Fixed cached classifiers (#1755)

* fixed replicated classifiers cache

Author: odeimaiz

services/web/client/source/class/osparc/component/export/Permissions.js

@@ -37,19 +37,19 @@ qx.Class.define("osparc.component.export.Permissions", {
   statics: {
     canDelete: function(accessRights) {
       let canDelete = accessRights.getDelete ? accessRights.getDelete() : false;
-      canDelete = !canDelete && accessRights.getWrite_access ? accessRights.getWrite_access() : false;
+      canDelete = canDelete || (accessRights.getWrite_access ? accessRights.getWrite_access() : false);
       return canDelete;
     },
 
     canWrite: function(accessRights) {
       let canWrite = accessRights.getWrite ? accessRights.getWrite() : false;
-      canWrite = !canWrite && accessRights.getWrite_access ? accessRights.getWrite_access() : false;
+      canWrite = canWrite || (accessRights.getWrite_access ? accessRights.getWrite_access() : false);
       return canWrite;
     },
 
     canView: function(accessRights) {
       let canView = accessRights.getRead ? accessRights.getRead() : false;
-      canView = !canView && accessRights.getExecute_access ? accessRights.getExecute_access() : false;
+      canView = canView || (accessRights.getExecute_access ? accessRights.getExecute_access() : false);
       return canView;
     }
   },

services/web/client/source/class/osparc/data/Resources.js

@@ -192,7 +192,7 @@ qx.Class.define("osparc.data.Resources", {
        * GROUPS/DAGS
        */
       "dags": {
-        usesCache: true,
+        useCache: true,
         idField: "key",
         endpoints: {
           post: {
@@ -342,7 +342,7 @@ qx.Class.define("osparc.data.Resources", {
        * Gets the json object containing sample classifiers
        */
       "classifiers": {
-        useCache: true,
+        useCache: false,
         idField: "classifiers",
         endpoints: {
           get: {

services/web/client/source/class/osparc/store/Store.js

@@ -115,8 +115,8 @@ qx.Class.define("osparc.store.Store", {
       init: {}
     },
     classifiers: {
-      check: "Object",
-      init: {}
+      check: "Array",
+      init: []
     }
   },
 
@@ -460,6 +460,55 @@ qx.Class.define("osparc.store.Store", {
       });
     },
 
+    __getOrgClassifiers: function(orgId) {
+      const params = {
+        url: {
+          "gid": orgId
+        }
+      };
+      return osparc.data.Resources.get("classifiers", params);
+    },
+
+    getAllClassifiers: function(reload = false) {
+      return new Promise((resolve, reject) => {
+        const oldClassifiers = this.getClassifiers();
+        if (!reload && oldClassifiers.length) {
+          resolve(oldClassifiers);
+          return;
+        }
+        osparc.store.Store.getInstance().getGroupsOrganizations()
+          .then(orgs => {
+            const allClassifiers = [];
+            if (orgs.length === 0) {
+              this.setClassifiers(allClassifiers);
+              resolve(allClassifiers);
+              return;
+            }
+            const classifierPromises = [];
+            orgs.forEach(org => {
+              classifierPromises.push(this.__getOrgClassifiers(org["gid"]));
+            });
+            Promise.all(classifierPromises)
+              .then(classifierss => {
+                if (classifierss.length === 0) {
+                  this.setClassifiers(allClassifiers);
+                  resolve(allClassifiers);
+                  return;
+                }
+                classifierss.forEach(({classifiers}) => {
+                  if (classifiers) {
+                    Object.keys(classifiers).forEach(key => {
+                      allClassifiers.push(classifiers[key]);
+                    });
+                  }
+                });
+                this.setClassifiers(allClassifiers);
+                resolve(allClassifiers);
+              });
+          });
+      });
+    },
+
     _applyStudy: function(newStudy) {
       if (newStudy) {
         this.setCurrentStudyId(newStudy.getStudyId());

services/web/client/source/class/osparc/utils/Classifiers.js

@@ -30,38 +30,16 @@ qx.Class.define("osparc.utils.Classifiers", {
           label: "root",
           children: []
         };
-        osparc.store.Store.getInstance().getGroupsOrganizations()
-          .then(orgs => {
-            if (orgs.length === 0) {
-              reject();
-              return;
+        osparc.store.Store.getInstance().getAllClassifiers()
+          .then(classifiers => {
+            const keys = Object.keys(classifiers);
+            if (keys.length) {
+              // Tree-ify
+              const tree = {};
+              keys.forEach(key => this.__buildTree(classifiers, key, classifiers[key].classifier.split("::"), tree));
+              rootData.children.push(...this.__virtualTree(tree));
             }
-            const classifierPromises = [];
-            orgs.forEach(org => {
-              const params = {
-                url: {
-                  "gid": org["gid"]
-                }
-              };
-              classifierPromises.push(osparc.data.Resources.get("classifiers", params));
-            });
-            Promise.all(classifierPromises)
-              .then(classifierss => {
-                if (classifierss.length === 0) {
-                  reject();
-                  return;
-                }
-                classifierss.forEach(({classifiers}) => {
-                  const keys = Object.keys(classifiers);
-                  if (keys.length) {
-                    // Tree-ify
-                    const tree = {};
-                    keys.forEach(key => this.__buildTree(classifiers, key, classifiers[key].classifier.split("::"), tree));
-                    rootData.children.push(...this.__virtualTree(tree));
-                  }
-                });
-                resolve(rootData);
-              });
+            resolve(rootData);
           });
       });
     },