renaming

Author: odeimaiz

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

@@ -1917,32 +1917,30 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     },
 
     __exportStudy: function(studyData) {
-      const exportTask = new osparc.task.Export(studyData);
-      exportTask.start();
-      exportTask.setSubtitle(this.tr("Preparing files"));
+      const exportTaskUI = new osparc.task.Export(studyData);
+      osparc.task.TasksContainer.getInstance().addTaskUI(exportTaskUI);
+      exportTaskUI.setSubtitle(this.tr("Preparing files"));
       const text = this.tr("Exporting process started and added to the background tasks");
       osparc.FlashMessenger.logAs(text, "INFO");
 
       const url = window.location.href + "v0/projects/" + studyData["uuid"] + ":xport";
       const progressCB = () => {
         const textSuccess = this.tr("Download started");
-        exportTask.setSubtitle(textSuccess);
+        exportTaskUI.setSubtitle(textSuccess);
       };
       osparc.utils.Utils.downloadLink(url, "POST", null, progressCB)
         .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(() => {
-          exportTask.stop();
-        });
+        .finally(() => osparc.task.TasksContainer.getInstance().removeTaskUI(exportTaskUI));
     },
 
     __importStudy: function(file) {
       const uploadingLabel = this.tr("Uploading file");
-      const importTask = new osparc.task.Import();
-      importTask.start();
-      importTask.setSubtitle(uploadingLabel);
+      const importTaskUI = new osparc.task.Import();
+      osparc.task.TasksContainer.getInstance().addTaskUI(importTaskUI);
+      importTaskUI.setSubtitle(uploadingLabel);
 
       const text = this.tr("Importing process started and added to the background tasks");
       osparc.FlashMessenger.logAs(text, "INFO");
@@ -1970,7 +1968,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           if (percentComplete === 100) {
             const processingLabel = this.tr("Processing study");
             importingStudyCard.getChildControl("state-label").setValue(processingLabel);
-            importTask.setSubtitle(processingLabel);
+            importTaskUI.setSubtitle(processingLabel);
             importingStudyCard.getChildControl("progress-bar").exclude();
           }
         } else {
@@ -1982,7 +1980,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         if (req.status == 200) {
           const processingLabel = this.tr("Processing study");
           importingStudyCard.getChildControl("state-label").setValue(processingLabel);
-          importTask.setSubtitle(processingLabel);
+          importTaskUI.setSubtitle(processingLabel);
           importingStudyCard.getChildControl("progress-bar").exclude();
           const data = JSON.parse(req.responseText);
           const params = {
@@ -1994,26 +1992,26 @@ 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(() => {
-              importTask.stop();
+              osparc.task.TasksContainer.getInstance().removeTaskUI(importTaskUI);
               this._resourcesContainer.removeNonResourceCard(importingStudyCard);
             });
         } else if (req.status == 400) {
-          importTask.stop();
+          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
-        importTask.stop();
+        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
-        importTask.stop();
+        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);
@@ -2139,7 +2137,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     __taskDuplicateReceived: function(task, studyName) {
       const duplicateTaskUI = new osparc.task.Duplicate(studyName);
       duplicateTaskUI.setTask(task);
-      duplicateTaskUI.start();
+      osparc.task.TasksContainer.getInstance().addTaskUI(duplicateTaskUI);
       const duplicatingStudyCard = this.__createDuplicateCard(studyName);
       duplicatingStudyCard.setTask(task);
       duplicatingStudyCard.subscribeToFilterGroup("searchBarFilter");
@@ -2152,7 +2150,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         if (msg) {
           osparc.FlashMessenger.logAs(msg, msgLevel);
         }
-        taskUI.stop();
+        osparc.task.TasksContainer.getInstance().removeTaskUI(taskUI);
         this._resourcesContainer.removeNonResourceCard(duplicatingStudyCard);
       };
 

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

@@ -351,7 +351,7 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
         if (msg) {
           osparc.FlashMessenger.logAs(msg, msgLevel);
         }
-        taskUI.stop();
+        osparc.task.TasksContainer.getInstance().removeTaskUI(taskUI);
         this._resourcesContainer.removeNonResourceCard(toTemplateCard);
       };
 
@@ -393,7 +393,7 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
     taskToTemplateReceived: function(task, studyName) {
       const toTemplateTaskUI = new osparc.task.ToTemplate(studyName);
       toTemplateTaskUI.setTask(task);
-      toTemplateTaskUI.start();
+      osparc.task.TasksContainer.getInstance().addTaskUI(toTemplateTaskUI);
       const toTemplateCard = this.__createToTemplateCard(studyName);
       toTemplateCard.setTask(task);
       this.__attachToTemplateEventHandler(task, toTemplateTaskUI, toTemplateCard);

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

@@ -133,16 +133,6 @@ qx.Class.define("osparc.task.TaskUI", {
       }, this);
     },
 
-    start: function() {
-      const tasks = osparc.task.TasksContainer.getInstance();
-      tasks.addTask(this);
-    },
-
-    stop: function() {
-      const tasks = osparc.task.TasksContainer.getInstance();
-      tasks.removeTask(this);
-    },
-
     setIcon: function(source) {
       this.getChildControl("icon").getContentElement().removeClass("rotate");
       this.getChildControl("icon").setSource(source);

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

@@ -39,12 +39,12 @@ qx.Class.define("osparc.task.TasksContainer", {
     __tasks: null,
     __tasksContainer: null,
 
-    addTask: function(task) {
+    addTaskUI: function(task) {
       this.__tasks.push(task);
       this.__tasksContainer.addAt(task, 0);
     },
 
-    removeTask: function(task) {
+    removeTaskUI: function(task) {
       if (this.__tasks.indexOf(task) > -1) {
         this.__tasks.remove(task);
       }