refactor and pass access rights

Author: odeimaiz

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

@@ -99,11 +99,13 @@ qx.Class.define("osparc.desktop.organizations.MembersList", {
         collaboratorsManager.setCaption("Add Members");
         collaboratorsManager.getActionButton().setLabel(this.tr("Add"));
         collaboratorsManager.addListener("addCollaborators", e => {
-          const selectedMembers = e.getData();
-          if (selectedMembers.length) {
+          const {
+            selectedGids,
+          } = e.getData();
+          if (selectedGids.length) {
             const promises = [];
             const usersStore = osparc.store.Users.getInstance();
-            selectedMembers.forEach(selectedMemberGId => promises.push(usersStore.getUser(selectedMemberGId)));
+            selectedGids.forEach(selectedMemberGId => promises.push(usersStore.getUser(selectedMemberGId)));
             Promise.all(promises)
               .then(values => {
                 values.forEach(user => {

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

@@ -98,8 +98,11 @@ qx.Class.define("osparc.desktop.wallets.MembersList", {
         const showOrganizations = false;
         const collaboratorsManager = new osparc.share.NewCollaboratorsManager(serializedData, showOrganizations);
         collaboratorsManager.addListener("addCollaborators", e => {
+          const {
+            selectedGids,
+          } = e.getData();
           const cb = () => collaboratorsManager.close();
-          this.__addMembers(e.getData(), cb);
+          this.__addMembers(selectedGids, cb);
         }, this);
       }, this);
       vBox.add(addMemberBtn);

services/static-webserver/client/source/class/osparc/editor/AnnotationNoteCreator.js

@@ -88,10 +88,12 @@ qx.Class.define("osparc.editor.AnnotationNoteCreator", {
             collaboratorsManager.setCaption("Recipient");
             collaboratorsManager.getActionButton().setLabel(this.tr("Add"));
             collaboratorsManager.addListener("addCollaborators", e => {
-              const collabs = e.getData();
-              if (collabs) {
+              const {
+                selectedGids,
+              } = e.getData();
+              if (selectedGids) {
                 collaboratorsManager.close();
-                this.__setRecipientGid(collabs[0]);
+                this.__setRecipientGid(selectedGids[0]);
               }
             }, this);
           }, this);

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

@@ -267,7 +267,13 @@ qx.Class.define("osparc.share.Collaborators", {
       // pass resourceType, so that, if it's a template testers can share it with product everyone
       serializedDataCopy["resourceType"] = this._resourceType;
       const addCollaborators = new osparc.share.AddCollaborators(serializedDataCopy);
-      addCollaborators.addListener("addCollaborators", e => this._addEditors(e.getData()), this);
+      addCollaborators.addListener("addCollaborators", e => {
+        const {
+          selectedGids,
+          newAccessRights,
+        } = e.getData();
+        this._addEditors(selectedGids, newAccessRights);
+      }, this);
       return addCollaborators;
     },
 

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

@@ -78,19 +78,22 @@ qx.Class.define("osparc.share.CollaboratorsStudy", {
   },
 
   members: {
-    _addEditors: function(gids) {
+    _addEditors: function(gids, newAccessRights) {
       if (gids.length === 0) {
         return;
       }
 
       const readAccessRole = osparc.data.Roles.STUDY["read"];
-      const writeAccessRole = osparc.data.Roles.STUDY["read"];
+      const writeAccessRole = osparc.data.Roles.STUDY["write"];
+      if (!newAccessRights) {
+        newAccessRights = this._resourceType === "study" ? writeAccessRole.accessRights : readAccessRole.accessRights;
+      }
       const resourceAlias = this._resourceType === "template" ?
         osparc.product.Utils.getTemplateAlias({firstUpperCase: true}) :
         osparc.product.Utils.getStudyAlias({firstUpperCase: true});
       const newCollaborators = {};
       gids.forEach(gid => {
-        newCollaborators[gid] = this._resourceType === "study" ? writeAccessRole.accessRights : readAccessRole.accessRights
+        newCollaborators[gid] = newAccessRights;
       });
       osparc.store.Study.addCollaborators(this._serializedDataCopy, newCollaborators)
         .then(() => {

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

@@ -77,7 +77,7 @@ qx.Class.define("osparc.share.NewCollaboratorsManager", {
         }
         case "potential-collaborators-list": {
           control = new qx.ui.container.Composite(new qx.ui.layout.VBox()).set({
-            minHeight: 100,
+            minHeight: 160,
           });
           const scrollContainer = new qx.ui.container.Scroll();
           scrollContainer.add(control);
@@ -311,8 +311,18 @@ qx.Class.define("osparc.share.NewCollaboratorsManager", {
       this.getChildControl("potential-collaborators-list").setEnabled(false);
       this.getChildControl("share-button").setFetching(true);
 
+      let newAccessRights = null;
+      if (this.__resourceData["resourceType"] === "study") {
+        const selected = this.getChildControl("access-rights-selector").getSelection()[0];
+        if (selected) {
+          newAccessRights = osparc.data.Roles.STUDY[selected.getModel()];
+        }
+      }
       if (Object.keys(this.__selectedCollaborators).length) {
-        this.fireDataEvent("addCollaborators", Object.keys(this.__selectedCollaborators));
+        this.fireDataEvent("addCollaborators", {
+          selectedGids: Object.keys(this.__selectedCollaborators),
+          newAccessRights,
+        });
       }
     }
   }

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

@@ -59,11 +59,13 @@ qx.Class.define("osparc.share.PublishTemplate", {
       this._add(this.__selectedCollabs);
 
       addCollaborators.addListener("addCollaborators", e => {
-        const gids = e.getData();
-        if (gids.length) {
+        const {
+          selectedGids,
+        } = e.getData();
+        if (selectedGids.length) {
           const potentialCollaborators = osparc.store.Groups.getInstance().getPotentialCollaborators(false, true)
           const currentGids = this.getSelectedGroups();
-          gids.forEach(gid => {
+          selectedGids.forEach(gid => {
             if (gid in potentialCollaborators && !currentGids.includes(gid)) {
               const collabButton = new qx.ui.toolbar.Button(potentialCollaborators[gid].getLabel(), "@MaterialIcons/close/12");
               collabButton.gid = gid;