promises for templates

Author: odeimaiz

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

@@ -190,28 +190,30 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
     },
 
     __addHypertools: function() {
-      const hypertools = osparc.store.Templates.getInstance().getTemplatesByType(osparc.data.model.StudyUI.HYPERTOOL_TYPE);
-      if (hypertools.length) {
-        const hypertoolsMenuButton = this.self().createMenuButton("@FontAwesome5Solid/star/16", this.tr("Hypertools"));
-        this.addAt(hypertoolsMenuButton, this.__itemIdx);
-        this.__itemIdx++;
-
-        const hypertoolsMenu = new qx.ui.menu.Menu().set({
-          appearance: "menu-wider",
-        });
-        hypertoolsMenuButton.setMenu(hypertoolsMenu);
-
-        hypertools.forEach(templateData => {
-          const hypertoolButton = this.self().createMenuButton(templateData["icon"], templateData["name"]);
-          hypertoolButton.addListener("tap", () => {
-            this.fireDataEvent("newStudyFromTemplateClicked", {
-              templateData,
-              newStudyLabel: templateData["name"],
+      osparc.store.Templates.getTemplatesHypertools()
+        .then(hypertools => {
+          if (hypertools.length) {
+            const hypertoolsMenuButton = this.self().createMenuButton("@FontAwesome5Solid/star/16", this.tr("Hypertools"));
+            this.addAt(hypertoolsMenuButton, this.__itemIdx);
+            this.__itemIdx++;
+
+            const hypertoolsMenu = new qx.ui.menu.Menu().set({
+              appearance: "menu-wider",
             });
-          });
-          hypertoolsMenu.add(hypertoolButton);
+            hypertoolsMenuButton.setMenu(hypertoolsMenu);
+
+            hypertools.forEach(templateData => {
+              const hypertoolButton = this.self().createMenuButton(templateData["icon"], templateData["name"]);
+              hypertoolButton.addListener("tap", () => {
+                this.fireDataEvent("newStudyFromTemplateClicked", {
+                  templateData,
+                  newStudyLabel: templateData["name"],
+                });
+              });
+              hypertoolsMenu.add(hypertoolButton);
+            });
+          }
         });
-      }
     },
 
     __addOtherTabsAccess: function() {
@@ -321,24 +323,26 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
     },
 
     __addFromTemplateButton: function(buttonConfig) {
-      const templates = osparc.store.Templates.getInstance().getTemplates();
-      const menuButton = this.self().createMenuButton(null, buttonConfig["title"]);
-      osparc.utils.Utils.setIdToWidget(menuButton, buttonConfig["idToWidget"]);
-      // disable it until found in templates store
-      menuButton.setEnabled(false);
-
-      let templateMetadata = templates.find(t => t.name === buttonConfig["expectedTemplateLabel"]);
-      if (templateMetadata) {
-        menuButton.setEnabled(true);
-        menuButton.addListener("tap", () => {
-          this.fireDataEvent("newStudyFromTemplateClicked", {
-            templateData: templateMetadata,
-            newStudyLabel: buttonConfig["newStudyLabel"],
-          });
+      osparc.store.Templates.getTemplates()
+        .then(templates => {
+          const menuButton = this.self().createMenuButton(null, buttonConfig["title"]);
+          osparc.utils.Utils.setIdToWidget(menuButton, buttonConfig["idToWidget"]);
+          // disable it until found in templates store
+          menuButton.setEnabled(false);
+
+          let templateMetadata = templates.find(t => t.name === buttonConfig["expectedTemplateLabel"]);
+          if (templateMetadata) {
+            menuButton.setEnabled(true);
+            menuButton.addListener("tap", () => {
+              this.fireDataEvent("newStudyFromTemplateClicked", {
+                templateData: templateMetadata,
+                newStudyLabel: buttonConfig["newStudyLabel"],
+              });
+            });
+            this.__addIcon(menuButton, buttonConfig["icon"], templateMetadata);
+            this.__addFromResourceButton(menuButton, buttonConfig["category"]);
+          }
         });
-        this.__addIcon(menuButton, buttonConfig["icon"], templateMetadata);
-        this.__addFromResourceButton(menuButton, buttonConfig["category"]);
-      }
     },
 
     __addFromServiceButton: function(buttonConfig) {

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

@@ -36,15 +36,17 @@ qx.Class.define("osparc.dashboard.NewStudies", {
     });
     this._add(this.__flatList);
 
-    const templates = osparc.store.Templates.getInstance().getTemplates()
-    this.__newStudies = newButtonsInfo.filter(newButtonInfo => {
-      if (newButtonInfo.showDisabled) {
-        return true;
-      }
-      return templates.find(t => t.name === newButtonInfo.expectedTemplateLabel);
-    });
+    osparc.store.Templates.getTemplates()
+      .then(templates => {
+        this.__newStudies = newButtonsInfo.filter(newButtonInfo => {
+          if (newButtonInfo.showDisabled) {
+            return true;
+          }
+          return templates.find(t => t.name === newButtonInfo.expectedTemplateLabel);
+        });
 
-    this.setGroupBy("category");
+        this.setGroupBy("category");
+      });
   },
 
   properties: {

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

@@ -912,24 +912,26 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         newPlansBtn.setEnabled(true);
 
         newPlansBtn.addListener("tap", () => {
-          const templates = osparc.store.Templates.getInstance().getTemplates();
-          if (templates) {
-            const newStudies = new osparc.dashboard.NewStudies(newStudiesConfig);
-            const winTitle = this.tr("New Plan");
-            const win = osparc.ui.window.Window.popUpInWindow(newStudies, winTitle, osparc.dashboard.NewStudies.WIDTH+40, 300).set({
-              clickAwayClose: false,
-              resizable: true
-            });
-            newStudies.addListener("newStudyClicked", e => {
-              win.close();
-              const templateInfo = e.getData();
-              const templateData = templates.find(t => t.name === templateInfo.expectedTemplateLabel);
-              if (templateData) {
-                this.__newPlanBtnClicked(templateData, templateInfo.newStudyLabel);
+          osparc.store.Templates.getTemplates()
+            .then(templates => {
+              if (templates) {
+                const newStudies = new osparc.dashboard.NewStudies(newStudiesConfig);
+                const winTitle = this.tr("New Plan");
+                const win = osparc.ui.window.Window.popUpInWindow(newStudies, winTitle, osparc.dashboard.NewStudies.WIDTH+40, 300).set({
+                  clickAwayClose: false,
+                  resizable: true
+                });
+                newStudies.addListener("newStudyClicked", e => {
+                  win.close();
+                  const templateInfo = e.getData();
+                  const templateData = templates.find(t => t.name === templateInfo.expectedTemplateLabel);
+                  if (templateData) {
+                    this.__newPlanBtnClicked(templateData, templateInfo.newStudyLabel);
+                  }
+                });
+                osparc.utils.Utils.setIdToWidget(win, "newStudiesWindow");
               }
             });
-            osparc.utils.Utils.setIdToWidget(win, "newStudiesWindow");
-          }
         });
       }
     },

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

@@ -36,7 +36,7 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
       }
       this._resourcesInitialized = true;
 
-      osparc.store.Templates.getInstance().fetchAllTemplates()
+      osparc.store.Templates.fetchAllTemplates()
         .then(() => {
           this._resourcesList = [];
           this.getChildControl("resources-layout");
@@ -84,17 +84,13 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
     __reloadTemplates: function(useCache) {
       this.__tasksToCards();
 
-      const templatesStore = osparc.store.Templates.getInstance();
       if (useCache) {
-        const templates = templatesStore.getTemplates();
-        this.__setResourcesToList(templates);
+        osparc.store.Templates.getTemplates()
+          .then(templates => this.__setResourcesToList(templates));
       } else {
-        templatesStore.fetchAllTemplates()
+        osparc.store.Templates.fetchAllTemplates()
           .then(templates => this.__setResourcesToList(templates))
-          .catch(err => {
-            console.error(err);
-            this.__setResourcesToList([]);
-          });
+          .catch(() => this.__setResourcesToList([]));
       }
     },
 

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

@@ -86,14 +86,16 @@ qx.Class.define("osparc.desktop.organizations.TemplatesList", {
           item.subscribeToFilterGroup("organizationTemplatesList");
           item.addListener("openMoreInfo", e => {
             const templateId = e.getData()["key"];
-            const templateData = osparc.store.Templates.getInstance().getTemplate(templateId);
-            if (templateData) {
-              templateData["resourceType"] = "template";
-              const resourceDetails = new osparc.dashboard.ResourceDetails(templateData).set({
-                showOpenButton: false
+            osparc.store.Templates.getTemplate(templateId)
+              .then(templateData => {
+                if (templateData) {
+                  templateData["resourceType"] = "template";
+                  const resourceDetails = new osparc.dashboard.ResourceDetails(templateData).set({
+                    showOpenButton: false
+                  });
+                  osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+                }
               });
-              osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
-            }
           });
         }
       });
@@ -110,14 +112,16 @@ qx.Class.define("osparc.desktop.organizations.TemplatesList", {
         return;
       }
 
-      const groupId = orgModel.getGroupId();
-      const templates = osparc.store.Templates.getInstance().getTemplates();
-      const orgTemplates = templates.filter(template => groupId in template["accessRights"]);
-      orgTemplates.forEach(orgTemplate => {
-        const orgTemplateCopy = osparc.utils.Utils.deepCloneObject(orgTemplate);
-        orgTemplateCopy["orgId"] = groupId;
-        templatesModel.append(qx.data.marshal.Json.createModel(orgTemplateCopy));
-      });
+      osparc.store.Templates.getTemplates()
+        .then(templates => {
+          const groupId = orgModel.getGroupId();
+          const orgTemplates = templates.filter(template => groupId in template["accessRights"]);
+          orgTemplates.forEach(orgTemplate => {
+            const orgTemplateCopy = osparc.utils.Utils.deepCloneObject(orgTemplate);
+            orgTemplateCopy["orgId"] = groupId;
+            templatesModel.append(qx.data.marshal.Json.createModel(orgTemplateCopy));
+          });
+        });
     }
   }
 });

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

@@ -16,40 +16,46 @@
 ************************************************************************ */
 
 qx.Class.define("osparc.store.Templates", {
-  extend: qx.core.Object,
-  type: "singleton",
+  type: "static",
 
-  construct: function() {
-    this.base(arguments);
-
-    this.__templates = [];
-  },
-
-  members: {
-    __templates: null,
+  statics: {
+    __templatesCached: [],
+    __templatesPromisesCached: null,
 
     fetchAllTemplates: function() {
-      if (this.__templates.length) {
-        return new Promise(resolve => resolve(this.__templates));
-      }
-
-      return osparc.data.Resources.getInstance().getAllPages("templates")
+      return this.__templatesPromisesCached = osparc.data.Resources.getInstance().getAllPages("templates")
         .then(templates => {
           this.__templates = templates;
           return templates;
+        })
+        .catch(err => {
+          osparc.FlashMessenger.logError(err);
+        })
+        .finally(() => {
+          this.__templatesPromisesCached = null;
         });
     },
 
     getTemplates: function() {
-      return this.__templates;
+      if (this.__templatesPromisesCached) {
+        return this.__templatesPromisesCached;
+      }
+
+      return new Promise(resolve => resolve(this.__templates));
     },
 
-    getTemplatesByType: function(type) {
-      return this.__templates.filter(t => osparc.study.Utils.extractTemplateType(t) === type);
+    getTemplatesHypertools: function() {
+      return this.getTemplates()
+        .then(templates => {
+          return templates.filter(t => osparc.study.Utils.extractTemplateType(t) === osparc.data.model.StudyUI.HYPERTOOL_TYPE);
+        });
     },
 
     getTemplate: function(templateId) {
-      return this.__templates.find(t => t.uuid === templateId);
+      return this.getTemplates()
+        .then(templates => {
+          return templates.find(t => t.uuid === templateId);
+        });
     },
   }
 });