refactor

Author: odeimaiz

services/static-webserver/client/source/class/osparc/Application.js

@@ -569,7 +569,7 @@ qx.Class.define("osparc.Application", {
     },
 
     __closeAllAndToLoginPage: function() {
-      osparc.data.PollTasks.getInstance().removeTasks();
+      osparc.store.PollTasks.getInstance().removeTasks();
       osparc.MaintenanceTracker.getInstance().stopTracker();
       osparc.CookieExpirationTracker.getInstance().stopTracker();
       osparc.NewUITracker.getInstance().stopTracker();

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

@@ -251,12 +251,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         return;
       }
 
-      osparc.data.Resources.get("tasks")
-        .then(tasks => {
-          if (tasks && tasks.length) {
-            this.__tasksReceived(tasks);
-          }
-        });
+      const tasks = osparc.store.PollTasks.getInstance().getTasks();
+      this.__tasksToCards(tasks);
 
       this._loadingResourcesBtn.setFetching(true);
       this._loadingResourcesBtn.setVisibility("visible");
@@ -1915,7 +1911,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       };
       const fetchPromise = osparc.data.Resources.fetch("studies", "duplicate", params, options);
       const interval = 1000;
-      const pollTasks = osparc.data.PollTasks.getInstance();
+      const pollTasks = osparc.store.PollTasks.getInstance();
       pollTasks.createPollingTask(fetchPromise, interval)
         .then(task => this.__taskDuplicateReceived(task, studyData["name"]))
         .catch(err => osparc.FlashMessenger.logError(err, this.tr("Something went wrong while duplicating")));
@@ -2133,23 +2129,14 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     },
 
     // TASKS //
-    __tasksReceived: function(tasks) {
-      tasks.forEach(taskData => this._taskDataReceived(taskData));
-    },
-
-    _taskDataReceived: function(taskData) {
-      // a bit hacky
-      if (taskData["task_id"].includes("from_study") && !taskData["task_id"].includes("as_template")) {
-        const interval = 1000;
-        const pollTasks = osparc.data.PollTasks.getInstance();
-        const task = pollTasks.addTask(taskData, interval);
-        if (task === null) {
-          return;
+    __tasksToCards: function(tasks) {
+      tasks.forEach(task => {
+        if (task.getTaskId().includes("from_study") && !task.getTaskId().includes("as_template")) {
+          // duplicating
+          const studyName = "";
+          this.__taskDuplicateReceived(task, studyName);
         }
-        // ask backend for studyData?
-        const studyName = "";
-        this.__taskDuplicateReceived(task, studyName);
-      }
+      });
     },
 
     __taskDuplicateReceived: function(task, studyName) {

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

@@ -75,6 +75,9 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
     },
 
     __reloadTemplates: function() {
+      const tasks = osparc.store.PollTasks.getInstance().getTasks();
+      this.__tasksToCards(tasks);
+
       osparc.data.Resources.getInstance().getAllPages("templates")
         .then(templates => this.__setResourcesToList(templates))
         .catch(err => {
@@ -380,19 +383,14 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
       });
     },
 
-    _taskDataReceived: function(taskData) {
-      // a bit hacky
-      if (taskData["task_id"].includes("from_study") && taskData["task_id"].includes("as_template")) {
-        const interval = 1000;
-        const pollTasks = osparc.data.PollTasks.getInstance();
-        const task = pollTasks.addTask(taskData, interval);
-        if (task === null) {
-          return;
+    __tasksToCards: function(tasks) {
+      tasks.forEach(task => {
+        if (task.getTaskId().includes("from_study") && task.getTaskId().includes("as_template")) {
+          // creating template
+          const studyName = "";
+          this.taskToTemplateReceived(task, studyName);
         }
-        // ask backend for studyData?
-        const studyName = "";
-        this.taskToTemplateReceived(task, studyName);
-      }
+      });
     },
 
     taskToTemplateReceived: function(task, studyName) {

services/static-webserver/client/source/class/osparc/data/Resources.js

@@ -553,7 +553,6 @@ qx.Class.define("osparc.data.Resources", {
        */
       "tasks": {
         useCache: false,
-        idField: "id",
         endpoints: {
           get: {
             method: "GET",

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

@@ -68,6 +68,7 @@ qx.Class.define("osparc.desktop.MainPage", {
     preloadPromises.push(store.getAllClassifiers(true));
     preloadPromises.push(osparc.store.Tags.getInstance().fetchTags());
     preloadPromises.push(osparc.store.Products.getInstance().fetchUiConfig());
+    preloadPromises.push(osparc.store.PollTasks.getInstance().fetchTasks());
     Promise.all(preloadPromises)
       .then(() => {
         const mainStack = this.__createMainStack();
@@ -232,7 +233,7 @@ qx.Class.define("osparc.desktop.MainPage", {
         pollTask: true
       };
       const fetchPromise = osparc.data.Resources.fetch("studies", "postToTemplate", params, options);
-      const pollTasks = osparc.data.PollTasks.getInstance();
+      const pollTasks = osparc.store.PollTasks.getInstance();
       const interval = 1000;
       pollTasks.createPollingTask(fetchPromise, interval)
         .then(task => {

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

@@ -62,6 +62,8 @@ qx.Class.define("osparc.desktop.MainPageDesktop", {
     }
     preloadPromises.push(store.getAllClassifiers(true));
     preloadPromises.push(osparc.store.Tags.getInstance().fetchTags());
+    preloadPromises.push(osparc.store.Products.getInstance().fetchUiConfig());
+    preloadPromises.push(osparc.store.PollTasks.getInstance().fetchTasks());
     Promise.all(preloadPromises)
       .then(() => {
         const desktopCenter = new osparc.desktop.credits.DesktopCenter();

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

@@ -15,7 +15,7 @@
 
 ************************************************************************ */
 
-qx.Class.define("osparc.data.PollTasks", {
+qx.Class.define("osparc.store.PollTasks", {
   extend: qx.core.Object,
   type: "singleton",
 
@@ -33,7 +33,18 @@ qx.Class.define("osparc.data.PollTasks", {
   },
 
   members: {
-    addTask: function(taskData, interval) {
+    fetchTasks: function() {
+      return osparc.data.Resources.get("tasks")
+        .then(tasksData => {
+          tasksData.forEach(taskData => {
+            const interval = 1000;
+            this.addTask(taskData, interval);
+          });
+        })
+        .catch(err => console.error(err));
+    },
+
+    addTask: function(taskData, interval = 1000) {
       const tasks = this.getTasks();
       const index = tasks.findIndex(t => t.getTaskId() === taskData["task_id"]);
       if (index === -1) {

services/static-webserver/client/source/class/osparc/study/Utils.js

@@ -162,7 +162,7 @@ qx.Class.define("osparc.study.Utils", {
           pollTask: true
         };
         const fetchPromise = osparc.data.Resources.fetch("studies", "postNewStudy", params, options);
-        const pollTasks = osparc.data.PollTasks.getInstance();
+        const pollTasks = osparc.store.PollTasks.getInstance();
         const interval = 1000;
         pollTasks.createPollingTask(fetchPromise, interval)
           .then(task => {
@@ -206,7 +206,7 @@ qx.Class.define("osparc.study.Utils", {
               pollTask: true
             };
             const fetchPromise = osparc.data.Resources.fetch("studies", "postNewStudyFromTemplate", params, options);
-            const pollTasks = osparc.data.PollTasks.getInstance();
+            const pollTasks = osparc.store.PollTasks.getInstance();
             const interval = 1000;
             pollTasks.createPollingTask(fetchPromise, interval)
               .then(task => {