Merge branch 'master' into is1771/share-tags

Author: odeimaiz

packages/postgres-database/src/simcore_postgres_database/migration/versions/307017ee1a49_add_deprecated_submit_column.py

@@ -0,0 +1,28 @@
+"""add deprecated submit column
+
+Revision ID: 307017ee1a49
+Revises: 1e3c9c804fec
+Create Date: 2025-01-06 12:53:51.604189+00:00
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '307017ee1a49'
+down_revision = '1e3c9c804fec'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('comp_tasks', sa.Column('submit', sa.DateTime(timezone=True), server_default=sa.text("'1900-01-01T00:00:00Z'::timestamptz"), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('comp_tasks', 'submit')
+    # ### end Alembic commands ###

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

@@ -1,6 +1,4 @@
-""" Computational Tasks Table
-
-"""
+"""Computational Tasks Table"""
 
 import enum
 
@@ -102,6 +100,14 @@ class NodeClass(enum.Enum):
         nullable=True,
         doc="Harware information of this task",
     ),
+    # deprecated columns must be kept due to legacy services
+    # utc timestamps for submission/start/end
+    sa.Column(
+        "submit",
+        sa.DateTime(timezone=True),
+        server_default=sa.text("'1900-01-01T00:00:00Z'::timestamptz"),
+        doc="[DEPRECATED unused but kept for legacy services and must be filled with a default value of 1 January 1900]",
+    ),
     # ------
     sa.UniqueConstraint("project_id", "node_id", name="project_node_uniqueness"),
 )

services/director-v2/src/simcore_service_director_v2/models/comp_tasks.py

@@ -150,6 +150,10 @@ class CompTaskAtDB(BaseModel):
     pricing_info: dict | None
     hardware_info: HardwareInfo
 
+    submit: dt.datetime | None = Field(
+        default=None, deprecated=True, description="Required for legacy services"
+    )
+
     @field_validator("state", mode="before")
     @classmethod
     def _convert_state_from_state_type_enum_if_needed(cls, v):
@@ -238,7 +242,9 @@ def to_db_model(self, **exclusion_rules) -> dict[str, Any]:
                         "pricing_unit_id": 1,
                         "pricing_unit_cost_id": 1,
                     },
-                    "hardware_info": next(iter(HardwareInfo.model_config["json_schema_extra"]["examples"])),  # type: ignore
+                    "hardware_info": next(
+                        iter(HardwareInfo.model_config["json_schema_extra"]["examples"])  # type: ignore
+                    ),
                 }
                 for image_example in Image.model_config["json_schema_extra"]["examples"]  # type: ignore
             ]

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

@@ -576,7 +576,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         const data = e.getData();
         const destWorkspaceId = data["workspaceId"];
         const destFolderId = data["folderId"];
-        this._folderToFolderRequested(folderId, currentWorkspaceId, destWorkspaceId, destFolderId);
+        this.__folderToFolderRequested(folderId, currentWorkspaceId, destWorkspaceId, destFolderId);
       });
       moveFolderTo.addListener("cancel", () => win.close());
     },
@@ -591,7 +591,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         });
     },
 
-    _folderToFolderRequested: function(folderId, workspaceId, destWorkspaceId, destFolderId) {
+    __folderToFolderRequested: function(folderId, workspaceId, destWorkspaceId, destFolderId) {
       if (destWorkspaceId === workspaceId) {
         this.__doMoveFolder(folderId, destWorkspaceId, destFolderId);
       } else {
@@ -1183,7 +1183,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           destWorkspaceId,
           destFolderId,
         } = e.getData();
-        this._moveStudyToFolderReqested(studyData, destWorkspaceId, destFolderId);
+        this.__studyToFolderRequested(studyData, destWorkspaceId, destFolderId);
       });
       workspacesAndFoldersTree.addListener("folderToFolderRequested", e => {
         const {
@@ -1192,17 +1192,38 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           destWorkspaceId,
           destFolderId,
         } = e.getData();
-        this._folderToFolderRequested(folderId, workspaceId, destWorkspaceId, destFolderId);
+        this.__folderToFolderRequested(folderId, workspaceId, destWorkspaceId, destFolderId);
       });
 
       this._resourceFilter.addListener("trashStudyRequested", e => {
-        this.__trashStudyRequested(e.getData());
+        const studyData = e.getData();
+        this.__trashStudyRequested(studyData);
       });
       this._resourceFilter.addListener("trashFolderRequested", e => {
-        this._trashFolderRequested(e.getData());
+        const folderId = e.getData();
+        this._trashFolderRequested(folderId);
       });
     },
 
+    _studyToFolderRequested: function(data) {
+      const {
+        studyData,
+        destWorkspaceId,
+        destFolderId,
+      } = data;
+      this.__studyToFolderRequested(studyData, destWorkspaceId, destFolderId);
+    },
+
+    _folderToFolderRequested: function(data) {
+      const {
+        folderId,
+        workspaceId,
+        destWorkspaceId,
+        destFolderId,
+      } = data;
+      this.__folderToFolderRequested(folderId, workspaceId, destWorkspaceId, destFolderId);
+    },
+
     __addSortByButton: function() {
       const sortByButton = new osparc.dashboard.SortedByMenuButton();
       sortByButton.set({
@@ -1686,7 +1707,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         });
     },
 
-    _moveStudyToFolderReqested: function(studyData, destWorkspaceId, destFolderId) {
+    __studyToFolderRequested: function(studyData, destWorkspaceId, destFolderId) {
       if (studyData["workspaceId"] === destWorkspaceId) {
         this.__doMoveStudy(studyData, destWorkspaceId, destFolderId);
       } else {
@@ -1713,7 +1734,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           const data = e.getData();
           const destWorkspaceId = data["workspaceId"];
           const destFolderId = data["folderId"];
-          this._moveStudyToFolderReqested(studyData, destWorkspaceId, destFolderId);
+          this.__studyToFolderRequested(studyData, destWorkspaceId, destFolderId);
         }, this);
         moveStudyTo.addListener("cancel", () => win.close());
       }, this);

services/static-webserver/client/source/class/osparc/file/FilesTree.js

@@ -181,7 +181,7 @@ qx.Class.define("osparc.file.FilesTree", {
             newChildren[0].children[0].children.length) { // node
             const nodeData = newChildren[0].children[0].children[0];
             const nodeTreeName = nodeData.label;
-            this.__resetTree(nodeTreeName);
+            this.__resetTree(nodeTreeName, nodeId);
             const rootNodeModel = this.getModel();
             if (nodeData.children.length) {
               const nodeItemsOnly = nodeData.children;
@@ -253,12 +253,12 @@ qx.Class.define("osparc.file.FilesTree", {
       }
     },
 
-    __resetTree: function(treeName) {
-      // FIXME: It is not resetting the model
+    __resetTree: function(treeName, itemId) {
+      itemId = itemId || treeName.replace(/\s/g, ""); // default to tree name without white spaces
       this.resetModel();
       const rootData = {
         label: treeName,
-        itemId: treeName.replace(/\s/g, ""), // remove all white spaces
+        itemId,
         location: null,
         path: null,
         pathLabel: [treeName],

services/static-webserver/client/source/class/osparc/file/TreeFolderView.js

@@ -119,15 +119,14 @@ qx.Class.define("osparc.file.TreeFolderView", {
       let found = false;
       while (!found && path.length) {
         found = foldersTree.findItemId(path.join("/"));
-        if (found) {
-          foldersTree.openNodeAndParents(found);
-          foldersTree.setSelection(new qx.data.Array([found]));
-          foldersTree.fireEvent("selectionChanged");
-        }
         // look for next parent
         path.pop();
       }
-      if (!found) {
+      if (found) {
+        foldersTree.openNodeAndParents(found);
+        foldersTree.setSelection(new qx.data.Array([found]));
+        foldersTree.fireEvent("selectionChanged");
+      } else {
         folderViewer.resetFolder();
       }
     }

services/static-webserver/client/source/class/osparc/widget/NodeDataManager.js

@@ -125,6 +125,10 @@ qx.Class.define("osparc.widget.NodeDataManager", {
       foldersTree.resetCache();
 
       const openSameFolder = () => {
+        if (!this.getStudyId()) {
+          // drop first, which is the study id
+          path.shift();
+        }
         // drop last, which is the file
         path.pop();
         treeFolderView.openPath(path);

services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js

@@ -129,7 +129,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
     __selectedItemId: null,
     __startHint: null,
     __toolHint: null,
-    __dropHereNodeUI: null,
+    __dropHereUI: null,
     __selectionRectInitPos: null,
     __selectionRectRepr: null,
     __panning: null,
@@ -1685,7 +1685,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
         this.setDroppable(true);
         const stopDragging = e => {
           this.__isDraggingLink = null;
-          this.__updateWidgets(false);
+          this.__updateDropHere(false);
         };
         const startDragging = e => {
           this.addListenerOnce("dragleave", stopDragging, this);
@@ -1786,7 +1786,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
 
       const posX = e.offsetX + 2;
       const posY = e.offsetY + 2;
-      this.__updateWidgets(dragging, posX, posY);
+      this.__updateDropHere(dragging, posX, posY);
     },
 
     __draggingLink: function(e, dragging) {
@@ -1802,34 +1802,36 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
       }
 
       const pos = this.__pointerEventToWorkbenchPos(e);
-      this.__updateWidgets(dragging, pos.x, pos.y);
+      this.__updateDropHere(dragging, pos.x, pos.y);
     },
 
-    __updateWidgets: function(dragging, posX, posY) {
+    __updateDropHere: function(show, posX, posY) {
       const boxWidth = 120;
       const boxHeight = 60;
-      if (this.__dropHereNodeUI === null) {
-        const dropHereNodeUI = this.__dropHereNodeUI = new qx.ui.basic.Label(this.tr("Drop here")).set({
+      if (this.__dropHereUI === null) {
+        const dropHereNodeUI = this.__dropHereUI = new qx.ui.basic.Label(this.tr("Drop here")).set({
           font: "workbench-start-hint",
           textColor: "workbench-start-hint"
         });
         dropHereNodeUI.exclude();
         this.__workbenchLayout.add(dropHereNodeUI);
         dropHereNodeUI.rect = this.__svgLayer.drawDashedRect(boxWidth, boxHeight);
       }
-      const dropMe = this.__dropHereNodeUI;
-      if (dragging) {
-        dropMe.show();
-        const dropMeBounds = dropMe.getBounds() || dropMe.getSizeHint();
-        dropMe.setLayoutProperties({
+      let dropHere = this.__dropHereUI;
+      if (show) {
+        dropHere.show();
+        const dropMeBounds = dropHere.getBounds() || dropHere.getSizeHint();
+        dropHere.setLayoutProperties({
           left: posX - parseInt(dropMeBounds.width/2) - parseInt(boxWidth/2),
           top: posY - parseInt(dropMeBounds.height/2)- parseInt(boxHeight/2)
         });
-        if ("rect" in dropMe) {
-          osparc.wrapper.Svg.updateItemPos(dropMe.rect, posX - boxWidth, posY - boxHeight);
+        if ("rect" in dropHere) {
+          osparc.wrapper.Svg.updateItemPos(dropHere.rect, posX - boxWidth, posY - boxHeight);
         }
       } else {
-        this.__removeDropHint();
+        dropHere.exclude();
+        osparc.wrapper.Svg.removeItem(dropHere.rect);
+        dropHere = null;
       }
     },
 
@@ -2017,14 +2019,14 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
       this.__draggingLink(e, false);
 
       if (this.__isDraggingLink && "dragData" in this.__isDraggingLink) {
+        const data = this.__isDraggingLink["dragData"];
+        this.__isDraggingLink = null;
         const pos = this.__pointerEventToWorkbenchPos(e, false);
         const service = qx.data.marshal.Json.createModel(osparc.service.Utils.getFilePicker());
         const nodeUI = await this.__addNode(service, pos);
         if (nodeUI) {
           const node = nodeUI.getNode();
-          const data = this.__isDraggingLink["dragData"];
           osparc.file.FilePicker.setOutputValueFromStore(node, data.getLocation(), data.getDatasetId(), data.getFileId(), data.getLabel());
-          this.__isDraggingLink = null;
         }
       }
     },
@@ -2047,11 +2049,5 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
         });
       }
     },
-
-    __removeDropHint: function() {
-      this.__dropHereNodeUI.setVisibility("excluded");
-      osparc.wrapper.Svg.removeItem(this.__dropHereNodeUI.rect);
-      this.__dropHereNodeUI = null;
-    }
   }
 });