getEveryoneGroupIds

Author: odeimaiz

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

@@ -148,10 +148,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
             return false;
           }
           case "shared-with-everyone": {
-            const everyoneGroupIds = [
-              groupsStore.getEveryoneProductGroup().getGroupId(),
-              groupsStore.getEveryoneGroup().getGroupId(),
-            ];
+            const everyoneGroupIds = groupsStore.getEveryoneGroupIds();
             const found = Object.keys(checks).some(gId => everyoneGroupIds.includes(parseInt(gId)));
             // show those that are shared with "1" or product everyone's groupId
             return !found;
@@ -190,13 +187,12 @@ qx.Class.define("osparc.dashboard.CardBase", {
 
       // Icon
       const groupsStore = osparc.store.Groups.getInstance();
-      const groupEveryone = groupsStore.getEveryoneGroup();
-      const groupProductEveryone = groupsStore.getEveryoneProductGroup();
+      const everyoneGroupIds = groupsStore.getEveryoneGroupIds();
       const organizations = groupsStore.getOrganizations();
       const myGroupId = groupsStore.getMyGroupId();
 
       const organizationIds = Object.keys(organizations).map(key => parseInt(key));
-      if (gids.includes(groupEveryone.getGroupId()) || gids.includes(groupProductEveryone.getGroupId())) {
+      if (gids.some(gid => everyoneGroupIds.includes(gid))) {
         shareIcon.setSource(osparc.dashboard.CardBase.SHARED_ALL);
       } else if (organizationIds.filter(value => gids.includes(value)).length) { // find intersection
         shareIcon.setSource(osparc.dashboard.CardBase.SHARED_ORGS);
@@ -230,14 +226,11 @@ qx.Class.define("osparc.dashboard.CardBase", {
 
     addHintFromGids: function(icon, gids) {
       const groupsStore = osparc.store.Groups.getInstance();
-      const groupEveryone = groupsStore.getEveryoneGroup();
-      const groupProductEveryone = groupsStore.getEveryoneProductGroup();
+      const everyoneGroupIds = groupsStore.getEveryoneGroupIds();
       const organizations = groupsStore.getOrganizations();
       const myGroupId = groupsStore.getMyGroupId();
 
-      const groups = [];
-      groups.push(groupEveryone);
-      groups.push(groupProductEveryone);
+      const groups = everyoneGroupIds;
       groups.push(...Object.values(organizations));
       const sharedGrps = [];
       groups.forEach(group => {

services/static-webserver/client/source/class/osparc/share/Collaborators.js

@@ -434,16 +434,13 @@ qx.Class.define("osparc.share.Collaborators", {
       // reload list
       this.__collaboratorsModel.removeAll();
 
+      const usersStore = osparc.store.Users.getInstance();
       const groupsStore = osparc.store.Groups.getInstance();
-      const everyoneGIds = [
-        groupsStore.getEveryoneProductGroup().getGroupId(),
-        groupsStore.getEveryoneGroup().getGroupId()
-      ];
+      const everyoneGroupIds = groupsStore.getEveryoneGroupIds();
+      const allGroups = groupsStore.getAllGroups();
+      const showOptions = this.__canIChangePermissions();
       const accessRights = this._serializedDataCopy["accessRights"];
       const collaboratorsList = [];
-      const showOptions = this.__canIChangePermissions();
-      const allGroups = groupsStore.getAllGroups();
-      const usersStore = osparc.store.Users.getInstance();
       for (let i=0; i<Object.keys(accessRights).length; i++) {
         const gid = parseInt(Object.keys(accessRights)[i]);
         let collab = null;
@@ -462,7 +459,7 @@ qx.Class.define("osparc.share.Collaborators", {
           };
           if (!("getUserId" in collab)) {
             // organization
-            if (everyoneGIds.includes(parseInt(gid))) {
+            if (everyoneGroupIds.includes(parseInt(gid))) {
               collaborator["thumbnail"] = "@FontAwesome5Solid/globe/32";
             } else if (!collaborator["thumbnail"]) {
               collaborator["thumbnail"] = "@FontAwesome5Solid/users/26";

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

@@ -28,12 +28,12 @@ qx.Class.define("osparc.store.Groups", {
   properties: {
     everyoneGroup: {
       check: "osparc.data.model.Group",
-      init: {}
+      init: null // this will stay null for guest users
     },
 
     everyoneProductGroup: {
       check: "osparc.data.model.Group",
-      init: {}
+      init: null // this will stay null for guest users
     },
 
     organizations: {
@@ -120,10 +120,14 @@ qx.Class.define("osparc.store.Groups", {
       const allGroupsAndUsers = {};
 
       const groupEveryone = this.getEveryoneGroup();
-      allGroupsAndUsers[groupEveryone.getGroupId()] = groupEveryone;
+      if (groupEveryone) {
+        allGroupsAndUsers[groupEveryone.getGroupId()] = groupEveryone;
+      }
 
       const groupProductEveryone = this.getEveryoneProductGroup();
-      allGroupsAndUsers[groupProductEveryone.getGroupId()] = groupProductEveryone;
+      if (groupProductEveryone) {
+        allGroupsAndUsers[groupProductEveryone.getGroupId()] = groupProductEveryone;
+      }
 
       const groupMe = this.getGroupMe();
       allGroupsAndUsers[groupMe.getGroupId()] = groupMe;
@@ -157,6 +161,17 @@ qx.Class.define("osparc.store.Groups", {
       return allMyGroupIds;
     },
 
+    getEveryoneGroupIds: function() {
+      const everyoneGroupIds = [];
+      if (this.getEveryoneProductGroup()) {
+        everyoneGroupIds.push(this.getEveryoneProductGroup().getGroupId());
+      }
+      if (this.getEveryoneGroup()) {
+        everyoneGroupIds.push(this.getEveryoneGroup().getGroupId());
+      }
+      return everyoneGroupIds;
+    },
+
     getGroup: function(groupId) {
       const groups = [];
 
@@ -177,12 +192,16 @@ qx.Class.define("osparc.store.Groups", {
       });
 
       const groupProductEveryone = this.getEveryoneProductGroup();
-      groupProductEveryone["collabType"] = 0;
-      groups.push(groupProductEveryone);
+      if (groupProductEveryone) {
+        groupProductEveryone["collabType"] = 0;
+        groups.push(groupProductEveryone);
+      }
 
       const groupEveryone = this.getEveryoneGroup();
-      groupEveryone["collabType"] = 0;
-      groups.push(groupEveryone);
+      if (groupEveryone) {
+        groupEveryone["collabType"] = 0;
+        groups.push(groupEveryone);
+      }
       const idx = groups.findIndex(group => group.getGroupId() === parseInt(groupId));
       if (idx > -1) {
         return groups[idx];

services/static-webserver/client/source/class/osparc/ui/list/CollaboratorListItem.js

@@ -129,10 +129,7 @@ qx.Class.define("osparc.ui.list.CollaboratorListItem", {
         return;
       }
       const groupsStore = osparc.store.Groups.getInstance();
-      const everyoneGroupIds = [
-        groupsStore.getEveryoneProductGroup().getGroupId(),
-        groupsStore.getEveryoneGroup().getGroupId(),
-      ];
+      const everyoneGroupIds = groupsStore.getEveryoneGroupIds();
       const label = this.getChildControl("title");
       if (everyoneGroupIds.includes(this.getModel())) {
         label.setValue(this.tr("Public"));