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
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ qx.Class.define("osparc.editor.HtmlEditor", {

this.getChildControl("preview-html");
this.getChildControl("subtitle").set({
value: this.tr("Supports HTML")
value: this.tr("Supports HTML"),
url: "https://en.wikipedia.org/wiki/HTML",
});
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ qx.Class.define("osparc.editor.MarkdownEditor", {

this.getChildControl("preview-markdown");
this.getChildControl("subtitle").set({
value: this.tr("Markdown supported")
value: this.tr("Markdown supported"),
url: "https://en.wikipedia.org/wiki/Markdown",
});
},

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,13 @@ qx.Class.define("osparc.editor.TextEditor", {
writePage.add(control, {
flex: 1
});
const subtitle = this.getChildControl("subtitle").set({
value: this.tr("Supports HTML")
});
const subtitle = this.getChildControl("subtitle");
writePage.add(subtitle);
tabs.add(writePage);
break;
}
case "subtitle":
control = new qx.ui.basic.Label().set({
control = new osparc.ui.basic.LinkLabel().set({
font: "text-12"
});
this._add(control);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,8 @@ qx.Class.define("osparc.info.CommentUI", {

__buildLayout: function() {
const thumbnail = this.getChildControl("thumbnail");
thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail("", "", 32));

const userName = this.getChildControl("user-name");
userName.setValue("Unknown");

const date = new Date(this.__comment["modified"]);
const date2 = osparc.utils.Utils.formatDateAndTime(date);
Expand All @@ -131,7 +129,14 @@ qx.Class.define("osparc.info.CommentUI", {
if (user) {
thumbnail.setSource(user.getThumbnail());
userName.setValue(user.getLabel());
} else {
thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail());
userName.setValue("Unknown user");
}
})
.catch(() => {
thumbnail.setSource(osparc.utils.Avatar.emailToThumbnail());
userName.setValue("Unknown user");
});

this.getChildControl("spacer");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,18 @@ qx.Class.define("osparc.store.Services", {
},

__addToCache: function(key, version, value) {
// some services that go to the cache are not complete, e.g. study services
// some services that go to the cache are not complete: /latest, /study/services
// if the one in the cache is the complete one, do not overwrite it
if (
this.__isInCache(key, version) &&
"inputs" in this.__servicesCached[key][version]
"history" in this.__servicesCached[key][version] // the most complete service metadata is already in cache
) {
return;
}
if (
this.__isInCache(key, version) &&
"inputs" in this.__servicesCached[key][version] && // this is the second most complete service metadata (/latest)
value && !("inputs" in value) // the one to be added is not more complete
) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ qx.Class.define("osparc.store.Users", {
extend: qx.core.Object,
type: "singleton",

construct: function() {
this.base(arguments);

this.__unknowns = [];
},

properties: {
users: {
check: "Array",
Expand All @@ -28,6 +34,8 @@ qx.Class.define("osparc.store.Users", {
},

members: {
__unknowns: null,

__fetchUser: function(groupId) {
const params = {
url: {
Expand All @@ -38,10 +46,17 @@ qx.Class.define("osparc.store.Users", {
.then(userData => {
const user = this.addUser(userData[0]);
return user;
})
.catch(() => {
this.__unknowns.push(groupId);
return null;
});
},

getUser: async function(groupId, fetchIfNotFound = true) {
if (this.__unknowns.includes(groupId)) {
return null;
}
const userFound = this.getUsers().find(user => user.getGroupId() === groupId);
if (userFound) {
return userFound;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@ qx.Class.define("osparc.utils.Avatar", {
type: "static",

statics: {
emailToThumbnail: function(email, username) {
return this.__getUrl(email, username, 32);
},

__getUrl: function(email, username, size = 100) {
emailToThumbnail: function(email, username = "??", size = 32) {
email = email || "";
// MD5 (Message-Digest Algorithm) by WebToolkit
const MD5 = function(s) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@
"title": "${replace_me_product_name}",
"newStudyLabel": "New Project",
"idToWidget": "startS4LButton"
}, {
"resourceType": "service",
"expectedKey": "simcore/services/dynamic/s4l-ui-framework",
"title": "Sim4Life.framework",
"newStudyLabel": "Sim4Life.framework"
}]
}
},
Expand Down
Loading