Merge branch 'master' into enh/distinguish-product-groups

Author: odeimaiz

packages/models-library/src/models_library/api_schemas_webserver/users.py

@@ -1,7 +1,7 @@
 import re
 from datetime import date, datetime
 from enum import Enum
-from typing import Annotated, Any, Literal, Self
+from typing import Annotated, Any, Literal, Self, TypeAlias
 
 import annotated_types
 from common_library.basic_types import DEFAULT_FACTORY
@@ -18,6 +18,7 @@
     StringConstraints,
     ValidationInfo,
     field_validator,
+    model_validator,
 )
 from pydantic.config import JsonDict
 
@@ -83,7 +84,14 @@ class MyProfileRestGet(OutputSchemaWithoutCamelCase):
     login: LowerCaseEmailStr
     phone: str | None = None
 
-    role: Literal["ANONYMOUS", "GUEST", "USER", "TESTER", "PRODUCT_OWNER", "ADMIN"]
+    role: Literal[
+        "ANONYMOUS",
+        "GUEST",
+        "USER",
+        "TESTER",
+        "PRODUCT_OWNER",
+        "ADMIN",
+    ]
     groups: MyGroupsGet | None = None
     gravatar_id: Annotated[str | None, Field(deprecated=True)] = None
 
@@ -306,15 +314,41 @@ class UserAccountReject(InputSchema):
     email: EmailStr
 
 
+GlobString: TypeAlias = Annotated[
+    str,
+    StringConstraints(
+        min_length=3, max_length=200, strip_whitespace=True, pattern=r"^[^%]*$"
+    ),
+]
+
+
 class UserAccountSearchQueryParams(RequestParameters):
     email: Annotated[
-        str,
+        GlobString | None,
         Field(
-            min_length=3,
-            max_length=200,
             description="complete or glob pattern for an email",
         ),
-    ]
+    ] = None
+    primary_group_id: Annotated[
+        GroupID | None,
+        Field(
+            description="Filter by primary group ID",
+        ),
+    ] = None
+    user_name: Annotated[
+        GlobString | None,
+        Field(
+            description="complete or glob pattern for a username",
+        ),
+    ] = None
+
+    @model_validator(mode="after")
+    def _validate_at_least_one_filter(self) -> Self:
+        field_names = list(self.__class__.model_fields)
+        if not any(getattr(self, field_name, None) for field_name in field_names):
+            msg = f"At least one filter {field_names} must be provided"
+            raise ValueError(msg)
+        return self
 
 
 class UserAccountGet(OutputSchema):
@@ -340,9 +374,9 @@ class UserAccountGet(OutputSchema):
     # pre-registration NOTE: that some users have no pre-registartion and therefore all options here can be none
     pre_registration_id: int | None
     pre_registration_created: datetime | None
-    invited_by: str | None = None
+    invited_by: UserNameID | None = None
     account_request_status: AccountRequestStatus | None
-    account_request_reviewed_by: UserID | None = None
+    account_request_reviewed_by: UserNameID | None = None
     account_request_reviewed_at: datetime | None = None
 
     # user status

packages/models-library/src/models_library/users.py

@@ -2,7 +2,6 @@
 from typing import Annotated, TypeAlias
 
 from common_library.users_enums import UserRole
-from models_library.basic_types import IDStr
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt, StringConstraints
 from pydantic.config import JsonDict
 from typing_extensions import (  # https://docs.pydantic.dev/latest/api/standard_library_types/#typeddict
@@ -12,8 +11,9 @@
 from .emails import LowerCaseEmailStr
 
 UserID: TypeAlias = PositiveInt
-UserNameID: TypeAlias = IDStr
-
+UserNameID: TypeAlias = Annotated[
+    str, StringConstraints(strip_whitespace=True, min_length=1, max_length=100)
+]
 
 FirstNameStr: TypeAlias = Annotated[
     str, StringConstraints(strip_whitespace=True, max_length=255)

services/api-server/setup.cfg

@@ -11,12 +11,12 @@ commit_args = --no-verify
 asyncio_mode = auto
 asyncio_default_fixture_loop_scope = function
 addopts = --strict-markers
-markers = 
+markers =
 	slow: marks tests as slow (deselect with '-m "not slow"')
 	acceptance_test: "marks tests as 'acceptance tests' i.e. does the system do what the user expects? Typically those are workflows."
 	testit: "marks test to run during development"
 
 [mypy]
-plugins = 
+plugins =
 	pydantic.mypy
 	sqlalchemy.ext.mypy.plugin

services/api-server/src/simcore_service_api_server/models/schemas/profiles.py

@@ -13,8 +13,7 @@ class ProfileCommon(BaseModel):
     last_name: LastNameStr | None = Field(None, examples=["Maxwell"])
 
 
-class ProfileUpdate(ProfileCommon):
-    ...
+class ProfileUpdate(ProfileCommon): ...
 
 
 class UserRoleEnum(StrAutoEnum):

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

@@ -526,6 +526,9 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       if (!osparc.desktop.credits.Utils.areWalletsEnabled()) {
         return;
       }
+      if (osparc.utils.Resources.isStudyLike(this.__resourceData) && !osparc.data.model.Study.canIWrite(this.__resourceData["accessRights"])) {
+        return;
+      }
 
       const resourceData = this.__resourceData;
       if (osparc.utils.Resources.isStudy(resourceData)) {
@@ -634,6 +637,13 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
     },
 
     __addPermissionsPage: function() {
+      if (osparc.utils.Resources.isStudyLike(this.__resourceData) && !osparc.data.model.Study.canIWrite(this.__resourceData["accessRights"])) {
+        return;
+      }
+      if (osparc.utils.Resources.isService(this.__resourceData) && !osparc.data.model.Service.canIWrite(this.__resourceData["accessRights"])) {
+        return;
+      }
+
       const id = "Permissions";
       const title = this.tr("Sharing");
       const iconSrc = "@FontAwesome5Solid/share-alt/22";
@@ -695,7 +705,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
         let classifiers = null;
         if (
           (osparc.utils.Resources.isStudy(resourceData) || osparc.utils.Resources.isTemplate(resourceData)) && osparc.data.model.Study.canIWrite(resourceData["accessRights"]) ||
-          osparc.utils.Resources.isService(resourceData) && osparc.service.Utils.canIWrite(resourceData["accessRights"])
+          osparc.utils.Resources.isService(resourceData) && osparc.data.model.Service.canIWrite(resourceData["accessRights"])
         ) {
           classifiers = new osparc.metadata.ClassifiersEditor(resourceData);
           classifiers.addListener("updateClassifiers", e => {
@@ -779,6 +789,9 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       if (osparc.utils.Resources.isService(resourceData)) {
         return;
       }
+      if (osparc.utils.Resources.isStudyLike(this.__resourceData) && !osparc.data.model.Study.canIWrite(this.__resourceData["accessRights"])) {
+        return;
+      }
 
       const id = "ServicesUpdate";
       const title = this.tr("Services Updates");
@@ -813,6 +826,9 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
       ) {
         return;
       }
+      if (osparc.utils.Resources.isStudyLike(this.__resourceData) && !osparc.data.model.Study.canIWrite(this.__resourceData["accessRights"])) {
+        return;
+      }
 
       const id = "ServicesBootOptions";
       const title = this.tr("Boot Options");

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

@@ -161,4 +161,13 @@ qx.Class.define("osparc.data.model.Service", {
       nullable: false
     },
   },
+
+  statics: {
+    canIWrite: function(serviceAccessRights) {
+      const groupsStore = osparc.store.Groups.getInstance();
+      const orgIDs = groupsStore.getOrganizationIds();
+      orgIDs.push(groupsStore.getMyGroupId());
+      return osparc.share.CollaboratorsService.canGroupsWrite(serviceAccessRights, orgIDs);
+    },
+  },
 });

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

@@ -110,7 +110,7 @@ qx.Class.define("osparc.info.ServiceLarge", {
 
       if (
         this.getService()["descriptionUi"] &&
-        !osparc.service.Utils.canIWrite(this.getService()["accessRights"])
+        !osparc.data.model.Service.canIWrite(this.getService()["accessRights"])
       ) {
         // In case of service instance, show also the copy Id buttons too
         const buttonsLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(10));
@@ -177,7 +177,7 @@ qx.Class.define("osparc.info.ServiceLarge", {
         alignY: "middle"
       }));
       layout.add(view);
-      if (osparc.service.Utils.canIWrite(this.getService()["accessRights"])) {
+      if (osparc.data.model.Service.canIWrite(this.getService()["accessRights"])) {
         const editBtn = osparc.utils.Utils.getEditButton();
         editBtn.addListener("execute", () => cb.call(this), this);
         layout.add(editBtn);
@@ -221,7 +221,7 @@ qx.Class.define("osparc.info.ServiceLarge", {
     },
 
     __infoElements: function() {
-      const canIWrite = osparc.service.Utils.canIWrite(this.getService()["accessRights"]);
+      const canIWrite = osparc.data.model.Service.canIWrite(this.getService()["accessRights"]);
 
       const infoLayout = {
         "THUMBNAIL": {

services/static-webserver/client/source/class/osparc/info/ServiceLarge.js

@@ -484,7 +484,7 @@ qx.Class.define("osparc.metadata.QualityEditor", {
       const myGid = osparc.auth.Data.getInstance().getGroupId();
       if (myGid) {
         if (osparc.utils.Resources.isService(this.__resourceData)) {
-          return osparc.service.Utils.canIWrite(this.__resourceData["accessRights"]);
+          return osparc.data.model.Service.canIWrite(this.__resourceData["accessRights"]);
         }
         return osparc.data.model.Study.canIWrite(this.__resourceData["accessRights"]);
       }