Skip to content

Commit 3447ebd

Browse files
odeimaizodeimaiz
committed
refactor
1 parent 7cf681a commit 3447ebd

File tree

3 files changed

+45
-20
lines changed

3 files changed

+45
-20
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,5 +255,14 @@ qx.Class.define("osparc.conversation.Conversation", {
255255
this.__messagesList.add(control);
256256
}
257257
},
258+
259+
deleteMessage: function(messageId) {
260+
const messageIndex = this.__messages.findIndex(msg => msg["messageId"] === messageId);
261+
if (messageIndex !== -1) {
262+
this.__messages.splice(messageIndex, 1);
263+
}
264+
265+
console.log(this.__messagesList.getChildren());
266+
},
258267
}
259268
});

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,12 @@ qx.Class.define("osparc.conversation.MessageUI", {
2626
construct: function(message, studyData = null) {
2727
this.base(arguments);
2828

29-
this.__message = message;
3029
this.__studyData = studyData;
30+
this.set({
31+
message,
32+
});
3133

32-
const isMyMessage = this.self().isMyMessage(this.__message);
34+
const isMyMessage = this.self().isMyMessage(message);
3335
const layout = new qx.ui.layout.Grid(12, 4);
3436
layout.setColumnFlex(1, 1); // content
3537
layout.setColumnFlex(isMyMessage ? 0 : 2, 3); // spacer
@@ -50,11 +52,17 @@ qx.Class.define("osparc.conversation.MessageUI", {
5052
"messageDeleted": "qx.event.type.Event",
5153
},
5254

53-
members: {
54-
__message: null,
55+
properties: {
56+
message: {
57+
check: "Object",
58+
init: null,
59+
nullable: false,
60+
},
61+
},
5562

63+
members: {
5664
_createChildControlImpl: function(id) {
57-
const isMyMessage = this.self().isMyMessage(this.__message);
65+
const isMyMessage = this.self().isMyMessage(this.getMessage());
5866
let control;
5967
switch (id) {
6068
case "thumbnail":
@@ -145,15 +153,15 @@ qx.Class.define("osparc.conversation.MessageUI", {
145153

146154
const userName = this.getChildControl("user-name");
147155

148-
const date = new Date(this.__message["modified"]);
156+
const date = new Date(this.getMessage()["modified"]);
149157
const date2 = osparc.utils.Utils.formatDateAndTime(date);
150158
const lastUpdate = this.getChildControl("last-updated");
151159
lastUpdate.setValue(date2);
152160

153161
const messageContent = this.getChildControl("message-content");
154-
messageContent.setValue(this.__message["content"]);
162+
messageContent.setValue(this.getMessage()["content"]);
155163

156-
osparc.store.Users.getInstance().getUser(this.__message["userGroupId"])
164+
osparc.store.Users.getInstance().getUser(this.getMessage()["userGroupId"])
157165
.then(user => {
158166
if (user) {
159167
thumbnail.setSource(user.getThumbnail());
@@ -170,7 +178,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
170178

171179
this.getChildControl("spacer");
172180

173-
if (this.self().isMyMessage(this.__message)) {
181+
if (this.self().isMyMessage(this.getMessage())) {
174182
const menuButton = this.getChildControl("menu-button");
175183

176184
const menu = new qx.ui.menu.Menu().set({
@@ -189,7 +197,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
189197
},
190198

191199
__editMessage: function() {
192-
const addMessage = new osparc.conversation.AddMessage(this.__studyData, this.__message["conversationId"], this.__message);
200+
const addMessage = new osparc.conversation.AddMessage(this.__studyData, this.getMessage()["conversationId"], this.getMessage());
193201
const title = this.tr("Edit message");
194202
const win = osparc.ui.window.Window.popUpInWindow(addMessage, title, 570, 135).set({
195203
clickAwayClose: false,
@@ -211,7 +219,7 @@ qx.Class.define("osparc.conversation.MessageUI", {
211219
win.open();
212220
win.addListener("close", () => {
213221
if (win.getConfirmed()) {
214-
osparc.study.Conversations.deleteMessage(this.__message["projectId"], this.__message["conversationId"], this.__message["messageId"])
222+
osparc.study.Conversations.deleteMessage(this.getMessage()["projectId"], this.getMessage()["conversationId"], this.getMessage()["messageId"])
215223
.then(() => this.fireEvent("messageDeleted"))
216224
.catch(err => osparc.FlashMessenger.logError(err));
217225
}

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ qx.Class.define("osparc.conversation.NotificationUI", {
2525
construct: function(message) {
2626
this.base(arguments);
2727

28-
this.__message = message;
28+
this.set({
29+
message,
30+
});
2931

30-
const isMyMessage = osparc.conversation.MessageUI.isMyMessage(this.__message);
32+
const isMyMessage = osparc.conversation.MessageUI.isMyMessage(message);
3133
const layout = new qx.ui.layout.Grid(4, 4);
3234
layout.setColumnFlex(isMyMessage ? 0 : 3, 3); // spacer
3335
layout.setRowAlign(0, "center", "middle");
@@ -37,13 +39,19 @@ qx.Class.define("osparc.conversation.NotificationUI", {
3739
this.__buildLayout();
3840
},
3941

40-
members: {
41-
__message: null,
42+
properties: {
43+
message: {
44+
check: "Object",
45+
init: null,
46+
nullable: false,
47+
},
48+
},
4249

50+
members: {
4351
// spacer - date - content - (thumbnail-spacer)
4452
// (thumbnail-spacer) - content - date - spacer
4553
_createChildControlImpl: function(id) {
46-
const isMyMessage = osparc.conversation.MessageUI.isMyMessage(this.__message);
54+
const isMyMessage = osparc.conversation.MessageUI.isMyMessage(this.getMessage());
4755
let control;
4856
switch (id) {
4957
case "thumbnail-spacer":
@@ -90,16 +98,16 @@ qx.Class.define("osparc.conversation.NotificationUI", {
9098
__buildLayout: function() {
9199
this.getChildControl("thumbnail-spacer");
92100

93-
const isMyMessage = osparc.conversation.MessageUI.isMyMessage(this.__message);
101+
const isMyMessage = osparc.conversation.MessageUI.isMyMessage(this.getMessage());
94102

95-
const modifiedDate = new Date(this.__message["modified"]);
103+
const modifiedDate = new Date(this.getMessage()["modified"]);
96104
const date = osparc.utils.Utils.formatDateAndTime(modifiedDate);
97105
const lastUpdate = this.getChildControl("last-updated");
98106
lastUpdate.setValue(isMyMessage ? date + " -" : " - " + date);
99107

100108
const messageContent = this.getChildControl("message-content");
101-
const notifierUserGroupId = parseInt(this.__message["userGroupId"]);
102-
const notifiedUserGroupId = parseInt(this.__message["content"]);
109+
const notifierUserGroupId = parseInt(this.getMessage()["userGroupId"]);
110+
const notifiedUserGroupId = parseInt(this.getMessage()["content"]);
103111
let msgContent = "🔔 ";
104112
Promise.all([
105113
osparc.store.Users.getInstance().getUser(notifierUserGroupId),

0 commit comments

Comments
 (0)