Skip to content

🐛 [Frontend] Conversations: fixes #8168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 28, 2025
Merged

🐛 [Frontend] Conversations: fixes #8168

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
804616a
minor fixes
odeimaiz Jul 28, 2025
afcda38
remove the temporary conversation page
odeimaiz Jul 28, 2025
04bb01f
minor
odeimaiz Jul 28, 2025
a91097b
messages title
odeimaiz Jul 28, 2025
f8374dd
scroll to bottom
odeimaiz Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions services/static-webserver/client/source/class/osparc/conversation/Conversation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ qx.Class.define("osparc.conversation.Conversation", {

__reloadMessages: function(removeMessages = true) {
if (this.getConversationId() === null) {
this.__messagesTitle.setValue(this.tr("No messages yet"));
// temporary conversation page
this.__messagesTitle.setValue(this.tr("No Messages yet"));
this.__messagesList.hide();
this.__loadMoreMessages.hide();
return;
Expand All @@ -217,7 +218,7 @@ qx.Class.define("osparc.conversation.Conversation", {
const messages = resp["data"];
messages.forEach(message => this.addMessage(message));
this.__nextRequestParams = resp["_links"]["next"];
if (this.__nextRequestParams === null) {
if (this.__nextRequestParams === null && this.__loadMoreMessages) {
this.__loadMoreMessages.exclude();
}
})
Expand All @@ -226,7 +227,9 @@ qx.Class.define("osparc.conversation.Conversation", {

__updateMessagesNumber: function() {
const nMessages = this.__messages.filter(msg => msg["type"] === "MESSAGE").length;
if (nMessages === 1) {
if (nMessages === 0) {
this.__messagesTitle.setValue(this.tr("No Messages yet"));
} else if (nMessages === 1) {
this.__messagesTitle.setValue(this.tr("1 Message"));
} else if (nMessages > 1) {
this.__messagesTitle.setValue(nMessages + this.tr(" Messages"));
Expand Down
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/data/model/Node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ qx.Class.define("osparc.data.model.Node", {
});
} else {
this.fireDataEvent("projectDocumentChanged", {
"op": "delete",
"op": "remove",
"path": `/ui/workbench/${this.getNodeId()}/marker`,
"osparc-resource": "ui",
});
Expand Down
26 changes: 14 additions & 12 deletions services/static-webserver/client/source/class/osparc/data/model/Study.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,19 +573,21 @@ qx.Class.define("osparc.data.model.Study", {
// Do not listen to output related backend updates if the node is a frontend node.
// The frontend controls its output values, progress and states.
// If a File Picker is uploading a file, the backend could override the current state with some older state.
if (node && nodeData && !osparc.data.model.Node.isFrontend(node.getMetaData())) {
node.setOutputData(nodeData.outputs);
if ("progress" in nodeData) {
const progress = Number.parseInt(nodeData["progress"]);
node.getStatus().setProgress(progress);
if (node) {
if (nodeData && !osparc.data.model.Node.isFrontend(node.getMetaData())) {
node.setOutputData(nodeData.outputs);
if ("progress" in nodeData) {
const progress = Number.parseInt(nodeData["progress"]);
node.getStatus().setProgress(progress);
}
node.populateStates(nodeData);
}
if ("errors" in nodeUpdatedData) {
const errors = nodeUpdatedData["errors"];
node.setErrors(errors);
} else {
node.setErrors([]);
}
node.populateStates(nodeData);
}
if (node && "errors" in nodeUpdatedData) {
const errors = nodeUpdatedData["errors"];
node.setErrors(errors);
} else {
node.setErrors([]);
}
},

Expand Down
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/data/model/StudyUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ qx.Class.define("osparc.data.model.StudyUI", {
if (annotationId in this.getAnnotations()) {
const annotation = this.getAnnotations()[annotationId]
this.fireDataEvent("projectDocumentChanged", {
"op": "delete",
"op": "remove",
"path": `/ui/annotations/${annotation.getId()}`,
"osparc-resource": "study-ui",
});
Expand Down
8 changes: 4 additions & 4 deletions services/static-webserver/client/source/class/osparc/data/model/Workbench.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ qx.Class.define("osparc.data.model.Workbench", {
this.__addNode(node);

node.populateNodeData();
this.giveUniqueNameToNode(node, node.getLabel());
this.__giveUniqueNameToNode(node, node.getLabel());
node.checkState();

return node;
Expand Down Expand Up @@ -653,15 +653,15 @@ qx.Class.define("osparc.data.model.Workbench", {
return false;
},

giveUniqueNameToNode: function(node, label, suffix = 2) {
__giveUniqueNameToNode: function(node, label, suffix = 2) {
const newLabel = label + "_" + suffix;
const allModels = this.getNodes();
const nodes = Object.values(allModels);
for (const node2 of nodes) {
if (node2.getNodeId() !== node.getNodeId() &&
node2.getLabel().localeCompare(node.getLabel()) === 0) {
node.setLabel(newLabel);
this.giveUniqueNameToNode(node, label, suffix+1);
this.__giveUniqueNameToNode(node, label, suffix+1);
}
}
},
Expand Down Expand Up @@ -720,7 +720,7 @@ qx.Class.define("osparc.data.model.Workbench", {

nodeIds.forEach(nodeId => {
const node = this.getNode(nodeId);
this.giveUniqueNameToNode(node, node.getLabel());
this.__giveUniqueNameToNode(node, node.getLabel());
});
});
},
Expand Down
13 changes: 11 additions & 2 deletions services/static-webserver/client/source/class/osparc/study/Conversations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,12 @@ qx.Class.define("osparc.study.Conversations", {

__addToPages: function(conversationPage) {
const conversationsLayout = this.getChildControl("conversations-layout");
if (conversationsLayout.getChildren().length === 1) {
// remove the temporary conversation page
if (conversationsLayout.getChildren()[0].getConversationId() === null) {
conversationsLayout.remove(conversationsLayout.getChildren()[0]);
}
}
conversationsLayout.add(conversationPage);

if (this.__newConversationButton === null) {
Expand All @@ -246,8 +252,11 @@ qx.Class.define("osparc.study.Conversations", {
conversationsLayout.getChildControl("bar").add(newConversationButton);
}
// remove and add to move to last position
conversationsLayout.getChildControl("bar").remove(this.__newConversationButton);
conversationsLayout.getChildControl("bar").add(this.__newConversationButton);
const bar = conversationsLayout.getChildControl("bar");
if (bar.indexOf(this.__newConversationButton) > -1) {
bar.remove(this.__newConversationButton);
}
bar.add(this.__newConversationButton);
},

__removeConversationPage: function(conversationId, changeSelection = false) {
Expand Down
8 changes: 1 addition & 7 deletions services/static-webserver/client/source/class/osparc/workbench/Annotation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,14 +276,8 @@ qx.Class.define("osparc.workbench.Annotation", {
const serializeData = {
type: this.getType(),
attributes: this.getAttributes(),
color: this.getColor(), // TYPES.NOTE and TYPES.CONVERSATION do not need a color but backend expects it
};
if ([
this.self().TYPES.RECT,
this.self().TYPES.TEXT,
this.self().TYPES.NOTE,
].includes(this.getType())) {
serializeData.color = this.getColor();
}
return serializeData;
}
}
Expand Down
4 changes: 2 additions & 2 deletions services/static-webserver/client/source/class/osparc/workbench/WorkbenchUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {

__addNode: async function(service, pos) {
// render temporary node
let tempNodeUI = this.__createTemporaryNodeUI(pos);
let dashedNodeUI = this.__createTemporaryNodeUI(pos);

let nodeUI = null;
try {
Expand All @@ -359,7 +359,7 @@ qx.Class.define("osparc.workbench.WorkbenchUI", {
console.error(err);
} finally {
// remove temporary node
this.__removeTemporaryNodeUI(tempNodeUI);
this.__removeTemporaryNodeUI(dashedNodeUI);
}
return nodeUI;
},
Expand Down
Loading