Merge branch 'master' into add-program-unit-tests

Author: bisgaard-itis

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

@@ -455,6 +455,7 @@ def __call__(self, message: str) -> bool:
                 )
                 if progress_completed:
                     self.logger.info("✅ Service start completed successfully!! ✅")
+                return progress_completed
 
         time_since_last_progress = datetime.now(UTC) - self._last_progress_time
         if time_since_last_progress > self.max_idle_timeout:

services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js

@@ -309,7 +309,6 @@ qx.Class.define("osparc.desktop.StudyEditor", {
           }
         }, this);
       }
-      socket.emit("logger");
     },
 
     __listenToProgress: function() {

services/static-webserver/client/source/class/osparc/editor/AnnotationNoteCreator.js

@@ -84,7 +84,9 @@ qx.Class.define("osparc.editor.AnnotationNoteCreator", {
             allowGrowX: false
           });
           control.addListener("execute", () => {
-            const collaboratorsManager = new osparc.share.NewCollaboratorsManager(null, false);
+            const currentStudy = osparc.store.Store.getInstance().getCurrentStudy().serialize();
+            currentStudy["resourceType"] = "study";
+            const collaboratorsManager = new osparc.share.NewCollaboratorsManager(currentStudy, false);
             collaboratorsManager.setCaption("Recipient");
             collaboratorsManager.getActionButton().setLabel(this.tr("Add"));
             collaboratorsManager.addListener("addCollaborators", e => {

services/static-webserver/client/source/class/osparc/info/CommentUI.js

@@ -28,8 +28,9 @@ qx.Class.define("osparc.info.CommentUI", {
     this.__comment = comment;
 
     const isMyComment = this.__isMyComment();
-    const layout = new qx.ui.layout.Grid(12, 5);
-    layout.setColumnFlex(isMyComment ? 0 : 1, 1); // message content
+    const layout = new qx.ui.layout.Grid(12, 4);
+    layout.setColumnFlex(1, 1); // comment
+    layout.setColumnFlex(isMyComment ? 0 : 2, 3); // spacer
     this._setLayout(layout);
     this.setPadding(5);
 
@@ -46,55 +47,63 @@ qx.Class.define("osparc.info.CommentUI", {
     _createChildControlImpl: function(id) {
       let control;
       switch (id) {
-        case "meta-data-grid": {
-          const layout = new qx.ui.layout.Grid(12, 5)
-          layout.setColumnWidth(this.__isMyComment() ? 1 : 0, 32); // thumbnail
-          control = new qx.ui.container.Composite(layout);
-          this._add(control, {
-            row: 0,
-            column: this.__isMyComment() ? 1 : 0
-          });
-          break;
-        }
         case "thumbnail":
           control = new qx.ui.basic.Image().set({
             scale: true,
             maxWidth: 32,
             maxHeight: 32,
             decorator: "rounded",
+            marginTop: 2,
+          });
+          this._add(control, {
+            row: 0,
+            column: this.__isMyComment() ? 2 : 0,
+            rowSpan: 2,
           });
-          this.getChildControl("meta-data-grid").add(control, {
+          break;
+        case "header-layout":
+          control = new qx.ui.container.Composite(new qx.ui.layout.HBox(5).set({
+            alignX: this.__isMyComment() ? "right" : "left"
+          }));
+          this._add(control, {
             row: 0,
-            column: this.__isMyComment() ? 1 : 0,
-            rowSpan: 2
+            column: 1
           });
           break;
         case "user-name":
           control = new qx.ui.basic.Label().set({
-            font: "text-14"
-          });
-          this.getChildControl("meta-data-grid").add(control, {
-            row: 0,
-            column: this.__isMyComment() ? 0 : 1
+            font: "text-12"
           });
+          this.getChildControl("header-layout").addAt(control, 0);
           break;
         case "last-updated":
           control = new qx.ui.basic.Label().set({
             font: "text-12"
           });
-          this.getChildControl("meta-data-grid").add(control, {
-            row: 1,
-            column: this.__isMyComment() ? 0 : 1
-          });
+          this.getChildControl("header-layout").addAt(control, 1);
           break;
         case "comment-content":
-          control = new osparc.ui.markdown.Markdown();
+          control = new osparc.ui.markdown.Markdown().set({
+            backgroundColor: "background-main-2",
+            decorator: "rounded",
+            noMargin: true,
+            paddingLeft: 8,
+            paddingRight: 8,
+            allowGrowX: true,
+          });
           control.getContentElement().setStyles({
-            "text-align": this.__isMyComment() ? "right" : "left"
+            "text-align": this.__isMyComment() ? "right" : "left",
           });
           this._add(control, {
-            row: 0,
-            column: this.__isMyComment() ? 0 : 1
+            row: 1,
+            column: 1,
+          });
+          break;
+        case "spacer":
+          control = new qx.ui.core.Spacer();
+          this._add(control, {
+            row: 1,
+            column: this.__isMyComment() ? 0 : 2,
           });
           break;
       }
@@ -122,6 +131,8 @@ qx.Class.define("osparc.info.CommentUI", {
         thumbnail.setSource(user.getThumbnail());
         userName.setValue(user.getLabel());
       }
+
+      this.getChildControl("spacer");
     }
   }
 });

services/static-webserver/client/source/class/osparc/share/NewCollaboratorsManager.js

@@ -374,7 +374,7 @@ qx.Class.define("osparc.share.NewCollaboratorsManager", {
         }
       }
       if (Object.keys(this.__selectedCollaborators).length) {
-        const selectedGIds = Object.keys(this.__selectedCollaborators).filter(key => qx.lang.Type.isNumber(key));
+        const selectedGIds = Object.keys(this.__selectedCollaborators).filter(key => /^\d+$/.test(key)); // all digits
         const selectedEmails = Object.keys(this.__selectedCollaborators).filter(key => osparc.auth.core.Utils.checkEmail(key));
 
         const addCollaborators = () => {