cache hypertools and tutorials only

Author: odeimaiz

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

@@ -65,6 +65,8 @@ qx.Class.define("osparc.dashboard.TutorialBrowser", {
     },
 
     __tutorialStateReceived: function(templateId, state, errors) {
+      osparc.store.Templates.getTutorials()
+      // OM
       const idx = this._resourcesList.findIndex(study => study["uuid"] === templateId);
       if (idx > -1) {
         this._resourcesList[idx]["state"] = state;

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

@@ -86,7 +86,7 @@ qx.Class.define("osparc.desktop.organizations.TutorialsList", {
           item.subscribeToFilterGroup("organizationTutorialsList");
           item.addListener("openMoreInfo", e => {
             const templateId = e.getData()["key"];
-            osparc.store.Templates.getTemplate(templateId)
+            osparc.store.Templates.getTutorial(templateId)
               .then(templateData => {
                 if (templateData) {
                   templateData["resourceType"] = "template";

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

@@ -466,14 +466,6 @@ qx.Class.define("osparc.store.Store", {
       });
     },
 
-    setTemplateState: function(templateId, state) {
-      const templatesWStateCache = this.getTemplates();
-      const idx = templatesWStateCache.findIndex(templateWStateCache => templateWStateCache["uuid"] === templateId);
-      if (idx !== -1) {
-        templatesWStateCache[idx]["state"] = state;
-      }
-    },
-
     trashStudy: function(studyId) {
       const params = {
         url: {
@@ -511,11 +503,6 @@ qx.Class.define("osparc.store.Store", {
       });
     },
 
-    getTemplate: function(templateId) {
-      const templates = this.getTemplates();
-      return templates.find(template => template["uuid"] === templateId);
-    },
-
     deleteStudy: function(studyId) {
       const params = {
         url: {

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

@@ -19,107 +19,107 @@ qx.Class.define("osparc.store.Templates", {
   type: "static",
 
   statics: {
-    __templates: null,
-    __templatesPromisesCached: null,
     __tutorials: null,
-    __tutorialsPromisesCached: null,
+    __tutorialsPromiseCached: null,
     __hypertools: null,
-    __hypertoolsPromisesCached: null,
+    __hypertoolsPromiseCached: null,
 
     __fetchTemplatesPaginated: function(params, options) {
+      params["url"]["templateType"] = osparc.data.model.StudyUI.TEMPLATE_TYPE;
       return osparc.data.Resources.fetch("templates", "getPageFilteredSorted", params, options)
-        .then(resp => {
-          const templates = resp.data;
-          // add them to the list
-          if (this.__templates) {
-            templates.forEach(template => {
-              const index = this.__templates.findIndex(t => t.uuid === template.uuid);
-              if (index === -1) {
-                this.__templates.push(template);
-              } else {
-                this.__templates[index] = template;
-              }
-            });
-          }
-          return resp;
-        })
         .catch(err => osparc.FlashMessenger.logError(err));
     },
 
     fetchTemplatesNonPublicPaginated: function(params, options) {
-      params["url"]["templateType"] = osparc.data.model.StudyUI.TEMPLATE_TYPE;
       return this.__fetchTemplatesPaginated(params, options);
     },
 
     fetchTemplatesPublicPaginated: function(params, options) {
-      params["url"]["templateType"] = osparc.data.model.StudyUI.TEMPLATE_TYPE;
       return this.__fetchTemplatesPaginated(params, options);
     },
 
-    __fetchAllTemplates: function() {
-      return this.__templatesPromisesCached = osparc.data.Resources.getInstance().getAllPages("templates")
-        .then(templates => {
-          this.__templates = templates;
-          return templates;
+    __fetchAllTutorials: function(params) {
+      params["url"]["templateType"] = osparc.data.model.StudyUI.TUTORIAL_TYPE;
+      return this.__tutorialsPromiseCached = osparc.data.Resources.getInstance().getAllPages("templates", params, "getPageFilteredSorted")
+        .then(tutorials => {
+          this.__tutorials = tutorials;
+          return tutorials;
         })
         .catch(err => {
           osparc.FlashMessenger.logError(err);
         })
         .finally(() => {
-          this.__templatesPromisesCached = null;
+          this.__tutorialsPromiseCached = null;
         });
     },
 
-    getTemplates: function(useCache = true) {
-      if (this.__templatesPromisesCached) {
-        // fetching templates already in progress
-        return this.__templatesPromisesCached;
-      }
-
-      if (this.__templates === null) {
-        // no templates cached, fetch them
-        return this.__fetchAllTemplates();
-      }
-
-      if (useCache) {
-        // templates already cached, return them
-        return new Promise(resolve => resolve(this.__templates));
-      }
-      // templates cached but force a refresh
-      return this.__fetchAllTemplates();
+    __fetchAllHypertools: function(params) {
+      params["url"]["templateType"] = osparc.data.model.StudyUI.HYPERTOOL_TYPE;
+      return this.__hypertoolsPromiseCached = osparc.data.Resources.getInstance().getAllPages("templates", params, "getPageFilteredSorted")
+        .then(hypertools => {
+          this.__hypertools = hypertools;
+          return hypertools;
+        })
+        .catch(err => {
+          osparc.FlashMessenger.logError(err);
+        })
+        .finally(() => {
+          this.__hypertoolsPromiseCached = null;
+        });
     },
 
-    getTutorials: function() {
+    getTutorials: function(useCache = true) {
       const params = {
         url: {
-          "templateType": osparc.data.model.StudyUI.TUTORIAL_TYPE,
           "orderBy": JSON.stringify({
             field: "last_change_date",
             direction: "desc"
           }),
         }
       };
-      return osparc.data.Resources.getInstance().getAllPages("templates", params, "getPageFilteredSorted");
+
+      if (this.__tutorialsPromiseCached) {
+        return this.__tutorialsPromiseCached;
+      }
+
+      if (this.__tutorials === null) {
+        // no tutorials cached, fetch them
+        return this.__fetchAllTutorials(params);
+      }
+
+      if (useCache) {
+        // tutorials already cached, return them
+        return new Promise(resolve => resolve(this.__tutorials));
+      }
+
+      return this.__fetchAllTutorials(params);
     },
 
-    getHypertools: function() {
+    getHypertools: function(useCache = true) {
       const params = {
         url: {
-          "templateType": osparc.data.model.StudyUI.HYPERTOOL_TYPE,
           "orderBy": JSON.stringify({
             field: "last_change_date",
             direction: "desc"
           }),
         }
       };
-      return osparc.data.Resources.getInstance().getAllPages("templates", params, "getPageFilteredSorted");
-    },
 
-    getTemplate: function(templateId) {
-      return this.getTemplates()
-        .then(templates => {
-          return templates.find(t => t.uuid === templateId);
-        });
+      if (this.__hypertoolsPromiseCached) {
+        return this.__hypertoolsPromiseCached;
+      }
+
+      if (this.__hypertools === null) {
+        // no hypertools cached, fetch them
+        return this.__fetchAllHypertools(params);
+      }
+
+      if (useCache) {
+        // hypertools already cached, return them
+        return new Promise(resolve => resolve(this.__hypertools));
+      }
+
+      return this.__fetchAllHypertools(params);
     },
   }
 });