ensure dialog waits for all results

complexdatacollective · Jan 28, 2022 · 7bdd0a3 · 7bdd0a3
1 parent a8eb32a
commit 7bdd0a3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/main/MainApp.js b/src/main/MainApp.js
@@ -79,7 +79,10 @@ const createApp = () => {
     defaultId: 0,
   }).then(({ response }) => {
     if (response === 1) {
-      protocolManager.correctSessionVariableTypes();
+      protocolManager.correctSessionVariableTypes()
+        .catch((err) => {
+          dialog.showErrorBox('Correct Variable Types Error', err && err.message);
+        });
     }
   });
 

diff --git a/src/main/data-managers/ProtocolManager.js b/src/main/data-managers/ProtocolManager.js
@@ -682,14 +682,14 @@ class ProtocolManager {
   async correctSessionVariableTypes() {
     let changesMade = false;
 
-    await this.allProtocols().then((allProtocols) => {
-      allProtocols.forEach((protocol) => {
+    await this.allProtocols().then((allProtocols) => (
+      promiseWithStaleEmitter(Promise.allSettled(allProtocols.map((protocol) => {
         const protocolId = get(protocol, '_id');
-        this.getProtocolSessions(protocolId)
-          .then((sessions) => {
-            sessions.forEach((session) => {
+        return this.getProtocolSessions(protocolId)
+          .then((sessions) => (
+            Promise.allSettled(sessions.map((session) => {
               const sessionId = get(session, '_id');
-              this.getProtocolSession(protocolId, sessionId)
+              return this.getProtocolSession(protocolId, sessionId)
                 .then((sessionData) => {
                   const nodes = getCorrectEntityVariableTypes(sessionData.data.nodes,
                     protocol.codebook.node);
@@ -709,15 +709,14 @@ class ProtocolManager {
                         ego: ego.correctedEntity,
                       },
                     };
-                    return promiseWithStaleEmitter(this.sessionDb.update(protocolId,
-                      updatedSession));
+                    return this.sessionDb.update(protocolId, updatedSession);
                   }
                   return Promise.resolve;
                 });
-            });
-          });
-      });
-    });
+            }))
+          ));
+      })))
+    ));
 
     if (changesMade) {
       dialog.showMessageBox(null, {