Changes after review

rancher · Dec 9, 2024 · 6858b5b · 6858b5b
1 parent 545da46
commit 6858b5b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
@@ -76,11 +76,15 @@ export default defineComponent({
   },
 
   async fetch() {
-    await this.$fetchType(this.resource, [], this.inStore);
+    const promises = [
+      this.$fetchType(this.resource, [], this.inStore),
+    ];
 
     if (this.fetchSecondaryResources) {
-      await this.fetchSecondaryResources({ canPaginate: this.canPaginate });
+      promises.push(this.fetchSecondaryResources({ canPaginate: this.canPaginate }))
     }
+
+    await Promise.all(promises);
   },
 
   computed: {

diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
@@ -259,6 +259,7 @@ export default {
     }
   },
 
+  // See https://github.com/rancher/dashboard/issues/12831 for outstanding performance related work
   watch: {
     $route() {
       this.shown = false;

diff --git a/shell/plugins/dashboard-store/actions.js b/shell/plugins/dashboard-store/actions.js
@@ -146,7 +146,7 @@ export default {
   /**
    *
    * @param {*} ctx
-   * @param { {type: string, opt: ActionFindPageArgs} } opt
+   * @param { {type: string, opt: ActionFindAllArgs} } opt
    */
   async findAll(ctx, { type, opt }) {
     const {
@@ -364,7 +364,7 @@ export default {
   /**
    *
    * @param {*} ctx
-   * @param { {type: string, opt: FindPageOpt} } opt
+   * @param { {type: string, opt: ActionFindPageArgs} } opt
    */
   async findPage(ctx, { type, opt }) {
     const { getters, commit, dispatch } = ctx;

diff --git a/shell/types/store/dashboard-store.types.ts b/shell/types/store/dashboard-store.types.ts
@@ -38,5 +38,9 @@ export interface ActionFindPageArgs extends ActionCoreFindArgs {
    * The single namespace to filter by (used in url path, not part of pagination params)
    */
   namespaced?: string,
+  /**
+   * Result of request is transient and not persisted to store
+   */
+  transient?: boolean,
   hasManualRefresh?: boolean,
 }
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
@@ -80,13 +80,13 @@ export function paginationFilterOnlyKubernetesClusters(store) {
 
   return PaginationParamFilter.createMultipleFields([
     new PaginationFilterField({
-      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // TODO: TEST
+      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // TODO: RC (home page/side bar) TEST
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true
     }),
     new PaginationFilterField({
-      field:  `status.provider`, // TODO: TEST
+      field:  `status.provider`, // TODO: RC (home page/side bar) TEST
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true

diff --git a/shell/utils/pagination-wrapper.ts b/shell/utils/pagination-wrapper.ts
@@ -1,6 +1,7 @@
 import paginationUtils from '@shell/utils/pagination-utils';
 import { PaginationArgs, PaginationResourceContext, StorePagination } from '@shell/types/store/pagination.types';
 import { VuexStore } from '@shell/types/store/vuex';
+import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 
 interface Result<T> {
   data: Array<T>
@@ -49,7 +50,7 @@ class PaginationWrapper<T = any> {
         throw new Error(`Wrapper for type '${ this.enabledFor.store }/${ this.enabledFor.resource?.id }' in context '${ this.enabledFor.resource?.context }' not supported`);
       }
       const { pagination, classify: doClassify } = args;
-      const opt = {
+      const opt: ActionFindPageArgs = {
         transient: true,
         pagination
       };