Skip to content

Commit 7dbbac2

Browse files
committed
more storing
1 parent c31dda7 commit 7dbbac2

File tree

3 files changed

+30
-10
lines changed

3 files changed

+30
-10
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,14 +213,14 @@ qx.Class.define("osparc.conversation.AddMessage", {
213213
const conversationId = this.getConversationId();
214214
const message = this.getMessage();
215215
if (studyData) {
216-
osparc.store.ConversationsProject.getInstance().editMessage(studyData["uuid"], conversationId, message["messageId"], content)
217-
.then(data => {
218-
this.fireDataEvent("messageUpdated", data);
219-
commentField.getChildControl("text-area").setValue("");
220-
});
216+
promise = osparc.store.ConversationsProject.getInstance().editMessage(studyData["uuid"], conversationId, message["messageId"], content);
221217
} else {
222-
// support comment editing
218+
promise = osparc.store.ConversationsSupport.getInstance().editMessage(conversationId, message["messageId"], content);
223219
}
220+
promise.then(data => {
221+
this.fireDataEvent("messageUpdated", data);
222+
commentField.getChildControl("text-area").setValue("");
223+
});
224224
}
225225
},
226226

services/static-webserver/client/source/class/osparc/store/ConversationsSupport.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ qx.Class.define("osparc.store.ConversationsSupport", {
6262
},
6363

6464
getConversation: function(conversationId) {
65+
if (conversationId in this.__conversationsCached) {
66+
return Promise.resolve(this.__conversationsCached[conversationId]);
67+
}
68+
6569
const params = {
6670
url: {
6771
conversationId,
@@ -130,6 +134,14 @@ qx.Class.define("osparc.store.ConversationsSupport", {
130134
},
131135

132136
getLastMessage: function(conversationId) {
137+
if (
138+
conversationId in this.__conversationsCached &&
139+
this.__conversationsCached[conversationId].getMessages() &&
140+
this.__conversationsCached[conversationId].getMessages().length
141+
) {
142+
return Promise.resolve(this.__conversationsCached[conversationId].getMessages()[0]);
143+
}
144+
133145
const params = {
134146
url: {
135147
conversationId,
@@ -188,7 +200,9 @@ qx.Class.define("osparc.store.ConversationsSupport", {
188200
},
189201

190202
__addMessageToCache: function(conversationId, messageData) {
191-
this.__conversationsCached[conversationId].addMessage(messageData);
203+
if (conversationId in this.__conversationsCached) {
204+
this.__conversationsCached[conversationId].addMessage(messageData);
205+
}
192206
},
193207
}
194208
});

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ qx.Class.define("osparc.support.ConversationPage", {
6767
case "conversation-title":
6868
control = new qx.ui.basic.Label().set({
6969
alignY: "middle",
70+
allowGrowX: true,
7071
});
7172
this.getChildControl("conversation-header-layout").add(control);
7273
break;
@@ -99,9 +100,14 @@ qx.Class.define("osparc.support.ConversationPage", {
99100
osparc.store.ConversationsSupport.getInstance().getConversation(conversationId)
100101
.then(conversation => {
101102
const name = conversation.getName();
102-
title.set({
103-
value: name && name !== "null" ? name : lastMessage.content,
104-
});
103+
if (name && name !== "null") {
104+
title.setValue(name);
105+
} else {
106+
osparc.store.ConversationsSupport.getInstance().getLastMessage(conversationId)
107+
.then(lastMessage => {
108+
title.setValue(lastMessage ? lastMessage.content : "");
109+
});
110+
}
105111
options.show();
106112
});
107113
} else {

0 commit comments

Comments
 (0)