not showing order on Search dialog unless "list" layout selected.

Clay-Ferguson · Nov 24, 2024 · c00667e · c00667e
1 parent f58a530
commit c00667e
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/src/main/resources/public/src/dlg/SearchContentDlg.ts b/src/main/resources/public/src/dlg/SearchContentDlg.ts
@@ -62,6 +62,7 @@ export class SearchContentDlg extends DialogBase {
 
     renderDlg(): Comp[] {
         const ast = getAs();
+        const state = this.getState<LS>();
         let requirePriorityCheckbox = null;
         if (this.getState<LS>().sortField === J.NodeProp.PRIORITY_FULL) {
             requirePriorityCheckbox = new Checkbox("Require Priority", null, {
@@ -176,7 +177,8 @@ export class SearchContentDlg extends DialogBase {
                         },
                         getValue: (): string => this.getState<LS>().displayLayout
                     }),
-                    new Selection(null, "Sort by", [
+                    state.displayLayout == "list" ? new Selection(null, "Sort by", [
+                        { key: "none", val: "n/a" },
                         { key: "mtm", val: "Modify Time" },
                         { key: "ctm", val: "Create Time" },
                         { key: "contentLength", val: "Text Length" },
@@ -201,7 +203,7 @@ export class SearchContentDlg extends DialogBase {
                             this.mergeState<LS>(newState);
                         },
                         getValue: (): string => this.getState<LS>().sortField
-                    }),
+                    }) : null,
                     new Div(null, null, [
                         requirePriorityCheckbox
                     ])
@@ -217,6 +219,18 @@ export class SearchContentDlg extends DialogBase {
         ];
     }
 
+    // We override so we can make adjustments 
+    mergeState<T extends LS>(moreState: T): void {
+        const state: LS = this.getState<LS>();
+        if (state.displayLayout === "graph" || state.displayLayout === "doc") {
+            SearchContentDlg.dlgState.sortField = "";
+            SearchContentDlg.dlgState.sortDir = "none";
+            moreState.sortField = "";
+            moreState.sortDir = "none";
+        }
+        super.mergeState(moreState);
+    }
+
     createSearchFieldIconButtons(): Comp {
         return new ButtonBar([
             new Button("Clear", () => {