Skip to content

🐛 [Frontend] Fix: Templates listing #7673

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 5 commits into from
May 14, 2025
Merged

🐛 [Frontend] Fix: Templates listing #7673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
97a77e3
Do not use the service alias anymore, use "app" instead
odeimaiz May 14, 2025
504e04e
Merge branch 'master' into fix/e2e-to-quick
odeimaiz May 14, 2025
5de2391
avoid changing the selection when the PreResources are not yet loaded
odeimaiz May 14, 2025
035a80e
use event instead of property
odeimaiz May 14, 2025
1caafc9
minor
odeimaiz May 14, 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
32 changes: 24 additions & 8 deletions services/static-webserver/client/source/class/osparc/dashboard/Dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,17 @@ qx.Class.define("osparc.dashboard.Dashboard", {
appearance: {
init: "dashboard",
refine: true
}
},
},

statics: {
PADDING: 15
},

events: {
"preResourcesLoaded": "qx.event.type.Event",
},

members: {
__studyBrowser: null,
__templateBrowser: null,
Expand Down Expand Up @@ -181,12 +185,15 @@ qx.Class.define("osparc.dashboard.Dashboard", {
this.add(tabPage);
}, this);

let preResourcesLoaded = false;
const preResourcePromises = [];
const groupsStore = osparc.store.Groups.getInstance();
preResourcePromises.push(groupsStore.fetchGroupsAndMembers());
preResourcePromises.push(osparc.store.Services.getServicesLatest(false));
Promise.all(preResourcePromises)
.then(() => {
preResourcesLoaded = true;
this.fireEvent("preResourcesLoaded");
if (this.__studyBrowser) {
this.__studyBrowser.initResources();
}
Expand All @@ -196,15 +203,24 @@ qx.Class.define("osparc.dashboard.Dashboard", {
if (this.__dataBrowser) {
this.__dataBrowser.initResources();
}

this.addListener("changeSelection", e => {
const selectedTab = e.getData()[0];
if (selectedTab && selectedTab.resourceBrowser) {
selectedTab.resourceBrowser.initResources();
}
}, this);
})
.catch(err => console.error(err));

this.addListener("changeSelection", e => {
const selectedTab = e.getData()[0];
if (selectedTab && selectedTab.resourceBrowser) {
// avoid changing the selection when the PreResources are not yet loaded
if (preResourcesLoaded) {
selectedTab.resourceBrowser.initResources();
} else {
const initTab = () => {
selectedTab.resourceBrowser.initResources()
this.removeListener("preResourcesLoaded", initTab);
};
this.addListener("preResourcesLoaded", initTab, this);
}
}
}, this);
},

__createStudyBrowser: function() {
Expand Down
22 changes: 7 additions & 15 deletions services/static-webserver/client/source/class/osparc/dashboard/SearchBarFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,33 +45,25 @@ qx.Class.define("osparc.dashboard.SearchBarFilter", {
HEIGHT: 36,

getSharedWithOptions: function(resourceType) {
if (resourceType === "service") {
resourceType = "app";
}
const resourceAlias = osparc.product.Utils.resourceTypeToAlias(resourceType, {
firstUpperCase: true,
plural: true
});
return [{
id: "show-all",
label: qx.locale.Manager.tr("All") + " " + osparc.product.Utils.resourceTypeToAlias(resourceType, {
firstUpperCase: true,
plural: true
}),
label: qx.locale.Manager.tr("All") + " " + resourceAlias,
icon: "@FontAwesome5Solid/home/20"
}, {
id: "my-resources",
label: qx.locale.Manager.tr("My") + " " + osparc.product.Utils.resourceTypeToAlias(resourceType, {
firstUpperCase: true,
plural: true
}),
label: qx.locale.Manager.tr("My") + " " + resourceAlias,
icon: "@FontAwesome5Solid/user/20"
}, {
id: "shared-with-me",
label: qx.locale.Manager.tr("Shared with Me"),
icon: "@FontAwesome5Solid/users/20"
}, {
id: "shared-with-everyone",
label: qx.locale.Manager.tr("Public") + " " + osparc.product.Utils.resourceTypeToAlias(resourceType, {
firstUpperCase: true,
plural: true
}),
label: qx.locale.Manager.tr("Public") + " " + resourceAlias,
icon: "@FontAwesome5Solid/globe/20"
}];
}
Expand Down
4 changes: 3 additions & 1 deletion services/static-webserver/client/source/class/osparc/product/Utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ qx.Class.define("osparc.product.Utils", {
case "template":
return this.getTemplateAlias(options);
case "service":
return this.getServiceAlias(options);
// return this.getServiceAlias(options);
// Do not use this alias anymore, use "app" instead
return this.getAppAlias(options);
case "hypertool":
return this.getHypertoolAlias(options);
case "app":
Expand Down
1 change: 1 addition & 0 deletions services/static-webserver/client/source/class/osparc/store/Services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ qx.Class.define("osparc.store.Services", {
__addServiceToCache: function(service) {
const key = service.key;
const version = service.version;
service["resourceType"] = "service";
this.__addToCache(key, version, service);
},

Expand Down
Loading