Merge branch 'master' into mai/repo-helpers

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/helpers/playwright.py

@@ -196,7 +196,6 @@ def __call__(self, message: str) -> None:
 class SocketIONodeProgressCompleteWaiter:
     node_id: str
     logger: logging.Logger
-    _last_call_return: bool = False
     _current_progress: dict[NodeProgressType, float] = field(
         default_factory=defaultdict
     )
@@ -224,24 +223,24 @@ def __call__(self, message: str) -> bool:
                         self._current_progress[
                             node_progress_event.progress_type
                         ] = new_progress
+
                         self.logger.info(
-                            "current startup progress: %s",
+                            "Current startup progress [expected number of node-progress-types=%d]: %s",
+                            len(NodeProgressType.required_types_for_started_service()),
                             f"{json.dumps({k:round(v,1) for k,v in self._current_progress.items()})}",
                         )
 
-                self._last_call_return = all(
-                    progress_type in self._current_progress
-                    for progress_type in NodeProgressType.required_types_for_started_service()
-                ) and all(
+                return self.got_expected_node_progress_types() and all(
                     round(progress, 1) == 1.0
                     for progress in self._current_progress.values()
                 )
-                return self._last_call_return
-        self._last_call_return = False
         return False
 
-    def get_last_call_return(self):
-        return self._last_call_return
+    def got_expected_node_progress_types(self):
+        return all(
+            progress_type in self._current_progress
+            for progress_type in NodeProgressType.required_types_for_started_service()
+        )
 
     def get_current_progress(self):
         return self._current_progress.values()
@@ -339,16 +338,17 @@ def expected_service_running(
         service_running = ServiceRunning(iframe_locator=None)
 
         try:
+
             with websocket.expect_event("framereceived", waiter, timeout=timeout):
                 if press_start_button:
                     _trigger_service_start(page, node_id)
 
                 yield service_running
 
         except PlaywrightTimeoutError:
-            if waiter.get_last_call_return() is False:
+            if waiter.got_expected_node_progress_types():
                 ctx.logger.warning(
-                    "⚠️  Progress bar didn't receive 100 percent: %s ⚠️",  # https://github.com/ITISFoundation/osparc-simcore/issues/6449
+                    "⚠️ Progress bar didn't receive 100 percent but all expected node-progress-types are in place: %s ⚠️",  # https://github.com/ITISFoundation/osparc-simcore/issues/6449
                     waiter.get_current_progress(),
                 )
             else:

services/static-webserver/client/source/class/osparc/Application.js

@@ -301,7 +301,7 @@ qx.Class.define("osparc.Application", {
 
     __setDefaultIcons: function() {
       const {productName} = this.__getProductMetaData()
-      const resourcePath = `../resource/osparc/${productName}/icons`;
+      const resourcePath = `../resource/osparc/${productName}/icons/`;
       const favIconUrls = [
         "favicon-16x16.png",
         "favicon-32x32.png",

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

@@ -425,7 +425,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
           break;
         case "service":
           uuid = resourceData.key ? resourceData.key : null;
-          owner = resourceData.owner ? resourceData.owner : "";
+          owner = resourceData.owner ? resourceData.owner : resourceData.contact;
           defaultHits = 0;
           break;
       }
@@ -730,7 +730,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
       }
 
       this._getChildren().forEach(item => {
-        if (item) {
+        if (item && "setOpacity" in item) {
           item.setOpacity(enabled ? 1.0 : 0.7);
         }
       });
@@ -784,13 +784,9 @@ qx.Class.define("osparc.dashboard.CardBase", {
         if (billingSettingsButton) {
           billingSettingsButton.setEnabled(osparc.study.Utils.canShowBillingOptions(resourceData));
         }
-        const moveToFolderButton = menuButtons.find(menuBtn => "moveToFolderButton" in menuBtn);
-        if (moveToFolderButton) {
-          moveToFolderButton.setEnabled(osparc.study.Utils.canMoveToFolder(resourceData));
-        }
-        const moveToWorkspaceButton = menuButtons.find(menuBtn => "moveToWorkspaceButton" in menuBtn);
-        if (moveToWorkspaceButton) {
-          moveToWorkspaceButton.setEnabled(osparc.study.Utils.canMoveToWorkspace(resourceData));
+        const moveToButton = menuButtons.find(menuBtn => "moveToButton" in menuBtn);
+        if (moveToButton) {
+          moveToButton.setEnabled(osparc.study.Utils.canMoveTo(resourceData));
         }
         const deleteButton = menuButtons.find(menuBtn => "deleteButton" in menuBtn);
         if (deleteButton) {

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

@@ -45,8 +45,7 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
   events: {
     "folderSelected": "qx.event.type.Data",
     "folderUpdated": "qx.event.type.Data",
-    "moveFolderToFolderRequested": "qx.event.type.Data",
-    "moveFolderToWorkspaceRequested": "qx.event.type.Data",
+    "moveFolderToRequested": "qx.event.type.Data",
     "deleteFolderRequested": "qx.event.type.Data"
   },
 
@@ -191,13 +190,9 @@ qx.Class.define("osparc.dashboard.FolderButtonItem", {
       editButton.addListener("execute", () => this.__editFolder(), this);
       menu.add(editButton);
 
-      const moveToFolderButton = new qx.ui.menu.Button(this.tr("Move to Folder..."), "@FontAwesome5Solid/folder/12");
-      moveToFolderButton.addListener("execute", () => this.fireDataEvent("moveFolderToFolderRequested", this.getFolderId()), this);
-      menu.add(moveToFolderButton);
-
-      const moveToWorkspaceButton = new qx.ui.menu.Button(this.tr("Move to Workspace..."), osparc.store.Workspaces.iconPath(14));
-      moveToWorkspaceButton.addListener("execute", () => this.fireDataEvent("moveFolderToWorkspaceRequested", this.getFolderId()), this);
-      menu.add(moveToWorkspaceButton);
+      const moveToButton = new qx.ui.menu.Button(this.tr("Move to..."), "@FontAwesome5Solid/folder/12");
+      moveToButton.addListener("execute", () => this.fireDataEvent("moveFolderToRequested", this.getFolderId()), this);
+      menu.add(moveToButton);
 
       menu.addSeparator();
 

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

@@ -224,7 +224,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
       }
     },
 
-    createOwner: function(label) {
+    __createOwner: function(label) {
       if (label === osparc.auth.Data.getInstance().getEmail()) {
         const resourceAlias = osparc.utils.Utils.resourceTypeToAlias(this.getResourceType());
         return qx.locale.Manager.tr(`My ${resourceAlias}`);
@@ -235,7 +235,7 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
     // overridden
     _applyOwner: function(value, old) {
       const label = this.getChildControl("subtitle-text");
-      const user = this.createOwner(value);
+      const user = this.__createOwner(value);
       label.setValue(user);
       label.setVisibility(value ? "visible" : "excluded");
     },

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

@@ -29,22 +29,21 @@ qx.Class.define("osparc.dashboard.GridButtonLoadMore", {
 
     this._applyFetching(false);
 
+    // A minimalistic spinning wheel
+    this.getChildControl("header").exclude();
     this.getChildControl("footer").exclude();
+    this.set({
+      backgroundColor: "transparent"
+    });
   },
 
   members: {
     _applyFetching: function(value) {
-      const title = this.getChildControl("title");
-      const desc = this.getChildControl("subtitle-text");
       this.setIcon(osparc.dashboard.CardBase.LOADING_ICON);
       if (value) {
-        title.setValue(this.tr("Loading..."));
-        desc.setValue("");
         this.getChildControl("icon").getChildControl("image").getContentElement()
           .addClass("rotate");
       } else {
-        title.setValue(this.tr("Load More"));
-        desc.setValue(this.tr("Click to load more").toString());
         this.getChildControl("icon").getChildControl("image").getContentElement()
           .removeClass("rotate");
       }

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

@@ -28,50 +28,46 @@ qx.Class.define("osparc.dashboard.ListButtonBase", {
   construct: function() {
     this.base(arguments);
     this.set({
-      width: osparc.dashboard.ListButtonBase.ITEM_WIDTH,
       minHeight: osparc.dashboard.ListButtonBase.ITEM_HEIGHT,
       allowGrowX: true
     });
 
     const layout = new qx.ui.layout.Grid();
     layout.setSpacing(10);
-    layout.setColumnFlex(osparc.dashboard.ListButtonBase.POS.DESCRIPTION, 1);
+    layout.setColumnFlex(osparc.dashboard.ListButtonBase.POS.SPACER, 1);
     this._setLayout(layout);
+
+    this.getChildControl("spacer");
   },
 
   statics: {
-    ITEM_WIDTH: 600,
-    ITEM_HEIGHT: 40,
+    ITEM_HEIGHT: 35,
     SPACING: 5,
     POS: {
       THUMBNAIL: 0,
       LOCK_STATUS: 1,
       TITLE: 2,
-      PROGRESS: 3,
-      DESCRIPTION: 4,
+      SPACER: 3,
+      PROGRESS: 4,
       TAGS: 5,
-      UPDATES: 6,
-      UI_MODE: 7,
-      STATUS: 8,
-      PERMISSION: 9,
+      ICONS_LAYOUT: 6,
+      SHARED: 7,
+      OWNER: 8,
+      LAST_CHANGE: 9,
       TSR: 10,
-      OWNER: 11,
-      SHARED: 12,
-      LAST_CHANGE: 13,
-      HITS: 14,
-      OPTIONS: 15
+      HITS: 11,
+      OPTIONS: 12
     }
   },
 
   members: {
     _createChildControlImpl: function(id) {
       let control;
-      let titleRow;
       switch (id) {
         case "icon": {
-          control = new osparc.ui.basic.Thumbnail(null, 40, this.self().ITEM_HEIGHT-2*5).set({
-            minHeight: 40,
-            minWidth: 40
+          control = new osparc.ui.basic.Thumbnail(null, this.self().ITEM_HEIGHT, this.self().ITEM_HEIGHT-2*5).set({
+            minHeight: this.self().ITEM_HEIGHT,
+            minWidth: this.self().ITEM_HEIGHT
           });
           control.getChildControl("image").set({
             anonymous: true,
@@ -83,43 +79,24 @@ qx.Class.define("osparc.dashboard.ListButtonBase", {
           });
           break;
         }
-        case "title-row":
-          control = new qx.ui.container.Composite(new qx.ui.layout.HBox(6)).set({
-            anonymous: true,
-            allowGrowX: true
-          });
-          this._add(control, {
-            row: 0,
-            column: osparc.dashboard.ListButtonBase.POS.TITLE
-          });
-          break;
         case "title":
           control = new qx.ui.basic.Label().set({
             textColor: "contrasted-text-light",
             font: "text-14",
             alignY: "middle",
             maxWidth: 300,
-            allowGrowX: true,
             rich: true,
           });
-          titleRow = this.getChildControl("title-row");
-          titleRow.addAt(control, 0, {
-            flex: 1
+          this._add(control, {
+            row: 0,
+            column: osparc.dashboard.ListButtonBase.POS.TITLE
           });
           break;
-        case "description":
-          control = new qx.ui.basic.Label().set({
-            textColor: "contrasted-text-dark",
-            rich: true,
-            maxHeight: 16,
-            minWidth: 100,
-            font: "text-14",
-            alignY: "middle",
-            allowGrowX: true
-          });
+        case "spacer":
+          control = new qx.ui.core.Spacer();
           this._add(control, {
             row: 0,
-            column: osparc.dashboard.ListButtonBase.POS.DESCRIPTION
+            column: osparc.dashboard.ListButtonBase.POS.SPACER
           });
           break;
         case "owner":
@@ -134,17 +111,23 @@ qx.Class.define("osparc.dashboard.ListButtonBase", {
             column: osparc.dashboard.ListButtonBase.POS.OWNER
           });
           break;
+        case "icons-layout":
+          control = new qx.ui.container.Composite(new qx.ui.layout.HBox(10).set({
+            alignY: "middle"
+          }))
+          this._add(control, {
+            row: 0,
+            column: osparc.dashboard.ListButtonBase.POS.ICONS_LAYOUT
+          });
+          break;
         case "project-status":
           control = new qx.ui.basic.Image().set({
             alignY: "middle",
             textColor: "status_icon",
             height: 12,
             width: 12
           });
-          this._add(control, {
-            row: 0,
-            column: osparc.dashboard.ListButtonBase.POS.STATUS
-          });
+          this.getChildControl("icons-layout").add(control);
           break;
       }
       return control || this.base(arguments, id);