Merge branch 'master' into 1973-add-celery-worker-to-api-server

bisgaard-itis · bisgaard-itis · commit 22a2226e3655 · 2025-09-02T16:03:46.000+02:00
diff --git a/packages/notifications-library/src/notifications_library/_models.py b/packages/notifications-library/src/notifications_library/_models.py
@@ -30,7 +30,6 @@ class SharerData:
 
 @dataclass(frozen=True)
 class ProductUIData:
-    project_alias: str
     logo_url: str | None = (
         None  # default_logo = "https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/refs/heads/master/services/static-webserver/client/source/resource/osparc/osparc-white.svg" in base.html
     )
diff --git a/packages/notifications-library/src/notifications_library/templates/on_share_project.email.content.html b/packages/notifications-library/src/notifications_library/templates/on_share_project.email.content.html
@@ -3,9 +3,9 @@
 {% block content %}
 <p>Dear {{ user.first_name or user.user_name }},</p>
 
-<p>Great news! {{ sharer.user_name }} has shared a {{ product.ui.project_alias }} with you on {{ product.display_name }}.</p>
+<p>Great news! {{ sharer.user_name }} has shared a project with you on {{ product.display_name }}.</p>
 
-<p>To view the {{ product.ui.project_alias }} and accept the sharing, follow below:</p>
+<p>To view the project and accept the sharing, follow below:</p>
 
 <p>
 {% if sharer.message %}
diff --git a/packages/notifications-library/src/notifications_library/templates/on_share_project.email.content.txt b/packages/notifications-library/src/notifications_library/templates/on_share_project.email.content.txt
@@ -1,8 +1,8 @@
 Dear {{ user.first_name or user.user_name }},
 
-Great news! {{ sharer.user_name }} has shared a {{ product.ui.project_alias }} with you on {{ product.display_name }}.
+Great news! {{ sharer.user_name }} has shared a project with you on {{ product.display_name }}.
 
-To view the {{ product.ui.project_alias }} and accept the sharing, follow below:
+To view the project and accept the sharing, follow below:
 
 {{ sharer.message }}
 {{ accept_link }}
diff --git a/packages/notifications-library/src/notifications_library/templates/on_share_project.email.subject.txt b/packages/notifications-library/src/notifications_library/templates/on_share_project.email.subject.txt
@@ -1 +1 @@
-A {{ product.ui.project_alias }} was shared with you on {{ host }}
+A project was shared with you on {{ host }}
diff --git a/packages/notifications-library/tests/conftest.py b/packages/notifications-library/tests/conftest.py
@@ -66,7 +66,6 @@ def product_data(
     product_ui = ProductUIData(
         logo_url=vendor_ui.get("logo_url"),
         strong_color=vendor_ui.get("strong_color"),
-        project_alias=vendor_ui["project_alias"],
     )
 
     return ProductData(  # type: ignore
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/products.py b/packages/postgres-database/src/simcore_postgres_database/models/products.py
@@ -32,7 +32,6 @@
 class VendorUI(TypedDict, total=True):
     logo_url: str  # vendor logo url
     strong_color: str  # vendor main color
-    project_alias: str  # project alias for the product (e.g. "project" or "study")
 
 
 class Vendor(TypedDict, total=False):
diff --git a/packages/postgres-database/src/simcore_postgres_database/utils_users.py b/packages/postgres-database/src/simcore_postgres_database/utils_users.py
@@ -172,7 +172,9 @@ async def link_and_update_user_from_pre_registration(
             pre_columns = (
                 users_pre_registration_details.c.pre_first_name,
                 users_pre_registration_details.c.pre_last_name,
-                # NOTE: pre_phone is not copied since it has to be validated.
+                # NOTE: pre_phone is NOT copied since it has to be validated.
+                # It remains here as informative. In the future it might be given
+                # as a hint to the front end?
                 # Otherwise, if phone is wrong, currently user won't be able to login!
             )
 
diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py b/packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py
@@ -294,7 +294,6 @@ def random_product(
             ui=VendorUI(
                 logo_url="https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/refs/heads/master/services/static-webserver/client/source/resource/osparc/osparc-black.svg",
                 strong_color=fake.color(),
-                project_alias=fake.random_element(elements=["project", "study"]),
             ),
         ),
         "registration_email_template": registration_email_template,
diff --git a/services/static-webserver/client/source/class/osparc/conversation/MessageUI.js b/services/static-webserver/client/source/class/osparc/conversation/MessageUI.js
@@ -64,7 +64,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
       let control;
       switch (id) {
         case "thumbnail":
-          control = osparc.utils.Utils.createThumbnail(32).set({
+          control = new osparc.ui.basic.UserThumbnail(32).set({
             marginTop: 4,
           });
           this._add(control, {
@@ -165,13 +165,8 @@ qx.Class.define("osparc.conversation.MessageUI", {
 
       osparc.store.Users.getInstance().getUser(message["userGroupId"])
         .then(user => {
-          if (user) {
-            thumbnail.setSource(user.getThumbnail());
-            userName.setValue(user.getLabel());
-          } else {
-            thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail());
-            userName.setValue("Unknown user");
-          }
+          thumbnail.setUser(user);
+          userName.setValue(user ? user.getLabel() : "Unknown user");
         })
         .catch(() => {
             thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail());
diff --git a/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js b/services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js
@@ -737,6 +737,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
           win.close();
         }
         win.addListener("cancel", () => cancelStudyOptions());
+        win.getChildControl("close-button").addListener("tap", () => cancelStudyOptions());
         studyOptions.addListener("cancel", () => cancelStudyOptions());
         studyOptions.addListener("startStudy", () => {
           const newName = studyOptions.getChildControl("title-field").getValue();
diff --git a/services/static-webserver/client/source/class/osparc/data/model/User.js b/services/static-webserver/client/source/class/osparc/data/model/User.js
@@ -51,7 +51,7 @@ qx.Class.define("osparc.data.model.User", {
       }
       description += email;
     }
-    const thumbnail = osparc.utils.Avatar.emailToThumbnail(email, username);
+
     this.set({
       userId,
       groupId,
@@ -60,10 +60,14 @@ qx.Class.define("osparc.data.model.User", {
       lastName,
       email,
       phoneNumber: userData["phone"] || null,
-      thumbnail,
       label: userData["userName"] || description,
       description,
     });
+
+    // create the thumbnail after setting email and username
+    this.set({
+      thumbnail: this.createThumbnail(),
+    });
   },
 
   properties: {
@@ -137,4 +141,10 @@ qx.Class.define("osparc.data.model.User", {
       event: "changeThumbnail",
     },
   },
+
+  members: {
+    createThumbnail: function(size) {
+      return osparc.utils.Avatar.emailToThumbnail(this.getEmail(), this.getUsername(), size);
+    },
+  },
 });
diff --git a/services/static-webserver/client/source/class/osparc/store/Support.js b/services/static-webserver/client/source/class/osparc/store/Support.js
@@ -163,7 +163,7 @@ qx.Class.define("osparc.store.Support", {
     addReleaseNotesToMenu: function(menu) {
       const releaseTag = osparc.utils.Utils.getReleaseTag();
       const releaseLink = osparc.utils.Utils.getReleaseLink();
-      const releaseBtn = new qx.ui.menu.Button(qx.locale.Manager.tr("Release Notes") + " " + releaseTag, "@FontAwesome5Solid/book/14");
+      const releaseBtn = new qx.ui.menu.Button(qx.locale.Manager.tr("What's new in") + " " + releaseTag, "@FontAwesome5Solid/bullhorn/14");
       releaseBtn.addListener("execute", () => window.open(releaseLink), this);
       menu.add(releaseBtn);
     },
diff --git a/services/static-webserver/client/source/class/osparc/ui/basic/UserThumbnail.js b/services/static-webserver/client/source/class/osparc/ui/basic/UserThumbnail.js
@@ -0,0 +1,58 @@
+/* ************************************************************************
+
+   osparc - the simcore frontend
+
+   https://osparc.io
+
+   Copyright:
+     2025 IT'IS Foundation, https://itis.swiss
+
+   License:
+     MIT: https://opensource.org/licenses/MIT
+
+   Authors:
+     * Odei Maiz (odeimaiz)
+
+************************************************************************ */
+
+qx.Class.define("osparc.ui.basic.UserThumbnail", {
+  extend: qx.ui.basic.Image,
+
+  construct: function(size) {
+    this.base(arguments);
+
+    this.set(osparc.utils.Utils.getThumbnailProps(size));
+
+    if (osparc.data.Permissions.getInstance().isProductOwner()) {
+      this.setCursor("pointer");
+      this.addListener("tap", this.__openUserDetails, this);
+    }
+  },
+
+  properties: {
+    user: {
+      check: "osparc.data.model.User",
+      init: null,
+      nullable: true,
+      apply: "__applyUser",
+    }
+  },
+
+  members: {
+    __applyUser: function(user) {
+      if (user) {
+        this.setSource(user.getThumbnail());
+      } else {
+        this.setSource(osparc.utils.Avatar.emailToThumbnail());
+      }
+    },
+
+    __openUserDetails: function() {
+      if (this.getUser()) {
+        const userDetails = new osparc.user.UserDetails(this.getUser());
+        userDetails.center();
+        userDetails.open();
+      }
+    },
+  }
+});
diff --git a/services/static-webserver/client/source/class/osparc/user/UserDetails.js b/services/static-webserver/client/source/class/osparc/user/UserDetails.js
@@ -0,0 +1,164 @@
+/* ************************************************************************
+
+   osparc - the simcore frontend
+
+   https://osparc.io
+
+   Copyright:
+     2025 IT'IS Foundation, https://itis.swiss
+
+   License:
+     MIT: https://opensource.org/licenses/MIT
+
+   Authors:
+     * Odei Maiz (odeimaiz)
+
+************************************************************************ */
+
+qx.Class.define("osparc.user.UserDetails", {
+  extend: osparc.ui.window.Window,
+
+  construct: function(user) {
+    this.base(arguments);
+
+    this.set({
+      layout: new qx.ui.layout.VBox(10),
+      autoDestroy: true,
+      showMaximize: false,
+      showMinimize: false,
+      clickAwayClose: true,
+    });
+
+    this.setUser(user);
+  },
+
+  statics: {
+    WIDTH: 300,
+    HEIGHT: 200,
+
+    GRID_POS: {
+      USERNAME: 0,
+      FULLNAME: 1,
+      EMAIL: 2,
+      USER_ID: 3,
+      GROUP_ID: 4,
+    }
+  },
+
+  properties: {
+    user: {
+      check: "osparc.data.model.User",
+      init: null,
+      nullable: false,
+      event: "changeUser",
+      apply: "__applyUser",
+    }
+  },
+
+  members: {
+    _createChildControlImpl: function(id) {
+      let control;
+      switch (id) {
+        case "top-layout":
+          control = new qx.ui.container.Composite(new qx.ui.layout.HBox(20));
+          this.add(control);
+          break;
+        case "thumbnail":
+          control = new osparc.ui.basic.Thumbnail(null, 100, 100);
+          control.getChildControl("image").set({
+            anonymous: true,
+            decorator: "rounded",
+          });
+          this.getChildControl("top-layout").add(control);
+          break;
+        case "main-info": {
+          const grid = new qx.ui.layout.Grid(10, 6);
+          grid.setColumnFlex(1, 1);
+          grid.setColumnAlign(0, "right", "middle");
+          control = new qx.ui.container.Composite(grid);
+          this.getChildControl("top-layout").add(control, {
+            flex: 1
+          });
+          break;
+        }
+        case "username": {
+          const title = new qx.ui.basic.Label("Username");
+          this.getChildControl("main-info").add(title, {
+            row: this.self().GRID_POS.USERNAME,
+            column: 0
+          });
+          control = new qx.ui.basic.Label();
+          this.getChildControl("main-info").add(control, {
+            row: this.self().GRID_POS.USERNAME,
+            column: 1
+          });
+          break;
+        }
+        case "fullname": {
+          const title = new qx.ui.basic.Label("Full Name");
+          this.getChildControl("main-info").add(title, {
+            row: this.self().GRID_POS.FULLNAME,
+            column: 0
+          });
+          control = new qx.ui.basic.Label();
+          this.getChildControl("main-info").add(control, {
+            row: this.self().GRID_POS.FULLNAME,
+            column: 1
+          });
+          break;
+        }
+        case "email": {
+          const title = new qx.ui.basic.Label("Email");
+          this.getChildControl("main-info").add(title, {
+            row: this.self().GRID_POS.EMAIL,
+            column: 0
+          });
+          control = new qx.ui.basic.Label();
+          this.getChildControl("main-info").add(control, {
+            row: this.self().GRID_POS.EMAIL,
+            column: 1
+          });
+          break;
+        }
+        case "user-id": {
+          const title = new qx.ui.basic.Label("User ID");
+          this.getChildControl("main-info").add(title, {
+            row: this.self().GRID_POS.USER_ID,
+            column: 0
+          });
+          control = new qx.ui.basic.Label();
+          this.getChildControl("main-info").add(control, {
+            row: this.self().GRID_POS.USER_ID,
+            column: 1
+          });
+          break;
+        }
+        case "group-id": {
+          const title = new qx.ui.basic.Label("Group ID");
+          this.getChildControl("main-info").add(title, {
+            row: this.self().GRID_POS.GROUP_ID,
+            column: 0
+          });
+          control = new qx.ui.basic.Label();
+          this.getChildControl("main-info").add(control, {
+            row: this.self().GRID_POS.GROUP_ID,
+            column: 1
+          });
+          break;
+        }
+      }
+      return control || this.base(arguments, id);
+    },
+
+    __applyUser: function(user) {
+      this.setCaption(user.getUsername());
+
+      this.getChildControl("thumbnail").setSource(user.createThumbnail(96));
+      this.getChildControl("username").setValue(user.getUsername());
+      this.getChildControl("fullname").setValue([user.getFirstName(), user.getLastName()].filter(Boolean).join(" "));
+      this.getChildControl("email").setValue(user.getEmail());
+      this.getChildControl("user-id").setValue(String(user.getUserId()));
+      this.getChildControl("group-id").setValue(String(user.getGroupId()));
+    },
+  }
+});
diff --git a/services/web/server/src/simcore_service_webserver/products/_models.py b/services/web/server/src/simcore_service_webserver/products/_models.py
diff --git a/services/web/server/src/simcore_service_webserver/products/_repository.py b/services/web/server/src/simcore_service_webserver/products/_repository.py
diff --git a/services/web/server/src/simcore_service_webserver/statics/_events.py b/services/web/server/src/simcore_service_webserver/statics/_events.py
diff --git a/services/web/server/src/simcore_service_webserver/users/_accounts_service.py b/services/web/server/src/simcore_service_webserver/users/_accounts_service.py
diff --git a/services/web/server/tests/unit/isolated/products/test_products_model.py b/services/web/server/tests/unit/isolated/products/test_products_model.py

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ class SharerData:`
`30`	`30`
`31`	`31`	`@dataclass(frozen=True)`
`32`	`32`	`class ProductUIData:`
`33`		`- project_alias: str`
`34`	`33`	`logo_url: str \| None = (`
`35`	`34`	`None # default_logo = "https://raw.githubusercontent.com/ITISFoundation/osparc-simcore/refs/heads/master/services/static-webserver/client/source/resource/osparc/osparc-white.svg" in base.html`
`36`	`35`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-A {{ product.ui.project_alias }} was shared with you on {{ host }}`
	`1`	`+A project was shared with you on {{ host }}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@ def product_data(`
`66`	`66`	`product_ui = ProductUIData(`
`67`	`67`	`logo_url=vendor_ui.get("logo_url"),`
`68`	`68`	`strong_color=vendor_ui.get("strong_color"),`
`69`		`- project_alias=vendor_ui["project_alias"],`
`70`	`69`	`)`
`71`	`70`
`72`	`71`	`return ProductData( # type: ignore`
Original file line number	Diff line number	Diff line change
`@@ -737,6 +737,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {`
`737`	`737`	`win.close();`
`738`	`738`	`}`
`739`	`739`	`win.addListener("cancel", () => cancelStudyOptions());`
	`740`	`+ win.getChildControl("close-button").addListener("tap", () => cancelStudyOptions());`
`740`	`741`	`studyOptions.addListener("cancel", () => cancelStudyOptions());`
`741`	`742`	`studyOptions.addListener("startStudy", () => {`
`742`	`743`	`const newName = studyOptions.getChildControl("title-field").getValue();`