Skip to content

Ensure PaginatedResourceTable displays correct initial page #15854

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
richard-cox merged 1 commit into from
Nov 5, 2025
Merged

Ensure PaginatedResourceTable displays correct initial page #15854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions shell/components/PaginatedResourceTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,11 @@ export default defineComponent({
},

async fetch() {
const promises = [
this.$fetchType(this.resource, [], this.overrideInStore || this.inStore),
];

if (this.fetchSecondaryResources) {
promises.push(this.fetchSecondaryResources({ canPaginate: this.canPaginate }));
await this.fetchSecondaryResources({ canPaginate: this.canPaginate });
}

await Promise.all(promises);
await this.$fetchType(this.resource, [], this.overrideInStore || this.inStore);
},

computed: {
Expand Down
7 changes: 5 additions & 2 deletions shell/pages/home.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,11 @@ export default defineComponent({
return Promise.resolve({});
}

const promises = [];

if ( this.canViewMgmtClusters ) {
this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER });
// This is the only one we need to block on (needed for the initial sort on mgmt name)
promises.push(this.$store.dispatch('management/findAll', { type: MANAGEMENT.CLUSTER }));
}

if ( this.canViewMachine ) {
Expand All @@ -323,7 +326,7 @@ export default defineComponent({
this.$store.dispatch('management/findAll', { type: MANAGEMENT.NODE_TEMPLATE });
}

return Promise.resolve({});
return Promise.all(promises);
},

async fetchPageSecondaryResources({
Expand Down
Loading