refactor

Author: odeimaiz

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

@@ -482,6 +482,54 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
       }
     },
 
+    taskToTemplateReceived: function(task, studyName, templateType) {
+      const toTemplateTaskUI = new osparc.task.ToTemplate(studyName);
+      toTemplateTaskUI.setTask(task);
+
+      osparc.task.TasksContainer.getInstance().addTaskUI(toTemplateTaskUI);
+
+      const cardTitle = this.tr("Publishing ") + studyName;
+      const toTemplateCard = this._addTaskCard(task, cardTitle, osparc.task.ToTemplate.ICON);
+      if (toTemplateCard) {
+        this.__attachToTemplateEventHandler(task, toTemplateCard, templateType);
+      }
+    },
+
+    __attachToTemplateEventHandler: function(task, toTemplateCard, templateType) {
+      const finished = () => {
+        this._resourcesContainer.removeNonResourceCard(toTemplateCard);
+      };
+
+      task.addListener("updateReceived", e => {
+        const updateData = e.getData();
+        if ("task_progress" in updateData && toTemplateCard) {
+          const taskProgress = updateData["task_progress"];
+          toTemplateCard.getChildControl("progress-bar").set({
+            value: osparc.data.PollTask.extractProgress(updateData) * 100
+          });
+          toTemplateCard.getChildControl("state-label").set({
+            value: taskProgress["message"]
+          });
+        }
+      }, this);
+      task.addListener("resultReceived", e => {
+        finished();
+        this.reloadResources();
+        const msg = templateType + this.tr(" created");
+        osparc.FlashMessenger.logAs(msg, "INFO");
+      });
+      task.addListener("taskAborted", () => {
+        finished();
+        const msg = this.tr("Study to Template cancelled");
+        osparc.FlashMessenger.logAs(msg, "WARNING");
+      });
+      task.addListener("pollingError", e => {
+        finished();
+        const err = e.getData();
+        osparc.FlashMessenger.logError(err);
+      });
+    },
+
     _addTaskCard: function(task, cardTitle, cardIcon) {
       if (!this._resourcesContainer) {
         return null;

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

@@ -355,54 +355,6 @@ qx.Class.define("osparc.dashboard.TutorialBrowser", {
         this.taskToTemplateReceived(task, studyName);
       });
     },
-
-    taskToTemplateReceived: function(task, studyName) {
-      const toTemplateTaskUI = new osparc.task.ToTemplate(studyName);
-      toTemplateTaskUI.setTask(task);
-
-      osparc.task.TasksContainer.getInstance().addTaskUI(toTemplateTaskUI);
-
-      const cardTitle = this.tr("Publishing ") + studyName;
-      const toTemplateCard = this._addTaskCard(task, cardTitle, osparc.task.ToTemplate.ICON);
-      if (toTemplateCard) {
-        this.__attachToTemplateEventHandler(task, toTemplateCard);
-      }
-    },
-
-    __attachToTemplateEventHandler: function(task, toTemplateCard) {
-      const finished = () => {
-        this._resourcesContainer.removeNonResourceCard(toTemplateCard);
-      };
-
-      task.addListener("updateReceived", e => {
-        const updateData = e.getData();
-        if ("task_progress" in updateData && toTemplateCard) {
-          const taskProgress = updateData["task_progress"];
-          toTemplateCard.getChildControl("progress-bar").set({
-            value: osparc.data.PollTask.extractProgress(updateData) * 100
-          });
-          toTemplateCard.getChildControl("state-label").set({
-            value: taskProgress["message"]
-          });
-        }
-      }, this);
-      task.addListener("resultReceived", e => {
-        finished();
-        this.reloadResources();
-        const msg = this.tr("Tutorial created");
-        osparc.FlashMessenger.logAs(msg, "INFO");
-      });
-      task.addListener("taskAborted", () => {
-        finished();
-        const msg = this.tr("Study to Tutorial cancelled");
-        osparc.FlashMessenger.logAs(msg, "WARNING");
-      });
-      task.addListener("pollingError", e => {
-        finished();
-        const err = e.getData();
-        osparc.FlashMessenger.logError(err);
-      });
-    },
     // TASKS //
   }
 });

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

@@ -249,9 +249,12 @@ qx.Class.define("osparc.desktop.MainPage", {
       pollTasks.createPollingTask(fetchPromise)
         .then(task => {
           const tutorialBrowser = this.__dashboard.getTutorialBrowser();
+          if (tutorialBrowser && templateType === osparc.data.model.StudyUI.TUTORIAL_TYPE) {
+            tutorialBrowser.taskToTemplateReceived(task, studyName, templateType);
+          }
           const appBrowser = this.__dashboard.getAppBrowser();
-          if (tutorialBrowser) {
-            tutorialBrowser.taskToTemplateReceived(task, studyName);
+          if (appBrowser && templateType === osparc.data.model.StudyUI.HYPERTOOL_TYPE) {
+            appBrowser.taskToTemplateReceived(task, studyName, templateType);
           }
           task.addListener("resultReceived", e => {
             const templateData = e.getData();