Merge branch 'master' into mai/upgrade-requirements-tests

Author: pcrespov

services/static-webserver/client/source/class/osparc/conversation/Conversation.js

@@ -90,9 +90,7 @@ qx.Class.define("osparc.conversation.Conversation", {
           const newLabel = e.getData()["newLabel"];
           if (this.getConversationId()) {
             osparc.study.Conversations.renameConversation(this.__studyData["uuid"], this.getConversationId(), newLabel)
-              .then(() => {
-                this.getChildControl("button").setLabel(newLabel);
-              });
+              .then(() => this.renameConversation(newLabel));
           } else {
             // create new conversation first
             osparc.study.Conversations.addConversation(this.__studyData["uuid"], newLabel)
@@ -111,11 +109,11 @@ qx.Class.define("osparc.conversation.Conversation", {
         column: 3
       });
 
-      const trashButton = new qx.ui.form.Button(null, "@FontAwesome5Solid/times/12").set({
+      const closeButton = new qx.ui.form.Button(null, "@FontAwesome5Solid/times/12").set({
         ...buttonsAesthetics,
         paddingLeft: 4, // adds spacing between buttons
       });
-      trashButton.addListener("execute", () => {
+      closeButton.addListener("execute", () => {
         const deleteConversation = () => {
           osparc.study.Conversations.deleteConversation(this.__studyData["uuid"], this.getConversationId())
             .then(() => this.fireEvent("conversationDeleted"));
@@ -138,15 +136,19 @@ qx.Class.define("osparc.conversation.Conversation", {
         }
       });
       // eslint-disable-next-line no-underscore-dangle
-      tabButton._add(trashButton, {
+      tabButton._add(closeButton, {
         row: 0,
         column: 4
       });
-      this.bind("conversationId", trashButton, "visibility", {
+      this.bind("conversationId", closeButton, "visibility", {
         converter: value => value ? "visible" : "excluded"
       });
     },
 
+    renameConversation: function(newName) {
+      this.getChildControl("button").setLabel(newName);
+    },
+
     __buildLayout: function() {
       this.__messagesTitle = new qx.ui.basic.Label();
       this._add(this.__messagesTitle);

services/static-webserver/client/source/class/osparc/conversation/MessageUI.js

@@ -101,10 +101,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
           break;
         case "message-content":
           control = new osparc.ui.markdown.Markdown().set({
-            decorator: "rounded",
             noMargin: true,
-            paddingLeft: 8,
-            paddingRight: 8,
             allowGrowX: true,
           });
           control.getContentElement().setStyles({

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

@@ -1024,13 +1024,16 @@ qx.Class.define("osparc.dashboard.CardBase", {
 
     __openResourceDetails: function(openWindowCB) {
       const resourceData = this.getResourceData();
-      const resourceDetails = new osparc.dashboard.ResourceDetails(resourceData);
+      const {
+        resourceDetails,
+        window,
+      } = osparc.dashboard.ResourceDetails.popUpInWindow(resourceData);
+
       resourceDetails.addListenerOnce("pagesAdded", () => {
         if (openWindowCB in resourceDetails) {
           resourceDetails[openWindowCB]();
         }
-      })
-      const win = osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+      });
       [
         "updateStudy",
         "updateTemplate",
@@ -1041,11 +1044,11 @@ qx.Class.define("osparc.dashboard.CardBase", {
         resourceDetails.addListener(ev, e => this.fireDataEvent(ev, e.getData()));
       });
       resourceDetails.addListener("publishTemplate", e => {
-        win.close();
+        window.close();
         this.fireDataEvent("publishTemplate", e.getData());
       });
       resourceDetails.addListener("openStudy", e => {
-        const openCB = () => win.close();
+        const openCB = () => window.close();
         const studyId = e.getData()["uuid"];
         const isStudyCreation = false;
         this._startStudyById(studyId, openCB, null, isStudyCreation);

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

@@ -360,10 +360,13 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
           // so that is not consumed by the menu button itself
           e.stopPropagation();
           latestMetadata["resourceType"] = "service";
-          const resourceDetails = new osparc.dashboard.ResourceDetails(latestMetadata);
-          const win = osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+          const {
+            resourceDetails,
+            window,
+          } = osparc.dashboard.ResourceDetails.popUpInWindow(latestMetadata);
+
           resourceDetails.addListener("openService", ev => {
-            win.close();
+            window.close();
             const openServiceData = ev.getData();
             this.fireDataEvent("newStudyFromServiceClicked", {
               serviceMetadata: openServiceData,

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

@@ -939,19 +939,22 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
     },
 
     _openResourceDetails: function(resourceData) {
-      const resourceDetails = new osparc.dashboard.ResourceDetails(resourceData);
-      const win = osparc.dashboard.ResourceDetails.popUpInWindow(resourceDetails);
+      const {
+        resourceDetails,
+        window,
+      } = osparc.dashboard.ResourceDetails.popUpInWindow(resourceData);
+
       resourceDetails.addListener("updateStudy", e => this._updateStudyData(e.getData()));
       resourceDetails.addListener("updateTemplate", e => this._updateTemplateData(e.getData()));
       resourceDetails.addListener("updateTutorial", e => this._updateTutorialData(e.getData()));
       resourceDetails.addListener("updateService", e => this._updateServiceData(e.getData()));
       resourceDetails.addListener("updateHypertool", e => this._updateHypertoolData(e.getData()));
       resourceDetails.addListener("publishTemplate", e => {
-        win.close();
+        window.close();
         this.fireDataEvent("publishTemplate", e.getData());
       });
       resourceDetails.addListener("openStudy", e => {
-        const openCB = () => win.close();
+        const openCB = () => window.close();
         const studyId = e.getData()["uuid"];
         const isStudyCreation = false;
         this._startStudyById(studyId, openCB, null, isStudyCreation);
@@ -962,13 +965,13 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
         "openHypertool",
       ].forEach(eventName => {
         resourceDetails.addListener(eventName, e => {
-          win.close();
+          window.close();
           const templateData = e.getData();
           this._createStudyFromTemplate(templateData);
         });
       });
       resourceDetails.addListener("openService", e => {
-        win.close();
+        window.close();
         const openServiceData = e.getData();
         this._createStudyFromService(openServiceData["key"], openServiceData["version"]);
       });