refactor

Author: odeimaiz

services/static-webserver/client/source/class/osparc/desktop/MainPage.js

@@ -95,7 +95,7 @@ qx.Class.define("osparc.desktop.MainPage", {
       const pollTasks = osparc.store.PollTasks.getInstance();
       const exportDataTasks = pollTasks.getExportDataTasks();
       exportDataTasks.forEach(task => {
-        osparc.task.ExportData.exportDataTaskReceived(task);
+        osparc.task.ExportData.exportDataTaskReceived(task, false);
       });
     },
 

services/static-webserver/client/source/class/osparc/task/ExportData.js

@@ -28,41 +28,50 @@ qx.Class.define("osparc.task.ExportData", {
   statics: {
     ICON: "@FontAwesome5Solid/download",
 
-    exportDataTaskReceived: function(task) {
+    exportDataTaskReceived: function(task, popUpProgressWindow = true) {
       const exportDataTaskUI = new osparc.task.ExportData();
       exportDataTaskUI.setTask(task);
       osparc.task.TasksContainer.getInstance().addTaskUI(exportDataTaskUI);
 
-      const progressWindow = new osparc.ui.window.Progress(
-        qx.locale.Manager.tr("Downloading files"),
-        osparc.task.ExportData+"/14",
-        qx.locale.Manager.tr("Compressing files..."),
-      );
-      if (task.getAbortHref()) {
-        const cancelButton = progressWindow.addCancelButton();
-        cancelButton.setLabel(qx.locale.Manager.tr("Ignore"));
-        const abortButton = new qx.ui.form.Button().set({
-          label: qx.locale.Manager.tr("Cancel"),
-          center: true,
-          minWidth: 100,
-        });
-        abortButton.addListener("execute", () => task.abortRequested());
-        progressWindow.addButton(abortButton);
-        abortButton.set({
-          appearance: "danger-button",
+      if (popUpProgressWindow) {
+        const progressWindow = new osparc.ui.window.Progress(
+          qx.locale.Manager.tr("Downloading files"),
+          osparc.task.ExportData+"/14",
+          qx.locale.Manager.tr("Compressing files..."),
+        );
+
+        if (task.getAbortHref()) {
+          const cancelButton = progressWindow.addCancelButton();
+          cancelButton.setLabel(qx.locale.Manager.tr("Ignore"));
+          const abortButton = new qx.ui.form.Button().set({
+            label: qx.locale.Manager.tr("Cancel"),
+            center: true,
+            minWidth: 100,
+          });
+          abortButton.addListener("execute", () => task.abortRequested());
+          progressWindow.addButton(abortButton);
+          abortButton.set({
+            appearance: "danger-button",
+          });
+        }
+
+        task.addListener("updateReceived", e => {
+          const data = e.getData();
+          if (data["task_progress"]) {
+            if ("message" in data["task_progress"] && data["task_progress"]["message"]) {
+              progressWindow.setMessage(data["task_progress"]["message"]);
+            }
+            progressWindow.setProgress(osparc.data.PollTask.extractProgress(data) * 100);
+          }
         });
+
+        task.addListener("resultReceived", () => progressWindow.close());
+        task.addListener("taskAborted", () => progressWindow.close());
+        task.addListener("pollingError", () => progressWindow.close());
+
+        progressWindow.open();
       }
-      progressWindow.open();
 
-      task.addListener("updateReceived", e => {
-        const data = e.getData();
-        if (data["task_progress"]) {
-          if ("message" in data["task_progress"] && data["task_progress"]["message"]) {
-            progressWindow.setMessage(data["task_progress"]["message"]);
-          }
-          progressWindow.setProgress(osparc.data.PollTask.extractProgress(data) * 100);
-        }
-      });
       task.addListener("resultReceived", e => {
         const taskData = e.getData();
         if (taskData["result"]) {
@@ -80,16 +89,13 @@ qx.Class.define("osparc.task.ExportData", {
               }
             })
         }
-        progressWindow.close();
       });
       task.addListener("taskAborted", () => {
         osparc.FlashMessenger.logAs(qx.locale.Manager.tr("Download aborted"), "WARNING");
-        progressWindow.close();
       });
       task.addListener("pollingError", e => {
         const err = e.getData();
         osparc.FlashMessenger.logError(err);
-        progressWindow.close();
       });
     }
   },