Merge pull request #715 from NeurodataWithoutBorders/ensure-workflow-…

…persistence Ensure persistent workflow changes appear in section states
NeurodataWithoutBorders · Apr 3, 2024 · 9e71e9d · 9e71e9d
2 parents 11d16e1 + b873f80
commit 9e71e9d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/environments/environment-Windows.yml b/environments/environment-Windows.yml
@@ -22,3 +22,4 @@ dependencies:
       - pytest == 7.2.2
       - pytest-cov == 4.1.0
       - scikit-learn == 1.4.0
+      - scipy == 1.12.0
diff --git a/src/renderer/src/stories/Dashboard.js b/src/renderer/src/stories/Dashboard.js
@@ -180,12 +180,12 @@ export class Dashboard extends LitElement {
         else if (typeof page === "object") return this.getPage(Object.values(page)[0]);
     }
 
-    updateSections({ sidebar = true, main = false } = {}) {
+    updateSections({ sidebar = true, main = false } = {}, globalState = this.page.info.globalState) {
         const info = this.page.info;
         let parent = info.parent;
 
         if (sidebar) {
-            this.subSidebar.sections = this.#getSections(parent.info.pages, info.globalState); // Update sidebar items (if changed)
+            this.subSidebar.sections = this.#getSections(parent.info.pages, globalState); // Update sidebar items (if changed)
         }
 
         const { sections } = this.subSidebar;
@@ -229,7 +229,7 @@ export class Dashboard extends LitElement {
         if (isNested) {
             let parent = info.parent;
             while (parent.info.parent) parent = parent.info.parent; // Lock sections to the top-level parent
-            this.updateSections({ sidebar: true });
+            this.updateSections({ sidebar: true }, toPass.globalState);
             this.subSidebar.active = info.id; // Update active item (if changed)
             this.sidebar.hide(true);
             this.subSidebar.show();

diff --git a/src/renderer/src/stories/pages/Page.js b/src/renderer/src/stories/pages/Page.js
@@ -268,7 +268,7 @@ export class Page extends LitElement {
 
     updateSections = () => {
         const dashboard = document.querySelector("nwb-dashboard");
-        dashboard.updateSections({ sidebar: true, main: true });
+        dashboard.updateSections({ sidebar: true, main: true }, this.info.globalState);
     };
 
     #unsaved = false;

diff --git a/src/renderer/src/stories/pages/guided-mode/setup/Preform.js b/src/renderer/src/stories/pages/guided-mode/setup/Preform.js
@@ -162,8 +162,8 @@ export class GuidedPreform extends Page {
                 if (typeof value === "boolean") {
                     this.unsavedUpdates = true;
                     this.info.globalState.project.workflow = this.state;
-                    await this.save({}, false);
-                    this.updateSections();
+                    this.updateSections(); // Trigger section changes with new workflow
+                    await this.save({}, false); // Save new workflow and section changes
                 }
             },
             onThrow,