Skip to content

Commit c90ed7c

Browse files
committed
Show notification in conversation
1 parent 4574e36 commit c90ed7c

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

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

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,29 @@ qx.Class.define("osparc.info.Conversation", {
223223
},
224224

225225
__addMessages: function(messages) {
226-
if (messages.length === 1) {
226+
const nMessages = messages.filter(msg => msg["type"] === "MESSAGE").length;
227+
if (nMessages === 1) {
227228
this.__messagesTitle.setValue(this.tr("1 Message"));
228-
} else if (messages.length > 1) {
229-
this.__messagesTitle.setValue(messages.length + this.tr(" Messages"));
229+
} else if (nMessages > 1) {
230+
this.__messagesTitle.setValue(nMessages + this.tr(" Messages"));
230231
}
231232

232233
messages.forEach(message => {
233-
const messageUi = new osparc.info.CommentUI(message);
234-
this.__messagesList.add(messageUi);
234+
switch (message["type"]) {
235+
case "NOTIFICATION": {
236+
const notificationUi = new qx.ui.basic.Label().set({
237+
value: `${message["userGroupId"]} notified ${message["content"]}`
238+
});
239+
this.__messagesList.add(notificationUi);
240+
break;
241+
}
242+
case "MESSAGE": {
243+
const messageUi = new osparc.info.CommentUI(message);
244+
this.__messagesList.add(messageUi);
245+
break;
246+
}
247+
}
248+
235249
});
236250
},
237251
}

services/static-webserver/client/source/class/osparc/study/Conversations.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ qx.Class.define("osparc.study.Conversations", {
101101
conversationId,
102102
},
103103
data: {
104-
"content": userGroupId,
104+
"content": userGroupId.toString(), // eventually the backend will accept integers
105105
"type": "NOTIFICATION",
106106
}
107107
};

0 commit comments

Comments
 (0)