cleaned up rightbuttons in treeView and fixed so that they show up in dashboard. fixed filters to gatherfield values correctly.

2 files changed, 8 insertions, 15 deletions

diff --git a/src/client/views/collections/TreeView.scss b/src/client/views/collections/TreeView.scss
index 5b0c04f33..0239ae863 100644
--- a/src/client/views/collections/TreeView.scss
+++ b/src/client/views/collections/TreeView.scss
@@ -113,24 +113,18 @@
         width: unset;
     }
 
-    .right-buttons-container {
+    .treeView-rightButtons {
         display: flex;
         align-items: center;
         margin-left: 0.25rem;
         opacity: 0.75;
 
-        >svg,
-        .styleProvider-treeView-lock,
-        .styleProvider-treeView-hide,
-        .styleProvider-treeView-lock-active,
-        .styleProvider-treeView-hide-active {
+        >svg {
             margin-left: 0.25rem;
             margin-right: 0.25rem;
         }
 
-        >svg,
-        .styleProvider-treeView-lock,
-        .styleProvider-treeView-hide {
+        >svg {
             display: none;
         }
     }
@@ -154,11 +148,9 @@
         }
     }
 
-    .right-buttons-container {
-
+    .treeView-rightButtons {
         >svg,
-        .styleProvider-treeView-lock,
-        .styleProvider-treeView-hide {
+        .styleProvider-treeView-icon {
             display: inherit;
         }
     }
diff --git a/src/client/views/collections/TreeView.tsx b/src/client/views/collections/TreeView.tsx
index e1fd78270..49db98743 100644
--- a/src/client/views/collections/TreeView.tsx
+++ b/src/client/views/collections/TreeView.tsx
@@ -626,6 +626,7 @@ export class TreeView extends React.Component<TreeViewProps> {
                 ContainingCollectionDoc={this.props.treeView.props.Document}
             />;
 
+        const buttons = this.props.styleProvider?.(this.doc, this.props.treeView.props, StyleProp.Decorations + (Doc.IsSystem(this.props.containerCollection) ? ":afterHeader" : ""));
         return <>
             <div className={`docContainer${Doc.IsSystem(this.props.document) || this.props.document.isFolder ? "-system" : ""}`} ref={this._tref} title="click to edit title. Double Click or Drag to Open"
                 style={{
@@ -636,8 +637,8 @@ export class TreeView extends React.Component<TreeViewProps> {
                 }} >
                 {view}
             </div >
-            <div className={"right-buttons-container"}>
-                {this.props.styleProvider?.(this.doc, this.props.treeView.props, StyleProp.Decorations + (Doc.IsSystem(this.props.containerCollection) ? ":afterHeader" : ""))} {/* hide and lock buttons */}
+            <div className="treeView-rightButtons">
+                {buttons} {/* hide and lock buttons */}
                 {this.headerElements}
             </div>
         </>;