From a6810c18df7c99fa504a9b19d5af22a39b2c2f1a Mon Sep 17 00:00:00 2001 From: Richard Cox Date: Wed, 4 Dec 2024 15:07:01 +0000 Subject: [PATCH] testing/tidying --- shell/config/settings.ts | 8 +++----- shell/list/catalog.cattle.io.clusterrepo.vue | 1 - shell/mixins/resource-fetch.js | 2 +- shell/pages/c/_cluster/explorer/EventsTable.vue | 1 - 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/shell/config/settings.ts b/shell/config/settings.ts index c657f08f25..bfe10fa9f1 100644 --- a/shell/config/settings.ts +++ b/shell/config/settings.ts @@ -267,17 +267,15 @@ export const DEFAULT_PERF_SETTING: PerfSettings = { resources: { enableAll: false, enableSome: { - // custom list or headers? not generic + // if a resource list is shown by a custom resource list component or has specific list headers then it's not generically shown + // and must be included here. enabled: [ NODE, EVENT, POD, CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION, HPA, INGRESS, SERVICE, - PV, CONFIG_MAP, PVC, SECRET, + PV, CONFIG_MAP, STORAGE_CLASS, PVC, SECRET, ], - // Currently covers more resources plus (at time of comment) - // STORAGE_CLASS - // LIMIT_RANGE, NETWORK_POLICY, POD_DISRUPTION_BUDGET, RESOURCE_QUOTA generic: true, } } diff --git a/shell/list/catalog.cattle.io.clusterrepo.vue b/shell/list/catalog.cattle.io.clusterrepo.vue index c8c8ac3248..ba7d66b64a 100644 --- a/shell/list/catalog.cattle.io.clusterrepo.vue +++ b/shell/list/catalog.cattle.io.clusterrepo.vue @@ -26,7 +26,6 @@ export default defineComponent({ * Filter out hidden repos from list of all repos */ filterRowsLocal(rows: ClusterRepo[]) { - // TODO: RC Test - no-vai return rows.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true')); }, diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js index 18d10ba2ca..f817bde7ee 100644 --- a/shell/mixins/resource-fetch.js +++ b/shell/mixins/resource-fetch.js @@ -102,7 +102,7 @@ export default { return rows; } } else { - return this.localFilter ? this.localFilter(rows) : rows; // TODO: RC Test - no-vai + return this.localFilter ? this.localFilter(rows) : rows; } return []; diff --git a/shell/pages/c/_cluster/explorer/EventsTable.vue b/shell/pages/c/_cluster/explorer/EventsTable.vue index 6027e8de27..4afbbd4b71 100644 --- a/shell/pages/c/_cluster/explorer/EventsTable.vue +++ b/shell/pages/c/_cluster/explorer/EventsTable.vue @@ -87,7 +87,6 @@ export default {