fix(Filter): keep track of active filters

src/components/app/DocumentList.js

@@ -434,13 +434,41 @@ class DocumentList extends Component {
         });
     }
 
-    handleFilterChange = (filters) => {
-        this.setState({
-            filters: filters,
-            page: 1
-        }, () => {
-            this.fetchLayoutAndData(true);
-        })
+    uniqueFilters = (array, key) => {
+        const keys = array.map(k => k[key]);
+        const uniqObject = keys.reduce((curr, next) => {
+            if (!curr[next])
+                curr[next] = true;
+            return curr;
+        }, {});
+        const uniqKeys = Object.keys(uniqObject);
+
+        return uniqKeys.map((k) => {
+            return array.filter(i => i[key] === k)[0];
+        });
+    }
+
+    handleFilterChange = (filter, add = true) => {
+        const stateFilter = this.state.filters || [];
+        if (add) {
+            this.setState({
+                filters: this.uniqueFilters([
+                    filter, ...stateFilter
+                ], 'filterId'),
+                page: 1
+            }, () => {
+                this.fetchLayoutAndData(true);
+            });
+        } else {
+            this.setState({
+                filters: stateFilter.filter(item => {
+                    return item.filterId !== filter.filterId;
+                }),
+                page: 1
+            }, () => {
+                this.fetchLayoutAndData(true);
+            });
+        }
     }
 
     // END OF MANAGING SORT, PAGINATION, FILTERS -------------------------------

src/components/filters/Filters.js

@@ -49,19 +49,19 @@ class Filters extends Component {
                     Object.assign({}, filter, {
                         parameters: this.parseToPatch(filter.parameters)
                     }) : filter;
-                this.setFilterActive([parsedFilter]);
+                this.setFilterActive(parsedFilter);
                 cb && cb();
             }
         });
     }
 
-    setFilterActive = (filter) => {
+    setFilterActive = (filter, add = true) => {
         const {updateDocList} = this.props;
 
         this.setState({
             filter: filter
         }, () => {
-            updateDocList(filter);
+            updateDocList(filter, add);
         })
     }
 
@@ -76,7 +76,7 @@ class Filters extends Component {
     }
 
     clearFilters = () => {
-        this.setFilterActive(null)
+        this.setFilterActive(this.state.filter, false);
     }
 
     dropdownToggled = () => {