Merge pull request #612 from coq-community/expanded-search-results

Expanded search results
coq · Sep 11, 2023 · 382ac37 · 382ac37
2 parents dead809 + 2def129
commit 382ac37
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 12 deletions.
diff --git a/client/package.json b/client/package.json
@@ -304,13 +304,15 @@
         "command": "extension.coq.collapseAllQueries",
         "title": "Collapse All",
         "category": "Coq",
-        "icon": "$(collapse-all)"
+        "icon": "$(collapse-all)",
+        "enablement": "vscoq.hasSearchResults"
       },
       {
         "command": "extension.coq.expandAllQueries",
         "title": "Expand All",
         "category": "Coq",
-        "icon": "$(expand-all)"
+        "icon": "$(expand-all)",
+        "enablement": "vscoq.hasSearchResults"
       }
     ],
     "menus": {
@@ -355,6 +357,7 @@
         {
           "command": "extension.coq.expandAllQueries",
           "group": "navigation",
+          "enablement": "editorHasSelection",
           "when": "view == vscoq.search && !vscoq.expandedQueries"
         }
       ]

diff --git a/client/search-ui/src/App.tsx b/client/search-ui/src/App.tsx
@@ -32,7 +32,8 @@ const defaultTab = {
         type: QueryType.search,
         data: []
     } as SearchResultType,
-    error: undefined
+    error: undefined,
+    expanded: true
 };
 
 const defaultQueryPanelState = {
@@ -114,6 +115,18 @@ const app = () => {
         ready();
     }, []);
 
+    useEffect(() => {
+        const {tabs, currentTab} = queryPanelState;
+        if(tabs[currentTab].type === QueryType.search && 
+            (tabs[currentTab].result as SearchResultType).data.length) {
+            enableCollapseButton();
+            updateCollapseButton(tabs[currentTab].expanded!);
+        } else {
+            disableCollapseButton();
+        }
+
+    }, [queryPanelState]);
+
     const ready = () => {
         vscode.postMessage({
             command: "ready",
@@ -140,8 +153,8 @@ const app = () => {
             const newTabs = state.tabs.map(tab => {
                 if(tab.id === notification.id) {
                     //This is only for typescript, but should always be the case
-                    if(tab.result.type === QueryType.search) {
-                        const data = tab.result.data.concat([{name: notification.name, statement: notification.statement, collapsed: true}]);
+                    if(tab.result.type === QueryType.search) { 
+                        const data = tab.result.data.concat([{name: notification.name, statement: notification.statement, collapsed: false}]);
                         return {...tab, result: {...tab.result, data: data}};
                     }
                 }
@@ -349,6 +362,25 @@ const app = () => {
         });
     };
 
+    const updateCollapseButton = (buttonStatus: boolean) => {
+        vscode.postMessage({
+            command: "toggleExpandButton", 
+            value: buttonStatus
+        });
+    };
+
+    const enableCollapseButton = () => {
+        vscode.postMessage({
+            command: "enableCollapseButton"
+        });
+    };
+
+    const disableCollapseButton = () => {
+        vscode.postMessage({
+            command: "disableCollapseButton"
+        });
+    };
+
     const copyNameToClipboard = (name: string) => {
         vscode.postMessage({
             command: "copySearchResult",
@@ -360,7 +392,7 @@ const app = () => {
         setQueryPanelState(
             state => {
                 const result = {type: QueryType.search, data: []} as SearchResultType; 
-                const newTab : QueryTab[] = [{id: uuid(), title: "New Tab", pattern: "", result: result, type: QueryType.search}];
+                const newTab : QueryTab[] = [{id: uuid(), title: "New Tab", pattern: "", result: result, type: QueryType.search, expanded: true}];
                 return {currentTab: state.tabs.length, tabs: state.tabs.concat(newTab)};
             }, 
             (state) => saveState({state, history, historyIndex})
@@ -406,7 +438,7 @@ const app = () => {
                         type: QueryType.search, 
                         data: data
                     } as SearchResultType;
-                    return {...tab, result: result};
+                    return {...tab, result: result, expanded: false};
                 }
                 return tab;
             });
@@ -425,7 +457,7 @@ const app = () => {
                         type: "search", 
                         data: data
                     } as SearchResultType;
-                    return {...tab, result: result};
+                    return {...tab, result: result, expanded: true};
                 }
                 return tab;
             });

diff --git a/client/search-ui/src/types.ts b/client/search-ui/src/types.ts
@@ -78,7 +78,8 @@ export interface QueryTab {
     pattern: string, 
     type: QueryType, 
     result: QueryResultType,
-    error?: QueryError
+    error?: QueryError,
+    expanded?: boolean
 };
 export type QueryPanelState = {
     currentTab: number;

diff --git a/client/src/panels/SearchViewProvider.ts b/client/src/panels/SearchViewProvider.ts
@@ -250,9 +250,16 @@ export default class SearchViewProvider implements vscode.WebviewViewProvider {
                 vscode.window.showInformationMessage('Successfuly copied command ' + message.text + ' to clipboard.');
                 return;
 
-            case "toggleExpandButton": 
-                const flag = (message.text === 'true');
-                vscode.commands.executeCommand('setContext', 'vscoq.expandedQueries', flag);
+            case "toggleExpandButton":
+                vscode.commands.executeCommand('setContext', 'vscoq.expandedQueries', message.value);
+                return;
+
+            case "enableCollapseButton":
+                vscode.commands.executeCommand('setContext', 'vscoq.hasSearchResults', true);
+                return;
+
+            case "disableCollapseButton":
+                vscode.commands.executeCommand('setContext', 'vscoq.hasSearchResults', false);
                 return;
         }
       }