From 5b0a4a154a6e68139d3d7e462ca421d3fbbdd224 Mon Sep 17 00:00:00 2001
From: anika <anika.ahluwalia@gmail.com>
Date: Thu, 28 Jan 2021 09:20:52 -0500
Subject: functionality for adding and removing filters

---
 src/client/util/CurrentUserUtils.ts  |  2 +-
 src/client/views/nodes/FilterBox.tsx | 55 +++++++++++++++++++++++++++++-------
 2 files changed, 46 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index f3fec9ae6..f869fe4f5 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -792,7 +792,7 @@ export class CurrentUserUtils {
             doc.currentFilter = new PrefetchProxy(Docs.Create.FilterDocument({
                 title: "FilterDoc", _height: 500,
                 treeViewHideTitle: true, _xMargin: 5, _yMargin: 5, _gridGap: 5, forceActive: true, childDropAction: "none",
-                treeViewTruncateTitleWidth: 150, treeViewPreventOpen: false, ignoreClick: true,
+                treeViewTruncateTitleWidth: 90, treeViewPreventOpen: false, ignoreClick: true,
                 lockedPosition: true, boxShadow: "0 0", dontRegisterChildViews: true, targetDropAction: "same", system: true
             }));
             const clearAll = ScriptField.MakeScript(`getProto(self).data = new List([])`);
diff --git a/src/client/views/nodes/FilterBox.tsx b/src/client/views/nodes/FilterBox.tsx
index 61f5232ce..6b1cd793e 100644
--- a/src/client/views/nodes/FilterBox.tsx
+++ b/src/client/views/nodes/FilterBox.tsx
@@ -63,6 +63,7 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
         return Array.from(keys.keys()).filter(key => key[0]).filter(key => key[0] === "#" || key.indexOf("lastModified") !== -1 || (key[0] === key[0].toUpperCase() && !key.startsWith("_")) || noviceFields.includes(key) || !Doc.UserDoc().noviceMode).sort();
     }
 
+
     /**
      * The current attributes selected to filter based on
      */
@@ -70,6 +71,10 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
         return DocListCast(this.dataDoc[this.props.fieldKey]);
     }
 
+    @computed get currentFacets() {
+        return this.activeAttributes.map(attribute => StrCast(attribute.title));
+    }
+
     gatherFieldValues(dashboard: Doc, facetKey: string) {
         const childDocs = DocListCast((dashboard.data as any)[0].data);
         const valueSet = new Set<string>();
@@ -102,28 +107,58 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
         });
         return { strings: Array.from(valueSet.keys()), rtFields };
     }
-    /**
-     * Responds to clicking the check box in the flyout menu
-     */
-    facetClick = (facetHeader: string) => {
+
+    public static removeFilter = (filterName: string) => {
+        console.log("remove filter");
         const targetDoc = SelectionManager.Views()[0].Document; // CollectionDockingView.Instance.props.Document;
-        const found = this.activeAttributes.findIndex(doc => doc.title === facetHeader);
+        const filterDoc = Doc.UserDoc().currentFilter as any as Doc;
+        const attributes = DocListCast(filterDoc["data"]);
+        const found = attributes.findIndex(doc => doc.title === filterName);
         if (found !== -1) {
-            (this.dataDoc[this.props.fieldKey] as List<Doc>).splice(found, 1);
+            (filterDoc["data"] as List<Doc>).splice(found, 1);
             const docFilter = Cast(targetDoc._docFilters, listSpec("string"));
             if (docFilter) {
                 let index: number;
-                while ((index = docFilter.findIndex(item => item.split(":")[0] === facetHeader)) !== -1) {
+                while ((index = docFilter.findIndex(item => item.split(":")[0] === filterName)) !== -1) {
                     docFilter.splice(index, 1);
                 }
             }
             const docRangeFilters = Cast(targetDoc._docRangeFilters, listSpec("string"));
             if (docRangeFilters) {
                 let index: number;
-                while ((index = docRangeFilters.findIndex(item => item.split(":")[0] === facetHeader)) !== -1) {
+                while ((index = docRangeFilters.findIndex(item => item.split(":")[0] === filterName)) !== -1) {
                     docRangeFilters.splice(index, 3);
                 }
             }
+        }
+    }
+
+    /**
+     * Responds to clicking the check box in the flyout menu
+     */
+    facetClick = (facetHeader: string) => {
+
+        console.log("facetClick: " + facetHeader);
+        console.log(this.props.fieldKey);
+
+        const targetDoc = SelectionManager.Views()[0].Document; // CollectionDockingView.Instance.props.Document;
+        const found = this.activeAttributes.findIndex(doc => doc.title === facetHeader);
+        if (found !== -1) {
+            // (this.dataDoc[this.props.fieldKey] as List<Doc>).splice(found, 1);
+            // const docFilter = Cast(targetDoc._docFilters, listSpec("string"));
+            // if (docFilter) {
+            //     let index: number;
+            //     while ((index = docFilter.findIndex(item => item.split(":")[0] === facetHeader)) !== -1) {
+            //         docFilter.splice(index, 1);
+            //     }
+            // }
+            // const docRangeFilters = Cast(targetDoc._docRangeFilters, listSpec("string"));
+            // if (docRangeFilters) {
+            //     let index: number;
+            //     while ((index = docRangeFilters.findIndex(item => item.split(":")[0] === facetHeader)) !== -1) {
+            //         docRangeFilters.splice(index, 3);
+            //     }
+            // }
         } else {
             const allCollectionDocs = DocListCast((targetDoc.data as any)[0].data);
             const facetValues = this.gatherFieldValues(targetDoc, facetHeader);
@@ -221,7 +256,7 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
                                     <option value="Is Not" key="Is Not">Is Not</option>
                                 </select>
                             </div>
-                            <div className="filterBox-treeView-close" onClick={e => this.facetClick(StrCast(doc.title))}>
+                            <div className="filterBox-treeView-close" onClick={e => FilterBox.removeFilter(StrCast(doc.title))}>
                                 <FontAwesomeIcon icon={"times"} size="sm" />
                             </div>
                         </>;
@@ -245,7 +280,7 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
         // const attributes = this.activeAttributes;
 
         // const options = this._allFacets.filter(facet => !attributes.some(attribute => attribute.title === facet)).map(facet => ({ value: facet, label: facet }));
-        const options = this._allFacets.map(facet => ({ value: facet, label: facet }));
+        const options = this._allFacets.filter(facet => this.currentFacets.indexOf(facet) === -1).map(facet => ({ value: facet, label: facet }));
 
         return this.props.dontRegisterView ? (null) : <div className="filterBox-treeView" style={{ width: "100%" }}>
 
-- 
cgit v1.2.3-70-g09d2