Share with everyone

Author: odeimaiz

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

@@ -37,7 +37,7 @@ qx.Class.define("osparc.share.Collaborators", {
 
     this.__collaborators = {};
     initCollabs.forEach(initCollab => {
-      this.__collaborators[initCollab["gid"]] = initCollab;
+      this.__collaborators[initCollab.getGroupId()] = initCollab;
     });
     this.__getCollaborators();
   },
@@ -402,15 +402,16 @@ qx.Class.define("osparc.share.Collaborators", {
 
       const groupsStore = osparc.store.Groups.getInstance();
       const everyoneGIds = [
-        groupsStore.getEveryoneProductGroup()["gid"],
-        groupsStore.getEveryoneGroup()["gid"]
+        groupsStore.getEveryoneProductGroup().getGroupId(),
+        groupsStore.getEveryoneGroup().getGroupId()
       ];
       const accessRights = this._serializedDataCopy["accessRights"];
       const collaboratorsList = [];
       const showOptions = this.__canIChangePermissions();
+      const allGroupsAndUsers = groupsStore.getAllGroupsAndUsers();
       Object.keys(accessRights).forEach(gid => {
-        if (Object.prototype.hasOwnProperty.call(this.__collaborators, gid)) {
-          const collab = this.__collaborators[gid];
+        if (gid in allGroupsAndUsers) {
+          const collab = allGroupsAndUsers[gid];
           // Do not override collaborator object
           const collaborator = {
             "gid": collab.getGroupId(),

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

@@ -35,8 +35,9 @@ qx.Class.define("osparc.share.CollaboratorsService", {
     const serviceDataCopy = osparc.utils.Utils.deepCloneObject(serviceData);
 
     const initCollabs = [];
-    initCollabs.push(this.self().getEveryoneProductObj());
-    initCollabs.push(this.self().getEveryoneObj());
+    const groupsStore = osparc.store.Groups.getInstance();
+    const everyoneProductGroup = groupsStore.getEveryoneProductGroup();
+    initCollabs.push(everyoneProductGroup);
 
     this.base(arguments, serviceDataCopy, initCollabs);
   },
@@ -64,22 +65,6 @@ qx.Class.define("osparc.share.CollaboratorsService", {
         "write": true
       };
     },
-
-    getEveryoneProductObj: function() {
-      const groupsStore = osparc.store.Groups.getInstance();
-      const everyoneProductGroup = groupsStore.getEveryoneProductGroup();
-      const everyone = osparc.utils.Utils.deepCloneObject(everyoneProductGroup);
-      everyone["accessRights"] = this.getCollaboratorAccessRight();
-      return everyone;
-    },
-
-    getEveryoneObj: function() {
-      const groupsStore = osparc.store.Groups.getInstance();
-      const everyoneGroup = groupsStore.getEveryoneGroup();
-      const everyone = osparc.utils.Utils.deepCloneObject(everyoneGroup);
-      everyone["accessRights"] = this.getCollaboratorAccessRight();
-      return everyone;
-    }
   },
 
   members: {

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

@@ -37,8 +37,9 @@ qx.Class.define("osparc.share.CollaboratorsStudy", {
 
     const initCollabs = [];
     if (osparc.data.Permissions.getInstance().canDo("study.everyone.share")) {
-      initCollabs.push(this.self().getEveryoneProductObj(this._resourceType === "study"));
-      initCollabs.push(this.self().getEveryoneObj(this._resourceType === "study"));
+      const groupsStore = osparc.store.Groups.getInstance();
+      const everyoneProductGroup = groupsStore.getEveryoneProductGroup();
+      initCollabs.push(everyoneProductGroup);
     }
 
     this.base(arguments, studyDataCopy, initCollabs);
@@ -105,22 +106,6 @@ qx.Class.define("osparc.share.CollaboratorsStudy", {
       }
       return true;
     },
-
-    getEveryoneProductObj: function(isStudy) {
-      const groupsStore = osparc.store.Groups.getInstance();
-      const everyoneProductGroup = groupsStore.getEveryoneProductGroup();
-      const everyone = osparc.utils.Utils.deepCloneObject(everyoneProductGroup);
-      everyone["accessRights"] = isStudy ? this.getCollaboratorAccessRight() : this.getViewerAccessRight();
-      return everyone;
-    },
-
-    getEveryoneObj: function(isStudy) {
-      const groupsStore = osparc.store.Groups.getInstance();
-      const everyoneGroup = groupsStore.getEveryoneGroup();
-      const everyone = osparc.utils.Utils.deepCloneObject(everyoneGroup);
-      everyone["accessRights"] = isStudy ? this.getCollaboratorAccessRight() : this.getViewerAccessRight();
-      return everyone;
-    }
   },
 
   members: {

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

@@ -136,6 +136,29 @@ qx.Class.define("osparc.store.Groups", {
       })
     },
 
+    getAllGroupsAndUsers: function() {
+      const allGroupsAndUsers = {};
+
+      const groupEveryone = this.getEveryoneGroup();
+      allGroupsAndUsers[groupEveryone.getGroupId()] = groupEveryone;
+
+      const groupProductEveryone = this.getEveryoneProductGroup();
+      allGroupsAndUsers[groupProductEveryone.getGroupId()] = groupProductEveryone;
+
+      const groupMe = this.getGroupMe();
+      allGroupsAndUsers[groupMe.getGroupId()] = groupMe;
+
+      Object.values(this.getOrganizations()).forEach(organization => {
+        allGroupsAndUsers[organization.getGroupId()] = organization;
+      });
+
+      Object.values(this.getReachableUsers()).forEach(reachableUser => {
+        allGroupsAndUsers[reachableUser.getGroupId()] = reachableUser;
+      });
+
+      return allGroupsAndUsers;
+    },
+
     getMyGroupId: function() {
       return this.getGroupMe().getGroupId();
     },