From f32df5a6b290318845afb842d938e21b938041d7 Mon Sep 17 00:00:00 2001
From: anika <anika.ahluwalia@gmail.com>
Date: Fri, 8 Jan 2021 01:37:39 -0600
Subject: UI changes and clean up

---
 src/client/util/CurrentUserUtils.ts   |  6 +++---
 src/client/views/MainView.tsx         |  5 +++--
 src/client/views/PropertiesView.tsx   | 10 +++++-----
 src/client/views/nodes/FilterBox.scss | 32 +++++++++++++++++++++-----------
 src/client/views/nodes/FilterBox.tsx  | 27 ++++++++++++++++++++-------
 5 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index e47c9a0e2..c4f7744ce 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -799,9 +799,9 @@ export class CurrentUserUtils {
             (doc.currentFilter as any as Doc).contextMenuScripts = new List<ScriptField>([clearAll!]);
             (doc.currentFilter as any as Doc).contextMenuLabels = new List<string>(["Clear All"]);
         }
-        const clearAll = ScriptField.MakeScript(`getProto(self).data = new List([]); scriptContext._docFilters = scriptContext._docRangeFilters = undefined;`, { scriptContext: Doc.name });
-        (doc.myFilter as any as Doc).contextMenuScripts = new List<ScriptField>([clearAll!]);
-        (doc.myFilter as any as Doc).contextMenuLabels = new List<string>(["Clear All"]);
+        // const clearAll = ScriptField.MakeScript(`getProto(self).data = new List([]); scriptContext._docFilters = scriptContext._docRangeFilters = undefined;`, { scriptContext: Doc.name });
+        // (doc.myFilter as any as Doc).contextMenuScripts = new List<ScriptField>([clearAll!]);
+        // (doc.myFilter as any as Doc).contextMenuLabels = new List<string>(["Clear All"]);
 
     }
 
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index ab63ebd03..6c0b85f4b 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -165,7 +165,8 @@ export class MainView extends React.Component {
             fa.faWindowMinimize, fa.faWindowRestore, fa.faTextWidth, fa.faTextHeight, fa.faClosedCaptioning, fa.faInfoCircle, fa.faTag, fa.faSyncAlt, fa.faPhotoVideo,
             fa.faArrowAltCircleDown, fa.faArrowAltCircleUp, fa.faArrowAltCircleLeft, fa.faArrowAltCircleRight, fa.faStopCircle, fa.faCheckCircle, fa.faGripVertical,
             fa.faSortUp, fa.faSortDown, fa.faTable, fa.faTh, fa.faThList, fa.faProjectDiagram, fa.faSignature, fa.faColumns, fa.faChevronCircleUp, fa.faUpload, fa.faBorderAll,
-            fa.faBraille, fa.faChalkboard, fa.faPencilAlt, fa.faEyeSlash, fa.faSmile, fa.faIndent, fa.faOutdent, fa.faChartBar, fa.faBan, fa.faPhoneSlash, fa.faGripLines, fa.faBookmark);
+            fa.faBraille, fa.faChalkboard, fa.faPencilAlt, fa.faEyeSlash, fa.faSmile, fa.faIndent, fa.faOutdent, fa.faChartBar, fa.faBan, fa.faPhoneSlash, fa.faGripLines,
+            fa.faSave, fa.faBookmark);
         this.initAuthenticationRouters();
     }
 
@@ -344,7 +345,7 @@ export class MainView extends React.Component {
                         renderDepth={0}
                         scriptContext={CollectionDockingView.Instance.props.Document}
                         focus={emptyFunction}
-                        styleProvider={this._sidebarContent.title === "My Dashboards" ? DashboardStyleProvider : DefaultStyleProvider}
+                        styleProvider={this._sidebarContent.title === "My Dashboards" ? this.DashboardStyleProvider : DefaultStyleProvider}
                         parentActive={returnTrue}
                         whenActiveChanged={emptyFunction}
                         bringToFront={emptyFunction}
diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx
index a8b65c114..1c6ad26e6 100644
--- a/src/client/views/PropertiesView.tsx
+++ b/src/client/views/PropertiesView.tsx
@@ -908,19 +908,19 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
                             </div>}
                     </div>
 
-                    <div className="propertiesView-settings">
-                        <div className="propertiesView-settings-title"
+                    <div className="propertiesView-sharing">
+                        <div className="propertiesView-sharing-title"
                             onPointerDown={action(() => this.openFilters = !this.openFilters)}
                             style={{ backgroundColor: this.openFilters ? "black" : "" }}>
                             Filters
-                        <div className="propertiesView-settings-title-icon">
+                        <div className="propertiesView-sharing-title-icon">
                                 <FontAwesomeIcon icon={this.openFilters ? "caret-down" : "caret-right"} size="lg" color="white" />
                             </div>
                         </div>
                         {!this.openFilters ? (null) :
-                            <div className="propertiesView-settings-content">
+                            <div className="propertiesView-sharing-content">
                                 <DocumentView
-                                    Document={Doc.UserDoc().myFilter as any as Doc}
+                                    Document={Doc.UserDoc().currentFilter as any as Doc}
                                     DataDoc={undefined}
                                     addDocument={undefined}
                                     addDocTab={returnFalse}
diff --git a/src/client/views/nodes/FilterBox.scss b/src/client/views/nodes/FilterBox.scss
index 8ebc7820a..59ef2c5cf 100644
--- a/src/client/views/nodes/FilterBox.scss
+++ b/src/client/views/nodes/FilterBox.scss
@@ -1,7 +1,7 @@
 .filterBox-flyout {
     display: block;
     text-align: left;
-    font-weight: 200;
+    font-weight: 100;
 
     .filterBox-flyout-facet {
         background-color: white;
@@ -35,22 +35,24 @@
 
 
 .filterBox-saveBookmark {
-    width: 105px;
     background-color: #f5f5f5;
     border-radius: 6px;
-    padding: 5px;
-    margin: 5px;
+    padding-left: 8px;
+    padding-right: 8px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    margin: 8px;
     display: flex;
-    font-size: 17px;
+    font-size: 11px;
 
     &:hover {
         background-color: white;
     }
 
     .filterBox-saveBookmark-icon {
-        margin-right: 10px;
+        margin-right: 6px;
         margin-top: 4px;
-        margin-left: 10px;
+        margin-left: 2px;
     }
 
 }
@@ -74,7 +76,7 @@
 .filterBox-addWrapper,
 .filterBox-select-matched,
 .filterBox-saveWrapper {
-    font-size: 12px;
+    font-size: 10px;
     justify-content: center;
     justify-items: center;
     padding-bottom: 10px;
@@ -82,7 +84,7 @@
 }
 
 .filterBox-addWrapper {
-    font-size: 15px;
+    font-size: 11px;
     width: 100%;
 }
 
@@ -103,9 +105,15 @@
     border-bottom: 2px solid black;
 }
 
+
+.filterBox-select-bool {
+    margin-top: 6px;
+}
+
 .filterBox-select-text {
     margin-right: 8px;
     margin-left: 8px;
+    margin-top: 3px;
 }
 
 .filterBox-select-box {
@@ -127,12 +135,14 @@
 }
 
 .filterBox-addFilter {
-    width: 100px;
+    width: 120px;
     background-color: #f5f5f5;
-    border-radius: 6px;
+    border-radius: 10px;
     padding: 5px;
     margin: 5px;
     display: flex;
+    text-align: center;
+    justify-content: center;
 
     &:hover {
         background-color: white;
diff --git a/src/client/views/nodes/FilterBox.tsx b/src/client/views/nodes/FilterBox.tsx
index cea1e6742..611e11b64 100644
--- a/src/client/views/nodes/FilterBox.tsx
+++ b/src/client/views/nodes/FilterBox.tsx
@@ -223,17 +223,22 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
                     <option value="AND" key="AND">AND</option>
                     <option value="OR" key="OR">OR</option>
                 </select>
-                <div className="filterBox-select-text">specified filters</div>
+                <div className="filterBox-select-text">filters in </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 className="filterBox-select-scope">
+            {/* <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> */}
 
             <div className="filterBox-tree" key="tree">
@@ -291,10 +296,18 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
                     <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 style={{ display: "flex" }}>
+                    <div className="filterBox-saveWrapper">
+                        <div className="filterBox-saveBookmark">
+                            <FontAwesomeIcon className="filterBox-saveBookmark-icon" icon={"save"} size={"sm"} />
+                            <div>SAVE</div>
+                        </div>
+                    </div>
+                    <div className="filterBox-saveWrapper">
+                        <div className="filterBox-saveBookmark">
+                            <FontAwesomeIcon className="filterBox-saveBookmark-icon" icon={"bookmark"} size={"sm"} />
+                            <div>MY FILTERS</div>
+                        </div>
                     </div>
                 </div>
             </div>
-- 
cgit v1.2.3-70-g09d2