refactor

Author: odeimaiz

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

@@ -251,8 +251,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         return;
       }
 
-      const tasks = osparc.store.PollTasks.getInstance().getTasks();
-      this.__tasksToCards(tasks);
+      this.__tasksToCards();
 
       this._loadingResourcesBtn.setFetching(true);
       this._loadingResourcesBtn.setVisibility("visible");
@@ -2129,13 +2128,11 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     },
 
     // TASKS //
-    __tasksToCards: function(tasks) {
+    __tasksToCards: function() {
+      const tasks = osparc.store.PollTasks.getInstance().getDuplicateStudyTasks();
       tasks.forEach(task => {
-        if (task.getTaskId().includes("from_study") && !task.getTaskId().includes("as_template")) {
-          // duplicating
-          const studyName = "";
-          this.__taskDuplicateReceived(task, studyName);
-        }
+        const studyName = "";
+        this.__taskDuplicateReceived(task, studyName);
       });
     },
 

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

@@ -75,8 +75,7 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
     },
 
     __reloadTemplates: function() {
-      const tasks = osparc.store.PollTasks.getInstance().getTasks();
-      this.__tasksToCards(tasks);
+      this.__tasksToCards();
 
       osparc.data.Resources.getInstance().getAllPages("templates")
         .then(templates => this.__setResourcesToList(templates))
@@ -383,13 +382,11 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
       });
     },
 
-    __tasksToCards: function(tasks) {
+    __tasksToCards: function() {
+      const tasks = osparc.store.PollTasks.getInstance().getPublishTemplateTasks();
       tasks.forEach(task => {
-        if (task.getTaskId().includes("from_study") && task.getTaskId().includes("as_template")) {
-          // creating template
-          const studyName = "";
-          this.taskToTemplateReceived(task, studyName);
-        }
+        const studyName = "";
+        this.taskToTemplateReceived(task, studyName);
       });
     },
 

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

@@ -19,10 +19,6 @@ qx.Class.define("osparc.store.PollTasks", {
   extend: qx.core.Object,
   type: "singleton",
 
-  construct: function() {
-    this.initTasks();
-  },
-
   properties: {
     tasks: {
       check: "Array",
@@ -73,6 +69,14 @@ qx.Class.define("osparc.store.PollTasks", {
     removeTasks: function() {
       const tasks = this.getTasks();
       tasks.forEach(task => task.dispose());
-    }
+    },
+
+    getDuplicateStudyTasks: function() {
+      return this.getTasks().filter(task => task.getTaskId().includes("from_study") && !task.getTaskId().includes("as_template"));
+    },
+
+    getPublishTemplateTasks: function() {
+      return this.getTasks().filter(task => task.getTaskId().includes("from_study") && task.getTaskId().includes("as_template"));
+    },
   }
 });