Merge branch 'master' into mai/enhance-auth

Author: pcrespov

.github/workflows/ci-testing-deploy.yml

@@ -2656,7 +2656,7 @@ jobs:
     if: ${{ always() }}
     needs:
       [
-        system-test-e2e,
+        # system-test-e2e, NOTE: not required, until Odei will have a look
         system-test-e2e-playwright,
         system-test-environment-setup,
         system-test-public-api,

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

@@ -405,7 +405,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
     services: {
       check: "Array",
       init: true,
-      nullable: false,
+      nullable: true,
       apply: "__applyServices",
       event: "changeServices",
     },
@@ -567,7 +567,11 @@ qx.Class.define("osparc.dashboard.CardBase", {
             resourceData["services"] = services;
             this.setServices(services);
           })
-          .catch(err => console.error(err));
+          .catch(err => {
+            resourceData["services"] = null;
+            this.setServices(null);
+            console.error(err);
+          });
 
         osparc.study.Utils.guessIcon(resourceData)
           .then(iconSource => this.setIcon(iconSource));
@@ -688,27 +692,38 @@ qx.Class.define("osparc.dashboard.CardBase", {
     },
 
     __applyServices: function(services) {
-      this.setEmptyWorkbench(services.length === 0);
-
-      // Updatable study
-      if (osparc.study.Utils.anyServiceRetired(services)) {
-        this.setUpdatable("retired");
-      } else if (osparc.study.Utils.anyServiceDeprecated(services)) {
-        this.setUpdatable("deprecated");
-      } else if (osparc.study.Utils.anyServiceUpdatable(services)) {
-        this.setUpdatable("updatable");
-      }
-
-      // Block card
-      const cantReadServices = osparc.study.Utils.getCantReadServices(services);
-      if (cantReadServices.length) {
+      const unknownServices = cantReadServices => {
+        // Block card
         this.setBlocked("UNKNOWN_SERVICES");
         const image = "@FontAwesome5Solid/ban/";
-        let toolTipText = this.tr("Inaccessible service(s):");
-        cantReadServices.forEach(unSrv => {
-          toolTipText += "<br>" + unSrv.key + ":" + osparc.service.Utils.extractVersionDisplay(unSrv.release);
-        });
+        let toolTipText = this.tr("Unknown service(s)");
+        if (cantReadServices && cantReadServices.length) {
+          toolTipText = this.tr("Inaccessible service(s)");
+          cantReadServices.forEach(unSrv => {
+            toolTipText += "<br>" + unSrv.key + ":" + osparc.service.Utils.extractVersionDisplay(unSrv.release);
+          });
+        }
         this.__showBlockedCard(image, toolTipText);
+      };
+
+      if (services) {
+        this.setEmptyWorkbench(services.length === 0);
+
+        // Updatable study
+        if (osparc.study.Utils.anyServiceRetired(services)) {
+          this.setUpdatable("retired");
+        } else if (osparc.study.Utils.anyServiceDeprecated(services)) {
+          this.setUpdatable("deprecated");
+        } else if (osparc.study.Utils.anyServiceUpdatable(services)) {
+          this.setUpdatable("updatable");
+        }
+
+        const cantReadServices = osparc.study.Utils.getCantReadServices(services);
+        if (cantReadServices.length) {
+          unknownServices(cantReadServices);
+        }
+      } else {
+        unknownServices();
       }
 
       this.evaluateMenuButtons();

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

@@ -43,7 +43,9 @@ qx.Class.define("osparc.dashboard.DataBrowser", {
       let control;
       switch (id) {
         case "tree-folder-view":
-          control = new osparc.file.TreeFolderView();
+          control = new osparc.file.TreeFolderView().set({
+            paddingBottom: 15,
+          });
           this._addToLayout(control, {
             flex: 1
           });

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

@@ -804,7 +804,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
     __getCreateTemplatePage: function() {
       if (
         !osparc.utils.Resources.isStudy(this.__resourceData) ||
-        osparc.product.Utils.showTemplates()
+        !osparc.product.Utils.showTemplates()
       ) {
         return null;
       }

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

@@ -151,7 +151,7 @@ qx.Class.define("osparc.data.Resources", {
           },
           postToTemplate: {
             method: "POST",
-            url: statics.API + "/projects?from_study={study_id}&as_template=true&copy_data={copy_data}"
+            url: statics.API + "/projects?from_study={study_id}&as_template=true&copy_data={copy_data}&hidden={hidden}"
           },
           open: {
             method: "POST",
@@ -303,6 +303,10 @@ qx.Class.define("osparc.data.Resources", {
             method: "POST",
             url: statics.API + "/projects/{studyId}/workspaces/{workspaceId}:move"
           },
+          updateMetadata: {
+            method: "PATCH",
+            url: statics.API + "/projects/{studyId}/metadata"
+          },
         }
       },
       "conversations": {

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

@@ -240,7 +240,8 @@ qx.Class.define("osparc.desktop.MainPage", {
       const params = {
         url: {
           "study_id": studyId,
-          "copy_data": copyData
+          "copy_data": copyData,
+          "hidden": false,
         },
       };
       const options = {

services/static-webserver/client/source/class/osparc/study/CreateFunction.js

@@ -282,11 +282,12 @@ qx.Class.define("osparc.study.CreateFunction", {
     __createFunction: function(exposedInputs, exposedOutputs) {
       this.__createFunctionBtn.setFetching(true);
 
-      // first publish it as a template
+      // first publish it as a hidden template
       const params = {
         url: {
           "study_id": this.__studyData["uuid"],
           "copy_data": true,
+          "hidden": true,
         },
       };
       const options = {
@@ -298,7 +299,8 @@ qx.Class.define("osparc.study.CreateFunction", {
         .then(task => {
           task.addListener("resultReceived", e => {
             const templateData = e.getData();
-            this.__doCreateFunction(templateData, exposedInputs, exposedOutputs);
+            this.__updateTemplateMetadata(templateData);
+            this.__registerFunction(templateData, exposedInputs, exposedOutputs);
           });
         })
         .catch(err => {
@@ -307,13 +309,27 @@ qx.Class.define("osparc.study.CreateFunction", {
         });
     },
 
-    __doCreateFunction: function(templateData, exposedInputs, exposedOutputs) {
+    __updateTemplateMetadata: function(templateData) {
+      const patchData = {
+        "custom" : {
+          "hidden": "Base template for function",
+        }
+      };
+      const params = {
+        url: {
+          "studyId": templateData["uuid"],
+        },
+        data: patchData
+      };
+      osparc.data.Resources.fetch("studies", "updateMetadata", params)
+        .catch(err => console.error(err));
+    },
+
+    __registerFunction: function(templateData, exposedInputs, exposedOutputs) {
       const nameField = this.__form.getItem("name");
       const descriptionField = this.__form.getItem("description");
 
       const functionData = this.self().createFunctionData(templateData, nameField.getValue(), descriptionField.getValue(), exposedInputs, exposedOutputs);
-      console.log("functionData", functionData);
-
       const params = {
         data: functionData,
       };

services/static-webserver/client/source/class/osparc/study/Utils.js

@@ -355,7 +355,9 @@ qx.Class.define("osparc.study.Utils", {
     },
 
     __getBlockedState: function(studyData) {
-      if (studyData["services"]) {
+      if (studyData["services"] === null) {
+        return "UNKNOWN_SERVICES";
+      } else if (studyData["services"]) {
         const cantReadServices = osparc.study.Utils.getCantReadServices(studyData["services"]);
         const inaccessibleServices = osparc.store.Services.getInaccessibleServices(studyData["workbench"]);
         if (cantReadServices.length || inaccessibleServices.length) {

services/web/server/src/simcore_service_webserver/projects/_controller/projects_rest.py

@@ -28,7 +28,6 @@
 from servicelib.redis import get_project_locked_state
 
 from ..._meta import API_VTAG as VTAG
-from ...catalog import catalog_service
 from ...login.decorators import login_required
 from ...redis import get_redis_lock_manager_client_sdk
 from ...resource_manager.user_sessions import PROJECT_ID_KEY, managed_resource
@@ -39,7 +38,6 @@
 from .. import _crud_api_create, _crud_api_read, _projects_service
 from .._permalink_service import update_or_pop_permalink_in_project
 from ..models import ProjectDict
-from ..utils import are_project_services_available, get_project_unavailable_services
 from . import _rest_utils
 from ._rest_exceptions import handle_plugin_requests_exceptions
 from ._rest_schemas import (
@@ -271,10 +269,6 @@ async def get_project(request: web.Request):
     req_ctx = AuthenticatedRequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
 
-    user_available_services = await catalog_service.get_services_for_user_in_product(
-        request.app, user_id=req_ctx.user_id, product_name=req_ctx.product_name
-    )
-
     project = await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_id}",
@@ -283,21 +277,6 @@ async def get_project(request: web.Request):
         include_trashed_by_primary_gid=True,
     )
 
-    if not are_project_services_available(project, user_available_services):
-        unavilable_services = get_project_unavailable_services(
-            project, user_available_services
-        )
-        formatted_services = ", ".join(
-            f"{service}:{version}" for service, version in unavilable_services
-        )
-        # TODO: lack of permissions should be notified with https://httpstatuses.com/403 web.HTTPForbidden
-        raise web.HTTPNotFound(
-            reason=(
-                f"Project '{path_params.project_id}' uses unavailable services. Please ask "
-                f"for permission for the following services {formatted_services}"
-            )
-        )
-
     # Adds permalink
     await update_or_pop_permalink_in_project(request, project)
 

services/web/server/src/simcore_service_webserver/projects/_crud_api_read.py

@@ -22,7 +22,6 @@
 )
 from simcore_postgres_database.webserver_models import ProjectType as ProjectTypeDB
 
-from ..catalog import catalog_service
 from ..folders import _folders_repository
 from ..workspaces.api import check_user_workspace_access
 from . import _projects_service
@@ -120,10 +119,6 @@ async def list_projects(  # pylint: disable=too-many-arguments
 ) -> tuple[list[ProjectDict], int]:
     db = ProjectDBAPI.get_from_app_context(app)
 
-    user_available_services = await catalog_service.get_services_for_user_in_product(
-        app, user_id=user_id, product_name=product_name
-    )
-
     workspace_is_private = True
     if workspace_id:
         await check_user_workspace_access(
@@ -165,7 +160,6 @@ async def list_projects(  # pylint: disable=too-many-arguments
         filter_by_template_type=(
             ProjectTemplateTypeDB(template_type) if template_type else None
         ),
-        filter_by_services=user_available_services,
         filter_trashed=trashed,
         filter_hidden=show_hidden,
         # composed attrs
@@ -202,17 +196,12 @@ async def list_projects_full_depth(
 ) -> tuple[list[ProjectDict], int]:
     db = ProjectDBAPI.get_from_app_context(app)
 
-    user_available_services = await catalog_service.get_services_for_user_in_product(
-        app, user_id=user_id, product_name=product_name
-    )
-
     db_projects, db_project_types, total_number_projects = await db.list_projects_dicts(
         product_name=product_name,
         user_id=user_id,
         workspace_query=WorkspaceQuery(workspace_scope=WorkspaceScope.ALL),
         folder_query=FolderQuery(folder_scope=FolderScope.ALL),
         filter_trashed=trashed,
-        filter_by_services=user_available_services,
         filter_by_project_type=ProjectType.STANDARD,
         search_by_multi_columns=search_by_multi_columns,
         search_by_project_name=search_by_project_name,