Merge branch 'master' into feature/more-plus-button

Author: odeimaiz

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

@@ -1,5 +1,5 @@
 """
-    Models Front-end UI
+Models Front-end UI
 """
 
 from typing import Annotated, Literal, NotRequired
@@ -20,6 +20,7 @@
 
 from ..projects_nodes_io import NodeID, NodeIDStr
 from ..utils.common_validators import empty_str_to_none_pre_validator
+from ._base import OutputSchema
 from .projects_nodes_ui import MarkerUI, PositionUI
 
 
@@ -79,14 +80,15 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
     )
 
 
-class StudyUI(BaseModel):
+class StudyUI(OutputSchema):
     # Model fully controlled by the UI and stored under `projects.ui`
     icon: HttpUrl | None = None
 
     workbench: dict[NodeIDStr, WorkbenchUI] | None = None
     slideshow: dict[NodeIDStr, SlideshowUI] | None = None
-    current_node_id: Annotated[NodeID | None, Field(alias="currentNodeId")] = None
+    current_node_id: NodeID | None = None
     annotations: dict[NodeIDStr, AnnotationUI] | None = None
+    template_type: Literal["hypertool"] | None = None
 
     _empty_is_none = field_validator("*", mode="before")(
         empty_str_to_none_pre_validator
@@ -169,6 +171,7 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                             },
                         },
                         "current_node_id": "4b3345e5-861f-47b0-8b52-a4508449be79",
+                        "template_type": "hypertool",
                     },
                 ]
             }

packages/models-library/src/models_library/rpc/webserver/projects.py

@@ -0,0 +1,41 @@
+from datetime import datetime
+from typing import Annotated, TypeAlias
+
+from models_library.projects import ProjectID
+from models_library.rpc_pagination import PageRpc
+from pydantic import BaseModel, ConfigDict, Field
+
+
+class ProjectRpcGet(BaseModel):
+    """
+    Minimal information about a project that (for now) will fullfill
+    the needs of the api-server. Specifically, the fields needed in
+    project to call create_job_from_project
+    """
+
+    uuid: Annotated[
+        ProjectID,
+        Field(description="project unique identifier"),
+    ]
+    name: Annotated[
+        str,
+        Field(description="project display name"),
+    ]
+    description: str
+
+    # timestamps
+    creation_date: datetime
+    last_change_date: datetime
+
+    model_config = ConfigDict(
+        extra="forbid",
+        populate_by_name=True,
+    )
+
+
+PageRpcProjectRpcGet: TypeAlias = PageRpc[
+    # WARNING: keep this definition in models_library and not in the RPC interface
+    # otherwise the metaclass PageRpc[*] will create *different* classes in server/client side
+    # and will fail to serialize/deserialize these parameters when transmitted/received
+    ProjectRpcGet
+]

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/projects.py

@@ -1,9 +1,16 @@
 import logging
+from typing import cast
 
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.rabbitmq_basic_types import RPCMethodName
+from models_library.rest_pagination import PageOffsetInt
+from models_library.rpc.webserver.projects import PageRpcProjectRpcGet
+from models_library.rpc_pagination import (
+    DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
+    PageLimitInt,
+)
 from models_library.users import UserID
 from pydantic import TypeAdapter, validate_call
 from servicelib.logging_utils import log_decorator
@@ -32,3 +39,29 @@ async def mark_project_as_job(
         job_parent_resource_name=job_parent_resource_name,
     )
     assert result is None
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+@validate_call(config={"arbitrary_types_allowed": True})
+async def list_projects_marked_as_jobs(
+    rpc_client: RabbitMQRPCClient,
+    *,
+    product_name: ProductName,
+    user_id: UserID,
+    # pagination
+    offset: PageOffsetInt = 0,
+    limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
+    # filters
+    job_parent_resource_name_filter: str | None = None,
+) -> PageRpcProjectRpcGet:
+    result = await rpc_client.request(
+        WEBSERVER_RPC_NAMESPACE,
+        TypeAdapter(RPCMethodName).validate_python("list_projects_marked_as_jobs"),
+        product_name=product_name,
+        user_id=user_id,
+        offset=offset,
+        limit=limit,
+        job_parent_resource_name_filter=job_parent_resource_name_filter,
+    )
+    assert TypeAdapter(PageRpcProjectRpcGet).validate_python(result)  # nosec
+    return cast(PageRpcProjectRpcGet, result)

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

@@ -79,6 +79,7 @@ qx.Class.define("osparc.dashboard.Dashboard", {
   members: {
     __studyBrowser: null,
     __templateBrowser: null,
+    __hypertoolBrowser: null,
     __serviceBrowser: null,
     __dataBrowser: null,
 
@@ -90,6 +91,10 @@ qx.Class.define("osparc.dashboard.Dashboard", {
       return this.__templateBrowser;
     },
 
+    getHypertoolBrowser: function() {
+      return this.__hypertoolBrowser;
+    },
+
     getServiceBrowser: function() {
       return this.__serviceBrowser;
     },
@@ -118,6 +123,14 @@ qx.Class.define("osparc.dashboard.Dashboard", {
           icon: "@FontAwesome5Solid/copy/"+tabIconSize,
           buildLayout: this.__createTemplateBrowser
         });
+        tabs.push({
+          id: "hypertoolsTab",
+          buttonId: "hypertoolsTabBtn",
+          label: this.tr("HYPERTOOLS"),
+          icon: "@FontAwesome5Solid/copy/"+tabIconSize,
+          initVisibility: "excluded",
+          buildLayout: this.__createHypertoolsBrowser
+        });
       }
       if (permissions.canDo("dashboard.services.read")) {
         tabs.push({
@@ -128,16 +141,17 @@ qx.Class.define("osparc.dashboard.Dashboard", {
           buildLayout: this.__createServiceBrowser
         });
       }
-      if (permissions.canDo("dashboard.data.read") && osparc.product.Utils.isProduct("osparc")) {
+      if (permissions.canDo("dashboard.data.read")) {
         tabs.push({
           id: "dataTab",
           buttonId: "dataTabBtn",
           label: this.tr("DATA"),
           icon: "@FontAwesome5Solid/folder/"+tabIconSize,
+          initVisibility: osparc.product.Utils.isProduct("osparc") ? "visible" : "excluded",
           buildLayout: this.__createDataBrowser
         });
       }
-      tabs.forEach(({id, buttonId, label, icon, buildLayout}) => {
+      tabs.forEach(({id, buttonId, label, icon, initVisibility, buildLayout}) => {
         const tabPage = new qx.ui.tabview.Page(label, icon).set({
           appearance: "dashboard-page"
         });
@@ -146,6 +160,7 @@ qx.Class.define("osparc.dashboard.Dashboard", {
         tabButton.set({
           minWidth: 50,
           maxHeight: 36,
+          visibility: initVisibility ? initVisibility : "visible",
         });
         tabButton.ttt = label;
         tabButton.getChildControl("label").set({
@@ -171,6 +186,10 @@ qx.Class.define("osparc.dashboard.Dashboard", {
             this.setSelection([tabFound]);
           }
         }, this);
+        viewLayout.addListener("showTab", e => {
+          const showTab = e.getData();
+          tabButton.setVisibility(showTab ? "visible" : "excluded");
+        })
         const scrollerMainView = new qx.ui.container.Scroll();
         scrollerMainView.add(viewLayout);
         tabPage.add(scrollerMainView);
@@ -188,6 +207,7 @@ qx.Class.define("osparc.dashboard.Dashboard", {
           [
             this.__studyBrowser,
             this.__templateBrowser,
+            this.__hypertoolBrowser,
             this.__serviceBrowser,
             this.__dataBrowser
           ].forEach(resourceBrowser => {
@@ -209,6 +229,12 @@ qx.Class.define("osparc.dashboard.Dashboard", {
       return templatesView;
     },
 
+    __createHypertoolsBrowser: function() {
+      const templateType = osparc.data.model.StudyUI.HYPERTOOL_TYPE;
+      const hypertoolsView = this.__hypertoolBrowser = new osparc.dashboard.TemplateBrowser(templateType);
+      return hypertoolsView;
+    },
+
     __createServiceBrowser: function() {
       const servicesView = this.__serviceBrowser = new osparc.dashboard.ServiceBrowser();
       return servicesView;

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

@@ -88,7 +88,8 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
 
   events: {
     "changeTab": "qx.event.type.Data",
-    "publishTemplate": "qx.event.type.Data"
+    "showTab": "qx.event.type.Data",
+    "publishTemplate": "qx.event.type.Data",
   },
 
   statics: {

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

@@ -315,7 +315,16 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
     __rebuildLayout: function(resourceType) {
       this.__cleanAll();
       if (this.getGroupBy()) {
-        const noGroupContainer = this.__createGroupContainer("no-group", "No Group", "transparent");
+        let groupTitle = "No Group";
+        switch (this.getGroupBy()) {
+          case "tags":
+            groupTitle = "Not Tagged";
+            break;
+          case "shared":
+            groupTitle = "Not Shared";
+            break;
+        }
+        const noGroupContainer = this.__createGroupContainer("no-group", groupTitle, "transparent");
         this.__groupedContainers.add(noGroupContainer);
         this._add(this.__groupedContainers);
       } else {

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

@@ -18,12 +18,15 @@
 qx.Class.define("osparc.dashboard.TemplateBrowser", {
   extend: osparc.dashboard.ResourceBrowserBase,
 
-  construct: function() {
+  construct: function(templateType = null) {
     this._resourceType = "template";
+    this.__templateType = templateType;
+
     this.base(arguments);
   },
 
   members: {
+    __templateType: null,
     __updateAllButton: null,
 
     // overridden
@@ -99,7 +102,8 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
 
     __setResourcesToList: function(templatesList) {
       templatesList.forEach(template => template["resourceType"] = "template");
-      this._resourcesList = templatesList;
+      this._resourcesList = templatesList.filter(template => osparc.study.Utils.extractTemplateType(template) === this.__templateType);
+      this.fireDataEvent("showTab", Boolean(this._resourcesList.length));
       this._reloadCards();
     },
 

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

@@ -33,7 +33,8 @@ qx.Class.define("osparc.data.model.StudyUI", {
       slideshow: new osparc.data.model.Slideshow(studyDataUI && studyDataUI.slideshow ? studyDataUI.slideshow : this.getSlideshow()),
       currentNodeId: studyDataUI && studyDataUI.currentNodeId ? studyDataUI.currentNodeId : this.initCurrentNodeId(),
       mode: studyDataUI && studyDataUI.mode ? studyDataUI.mode : this.initMode(),
-      annotations: {}
+      annotations: {},
+      templateType: studyDataUI && studyDataUI.templateType ? studyDataUI.templateType : null,
     });
 
     if ("annotations" in studyDataUI) {
@@ -79,7 +80,18 @@ qx.Class.define("osparc.data.model.StudyUI", {
       check: "Object",
       init: {},
       nullable: true
-    }
+    },
+
+    templateType: {
+      check: [null, "hypertool"],
+      init: null,
+      nullable: true,
+      event: "changeTemplateType",
+    },
+  },
+
+  statics: {
+    HYPERTOOL_TYPE: "hypertool",
   },
 
   members: {

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

@@ -227,12 +227,17 @@ qx.Class.define("osparc.desktop.MainPage", {
       const text = this.tr("Started template creation and added to the background tasks");
       osparc.FlashMessenger.logAs(text, "INFO");
 
+      const studyId = data["studyData"].uuid;
+      const studyName = data["studyData"].name;
+      const copyData = data["copyData"];
+      const templateAccessRights = data["accessRights"];
+      const templateType = data["templateType"];
+
       const params = {
         url: {
-          "study_id": data["studyData"].uuid,
-          "copy_data": data["copyData"]
+          "study_id": studyId,
+          "copy_data": copyData
         },
-        data: data["studyData"]
       };
       const options = {
         pollTask: true
@@ -242,12 +247,27 @@ qx.Class.define("osparc.desktop.MainPage", {
       pollTasks.createPollingTask(fetchPromise)
         .then(task => {
           const templateBrowser = this.__dashboard.getTemplateBrowser();
+          const hypertoolBrowser = this.__dashboard.getHypertoolBrowser();
           if (templateBrowser) {
-            templateBrowser.taskToTemplateReceived(task, data["studyData"].name);
+            templateBrowser.taskToTemplateReceived(task, studyName);
           }
           task.addListener("resultReceived", e => {
             const templateData = e.getData();
-            osparc.store.Study.addCollaborators(templateData, data["accessRights"]);
+            // these operations need to be done after template creation
+            osparc.store.Study.addCollaborators(templateData, templateAccessRights);
+            if (templateType) {
+              const studyUI = osparc.utils.Utils.deepCloneObject(templateData["ui"]);
+              studyUI["templateType"] = templateType;
+              osparc.store.Study.patchStudyData(templateData, "ui", studyUI)
+                .then(() => {
+                  if (templateBrowser) {
+                    templateBrowser.reloadResources();
+                  }
+                  if (hypertoolBrowser) {
+                    hypertoolBrowser.reloadResources();
+                  }
+                });
+            }
           });
         })
         .catch(errMsg => {

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

@@ -22,7 +22,7 @@
  * - Product everyone
  */
 
-qx.Class.define("osparc.share.PublishTemplate", {
+qx.Class.define("osparc.share.ShareTemplateWith", {
   extend: qx.ui.core.Widget,
 
   /**