groupMembers

odeimaiz · odeimaiz · commit 5f9a860a0426 · 2024-11-20T16:36:19.000+01:00
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js b/services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js
@@ -179,7 +179,7 @@ qx.Class.define("osparc.dashboard.Dashboard", {
 
       const preResourcePromises = [];
       const groupsStore = osparc.store.Groups.getInstance();
-      preResourcePromises.push(groupsStore.fetchAll());
+      preResourcePromises.push(groupsStore.fetchGroupsAndMembers());
       preResourcePromises.push(osparc.store.Services.getServicesLatest(false));
       Promise.all(preResourcePromises)
         .then(() => {
diff --git a/services/static-webserver/client/source/class/osparc/data/model/Group.js b/services/static-webserver/client/source/class/osparc/data/model/Group.js
@@ -42,34 +42,42 @@ qx.Class.define("osparc.data.model.Group", {
       check: "Number",
       nullable: false,
       init: null,
-      event: "changeGroupId"
+      event: "changeGroupId",
     },
 
     label: {
       check: "String",
       nullable: false,
       init: null,
-      event: "changeLabel"
+      event: "changeLabel",
     },
 
     description: {
       check: "String",
       nullable: true,
       init: null,
-      event: "changeDescription"
+      event: "changeDescription",
     },
 
     accessRights: {
       check: "Object",
       nullable: false,
       init: null,
-      event: "changeAccessRights"
+      event: "changeAccessRights",
     },
 
     thumbnail: {
       check: "String",
       nullable: true,
-      init: ""
+      init: "",
+      event: "changeThumbnail",
+    },
+
+    groupMembers: {
+      check: "Object",
+      nullable: true,
+      init: null,
+      event: "changeGroupMembers",
     },
 
     groupType: {
diff --git a/services/static-webserver/client/source/class/osparc/desktop/organizations/OrganizationDetails.js b/services/static-webserver/client/source/class/osparc/desktop/organizations/OrganizationDetails.js
@@ -48,12 +48,14 @@ qx.Class.define("osparc.desktop.organizations.OrganizationDetails", {
       this.__orgModel = orgModel;
 
       const organizationListItem = this.__addOrganizationListItem();
-      orgModel.bind("gid", organizationListItem, "key");
-      orgModel.bind("gid", organizationListItem, "model");
+      orgModel.bind("groupId", organizationListItem, "key");
+      orgModel.bind("groupId", organizationListItem, "model");
       orgModel.bind("thumbnail", organizationListItem, "thumbnail");
       orgModel.bind("label", organizationListItem, "title");
       orgModel.bind("description", organizationListItem, "subtitle");
-      orgModel.bind("nMembers", organizationListItem, "role");
+      orgModel.bindProperty("groupMembers", "role", {
+        converter: groupMembers => groupMembers ? Object.keys(groupMembers).length + this.tr(" members") : "-"
+      });
       orgModel.bind("accessRights", organizationListItem, "accessRights");
 
       // set orgModel to the tab views
diff --git a/services/static-webserver/client/source/class/osparc/desktop/organizations/OrganizationsList.js b/services/static-webserver/client/source/class/osparc/desktop/organizations/OrganizationsList.js
@@ -135,7 +135,9 @@ qx.Class.define("osparc.desktop.organizations.OrganizationsList", {
           ctrl.bindProperty("thumbnail", "thumbnail", null, item, id);
           ctrl.bindProperty("label", "title", null, item, id);
           ctrl.bindProperty("description", "subtitle", null, item, id);
-          ctrl.bindProperty("nMembers", "role", null, item, id);
+          ctrl.bindProperty("groupMembers", "role", {
+            converter: groupMembers => groupMembers ? Object.keys(groupMembers).length + this.tr(" members") : "-"
+          }, item, id);
           ctrl.bindProperty("accessRights", "accessRights", null, item, id);
         },
         configureItem: item => {
@@ -179,13 +181,8 @@ qx.Class.define("osparc.desktop.organizations.OrganizationsList", {
 
       const groupsStore = osparc.store.Groups.getInstance();
       const orgs = Object.values(groupsStore.getOrganizations());
-      const orgsList = orgs.map(org => {
-        const respOrgMembers = groupsStore.getOrganizationMembers(org["gid"]);
-        org["nMembers"] = Object.keys(respOrgMembers).length + this.tr(" members");
-        return org;
-      });
-      orgsList.sort(this.self().sortOrganizations);
-      orgsList.forEach(org => orgsModel.append(org));
+      orgs.sort(this.self().sortOrganizations);
+      orgs.forEach(org => orgsModel.append(org));
       this.setOrganizationsLoaded(true);
       if (orgId) {
         this.fireDataEvent("organizationSelected", orgId);
diff --git a/services/static-webserver/client/source/class/osparc/desktop/organizations/OrganizationsWindow.js b/services/static-webserver/client/source/class/osparc/desktop/organizations/OrganizationsWindow.js
@@ -49,7 +49,7 @@ qx.Class.define("osparc.desktop.organizations.OrganizationsWindow", {
 
   members: {
     __stack: null,
-    __orgsList: null,
+    __orgsPage: null,
     __orgDetails: null,
 
     __buildLayout: function() {
@@ -58,7 +58,7 @@ qx.Class.define("osparc.desktop.organizations.OrganizationsWindow", {
         flex: 1
       });
 
-      const orgsPage = this.__orgsList = new osparc.desktop.organizations.OrganizationsList();
+      const orgsPage = this.__orgsPage = new osparc.desktop.organizations.OrganizationsList();
       const orgDetails = this.__orgDetails = new osparc.desktop.organizations.OrganizationDetails();
       stack.add(orgsPage);
       stack.add(orgDetails);
@@ -77,15 +77,15 @@ qx.Class.define("osparc.desktop.organizations.OrganizationsWindow", {
 
     openOrganizationDetails: function(organizationId) {
       const openOrgDetails = orgId => {
-        const orgModel = this.__orgsList.getOrgModel(orgId);
+        const orgModel = this.__orgsPage.getOrgModel(orgId);
         this.__orgDetails.setCurrentOrg(orgModel);
         this.getChildControl("title").setValue(this.tr("Organization details"));
         this.__stack.setSelection([this.__orgDetails]);
       };
-      if (this.__orgsList.isOrganizationsLoaded()) {
+      if (this.__orgsPage.isOrganizationsLoaded()) {
         openOrgDetails(organizationId);
       } else {
-        this.__orgsList.addListenerOnce("changeOrganizationsLoaded", () => openOrgDetails(organizationId));
+        this.__orgsPage.addListenerOnce("changeOrganizationsLoaded", () => openOrgDetails(organizationId));
       }
     }
   }
diff --git a/services/static-webserver/client/source/class/osparc/editor/AnnotationNoteCreator.js b/services/static-webserver/client/source/class/osparc/editor/AnnotationNoteCreator.js
@@ -142,7 +142,7 @@ qx.Class.define("osparc.editor.AnnotationNoteCreator", {
 
     __setRecipientGid: function(gid) {
       this.setRecipientGid(gid);
-      osparc.store.Groups.getInstance().getGroup(gid)
+      osparc.store.Groups.getInstance().fetchGroup(gid)
         .then(user => {
           this.getChildControl("selected-recipient").setValue(user.label);
         });
diff --git a/services/static-webserver/client/source/class/osparc/notification/NotificationUI.js b/services/static-webserver/client/source/class/osparc/notification/NotificationUI.js
@@ -134,7 +134,7 @@ qx.Class.define("osparc.notification.NotificationUI", {
         case "NEW_ORGANIZATION":
           icon.setSource("@FontAwesome5Solid/users/14");
           if (resourceId) {
-            osparc.store.Groups.getInstance().getGroup(resourceId)
+            osparc.store.Groups.getInstance().fetchGroup(resourceId)
               .then(group => descriptionLabel.setValue("You're now member of '" + group["label"] + "'"))
               .catch(() => this.setEnabled(false));
           }
@@ -264,7 +264,7 @@ qx.Class.define("osparc.notification.NotificationUI", {
 
     __openOrganizationDetails: function(orgId) {
       // make sure org is available
-      osparc.store.Groups.getInstance().getGroup(orgId)
+      osparc.store.Groups.getInstance().fetchGroup(orgId)
         .then(org => {
           if (org) {
             const orgsWindow = osparc.desktop.organizations.OrganizationsWindow.openWindow();
diff --git a/services/static-webserver/client/source/class/osparc/share/CollaboratorsStudy.js b/services/static-webserver/client/source/class/osparc/share/CollaboratorsStudy.js
@@ -226,7 +226,7 @@ qx.Class.define("osparc.share.CollaboratorsStudy", {
         );
       };
 
-      const groupData = await osparc.store.Store.getInstance().getGroup(groupId);
+      const groupData = await osparc.store.Store.getInstance().fetchGroup(groupId);
       const isOrganization = (groupData && !("id" in groupData));
       if (isOrganization) {
         const msg = this.tr(`Demoting to ${osparc.data.Roles.STUDY[1].label} will remove write access to all the members of the Organization. Are you sure?`);
diff --git a/services/static-webserver/client/source/class/osparc/share/CollaboratorsWorkspace.js b/services/static-webserver/client/source/class/osparc/share/CollaboratorsWorkspace.js
@@ -157,7 +157,7 @@ qx.Class.define("osparc.share.CollaboratorsWorkspace", {
         );
       };
 
-      const groupData = await osparc.store.Groups.getInstance().getGroup(groupId);
+      const groupData = await osparc.store.Groups.getInstance().fetchGroup(groupId);
       const isOrganization = (groupData && !("id" in groupData));
       if (isOrganization) {
         const msg = this.tr(`Demoting to ${osparc.data.Roles.WORKSPACE[1].label} will remove write access to all the members of the Organization. Are you sure?`);
diff --git a/services/static-webserver/client/source/class/osparc/share/ShareePermissions.js b/services/static-webserver/client/source/class/osparc/share/ShareePermissions.js
@@ -33,7 +33,7 @@ qx.Class.define("osparc.share.ShareePermissions", {
       this._add(layout);
       for (let i=0; i<shareesData.length; i++) {
         const shareeData = shareesData[i];
-        osparc.store.Groups.getInstance().getGroup(shareeData.gid)
+        osparc.store.Groups.getInstance().fetchGroup(shareeData.gid)
           .then(group => {
             if (group) {
               layout.add(new qx.ui.basic.Label(group.label), {
diff --git a/services/static-webserver/client/source/class/osparc/store/Groups.js b/services/static-webserver/client/source/class/osparc/store/Groups.js
@@ -47,11 +47,6 @@ qx.Class.define("osparc.store.Groups", {
       init: {}
     },
 
-    organizationMembers: {
-      check: "Object",
-      init: {}
-    },
-
     reachableMembers: {
       check: "Object",
       init: {}
@@ -78,7 +73,7 @@ qx.Class.define("osparc.store.Groups", {
     groupsCached: null,
     usersCached: null,
 
-    fetchGroups: function() {
+    __fetchGroups: function() {
       if (osparc.auth.Data.getInstance().isGuest()) {
         return new Promise(resolve => {
           resolve([]);
@@ -111,58 +106,32 @@ qx.Class.define("osparc.store.Groups", {
       };
       return osparc.data.Resources.get("organizationMembers", params)
         .then(orgMembers => {
-          this.getOrganizationMembers()[groupId] = {};
-          orgMembers.forEach(orgMember => {
-            orgMember["label"] = osparc.utils.Utils.firstsUp(
-              `${"first_name" in orgMember && orgMember["first_name"] != null ? orgMember["first_name"] : orgMember["login"]}`,
-              `${orgMember["last_name"] ? orgMember["last_name"] : ""}`
-            );
-            this.getOrganizationMembers()[groupId][orgMember["gid"]] = orgMember;
-          });
+          const group = this.getOrganizations()[groupId];
+          if (group) {
+            group.setGroupMembers({});
+            orgMembers.forEach(orgMember => {
+              orgMember["label"] = osparc.utils.Utils.firstsUp(
+                `${"first_name" in orgMember && orgMember["first_name"] != null ? orgMember["first_name"] : orgMember["login"]}`,
+                `${orgMember["last_name"] ? orgMember["last_name"] : ""}`
+              );
+              group.getGroupMembers()[orgMember["gid"]] = orgMember;
+              this.getReachableMembers()[orgMember["gid"]] = orgMember;
+            });
+          }
         });
     },
 
-    fetchAll: function() {
-      this.fetchGroups()
-        .then(orgs => {
-          this.resetOrganizationMembers();
-          this.resetReachableMembers();
-          const memberPromises = Object.keys(orgs).map(orgId => this.__fetchGroupMembers(orgId));
-          Promise.all(memberPromises)
-            .then(() => {
-              Object.values(this.getOrganizationMembers()).forEach(orgMembers => {
-                Object.values(orgMembers).forEach(reachableMember => {
-                  this.getReachableMembers()[reachableMember["gid"]] = reachableMember;
-                });
-              });
-            });
-
-          /*
-          const orgMembersPromises = [];
-          Object.keys(orgs).forEach(gid => {
-            const params = {
-              url: {
-                gid
-              }
-            };
-            orgMembersPromises.push(osparc.data.Resources.get("organizationMembers", params));
+    fetchGroupsAndMembers: function() {
+      return new Promise(resolve => {
+        this.__fetchGroups()
+          .then(orgs => {
+            this.resetReachableMembers();
+            const promises = Object.keys(orgs).map(orgId => this.__fetchGroupMembers(orgId));
+            Promise.all(promises)
+              .then(() => resolve())
+              .catch(err => console.error(err));
           });
-          Promise.all(orgMembersPromises)
-            .then(orgMemberss => {
-              const reachableMembers = {};
-              orgMemberss.forEach(orgMembers => {
-                orgMembers.forEach(orgMember => {
-                  orgMember["label"] = osparc.utils.Utils.firstsUp(
-                    `${"first_name" in orgMember && orgMember["first_name"] != null ? orgMember["first_name"] : orgMember["login"]}`,
-                    `${orgMember["last_name"] ? orgMember["last_name"] : ""}`
-                  );
-                  reachableMembers[orgMember["gid"]] = orgMember;
-                });
-              });
-              this.setReachableMembers(reachableMembers);
-            });
-          */
-        });
+      })
     },
 
     getMyGroupId: function() {
@@ -249,7 +218,11 @@ qx.Class.define("osparc.store.Groups", {
       });
     },
 
-    getGroup: function(gid) {
+    getGroup: function(groupId = null) {
+      return this.groupsCached.find(f => f.getGroupId() === groupId);
+    },
+
+    fetchGroup: function(gid) {
       return new Promise(resolve => {
         if (gid) {
           this.getPotentialCollaborators()
@@ -331,12 +304,6 @@ qx.Class.define("osparc.store.Groups", {
         .catch(console.error);
     },
 
-    /*
-    getGroup: function(groupId = null) {
-      return this.groupsCached.find(f => f.getGroupId() === groupId);
-    },
-    */
-
     __addToGroupsCache: function(groupData, groupType) {
       let group = this.groupsCached.find(f => f.getGroupId() === groupData["gid"]);
       if (group) {
diff --git a/services/static-webserver/client/source/class/osparc/workbench/Annotation.js b/services/static-webserver/client/source/class/osparc/workbench/Annotation.js
@@ -96,7 +96,7 @@ qx.Class.define("osparc.workbench.Annotation", {
       let representation = null;
       switch (this.getType()) {
         case "note": {
-          const user = await osparc.store.Groups.getInstance().getGroup(attrs.recipientGid);
+          const user = await osparc.store.Groups.getInstance().fetchGroup(attrs.recipientGid);
           representation = this.__svgLayer.drawAnnotationNote(attrs.x, attrs.y, user ? user.label : "", attrs.text);
           break;
         }
diff --git a/services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js b/services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js
@@ -1935,7 +1935,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
         const win = osparc.editor.AnnotationNoteCreator.popUpInWindow(noteEditor);
         noteEditor.addListener("addNote", () => {
           const gid = noteEditor.getRecipientGid();
-          osparc.store.Groups.getInstance().getGroup(gid)
+          osparc.store.Groups.getInstance().fetchGroup(gid)
             .then(user => {
               serializeData.attributes.recipientGid = gid;
               serializeData.attributes.text = noteEditor.getNote();
