refactor

Author: odeimaiz

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

@@ -121,6 +121,7 @@ qx.Class.define("osparc.data.model.Conversation", {
 
   members: {
     __fetchLastMessagePromise: null,
+    __nextRequestParams: null,
 
     __applyName: function(name) {
       if (name && name !== "null") {
@@ -161,6 +162,32 @@ qx.Class.define("osparc.data.model.Conversation", {
       return this.__fetchLastMessage();
     },
 
+    getNextMessages: function() {
+      const params = {
+        url: {
+          conversationId: this.getConversationId(),
+          offset: 0,
+          limit: 42
+        }
+      };
+      const nextRequestParams = this.__nextRequestParams;
+      if (nextRequestParams) {
+        params.url.offset = nextRequestParams.offset;
+        params.url.limit = nextRequestParams.limit;
+      }
+      const options = {
+        resolveWResponse: true
+      };
+      return osparc.data.Resources.fetch("conversationsSupport", "getMessagesPage", params, options)
+        .then(resp => {
+          const messages = resp["data"];
+          messages.forEach(message => this.addMessage(message));
+          this.__nextRequestParams = resp["_links"]["next"];
+          return resp;
+        })
+        .catch(err => osparc.FlashMessenger.logError(err));
+    },
+
     renameConversation: function(newName) {
       osparc.store.ConversationsSupport.getInstance().renameConversation(this.getConversationId(), newName)
         .then(() => {

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

@@ -56,7 +56,6 @@ qx.Class.define("osparc.support.Conversation", {
 
   members: {
     __messages: null,
-    __nextRequestParams: null,
 
     _createChildControlImpl: function(id) {
       let control;
@@ -138,26 +137,6 @@ qx.Class.define("osparc.support.Conversation", {
       }
     },
 
-    __getNextRequest: function() {
-      const params = {
-        url: {
-          conversationId: this.getConversation().getConversationId(),
-          offset: 0,
-          limit: 42
-        }
-      };
-      const nextRequestParams = this.__nextRequestParams;
-      if (nextRequestParams) {
-        params.url.offset = nextRequestParams.offset;
-        params.url.limit = nextRequestParams.limit;
-      }
-      const options = {
-        resolveWResponse: true
-      };
-      return osparc.data.Resources.fetch("conversationsSupport", "getMessagesPage", params, options)
-        .catch(err => osparc.FlashMessenger.logError(err));
-    },
-
     __reloadMessages: function(removeMessages = true) {
       const messagesContainer = this.getChildControl("messages-container");
       const loadMoreMessages = this.getChildControl("load-more-button");
@@ -176,12 +155,11 @@ qx.Class.define("osparc.support.Conversation", {
         messagesContainer.removeAll();
       }
 
-      this.__getNextRequest()
+      this.getConversation().getNextMessages()
         .then(resp => {
           const messages = resp["data"];
           messages.forEach(message => this.addMessage(message));
-          this.__nextRequestParams = resp["_links"]["next"];
-          if (this.__nextRequestParams === null && loadMoreMessages) {
+          if (resp["_links"]["next"] === null && loadMoreMessages) {
             loadMoreMessages.exclude();
           }
         })