list to websocket

Author: odeimaiz

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

@@ -27,6 +27,7 @@ qx.Class.define("osparc.conversation.Conversation", {
     this.base(arguments);
 
     this.__studyData = studyData;
+    this.__messages = [];
 
     if (conversationId) {
       this.setConversationId(conversationId);
@@ -64,6 +65,7 @@ qx.Class.define("osparc.conversation.Conversation", {
 
   members: {
     __studyData: null,
+    __messages: null,
     __nextRequestParams: null,
     __messagesTitle: null,
     __messagesList: null,
@@ -189,14 +191,13 @@ qx.Class.define("osparc.conversation.Conversation", {
       this.__loadMoreMessages.setFetching(true);
 
       if (removeMessages) {
+        this.__messages = [];
         this.__messagesList.removeAll();
       }
 
       this.__getNextRequest()
         .then(resp => {
           const messages = resp["data"];
-          // it's not provided by the backend
-          messages.forEach(message => message["studyId"] = this.__studyData["uuid"]);
           this.__addMessages(messages);
           this.__nextRequestParams = resp["_links"]["next"];
           if (this.__nextRequestParams === null) {
@@ -227,6 +228,11 @@ qx.Class.define("osparc.conversation.Conversation", {
     },
 
     __addMessages: function(messages) {
+      // it's not provided by the backend
+      messages.forEach(message => message["projectId"] = this.__studyData["uuid"]);
+
+      this.__messages = this.__messages.concat(messages);
+
       const nMessages = messages.filter(msg => msg["type"] === "MESSAGE").length;
       if (nMessages === 1) {
         this.__messagesTitle.setValue(this.tr("1 Message"));

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

@@ -211,7 +211,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
       win.open();
       win.addListener("close", () => {
         if (win.getConfirmed()) {
-          osparc.study.Conversations.deleteMessage(this.__message["studyId"], this.__message["conversationId"], this.__message["messageId"])
+          osparc.study.Conversations.deleteMessage(this.__message["projectId"], this.__message["conversationId"], this.__message["messageId"])
             .then(() => this.fireEvent("messageDeleted"))
             .catch(err => osparc.FlashMessenger.logError(err));
         }

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

@@ -27,6 +27,8 @@ qx.Class.define("osparc.study.Conversations", {
 
     this._setLayout(new qx.ui.layout.VBox());
 
+    this.__conversations = [];
+
     this.fetchConversations(studyData);
   },
 
@@ -138,6 +140,8 @@ qx.Class.define("osparc.study.Conversations", {
   },
 
   members: {
+    __conversations: null,
+
     _createChildControlImpl: function(id) {
       let control;
       switch (id) {
@@ -156,6 +160,37 @@ qx.Class.define("osparc.study.Conversations", {
       return control || this.base(arguments, id);
     },
 
+    __listenToConversationWS: function() {
+      const socket = osparc.wrapper.WebSocket.getInstance();
+
+      socket.on("conversation:message:created", data => {
+        if (data) {
+          const projectId = data["projectId"];
+          const conversationId = data["conversationId"];
+          const messageId = data["messageId"];
+          console.log("Conversation message created", projectId, conversationId, messageId);
+        }
+      }, this);
+
+      socket.on("conversation:message:update", data => {
+        if (data) {
+          const projectId = data["projectId"];
+          const conversationId = data["conversationId"];
+          const messageId = data["messageId"];
+          console.log("Conversation message created", projectId, conversationId, messageId);
+        }
+      }, this);
+
+      socket.on("conversation:message:deleted", data => {
+        if (data) {
+          const projectId = data["projectId"];
+          const conversationId = data["conversationId"];
+          const messageId = data["messageId"];
+          console.log("Conversation message created", projectId, conversationId, messageId);
+        }
+      }, this);
+    },
+
     fetchConversations: function(studyData) {
       const loadMoreButton = this.getChildControl("loading-button");
       loadMoreButton.setFetching(true);
@@ -192,20 +227,22 @@ qx.Class.define("osparc.study.Conversations", {
         this.fetchConversations(studyData);
       };
 
+      this.__conversations = [];
       if (conversations.length === 0) {
         const noConversationTab = new osparc.conversation.Conversation(studyData);
         conversationPages.push(noConversationTab);
         noConversationTab.setLabel(this.tr("new"));
         noConversationTab.addListener("conversationDeleted", () => reloadConversations());
         conversationsLayout.add(noConversationTab);
       } else {
-        conversations.forEach(conversation => {
-          const conversationId = conversation["conversationId"];
-          const conversationTab = new osparc.conversation.Conversation(studyData, conversationId);
-          conversationPages.push(conversationTab);
-          conversationTab.setLabel(conversation["name"]);
-          conversationTab.addListener("conversationDeleted", () => reloadConversations());
-          conversationsLayout.add(conversationTab);
+        conversations.forEach(conversationData => {
+          const conversationId = conversationData["conversationId"];
+          const conversation = new osparc.conversation.Conversation(studyData, conversationId);
+          this.__conversations.push(conversation);
+          conversationPages.push(conversation);
+          conversation.setLabel(conversationData["name"]);
+          conversation.addListener("conversationDeleted", () => reloadConversations());
+          conversationsLayout.add(conversation);
         });
       }