Merge branch 'master' into bugs/02-12

Author: odeimaiz

api/specs/web-server/_folders.py

@@ -25,6 +25,9 @@
     FoldersListQueryParams,
     FoldersPathParams,
 )
+from simcore_service_webserver.folders._workspaces_handlers import (
+    _FolderWorkspacesPathParams,
+)
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",
@@ -97,3 +100,15 @@ async def delete_folder(
     _path: Annotated[FoldersPathParams, Depends()],
 ):
     ...
+
+
+@router.post(
+    "/folders/{folder_id}/workspaces/{workspace_id}:move",
+    status_code=status.HTTP_204_NO_CONTENT,
+    summary="Move folder to the workspace",
+    tags=["workspaces"],
+)
+async def move_folder_to_workspace(
+    _path: Annotated[_FolderWorkspacesPathParams, Depends()],
+):
+    ...

api/specs/web-server/_projects_workspaces.py

@@ -23,12 +23,12 @@
 )
 
 
-@router.put(
-    "/projects/{project_id}/workspaces/{workspace_id}",
+@router.post(
+    "/projects/{project_id}/workspaces/{workspace_id}:move",
     status_code=status.HTTP_204_NO_CONTENT,
     summary="Move project to the workspace",
 )
-async def replace_project_workspace(
+async def move_project_to_workspace(
     _path: Annotated[_ProjectWorkspacesPathParams, Depends()],
 ):
     ...

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

@@ -9,8 +9,16 @@
 from typing import Annotated, Any, Literal, TypeAlias
 
 from models_library.folders import FolderID
+from models_library.utils._original_fastapi_encoders import jsonable_encoder
 from models_library.workspaces import WorkspaceID
-from pydantic import BeforeValidator, ConfigDict, Field, HttpUrl, field_validator
+from pydantic import (
+    BeforeValidator,
+    ConfigDict,
+    Field,
+    HttpUrl,
+    PlainSerializer,
+    field_validator,
+)
 
 from ..api_schemas_long_running_tasks.tasks import TaskGet
 from ..basic_types import LongTruncatedStr, ShortTruncatedStr
@@ -130,12 +138,22 @@ class ProjectPatch(InputSchema):
     name: ShortTruncatedStr | None = Field(default=None)
     description: LongTruncatedStr | None = Field(default=None)
     thumbnail: Annotated[
-        HttpUrl | None, BeforeValidator(empty_str_to_none_pre_validator)
+        HttpUrl | None,
+        BeforeValidator(empty_str_to_none_pre_validator),
+        PlainSerializer(lambda x: str(x) if x is not None else None),
     ] = Field(default=None)
     access_rights: dict[GroupIDStr, AccessRights] | None = Field(default=None)
     classifiers: list[ClassifierID] | None = Field(default=None)
     dev: dict | None = Field(default=None)
-    ui: StudyUI | None = Field(default=None)
+    ui: Annotated[
+        StudyUI | None,
+        BeforeValidator(empty_str_to_none_pre_validator),
+        PlainSerializer(
+            lambda obj: jsonable_encoder(
+                obj, exclude_unset=True, by_alias=False
+            )  # For the sake of backward compatibility
+        ),
+    ] = Field(default=None)
     quality: dict[str, Any] | None = Field(default=None)
 
 

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_projects.py

@@ -95,7 +95,7 @@ async def create_project(
         for group_id, permissions in _access_rights.items():
             await update_or_insert_project_group(
                 app,
-                new_project["uuid"],
+                project_id=new_project["uuid"],
                 group_id=int(group_id),
                 read=permissions["read"],
                 write=permissions["write"],

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/comp_tasks/_utils.py

@@ -6,6 +6,7 @@
 import aiopg.sa
 import arrow
 from dask_task_models_library.container_tasks.protocol import ContainerEnvsDict
+from models_library.api_schemas_catalog.services import ServiceGet
 from models_library.api_schemas_clusters_keeper.ec2_instances import EC2InstanceTypeGet
 from models_library.api_schemas_directorv2.services import (
     NodeRequirements,
@@ -89,7 +90,7 @@ async def _get_service_details(
         node.version,
         product_name,
     )
-    obj: ServiceMetaDataPublished = ServiceMetaDataPublished(**service_details)
+    obj: ServiceMetaDataPublished = ServiceGet(**service_details)
     return obj
 
 

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_route_computations.py

@@ -186,15 +186,29 @@ def _mocked_service_resources(request) -> httpx.Response:
     def _mocked_services_details(
         request, service_key: str, service_version: str
     ) -> httpx.Response:
+        assert "json_schema_extra" in ServiceGet.model_config
+        assert isinstance(ServiceGet.model_config["json_schema_extra"], dict)
+        assert isinstance(
+            ServiceGet.model_config["json_schema_extra"]["examples"], list
+        )
+        assert isinstance(
+            ServiceGet.model_config["json_schema_extra"]["examples"][0], dict
+        )
+        data_published = fake_service_details.model_copy(
+            update={
+                "key": urllib.parse.unquote(service_key),
+                "version": service_version,
+            }
+        ).model_dump(by_alias=True)
+        data = {
+            **ServiceGet.model_config["json_schema_extra"]["examples"][0],
+            **data_published,
+        }
+        payload = ServiceGet.model_validate(data)
         return httpx.Response(
             200,
             json=jsonable_encoder(
-                fake_service_details.model_copy(
-                    update={
-                        "key": urllib.parse.unquote(service_key),
-                        "version": service_version,
-                    }
-                ),
+                payload,
                 by_alias=True,
             ),
         )

services/static-webserver/client/source/class/osparc/CookiePolicy.js

@@ -154,17 +154,15 @@ qx.Class.define("osparc.CookiePolicy", {
           control = new qx.ui.basic.Label(text).set({
             rich : true
           });
-          osparc.store.Support.getLicenseURL()
-            .then(licenseLink => {
-              const lbl = control.getValue();
-              if (licenseLink) {
-                const color = qx.theme.manager.Color.getInstance().resolve("text");
-                const textLink = `<a href=${licenseLink} style='color: ${color}' target='_blank'>Licensing.</a>`;
-                control.setValue(lbl + textLink);
-              } else {
-                control.setValue(lbl + this.tr("Licensing."));
-              }
-            });
+          const licenseLink = osparc.store.Support.getLicenseURL();
+          const lbl = control.getValue();
+          if (licenseLink) {
+            const color = qx.theme.manager.Color.getInstance().resolve("text");
+            const textLink = `<a href=${licenseLink} style='color: ${color}' target='_blank'>Licensing.</a>`;
+            control.setValue(lbl + textLink);
+          } else {
+            control.setValue(lbl + this.tr("Licensing."));
+          }
           this._add(control, {
             column: 0,
             row: 2

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

@@ -576,11 +576,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         const data = e.getData();
         const destWorkspaceId = data["workspaceId"];
         const destFolderId = data["folderId"];
-        if (destWorkspaceId !== currentWorkspaceId) {
-          const msg = this.tr("Moving folders to Shared Workspaces are coming soon");
-          osparc.FlashMessenger.getInstance().logAs(msg, "WARNING");
-          return;
-        }
         const moveFolder = () => {
           Promise.all([
             this.__moveFolderToWorkspace(folderId, destWorkspaceId),

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

@@ -288,8 +288,8 @@ qx.Class.define("osparc.data.Resources", {
             url: statics.API + "/projects/{studyId}/folders/{folderId}"
           },
           moveToWorkspace: {
-            method: "PUT",
-            url: statics.API + "/projects/{studyId}/workspaces/{workspaceId}"
+            method: "POST",
+            url: statics.API + "/projects/{studyId}/workspaces/{workspaceId}:move"
           },
         }
       },
@@ -342,8 +342,8 @@ qx.Class.define("osparc.data.Resources", {
             url: statics.API + "/folders/{folderId}"
           },
           moveToWorkspace: {
-            method: "PUT",
-            url: statics.API + "/folders/{folderId}/folders/{workspaceId}"
+            method: "POST",
+            url: statics.API + "/folders/{folderId}/folders/{workspaceId}:move"
           },
           trash: {
             method: "POST",

services/static-webserver/client/source/class/osparc/navigation/UserMenu.js

@@ -127,8 +127,8 @@ qx.Class.define("osparc.navigation.UserMenu", {
         case "license":
           control = new qx.ui.menu.Button(this.tr("License"));
           osparc.utils.Utils.setIdToWidget(control, "userMenuLicenseBtn");
-          osparc.store.Support.getLicenseURL()
-            .then(licenseURL => control.addListener("execute", () => window.open(licenseURL)));
+          const licenseURL = osparc.store.Support.getLicenseURL();
+          control.addListener("execute", () => window.open(licenseURL));
           this.add(control);
           break;
         case "tip-lite-button":
@@ -257,7 +257,7 @@ qx.Class.define("osparc.navigation.UserMenu", {
       }
 
       this.getChildControl("about");
-      if (!osparc.product.Utils.isProduct("osparc")) {
+      if (osparc.product.Utils.showAboutProduct()) {
         this.getChildControl("about-product");
       }
       this.getChildControl("license");