STUDY

Author: odeimaiz

services/static-webserver/client/source/class/osparc/data/Roles.js

@@ -80,22 +80,37 @@ qx.Class.define("osparc.data.Roles", {
         longLabel: qx.locale.Manager.tr("User: Read access"),
         canDo: [
           qx.locale.Manager.tr("- can open it")
-        ]
+        ],
+        accessRights: {
+          "read": true,
+          "write": false,
+          "delete": false
+        },
       },
       "write": {
         label: qx.locale.Manager.tr("Editor"),
         longLabel: qx.locale.Manager.tr("Editor: Read/Write access"),
         canDo: [
           qx.locale.Manager.tr("- can make changes"),
           qx.locale.Manager.tr("- can share it")
-        ]
+        ],
+        accessRights: {
+          "read": true,
+          "write": true,
+          "delete": false
+        },
       },
       "delete": {
         label: qx.locale.Manager.tr("Owner"),
         longLabel: qx.locale.Manager.tr("Owner: Read/Write/Delete access"),
         canDo: [
           qx.locale.Manager.tr("- can delete it")
-        ]
+        ],
+        accessRights: {
+          "read": true,
+          "write": true,
+          "delete": true
+        },
       }
     },
     SERVICES: {

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

@@ -57,30 +57,6 @@ qx.Class.define("osparc.share.CollaboratorsStudy", {
       return canWrite;
     },
 
-    getViewerAccessRight: function() {
-      return {
-        "read": true,
-        "write": false,
-        "delete": false
-      };
-    },
-
-    getCollaboratorAccessRight: function() {
-      return {
-        "read": true,
-        "write": true,
-        "delete": false
-      };
-    },
-
-    getOwnerAccessRight: function() {
-      return {
-        "read": true,
-        "write": true,
-        "delete": true
-      };
-    },
-
     __getDeleters: function(studyData) {
       const deleters = [];
       Object.entries(studyData["accessRights"]).forEach(([key, value]) => {
@@ -107,12 +83,14 @@ qx.Class.define("osparc.share.CollaboratorsStudy", {
         return;
       }
 
+      const readAccessRole = osparc.data.Roles.STUDY["read"];
+      const writeAccessRole = osparc.data.Roles.STUDY["read"];
       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" ? this.self().getCollaboratorAccessRight() : this.self().getViewerAccessRight();
+        newCollaborators[gid] = this._resourceType === "study" ? writeAccessRole.accessRights : readAccessRole.accessRights
       });
       osparc.store.Study.addCollaborators(this._serializedDataCopy, newCollaborators)
         .then(() => {
@@ -164,40 +142,43 @@ qx.Class.define("osparc.share.CollaboratorsStudy", {
     },
 
     _promoteToEditor: function(collaborator, item) {
+      const writeAccessRole = osparc.data.Roles.STUDY["write"];
       this.__make(
         collaborator["gid"],
-        this.self().getCollaboratorAccessRight(),
-        this.tr(`Successfully promoted to ${osparc.data.Roles.STUDY["write"].label}`),
-        this.tr(`Something went wrong while promoting to ${osparc.data.Roles.STUDY["write"].label}`),
+        writeAccessRole.accessRights,
+        this.tr(`Successfully promoted to ${writeAccessRole.label}`),
+        this.tr(`Something went wrong while promoting to ${writeAccessRole.label}`),
         item
       );
     },
 
     _promoteToOwner: function(collaborator, item) {
+      const deleteAccessRole = osparc.data.Roles.STUDY["delete"];
       this.__make(
         collaborator["gid"],
-        this.self().getOwnerAccessRight(),
-        this.tr(`Successfully promoted to ${osparc.data.Roles.STUDY["delete"].label}`),
-        this.tr(`Something went wrong while promoting to ${osparc.data.Roles.STUDY["delete"].label}`),
+        deleteAccessRole.accessRights,
+        this.tr(`Successfully promoted to ${deleteAccessRole.label}`),
+        this.tr(`Something went wrong while promoting to ${deleteAccessRole.label}`),
         item
       );
     },
 
     _demoteToUser: async function(collaborator, item) {
+      const readAccessRole = osparc.data.Roles.STUDY["read"];
       const groupId = collaborator["gid"];
       const demoteToUser = (gid, itm) => {
         this.__make(
           gid,
-          this.self().getViewerAccessRight(),
-          this.tr(`Successfully demoted to ${osparc.data.Roles.STUDY["read"].label}`),
-          this.tr(`Something went wrong while demoting to ${osparc.data.Roles.STUDY["read"].label}`),
+          readAccessRole.accessRights,
+          this.tr(`Successfully demoted to ${readAccessRole.label}`),
+          this.tr(`Something went wrong while demoting to ${readAccessRole.label}`),
           itm
         );
       };
 
       const organization = osparc.store.Groups.getInstance().getOrganization(groupId);
       if (organization) {
-        const msg = this.tr(`Demoting to ${osparc.data.Roles.STUDY["read"].label} will remove write access to all the members of the Organization. Are you sure?`);
+        const msg = this.tr(`Demoting to ${readAccessRole.label} will remove write access to all the members of the Organization. Are you sure?`);
         const win = new osparc.ui.window.Confirmation(msg).set({
           caption: this.tr("Demote"),
           confirmAction: "delete",
@@ -216,11 +197,12 @@ qx.Class.define("osparc.share.CollaboratorsStudy", {
     },
 
     _demoteToEditor: function(collaborator, item) {
+      const writeAccessRole = osparc.data.Roles.STUDY["write"];
       this.__make(
         collaborator["gid"],
-        this.self().getCollaboratorAccessRight(),
-        this.tr(`Successfully demoted to ${osparc.data.Roles.STUDY["write"].label}`),
-        this.tr(`Something went wrong while demoting to ${osparc.data.Roles.STUDY["write"].label}`),
+        writeAccessRole.accessRights,
+        this.tr(`Successfully demoted to ${writeAccessRole.label}`),
+        this.tr(`Something went wrong while demoting to ${writeAccessRole.label}`),
         item
       );
     },

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

@@ -80,11 +80,13 @@ qx.Class.define("osparc.share.PublishTemplate", {
     },
 
     __updateAccessRights: function() {
+      const readAccessRole = osparc.data.Roles.STUDY["read"];
+      const deleteAccessRole = osparc.data.Roles.STUDY["delete"];
       // these "accessRights" are only used for repopulating potential collaborators in the AddCollaborators -> NewCollaboratorsManager
       const myGroupId = osparc.auth.Data.getInstance().getGroupId();
       this.__potentialTemplateData["accessRights"] = {};
-      this.__potentialTemplateData["accessRights"][myGroupId] = osparc.share.CollaboratorsStudy.getOwnerAccessRight();
-      this.getSelectedGroups().forEach(gid => this.__potentialTemplateData["accessRights"][gid] = osparc.share.CollaboratorsStudy.getViewerAccessRight());
+      this.__potentialTemplateData["accessRights"][myGroupId] = deleteAccessRole.accessRights;
+      this.getSelectedGroups().forEach(gid => this.__potentialTemplateData["accessRights"][gid] = readAccessRole.accessRights);
     },
 
     getSelectedGroups: function() {