Merge branch 'master' into enh/request-services-access

Author: mergify[bot]

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

@@ -845,7 +845,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
     },
 
     __getCreateFunctionsPage: function() {
-      if (osparc.utils.DisabledPlugins.isFunctionsDisabled()) {
+      if (!osparc.data.Permissions.getInstance().checkFunctionPermissions("writeFunctions")) {
         return null;
       }
 

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

@@ -192,6 +192,9 @@ qx.Class.define("osparc.data.Permissions", {
   },
 
   members: {
+    __permissions: null,
+    __functionPermissions: null,
+
     arePermissionsReady() {
       return this.getRole() !== null;
     },
@@ -276,19 +279,44 @@ qx.Class.define("osparc.data.Permissions", {
       return canDo;
     },
 
-    checkCanDo: function(action) {
-      return new Promise((resolve, reject) => {
-        osparc.data.Resources.get("permissions")
-          .then(permissions => {
-            const found = permissions.find(permission => permission["name"] === action);
-            if (found) {
-              resolve(found["allowed"]);
-            } else {
-              resolve(false);
-            }
-          })
-          .catch(err => reject(err));
-      });
+    fetchPermissions: function() {
+      osparc.data.Resources.get("permissions")
+        .then(permissions => {
+          this.__permissions = permissions;
+        })
+        .catch(err => console.error(err));
+    },
+
+    checkMyGroupCanDo: function(action) {
+      if (this.__permissions) {
+        const found = this.__permissions.find(permission => permission["name"] === action);
+        if (found) {
+          return found["allowed"];
+        }
+      }
+      return false;
+    },
+
+    fetchFunctionPermissions: function() {
+      osparc.data.Resources.get("functionPermissions")
+        .then(functionPermissions => {
+          this.__functionPermissions = functionPermissions;
+        })
+        .catch(err => console.error(err));
+    },
+
+    checkFunctionPermissions: function(action) {
+      if (osparc.utils.DisabledPlugins.isFunctionsDisabled()) {
+        return false;
+      }
+
+      if (
+        this.__functionPermissions &&
+        action in this.__functionPermissions
+      ) {
+        return this.__functionPermissions[action];
+      }
+      return false;
     },
 
     isTester: function() {

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

@@ -837,6 +837,18 @@ qx.Class.define("osparc.data.Resources", {
           }
         }
       },
+      /*
+       * FUNCTION PERMISSIONS
+       */
+      "functionPermissions": {
+        useCache: true,
+        endpoints: {
+          get: {
+            method: "GET",
+            url: statics.API + "/me/function-permissions"
+          }
+        }
+      },
       /*
        * API-KEYS
        */

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

@@ -70,6 +70,8 @@ qx.Class.define("osparc.desktop.MainPage", {
     preloadPromises.push(osparc.store.Products.getInstance().fetchUiConfig());
     preloadPromises.push(osparc.store.PollTasks.getInstance().fetchTasks());
     preloadPromises.push(osparc.store.Jobs.getInstance().fetchJobsLatest());
+    preloadPromises.push(osparc.data.Permissions.getInstance().fetchPermissions());
+    preloadPromises.push(osparc.data.Permissions.getInstance().fetchFunctionPermissions());
     Promise.all(preloadPromises)
       .then(() => {
         const mainStack = this.__createMainStack();

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

@@ -1090,8 +1090,6 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
       }
 
       const nodeOptions = new osparc.widget.NodeOptions(node);
-      nodeOptions.buildLayout();
-
       return nodeOptions;
     },
 

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

@@ -178,6 +178,10 @@ qx.Class.define("osparc.store.Store", {
       check: "Array",
       init: []
     },
+    functionPermissions: {
+      check: "Object",
+      init: {}
+    },
     apiKeys: {
       check: "Array",
       init: []

services/static-webserver/client/source/class/osparc/widget/NodeOptions.js

@@ -36,7 +36,8 @@ qx.Class.define("osparc.widget.NodeOptions", {
   properties: {
     node: {
       check: "osparc.data.model.Node",
-      nullable: false
+      nullable: false,
+      apply: "__buildLayout",
     }
   },
 
@@ -46,7 +47,7 @@ qx.Class.define("osparc.widget.NodeOptions", {
       this.show();
     },
 
-    buildLayout: async function() {
+    __buildLayout: function() {
       const node = this.getNode();
 
       const sections = [];
@@ -83,7 +84,7 @@ qx.Class.define("osparc.widget.NodeOptions", {
 
       // Update Resource Limits
       if (
-        await osparc.data.Permissions.getInstance().checkCanDo("override_services_specifications") &&
+        osparc.data.Permissions.getInstance().checkMyGroupCanDo("override_services_specifications") &&
         (node.isComputational() || node.isDynamic())
       ) {
         const updateResourceLimitsView = new osparc.node.UpdateResourceLimitsView(node);