From 18a16ba1ddafb5bfb234790c65945061e99916cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Sep 2025 16:12:52 +0000
Subject: [PATCH 1/9] Bump sha.js from 2.4.11 to 2.4.12 in /shell

Bumps [sha.js](https://github.com/crypto-browserify/sha.js) from 2.4.11 to 2.4.12.
- [Changelog](https://github.com/browserify/sha.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/crypto-browserify/sha.js/compare/v2.4.11...v2.4.12)

---
updated-dependencies:
- dependency-name: sha.js
  dependency-version: 2.4.12
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 shell/yarn.lock | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/shell/yarn.lock b/shell/yarn.lock
index 8156f9e413..5ffa09f730 100644
--- a/shell/yarn.lock
+++ b/shell/yarn.lock
@@ -12268,15 +12268,7 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-sha.js@^2.4.11:
+sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8:
   version "2.4.12"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.12.tgz#eb8b568bf383dfd1867a32c3f2b74eb52bdbf23f"
   integrity sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==

From 66094b65385bb04b7fb92d570493696e6f6cab4c Mon Sep 17 00:00:00 2001
From: yonasberhe23 <yonas.berhe@suse.com>
Date: Tue, 23 Sep 2025 12:54:19 -0700
Subject: [PATCH 2/9] fix fleet dashboard tests

---
 .../fleet-dashboard-workspace-card.po.ts      | 26 +++++++--------
 .../e2e/po/pages/fleet/fleet-dashboard.po.ts  |  2 +-
 .../e2e/tests/pages/fleet/dashboard.spec.ts   | 33 ++++++++++---------
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/cypress/e2e/po/components/fleet/fleet-dashboard-workspace-card.po.ts b/cypress/e2e/po/components/fleet/fleet-dashboard-workspace-card.po.ts
index 0e1278a45c..236f527249 100644
--- a/cypress/e2e/po/components/fleet/fleet-dashboard-workspace-card.po.ts
+++ b/cypress/e2e/po/components/fleet/fleet-dashboard-workspace-card.po.ts
@@ -12,7 +12,7 @@ class ResourcePanelPo extends ComponentPo {
   }
 
   stateBadge(state: string) {
-    return this.self().find(`.bg-${ state }`);
+    return this.self().find(`.badge.bg-${ state }`);
   }
 }
 
@@ -32,6 +32,14 @@ class ExpandedPanelPo extends ComponentPo {
   tablePanel() {
     return new TablePanelPo(this.self(), this.workspace);
   }
+
+  gitReposFilter() {
+    return CheckboxInputPo.byLabel(this.self(), 'Show Git Repos');
+  }
+
+  helmOpsFilter() {
+    return CheckboxInputPo.byLabel(this.self(), 'Show Helm Ops');
+  }
 }
 
 class CardPanelPo extends ComponentPo {
@@ -43,14 +51,6 @@ class CardPanelPo extends ComponentPo {
     this.workspace = workspace;
   }
 
-  gitReposFilter() {
-    return CheckboxInputPo.byLabel(this.self(), 'Show Git Repos');
-  }
-
-  helmOpsFilter() {
-    return CheckboxInputPo.byLabel(this.self(), 'Show Helm Ops');
-  }
-
   statePanel(stateDisplay) {
     return new StatePanelPo(`[data-testid="state-panel-${ stateDisplay }"]`, this.self(), this.workspace);
   }
@@ -76,11 +76,11 @@ class StatePanelPo extends ComponentPo {
   }
 
   title() {
-    return this.self().find(`.title .label`);
+    return this.self().find('.title .state-title');
   }
 
-  card(name) {
-    return this.self().find(`[data-testid="card-${ this.workspace }/${ name }"]`);
+  card(name: string) {
+    return this.self().find(`[data-testid="item-card-header-title"]`).contains(name);
   }
 }
 
@@ -102,6 +102,6 @@ export default class FleetDashboardWorkspaceCardPo extends ComponentPo {
   }
 
   expandButton() {
-    return this.self().find('[data-testid="expand-button"]');
+    return this.self().find(`[data-testid="workspace-expand-btn-${ this.workspace }"]`);
   }
 }
diff --git a/cypress/e2e/po/pages/fleet/fleet-dashboard.po.ts b/cypress/e2e/po/pages/fleet/fleet-dashboard.po.ts
index 63ab06a44b..f5b2b937fc 100644
--- a/cypress/e2e/po/pages/fleet/fleet-dashboard.po.ts
+++ b/cypress/e2e/po/pages/fleet/fleet-dashboard.po.ts
@@ -41,7 +41,7 @@ export class FleetDashboardListPagePo extends BaseListPagePo {
     }
 
     slideInPanel() {
-      return cy.get('[data-testid="slide-in-panel-component"] [data-testid="fleet-dashboard-resource-details-header"]');
+      return cy.get('[data-testid="slide-in-panel-component"]');
     }
 
     fleetDashboardEmptyState() {
diff --git a/cypress/e2e/tests/pages/fleet/dashboard.spec.ts b/cypress/e2e/tests/pages/fleet/dashboard.spec.ts
index ccaead66e3..8a3f914a7f 100644
--- a/cypress/e2e/tests/pages/fleet/dashboard.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/dashboard.spec.ts
@@ -100,15 +100,16 @@ describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () =
     expandButton.should('be.visible');
     expandButton.click();
 
-    const cardsPanel = workspaceCard.expandedPanel().cardsPanel();
+    const expandedPanel = workspaceCard.expandedPanel();
+    const cardsPanel = expandedPanel.cardsPanel();
 
     cardsPanel.self().should('be.visible');
 
-    cardsPanel.gitReposFilter().checkVisible();
-    cardsPanel.gitReposFilter().isChecked();
+    expandedPanel.gitReposFilter().checkVisible();
+    expandedPanel.gitReposFilter().isChecked();
 
-    cardsPanel.helmOpsFilter().checkVisible();
-    cardsPanel.helmOpsFilter().isChecked();
+    expandedPanel.helmOpsFilter().checkVisible();
+    expandedPanel.helmOpsFilter().isChecked();
 
     const activeStatePanel = cardsPanel.statePanel('Active');
 
@@ -117,10 +118,7 @@ describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () =
     activeStatePanel.title().should('contain.text', '/1');
     activeStatePanel.title().click();
 
-    const card = activeStatePanel.card(repoName);
-
-    card.should('be.visible');
-    card.find('.title').should('contain.text', repoName);
+    activeStatePanel.card(repoName).should('be.visible');
   });
 
   it('Should filter by GitRepo type', () => {
@@ -132,9 +130,10 @@ describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () =
 
     expandButton.click();
 
-    const cardsPanel = workspaceCard.expandedPanel().cardsPanel();
+    const expandedPanel = workspaceCard.expandedPanel();
+    const cardsPanel = expandedPanel.cardsPanel();
 
-    cardsPanel.gitReposFilter().set();
+    expandedPanel.gitReposFilter().set();
     const activeStatePanel = cardsPanel.statePanel('Active');
 
     activeStatePanel.self().should('not.be.visible');
@@ -151,16 +150,16 @@ describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () =
 
     const cardsPanel = workspaceCard.expandedPanel().cardsPanel();
 
-    cardsPanel.checkExists();
+    cardsPanel.self().should('be.visible');
 
-    // click 'card' mode
+    // click 'table' mode (first button is table mode)
     fleetDashboardPage.viewModeButton().self().find('[data-testid="button-group-child-0"]').click();
 
     cardsPanel.checkNotExists();
 
     const tablePanel = workspaceCard.expandedPanel().tablePanel();
 
-    tablePanel.checkExists();
+    tablePanel.checkVisible();
   });
 
   it('Should open slide-in panel', () => {
@@ -202,10 +201,12 @@ describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () =
     const activeStatePanel = cardsPanel.statePanel('Active');
 
     activeStatePanel.title().click();
+    activeStatePanel.card(repoName).should('be.visible').click();
 
-    const card = activeStatePanel.card(repoName);
+    const details = fleetDashboardPage.slideInPanel();
 
-    card.find('.title a').click();
+    details.should('be.visible');
+    details.find('.title').should('contain.text', repoName).click();
 
     appDetails.waitForPage(null, 'bundles');
   });

From 9fe21d81432d8218feda519394e60f3a1ea08256 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 25 Sep 2025 11:43:22 +0100
Subject: [PATCH 3/9] Fix disabled extension test involving
 PaginatedResourceTable - this previously failed, re-enabled and resolved
 issues

---
 shell/components/PaginatedResourceTable.vue  | 9 +++++++--
 shell/list/catalog.cattle.io.clusterrepo.vue | 4 ++--
 shell/scripts/test-plugins-build.sh          | 9 ++++-----
 shell/scripts/typegen.sh                     | 2 ++
 shell/types/store/vuex.d.ts                  | 3 ++-
 shell/types/vue-shim.d.ts                    | 7 ++-----
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index 8411ddae3c..229ff91626 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -2,6 +2,7 @@
 import { defineComponent } from 'vue';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import ResourceTable from '@shell/components/ResourceTable.vue';
+import { VuexStore } from '@shell/types/store/vuex';
 
 /**
  * This is meant to enable ResourceList like capabilities outside of List pages / components
@@ -130,13 +131,17 @@ export default defineComponent({
     safeHeaders(): any[] {
       const customHeaders: any[] = this.canPaginate ? this.paginationHeaders : this.headers;
 
-      return customHeaders || this.$store.getters['type-map/headersFor'](this.schema, this.canPaginate);
+      const $store = this.$store as VuexStore;
+
+      return customHeaders || $store.getters['type-map/headersFor'](this.schema, this.canPaginate);
     }
   },
 
   methods: {
     clearSelection() {
-      this.$refs.table.clearSelection();
+      const table = this.$refs.table as { clearSelection: () => void };
+
+      table.clearSelection();
     },
   }
 });
diff --git a/shell/list/catalog.cattle.io.clusterrepo.vue b/shell/list/catalog.cattle.io.clusterrepo.vue
index ba7d66b64a..7dcd86aeb8 100644
--- a/shell/list/catalog.cattle.io.clusterrepo.vue
+++ b/shell/list/catalog.cattle.io.clusterrepo.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
-import ClusterRepo from '@shell/models/catalog.cattle.io.clusterrepo';
+import { RancherKubeMetadata } from '@shell/types/kube/kube-api';
 import { PaginationArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
 import { defineComponent } from 'vue';
 
@@ -25,7 +25,7 @@ export default defineComponent({
     /**
      * Filter out hidden repos from list of all repos
      */
-    filterRowsLocal(rows: ClusterRepo[]) {
+    filterRowsLocal(rows: { metadata: RancherKubeMetadata}[]) {
       return rows.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
     },
 
diff --git a/shell/scripts/test-plugins-build.sh b/shell/scripts/test-plugins-build.sh
index 2f2e2bb992..700331fe05 100755
--- a/shell/scripts/test-plugins-build.sh
+++ b/shell/scripts/test-plugins-build.sh
@@ -98,12 +98,11 @@ createTestComponent() {
   # Add test list component to the test package
   # Validates rancher-components imports
 
-  # NOTE - This fails if importing some components with TS imports...
-  # cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
-  # See https://github.com/rancher/dashboard/issues/12918
-
-  # Use a basic list instead
+  # Basic list instead
   cp ${SHELL_DIR}/list/namespace.vue pkg/test-pkg/list
+
+  # More complex list
+  cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
 }
 
 # Publish shell pkg (tag is needed as publish-shell is optimized to work with release-shell-pkg workflow)
diff --git a/shell/scripts/typegen.sh b/shell/scripts/typegen.sh
index e6f64b1f48..ebaffabeea 100755
--- a/shell/scripts/typegen.sh
+++ b/shell/scripts/typegen.sh
@@ -39,6 +39,8 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/steve/hybrid-class.js --d
 # # mixins
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/create-edit-view/index.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins/create-edit-view > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch-namespaced.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch-api-pagination.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
 
 # # models
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/namespace.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
diff --git a/shell/types/store/vuex.d.ts b/shell/types/store/vuex.d.ts
index 7ae015439b..fdc63351ec 100644
--- a/shell/types/store/vuex.d.ts
+++ b/shell/types/store/vuex.d.ts
@@ -10,7 +10,8 @@ export interface VuexStoreGetters {
 
 export interface VuexStore {
   getters: VuexStoreGetters,
-  dispatch: any,
+  dispatch: <T = any>(action: string, payload?: any) => Promise<T>,
+  commit: (mutation: string, payload?: any) => void,
 
   // When we have exact properties above we can remove below
   [name:string]: any
diff --git a/shell/types/vue-shim.d.ts b/shell/types/vue-shim.d.ts
index b91d90291f..389cb1b8f6 100644
--- a/shell/types/vue-shim.d.ts
+++ b/shell/types/vue-shim.d.ts
@@ -1,5 +1,6 @@
 /* eslint-disable */
 import type ShellApi from '@shell/plugins/internal-api/shell/shell.api';
+import { VuexStore } from '@shell/types/store/vuex';
 
 export {};
 
@@ -13,11 +14,7 @@ declare module 'vue' {
       (key: string, args?: Record<string, any>, raw?: boolean): string;
       (options: { k: string; raw?: boolean; tag?: string | Record<string, any>; escapehtml?: boolean }): string;
     },
-    $store: {
-      getters: Record<string, any>,
-      dispatch: (action: string, payload?: any) => Promise<any>,
-      commit: (mutation: string, payload?: any) => void,
-    },
+    $store: VuexStore,
     $shell: ShellApi,
   }
 }

From 7af5e81950abaa9ea3fac0ad3938dd06910c03a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Sep 2025 01:59:16 +0000
Subject: [PATCH 4/9] Bump focus-trap from 7.6.2 to 7.6.5

Bumps [focus-trap](https://github.com/focus-trap/focus-trap) from 7.6.2 to 7.6.5.
- [Release notes](https://github.com/focus-trap/focus-trap/releases)
- [Changelog](https://github.com/focus-trap/focus-trap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/focus-trap/focus-trap/compare/v7.6.2...v7.6.5)

---
updated-dependencies:
- dependency-name: focus-trap
  dependency-version: 7.6.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |  2 +-
 yarn.lock    | 40 ++++++++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 406f72758f..9c402299d8 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "express": "4.17.1",
     "file-saver": "2.0.2",
     "floating-vue": "5.2.2",
-    "focus-trap": "7.6.2",
+    "focus-trap": "7.6.5",
     "https": "1.0.0",
     "identicon.js": "2.3.3",
     "intl-messageformat": "7.8.4",
diff --git a/yarn.lock b/yarn.lock
index 0497f916b0..5bc2156ea1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7812,7 +7812,6 @@ eslint-plugin-jest@24.4.0:
 
 "eslint-plugin-local-rules@link:./eslint-plugin-local-rules":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-local-rules@link:eslint-plugin-local-rules":
   version "0.0.0"
@@ -8522,10 +8521,10 @@ flush-promises@1.0.2:
   resolved "https://registry.npmjs.org/flush-promises/-/flush-promises-1.0.2.tgz#4948fd58f15281fed79cbafc86293d5bb09b2ced"
   integrity sha512-G0sYfLQERwKz4+4iOZYQEZVpOt9zQrlItIxQAAYAWpfby3gbHrx0osCHz5RLl/XoXevXk0xoN4hDFky/VV9TrA==
 
-focus-trap@7.6.2:
-  version "7.6.2"
-  resolved "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz#a501988821ca23d0150a7229eb7a20a3695bdf0e"
-  integrity sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==
+focus-trap@7.6.5:
+  version "7.6.5"
+  resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.6.5.tgz#56f0814286d43c1a2688e9bc4f31f17ae047fb76"
+  integrity sha512-7Ke1jyybbbPZyZXFxEftUtxFGLMpE2n6A+z//m4CRDlj0hW+o3iYSmh8nFlYMurOiJVDmJRilUQtJr08KfIxlg==
   dependencies:
     tabbable "^6.2.0"
 
@@ -14226,7 +14225,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -14243,6 +14242,15 @@ string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -14317,7 +14325,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -14338,6 +14346,13 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -15673,7 +15688,7 @@ worker-loader@3.0.8:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -15699,6 +15714,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From b8ebd8572f67bf8c095dc2358b91679f8992dd5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Sep 2025 04:55:20 +0000
Subject: [PATCH 5/9] Bump focus-trap from 7.6.2 to 7.6.5 in /shell

Bumps [focus-trap](https://github.com/focus-trap/focus-trap) from 7.6.2 to 7.6.5.
- [Release notes](https://github.com/focus-trap/focus-trap/releases)
- [Changelog](https://github.com/focus-trap/focus-trap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/focus-trap/focus-trap/compare/v7.6.2...v7.6.5)

---
updated-dependencies:
- dependency-name: focus-trap
  dependency-version: 7.6.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 shell/package.json | 2 +-
 shell/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/shell/package.json b/shell/package.json
index ebc438fde5..57931aea00 100644
--- a/shell/package.json
+++ b/shell/package.json
@@ -93,7 +93,7 @@
     "express": "4.17.1",
     "file-saver": "2.0.2",
     "floating-vue": "5.2.2",
-    "focus-trap": "7.6.2",
+    "focus-trap": "7.6.5",
     "frontmatter-markdown-loader": "3.7.0",
     "identicon.js": "2.3.3",
     "intl-messageformat": "7.8.4",
diff --git a/shell/yarn.lock b/shell/yarn.lock
index 8156f9e413..7582adf1cc 100644
--- a/shell/yarn.lock
+++ b/shell/yarn.lock
@@ -7737,10 +7737,10 @@ floating-vue@5.2.2:
     "@floating-ui/dom" "~1.1.1"
     vue-resize "^2.0.0-alpha.1"
 
-focus-trap@7.6.2:
-  version "7.6.2"
-  resolved "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.2.tgz#a501988821ca23d0150a7229eb7a20a3695bdf0e"
-  integrity sha512-9FhUxK1hVju2+AiQIDJ5Dd//9R2n2RAfJ0qfhF4IHGHgcoEUTMpbTeG/zbEuwaiYXfuAH6XE0/aCyxDdRM+W5w==
+focus-trap@7.6.5:
+  version "7.6.5"
+  resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-7.6.5.tgz#56f0814286d43c1a2688e9bc4f31f17ae047fb76"
+  integrity sha512-7Ke1jyybbbPZyZXFxEftUtxFGLMpE2n6A+z//m4CRDlj0hW+o3iYSmh8nFlYMurOiJVDmJRilUQtJr08KfIxlg==
   dependencies:
     tabbable "^6.2.0"
 

From 648504d90883ce6ed65cdef40d989cbf6f5cf987 Mon Sep 17 00:00:00 2001
From: Cody Jackson <cody.jackson@suse.com>
Date: Wed, 1 Oct 2025 06:48:57 -0700
Subject: [PATCH 6/9] Making it easier for a user to select a name to confirm
 deleting a resource

Fixes #8825
---
 shell/components/PromptRemove.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/shell/components/PromptRemove.vue b/shell/components/PromptRemove.vue
index 208802509b..60342a1854 100644
--- a/shell/components/PromptRemove.vue
+++ b/shell/components/PromptRemove.vue
@@ -384,6 +384,7 @@ export default {
           >
             <span
               v-clean-html="t('promptRemove.confirmName', { nameToMatch: escapeHtml(nameToMatch) }, true)"
+              class="confirm-text"
             />
           </div>
         </div>
@@ -472,5 +473,9 @@ export default {
         flex: 1;
       }
     }
+
+    .confirm-text b {
+      user-select: all;
+    }
   }
 </style>

From a901d68a2b0a91b87ba352d4d76cd39456dc2225 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 1 Oct 2025 15:59:15 +0100
Subject: [PATCH 7/9] Ensure we ignore stale pre-2.11 pagination config

---
 shell/utils/pagination-utils.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/shell/utils/pagination-utils.ts b/shell/utils/pagination-utils.ts
index e395c18020..53910d8bbb 100644
--- a/shell/utils/pagination-utils.ts
+++ b/shell/utils/pagination-utils.ts
@@ -16,6 +16,7 @@ import { STEVE_CACHE } from '@shell/store/features';
 import { getPerformanceSetting } from '@shell/utils/settings';
 import { PAGINATION_SETTINGS_STORE_DEFAULTS } from '@shell/plugins/steve/steve-pagination-utils';
 import { MANAGEMENT } from '@shell/config/types';
+import { DEFAULT_PERF_SETTING } from '@shell/config/settings';
 
 /**
  * Helper functions for server side pagination
@@ -43,7 +44,15 @@ class PaginationUtils {
   public getStoreSettings(arg: any | PaginationSettings): PaginationSettingsStore {
     const serverPagination: PaginationSettings = arg?.rootGetters !== undefined ? this.getSettings(arg) : arg;
 
-    return serverPagination?.useDefaultStores ? this.getStoreDefault() : serverPagination?.stores || this.getStoreDefault();
+    // Ensure we use the current default store settings if
+    // 1. from 2.11.0 user saved `ui-performance` setting and it's applied the default pagination settings containing useDefaultStores
+    // 2. before 2.11.0 user has saved `ui-performance` setting and it's applied an obsolete pagination settings that lack useDefaultStore
+    // 3. user has manually set the `ui-performance` pagination setting useDefaultStores value
+    if (serverPagination?.useDefaultStores || serverPagination?.useDefaultStores === undefined) {
+      return this.getStoreDefault();
+    }
+
+    return serverPagination?.stores || this.getStoreDefault();
   }
 
   public getStoreDefault(): PaginationSettingsStore {
@@ -168,7 +177,7 @@ class PaginationUtils {
   resourceChangesDebounceMs({ rootGetters }: any): number | undefined {
     const settings = this.getSettings({ rootGetters });
 
-    return settings.resourceChangesDebounceMs;
+    return settings.resourceChangesDebounceMs || DEFAULT_PERF_SETTING.serverPagination.resourceChangesDebounceMs;
   }
 
   validateNsProjectFilters(nsProjectFilters: string[]) {

From bcee72e2604a734b457d67ccaf33df5b21eab4ec Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 2 Oct 2025 09:35:14 +0100
Subject: [PATCH 8/9] Update `addTableColumn` api docs

---
 .../docs/extensions/api/table-columns.md      | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/docusaurus/docs/extensions/api/table-columns.md b/docusaurus/docs/extensions/api/table-columns.md
index d3900b63ec..4dd7ecfeff 100644
--- a/docusaurus/docs/extensions/api/table-columns.md
+++ b/docusaurus/docs/extensions/api/table-columns.md
@@ -13,12 +13,12 @@ This method adds a table column to a `ResourceTable` element-based table on the
 Method:
 
 ```ts
-plugin.addTableColumn(where: String, when: LocationConfig, options: Object);
+plugin.addTableColumn(where: String, when: LocationConfig, column: TableColumn);
 ```
 
 _Arguments_
 
-`where` string parameter admissable values for this method:
+`where` string parameter admissible values for this method:
 
 | Key | Type | Description |
 |---|---|---|
@@ -26,28 +26,35 @@ _Arguments_
 
 <br/>
 
-`when` Object admissable values:
+`when` Object admissible values:
 
 `LocationConfig` as described above for the [LocationConfig object](./common#locationconfig).
 
-<br/>
-<br/>
+*(Rancher version v2.13.0)*
 
-### TableColumnLocation.RESOURCE options
+An addition parameter can be provided which will be used to support the column when server-side pagination is enabled. For more information and other changes required to server-side pagination see [here](../performance/scaling/lists.md).
+
+```ts
+plugin.addTableColumn(where: String, when: LocationConfig, column: TableColumn, paginationColumn?: PaginationTableColumn));
+```
+
+### TableColumnLocation.RESOURCE column
 
 ![Table Col](../screenshots/table-cols.png)
 
-`options` config object. Admissable parameters for the `options` with `'TableColumnLocation.RESOURCE'` are:
+`column` config object. Admissible parameters for the `column` with `'TableColumnLocation.RESOURCE'` are:
 
 | Key | Type | Description |
 |---|---|---|
 |`name`| String | Label for column |
-|`labelKey`| String | Same as "name" but allows for translation. Will superseed "name" |
+|`labelKey`| String | Same as "name" but allows for translation. Will supersede "name" |
 |`value`| String | Object property to obtain the value from |
-|`getValue`| Fuction | Same as "value", but it can be a function. Will superseed "value" |
+|`getValue`| Function | Same as "value", but it can be a function. Will supersede "value" |
 |`width`| Int | Column width (in `px`). Optional |
-|`sort`| Array | Object properties to be bound to the table sorting. Optional |
-|`search`| Array | Object properties to be bound to the table search. Optional |
+|`sort`| boolean,string,Array | Object properties to be bound to the table sorting. Optional |
+|`search`| boolean,string,Array | Object properties to be bound to the table search. Optional |
+| `formatter`| string | Name of a `formatter` component used to render the cell. Components should be in the extension `formatters` folder
+| `formatterOpts`| any | Provide additional values to the `formatter` component via a `formatterOpts` component param
 
 Usage example for `'TableColumnLocation.RESOURCE'`:
 

From 43437c1e2e3cde381d6cd77a8c3c4750fe9d8890 Mon Sep 17 00:00:00 2001
From: momesgin <mo.mesgin@suse.com>
Date: Thu, 2 Oct 2025 16:55:05 -0700
Subject: [PATCH 9/9] Apps & Marketplace - Long repo names (#15563)

* handle long repo names + update filters color

* revert filters text color change

* minor refactor

---------

Co-authored-by: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
---
 shell/components/FilterPanel.vue              |  9 +++++++-
 .../apps/charts/AppChartCardFooter.vue        |  6 +++++
 .../c/_cluster/apps/charts/StatusLabel.vue    |  7 +++---
 shell/pages/c/_cluster/apps/charts/index.vue  | 23 ++++++++++---------
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/shell/components/FilterPanel.vue b/shell/components/FilterPanel.vue
index e1c128280c..a259a94c58 100644
--- a/shell/components/FilterPanel.vue
+++ b/shell/components/FilterPanel.vue
@@ -20,6 +20,8 @@ type FilterOption = {
   componentProps?: Record<string, unknown>;
   /** Label to show next to the checkbox, or a custom component next to the checkbox */
   label?: string | { component: ComponentType; componentProps: Record<string, unknown>; };
+  /** Tooltip to be displayed above the checkbox on hover */
+  labelTooltip?: string;
 };
 
 /**
@@ -97,7 +99,12 @@ const updateFilter = (key: string, value: string[]) => {
             @update:value="updateFilter(filter.key, $event)"
           >
             <template #label>
-              <span v-if="typeof option.label === 'string'">{{ option.label }}</span>
+              <span
+                v-if="typeof option.label === 'string'"
+                v-clean-tooltip="{content: option.labelTooltip, delay: { show: 1000 }}"
+              >
+                {{ option.label }}
+              </span>
               <component
                 :is="option.label.component"
                 v-else
diff --git a/shell/pages/c/_cluster/apps/charts/AppChartCardFooter.vue b/shell/pages/c/_cluster/apps/charts/AppChartCardFooter.vue
index 37e7f77f7c..f0929ebf1a 100644
--- a/shell/pages/c/_cluster/apps/charts/AppChartCardFooter.vue
+++ b/shell/pages/c/_cluster/apps/charts/AppChartCardFooter.vue
@@ -80,6 +80,12 @@ function onClickItem(type: string, label: string) {
     &-text {
       text-transform: capitalize;
       margin-right: 8px;
+      display: -webkit-box;
+      -webkit-line-clamp: 1;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      word-break: break-all;
     }
 
     &-icon {
diff --git a/shell/pages/c/_cluster/apps/charts/StatusLabel.vue b/shell/pages/c/_cluster/apps/charts/StatusLabel.vue
index 1ad71daa24..be453b32f4 100644
--- a/shell/pages/c/_cluster/apps/charts/StatusLabel.vue
+++ b/shell/pages/c/_cluster/apps/charts/StatusLabel.vue
@@ -2,9 +2,9 @@
 
 defineProps<{
   label: string;
-  icon: string;
+  icon?: string;
   iconColor?: string;
-  tooltip?: string;
+  iconTooltip?: string;
 }>();
 
 </script>
@@ -13,7 +13,8 @@ defineProps<{
   <div class="status-label">
     {{ label }}
     <i
-      v-clean-tooltip.right="tooltip"
+      v-if="!!icon"
+      v-clean-tooltip.right="iconTooltip"
       :class="['icon', icon, iconColor]"
     />
   </div>
diff --git a/shell/pages/c/_cluster/apps/charts/index.vue b/shell/pages/c/_cluster/apps/charts/index.vue
index e3ac6da2e4..b01435f3b1 100644
--- a/shell/pages/c/_cluster/apps/charts/index.vue
+++ b/shell/pages/c/_cluster/apps/charts/index.vue
@@ -82,10 +82,10 @@ export default {
           label: {
             component:      markRaw(StatusLabel),
             componentProps: {
-              label:     this.t('generic.installed'),
-              icon:      'icon-warning',
-              iconColor: 'warning',
-              tooltip:   this.t('catalog.charts.statusFilterCautions.installation')
+              label:       this.t('generic.installed'),
+              icon:        'icon-warning',
+              iconColor:   'warning',
+              iconTooltip: this.t('catalog.charts.statusFilterCautions.installation')
             }
           }
         },
@@ -98,10 +98,10 @@ export default {
           label: {
             component:      markRaw(StatusLabel),
             componentProps: {
-              label:     this.t('generic.upgradeable'),
-              icon:      'icon-warning',
-              iconColor: 'warning',
-              tooltip:   this.t('catalog.charts.statusFilterCautions.upgradeable')
+              label:       this.t('generic.upgradeable'),
+              icon:        'icon-warning',
+              iconColor:   'warning',
+              iconTooltip: this.t('catalog.charts.statusFilterCautions.upgradeable')
             }
           }
         }
@@ -125,9 +125,10 @@ export default {
     repoOptions() {
       let out = this.$store.getters['catalog/repos'].map((r) => {
         return {
-          value:  r._key,
-          label:  r.nameDisplay,
-          weight: ( r.isRancher ? 1 : ( r.isPartner ? 2 : 3 ) ),
+          value:        r._key,
+          label:        r.nameDisplay,
+          labelTooltip: r.nameDisplay,
+          weight:       ( r.isRancher ? 1 : ( r.isPartner ? 2 : 3 ) ),
         };
       });