Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into storage/add-pagin…
Browse files Browse the repository at this point in the history
…ation
  • Loading branch information
sanderegg committed Feb 20, 2025
2 parents edbd6ba + ba9624a commit 02ebf8d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
this.__setWorkspacesToList(workspaces);
if (this.getCurrentContext() === "trash") {
if (workspaces.length) {
// Not yet implemented
// this.__header.getChildControl("empty-trash-button").show();
this.__header.getChildControl("empty-trash-button").show();
}
}
})
Expand Down Expand Up @@ -240,8 +239,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
this.__setFoldersToList(folders);
if (this.getCurrentContext() === "trash") {
if (folders.length) {
// Not yet implemented
// this.__header.getChildControl("empty-trash-button").show();
this.__header.getChildControl("empty-trash-button").show();
}
}
})
Expand Down Expand Up @@ -312,8 +310,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {

if (this.getCurrentContext() === "trash") {
if (this._resourcesList.length) {
// Not yet implemented
// this.__header.getChildControl("empty-trash-button").show();
this.__header.getChildControl("empty-trash-button").show();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,12 @@ qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
const featuresGrid = new qx.ui.layout.Grid(8, 8);
const featuresLayout = new qx.ui.container.Composite(featuresGrid);
let idx = 0;
const capitalizeField = [
"Sex",
"Species",
"Ethnicity",
"Functionality",
];
[
"Name",
"Version",
Expand All @@ -258,8 +264,10 @@ qx.Class.define("osparc.vipMarket.AnatomicalModelDetails", {
row: idx,
});

const value = features[key.toLowerCase()];
const featureValue = capitalizeField.includes(key) ? osparc.utils.Utils.capitalize(value) : value;
const nameLabel = new qx.ui.basic.Label().set({
value: features[key.toLowerCase()],
value: featureValue,
font: "text-14",
alignX: "left",
});
Expand Down

0 comments on commit 02ebf8d

Please sign in to comment.