@@ -47,7 +47,7 @@ qx.Class.define("osparc.conversation.Conversation", {
4747
4848 this . __buildLayout ( ) ;
4949
50- this . fetchMessages ( ) ;
50+ this . reloadMessages ( ) ;
5151 } ,
5252
5353 properties : {
@@ -161,7 +161,7 @@ qx.Class.define("osparc.conversation.Conversation", {
161161 } ) ;
162162
163163 this . __loadMoreMessages = new osparc . ui . form . FetchButton ( this . tr ( "Load more messages..." ) ) ;
164- this . __loadMoreMessages . addListener ( "execute" , ( ) => this . fetchMessages ( false ) ) ;
164+ this . __loadMoreMessages . addListener ( "execute" , ( ) => this . reloadMessages ( false ) ) ;
165165 this . _add ( this . __loadMoreMessages ) ;
166166
167167 if ( osparc . data . model . Study . canIWrite ( this . __studyData [ "accessRights" ] ) ) {
@@ -172,13 +172,33 @@ qx.Class.define("osparc.conversation.Conversation", {
172172 if ( data [ "conversationId" ] ) {
173173 this . setConversationId ( data [ "conversationId" ] ) ;
174174 }
175- this . fetchMessages ( ) ;
175+ this . reloadMessages ( ) ;
176176 } ) ;
177177 this . _add ( addMessages ) ;
178178 }
179179 } ,
180180
181- fetchMessages : function ( removeMessages = true ) {
181+ __getNextRequest : function ( ) {
182+ const params = {
183+ url : {
184+ studyId : this . __studyData [ "uuid" ] ,
185+ conversationId : this . getConversationId ( ) ,
186+ offset : 0 ,
187+ limit : 42
188+ }
189+ } ;
190+ const nextRequestParams = this . __nextRequestParams ;
191+ if ( nextRequestParams ) {
192+ params . url . offset = nextRequestParams . offset ;
193+ params . url . limit = nextRequestParams . limit ;
194+ }
195+ const options = {
196+ resolveWResponse : true
197+ } ;
198+ return osparc . data . Resources . fetch ( "conversations" , "getMessagesPage" , params , options ) ;
199+ } ,
200+
201+ reloadMessages : function ( removeMessages = true ) {
182202 if ( this . getConversationId ( ) === null ) {
183203 this . __messagesTitle . setValue ( this . tr ( "No messages yet" ) ) ;
184204 this . __messagesList . hide ( ) ;
@@ -207,26 +227,6 @@ qx.Class.define("osparc.conversation.Conversation", {
207227 . finally ( ( ) => this . __loadMoreMessages . setFetching ( false ) ) ;
208228 } ,
209229
210- __getNextRequest : function ( ) {
211- const params = {
212- url : {
213- studyId : this . __studyData [ "uuid" ] ,
214- conversationId : this . getConversationId ( ) ,
215- offset : 0 ,
216- limit : 42
217- }
218- } ;
219- const nextRequestParams = this . __nextRequestParams ;
220- if ( nextRequestParams ) {
221- params . url . offset = nextRequestParams . offset ;
222- params . url . limit = nextRequestParams . limit ;
223- }
224- const options = {
225- resolveWResponse : true
226- } ;
227- return osparc . data . Resources . fetch ( "conversations" , "getMessagesPage" , params , options ) ;
228- } ,
229-
230230 addMessage : function ( message ) {
231231 // it's not provided by the backend
232232 message [ "projectId" ] = this . __studyData [ "uuid" ] ;
@@ -244,8 +244,8 @@ qx.Class.define("osparc.conversation.Conversation", {
244244 switch ( message [ "type" ] ) {
245245 case "MESSAGE" :
246246 control = new osparc . conversation . MessageUI ( message , this . __studyData ) ;
247- control . addListener ( "messageEdited" , ( ) => this . fetchMessages ( ) ) ;
248- control . addListener ( "messageDeleted" , ( ) => this . fetchMessages ( ) ) ;
247+ control . addListener ( "messageEdited" , ( ) => this . reloadMessages ( ) ) ;
248+ control . addListener ( "messageDeleted" , ( ) => this . reloadMessages ( ) ) ;
249249 break ;
250250 case "NOTIFICATION" :
251251 control = new osparc . conversation . NotificationUI ( message ) ;
0 commit comments