more refactoring

Author: odeimaiz

services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js

@@ -1924,8 +1924,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         .catch(err => {
           const msg = osparc.data.Resources.getErrorMsg(JSON.parse(err.response)) || this.tr("Something went wrong while exporting the study");
           osparc.FlashMessenger.logError(err, msg);
-        })
-        .finally(() => osparc.task.TasksContainer.getInstance().removeTaskUI(exportTaskUI));
+        });
     },
 
     __importStudy: function(file) {
@@ -1983,26 +1982,22 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
             .then(studyData => this._updateStudyData(studyData))
             .catch(err => osparc.FlashMessenger.logError(err, this.tr("Something went wrong while fetching the study")))
             .finally(() => {
-              osparc.task.TasksContainer.getInstance().removeTaskUI(importTaskUI);
               this._resourcesContainer.removeNonResourceCard(importingStudyCard);
             });
         } else if (req.status == 400) {
-          osparc.task.TasksContainer.getInstance().removeTaskUI(importTaskUI);
           this._resourcesContainer.removeNonResourceCard(importingStudyCard);
           const msg = osparc.data.Resources.getErrorMsg(JSON.parse(req.response)) || this.tr("Something went wrong while importing the study");
           osparc.FlashMessenger.logError(msg);
         }
       });
       req.addEventListener("error", e => {
         // transferFailed
-        osparc.task.TasksContainer.getInstance().removeTaskUI(importTaskUI);
         this._resourcesContainer.removeNonResourceCard(importingStudyCard);
         const msg = osparc.data.Resources.getErrorMsg(e) || this.tr("Something went wrong while importing the study");
         osparc.FlashMessenger.logError(msg);
       });
       req.addEventListener("abort", e => {
         // transferAborted
-        osparc.task.TasksContainer.getInstance().removeTaskUI(importTaskUI);
         this._resourcesContainer.removeNonResourceCard(importingStudyCard);
         const msg = osparc.data.Resources.getErrorMsg(e) || this.tr("Something went wrong while importing the study");
         osparc.FlashMessenger.logError(msg);
@@ -2143,8 +2138,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         if (msg) {
           osparc.FlashMessenger.logAs(msg, msgLevel);
         }
-        osparc.store.PollTasks.getInstance().removeTask(task);
-        osparc.task.TasksContainer.getInstance().removeTaskUI(taskUI);
         this._removeTaskCard(task);
       };
 

services/static-webserver/client/source/class/osparc/dashboard/TemplateBrowser.js

@@ -372,8 +372,6 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
         if (msg) {
           osparc.FlashMessenger.logAs(msg, msgLevel);
         }
-        osparc.store.PollTasks.getInstance().removeTask(task);
-        osparc.task.TasksContainer.getInstance().removeTaskUI(taskUI);
         this._resourcesContainer.removeNonResourceCard(toTemplateCard);
       };
 

services/static-webserver/client/source/class/osparc/file/FileLabelWithActions.js

@@ -225,6 +225,11 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
         const interval = 1000;
         pollTasks.createPollingTask(fetchPromise, interval)
           .then(task => {
+            const taskUI = new osparc.task.TaskUI();
+            taskUI.setTitle(this.tr("Deleting files"));
+            taskUI.setTask(task);
+            osparc.task.TasksContainer.getInstance().addTaskUI(taskUI);
+
             task.addListener("resultReceived", e => {
               this.fireDataEvent("pathsDeleted", paths);
               osparc.FlashMessenger.logAs(this.tr("Items successfully deleted"), "INFO");

services/static-webserver/client/source/class/osparc/store/PollTasks.js

@@ -55,7 +55,7 @@ qx.Class.define("osparc.store.PollTasks", {
       });
     },
 
-    removeTask: function(task) {
+    __removeTask: function(task) {
       const tasks = this.getTasks();
       const index = tasks.findIndex(t => t.getTaskId() === task.getTaskId());
       if (index > -1) {
@@ -68,6 +68,7 @@ qx.Class.define("osparc.store.PollTasks", {
       const index = tasks.findIndex(t => t.getTaskId() === taskData["task_id"]);
       if (index === -1) {
         const task = new osparc.data.PollTask(taskData, interval);
+        task.addListener("resultReceived", () => this.__removeTask(task), this);
         tasks.push(task);
         return task;
       }

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

@@ -46,9 +46,11 @@ qx.Class.define("osparc.task.TasksContainer", {
       }
       this.__tasks.push(taskUI);
       this.__tasksContainer.addAt(taskUI, 0);
+
+      taskUI.getTask().addListener("resultReceived", () => this.__removeTaskUI(taskUI), this);
     },
 
-    removeTaskUI: function(taskUI) {
+    __removeTaskUI: function(taskUI) {
       if (this.__tasks.indexOf(taskUI) > -1) {
         this.__tasks.remove(taskUI);
       }