♻️ Is3669/access rights renaming (ITISFoundation#3674)

pcrespov · odeimaiz · web-flow · commit dfdd1c4669e9 · 2022-12-15T16:57:36.000Z
Co-authored-by: Odei Maiz &lt;33152403+odeimaiz@users.noreply.github.com&gt;
diff --git a/packages/models-library/src/models_library/services_access.py b/packages/models-library/src/models_library/services_access.py
@@ -1,7 +1,7 @@
 """Service access rights models
 
 """
-from typing import Dict, Optional
+from typing import Optional
 
 from pydantic import BaseModel, Field
 from pydantic.types import PositiveInt
@@ -20,6 +20,8 @@ class ServiceGroupAccessRights(BaseModel):
 
 
 class ServiceAccessRights(BaseModel):
-    access_rights: Optional[Dict[GroupId, ServiceGroupAccessRights]] = Field(
-        None, description="service access rights per group id"
+    access_rights: Optional[dict[GroupId, ServiceGroupAccessRights]] = Field(
+        None,
+        alias="accessRights",
+        description="service access rights per group id",
     )
diff --git a/services/catalog/src/simcore_service_catalog/models/schemas/services.py b/services/catalog/src/simcore_service_catalog/models/schemas/services.py
@@ -13,7 +13,7 @@ class Config:
         schema_extra = {
             "example": {
                 # ServiceAccessRights
-                "access_rights": {
+                "accessRights": {
                     1: {
                         "execute_access": False,
                         "write_access": False,
@@ -66,6 +66,7 @@ class ServiceGet(
     owner: Optional[EmailStr]
 
     class Config:
+        allow_population_by_field_name = True
         extra = Extra.ignore
         schema_extra = {
             "example": {
@@ -74,7 +75,7 @@ class Config:
                 "description": "File Picker",
                 "classifiers": [],
                 "quality": {},
-                "access_rights": {
+                "accessRights": {
                     "1": {"execute_access": True, "write_access": False},
                     "4": {"execute_access": True, "write_access": True},
                 },
diff --git a/services/static-webserver/client/source/class/osparc/component/metadata/QualityEditor.js b/services/static-webserver/client/source/class/osparc/component/metadata/QualityEditor.js
@@ -689,7 +689,7 @@ qx.Class.define("osparc.component.metadata.QualityEditor", {
         const orgIDs = osparc.auth.Data.getInstance().getOrgIds();
         orgIDs.push(myGid);
         if (osparc.utils.Resources.isService(this.__resourceData)) {
-          return osparc.component.permissions.Service.canAnyGroupWrite(this.__resourceData["access_rights"], orgIDs);
+          return osparc.component.permissions.Service.canAnyGroupWrite(this.__resourceData["accessRights"], orgIDs);
         }
         return osparc.component.permissions.Study.canGroupsWrite(this.__resourceData["accessRights"], orgIDs);
       }
diff --git a/services/static-webserver/client/source/class/osparc/component/permissions/Permissions.js b/services/static-webserver/client/source/class/osparc/component/permissions/Permissions.js
@@ -232,7 +232,7 @@ qx.Class.define("osparc.component.permissions.Permissions", {
     __reloadOrganizationsAndMembers: function() {
       this.__organizationsAndMembers.reset();
 
-      const aceessRights = this.__getAccessRights();
+      const aceessRights = this._serializedData["accessRights"];
       const myFriends = Object.values(this.__collaborators);
 
       // sort them first
@@ -273,7 +273,7 @@ qx.Class.define("osparc.component.permissions.Permissions", {
     __reloadCollaboratorsList: function() {
       this.__collaboratorsModel.removeAll();
 
-      const aceessRights = this.__getAccessRights();
+      const aceessRights = this._serializedData["accessRights"];
       Object.keys(aceessRights).forEach(gid => {
         if (Object.prototype.hasOwnProperty.call(this.__collaborators, gid)) {
           const collaborator = this.__collaborators[gid];
@@ -289,10 +289,6 @@ qx.Class.define("osparc.component.permissions.Permissions", {
       });
     },
 
-    __getAccessRights: function() {
-      return this._serializedData["accessRights"] || this._serializedData["access_rights"];
-    },
-
     _isUserOwner: function() {
       throw new Error("Abstract method called!");
     },
diff --git a/services/static-webserver/client/source/class/osparc/component/permissions/Service.js b/services/static-webserver/client/source/class/osparc/component/permissions/Service.js
@@ -72,7 +72,7 @@ qx.Class.define("osparc.component.permissions.Service", {
     },
 
     removeCollaborator: function(serializedData, gid) {
-      return delete serializedData["access_rights"][gid];
+      return delete serializedData["accessRights"][gid];
     },
 
     getEveryoneObj: function() {
@@ -90,7 +90,7 @@ qx.Class.define("osparc.component.permissions.Service", {
   members: {
     _isUserOwner: function() {
       const myGid = osparc.auth.Data.getInstance().getGroupId();
-      const aceessRights = this._serializedData["access_rights"];
+      const aceessRights = this._serializedData["accessRights"];
       if (myGid in aceessRights) {
         return aceessRights[myGid]["write_access"];
       }
@@ -103,7 +103,7 @@ qx.Class.define("osparc.component.permissions.Service", {
         return;
       }
       gids.forEach(gid => {
-        this._serializedData["access_rights"][gid] = this.self().getCollaboratorAccessRight();
+        this._serializedData["accessRights"][gid] = this.self().getCollaboratorAccessRight();
       });
       const params = {
         url: osparc.data.Resources.getServiceUrl(
@@ -152,7 +152,7 @@ qx.Class.define("osparc.component.permissions.Service", {
     },
 
     _makeOwner: function(collaborator) {
-      this._serializedData["access_rights"][collaborator["gid"]] = this.self().getOwnerAccessRight();
+      this._serializedData["accessRights"][collaborator["gid"]] = this.self().getOwnerAccessRight();
       const params = {
         url: osparc.data.Resources.getServiceUrl(
           this._serializedData["key"],
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js b/services/static-webserver/client/source/class/osparc/dashboard/CardBase.js
@@ -236,57 +236,53 @@ qx.Class.define("osparc.dashboard.CardBase", {
       return this.getResourceType() === resourceType;
     },
 
-    __applyResourceData: function(studyData) {
+    __applyResourceData: function(resourceData) {
       let defaultThumbnail = "";
       let uuid = null;
       let owner = "";
-      let accessRights = {};
       let defaultHits = null;
       let workbench = null;
-      switch (studyData["resourceType"]) {
+      switch (resourceData["resourceType"]) {
         case "study":
-          uuid = studyData.uuid ? studyData.uuid : uuid;
-          owner = studyData.prjOwner ? studyData.prjOwner : owner;
-          accessRights = studyData.accessRights ? studyData.accessRights : accessRights;
+          uuid = resourceData.uuid ? resourceData.uuid : uuid;
+          owner = resourceData.prjOwner ? resourceData.prjOwner : owner;
           defaultThumbnail = this.self().STUDY_ICON;
-          workbench = studyData.workbench ? studyData.workbench : workbench;
+          workbench = resourceData.workbench ? resourceData.workbench : workbench;
           break;
         case "template":
-          uuid = studyData.uuid ? studyData.uuid : uuid;
-          owner = studyData.prjOwner ? studyData.prjOwner : owner;
-          accessRights = studyData.accessRights ? studyData.accessRights : accessRights;
+          uuid = resourceData.uuid ? resourceData.uuid : uuid;
+          owner = resourceData.prjOwner ? resourceData.prjOwner : owner;
           defaultThumbnail = this.self().TEMPLATE_ICON;
-          workbench = studyData.workbench ? studyData.workbench : workbench;
+          workbench = resourceData.workbench ? resourceData.workbench : workbench;
           break;
         case "service":
-          uuid = studyData.key ? studyData.key : uuid;
-          owner = studyData.owner ? studyData.owner : owner;
-          accessRights = studyData.access_rights ? studyData.access_rights : accessRights;
+          uuid = resourceData.key ? resourceData.key : uuid;
+          owner = resourceData.owner ? resourceData.owner : owner;
           defaultThumbnail = this.self().SERVICE_ICON;
-          if (osparc.data.model.Node.isComputational(studyData)) {
+          if (osparc.data.model.Node.isComputational(resourceData)) {
             defaultThumbnail = this.self().COMP_SERVICE_ICON;
           }
-          if (osparc.data.model.Node.isDynamic(studyData)) {
+          if (osparc.data.model.Node.isDynamic(resourceData)) {
             defaultThumbnail = this.self().DYNAMIC_SERVICE_ICON;
           }
           defaultHits = 0;
           break;
       }
 
       this.set({
-        resourceType: studyData.resourceType,
+        resourceType: resourceData.resourceType,
         uuid,
-        title: studyData.name,
-        description: studyData.description,
+        title: resourceData.name,
+        description: resourceData.description,
         owner,
-        accessRights,
-        lastChangeDate: studyData.lastChangeDate ? new Date(studyData.lastChangeDate) : null,
-        icon: studyData.thumbnail || defaultThumbnail,
-        state: studyData.state ? studyData.state : {},
-        classifiers: studyData.classifiers && studyData.classifiers ? studyData.classifiers : [],
-        quality: studyData.quality ? studyData.quality : null,
-        uiMode: studyData.ui && studyData.ui.mode ? studyData.ui.mode : null,
-        hits: studyData.hits ? studyData.hits : defaultHits,
+        accessRights: resourceData.accessRights ? resourceData.accessRights : {},
+        lastChangeDate: resourceData.lastChangeDate ? new Date(resourceData.lastChangeDate) : null,
+        icon: resourceData.thumbnail || defaultThumbnail,
+        state: resourceData.state ? resourceData.state : {},
+        classifiers: resourceData.classifiers && resourceData.classifiers ? resourceData.classifiers : [],
+        quality: resourceData.quality ? resourceData.quality : null,
+        uiMode: resourceData.ui && resourceData.ui.mode ? resourceData.ui.mode : null,
+        hits: resourceData.hits ? resourceData.hits : defaultHits,
         workbench
       });
     },
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceContainerManager.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceContainerManager.js
@@ -282,11 +282,7 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
       } else if (this.getGroupBy() === "shared") {
         let orgIds = [];
         if ("accessRights" in resourceData) {
-          // study or templates
           orgIds = Object.keys(resourceData["accessRights"]);
-        } else if ("access_rights" in resourceData) {
-          // services
-          orgIds = Object.keys(resourceData["access_rights"]);
         }
         if (orgIds.length === 0) {
           let noGroupContainer = this.__getGroupContainer("no-group");
diff --git a/services/static-webserver/client/source/class/osparc/info/ServiceUtils.js b/services/static-webserver/client/source/class/osparc/info/ServiceUtils.js
@@ -106,7 +106,7 @@ qx.Class.define("osparc.info.ServiceUtils", {
     createAccessRights: function(serviceData) {
       let permissions = "";
       const myGID = osparc.auth.Data.getInstance().getGroupId();
-      const ar = serviceData["access_rights"];
+      const ar = serviceData["accessRights"];
       if (myGID in ar) {
         if (ar[myGID]["write_access"]) {
           permissions = qx.locale.Manager.tr("Write");
diff --git a/services/static-webserver/client/source/class/osparc/utils/Services.js b/services/static-webserver/client/source/class/osparc/utils/Services.js
@@ -194,7 +194,7 @@ qx.Class.define("osparc.utils.Services", {
     isOwner: function(serviceData) {
       const orgIDs = osparc.auth.Data.getInstance().getOrgIds();
       orgIDs.push(osparc.auth.Data.getInstance().getGroupId());
-      return osparc.component.permissions.Service.canAnyGroupWrite(serviceData["access_rights"], orgIDs);
+      return osparc.component.permissions.Service.canAnyGroupWrite(serviceData["accessRights"], orgIDs);
     },
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -689,7 +689,7 @@ qx.Class.define("osparc.component.metadata.QualityEditor", {`
`689`	`689`	`const orgIDs = osparc.auth.Data.getInstance().getOrgIds();`
`690`	`690`	`orgIDs.push(myGid);`
`691`	`691`	`if (osparc.utils.Resources.isService(this.__resourceData)) {`
`692`		`- return osparc.component.permissions.Service.canAnyGroupWrite(this.__resourceData["access_rights"], orgIDs);`
	`692`	`+ return osparc.component.permissions.Service.canAnyGroupWrite(this.__resourceData["accessRights"], orgIDs);`
`693`	`693`	`}`
`694`	`694`	`return osparc.component.permissions.Study.canGroupsWrite(this.__resourceData["accessRights"], orgIDs);`
`695`	`695`	`}`