Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/compile.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
"class": "osparc.Application",
"theme": "osparc.theme.products.tis.ThemeDark",
"name": "tis",
"title": "TIP V3.0 - IT'IS",
"title": "TIP V4.0 - IT'IS",
"include": [
"iconfont.material.Load",
"iconfont.fontawesome5.Load",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ qx.Class.define("osparc.desktop.MainPage", {
const preferencesSettings = osparc.Preferences.getInstance();
if (!isReadOnly && preferencesSettings.getConfirmBackToDashboard()) {
const studyName = this.__studyEditor.getStudy().getName();
const win = new osparc.ui.window.Confirmation();
const win = new osparc.ui.window.Confirmation().set({
confirmAction: "warning",
});
if (osparc.product.Utils.getProductName().includes("s4l")) {
let msg = this.tr("Do you want to close ") + "<b>" + studyName + "</b>?";
msg += "<br><br>";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ qx.Class.define("osparc.info.ServiceLarge", {
}

extraInfo.push({
label: this.tr("KEY"),
label: this.tr("Key"),
view: this.__createKey(),
action: {
button: osparc.utils.Utils.getCopyButton(),
Expand All @@ -273,34 +273,34 @@ qx.Class.define("osparc.info.ServiceLarge", {

if (osparc.data.Permissions.getInstance().isTester() || osparc.service.Utils.canIWrite(this.getService()["accessRights"])) {
extraInfo.push({
label: this.tr("INTEGRATION VERSION"),
label: this.tr("Integration Version"),
view: this.__createIntegrationVersion(),
action: null
});
}

extraInfo.push({
label: this.tr("VERSION"),
label: this.tr("Version"),
view: this.__createDisplayVersion(),
action: {
button: osparc.service.Utils.canIWrite(this.getService()["accessRights"]) ? osparc.utils.Utils.getEditButton() : null,
callback: this.__openVersionDisplayEditor,
ctx: this
}
}, {
label: this.tr("RELEASE DATE"),
label: this.tr("Released Date"),
view: this.__createReleasedDate(),
action: null
}, {
label: this.tr("CONTACT"),
label: this.tr("Contact"),
view: this.__createContact(),
action: null
}, {
label: this.tr("AUTHORS"),
label: this.tr("Authors"),
view: this.__createAuthors(),
action: null
}, {
label: this.tr("ACCESS RIGHTS"),
label: this.tr("Access"),
view: this.__createAccessRights(),
action: {
button: osparc.service.Utils.canIWrite(this.getService()["accessRights"]) ? osparc.utils.Utils.getEditButton() : null,
Expand All @@ -309,37 +309,6 @@ qx.Class.define("osparc.info.ServiceLarge", {
}
});

if (
osparc.product.Utils.showClassifiers() &&
this.getService()["classifiers"]
) {
extraInfo.push({
label: this.tr("CLASSIFIERS"),
view: this.__createClassifiers(),
action: {
button: osparc.service.Utils.canIWrite(this.getService()["accessRights"]) ? osparc.utils.Utils.getEditButton() : null,
callback: this.isOpenOptions() ? this.__openClassifiers : "openClassifiers",
ctx: this
}
});
}

if (
osparc.product.Utils.showQuality() &&
this.getService()["quality"] &&
osparc.metadata.Quality.isEnabled(this.getService()["quality"])
) {
extraInfo.push({
label: this.tr("QUALITY"),
view: this.__createQuality(),
action: {
button: osparc.service.Utils.canIWrite(this.getService()["accessRights"]) ? osparc.utils.Utils.getEditButton() : null,
callback: this.isOpenOptions() ? this.__openQuality : "openQuality",
ctx: this
}
});
}

return extraInfo;
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,16 @@ qx.Class.define("osparc.info.ServiceUtils", {
*/
createAuthors: function(serviceData) {
const authors = new qx.ui.basic.Label().set({
rich: true
rich: true,
wrap: true,
maxWidth: 220,
});
authors.set({
value: serviceData["authors"].map(author => author["name"]).join(", "),
});
serviceData["authors"].forEach(author => {
const oldVal = authors.getValue();
const oldTTT = authors.getToolTipText();
authors.set({
value: (oldVal ? oldVal : "") + `${author["name"]} <br>`,
toolTipText: (oldTTT ? oldTTT : "") + `${author["email"]} - ${author["affiliation"]}<br>`
});
});
Expand Down Expand Up @@ -168,7 +171,7 @@ qx.Class.define("osparc.info.ServiceUtils", {
* @param maxHeight {Number} description's maxHeight
*/
createDescription: function(serviceData) {
const descriptionLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(5).set({
const descriptionLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox().set({
alignY: "middle"
}));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ qx.Class.define("osparc.info.StudyLarge", {
__infoElements: function() {
const infoLayout = {
"TITLE": {
label: this.tr("Title:"),
view: osparc.info.StudyUtils.createTitle(this.getStudy()),
action: {
button: osparc.utils.Utils.getEditButton(this.__canIWrite()),
Expand All @@ -139,7 +138,6 @@ qx.Class.define("osparc.info.StudyLarge", {
}
},
"THUMBNAIL": {
label: this.tr("Thumbnail:"),
view: this.__createThumbnail(),
action: {
button: osparc.utils.Utils.getEditButton(this.__canIWrite()),
Expand All @@ -148,7 +146,6 @@ qx.Class.define("osparc.info.StudyLarge", {
}
},
"DESCRIPTION": {
label: this.tr("Description:"),
view: osparc.info.StudyUtils.createDescriptionMD(this.getStudy(), 150),
action: {
button: osparc.utils.Utils.getEditButton(this.__canIWrite()),
Expand All @@ -157,12 +154,12 @@ qx.Class.define("osparc.info.StudyLarge", {
}
},
"AUTHOR": {
label: this.tr("Author:"),
label: this.tr("Author"),
view: osparc.info.StudyUtils.createOwner(this.getStudy()),
action: null
},
"ACCESS_RIGHTS": {
label: this.tr("Access:"),
label: this.tr("Access"),
view: osparc.info.StudyUtils.createAccessRights(this.getStudy()),
action: {
button: osparc.utils.Utils.getLinkButton(this.__canIWrite()),
Expand All @@ -171,17 +168,17 @@ qx.Class.define("osparc.info.StudyLarge", {
}
},
"CREATED": {
label: this.tr("Created:"),
label: this.tr("Created"),
view: osparc.info.StudyUtils.createCreationDate(this.getStudy()),
action: null
},
"MODIFIED": {
label: this.tr("Modified:"),
label: this.tr("Modified"),
view: osparc.info.StudyUtils.createLastChangeDate(this.getStudy()),
action: null
},
"TAGS": {
label: this.tr("Tags:"),
label: this.tr("Tags"),
view: osparc.info.StudyUtils.createTags(this.getStudy()),
action: {
button: osparc.utils.Utils.getLinkButton(this.__canIWrite()),
Expand Down
Loading
Loading