Skip to content

Commit 1582d17

Browse files
committed
fixes
1 parent e7ff09f commit 1582d17

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ qx.Class.define("osparc.data.model.Conversation", {
133133
},
134134

135135
__applyLastMessage: function(lastMessage) {
136-
if (this.getNameAlias() === "") {
136+
const name = this.getName();
137+
if (!name || name === "null") {
137138
this.setNameAlias(lastMessage ? lastMessage.content : "");
138139
}
139140
},
@@ -192,9 +193,15 @@ qx.Class.define("osparc.data.model.Conversation", {
192193
},
193194

194195
addMessage: function(message) {
195-
this.__messages.push(message);
196-
197-
this.setLastMessage(this.__messages[0]);
196+
if (message) {
197+
const found = this.__messages.find(msg => msg["messageId"] === message["messageId"]);
198+
if (!found) {
199+
this.__messages.push(message);
200+
}
201+
// latest first
202+
this.__messages.sort((a, b) => new Date(b.created) - new Date(a.created));
203+
this.setLastMessage(this.__messages[0]);
204+
}
198205
},
199206

200207
getContextProjectId: function() {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ qx.Class.define("osparc.support.Conversation", {
135135
this.setConversation(conversation);
136136
});
137137
} else {
138+
this.getConversation().addMessage(data);
138139
this.addMessage(data);
139140
}
140141
});

0 commit comments

Comments
 (0)