merge master into 7199-create-storage-workhorse-mode

Author: bisgaard-itis

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

@@ -13,6 +13,7 @@
 from .utils.enums import StrAutoEnum
 
 LicensedItemID: TypeAlias = UUID
+LicensedResourceID: TypeAlias = UUID
 
 
 class LicensedResourceType(StrAutoEnum):
@@ -90,6 +91,28 @@ class LicensedItemUpdateDB(BaseModel):
     trash: bool | None = None
 
 
+class LicensedResourceDB(BaseModel):
+    licensed_resource_id: LicensedResourceID
+    display_name: str
+
+    licensed_resource_name: str
+    licensed_resource_type: LicensedResourceType
+    licensed_resource_data: dict[str, Any] | None
+
+    # states
+    created: datetime
+    modified: datetime
+    trashed: datetime | None
+
+    model_config = ConfigDict(from_attributes=True)
+
+
+class LicensedResourcePatchDB(BaseModel):
+    display_name: str | None = None
+    licensed_resource_name: str | None = None
+    trash: bool | None = None
+
+
 class LicensedItem(BaseModel):
     licensed_item_id: LicensedItemID
     display_name: str

packages/postgres-database/src/simcore_postgres_database/migration/versions/68777fdf9539_add_licensed_resources.py

@@ -0,0 +1,93 @@
+"""add licensed resources
+
+Revision ID: 68777fdf9539
+Revises: 061607911a22
+Create Date: 2025-02-09 10:24:50.533653+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "68777fdf9539"
+down_revision = "061607911a22"
+branch_labels = None
+depends_on = None
+
+
+# Reuse the existing Enum type
+existing_enum = sa.Enum("VIP_MODEL", name="licensedresourcetype", native_enum=False)
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "licensed_resources",
+        sa.Column(
+            "licensed_resource_id",
+            postgresql.UUID(as_uuid=True),
+            server_default=sa.text("gen_random_uuid()"),
+            nullable=False,
+        ),
+        sa.Column("display_name", sa.String(), nullable=False),
+        sa.Column("licensed_resource_name", sa.String(), nullable=False),
+        sa.Column(
+            "licensed_resource_type",
+            existing_enum,  # Reuse existing Enum instead of redefining it
+            nullable=False,
+        ),
+        sa.Column(
+            "licensed_resource_data",
+            postgresql.JSONB(astext_type=sa.Text()),
+            nullable=True,
+        ),
+        sa.Column(
+            "created",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
+            nullable=False,
+        ),
+        sa.Column(
+            "modified",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
+            nullable=False,
+        ),
+        sa.Column(
+            "trashed",
+            sa.DateTime(timezone=True),
+            nullable=True,
+            comment="The date and time when the licensed_resources was marked as trashed. Null if the licensed_resources has not been trashed [default].",
+        ),
+        sa.PrimaryKeyConstraint("licensed_resource_id"),
+        sa.UniqueConstraint(
+            "licensed_resource_name",
+            "licensed_resource_type",
+            name="uq_licensed_resource_name_type2",
+        ),
+    )
+    # ### end Alembic commands ###
+
+    # Migration of licensed resources from licensed_items table to new licensed_resources table
+    op.execute(
+        sa.DDL(
+            """
+    INSERT INTO licensed_resources (display_name, licensed_resource_name, licensed_resource_type, licensed_resource_data, created, modified)
+    SELECT
+        display_name,
+        licensed_resource_name,
+        licensed_resource_type,
+        licensed_resource_data,
+        CURRENT_TIMESTAMP as created,
+        CURRENT_TIMESTAMP as modified
+    FROM licensed_items
+        """
+        )
+    )
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("licensed_resources")
+    # ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/models/licensed_resources.py

@@ -0,0 +1,58 @@
+""" resource_tracker_service_runs table
+"""
+
+
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+from ._common import (
+    column_created_datetime,
+    column_modified_datetime,
+    column_trashed_datetime,
+)
+from .base import metadata
+from .licensed_items import LicensedResourceType
+
+licensed_resources = sa.Table(
+    "licensed_resources",
+    metadata,
+    sa.Column(
+        "licensed_resource_id",
+        postgresql.UUID(as_uuid=True),
+        nullable=False,
+        primary_key=True,
+        server_default=sa.text("gen_random_uuid()"),
+    ),
+    sa.Column(
+        "display_name",
+        sa.String,
+        nullable=False,
+        doc="Display name for front-end",
+    ),
+    sa.Column(
+        "licensed_resource_name",
+        sa.String,
+        nullable=False,
+        doc="Resource name identifier",
+    ),
+    sa.Column(
+        "licensed_resource_type",
+        sa.Enum(LicensedResourceType),
+        nullable=False,
+        doc="Resource type, ex. VIP_MODEL",
+    ),
+    sa.Column(
+        "licensed_resource_data",
+        postgresql.JSONB,
+        nullable=True,
+        doc="Resource metadata. Used for read-only purposes",
+    ),
+    column_created_datetime(timezone=True),
+    column_modified_datetime(timezone=True),
+    column_trashed_datetime("licensed_resources"),
+    sa.UniqueConstraint(
+        "licensed_resource_name",
+        "licensed_resource_type",
+        name="uq_licensed_resource_name_type2",
+    ),
+)

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

@@ -549,7 +549,9 @@ qx.Class.define("osparc.data.model.Node", {
       return this.getIframeHandler() ? this.getIframeHandler().getLoadingPage() : null;
     },
 
-    __applyPropsForm: function() {
+    __applyPropsForm: function(propsForm) {
+      osparc.utils.Utils.setIdToWidget(propsForm, "settingsForm_" + this.getNodeId());
+
       const checkIsPipelineRunning = () => {
         const isPipelineRunning = this.getStudy().isPipelineRunning();
         this.getPropsForm().setEnabled(!isPipelineRunning);

services/static-webserver/client/source/class/osparc/node/slideshow/NodeView.js

@@ -38,13 +38,6 @@ qx.Class.define("osparc.node.slideshow.NodeView", {
 
   statics: {
     LOGGER_HEIGHT: 28,
-
-    isPropsFormShowable: function(node) {
-      if (node && ("getPropsForm" in node) && node.getPropsForm()) {
-        return node.getPropsForm().hasVisibleInputs();
-      }
-      return false;
-    }
   },
 
   members: {
@@ -135,8 +128,8 @@ qx.Class.define("osparc.node.slideshow.NodeView", {
     },
 
     isSettingsGroupShowable: function() {
-      const node = this.getNode();
-      return this.self().isPropsFormShowable(node);
+      // do not show Settings in App Mode
+      return false;
     },
 
     __iFrameChanged: function() {

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

@@ -401,7 +401,6 @@ qx.Class.define("osparc.study.Utils", {
       // the was to guess the TI type is to check the boot mode of the ti-postpro in the pipeline
       const tiPostpro = Object.values(studyData["workbench"]).find(srv => srv.key.includes("ti-postpro"));
       if (tiPostpro && tiPostpro["bootOptions"]) {
-        console.log(tiPostpro);
         switch (tiPostpro["bootOptions"]["boot_mode"]) {
           case "0":
             // classic TI

services/static-webserver/client/source/class/osparc/ui/basic/DateAndBy.js

@@ -96,9 +96,12 @@ qx.Class.define("osparc.ui.basic.DateAndBy", {
         const atom = this.getChildControl("last-touching");
         const myGroupId = osparc.auth.Data.getInstance().getGroupId();
         if (groupId === myGroupId) {
-          atom.setLabel("by me");
+          atom.set({
+            label: "by me",
+            icon: null,
+          })
         } else {
-          atom.setLabel("by");
+          atom.setLabel("by ");
           osparc.dashboard.CardBase.addHintFromGids(atom, [groupId]);
         }
       }

services/static-webserver/client/source/class/osparc/vipMarket/AnatomicalModelDetails.js

@@ -73,29 +73,39 @@ qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
       }
     },
 
-    __createModelInfo: function(anatomicalModelsData) {
-      const cardGrid = new qx.ui.layout.Grid(16, 16);
-      const cardLayout = new qx.ui.container.Composite(cardGrid);
+    __createModelInfo: function(anatomicalModelsDataSource) {
+      const cardLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(16));
 
-      const description = anatomicalModelsData["description"] || "";
-      description.split(" - ").forEach((desc, idx) => {
+      const description = anatomicalModelsDataSource["description"] || "";
+      const delimiter = " - ";
+      let titleAndSubtitle = description.split(delimiter);
+      if (titleAndSubtitle.length > 0) {
         const titleLabel = new qx.ui.basic.Label().set({
-          value: desc,
+          value: titleAndSubtitle[0],
           font: "text-16",
-          alignX: "center",
           alignY: "middle",
           allowGrowX: true,
           allowGrowY: true,
         });
-        cardLayout.add(titleLabel, {
-          column: 0,
-          row: idx,
-          colSpan: 2,
+        cardLayout.add(titleLabel);
+        titleAndSubtitle.shift();
+      }
+      if (titleAndSubtitle.length > 0) {
+        titleAndSubtitle = titleAndSubtitle.join(delimiter);
+        const subtitleLabel = new qx.ui.basic.Label().set({
+          value: titleAndSubtitle,
+          font: "text-16",
+          alignY: "middle",
+          allowGrowX: true,
+          allowGrowY: true,
         });
-      });
+        cardLayout.add(subtitleLabel);
+      }
+
 
+      const middleLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(16));
       const thumbnail = new qx.ui.basic.Image().set({
-        source: anatomicalModelsData["thumbnail"],
+        source: anatomicalModelsDataSource["thumbnail"],
         alignY: "middle",
         scale: true,
         allowGrowX: true,
@@ -105,12 +115,9 @@ qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
         maxWidth: 256,
         maxHeight: 256,
       });
-      cardLayout.add(thumbnail, {
-        column: 0,
-        row: 2,
-      });
+      middleLayout.add(thumbnail);
 
-      const features = anatomicalModelsData["features"];
+      const features = anatomicalModelsDataSource["features"];
       const featuresGrid = new qx.ui.layout.Grid(8, 8);
       const featuresLayout = new qx.ui.container.Composite(featuresGrid);
       let idx = 0;
@@ -176,15 +183,14 @@ qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
         }
         return doiLabel;
       };
-      featuresLayout.add(doiToLink(anatomicalModelsData["doi"]), {
+      featuresLayout.add(doiToLink(anatomicalModelsDataSource["doi"]), {
         column: 1,
         row: idx,
       });
 
-      cardLayout.add(featuresLayout, {
-        column: 1,
-        row: 2,
-      });
+      middleLayout.add(featuresLayout);
+
+      cardLayout.add(middleLayout);
 
       return cardLayout;
     },

services/static-webserver/client/source/class/osparc/vipMarket/VipMarket.js

@@ -182,17 +182,15 @@ qx.Class.define("osparc.vipMarket.VipMarket", {
           this.__anatomicalModels = [];
           licensedItems.forEach(licensedItem => {
             const anatomicalModel = osparc.utils.Utils.deepCloneObject(licensedItem);
-            anatomicalModel["modelId"] = anatomicalModel["licensedResourceData"]["source"]["id"];
+            const anatomicalModelDataSource = anatomicalModel["licensedResourceData"]["source"];
+            anatomicalModel["modelId"] = anatomicalModelDataSource["id"];
             anatomicalModel["thumbnail"] = "";
             anatomicalModel["date"] = null;
-            if (anatomicalModel["licensedResourceData"] && anatomicalModel["licensedResourceData"]["source"]) {
-              const anatomicalModelSource = anatomicalModel["licensedResourceData"]["source"];
-              if (anatomicalModelSource["thumbnail"]) {
-                anatomicalModel["thumbnail"] = anatomicalModelSource["thumbnail"];
-              }
-              if (anatomicalModelSource["features"] && anatomicalModelSource["features"]["date"]) {
-                anatomicalModel["date"] = new Date(anatomicalModelSource["features"]["date"]);
-              }
+            if (anatomicalModelDataSource["thumbnail"]) {
+              anatomicalModel["thumbnail"] = anatomicalModelDataSource["thumbnail"];
+            }
+            if (anatomicalModelDataSource["features"] && anatomicalModelDataSource["features"]["date"]) {
+              anatomicalModel["date"] = new Date(anatomicalModelDataSource["features"]["date"]);
             }
             // attach license data
             anatomicalModel["licensedItemId"] = licensedItem["licensedItemId"];