✨ [Frontend] Feature: Localized conversations

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

@@ -146,7 +146,7 @@ qx.Class.define("osparc.conversation.AddMessage", {
         this.__postMessage();
       } else {
         // create new conversation first
-        osparc.study.Conversations.addConversation(this.__studyData["uuid"])
+        osparc.store.Conversations.getInstance().addConversation(this.__studyData["uuid"])
           .then(data => {
             this.__conversationId = data["conversationId"];
             this.__postMessage();
@@ -213,7 +213,7 @@ qx.Class.define("osparc.conversation.AddMessage", {
         this.__postNotify(userGid);
       } else {
         // create new conversation first
-        osparc.study.Conversations.addConversation(this.__studyData["uuid"])
+        osparc.store.Conversations.getInstance().addConversation(this.__studyData["uuid"])
           .then(data => {
             this.__conversationId = data["conversationId"];
             this.__postNotify(userGid);
@@ -225,7 +225,7 @@ qx.Class.define("osparc.conversation.AddMessage", {
       const commentField = this.getChildControl("comment-field");
       const content = commentField.getChildControl("text-area").getValue();
       if (content) {
-        osparc.study.Conversations.addMessage(this.__studyData["uuid"], this.__conversationId, content)
+        osparc.store.Conversations.getInstance().addMessage(this.__studyData["uuid"], this.__conversationId, content)
           .then(data => {
             this.fireDataEvent("messageAdded", data);
             commentField.getChildControl("text-area").setValue("");
@@ -237,7 +237,7 @@ qx.Class.define("osparc.conversation.AddMessage", {
       const commentField = this.getChildControl("comment-field");
       const content = commentField.getChildControl("text-area").getValue();
       if (content) {
-        osparc.study.Conversations.editMessage(this.__studyData["uuid"], this.__conversationId, this.__message["messageId"], content)
+        osparc.store.Conversations.getInstance().editMessage(this.__studyData["uuid"], this.__conversationId, this.__message["messageId"], content)
           .then(data => {
             this.fireDataEvent("messageUpdated", data);
             commentField.getChildControl("text-area").setValue("");
@@ -247,7 +247,7 @@ qx.Class.define("osparc.conversation.AddMessage", {
 
     __postNotify: function(userGid) {
       if (userGid) {
-        osparc.study.Conversations.notifyUser(this.__studyData["uuid"], this.__conversationId, userGid)
+        osparc.store.Conversations.getInstance().notifyUser(this.__studyData["uuid"], this.__conversationId, userGid)
           .then(data => {
             this.fireDataEvent("messageAdded", data);
             const potentialCollaborators = osparc.store.Groups.getInstance().getPotentialCollaborators();

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

@@ -82,18 +82,19 @@ qx.Class.define("osparc.conversation.Conversation", {
       };
       const renameButton = new qx.ui.form.Button(null, "@FontAwesome5Solid/pencil-alt/10").set({
         ...buttonsAesthetics,
+        visibility: osparc.data.model.Study.canIWrite(this.__studyData["accessRights"]) ? "visible" : "excluded",
       });
       renameButton.addListener("execute", () => {
         const titleEditor = new osparc.widget.Renamer(tabButton.getLabel());
         titleEditor.addListener("labelChanged", e => {
           titleEditor.close();
           const newLabel = e.getData()["newLabel"];
           if (this.getConversationId()) {
-            osparc.study.Conversations.renameConversation(this.__studyData["uuid"], this.getConversationId(), newLabel)
+            osparc.store.Conversations.getInstance().renameConversation(this.__studyData["uuid"], this.getConversationId(), newLabel)
               .then(() => this.renameConversation(newLabel));
           } else {
             // create new conversation first
-            osparc.study.Conversations.addConversation(this.__studyData["uuid"], newLabel)
+            osparc.store.Conversations.getInstance().addConversation(this.__studyData["uuid"], newLabel)
               .then(data => {
                 this.setConversationId(data["conversationId"]);
                 this.getChildControl("button").setLabel(newLabel);
@@ -112,10 +113,11 @@ qx.Class.define("osparc.conversation.Conversation", {
       const closeButton = new qx.ui.form.Button(null, "@FontAwesome5Solid/times/12").set({
         ...buttonsAesthetics,
         paddingLeft: 4, // adds spacing between buttons
+        visibility: osparc.data.model.Study.canIWrite(this.__studyData["accessRights"]) ? "visible" : "excluded",
       });
       closeButton.addListener("execute", () => {
         const deleteConversation = () => {
-          osparc.study.Conversations.deleteConversation(this.__studyData["uuid"], this.getConversationId())
+          osparc.store.Conversations.getInstance().deleteConversation(this.__studyData["uuid"], this.getConversationId())
             .then(() => this.fireEvent("conversationDeleted"));
         }
         if (this.__messagesList.getChildren().length === 0) {
@@ -166,18 +168,18 @@ qx.Class.define("osparc.conversation.Conversation", {
       this.__loadMoreMessages.addListener("execute", () => this.__reloadMessages(false));
       this._add(this.__loadMoreMessages);
 
-      if (osparc.data.model.Study.canIWrite(this.__studyData["accessRights"])) {
-        const addMessages = new osparc.conversation.AddMessage(this.__studyData, this.getConversationId());
-        addMessages.setPaddingLeft(10);
-        addMessages.addListener("messageAdded", e => {
-          const data = e.getData();
-          if (data["conversationId"]) {
-            this.setConversationId(data["conversationId"]);
-            this.addMessage(data);
-          }
-        });
-        this._add(addMessages);
-      }
+      const addMessages = new osparc.conversation.AddMessage(this.__studyData, this.getConversationId()).set({
+        enabled: osparc.data.model.Study.canIWrite(this.__studyData["accessRights"]),
+        paddingLeft: 10,
+      });
+      addMessages.addListener("messageAdded", e => {
+        const data = e.getData();
+        if (data["conversationId"]) {
+          this.setConversationId(data["conversationId"]);
+          this.addMessage(data);
+        }
+      });
+      this._add(addMessages);
     },
 
     __getNextRequest: function() {
@@ -197,7 +199,8 @@ qx.Class.define("osparc.conversation.Conversation", {
       const options = {
         resolveWResponse: true
       };
-      return osparc.data.Resources.fetch("conversations", "getMessagesPage", params, options);
+      return osparc.data.Resources.fetch("conversations", "getMessagesPage", params, options)
+        .catch(err => osparc.FlashMessenger.logError(err));
     },
 
     __reloadMessages: function(removeMessages = true) {

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

@@ -227,7 +227,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
       win.open();
       win.addListener("close", () => {
         if (win.getConfirmed()) {
-          osparc.study.Conversations.deleteMessage(message)
+          osparc.store.Conversations.getInstance().deleteMessage(message)
             .then(() => this.fireDataEvent("messageDeleted", message))
             .catch(err => osparc.FlashMessenger.logError(err));
         }

services/static-webserver/client/source/class/osparc/data/Resources.js

@@ -310,7 +310,7 @@ qx.Class.define("osparc.data.Resources", {
         }
       },
       "conversations": {
-        useCache: false,
+        useCache: false, // It has its own cache handler
         endpoints: {
           addConversation: {
             method: "POST",

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

@@ -873,33 +873,42 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
 
     __getAnnotationsSection: function() {
       const annotationsSection = new qx.ui.container.Composite(new qx.ui.layout.VBox(10));
-      annotationsSection.add(new qx.ui.basic.Label(this.tr("Annotations")).set({
+      annotationsSection.add(new qx.ui.basic.Label(this.tr("Add to Workbench")).set({
         font: "text-14"
       }));
 
-      const annotationsButtons = new qx.ui.container.Composite(new qx.ui.layout.HBox(5));
+      const annotationsButtons = new qx.ui.container.Composite(new qx.ui.layout.Flow(5, 5));
       annotationsSection.add(annotationsButtons);
 
       const buttonsHeight = 28;
+
+      const addConversationBtn = new qx.ui.form.Button().set({
+        label: this.tr("Conversation"),
+        icon: "@FontAwesome5Solid/comment/14",
+        height: buttonsHeight
+      });
+      addConversationBtn.addListener("execute", () => this.__workbenchUI.startConversation(), this);
+      annotationsButtons.add(addConversationBtn);
+
       const addNoteBtn = new qx.ui.form.Button().set({
         label: this.tr("Note"),
-        icon: "@FontAwesome5Solid/plus/14",
+        icon: "@FontAwesome5Solid/sticky-note/14",
         height: buttonsHeight
       });
       addNoteBtn.addListener("execute", () => this.__workbenchUI.startAnnotationsNote(), this);
       annotationsButtons.add(addNoteBtn);
 
       const addRectBtn = new qx.ui.form.Button().set({
-        label: this.tr("Rectangle"),
-        icon: "@FontAwesome5Solid/plus/14",
+        label: this.tr("Box"),
+        icon: "@FontAwesome5Regular/square/14",
         height: buttonsHeight
       });
       addRectBtn.addListener("execute", () => this.__workbenchUI.startAnnotationsRect(), this);
       annotationsButtons.add(addRectBtn);
 
       const addTextBtn = new qx.ui.form.Button().set({
         label: this.tr("Text"),
-        icon: "@FontAwesome5Solid/plus/14",
+        icon: "@FontAwesome5Solid/font/14",
         height: buttonsHeight
       });
       addTextBtn.addListener("execute", () => this.__workbenchUI.startAnnotationsText(), this);