updated solution to align with the existing structure

dondi · Feb 25, 2025 · 6ba59ce · 6ba59ce
1 parent 702183d
commit 6ba59ce
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/web-client/public/js/grnstate.js b/web-client/public/js/grnstate.js
@@ -148,4 +148,7 @@ export const grnState = {
 
 // Viewport Size Parameter
     viewportSize: VIEWPORT_INIT,
+
+// Demo Dropdown Selection
+    demoDropdownValue: null,
 };
diff --git a/web-client/public/js/setup-load-and-import-handlers.js b/web-client/public/js/setup-load-and-import-handlers.js
@@ -196,6 +196,7 @@ export const setupLoadAndImportHandlers = (grnState) => {
             if (selected === demoClass) {
                 loadDemo(demoPath, demoClass, demoName);
             }
+            grnState.demoDropdownValue = selected;
         });
     };
 
@@ -227,12 +228,14 @@ export const responseCustomWorkbookData = (grnState, queryURL, name) => {
         }
         grnState.name = name;
         grnState.workbook = workbook;
+        grnState.demoDropdownValue = null;
         // Reset the node coloring dataset selection
         grnState.nodeColoring.topDataset = grnState.defaultDataset;
         grnState.nodeColoring.bottomDataset = grnState.defaultDataset;
         grnState.annotateLinks();
         disableUpload(false);
         updateApp(grnState);
         reloader = () => responseCustomWorkbookData(grnState, queryURL, name);
+
     });
 };
diff --git a/web-client/public/js/update-app.js b/web-client/public/js/update-app.js
@@ -549,6 +549,11 @@ const updateModeViews = () =>{
     }
 };
 
+const resetDemoDropdown = () =>{
+    $("#demoSourceDropdown option").removeAttr("selected");
+    $("#demoSourceDropdown").val("none");
+};
+
 const checkWorkbookModeSettings = () => {
     const hasExpression = hasExpressionData(grnState.workbook.expression);
 
@@ -822,6 +827,10 @@ export const updateApp = grnState => {
                 grnState.nodeColoringEnabled = false;
             }
         }
+        if (!(grnState.demoDropdownValue)){
+            resetDemoDropdown();
+        }
+
         refreshApp();
 
         // Rare exception to the MVC cycle: right now we have no way of knowing whether the workbook has changed