patchAccessRights

Author: odeimaiz

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

@@ -331,19 +331,11 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
         return;
       }
 
-      const params = {
-        url: {
-          "gid": this.__currentOrg.getGroupId(),
-          "uid": listedMember["id"]
-        },
-        data: {
-          "accessRights": this.self().getReadAccess()
-        }
-      };
-      osparc.data.Resources.fetch("organizationMembers", "patch", params)
+      const newAccessRights = this.self().getReadAccess();
+      const groupsStore = osparc.store.Groups.getInstance();
+      groupsStore.patchMember(this.__currentOrg.getGroupId(), listedMember["id"], newAccessRights)
         .then(() => {
           osparc.FlashMessenger.getInstance().logAs(this.tr(`Successfully promoted to ${osparc.data.Roles.ORG[1].label}`));
-          osparc.store.Store.getInstance().reset("organizationMembers");
           this.__reloadOrgMembers();
         })
         .catch(err => {

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

@@ -231,6 +231,22 @@ qx.Class.define("osparc.store.Groups", {
       return null;
     },
 
+    getGroupMemberByUserId: function(orgId, userId) {
+      const org = this.getGroup(orgId);
+      if (org) {
+        return Object.values(org.getGroupMembers()).find(user => user.getUserId() === userId);
+      }
+      return null;
+    },
+
+    getGroupMemberByLogin: function(orgId, userEmail) {
+      const org = this.getGroup(orgId);
+      if (org) {
+        return Object.values(org.getGroupMembers()).find(user => user.getLogin() === userEmail);
+      }
+      return null;
+    },
+
     postGroup: function(name, parentGroupId = null, workspaceId = null) {
       const newGroupData = {
         name,
@@ -304,12 +320,32 @@ qx.Class.define("osparc.store.Groups", {
           return this.__fetchGroupMembers(gid);
         })
         .then(() => {
-          const org = this.getOrganization(gid);
-          if (org) {
-            const groupMember = Object.values(org.getGroupMembers()).find(user => user.getLogin() === newMemberEmail);
-            if (groupMember) {
-              return groupMember;
-            }
+          const groupMember = this.getGroupMemberByLogin(gid, newMemberEmail);
+          if (groupMember) {
+            return groupMember;
+          }
+          return null;
+        });
+    },
+
+    patchAccessRights: function(orgId, userId, newAccessRights) {
+      const gid = parseInt(orgId);
+      const uid = parseInt(userId);
+      const params = {
+        url: {
+          gid,
+          uid,
+        },
+        data: {
+          "accessRights": newAccessRights
+        }
+      };
+      return osparc.data.Resources.fetch("organizationMembers", "patch", params)
+        .then(() => {
+          const groupMember = this.getGroupMemberByUserId(gid, uid);
+          if (groupMember) {
+            groupMember.setAccessRights(newAccessRights);
+            return groupMember;
           }
           return null;
         });
@@ -370,11 +406,9 @@ qx.Class.define("osparc.store.Groups", {
     __removeUserFromCache: function(userId, orgId) {
       if (orgId) {
         const organization = this.getOrganization(orgId);
-        if (organization) {
-          const groupMember = Object.values(organization.getGroupMembers()).find(user => user.getUserId() === userId);
-          if (groupMember) {
-            delete organization.getGroupMembers()[groupMember.getGroupId()]
-          }
+        const groupMember = this.getGroupMemberByUserId(orgId, userId)
+        if (organization && groupMember) {
+          delete organization.getGroupMembers()[groupMember.getGroupId()]
         }
       }
     },