don't wait for socket

Author: odeimaiz

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

@@ -36,8 +36,8 @@ qx.Class.define("osparc.conversation.AddMessage", {
   },
 
   events: {
-    "commentAdded": "qx.event.type.Data",
-    "messageEdited": "qx.event.type.Data",
+    "messageAdded": "qx.event.type.Data",
+    "messageUpdated": "qx.event.type.Data",
   },
 
   members: {
@@ -227,7 +227,7 @@ qx.Class.define("osparc.conversation.AddMessage", {
       if (content) {
         osparc.study.Conversations.addMessage(this.__studyData["uuid"], this.__conversationId, content)
           .then(data => {
-            this.fireDataEvent("commentAdded", data);
+            this.fireDataEvent("messageAdded", data);
             commentField.getChildControl("text-area").setValue("");
           });
       }
@@ -239,7 +239,7 @@ qx.Class.define("osparc.conversation.AddMessage", {
       if (content) {
         osparc.study.Conversations.editMessage(this.__studyData["uuid"], this.__conversationId, this.__message["messageId"], content)
           .then(data => {
-            this.fireDataEvent("messageEdited", data);
+            this.fireDataEvent("messageUpdated", data);
             commentField.getChildControl("text-area").setValue("");
           });
       }
@@ -249,7 +249,7 @@ qx.Class.define("osparc.conversation.AddMessage", {
       if (userGid) {
         osparc.study.Conversations.notifyUser(this.__studyData["uuid"], this.__conversationId, userGid)
           .then(data => {
-            this.fireDataEvent("commentAdded", data);
+            this.fireDataEvent("messageAdded", data);
             const potentialCollaborators = osparc.store.Groups.getInstance().getPotentialCollaborators();
             if (userGid in potentialCollaborators) {
               if ("getUserId" in potentialCollaborators[userGid]) {

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

@@ -167,10 +167,11 @@ qx.Class.define("osparc.conversation.Conversation", {
       if (osparc.data.model.Study.canIWrite(this.__studyData["accessRights"])) {
         const addMessages = new osparc.conversation.AddMessage(this.__studyData, this.getConversationId());
         addMessages.setPaddingLeft(10);
-        addMessages.addListener("commentAdded", e => {
+        addMessages.addListener("messageAdded", e => {
           const data = e.getData();
           if (data["conversationId"]) {
             this.setConversationId(data["conversationId"]);
+            this.addMessage(data);
           }
         });
         this._add(addMessages);
@@ -259,6 +260,8 @@ qx.Class.define("osparc.conversation.Conversation", {
       switch (message["type"]) {
         case "MESSAGE":
           control = new osparc.conversation.MessageUI(message, this.__studyData);
+          control.addListener("messageUpdated", e => this.updateMessage(e.getData()));
+          control.addListener("messageDeleted", e => this.deleteMessage(e.getData()));
           break;
         case "NOTIFICATION":
           control = new osparc.conversation.NotificationUI(message);

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

@@ -45,8 +45,8 @@ qx.Class.define("osparc.conversation.MessageUI", {
   },
 
   events: {
-    "messageEdited": "qx.event.type.Event",
-    "messageDeleted": "qx.event.type.Event",
+    "messageUpdated": "qx.event.type.Data",
+    "messageDeleted": "qx.event.type.Data",
   },
 
   properties: {
@@ -207,9 +207,9 @@ qx.Class.define("osparc.conversation.MessageUI", {
         resizable: true,
         showClose: true,
       });
-      addMessage.addListener("messageEdited", () => {
+      addMessage.addListener("messageUpdated", e => {
         win.close();
-        this.fireDataEvent("messageEdited");
+        this.fireDataEvent("messageUpdated", e.getData());
       });
     },
 
@@ -225,7 +225,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
       win.addListener("close", () => {
         if (win.getConfirmed()) {
           osparc.study.Conversations.deleteMessage(message)
-            .then(() => this.fireEvent("messageDeleted"))
+            .then(() => this.fireDataEvent("messageDeleted", message))
             .catch(err => osparc.FlashMessenger.logError(err));
         }
       });