Merge branch 'master' into feature/grouped-jobs

Author: mergify[bot]

services/static-webserver/client/source/class/osparc/filter/CollaboratorToggleButton.js

@@ -24,34 +24,38 @@ qx.Class.define("osparc.filter.CollaboratorToggleButton", {
       appearance: "tagbutton"
     });
 
-    if (collaborator["collabType"] === 0) {
-      this.setLabel(this.tr("Public"));
-    } else {
-      let label = collaborator.getLabel();
-      if ("getEmail" in collaborator && collaborator.getEmail()) {
-        label += ` (${collaborator.getEmail()})`;
-      }
-      this.setLabel(label);
-    }
-
-    if (collaborator.getDescription()) {
-      const ttt = collaborator.getLabel() + "<br>" + collaborator.getDescription();
-      this.setToolTipText(ttt);
-    }
-
     let iconPath = null;
+    let label = null;
+    let toolTipText = "";
     switch (collaborator["collabType"]) {
       case 0:
         iconPath = "@FontAwesome5Solid/globe/14";
+        label = this.tr("Public");
+        toolTipText = this.tr("Public to all users");
         break;
       case 1:
         iconPath = "@FontAwesome5Solid/users/14";
+        label = collaborator.getLabel();
+        toolTipText = collaborator.getDescription();
         break;
-      case 2:
+      case 2: {
         iconPath = "@FontAwesome5Solid/user/14";
+        label = collaborator.getLabel();
+        if (collaborator.getEmail()) {
+          toolTipText += collaborator.getEmail() + "<br>";
+        }
+        if (collaborator.getFirstName()) {
+          toolTipText += [collaborator.getFirstName(), collaborator.getLastName()].join(" ").trim();
+        }
         break;
+      }
     }
     this.setIcon(iconPath);
+    this.setLabel(label);
+    if (toolTipText) {
+      const infoButton = new osparc.ui.hint.InfoHint(toolTipText);
+      this._add(infoButton);
+    }
 
     this.getChildControl("check");
   },

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

@@ -296,7 +296,6 @@ qx.Class.define("osparc.info.MergedLarge", {
     },
 
     __createDescription: function() {
-      const maxHeight = 400;
       const descriptionLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(5).set({
         alignY: "middle"
       }));
@@ -306,7 +305,8 @@ qx.Class.define("osparc.info.MergedLarge", {
       });
       descriptionLayout.add(label);
 
-      const descriptionContainer = osparc.info.StudyUtils.createDescriptionMD(this.getStudy(), maxHeight);
+      const maxHeight = 400;
+      const descriptionContainer = osparc.info.StudyUtils.createDescription(this.getStudy(), maxHeight);
       descriptionLayout.add(descriptionContainer);
 
       return descriptionLayout;