Skip to content

🎨🐛 [Frontend] Handle error on project/services #7883

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 8 commits into from
Jun 12, 2025
Merged

🎨🐛 [Frontend] Handle error on project/services #7883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b536c7e
handle errored /services
odeimaiz Jun 12, 2025
f4e8a16
minor
odeimaiz Jun 12, 2025
585bab3
fix
odeimaiz Jun 12, 2025
665ba79
block sections
odeimaiz Jun 12, 2025
cd5f7c2
minor
odeimaiz Jun 12, 2025
f4de3a8
Merge branch 'master' into enh/handle-non-existing-services
odeimaiz Jun 12, 2025
12ee4b5
Merge branch 'master' into enh/handle-non-existing-services
odeimaiz Jun 12, 2025
cb93d4d
Merge branch 'master' into enh/handle-non-existing-services
odeimaiz Jun 12, 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
55 changes: 35 additions & 20 deletions services/static-webserver/client/source/class/osparc/dashboard/CardBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
services: {
check: "Array",
init: true,
nullable: false,
nullable: true,
apply: "__applyServices",
event: "changeServices",
},
Expand Down Expand Up @@ -567,7 +567,11 @@ qx.Class.define("osparc.dashboard.CardBase", {
resourceData["services"] = services;
this.setServices(services);
})
.catch(err => console.error(err));
.catch(err => {
resourceData["services"] = null;
this.setServices(null);
console.error(err);
});

osparc.study.Utils.guessIcon(resourceData)
.then(iconSource => this.setIcon(iconSource));
Expand Down Expand Up @@ -688,27 +692,38 @@ qx.Class.define("osparc.dashboard.CardBase", {
},

__applyServices: function(services) {
this.setEmptyWorkbench(services.length === 0);

// Updatable study
if (osparc.study.Utils.anyServiceRetired(services)) {
this.setUpdatable("retired");
} else if (osparc.study.Utils.anyServiceDeprecated(services)) {
this.setUpdatable("deprecated");
} else if (osparc.study.Utils.anyServiceUpdatable(services)) {
this.setUpdatable("updatable");
}

// Block card
const cantReadServices = osparc.study.Utils.getCantReadServices(services);
if (cantReadServices.length) {
const unknownServices = cantReadServices => {
// Block card
this.setBlocked("UNKNOWN_SERVICES");
const image = "@FontAwesome5Solid/ban/";
let toolTipText = this.tr("Inaccessible service(s):");
cantReadServices.forEach(unSrv => {
toolTipText += "<br>" + unSrv.key + ":" + osparc.service.Utils.extractVersionDisplay(unSrv.release);
});
let toolTipText = this.tr("Unknown service(s)");
if (cantReadServices && cantReadServices.length) {
toolTipText = this.tr("Inaccessible service(s)");
cantReadServices.forEach(unSrv => {
toolTipText += "<br>" + unSrv.key + ":" + osparc.service.Utils.extractVersionDisplay(unSrv.release);
});
}
this.__showBlockedCard(image, toolTipText);
};

if (services) {
this.setEmptyWorkbench(services.length === 0);

// Updatable study
if (osparc.study.Utils.anyServiceRetired(services)) {
this.setUpdatable("retired");
} else if (osparc.study.Utils.anyServiceDeprecated(services)) {
this.setUpdatable("deprecated");
} else if (osparc.study.Utils.anyServiceUpdatable(services)) {
this.setUpdatable("updatable");
}

const cantReadServices = osparc.study.Utils.getCantReadServices(services);
if (cantReadServices.length) {
unknownServices(cantReadServices);
}
} else {
unknownServices();
}

this.evaluateMenuButtons();
Expand Down
4 changes: 3 additions & 1 deletion services/static-webserver/client/source/class/osparc/dashboard/DataBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ qx.Class.define("osparc.dashboard.DataBrowser", {
let control;
switch (id) {
case "tree-folder-view":
control = new osparc.file.TreeFolderView();
control = new osparc.file.TreeFolderView().set({
paddingBottom: 15,
});
this._addToLayout(control, {
flex: 1
});
Expand Down
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/dashboard/ResourceDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
__getCreateTemplatePage: function() {
if (
!osparc.utils.Resources.isStudy(this.__resourceData) ||
osparc.product.Utils.showTemplates()
!osparc.product.Utils.showTemplates()
) {
return null;
}
Expand Down
4 changes: 3 additions & 1 deletion services/static-webserver/client/source/class/osparc/study/Utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,9 @@ qx.Class.define("osparc.study.Utils", {
},

__getBlockedState: function(studyData) {
if (studyData["services"]) {
if (studyData["services"] === null) {
return "UNKNOWN_SERVICES";
} else if (studyData["services"]) {
const cantReadServices = osparc.study.Utils.getCantReadServices(studyData["services"]);
const inaccessibleServices = osparc.store.Services.getInaccessibleServices(studyData["workbench"]);
if (cantReadServices.length || inaccessibleServices.length) {
Expand Down
Loading