Merge pull request #174 from ty-d/NoProgressBarForCSPPages

No progress bar for csp pages

Author: rajrsingh

src/commands/studio.ts

@@ -249,29 +249,41 @@ class StudioActions {
         location: vscode.ProgressLocation.Notification,
         title: `Executing user action: ${action.label}`,
       },
-      () =>
-        this.api
-          .actionQuery(query, parameters)
-          .then(async (data) => {
-            if (action.save) {
-              await this.processSaveFlag(action.save);
-            }
-            outputConsole(data.console);
-            return data.result.content.pop();
-          })
-          .then(this.processUserAction)
-          .then((answer) => {
-            if (answer) {
-              return answer.msg || answer.msg === ""
-                ? this.userAction(action, true, answer.answer, answer.msg, type)
-                : this.userAction(action, true, answer, "", type);
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-            outputChannel.appendLine(`Studio Action "${action.label}" not supported`);
-            outputChannel.show();
-          })
+      () => {
+        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();
+
+              // 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 === ""
+                  ? 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();
+            });
+        });
+      }
     );
   }