mark conversations

Author: odeimaiz

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

@@ -100,7 +100,7 @@ qx.Class.define("osparc.conversation.MessageList", {
       if (conversation) {
         conversation.addListener("messageAdded", e => {
           const data = e.getData();
-          this.__messageAdded(data);
+          this._messageAdded(data);
         });
         conversation.addListener("messageDeleted", e => {
           const data = e.getData();
@@ -120,7 +120,7 @@ qx.Class.define("osparc.conversation.MessageList", {
         return;
       }
 
-      this.getConversation().getMessages().forEach(message => this.__messageAdded(message));
+      this.getConversation().getMessages().forEach(message => this._messageAdded(message));
 
       loadMoreMessages.show();
       loadMoreMessages.setFetching(true);
@@ -153,7 +153,7 @@ qx.Class.define("osparc.conversation.MessageList", {
       );
     },
 
-    __messageAdded: function(message) {
+    _messageAdded: function(message) {
       // ignore it if it was already there
       const existingMessageUI = this.__getMessageUI(message.getMessageId());
       if (existingMessageUI) {

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

@@ -140,13 +140,13 @@ qx.Class.define("osparc.data.model.Conversation", {
             if (conversationId === this.getConversationId()) {
               switch (eventName) {
                 case this.self().CHANNELS.CONVERSATION_MESSAGE_CREATED:
-                  this.addMessage(messageData);
+                  this._addMessage(messageData);
                   break;
                 case this.self().CHANNELS.CONVERSATION_MESSAGE_UPDATED:
-                  this.updateMessage(messageData);
+                  this._updateMessage(messageData);
                   break;
                 case this.self().CHANNELS.CONVERSATION_MESSAGE_DELETED:
-                  this.deleteMessage(messageData);
+                  this._deleteMessage(messageData);
                   break;
               }
             }
@@ -187,7 +187,7 @@ qx.Class.define("osparc.data.model.Conversation", {
       return promise
         .then(resp => {
           const messagesData = resp["data"];
-          messagesData.forEach(messageData => this.addMessage(messageData));
+          messagesData.forEach(messageData => this._addMessage(messageData));
           this.__nextRequestParams = resp["_links"]["next"];
           return resp;
         })
@@ -212,7 +212,7 @@ qx.Class.define("osparc.data.model.Conversation", {
       return this.__messages.some(msg => msg.getMessageId() === messageId);
     },
 
-    addMessage: function(messageData) {
+    _addMessage: function(messageData) {
       let message = this.__messages.find(msg => msg.getMessageId() === messageData["messageId"]);
       if (!message) {
         message = new osparc.data.model.Message(messageData);
@@ -224,7 +224,7 @@ qx.Class.define("osparc.data.model.Conversation", {
       return message;
     },
 
-    updateMessage: function(messageData) {
+    _updateMessage: function(messageData) {
       if (messageData) {
         const found = this.__messages.find(msg => msg.getMessageId() === messageData["messageId"]);
         if (found) {
@@ -234,7 +234,7 @@ qx.Class.define("osparc.data.model.Conversation", {
       }
     },
 
-    deleteMessage: function(messageData) {
+    _deleteMessage: function(messageData) {
       if (messageData) {
         const found = this.__messages.find(msg => msg.getMessageId() === messageData["messageId"]);
         if (found) {

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

@@ -181,9 +181,11 @@ qx.Class.define("osparc.data.model.ConversationSupport", {
         .catch(err => osparc.FlashMessenger.logError(err));
     },
 
-    addMessage: function(messageData) {
+    // overriden
+    _addMessage: function(messageData) {
       const message = this.base(arguments, messageData);
       this.__evalFirstAndLastMessage();
+
       // mark conversation as unread if the message is from the other party
       const userGroupId = message.getUserGroupId();
       const myGroupId = osparc.auth.Data.getInstance().getGroupId();
@@ -197,12 +199,14 @@ qx.Class.define("osparc.data.model.ConversationSupport", {
       return message;
     },
 
-    updateMessage: function(messageData) {
+    // overriden
+    _updateMessage: function(messageData) {
       this.base(arguments, messageData);
       this.__evalFirstAndLastMessage();
     },
 
-    deleteMessage: function(messageData) {
+    // overriden
+    _deleteMessage: function(messageData) {
       this.base(arguments, messageData);
       this.__evalFirstAndLastMessage();
     },

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

@@ -133,6 +133,22 @@ qx.Class.define("osparc.support.Conversation", {
       this.__evaluateShareProject();
     },
 
+    // overridden
+    _messageAdded: function(message) {
+      this.base(arguments, message);
+
+      // keep conversation read
+      const conversation = this.getConversation();
+      if (conversation) {
+        if (osparc.store.Groups.getInstance().amIASupportUser()) {
+          conversation.setReadBySupport(true);
+        } else {
+          conversation.setReadByUser(true);
+        }
+        console.log("marked as read:", message);
+      }
+    },
+
     __postMessage: function(content) {
       const conversationId = this.getConversation().getConversationId();
       return osparc.store.ConversationsSupport.getInstance().postMessage(conversationId, content);

services/static-webserver/client/source/class/osparc/support/ConversationPage.js

@@ -63,11 +63,14 @@ qx.Class.define("osparc.support.ConversationPage", {
         }
         case "back-button":
           control = new qx.ui.form.Button().set({
-            toolTipText: this.tr("Return to Messages"),
+            toolTipText: this.tr("Return to Conversations"),
             icon: "@FontAwesome5Solid/arrow-left/16",
             backgroundColor: "transparent"
           });
-          control.addListener("execute", () => this.fireEvent("showConversations"));
+          control.addListener("execute", () => {
+            this.setConversation(null);
+            this.fireEvent("showConversations");
+          });
           this.getChildControl("conversation-header-layout").addAt(control, 0);
           break;
         case "conversation-header-center-layout":