Skip to content

Fix/sntz tgs #8524

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 15 commits into from
Oct 16, 2025
Merged

Fix/sntz tgs #8524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c08a6a6
minor
odeimaiz Oct 16, 2025
4224ad0
not needed
odeimaiz Oct 16, 2025
6e86cee
refactor
odeimaiz Oct 16, 2025
c9adfac
not needed
odeimaiz Oct 16, 2025
a7ec4de
SafeLabel
odeimaiz Oct 16, 2025
8ad5b66
minor
odeimaiz Oct 16, 2025
ae48944
Safer
odeimaiz Oct 16, 2025
483a62f
more
odeimaiz Oct 16, 2025
62f656a
unused
odeimaiz Oct 16, 2025
ef45fa6
SafeLabel
odeimaiz Oct 16, 2025
ab2aec7
upgrade to 3.2.7
odeimaiz Oct 16, 2025
ff9707b
undo
odeimaiz Oct 16, 2025
4c9cc1c
wrap
odeimaiz Oct 16, 2025
be54a5a
refactor
odeimaiz Oct 16, 2025
7adce5b
Merge branch 'master' into fix/sntz-tgs
odeimaiz Oct 16, 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
2 changes: 1 addition & 1 deletion services/static-webserver/client/Manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"jsondiffpatch/jsondiffpatch-0.7.3.min.js",
"jsontreeviewer/jsonTree.js",
"marked/marked.min.js",
"DOMPurify/purify.min.js"
"DOMPurify/purify-3.2.7.min.js"
],
"css": [
"jsontreeviewer/jsonTree.css",
Expand Down
1 change: 0 additions & 1 deletion services/static-webserver/client/source/class/osparc/dashboard/FolderButtonNew.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ qx.Class.define("osparc.dashboard.FolderButtonNew", {
control = new qx.ui.basic.Label(this.tr("New folder")).set({
anonymous: true,
font: "text-14",
rich: true,
});
this._add(control, {
...osparc.dashboard.FolderButtonBase.POS.TITLE,
Expand Down
6 changes: 3 additions & 3 deletions services/static-webserver/client/source/class/osparc/dashboard/GridButtonBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,10 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
break;
}
case "title":
control = new qx.ui.basic.Label().set({
control = new osparc.ui.basic.SafeLabel().set({
textColor: "contrasted-text-light",
font: "text-14",
rich: false, // do not allow multi-line titles
});
layout = this.getChildControl("header");
layout.add(control, this.self().HPOS.TITLE);
Expand All @@ -205,12 +206,11 @@ qx.Class.define("osparc.dashboard.GridButtonBase", {
break;
}
case "subtitle-text": {
control = new qx.ui.basic.Label().set({
control = new osparc.ui.basic.SafeLabel().set({
textColor: "contrasted-text-dark",
alignY: "middle",
allowGrowX: true,
allowShrinkX: true,
rich: true,
anonymous: true,
font: "text-12",
allowGrowY: false
Expand Down
3 changes: 1 addition & 2 deletions services/static-webserver/client/source/class/osparc/dashboard/GridButtonTaskPlaceholder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,10 @@ qx.Class.define("osparc.dashboard.GridButtonTaskPlaceholder", {
let layout;
switch (id) {
case "state-label": {
control = new qx.ui.basic.Label().set({
control = new osparc.ui.basic.SafeLabel().set({
textColor: "contrasted-text-dark",
allowGrowX: true,
allowShrinkX: true,
rich: true,
anonymous: true,
font: "text-12",
allowGrowY: true,
Expand Down
6 changes: 4 additions & 2 deletions services/static-webserver/client/source/class/osparc/dashboard/GroupedCardContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,12 @@ qx.Class.define("osparc.dashboard.GroupedCardContainer", {
allowGrowX: false
});
control.getChildControl("icon").set(osparc.utils.Utils.getThumbnailProps(32));
control.getChildControl("label").set({
const atomLabel = control.getChildControl("label");
atomLabel.set({
rich: true,
wrap: true
})
});
osparc.wrapper.DOMPurify.sanitizeLabel(atomLabel);
control.getContentElement().setStyles({
"border-top-left-radius": "4px",
"border-top-right-radius": "4px"
Expand Down
3 changes: 1 addition & 2 deletions services/static-webserver/client/source/class/osparc/dashboard/ListButtonBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,11 @@ qx.Class.define("osparc.dashboard.ListButtonBase", {
break;
}
case "title":
control = new qx.ui.basic.Label().set({
control = new osparc.ui.basic.SafeLabel().set({
textColor: "contrasted-text-light",
font: "text-14",
alignY: "middle",
maxWidth: 300,
rich: true,
});
this._add(control, {
row: 0,
Expand Down
3 changes: 1 addition & 2 deletions ...ces/static-webserver/client/source/class/osparc/desktop/credits/CreditsServiceListItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,11 @@ qx.Class.define("osparc.desktop.credits.CreditsServiceListItem", {
break;
}
case "title":
control = new qx.ui.basic.Label().set({
control = new osparc.ui.basic.SafeLabel().set({
font: "text-12",
alignY: "middle",
maxWidth: 200,
allowGrowX: true,
rich: true,
});
this._add(control, this.self().GRID.NAME);
break;
Expand Down
1 change: 0 additions & 1 deletion services/static-webserver/client/source/class/osparc/desktop/organizations/ServicesList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ qx.Class.define("osparc.desktop.organizations.ServicesList", {
const intro = new qx.ui.basic.Label().set({
value: msg,
alignX: "left",
rich: true,
font: "text-13"
});
return intro;
Expand Down
1 change: 0 additions & 1 deletion services/static-webserver/client/source/class/osparc/desktop/organizations/TutorialsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ qx.Class.define("osparc.desktop.organizations.TutorialsList", {
const intro = new qx.ui.basic.Label().set({
value: msg,
alignX: "left",
rich: true,
font: "text-13"
});
return intro;
Expand Down
2 changes: 2 additions & 0 deletions services/static-webserver/client/source/class/osparc/desktop/preferences/pages/TagsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ qx.Class.define("osparc.desktop.preferences.pages.TagsPage", {
Once the tags are created, they can be assigned to the ") + studyLabel + this.tr(" via 'More options...' on the ") + studyLabel + this.tr(" cards.");
const intro = new qx.ui.basic.Label(msg).set({
font: "text-13",
rich: true,
wrap: true
});
this._add(intro);

Expand Down
3 changes: 1 addition & 2 deletions ...ices/static-webserver/client/source/class/osparc/desktop/preferences/window/APIKeyBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,9 @@ qx.Class.define("osparc.desktop.preferences.window.APIKeyBase", {

members: {
__addInfoText: function(infoText) {
const introLabel = new qx.ui.basic.Label(infoText).set({
const introLabel = new osparc.ui.basic.SafeLabel(infoText).set({
paddingLeft: 5,
paddingRight: 5,
rich: true
});
this.add(introLabel);
}
Expand Down
3 changes: 1 addition & 2 deletions services/static-webserver/client/source/class/osparc/desktop/wallets/WalletListItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,8 @@ qx.Class.define("osparc.desktop.wallets.WalletListItem", {
});
break;
case "subtitle":
control = new qx.ui.basic.Label().set({
control = new osparc.ui.basic.SafeLabel().set({
font: "text-13",
rich: true
});
this._add(control, {
row: 1,
Expand Down
3 changes: 1 addition & 2 deletions services/static-webserver/client/source/class/osparc/desktop/wallets/WalletsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,9 @@ qx.Class.define("osparc.desktop.wallets.WalletsList", {

__createHeader: function(label, showCurrently) {
const header = new qx.ui.container.Composite(new qx.ui.layout.HBox());
const userWallets = new qx.ui.basic.Label().set({
const userWallets = new osparc.ui.basic.SafeLabel().set({
value: label,
alignX: "left",
rich: true,
font: "text-14"
});
header.add(userWallets);
Expand Down
13 changes: 1 addition & 12 deletions services/static-webserver/client/source/class/osparc/editor/ThumbnailEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,6 @@ qx.Class.define("osparc.editor.ThumbnailEditor", {
"cancel": "qx.event.type.Event"
},

statics: {
sanitizeUrl: function(dirty) {
const clean = osparc.wrapper.DOMPurify.getInstance().sanitize(dirty);
if ((dirty && dirty !== clean) || (clean !== "" && !osparc.utils.Utils.isValidHttpUrl(clean))) {
osparc.FlashMessenger.logAs(qx.locale.Manager.tr("Error checking link"), "WARNING");
return null;
}
return clean;
}
},

members: {
_createChildControlImpl: function(id) {
let control;
Expand Down Expand Up @@ -125,7 +114,7 @@ qx.Class.define("osparc.editor.ThumbnailEditor", {
});
control.addListener("execute", () => {
const urlField = this.getChildControl("url-field");
const validUrl = this.self().sanitizeUrl(urlField.getValue());
const validUrl = osparc.wrapper.DOMPurify.sanitizeUrl(urlField.getValue());
if (validUrl) {
this.fireDataEvent("updateThumbnail", validUrl);
}
Expand Down
4 changes: 3 additions & 1 deletion services/static-webserver/client/source/class/osparc/file/FolderContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,15 @@ qx.Class.define("osparc.file.FolderContent", {
height: 80,
padding: 2
});
item.getChildControl("label").set({
const toggleLabel = item.getChildControl("label");
toggleLabel.set({
font: "text-12",
rich: true,
textAlign: "center",
maxWidth: 100,
maxHeight: 33 // two lines
});
osparc.wrapper.DOMPurify.sanitizeLabel(toggleLabel);
osparc.utils.Utils.setIdToWidget(item, "FolderViewerItem");
return item;
},
Expand Down
3 changes: 1 addition & 2 deletions services/static-webserver/client/source/class/osparc/form/tag/TagItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ qx.Class.define("osparc.form.tag.TagItem", {
this.bind("color", control, "color");
break;
case "description":
control = new qx.ui.basic.Label().set({
rich: true,
control = new osparc.ui.basic.SafeLabel().set({
allowGrowX: true,
alignY: "middle",
});
Expand Down
3 changes: 1 addition & 2 deletions services/static-webserver/client/source/class/osparc/info/ServiceUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ qx.Class.define("osparc.info.ServiceUtils", {
* @param serviceData {Object} Serialized Service Object
*/
createAuthors: function(serviceData) {
const authors = new qx.ui.basic.Label().set({
rich: true,
const authors = new osparc.ui.basic.SafeLabel().set({
wrap: true,
maxWidth: 220,
});
Expand Down
3 changes: 1 addition & 2 deletions services/static-webserver/client/source/class/osparc/info/Utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ qx.Class.define("osparc.info.Utils", {

statics: {
createTitle: function() {
const label = new qx.ui.basic.Label().set({
const label = new osparc.ui.basic.SafeLabel().set({
font: "text-14",
maxWidth: 600,
rich: true,
wrap: true
});
return label;
Expand Down
115 changes: 0 additions & 115 deletions services/static-webserver/client/source/class/osparc/navigation/CreditsMenuButton.js
View file
Open in desktop

This file was deleted.

9 changes: 3 additions & 6 deletions services/static-webserver/client/source/class/osparc/notification/NotificationUI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,8 @@ qx.Class.define("osparc.notification.NotificationUI", {
});
break;
case "title":
control = new qx.ui.basic.Label().set({
control = new osparc.ui.basic.SafeLabel().set({
font: "text-13",
rich: true,
wrap: true
});
this._add(control, {
Expand All @@ -88,9 +87,8 @@ qx.Class.define("osparc.notification.NotificationUI", {
});
break;
case "text":
control = new qx.ui.basic.Label().set({
control = new osparc.ui.basic.SafeLabel().set({
font: "text-12",
rich: true,
wrap: true
});
this._add(control, {
Expand All @@ -99,9 +97,8 @@ qx.Class.define("osparc.notification.NotificationUI", {
});
break;
case "date":
control = new qx.ui.basic.Label().set({
control = new osparc.ui.basic.SafeLabel().set({
font: "text-11",
rich: true,
wrap: true
});
this._add(control, {
Expand Down
Loading
Loading