Skip to content

🐛🎨 [Frontend] Enh: Comments aesthetics #7517

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 7 commits into from
Apr 14, 2025
Merged

🐛🎨 [Frontend] Enh: Comments aesthetics #7517

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7bf3d3a
minor
odeimaiz Apr 11, 2025
66394bb
Fix Note's Recipient
odeimaiz Apr 14, 2025
030dfde
not needed
odeimaiz Apr 14, 2025
4438f29
comment layout
odeimaiz Apr 14, 2025
7a5e096
Merge branch 'master' into enh/comment-ui
odeimaiz Apr 14, 2025
6188fc3
minor
odeimaiz Apr 14, 2025
466269c
Merge branch 'enh/comment-ui' of github.com:odeimaiz/osparc-simcore i…
odeimaiz Apr 14, 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
1 change: 0 additions & 1 deletion services/static-webserver/client/source/class/osparc/desktop/StudyEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ qx.Class.define("osparc.desktop.StudyEditor", {
}
}, this);
}
socket.emit("logger");
},

__listenToProgress: function() {
Expand Down
4 changes: 3 additions & 1 deletion services/static-webserver/client/source/class/osparc/editor/AnnotationNoteCreator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ qx.Class.define("osparc.editor.AnnotationNoteCreator", {
allowGrowX: false
});
control.addListener("execute", () => {
const collaboratorsManager = new osparc.share.NewCollaboratorsManager(null, false);
const currentStudy = osparc.store.Store.getInstance().getCurrentStudy().serialize();
currentStudy["resourceType"] = "study";
const collaboratorsManager = new osparc.share.NewCollaboratorsManager(currentStudy, false);
collaboratorsManager.setCaption("Recipient");
collaboratorsManager.getActionButton().setLabel(this.tr("Add"));
collaboratorsManager.addListener("addCollaborators", e => {
Expand Down
67 changes: 39 additions & 28 deletions services/static-webserver/client/source/class/osparc/info/CommentUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ qx.Class.define("osparc.info.CommentUI", {
this.__comment = comment;

const isMyComment = this.__isMyComment();
const layout = new qx.ui.layout.Grid(12, 5);
layout.setColumnFlex(isMyComment ? 0 : 1, 1); // message content
const layout = new qx.ui.layout.Grid(12, 4);
layout.setColumnFlex(1, 1); // comment
layout.setColumnFlex(isMyComment ? 0 : 2, 2); // spacer
this._setLayout(layout);
this.setPadding(5);

Expand All @@ -46,55 +47,63 @@ qx.Class.define("osparc.info.CommentUI", {
_createChildControlImpl: function(id) {
let control;
switch (id) {
case "meta-data-grid": {
const layout = new qx.ui.layout.Grid(12, 5)
layout.setColumnWidth(this.__isMyComment() ? 1 : 0, 32); // thumbnail
control = new qx.ui.container.Composite(layout);
this._add(control, {
row: 0,
column: this.__isMyComment() ? 1 : 0
});
break;
}
case "thumbnail":
control = new qx.ui.basic.Image().set({
scale: true,
maxWidth: 32,
maxHeight: 32,
decorator: "rounded",
marginTop: 2,
});
this._add(control, {
row: 0,
column: this.__isMyComment() ? 2 : 0,
rowSpan: 2,
});
this.getChildControl("meta-data-grid").add(control, {
break;
case "header-layout":
control = new qx.ui.container.Composite(new qx.ui.layout.HBox(5).set({
alignX: this.__isMyComment() ? "right" : "left"
}));
this._add(control, {
row: 0,
column: this.__isMyComment() ? 1 : 0,
rowSpan: 2
column: 1
});
break;
case "user-name":
control = new qx.ui.basic.Label().set({
font: "text-14"
});
this.getChildControl("meta-data-grid").add(control, {
row: 0,
column: this.__isMyComment() ? 0 : 1
font: "text-12"
});
this.getChildControl("header-layout").addAt(control, 0);
break;
case "last-updated":
control = new qx.ui.basic.Label().set({
font: "text-12"
});
this.getChildControl("meta-data-grid").add(control, {
row: 1,
column: this.__isMyComment() ? 0 : 1
});
this.getChildControl("header-layout").addAt(control, 1);
break;
case "comment-content":
control = new osparc.ui.markdown.Markdown();
control = new osparc.ui.markdown.Markdown().set({
backgroundColor: "background-main-2",
decorator: "rounded",
noMargin: true,
paddingLeft: 8,
paddingRight: 8,
allowGrowX: true,
});
control.getContentElement().setStyles({
"text-align": this.__isMyComment() ? "right" : "left"
"text-align": this.__isMyComment() ? "right" : "left",
});
this._add(control, {
row: 0,
column: this.__isMyComment() ? 0 : 1
row: 1,
column: 1,
});
break;
case "spacer":
control = new qx.ui.core.Spacer();
this._add(control, {
row: 1,
column: this.__isMyComment() ? 0 : 2,
});
break;
}
Expand Down Expand Up @@ -122,6 +131,8 @@ qx.Class.define("osparc.info.CommentUI", {
thumbnail.setSource(user.getThumbnail());
userName.setValue(user.getLabel());
}

this.getChildControl("spacer");
}
}
});
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/share/NewCollaboratorsManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ qx.Class.define("osparc.share.NewCollaboratorsManager", {
}
}
if (Object.keys(this.__selectedCollaborators).length) {
const selectedGIds = Object.keys(this.__selectedCollaborators).filter(key => qx.lang.Type.isNumber(key));
const selectedGIds = Object.keys(this.__selectedCollaborators).filter(key => /^\d+$/.test(key)); // all digits
const selectedEmails = Object.keys(this.__selectedCollaborators).filter(key => osparc.auth.core.Utils.checkEmail(key));

const addCollaborators = () => {
Expand Down
Loading