Merge branch 'filters' of https://github.com/browngraphicslab/Dash-Web into filters

2 files changed, 231 insertions, 24 deletions

diff --git a/src/client/views/nodes/FilterBox.scss b/src/client/views/nodes/FilterBox.scss
index d32cc0d2b..d19fc07d3 100644
--- a/src/client/views/nodes/FilterBox.scss
+++ b/src/client/views/nodes/FilterBox.scss
@@ -1,17 +1,144 @@
-
-
 .filterBox-flyout {
-    width: 400px;
     display: block;
     text-align: left;
+    font-weight: 200;
+
     .filterBox-flyout-facet {
-            background-color: lightgray;
-            text-align: left;
-            display: inline-block;
-            position: relative;
-            width: 100%;
+        background-color: white;
+        text-align: left;
+        display: inline-block;
+        position: relative;
+        width: 100%;
+
+        .filterBox-flyout-facet-check {
+            margin-right: 6px;
+        }
+    }
+}
+
+
+.filter-bookmark {
+    //display: flex;
+
+    .filter-bookmark-icon {
+        float: right;
+        margin-right: 10px;
+        margin-top: 7px;
+    }
+}
+
+.filterBox-bottom {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+}
+
+
+.filterBox-saveBookmark {
+    width: 105px;
+    background-color: #f5f5f5;
+    border-radius: 6px;
+    padding: 5px;
+    margin: 5px;
+    display: flex;
+    font-size: 17px;
+
+    &:hover {
+        background-color: white;
+    }
+
+    .filterBox-saveBookmark-icon {
+        margin-right: 10px;
+        margin-top: 4px;
+        margin-left: 10px;
+    }
+
+}
+
+.filterBox-title {
+
+    justify-content: center;
+    text-align: center;
+    padding-bottom: 13px;
+    font-size: 20px;
+    font-weight: bold;
+
+    .filterBox-span {
+        margin-right: 15px;
+    }
+
+}
+
+.filterBox-select-scope,
+.filterBox-select-bool,
+.filterBox-addWrapper,
+.filterBox-select-matched,
+.filterBox-saveWrapper {
+    font-size: 12px;
+    justify-content: center;
+    justify-items: center;
+    padding-bottom: 10px;
+    display: flex;
+}
+
+.filterBox-addWrapper {
+    font-size: 15px;
+    width: 100%;
+}
+
+.filterBox-saveWrapper {
+    width: 100%;
+}
+
+// .filterBox-top {
+//     padding-bottom: 20px;
+//     border-bottom: 2px solid black;
+//     position: fixed;
+//     top: 0;
+//     width: 100%;
+// }
+
+.filterBox-select-scope {
+    padding-bottom: 20px;
+    border-bottom: 2px solid black;
+}
+
+.filterBox-select-text {
+    margin-right: 8px;
+    margin-left: 8px;
+}
+
+.filterBox-select-box {
+    margin-right: 2px;
+    font-size: 30px;
+    border: 0;
+    background: transparent;
+}
+
+.filterBox-selection {
+    border-radius: 6px;
+    border: none;
+    background-color: #f5f5f5;
+    padding: 2px;
+
+    &:hover {
+        background-color: white;
     }
 }
+
+.filterBox-addFilter {
+    width: 100px;
+    background-color: #f5f5f5;
+    border-radius: 6px;
+    padding: 5px;
+    margin: 5px;
+    display: flex;
+
+    &:hover {
+        background-color: white;
+    }
+}
+
 .filterBox-treeView {
     display: flex;
     flex-direction: column;
@@ -22,22 +149,18 @@
     top: 0;
     border-left: solid 1px;
     z-index: 1;
+    background-color: #D3D3D3;
 
     .filterBox-addfacet {
         display: inline-block;
         width: 200px;
         height: 30px;
-        background: darkGray;
         text-align: left;
 
         .filterBox-addFacetButton {
             display: flex;
             margin: auto;
             cursor: pointer;
-
-            .filterBox-span {
-                margin-right: 15px;
-            }
         }
 
         >div,
@@ -50,6 +173,7 @@
     .filterBox-tree {
         display: inline-block;
         width: 100%;
-        height: calc(100% - 30px);
+        margin-bottom: 10px;
+        //height: calc(100% - 30px);
     }
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/FilterBox.tsx b/src/client/views/nodes/FilterBox.tsx
index 36df21b2d..29fd84492 100644
--- a/src/client/views/nodes/FilterBox.tsx
+++ b/src/client/views/nodes/FilterBox.tsx
@@ -1,6 +1,6 @@
 import React = require("react");
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { computed } from "mobx";
+import { action, computed } from "mobx";
 import { observer } from "mobx-react";
 import { DataSym, Doc, DocListCast, Field, Opt } from "../../../fields/Doc";
 import { documentSchema } from "../../../fields/documentSchemas";
@@ -20,6 +20,8 @@ import { FieldView, FieldViewProps } from './FieldView';
 import './FilterBox.scss';
 import { Scripting } from "../../util/Scripting";
 import { values } from "lodash";
+import { tokenToString } from "typescript";
+import { SelectionManager } from "../../util/SelectionManager";
 const higflyout = require("@hig/flyout");
 export const { anchorPoints } = higflyout;
 export const Flyout = higflyout.default;
@@ -31,6 +33,11 @@ const FilterBoxDocument = makeInterface(documentSchema);
 export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDocument>(FilterBoxDocument) {
     public static LayoutString(fieldKey: string) { return FieldView.LayoutString(FilterBox, fieldKey); }
 
+    public _filterBoolean = "AND";
+    public _filterScope = "Current Dashboard";
+    public _filterSelected = false;
+    public _filterMatch = "matched";
+
     @computed get allDocs() {
         const allDocs = new Set<Doc>();
         if (CollectionDockingView.Instance) {
@@ -159,25 +166,76 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
         return script ? () => script : undefined;
     }
 
+    @action
+    changeBool = (e: any) => {
+        this._filterBoolean = e.currentTarget.value;
+        console.log(this._filterBoolean);
+    }
+
+    @action
+    changeScope = (e: any) => {
+        this._filterScope = e.currentTarget.value;
+        console.log(this._filterScope);
+    }
+
+    @action
+    changeMatch = (e: any) => {
+        this._filterMatch = e.currentTarget.value;
+        console.log(this._filterMatch);
+    }
+
+
+    @action
+    changeSelected = (e: any) => {
+        if (this._filterSelected) {
+            this._filterSelected = false;
+            SelectionManager.DeselectAll();
+        } else {
+            this._filterSelected = true;
+            // helper method to select specified docs
+        }
+        console.log(this._filterSelected);
+    }
+
     render() {
         const facetCollection = this.props.Document;
-        const flyout = <div className="filterBox-flyout" style={{ width: `100%`, height: this.props.PanelHeight() - 30 }} onWheel={e => e.stopPropagation()}>
+        const flyout = <div className="filterBox-flyout" style={{ width: `100%` }} onWheel={e => e.stopPropagation()}>
             {this._allFacets.map(facet => <label className="filterBox-flyout-facet" key={`${facet}`} onClick={e => this.facetClick(facet)}>
-                <input type="checkbox" onChange={e => { }} checked={DocListCast(this.props.Document[this.props.fieldKey]).some(d => d.title === facet)} />
+                <input className="filterBox-flyout-facet-check" type="checkbox" onChange={e => { }} checked={DocListCast(this.props.Document[this.props.fieldKey]).some(d => d.title === facet)} />
                 <span className="checkmark" />
                 {facet}
             </label>)}
         </div>;
 
         return this.props.dontRegisterView ? (null) : <div className="filterBox-treeView" style={{ width: "100%" }}>
-            <div className="filterBox-addFacet" style={{ width: "100%" }} onPointerDown={e => e.stopPropagation()}>
-                <Flyout anchorPoint={anchorPoints.LEFT_TOP} content={flyout}>
-                    <div className="filterBox-addFacetButton">
-                        <FontAwesomeIcon icon={"edit"} size={"lg"} />
-                        <span className="filterBox-span">Choose Facets</span>
-                    </div>
-                </Flyout>
+
+            {/* <div className="filterBox-top"> */}
+            <div className="filter-bookmark">
+                <FontAwesomeIcon className="filter-bookmark-icon" icon={"bookmark"} size={"lg"} />
+            </div>
+
+            <div className="filterBox-title">
+                <span className="filterBox-span">Choose Filters</span>
+            </div>
+
+            <div className="filterBox-select-bool">
+                <select className="filterBox-selection" onChange={e => this.changeBool(e)}>
+                    <option value="AND" key="AND">AND</option>
+                    <option value="OR" key="OR">OR</option>
+                </select>
+                <div className="filterBox-select-text">specified filters</div>
+            </div>
+
+            <div className="filterBox-select-scope">
+                <div className="filterBox-select-text">Scope: </div>
+                <select className="filterBox-selection" onChange={e => this.changeScope(e)}>
+                    <option value="Current Dashboard" key="Current Dashboard">Current Dashboard</option>
+                    <option value="Current Tab" key="Current Tab">Current Tab</option>
+                    <option value="Current Collection" key="Current Collection">Current Collection</option>
+                </select>
             </div>
+            {/* </div> */}
+
             <div className="filterBox-tree" key="tree">
                 <CollectionTreeView
                     Document={facetCollection}
@@ -214,6 +272,31 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
                     removeDocument={returnFalse}
                     addDocument={returnFalse} />
             </div>
+            <Flyout className="filterBox-flyout" anchorPoint={anchorPoints.LEFT_TOP} content={flyout}>
+                <div className="filterBox-addWrapper">
+                    <div className="filterBox-addFilter"> + add a filter</div>
+                </div>
+            </Flyout>
+
+            <div className="filterBox-bottom">
+                <div className="filterBox-select-matched">
+                    <input className="filterBox-select-box" type="checkbox"
+                        onChange={e => this.changeSelected(e)} />
+                    <div className="filterBox-select-text">select</div>
+                    <select className="filterBox-selection" onChange={e => this.changeMatch(e)}>
+                        <option value="matched" key="matched">matched</option>
+                        <option value="unmatched" key="unmatched">unmatched</option>
+                    </select>
+                    <div className="filterBox-select-text">documents</div>
+                </div>
+
+                <div className="filterBox-saveWrapper">
+                    <div className="filterBox-saveBookmark">
+                        <FontAwesomeIcon className="filterBox-saveBookmark-icon" icon={"bookmark"} size={"sm"} />
+                        <div>SAVE</div>
+                    </div>
+                </div>
+            </div>
         </div>;
     }
 }