Fix merge

NeurodataWithoutBorders · Jun 5, 2024 · df7fde0 · df7fde0
1 parent a9b7f37
commit df7fde0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/electron/frontend/core/components/pages/Page.js b/src/electron/frontend/core/components/pages/Page.js
@@ -165,6 +165,7 @@ export class Page extends LitElement {
 
         const { close: closeProgressPopup } = swalOpts;
 
+
         const fileConfiguration = [];
 
         try {
@@ -245,9 +246,7 @@ export class Page extends LitElement {
                         this.notify(message, "error");
                         throw error;
                     })
-
-                    .finally(() => closeProgressPopup());
-
+
                 results.forEach((info) => {
                     const { file } = info;
                     const fileName = file.split("/").pop();
@@ -259,7 +258,7 @@ export class Page extends LitElement {
             }
 
         } finally {
-            await closeProgressPopup();
+            closeProgressPopup && await closeProgressPopup();
         }
 
         return conversionOutput;

diff --git a/src/electron/frontend/core/components/pages/guided-mode/setup/Preform.js b/src/electron/frontend/core/components/pages/guided-mode/setup/Preform.js
@@ -172,7 +172,7 @@ export class GuidedPreform extends Page {
         subtitle: "Answer the following questions to simplify your workflow through the GUIDE",
     };
 
-    #setWorkflow = () => (this.info.globalState.project.workflow = merge(this.state, structuredClone(defaults)));
+    #setWorkflow = () => this.info.globalState.project.workflow = this.state; // NOTE: Defaults already populated
 
     beforeSave = async () => {
         await this.form.validate();

diff --git a/src/pyflask/manageNeuroconv/manage_neuroconv.py b/src/pyflask/manageNeuroconv/manage_neuroconv.py
@@ -975,8 +975,6 @@ def update_backend_configuration(info: dict) -> dict:
     backend = info_from_frontend.get("backend", "hdf5")
     backend_configuration_from_frontend = info_from_frontend.get("results", {}).get(backend, {})
 
-    if not backend_configuration_from_frontend:
-        return None  # Do not provide backend configuration if no customization is present
 
     converter, metadata, __ = get_conversion_info(info)