more refactoring

Author: odeimaiz

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

@@ -35,18 +35,14 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
       this._hideLoadingPage();
     },
 
-    reloadResources: function() {
+    reloadResources: function(useCache = true) {
       if (osparc.data.Permissions.getInstance().canDo("studies.templates.read")) {
-        this.__reloadTemplates();
+        this.__reloadTemplates(useCache);
       } else {
         this.__setResourcesToList([]);
       }
     },
 
-    invalidateTemplates: function() {
-      osparc.store.Store.getInstance().invalidate("templates");
-    },
-
     __attachEventHandlers: function() {
       const socket = osparc.wrapper.WebSocket.getInstance();
       socket.on("projectStateUpdated", data => {
@@ -74,15 +70,21 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
       }
     },
 
-    __reloadTemplates: function() {
+    __reloadTemplates: function(useCache) {
       this.__tasksToCards();
 
-      osparc.data.Resources.getInstance().getAllPages("templates")
-        .then(templates => this.__setResourcesToList(templates))
-        .catch(err => {
-          console.error(err);
-          this.__setResourcesToList([]);
-        });
+      const templatesStore = osparc.store.Templates.getInstance();
+      if (useCache) {
+        const templates = templatesStore.getTemplates();
+        this.__setResourcesToList(templates);
+      } else {
+        templatesStore.fetchAllTemplates()
+          .then(templates => this.__setResourcesToList(templates))
+          .catch(err => {
+            console.error(err);
+            this.__setResourcesToList([]);
+          });
+      }
     },
 
     _updateTemplateData: function(templateData) {

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

@@ -158,7 +158,9 @@ qx.Class.define("osparc.desktop.MainPage", {
       this.closeEditor();
       this.__showDashboard();
       // reset templates
-      this.__dashboard.getTemplateBrowser().invalidateTemplates();
+      // OM is this needed?
+      // this.__dashboard.getTemplateBrowser().invalidateTemplates();
+      osparc.store.Templates.getInstance().invalidateTemplates();
       this.__dashboard.getTemplateBrowser().reloadResources();
       // reset studies
       this.__dashboard.getStudyBrowser().invalidateStudies();

services/static-webserver/client/source/class/osparc/info/StudyLarge.js

@@ -310,10 +310,6 @@ qx.Class.define("osparc.info.StudyLarge", {
           studyData["resourceType"] = this.__isTemplate ? "template" : "study";
           this.fireDataEvent("updateStudy", studyData);
           qx.event.message.Bus.getInstance().dispatchByName("updateStudy", studyData);
-          if (this.__isTemplate) {
-            // reload templates
-            osparc.data.Resources.get("templates", {}, false)
-          }
         })
         .catch(err => {
           const msg = this.tr("An issue occurred while updating the information.");

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

@@ -40,6 +40,10 @@ qx.Class.define("osparc.store.Templates", {
         });
     },
 
+    invalidateTemplates: function() {
+      this.__templates = [];
+    },
+
     getTemplates: function() {
       return this.__templates;
     },