Merge pull request #182 from intersystems-community/studio-actions-reject-progress

reject progress if error in studio actions happens

Author: rajrsingh

src/commands/studio.ts

@@ -250,39 +250,42 @@ class StudioActions {
         title: `Executing user action: ${action.label}`,
       },
       () => {
-        return new Promise((resolve) => {
-          this.api
-            .actionQuery(query, parameters)
-            .then(async (data) => {
-              if (action.save) {
-                await this.processSaveFlag(action.save);
-              }
-              if (!afterUserAction) {
-                outputConsole(data.console);
-              }
-              const actionToProcess = data.result.content.pop();
+        return this.api
+          .actionQuery(query, parameters)
+          .then(async (data) => {
+            if (action.save) {
+              await this.processSaveFlag(action.save);
+            }
+            if (!afterUserAction) {
+              outputConsole(data.console);
+            }
+            if (!data.result.content.length) {
+              // nothing to-do, just ignore it
+              return;
+            }
+            const actionToProcess = data.result.content.pop();
 
-              // CSP pages should not have a progress bar
-              if (actionToProcess.action === 2) {
-                resolve();
-              }
-              return actionToProcess;
-            })
-            .then(this.processUserAction)
-            .then((answer) => {
-              if (answer) {
-                return answer.msg || answer.msg === ""
+            // CSP pages should not have a progress bar
+            if (actionToProcess.action === 2) {
+              return;
+            }
+            return actionToProcess;
+          })
+          .then(
+            (actionToProcess) =>
+              actionToProcess &&
+              this.processUserAction(actionToProcess).then((answer) =>
+                answer && (answer.msg || answer.msg === "")
                   ? this.userAction(action, true, answer.answer, answer.msg, type)
-                  : this.userAction(action, true, answer, "", type);
-              }
-            })
-            .then(() => resolve())
-            .catch((err) => {
-              console.log(err);
-              outputChannel.appendLine(`Studio Action "${action.label}" not supported`);
-              outputChannel.show();
-            });
-        });
+                  : this.userAction(action, true, answer, "", type)
+              )
+          )
+          .catch((err) => {
+            console.log(err);
+            outputChannel.appendLine(`Studio Action "${action.label}" not supported`);
+            outputChannel.show();
+            return Promise.reject();
+          });
       }
     );
   }