Skip to content

Commit 1612d7c

Browse files
committed
nameAlias
1 parent 1b03fa1 commit 1612d7c

File tree

3 files changed

+19
-25
lines changed

3 files changed

+19
-25
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ qx.Class.define("osparc.data.model.Conversation", {
3838
projectId: conversationData.projectUuid || null,
3939
extraContext: conversationData.extraContext || null,
4040
});
41+
42+
if (conversationData.name && conversationData.name !== "null") {
43+
this.setNameAlias(conversationData.name);
44+
} else {
45+
osparc.store.ConversationsSupport.getInstance().getLastMessage(conversationData.conversationId)
46+
.then(lastMessage => {
47+
this.setNameAlias(lastMessage ? lastMessage.content : "");
48+
});
49+
}
4150
},
4251

4352
properties: {
@@ -55,6 +64,13 @@ qx.Class.define("osparc.data.model.Conversation", {
5564
event: "changeName",
5665
},
5766

67+
nameAlias: {
68+
check: "String",
69+
nullable: false,
70+
init: "",
71+
event: "changeNameAlias",
72+
},
73+
5874
userGroupId: {
5975
check: "Number",
6076
nullable: false,

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

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,26 +46,12 @@ qx.Class.define("osparc.support.ConversationListItem", {
4646

4747
members: {
4848
__applyConversation: function(conversation) {
49-
const conversationId = conversation.getConversationId();
50-
if (conversation.getMessages()) {
51-
this.__populateListItem();
52-
} else {
53-
osparc.store.ConversationsSupport.getInstance().getLastMessage(conversationId)
54-
.then(() => {
55-
this.__populateListItem();
56-
});
57-
}
58-
},
59-
60-
__populateListItem: function() {
61-
const conversation = this.getConversation();
49+
conversation.bind("nameAlias", this, "title");
6250
const messages = conversation.getMessages();
6351
if (messages && messages.length) {
6452
const lastMessage = messages[0];
6553
const date = osparc.utils.Utils.formatDateAndTime(new Date(lastMessage.created));
66-
const name = conversation.getName();
6754
this.set({
68-
title: name && name !== "null" ? name : lastMessage.content,
6955
subtitle: date,
7056
});
7157

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,7 @@ qx.Class.define("osparc.support.ConversationPage", {
131131
if (conversationId) {
132132
osparc.store.ConversationsSupport.getInstance().getConversation(conversationId)
133133
.then(conversation => {
134-
const name = conversation.getName();
135-
if (name && name !== "null") {
136-
title.setValue(name);
137-
} else {
138-
osparc.store.ConversationsSupport.getInstance().getLastMessage(conversationId)
139-
.then(lastMessage => {
140-
title.setValue(lastMessage ? lastMessage.content : "");
141-
});
142-
}
143-
options.show();
134+
conversation.bind("nameAlias", title, "value");
144135
const amISupporter = osparc.store.Products.getInstance().amIASupportUser();
145136
const extraContextLabel = this.getChildControl("conversation-extra-content");
146137
extraContextLabel.setVisibility(amISupporter ? "visible" : "excluded");
@@ -153,6 +144,7 @@ qx.Class.define("osparc.support.ConversationPage", {
153144
}
154145
extraContextLabel.setValue(extraContextText);
155146
}
147+
options.show();
156148
});
157149
} else {
158150
title.setValue("");

0 commit comments

Comments
 (0)