progress on edit message

Author: odeimaiz

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

@@ -23,11 +23,12 @@ qx.Class.define("osparc.conversation.AddMessage", {
     * @param studyData {Object} serialized Study Data
     * @param conversationId {String} Conversation Id
     */
-  construct: function(studyData, conversationId = null) {
+  construct: function(studyData, conversationId = null, message = null) {
     this.base(arguments);
 
     this.__studyData = studyData;
     this.__conversationId = conversationId;
+    this.__message = message;
 
     this._setLayout(new qx.ui.layout.VBox(5));
 
@@ -36,11 +37,13 @@ qx.Class.define("osparc.conversation.AddMessage", {
 
   events: {
     "commentAdded": "qx.event.type.Data",
+    "messageEdited": "qx.event.type.Data",
   },
 
   members: {
     __studyData: null,
     __conversationId: null,
+    __message: null,
 
     _createChildControlImpl: function(id) {
       let control;
@@ -120,13 +123,22 @@ qx.Class.define("osparc.conversation.AddMessage", {
 
     __buildLayout: function() {
       this.getChildControl("thumbnail");
-      this.getChildControl("comment-field");
+      const commentField = this.getChildControl("comment-field");
 
       const addMessageButton = this.getChildControl("add-comment-button");
-      addMessageButton.addListener("execute", () => this.__addComment());
+      if (this.__message) {
+        // edit mode
+        addMessageButton.setLabel(this.tr("Edit message"));
+        addMessageButton.addListener("execute", () => this.__editComment());
+
+        commentField.setText(this.__message["content"]);
+      } else {
+        // new message
+        addMessageButton.addListener("execute", () => this.__addComment());
 
-      const notifyUserButton = this.getChildControl("notify-user-button");
-      notifyUserButton.addListener("execute", () => this.__notifyUserTapped());
+        const notifyUserButton = this.getChildControl("notify-user-button");
+        notifyUserButton.addListener("execute", () => this.__notifyUserTapped());
+      }
     },
 
     __addComment: function() {
@@ -211,13 +223,24 @@ qx.Class.define("osparc.conversation.AddMessage", {
 
     __postMessage: function() {
       const commentField = this.getChildControl("comment-field");
-      const comment = commentField.getChildControl("text-area").getValue();
-      if (comment) {
-        osparc.study.Conversations.addMessage(this.__studyData["uuid"], this.__conversationId, comment)
+      const content = commentField.getChildControl("text-area").getValue();
+      if (content) {
+        osparc.study.Conversations.addMessage(this.__studyData["uuid"], this.__conversationId, content)
           .then(data => {
             this.fireDataEvent("commentAdded", data);
             commentField.getChildControl("text-area").setValue("");
-            osparc.FlashMessenger.logAs(this.tr("Message added"), "INFO");
+          });
+      }
+    },
+
+    __editComment: function() {
+      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)
+          .then(data => {
+            this.fireDataEvent("messageEdited", data);
+            commentField.getChildControl("text-area").setValue("");
           });
       }
     },

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

@@ -238,7 +238,7 @@ qx.Class.define("osparc.conversation.Conversation", {
         let control = null;
         switch (message["type"]) {
           case "MESSAGE":
-            control = new osparc.conversation.MessageUI(message);
+            control = new osparc.conversation.MessageUI(message, this.__studyData);
             control.addListener("messageEdited", () => this.fetchMessages());
             control.addListener("messageDeleted", () => this.fetchMessages());
             break;

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

@@ -21,11 +21,13 @@ qx.Class.define("osparc.conversation.MessageUI", {
 
   /**
     * @param message {Object} message
+    * @param studyData {Object?null} serialized Study Data
     */
-  construct: function(message) {
+  construct: function(message, studyData = null) {
     this.base(arguments);
 
     this.__message = message;
+    this.__studyData = studyData;
 
     const isMyMessage = this.self().isMyMessage(this.__message);
     const layout = new qx.ui.layout.Grid(12, 4);
@@ -187,13 +189,14 @@ qx.Class.define("osparc.conversation.MessageUI", {
     },
 
     __editMessage: function() {
-      const messageContent = this.getChildControl("message-content");
-      const editDialog = new osparc.ui.dialog.EditMessageDialog(this.__message, messageContent.getValue());
-      editDialog.addListener("messageEdited", e => {
-        messageContent.setValue(e.getData());
-        this.fireDataEvent("messageEdited", e.getData());
+      const addMessage = new osparc.conversation.AddMessage(this.__studyData, this.__message["conversationId"], this.__message);
+      addMessage.addListener("messageEdited", () => this.fireDataEvent("messageEdited"));
+      const title = this.tr("Edit message");
+      osparc.ui.window.Window.popUpInWindow(addMessage, title, 550, 135).set({
+        clickAwayClose: false,
+        resizable: true,
+        showClose: true,
       });
-      editDialog.open();
     },
 
     __deleteMessage: function() {
@@ -207,10 +210,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
         if (win.getConfirmed()) {
           console.log(this.__message);
           osparc.study.Conversations.deleteMessage(this.__message["studyId"], this.__message["conversationId"], this.__message["messageId"])
-            .then(() => {
-              this.fireEvent("messageDeleted");
-              osparc.FlashMessenger.logAs(this.tr("Message deleted"), "INFO");
-            });
+            .then(() => this.fireEvent("messageDeleted"));
         }
       });
     },

services/static-webserver/client/source/class/osparc/study/Conversations.js

@@ -94,6 +94,22 @@ qx.Class.define("osparc.study.Conversations", {
         .catch(err => osparc.FlashMessenger.logError(err));
     },
 
+    editMessage: function(studyId, conversationId, messageId, message) {
+      const params = {
+        url: {
+          studyId,
+          conversationId,
+          messageId,
+        },
+        data: {
+          "content": message,
+          "type": "MESSAGE",
+        },
+      };
+      return osparc.data.Resources.fetch("conversations", "editMessage", params)
+        .catch(err => osparc.FlashMessenger.logError(err));
+    },
+
     deleteMessage: function(studyId, conversationId, messageId) {
       const params = {
         url: {