Merge branch 'feature/functinos-browser' of github.com:odeimaiz/osparc-simcore into feature/functinos-browser

Author: odeimaiz

.env-devel

@@ -395,6 +395,7 @@ WEBSERVER_PROJECTS={}
 WEBSERVER_PROMETHEUS_API_VERSION=v1
 WEBSERVER_PROMETHEUS_URL=http://prometheus:9090
 WEBSERVER_PUBLICATIONS=1
+WEBSERVER_REALTIME_COLLABORATION='{"RTC_MAX_NUMBER_OF_USERS":3}'
 WEBSERVER_SCICRUNCH={}
 WEBSERVER_SESSION_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
 WEBSERVER_SOCKETIO=1

packages/postgres-database/docker/Dockerfile

@@ -55,11 +55,5 @@ COPY entrypoint.bash /home/entrypoint.bash
 
 RUN chmod +x /home/entrypoint.bash
 
-ENV POSTGRES_USER=scu \
-  POSTGRES_PASSWORD=adminadmin \
-  POSTGRES_HOST=postgres \
-  POSTGRES_PORT=5432 \
-  POSTGRES_DB=simcoredb
-
 ENTRYPOINT [ "/bin/bash", "/home/entrypoint.bash" ]
 CMD [ "sc-pg", "upgrade" ]

services/dask-sidecar/Dockerfile

@@ -5,7 +5,7 @@ ARG PYTHON_VERSION="3.11.9"
 ARG UV_VERSION="0.7"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
-FROM --platform=${TARGETPLATFORM} python:${PYTHON_VERSION}-slim-bookworm AS base
+FROM python:${PYTHON_VERSION}-slim-bookworm AS base
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN echo "I am running on $BUILDPLATFORM, building for $TARGETPLATFORM" > /log

services/docker-compose.yml

@@ -673,6 +673,7 @@ services:
       SWARM_STACK_NAME: ${SWARM_STACK_NAME}
 
       WEBSERVER_DEV_FEATURES_ENABLED: ${WEBSERVER_DEV_FEATURES_ENABLED}
+      WEBSERVER_REALTIME_COLLABORATION: ${WEBSERVER_REALTIME_COLLABORATION}
 
       WEBSERVER_LOGLEVEL: ${WEBSERVER_LOGLEVEL}
       WEBSERVER_PROFILING: ${WEBSERVER_PROFILING}

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/outputs/_manager.py

@@ -118,6 +118,7 @@ def __init__(
 
         self._port_key_tracker = _PortKeyTracker()
         self._task_uploading: Task | None = None
+        self._task_uploading_followup: Task | None = None
         self._task_scheduler_worker: Task | None = None
         self._schedule_all_ports_for_upload: bool = False
 
@@ -171,14 +172,22 @@ def _remove_downloads(future: Future) -> None:
                 except Exception as e:  # pylint: disable=broad-except
                     self._last_upload_error_tracker[port_key] = e
 
-            create_task(self._port_key_tracker.remove_all_uploading())
+            self._task_uploading_followup = create_task(
+                self._port_key_tracker.remove_all_uploading()
+            )
 
         self._task_uploading.add_done_callback(_remove_downloads)
 
     async def _uploading_task_cancel(self) -> None:
         if self._task_uploading is not None:
             await _cancel_task(self._task_uploading, self.task_cancellation_timeout_s)
             await self._port_key_tracker.move_all_uploading_to_pending()
+            self._task_uploading = None
+        if self._task_uploading_followup is not None:
+            await _cancel_task(
+                self._task_uploading_followup, self.task_cancellation_timeout_s
+            )
+            self._task_uploading_followup = None
 
     async def _scheduler_worker(self) -> None:
         if await self._port_key_tracker.are_pending_ports_uploading():

services/migration/Dockerfile

@@ -84,14 +84,7 @@ FROM base AS production
 
 ENV PYTHONOPTIMIZE=TRUE
 
-# testing defaults
-ENV POSTGRES_USER=scu \
-  POSTGRES_PASSWORD=adminadmin \
-  POSTGRES_HOST=postgres \
-  POSTGRES_PORT=5432 \
-  POSTGRES_DB=simcoredb \
-  SC_DONE_MARK_FILE=migration.done
-
+ENV SC_DONE_MARK_FILE=migration.done
 
 WORKDIR /home/scu
 

services/static-webserver/client/Makefile

@@ -44,7 +44,7 @@ follow-dev-logs: ## follow the logs of the qx compiler
 .PHONY: compile touch upgrade
 compile: ## qx compiles host' 'source' -> image's 'build-output'
 	# qx compile 'source' within $(docker_image) image  [itisfoundation/qooxdoo-kit:${QOOXDOO_KIT_TAG}]
-	@docker --debug buildx build \
+	@docker buildx build \
 		--load \
 		--file $(docker_file) \
 		--tag $(docker_image) \
@@ -58,7 +58,7 @@ compile: ## qx compiles host' 'source' -> image's 'build-output'
 
 touch: ## minimal image build with /project/output-build inside
 	# touch /project/output-build such that multi-stage 'services/web/Dockerfile' can build development target (fixes #1097)
-	@docker --debug buildx build \
+	@docker buildx build \
 		--load \
 		--file $(docker_file) \
 		--tag $(docker_image) \

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

@@ -24,6 +24,14 @@ qx.Class.define("osparc.dashboard.CardBase", {
   construct: function() {
     this.base(arguments);
 
+    if (osparc.utils.DisabledPlugins.isSimultaneousAccessEnabled()) {
+      // "IN_USE" is not a blocker anymore
+      const inUseIdx = qx.util.PropertyUtil.getProperties(osparc.dashboard.CardBase).blocked.check.indexOf("IN_USE");
+      if (inUseIdx > -1) {
+        qx.util.PropertyUtil.getProperties(osparc.dashboard.CardBase).blocked.check.splice(inUseIdx, 1);
+      }
+    }
+
     [
       "pointerover",
       "focus"
@@ -780,13 +788,22 @@ qx.Class.define("osparc.dashboard.CardBase", {
     },
 
     __applyState: function(state) {
-      let lockInUse = false;
+      let projectInUse = false;
       if ("locked" in state && "value" in state["locked"]) {
-        lockInUse = state["locked"]["value"];
+        projectInUse = state["locked"]["value"];
       }
-      this.setBlocked(lockInUse ? "IN_USE" : false);
-      if (lockInUse) {
-        this.__showBlockedCardFromStatus("IN_USE", state["locked"]);
+
+      if (osparc.utils.DisabledPlugins.isSimultaneousAccessEnabled()) {
+        if (projectInUse && state["locked"]["status"] === "OPENED") {
+          this.__showWhoIsIn(state["locked"]["owner"]);
+        } else {
+          this.__showWhoIsIn(null);
+        }
+      } else {
+        this.setBlocked(projectInUse ? "IN_USE" : false);
+        if (projectInUse) {
+          this.__showBlockedCardFromStatus("IN_USE", state["locked"]);
+        }
       }
 
       const pipelineState = ("state" in state) ? state["state"]["value"] : undefined;
@@ -866,6 +883,30 @@ qx.Class.define("osparc.dashboard.CardBase", {
       });
     },
 
+    __showWhoIsIn: function(whoIsIn) {
+      let users = [];
+      if (whoIsIn) {
+        // replace this once the backend returns a list of group__ids
+        const allUsers = [
+          { name: "Alice", avatar: "https://i.pravatar.cc/150?img=1" },
+          { name: "Bob", avatar: "https://i.pravatar.cc/150?img=2" },
+          { name: "Charlie", avatar: "https://i.pravatar.cc/150?img=3" },
+          { name: "Dana", avatar: "https://i.pravatar.cc/150?img=4" },
+          { name: "Eve", avatar: "https://i.pravatar.cc/150?img=5" },
+          { name: "Frank", avatar: "https://i.pravatar.cc/150?img=6" },
+        ];
+        // Random number of users between 1 and 6
+        const randomCount = Math.floor(Math.random() * 6) + 1;
+        // Shuffle the array and take the first randomCount users
+        const shuffled = allUsers.sort(() => 0.5 - Math.random());
+        users = shuffled.slice(0, randomCount);
+      }
+      if (osparc.utils.DisabledPlugins.isSimultaneousAccessEnabled() && this.getResourceType() === "study") {
+        const avatarGroup = this.getChildControl("avatar-group");
+        avatarGroup.setUsers(users);
+      }
+    },
+
     __showBlockedCardFromStatus: function(reason, moreInfo) {
       switch (reason) {
         case "IN_USE":

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

@@ -43,35 +43,41 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
   statics: {
     ITEM_WIDTH: 190,
     ITEM_HEIGHT: 220,
-    PADDING: 10,
-    TITLE_PADDING: 6,
-    SPACING_IN: 5,
+    PADDING: 6,
     SPACING: 15,
     THUMBNAIL_SIZE: 50,
     POS: {
       TITLE: {
         row: 0,
         column: 0,
-        rowSpan: 1,
-        colSpan: 4
       },
-      THUMBNAIL: {
-        row: 2,
+      BODY: {
+        row: 1,
         column: 0,
-        rowSpan: 1,
-        colSpan: 4
-      },
-      TAGS: {
-        row: 3,
-        column: 0
       },
       FOOTER: {
-        row: 4,
+        row: 2,
         column: 0,
-        rowSpan: 1,
-        colSpan: 4
       }
     },
+    HPOS: {
+      ICON: {
+        column: 0,
+        row: 0,
+      },
+      TITLE: {
+        column: 1,
+        row: 0,
+      },
+      SUBTITLE_ICON: {
+        column: 0,
+        row: 1,
+      },
+      SUBTITLE_TEXT: {
+        column: 1,
+        row: 1,
+      },
+    },
     FPOS: {
       MODIFIED: {
         row: 0,
@@ -97,7 +103,7 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
         row: 1,
         column: 2,
       }
-    }
+    },
   },
 
   events: {
@@ -113,20 +119,21 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
       switch (id) {
         case "main-layout": {
           const grid = new qx.ui.layout.Grid();
-          grid.setSpacing(this.self().SPACING_IN);
-          grid.setRowFlex(2, 1);
+          grid.setRowFlex(this.self().POS.BODY.row, 1);
           grid.setColumnFlex(0, 1);
 
           control = new qx.ui.container.Composite().set({
+            minWidth: this.self().ITEM_WIDTH,
+            minHeight: this.self().ITEM_HEIGHT,
             maxWidth: this.self().ITEM_WIDTH,
-            maxHeight: this.self().ITEM_HEIGHT
+            maxHeight: this.self().ITEM_HEIGHT,
           });
           control.setLayout(grid);
           const header = this.getChildControl("header");
           const body = this.getChildControl("body");
           const footer = this.getChildControl("footer");
           control.add(header, this.self().POS.TITLE);
-          control.add(body, this.self().POS.THUMBNAIL);
+          control.add(body, this.self().POS.BODY);
           control.add(footer, this.self().POS.FOOTER);
           this._add(control, {
             top: 0,
@@ -140,8 +147,8 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
           const hGrid = new qx.ui.layout.Grid().set({
             spacing: 6,
           });
-          hGrid.setRowFlex(0, 1);
-          hGrid.setColumnFlex(1, 1);
+          hGrid.setRowFlex(this.self().HPOS.TITLE.row, 1);
+          hGrid.setColumnFlex(this.self().HPOS.TITLE.column, 1);
           hGrid.setColumnAlign(0, "right", "middle");
           hGrid.setColumnAlign(1, "left", "middle");
           hGrid.setColumnAlign(2, "center", "middle");
@@ -157,24 +164,17 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
           break;
         }
         case "body":
-          control = new qx.ui.container.Composite(new qx.ui.layout.VBox(5)).set({
-            decorator: "main",
-            allowGrowY: true,
-            allowGrowX: true,
-            allowShrinkX: true,
-            padding: this.self().PADDING
-          });
-          control.getContentElement().setStyles({
-            "border-width": 0
+          control = new qx.ui.container.Composite(new qx.ui.layout.VBox(6)).set({
+            padding: this.self().PADDING,
           });
           break;
         case "footer": {
           const fGrid = new qx.ui.layout.Grid();
           fGrid.setSpacing(2);
-          fGrid.setColumnFlex(0, 1);
+          fGrid.setColumnFlex(this.self().FPOS.MODIFIED.row, 1);
           control = new qx.ui.container.Composite().set({
             backgroundColor: "background-card-overlay",
-            padding: this.self().PADDING - 2,
+            padding: this.self().PADDING,
             maxWidth: this.self().ITEM_WIDTH,
             maxHeight: this.self().ITEM_HEIGHT
           });
@@ -184,10 +184,7 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
         case "icon": {
           control = osparc.dashboard.CardBase.createCardIcon();
           layout = this.getChildControl("header");
-          layout.add(control, {
-            column: 0,
-            row: 0,
-          });
+          layout.add(control, this.self().HPOS.ICON);
           break;
         }
         case "title":
@@ -196,21 +193,15 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
             font: "text-14",
           });
           layout = this.getChildControl("header");
-          layout.add(control, {
-            column: 1,
-            row: 0,
-          });
+          layout.add(control, this.self().HPOS.TITLE);
           break;
         case "subtitle-icon": {
           control = new qx.ui.basic.Image().set({
             allowGrowX: false,
             allowShrinkX: false,
           });
           layout = this.getChildControl("header");
-          layout.add(control, {
-            column: 0,
-            row: 1,
-          });
+          layout.add(control, this.self().HPOS.SUBTITLE_ICON);
           break;
         }
         case "subtitle-text": {
@@ -225,10 +216,7 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
             allowGrowY: false
           });
           layout = this.getChildControl("header");
-          layout.add(control, {
-            column: 1,
-            row: 1,
-          });
+          layout.add(control, this.self().HPOS.SUBTITLE_TEXT);
           break;
         }
         case "thumbnail": {
@@ -322,32 +310,6 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
       return;
     },
 
-    __fitThumbnailHeight: function() {
-      const thumbnailLayout = this.getChildControl("thumbnail");
-      let maxHeight = this.getHeight() - this.getPaddingTop() - this.getPaddingBottom() - 5;
-      const checkThis = [
-        "title",
-        "body",
-        "footer",
-        "tags"
-      ];
-      const layout = this.getChildControl("main-layout");
-      // eslint-disable-next-line no-underscore-dangle
-      layout._getChildren().forEach(child => {
-        if (checkThis.includes(child.getSubcontrolId()) && child.getBounds()) {
-          maxHeight -= (child.getBounds().height + this.self().SPACING_IN);
-          if (child.getSubcontrolId() === "tags") {
-            maxHeight -= 8;
-          }
-        }
-      });
-      // maxHeight -= 4; // for Roboto
-      maxHeight -= 18; // for Manrope
-      thumbnailLayout.getChildControl("image").setMaxHeight(maxHeight);
-      thumbnailLayout.setMaxHeight(maxHeight);
-      thumbnailLayout.recheckSize();
-    },
-
     /**
      * Event handler for the pointer over event.
      */