From 68829b8439f3fa8a47456bbf8edfb02013eae886 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Mon, 13 Jan 2025 16:04:42 -0800
Subject: [PATCH 001/140] restrict installed apps upgrade

---
 shell/assets/translations/en-us.yaml          |  2 +
 shell/list/catalog.cattle.io.app.vue          | 25 +++++-
 shell/mixins/__tests__/chart.test.ts          |  9 +-
 shell/mixins/chart.js                         |  4 +-
 .../__tests__/catalog.cattle.io.app.test.ts   | 88 +++++++++++++++++++
 shell/models/catalog.cattle.io.app.js         | 85 +++++++++++-------
 .../pages/c/_cluster/explorer/tools/index.vue |  4 +-
 shell/store/catalog.js                        | 21 +++--
 8 files changed, 188 insertions(+), 50 deletions(-)
 create mode 100644 shell/models/__tests__/catalog.cattle.io.app.test.ts

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 758c7a19d37..603f216ab2a 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -903,6 +903,8 @@ catalog:
         label: Resources
         busy: The related resources will appear when {app} is fully installed.
       values: Values YAML
+    upgrade:
+      uncertainUpgradeWarningTooltip: Unable to identify source chart and repository for this application in order to determine if an upgrade is available
   chart:
     registry:
       label: Container Registry
diff --git a/shell/list/catalog.cattle.io.app.vue b/shell/list/catalog.cattle.io.app.vue
index 05aaa0c4606..dab3e3e3983 100644
--- a/shell/list/catalog.cattle.io.app.vue
+++ b/shell/list/catalog.cattle.io.app.vue
@@ -1,5 +1,6 @@
 <script>
 import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
+import { APP_UPGRADE_STATUS } from '@shell/store/catalog';
 
 export default {
   name:       'ListApps',
@@ -21,6 +22,10 @@ export default {
     }
   },
 
+  data() {
+    return { APP_UPGRADE_STATUS };
+  },
+
   async fetch() {
     await this.$store.dispatch('catalog/load');
   },
@@ -36,18 +41,30 @@ export default {
   >
     <template #cell:upgrade="{row}">
       <span
-        v-if="row.upgradeAvailable"
+        v-if="row.upgradeAvailable === APP_UPGRADE_STATUS.SINGLE_UPGRADE"
         class="badge-state bg-warning hand"
-        @click="row.goToUpgrade(row.upgradeAvailable)"
+        @click="row.goToUpgrade(row.upgradeAvailableVersion)"
       >
-        {{ row.upgradeAvailable }}
+        {{ row.upgradeAvailableVersion }}
         <i class="icon icon-upload" />
       </span>
       <span
-        v-else-if="row.upgradeAvailable === false"
+        v-else-if="row.upgradeAvailable === APP_UPGRADE_STATUS.NOT_APPLICABLE"
         v-t="'catalog.app.managed'"
         class="text-muted"
       />
+      <span
+        v-else-if="row.upgradeAvailable === APP_UPGRADE_STATUS.NO_UPGRADE"
+        class="text-muted"
+      />
+      <span
+        v-else-if="row.upgradeAvailable === APP_UPGRADE_STATUS.MULTIPLE_UPGRADES"
+      >
+        <i
+          v-clean-tooltip="t('catalog.app.upgrade.uncertainUpgradeWarningTooltip')"
+          class="icon icon-info"
+        />
+      </span>
     </template>
   </PaginatedResourceTable>
 </template>
diff --git a/shell/mixins/__tests__/chart.test.ts b/shell/mixins/__tests__/chart.test.ts
index ca2ac4844ce..0e0f4761bfd 100644
--- a/shell/mixins/__tests__/chart.test.ts
+++ b/shell/mixins/__tests__/chart.test.ts
@@ -1,6 +1,7 @@
 import ChartMixin from '@shell/mixins/chart';
 import { OPA_GATE_KEEPER_ID } from '@shell/pages/c/_cluster/gatekeeper/index.vue';
 import { mount } from '@vue/test-utils';
+import { APP_UPGRADE_STATUS } from '@shell/store/catalog';
 
 describe('chartMixin', () => {
   const testCases = {
@@ -10,10 +11,10 @@ describe('chartMixin', () => {
       ['any_other_id', 0]
     ],
     managedApps: [
-      [false, false, 0],
-      [true, null, 0],
-      [true, true, 0],
-      [true, false, 1],
+      [false, APP_UPGRADE_STATUS.NOT_APPLICABLE, 0],
+      [true, APP_UPGRADE_STATUS.NO_UPGRADE, 0],
+      [true, 'some-version', 0],
+      [true, APP_UPGRADE_STATUS.NOT_APPLICABLE, 1],
     ],
   };
 
diff --git a/shell/mixins/chart.js b/shell/mixins/chart.js
index 27ffbd7710f..c9dc554dd9b 100644
--- a/shell/mixins/chart.js
+++ b/shell/mixins/chart.js
@@ -14,7 +14,7 @@ import { formatSi, parseSi } from '@shell/utils/units';
 import { CAPI, CATALOG } from '@shell/config/types';
 import { isPrerelease } from '@shell/utils/version';
 import difference from 'lodash/difference';
-import { LINUX } from '@shell/store/catalog';
+import { LINUX, APP_UPGRADE_STATUS } from '@shell/store/catalog';
 import { clone } from '@shell/utils/object';
 import { merge } from 'lodash';
 
@@ -181,7 +181,7 @@ export default {
         warnings.unshift(this.t('gatekeeperIndex.deprecated', {}, true));
       }
 
-      if (this.existing && this.existing.upgradeAvailable === false) {
+      if (this.existing && this.existing.upgradeAvailable === APP_UPGRADE_STATUS.NOT_APPLICABLE) {
         warnings.unshift(this.t('catalog.install.warning.managed', {
           name:    this.existing.name,
           version: this.chart ? this.query.versionName : null
diff --git a/shell/models/__tests__/catalog.cattle.io.app.test.ts b/shell/models/__tests__/catalog.cattle.io.app.test.ts
new file mode 100644
index 00000000000..61c6d74c13b
--- /dev/null
+++ b/shell/models/__tests__/catalog.cattle.io.app.test.ts
@@ -0,0 +1,88 @@
+import CatalogApp from '@shell/models/catalog.cattle.io.app';
+import { APP_UPGRADE_STATUS } from '@shell/store/catalog';
+
+const latestVersion = '1.16.2';
+const secondLatestVersion = '1.16.1';
+const chartName = 'cert-manager';
+
+const appCo = {
+  repoName: 'appCo',
+  home:     'https://apps.rancher.io/applications/cert-manager'
+};
+
+const certManagerFromCli = { home: 'https://github.com/jetstack/cert-manager' };
+
+const certManagerOfficial = {
+  repoName: 'certManagerOfficial',
+  home:     'https://cert-manager.io'
+};
+
+// cert-manager chart from application collection OCI repo
+const matchingChart1 = {
+  name:     chartName,
+  repoName: appCo.repoName,
+  versions: [{
+    version:     latestVersion,
+    home:        appCo.home,
+    repoName:    appCo.repoName,
+    annotations: {}
+  }]
+};
+
+// cert-manager chart from its official helm repo 'https://cert-manager.io' added to Rancher UI repositories
+const matchingChart2 = {
+  name:     chartName,
+  repoName: certManagerOfficial.repoName,
+  versions: [{
+    version:     latestVersion,
+    home:        certManagerOfficial.home,
+    repoName:    certManagerOfficial.repoName,
+    annotations: {},
+  }]
+};
+
+const installedChartFromCli = {
+  metadata: {
+    name:    chartName,
+    home:    certManagerFromCli.home,
+    version: secondLatestVersion
+  }
+};
+
+const installedChartFromRancherUI = {
+  metadata: {
+    name:    chartName,
+    home:    certManagerOfficial.home,
+    version: secondLatestVersion
+  }
+};
+
+// // home is not set
+// const installedCustomChartFromRancherUI = {
+//   metadata: {
+//     name:    chartName,
+//     version: secondLatestVersion
+//   }
+// };
+
+describe('class CatalogApp', () => {
+  describe('upgradeAvailable', () => {
+    // TODO: more test cases
+    const testCases = [
+      [installedChartFromCli, [matchingChart1, matchingChart2], APP_UPGRADE_STATUS.NO_UPGRADE],
+      [installedChartFromRancherUI, [matchingChart1, matchingChart2], APP_UPGRADE_STATUS.SINGLE_UPGRADE]
+    ];
+
+    it.each(testCases)('should return the correct upgrade status', (installedChart: Object, matchingCharts: any, expected: any) => {
+      const catalogApp = new CatalogApp({ spec: { chart: installedChart } }, {
+        rootGetters: {
+          'catalog/chart': () => matchingCharts,
+          currentCluster:  { workerOSs: ['linux'] },
+          'prefs/get':     () => false
+        }
+      });
+
+      expect(catalogApp.upgradeAvailable).toBe(expected);
+    });
+  });
+});
diff --git a/shell/models/catalog.cattle.io.app.js b/shell/models/catalog.cattle.io.app.js
index e2de968d6f1..0b9ce122f14 100644
--- a/shell/models/catalog.cattle.io.app.js
+++ b/shell/models/catalog.cattle.io.app.js
@@ -9,7 +9,7 @@ import { SHOW_PRE_RELEASE } from '@shell/store/prefs';
 import { set } from '@shell/utils/object';
 
 import SteveModel from '@shell/plugins/steve/steve-class';
-import { compatibleVersionsFor } from '@shell/store/catalog';
+import { compatibleVersionsFor, APP_UPGRADE_STATUS } from '@shell/store/catalog';
 
 export default class CatalogApp extends SteveModel {
   showMasthead(mode) {
@@ -22,6 +22,8 @@ export default class CatalogApp extends SteveModel {
     set(this, 'skipCRDs', false);
     set(this, 'timeout', 300);
     set(this, 'wait', true);
+    set(this, 'foundMultipleUpgradeMatches', false);
+    set(this, 'upgradeAvailableVersion', '');
   }
 
   get _availableActions() {
@@ -40,7 +42,7 @@ export default class CatalogApp extends SteveModel {
   }
 
   get warnDeletionMessage() {
-    if (this.upgradeAvailable === false) {
+    if (this.upgradeAvailable === APP_UPGRADE_STATUS.NOT_APPLICABLE) {
       return this.t('catalog.delete.warning.managed', { name: this.name });
     }
 
@@ -56,16 +58,33 @@ export default class CatalogApp extends SteveModel {
 
     const chartName = chart.metadata?.name;
     const repoName = chart.metadata?.annotations?.[CATALOG_ANNOTATIONS.SOURCE_REPO_NAME] || this.metadata?.labels?.[CATALOG_ANNOTATIONS.CLUSTER_REPO_NAME];
-    const preferRepoType = chart.metadata?.annotations?.[CATALOG_ANNOTATIONS.SOURCE_REPO_TYPE] || 'cluster';
 
-    const match = this.$rootGetters['catalog/chart']({
+    const matchingCharts = this.$rootGetters['catalog/chart']({
       chartName,
       repoName,
-      preferRepoType,
-      includeHidden
-    });
+      includeHidden,
+      multiple: true
+    }) || [];
+
+    if (matchingCharts.length === 0) {
+      return;
+    }
+
+    // narrowing down the matches by checking more properties, like home url
+    // we let a match pass if home url is not set since we support custom charts and they might not follow the best practices to include the home url
+    const thisHome = chart?.metadata?.home;
+    const bestMatches = matchingCharts.filter((m) => !thisHome || m.versions[0]?.home === thisHome);
+
+    if (bestMatches.length === 0) {
+      return;
+    }
+
+    if (bestMatches.length === 1) {
+      return bestMatches[0];
+    }
 
-    return match;
+    // found multiple matches but couldn't choose one unique match
+    this.foundMultipleUpgradeMatches = true;
   }
 
   get currentVersion() {
@@ -73,28 +92,33 @@ export default class CatalogApp extends SteveModel {
   }
 
   get upgradeAvailable() {
-    // false = does not apply (managed by fleet)
-    // null = no upgrade found
-    // object = version available to upgrade to
+    // one the following statuses gets returned:
+    // NOT_APPLICABLE - managed by fleet
+    // NO_UPGRADE - no upgrade found
+    // SINGLE_UPGRADE - a version available to upgrade to
+    // MULTIPLE_UPGRADES - more than one match found
 
     if (
       this.spec?.chart?.metadata?.annotations?.[CATALOG_ANNOTATIONS.MANAGED] ||
       this.spec?.chart?.metadata?.annotations?.[FLEET.BUNDLE_ID]
     ) {
       // Things managed by fleet shouldn't show upgrade available even if there might be.
-      return false;
+      return APP_UPGRADE_STATUS.NOT_APPLICABLE;
     }
     const chart = this.matchingChart(false);
 
+    if (this.foundMultipleUpgradeMatches) {
+      return APP_UPGRADE_STATUS.MULTIPLE_UPGRADES;
+    }
+
     if ( !chart ) {
-      return null;
+      return APP_UPGRADE_STATUS.NO_UPGRADE;
     }
 
     const workerOSs = this.$rootGetters['currentCluster'].workerOSs;
 
     const showPreRelease = this.$rootGetters['prefs/get'](SHOW_PRE_RELEASE);
 
-    const thisVersion = this.spec?.chart?.metadata?.version;
     let versions = chart.versions;
 
     if (!showPreRelease) {
@@ -106,45 +130,45 @@ export default class CatalogApp extends SteveModel {
     const newestChart = versions?.[0];
     const newestVersion = newestChart?.version;
 
-    if ( !thisVersion || !newestVersion ) {
-      return null;
+    if ( !this.currentVersion || !newestVersion ) {
+      return APP_UPGRADE_STATUS.NO_UPGRADE;
     }
 
-    if ( compare(thisVersion, newestVersion) < 0 ) {
-      return cleanupVersion(newestVersion);
+    if ( compare(this.currentVersion, newestVersion) < 0 ) {
+      // set the available upgrade version to be used in other places
+      this.upgradeAvailableVersion = cleanupVersion(newestVersion);
+
+      return APP_UPGRADE_STATUS.SINGLE_UPGRADE;
     }
 
-    return null;
+    return APP_UPGRADE_STATUS.NO_UPGRADE;
   }
 
   get upgradeAvailableSort() {
-    const version = this.upgradeAvailable;
-
-    if ( !version ) {
-      return '~'; // Tilde sorts after all numbers and letters
+    if (this.upgradeAvailable === APP_UPGRADE_STATUS.SINGLE_UPGRADE) {
+      return sortable(this.upgradeAvailableVersion);
     }
 
-    return sortable(version);
+    return '~'; // Tilde sorts after all numbers and letters
   }
 
   get currentVersionCompatible() {
     const workerOSs = this.$rootGetters['currentCluster'].workerOSs;
 
     const chart = this.matchingChart(false);
-    const thisVersion = this.spec?.chart?.metadata?.version;
 
     if (!chart) {
       return true;
     }
 
-    const versionInChart = chart.versions.find((version) => version.version === thisVersion);
+    const versionInChart = chart.versions.find((version) => version.version === this.currentVersion);
 
     if (!versionInChart) {
       return true;
     }
     const compatibleVersions = compatibleVersionsFor(chart, workerOSs, true) || [];
 
-    const thisVersionCompatible = !!compatibleVersions.find((version) => version.version === thisVersion);
+    const thisVersionCompatible = !!compatibleVersions.find((version) => version.version === this.currentVersion);
 
     return thisVersionCompatible;
   }
@@ -153,7 +177,7 @@ export default class CatalogApp extends SteveModel {
     if (this.currentVersionCompatible) {
       return null;
     }
-    if (this.upgradeAvailable) {
+    if (this.upgradeAvailableVersion) {
       return this.t('catalog.os.versionIncompatible');
     }
 
@@ -162,11 +186,10 @@ export default class CatalogApp extends SteveModel {
 
   goToUpgrade(forceVersion, fromTools) {
     const match = this.matchingChart(true);
-    const versionName = this.spec?.chart?.metadata?.version;
     const query = {
       [NAMESPACE]: this.metadata.namespace,
       [NAME]:      this.metadata.name,
-      [VERSION]:   forceVersion || versionName,
+      [VERSION]:   forceVersion || this.currentVersion,
     };
 
     if ( match ) {
@@ -221,7 +244,7 @@ export default class CatalogApp extends SteveModel {
   }
 
   get versionDisplay() {
-    return cleanupVersion(this.spec?.chart?.metadata?.version);
+    return cleanupVersion(this.currentVersion);
   }
 
   get versionSort() {
diff --git a/shell/pages/c/_cluster/explorer/tools/index.vue b/shell/pages/c/_cluster/explorer/tools/index.vue
index d01c18bbbc6..0c02f6c3867 100644
--- a/shell/pages/c/_cluster/explorer/tools/index.vue
+++ b/shell/pages/c/_cluster/explorer/tools/index.vue
@@ -326,8 +326,8 @@ export default {
             >{{ t('catalog.charts.deploysOnWindows') }}</label>
           </div>
           <div class="version">
-            <template v-if="opt.app && opt.app.upgradeAvailable">
-              v{{ opt.app.currentVersion }} <b><i class="icon icon-chevron-right" /> v{{ opt.app.upgradeAvailable }}</b>
+            <template v-if="opt.app && opt.app.upgradeAvailableVersion">
+              v{{ opt.app.currentVersion }} <b><i class="icon icon-chevron-right" /> v{{ opt.app.upgradeAvailableVersion }}</b>
             </template>
             <template v-else-if="opt.app">
               v{{ opt.app.currentVersion }}
diff --git a/shell/store/catalog.js b/shell/store/catalog.js
index 9f021474ffe..481df65e519 100644
--- a/shell/store/catalog.js
+++ b/shell/store/catalog.js
@@ -31,6 +31,13 @@ const CERTIFIED_SORTS = {
   other:                               3,
 };
 
+export const APP_UPGRADE_STATUS = {
+  NOT_APPLICABLE:    'not_applicable', // managed by fleet
+  NO_UPGRADE:        'no_upgrade', // no upgrade found
+  SINGLE_UPGRADE:    'single_upgrade', // a version available to upgrade to
+  MULTIPLE_UPGRADES: 'multiple_upgrades' // more than one match found
+};
+
 export const WINDOWS = 'windows';
 export const LINUX = 'linux';
 
@@ -101,7 +108,7 @@ export const getters = {
 
   chart(state, getters) {
     return ({
-      key, repoType, repoName, chartName, preferRepoType, preferRepoName, includeHidden, showDeprecated
+      key, repoType, repoName, chartName, includeHidden, showDeprecated, multiple
     }) => {
       if ( key && !repoType && !repoName && !chartName) {
         const parsed = parseKey(key);
@@ -111,7 +118,7 @@ export const getters = {
         chartName = parsed.chartName;
       }
 
-      let matching = filterBy(getters.charts, {
+      let matchingCharts = filterBy(getters.charts, {
         repoType,
         repoName,
         chartName,
@@ -119,18 +126,18 @@ export const getters = {
       });
 
       if ( includeHidden === false ) {
-        matching = matching.filter((x) => !x.hidden);
+        matchingCharts = matchingCharts.filter((x) => !x.hidden);
       }
 
-      if ( !matching.length ) {
+      if ( !matchingCharts.length ) {
         return;
       }
 
-      if ( preferRepoType && preferRepoName ) {
-        preferSameRepo(matching, preferRepoType, preferRepoName);
+      if (multiple) {
+        return matchingCharts;
       }
 
-      return matching[0];
+      return matchingCharts[0];
     };
   },
 

From ac388ad8bc57c379777d0776f31c86a8d460f039 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Tue, 14 Jan 2025 16:14:45 -0800
Subject: [PATCH 002/140] update filtering condition

---
 shell/models/catalog.cattle.io.app.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/models/catalog.cattle.io.app.js b/shell/models/catalog.cattle.io.app.js
index 0b9ce122f14..a4cce5ab53f 100644
--- a/shell/models/catalog.cattle.io.app.js
+++ b/shell/models/catalog.cattle.io.app.js
@@ -70,10 +70,10 @@ export default class CatalogApp extends SteveModel {
       return;
     }
 
-    // narrowing down the matches by checking more properties, like home url
-    // we let a match pass if home url is not set since we support custom charts and they might not follow the best practices to include the home url
+    // narrowing down the matches by checking if the current version includes in the list of available versions from a matched chart
+    // Filtering matches by verifying if the current version is in the matched chart's available versions, and that the home value matches as well
     const thisHome = chart?.metadata?.home;
-    const bestMatches = matchingCharts.filter((m) => !thisHome || m.versions[0]?.home === thisHome);
+    const bestMatches = matchingCharts.filter((m) => m.versions.some(v => v.version === this.currentVersion && v.home === thisHome));
 
     if (bestMatches.length === 0) {
       return;

From f9a58fcdd084803af4d6cd644271bca5e19341dd Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Tue, 14 Jan 2025 16:15:50 -0800
Subject: [PATCH 003/140] lint

---
 shell/models/catalog.cattle.io.app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/models/catalog.cattle.io.app.js b/shell/models/catalog.cattle.io.app.js
index a4cce5ab53f..8d68e53e00d 100644
--- a/shell/models/catalog.cattle.io.app.js
+++ b/shell/models/catalog.cattle.io.app.js
@@ -73,7 +73,7 @@ export default class CatalogApp extends SteveModel {
     // narrowing down the matches by checking if the current version includes in the list of available versions from a matched chart
     // Filtering matches by verifying if the current version is in the matched chart's available versions, and that the home value matches as well
     const thisHome = chart?.metadata?.home;
-    const bestMatches = matchingCharts.filter((m) => m.versions.some(v => v.version === this.currentVersion && v.home === thisHome));
+    const bestMatches = matchingCharts.filter((m) => m.versions.some((v) => v.version === this.currentVersion && v.home === thisHome));
 
     if (bestMatches.length === 0) {
       return;

From f24ef55f5c4b143306d8cb5c857f3999fac1bc7e Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Tue, 14 Jan 2025 16:17:48 -0800
Subject: [PATCH 004/140] removed extra comment

---
 shell/models/catalog.cattle.io.app.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shell/models/catalog.cattle.io.app.js b/shell/models/catalog.cattle.io.app.js
index 8d68e53e00d..a0c3d49581e 100644
--- a/shell/models/catalog.cattle.io.app.js
+++ b/shell/models/catalog.cattle.io.app.js
@@ -70,7 +70,6 @@ export default class CatalogApp extends SteveModel {
       return;
     }
 
-    // narrowing down the matches by checking if the current version includes in the list of available versions from a matched chart
     // Filtering matches by verifying if the current version is in the matched chart's available versions, and that the home value matches as well
     const thisHome = chart?.metadata?.home;
     const bestMatches = matchingCharts.filter((m) => m.versions.some((v) => v.version === this.currentVersion && v.home === thisHome));

From e0bbde3d8fb9113409d9c2267a92aeeb29a53260 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Wed, 15 Jan 2025 08:40:17 -0800
Subject: [PATCH 005/140] optimize the iteration through matching charts
 versions

---
 shell/models/catalog.cattle.io.app.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/shell/models/catalog.cattle.io.app.js b/shell/models/catalog.cattle.io.app.js
index a0c3d49581e..4ac7eb20b4e 100644
--- a/shell/models/catalog.cattle.io.app.js
+++ b/shell/models/catalog.cattle.io.app.js
@@ -72,7 +72,17 @@ export default class CatalogApp extends SteveModel {
 
     // Filtering matches by verifying if the current version is in the matched chart's available versions, and that the home value matches as well
     const thisHome = chart?.metadata?.home;
-    const bestMatches = matchingCharts.filter((m) => m.versions.some((v) => v.version === this.currentVersion && v.home === thisHome));
+    const bestMatches = matchingCharts.filter(({ versions }) => {
+      for (let i = 0; i < versions.length; i++) {
+        const { version, home } = versions[i];
+
+        if (version === this.currentVersion && home === thisHome) {
+          return true;
+        }
+      }
+
+      return false;
+    });
 
     if (bestMatches.length === 0) {
       return;

From a14d79f1d6ec41c3a12123c5f221e9e3cc2b0db3 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Sun, 19 Jan 2025 12:59:44 -0800
Subject: [PATCH 006/140] more test cases

---
 .../__tests__/catalog.cattle.io.app.test.ts   | 95 +++++++++++++++----
 1 file changed, 76 insertions(+), 19 deletions(-)

diff --git a/shell/models/__tests__/catalog.cattle.io.app.test.ts b/shell/models/__tests__/catalog.cattle.io.app.test.ts
index 61c6d74c13b..c7481f41bbe 100644
--- a/shell/models/__tests__/catalog.cattle.io.app.test.ts
+++ b/shell/models/__tests__/catalog.cattle.io.app.test.ts
@@ -10,15 +10,31 @@ const appCo = {
   home:     'https://apps.rancher.io/applications/cert-manager'
 };
 
-const certManagerFromCli = { home: 'https://github.com/jetstack/cert-manager' };
-
 const certManagerOfficial = {
   repoName: 'certManagerOfficial',
-  home:     'https://cert-manager.io'
+  home:     'https://cert-manager.io',
+  oldHome:  'https://github.com/jetstack/cert-manager' // older versions of cert-manager used to have this home url(e.g. 1.7.1)
 };
 
 // cert-manager chart from application collection OCI repo
-const matchingChart1 = {
+const appCoMatchingChart1 = {
+  name:     chartName,
+  repoName: appCo.repoName,
+  versions: [{
+    version:     latestVersion,
+    home:        appCo.home,
+    repoName:    appCo.repoName,
+    annotations: {}
+  },
+  {
+    version:     secondLatestVersion,
+    home:        appCo.home,
+    repoName:    appCo.repoName,
+    annotations: {}
+  }]
+};
+
+const appCoMatchingChart2 = {
   name:     chartName,
   repoName: appCo.repoName,
   versions: [{
@@ -26,11 +42,34 @@ const matchingChart1 = {
     home:        appCo.home,
     repoName:    appCo.repoName,
     annotations: {}
+  },
+  {
+    version:     secondLatestVersion,
+    home:        appCo.home,
+    repoName:    appCo.repoName,
+    annotations: {}
   }]
 };
 
 // cert-manager chart from its official helm repo 'https://cert-manager.io' added to Rancher UI repositories
-const matchingChart2 = {
+const certManagerOfficialMatchingChart1 = {
+  name:     chartName,
+  repoName: certManagerOfficial.repoName,
+  versions: [{
+    version:     latestVersion,
+    home:        certManagerOfficial.home,
+    repoName:    certManagerOfficial.repoName,
+    annotations: {},
+  },
+  {
+    version:     secondLatestVersion,
+    home:        certManagerOfficial.oldHome,
+    repoName:    certManagerOfficial.repoName,
+    annotations: {},
+  }]
+};
+
+const certManagerOfficialMatchingChart2 = {
   name:     chartName,
   repoName: certManagerOfficial.repoName,
   versions: [{
@@ -38,39 +77,57 @@ const matchingChart2 = {
     home:        certManagerOfficial.home,
     repoName:    certManagerOfficial.repoName,
     annotations: {},
+  },
+  {
+    version:     secondLatestVersion,
+    home:        certManagerOfficial.oldHome,
+    repoName:    certManagerOfficial.repoName,
+    annotations: {},
   }]
 };
 
-const installedChartFromCli = {
+const installedCertManagerAppCoFromRancherUI = {
   metadata: {
     name:    chartName,
-    home:    certManagerFromCli.home,
+    home:    appCo.home,
     version: secondLatestVersion
   }
 };
 
-const installedChartFromRancherUI = {
+const installedCertManagerOfficialFromCli = {
   metadata: {
     name:    chartName,
-    home:    certManagerOfficial.home,
+    home:    certManagerOfficial.oldHome,
     version: secondLatestVersion
   }
 };
 
-// // home is not set
-// const installedCustomChartFromRancherUI = {
-//   metadata: {
-//     name:    chartName,
-//     version: secondLatestVersion
-//   }
-// };
+const installedCertManagerOfficialFromRancherUI = {
+  metadata: {
+    name:    chartName,
+    home:    certManagerOfficial.oldHome,
+    version: secondLatestVersion
+  }
+};
 
 describe('class CatalogApp', () => {
   describe('upgradeAvailable', () => {
-    // TODO: more test cases
     const testCases = [
-      [installedChartFromCli, [matchingChart1, matchingChart2], APP_UPGRADE_STATUS.NO_UPGRADE],
-      [installedChartFromRancherUI, [matchingChart1, matchingChart2], APP_UPGRADE_STATUS.SINGLE_UPGRADE]
+      // when you follow Rancher Installation docs to install cert-manager through CLI
+      [installedCertManagerOfficialFromCli, [], APP_UPGRADE_STATUS.NO_UPGRADE],
+      [installedCertManagerOfficialFromCli, [appCoMatchingChart1], APP_UPGRADE_STATUS.NO_UPGRADE],
+      [installedCertManagerOfficialFromCli, [appCoMatchingChart1, appCoMatchingChart2], APP_UPGRADE_STATUS.NO_UPGRADE],
+      [installedCertManagerOfficialFromCli, [appCoMatchingChart1, appCoMatchingChart2, certManagerOfficialMatchingChart1], APP_UPGRADE_STATUS.SINGLE_UPGRADE],
+      // when you add application collection OCI repo through UI
+      [installedCertManagerAppCoFromRancherUI, [], APP_UPGRADE_STATUS.NO_UPGRADE],
+      [installedCertManagerAppCoFromRancherUI, [appCoMatchingChart1], APP_UPGRADE_STATUS.SINGLE_UPGRADE],
+      [installedCertManagerAppCoFromRancherUI, [appCoMatchingChart1, certManagerOfficialMatchingChart1], APP_UPGRADE_STATUS.SINGLE_UPGRADE],
+      [installedCertManagerAppCoFromRancherUI, [appCoMatchingChart1, appCoMatchingChart2], APP_UPGRADE_STATUS.MULTIPLE_UPGRADES],
+      // when you add cert-manager official helm repo through UI
+      [installedCertManagerOfficialFromRancherUI, [], APP_UPGRADE_STATUS.NO_UPGRADE],
+      [installedCertManagerOfficialFromRancherUI, [certManagerOfficialMatchingChart1], APP_UPGRADE_STATUS.SINGLE_UPGRADE],
+      [installedCertManagerOfficialFromRancherUI, [certManagerOfficialMatchingChart1, appCoMatchingChart1], APP_UPGRADE_STATUS.SINGLE_UPGRADE],
+      [installedCertManagerOfficialFromRancherUI, [certManagerOfficialMatchingChart1, certManagerOfficialMatchingChart2], APP_UPGRADE_STATUS.MULTIPLE_UPGRADES]
     ];
 
     it.each(testCases)('should return the correct upgrade status', (installedChart: Object, matchingCharts: any, expected: any) => {

From dfc0865a40892bd6d9eb697ecec7c3128e19f834 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Wed, 22 Jan 2025 17:29:22 -0800
Subject: [PATCH 007/140] check version compatibility when there are multiple
 matchings + refactor

---
 shell/models/catalog.cattle.io.app.js         | 83 +++++++++++++------
 .../pages/c/_cluster/apps/charts/install.vue  |  2 +-
 .../pages/c/_cluster/explorer/tools/index.vue |  2 +-
 3 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/shell/models/catalog.cattle.io.app.js b/shell/models/catalog.cattle.io.app.js
index 4ac7eb20b4e..5f239ac396b 100644
--- a/shell/models/catalog.cattle.io.app.js
+++ b/shell/models/catalog.cattle.io.app.js
@@ -22,7 +22,6 @@ export default class CatalogApp extends SteveModel {
     set(this, 'skipCRDs', false);
     set(this, 'timeout', 300);
     set(this, 'wait', true);
-    set(this, 'foundMultipleUpgradeMatches', false);
     set(this, 'upgradeAvailableVersion', '');
   }
 
@@ -49,11 +48,11 @@ export default class CatalogApp extends SteveModel {
     return null;
   }
 
-  matchingChart(includeHidden) {
+  matchingCharts(includeHidden) {
     const chart = this.spec?.chart;
 
     if ( !chart ) {
-      return;
+      return [];
     }
 
     const chartName = chart.metadata?.name;
@@ -67,7 +66,7 @@ export default class CatalogApp extends SteveModel {
     }) || [];
 
     if (matchingCharts.length === 0) {
-      return;
+      return [];
     }
 
     // Filtering matches by verifying if the current version is in the matched chart's available versions, and that the home value matches as well
@@ -76,7 +75,7 @@ export default class CatalogApp extends SteveModel {
       for (let i = 0; i < versions.length; i++) {
         const { version, home } = versions[i];
 
-        if (version === this.currentVersion && home === thisHome) {
+        if (version === this.currentVersion && (!home || !thisHome || home === thisHome)) {
           return true;
         }
       }
@@ -84,16 +83,7 @@ export default class CatalogApp extends SteveModel {
       return false;
     });
 
-    if (bestMatches.length === 0) {
-      return;
-    }
-
-    if (bestMatches.length === 1) {
-      return bestMatches[0];
-    }
-
-    // found multiple matches but couldn't choose one unique match
-    this.foundMultipleUpgradeMatches = true;
+    return bestMatches;
   }
 
   get currentVersion() {
@@ -101,7 +91,7 @@ export default class CatalogApp extends SteveModel {
   }
 
   get upgradeAvailable() {
-    // one the following statuses gets returned:
+    // one of the following statuses gets returned:
     // NOT_APPLICABLE - managed by fleet
     // NO_UPGRADE - no upgrade found
     // SINGLE_UPGRADE - a version available to upgrade to
@@ -114,18 +104,27 @@ export default class CatalogApp extends SteveModel {
       // Things managed by fleet shouldn't show upgrade available even if there might be.
       return APP_UPGRADE_STATUS.NOT_APPLICABLE;
     }
-    const chart = this.matchingChart(false);
 
-    if (this.foundMultipleUpgradeMatches) {
-      return APP_UPGRADE_STATUS.MULTIPLE_UPGRADES;
-    }
+    const charts = this.matchingCharts(false);
 
-    if ( !chart ) {
+    if (charts.length === 0) {
       return APP_UPGRADE_STATUS.NO_UPGRADE;
     }
 
-    const workerOSs = this.$rootGetters['currentCluster'].workerOSs;
+    // Handle single chart logic
+    if (charts.length === 1) {
+      return this.evaluateUpgradeForChart(charts[0]);
+    }
+
+    // Handle multiple upgrade matches
+    return this.handleMultipleUpgradeMatches(charts);
+  }
 
+  /**
+   * Evaluates upgrade status for a single chart.
+   */
+  evaluateUpgradeForChart(chart) {
+    const workerOSs = this.$rootGetters['currentCluster'].workerOSs;
     const showPreRelease = this.$rootGetters['prefs/get'](SHOW_PRE_RELEASE);
 
     let versions = chart.versions;
@@ -139,12 +138,42 @@ export default class CatalogApp extends SteveModel {
     const newestChart = versions?.[0];
     const newestVersion = newestChart?.version;
 
-    if ( !this.currentVersion || !newestVersion ) {
+    if (!this.currentVersion || !newestVersion) {
       return APP_UPGRADE_STATUS.NO_UPGRADE;
     }
 
-    if ( compare(this.currentVersion, newestVersion) < 0 ) {
-      // set the available upgrade version to be used in other places
+    if (compare(this.currentVersion, newestVersion) < 0) {
+      // Set the available upgrade version to be used in other places
+      this.upgradeAvailableVersion = cleanupVersion(newestVersion);
+
+      return APP_UPGRADE_STATUS.SINGLE_UPGRADE;
+    }
+
+    return APP_UPGRADE_STATUS.NO_UPGRADE;
+  }
+
+  /**
+   * Handles the case where multiple upgrade matches are found.
+   * @param charts - Array of matching charts
+   */
+  handleMultipleUpgradeMatches(charts) {
+    const qualifiedCharts = [];
+
+    for (const chart of charts) {
+      const status = this.evaluateUpgradeForChart(chart);
+
+      if (status === APP_UPGRADE_STATUS.SINGLE_UPGRADE) {
+        qualifiedCharts.push(chart);
+      }
+    }
+
+    if (qualifiedCharts.length > 1) {
+      return APP_UPGRADE_STATUS.MULTIPLE_UPGRADES;
+    }
+
+    if (qualifiedCharts.length === 1) {
+      const newestVersion = qualifiedCharts[0]?.versions?.[0]?.version;
+
       this.upgradeAvailableVersion = cleanupVersion(newestVersion);
 
       return APP_UPGRADE_STATUS.SINGLE_UPGRADE;
@@ -164,7 +193,7 @@ export default class CatalogApp extends SteveModel {
   get currentVersionCompatible() {
     const workerOSs = this.$rootGetters['currentCluster'].workerOSs;
 
-    const chart = this.matchingChart(false);
+    const chart = this.matchingChart(false)[0];
 
     if (!chart) {
       return true;
@@ -194,7 +223,7 @@ export default class CatalogApp extends SteveModel {
   }
 
   goToUpgrade(forceVersion, fromTools) {
-    const match = this.matchingChart(true);
+    const match = this.matchingChart(true)[0];
     const query = {
       [NAMESPACE]: this.metadata.namespace,
       [NAME]:      this.metadata.name,
diff --git a/shell/pages/c/_cluster/apps/charts/install.vue b/shell/pages/c/_cluster/apps/charts/install.vue
index c84dab2069c..7a75dc52687 100644
--- a/shell/pages/c/_cluster/apps/charts/install.vue
+++ b/shell/pages/c/_cluster/apps/charts/install.vue
@@ -502,7 +502,7 @@ export default {
     },
 
     charts() {
-      const current = this.existing?.matchingChart(true);
+      const current = this.existing?.matchingChart(true)[0];
 
       const out = this.$store.getters['catalog/charts'].filter((x) => {
         if ( x.key === current?.key || x.chartName === current?.chartName ) {
diff --git a/shell/pages/c/_cluster/explorer/tools/index.vue b/shell/pages/c/_cluster/explorer/tools/index.vue
index 0c02f6c3867..bc0568b9743 100644
--- a/shell/pages/c/_cluster/explorer/tools/index.vue
+++ b/shell/pages/c/_cluster/explorer/tools/index.vue
@@ -60,7 +60,7 @@ export default {
       const out = {};
 
       for (const app of (this.installedApps || [])) {
-        const matching = app.matchingChart();
+        const matching = app.matchingCharts()[0];
 
         if ( !matching ) {
           continue;

From 15b7001da5bb5c14b53959e881d728a70417b33d Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Thu, 23 Jan 2025 11:15:44 -0800
Subject: [PATCH 008/140] fix typo

---
 shell/models/catalog.cattle.io.app.js          | 4 ++--
 shell/pages/c/_cluster/apps/charts/install.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/models/catalog.cattle.io.app.js b/shell/models/catalog.cattle.io.app.js
index 5f239ac396b..1c50e2a3714 100644
--- a/shell/models/catalog.cattle.io.app.js
+++ b/shell/models/catalog.cattle.io.app.js
@@ -193,7 +193,7 @@ export default class CatalogApp extends SteveModel {
   get currentVersionCompatible() {
     const workerOSs = this.$rootGetters['currentCluster'].workerOSs;
 
-    const chart = this.matchingChart(false)[0];
+    const chart = this.matchingCharts(false)[0];
 
     if (!chart) {
       return true;
@@ -223,7 +223,7 @@ export default class CatalogApp extends SteveModel {
   }
 
   goToUpgrade(forceVersion, fromTools) {
-    const match = this.matchingChart(true)[0];
+    const match = this.matchingCharts(true)[0];
     const query = {
       [NAMESPACE]: this.metadata.namespace,
       [NAME]:      this.metadata.name,
diff --git a/shell/pages/c/_cluster/apps/charts/install.vue b/shell/pages/c/_cluster/apps/charts/install.vue
index 7a75dc52687..3ce408e3ab4 100644
--- a/shell/pages/c/_cluster/apps/charts/install.vue
+++ b/shell/pages/c/_cluster/apps/charts/install.vue
@@ -502,7 +502,7 @@ export default {
     },
 
     charts() {
-      const current = this.existing?.matchingChart(true)[0];
+      const current = this.existing?.matchingCharts(true)[0];
 
       const out = this.$store.getters['catalog/charts'].filter((x) => {
         if ( x.key === current?.key || x.chartName === current?.chartName ) {

From 6912d69f54fc3bafebe76f1a4ab4e0b815b3b69f Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Thu, 23 Jan 2025 11:57:06 -0800
Subject: [PATCH 009/140] refine matching logic + add documenting and comments

---
 shell/models/catalog.cattle.io.app.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/shell/models/catalog.cattle.io.app.js b/shell/models/catalog.cattle.io.app.js
index 1c50e2a3714..f046efea827 100644
--- a/shell/models/catalog.cattle.io.app.js
+++ b/shell/models/catalog.cattle.io.app.js
@@ -48,6 +48,13 @@ export default class CatalogApp extends SteveModel {
     return null;
   }
 
+  /**
+   * Finds matching charts based on the current chart's name, repository, and other attributes.
+   * The function filters out charts that do not meet specific criteria, including version and home value matches.
+   *
+   * @param includeHidden - Whether to include hidden charts in the search.
+   * @returns An array of matching chart objects that meet the specified criteria.
+  */
   matchingCharts(includeHidden) {
     const chart = this.spec?.chart;
 
@@ -72,9 +79,16 @@ export default class CatalogApp extends SteveModel {
     // Filtering matches by verifying if the current version is in the matched chart's available versions, and that the home value matches as well
     const thisHome = chart?.metadata?.home;
     const bestMatches = matchingCharts.filter(({ versions }) => {
-      for (let i = 0; i < versions.length; i++) {
+      // First checking if the latest version has the same home value
+      if (thisHome === versions[0]?.home) {
+        return true;
+      }
+
+      for (let i = 1; i < versions.length; i++) {
         const { version, home } = versions[i];
 
+        // Finding the exact version, if the version is not there, then most likely it's not a match
+        // if the exact version is found, then we can compare the home values when they exist
         if (version === this.currentVersion && (!home || !thisHome || home === thisHome)) {
           return true;
         }

From b319b4fe554cd76c25196bd5c89b9698046b7a6f Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Tue, 11 Feb 2025 15:04:24 -0800
Subject: [PATCH 010/140] rke1 deprecation banner on cluster management page

---
 shell/assets/translations/en-us.yaml          |  1 +
 shell/list/provisioning.cattle.io.cluster.vue | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index da037fa1fe5..c42a91b155c 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -1870,6 +1870,7 @@ cluster:
         =1 { {pool_name}: The provided value for {fields} was not found in the list of expected values. This can happen with clusters provisioned outside of Rancher or when options for the provider have changed. }
         other { {pool_name}: The provided values for {fields} were not found in the list of expected values. This can happen with clusters provisioned outside of Rancher or when options for the provider have changed. }
       }
+    rke1DeprecationMessage: 'Rancher Kubernetes Engine (RKE, RKE1) will reach end of life on July 31, 2025. Rancher 2.12.0 and later will no longer support provisioning or managing downstream RKE1 clusters. We recommend replatforming RKE1 clusters to RKE2 to ensure continued support and security updates. Learn more about the transition <a href="https://www.suse.com/support/kb/doc/?id=000021518" target="_blank" rel="noopener noreferrer nofollow">here</a>.'
   rkeTemplateUpgrade: Template revision {name} available for upgrade
   cloudCredentials:
     renew: Renew Cloud Credentials
diff --git a/shell/list/provisioning.cattle.io.cluster.vue b/shell/list/provisioning.cattle.io.cluster.vue
index e2f2fb0c404..03644a48dd4 100644
--- a/shell/list/provisioning.cattle.io.cluster.vue
+++ b/shell/list/provisioning.cattle.io.cluster.vue
@@ -167,6 +167,10 @@ export default {
         expiring: counts.expiring ? this.t('cluster.cloudCredentials.banners.expiring', { count: counts.expiring }) : '',
         expired:  counts.expired ? this.t('cluster.cloudCredentials.banners.expired', { count: counts.expired }) : '',
       };
+    },
+
+    showRke1DeprecationWarning() {
+      return this.rows.some((r) => r.isRke1);
     }
   },
 
@@ -179,6 +183,12 @@ export default {
 
 <template>
   <div>
+    <Banner
+      v-if="showRke1DeprecationWarning"
+      color="warning"
+      label-key="cluster.banner.rke1DeprecationMessage"
+    />
+
     <Banner
       v-if="hiddenHarvesterCount"
       color="info"

From 2f03409d5d155f0c57609e5ad80d6f4d8ca4178b Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Wed, 12 Feb 2025 10:49:06 -0800
Subject: [PATCH 011/140] minor refactor

---
 shell/list/provisioning.cattle.io.cluster.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/shell/list/provisioning.cattle.io.cluster.vue b/shell/list/provisioning.cattle.io.cluster.vue
index 03644a48dd4..8f206113d65 100644
--- a/shell/list/provisioning.cattle.io.cluster.vue
+++ b/shell/list/provisioning.cattle.io.cluster.vue
@@ -77,6 +77,7 @@ export default {
     const res = await allHash(hash);
 
     this.mgmtClusters = res.mgmtClusters;
+    this.showRke1DeprecationWarning = this.rows.some((r) => r.isRke1);
   },
 
   data() {
@@ -84,6 +85,7 @@ export default {
       resource:     CAPI.RANCHER_CLUSTER,
       schema:       this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
       mgmtClusters: [],
+      showRke1DeprecationWarning: false
     };
   },
 
@@ -167,10 +169,6 @@ export default {
         expiring: counts.expiring ? this.t('cluster.cloudCredentials.banners.expiring', { count: counts.expiring }) : '',
         expired:  counts.expired ? this.t('cluster.cloudCredentials.banners.expired', { count: counts.expired }) : '',
       };
-    },
-
-    showRke1DeprecationWarning() {
-      return this.rows.some((r) => r.isRke1);
     }
   },
 

From 32f17e66a4a622c61ba52818066f13d1930c933e Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Wed, 12 Feb 2025 10:52:53 -0800
Subject: [PATCH 012/140] lint

---
 shell/list/provisioning.cattle.io.cluster.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/list/provisioning.cattle.io.cluster.vue b/shell/list/provisioning.cattle.io.cluster.vue
index 8314f59b4f0..99fcbb0df2b 100644
--- a/shell/list/provisioning.cattle.io.cluster.vue
+++ b/shell/list/provisioning.cattle.io.cluster.vue
@@ -82,9 +82,9 @@ export default {
 
   data() {
     return {
-      resource:     CAPI.RANCHER_CLUSTER,
-      schema:       this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
-      mgmtClusters: [],
+      resource:                   CAPI.RANCHER_CLUSTER,
+      schema:                     this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
+      mgmtClusters:               [],
       showRke1DeprecationWarning: false
     };
   },

From ae608720057bbf3b544d5578c82e707661dfbe4b Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 11 Feb 2025 16:35:32 +0100
Subject: [PATCH 013/140] Fleet: add Polling Interval input field to GitRepo
 edit page

- Add UnitInput field to edit/display the pollingInterval
- Add unit tests
- Add warning banners to inform about polling interval low value risks
- Scroll page to show warning banners

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/assets/translations/en-us.yaml          |  6 ++
 shell/detail/fleet.cattle.io.gitrepo.vue      |  2 +-
 .../__tests__/fleet.cattle.io.gitrepo.test.ts | 78 +++++++++++++++++--
 shell/edit/fleet.cattle.io.gitrepo.vue        | 59 ++++++++++++++
 4 files changed, 137 insertions(+), 8 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 4640276a714..8c8a6a15a52 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2469,6 +2469,12 @@ fleet:
       keepResourcesTooltip: When enabled, resources will be kept when deleting a GitRepo or Bundle - only Helm release secrets will be deleted.
       correctDrift: Enable Self-Healing
       correctDriftTooltip: When enabled, Fleet will ensure that the cluster resources are kept in sync with the git repository. All resource changes made on the cluster will be lost.
+    syncronization:
+      label: Syncronization
+      pollingInterval:
+        label: Polling Interval
+        tooltip: Polling Interval is the time between a push to the Repository and Fleet reacting to it.
+        warning: Warning, the recommended value for Polling Interval is 15 seconds. Please consider to increase the interval value if the GitRepo has a large amount of resources, to avoid performance issues.
     add:
       steps:
         repoInfo:
diff --git a/shell/detail/fleet.cattle.io.gitrepo.vue b/shell/detail/fleet.cattle.io.gitrepo.vue
index 884f40be432..aa3cc544937 100644
--- a/shell/detail/fleet.cattle.io.gitrepo.vue
+++ b/shell/detail/fleet.cattle.io.gitrepo.vue
@@ -40,7 +40,7 @@ export default {
   },
   computed: {
     gitRepoHasClusters() {
-      return this.value.status.desiredReadyClusters;
+      return this.value.status?.desiredReadyClusters;
     },
     clusterSchema() {
       return this.$store.getters['management/schemaFor'](FLEET.CLUSTER);
diff --git a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
index a035d41d1ce..216581d657f 100644
--- a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
+++ b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
@@ -1,6 +1,16 @@
 import { mount } from '@vue/test-utils';
+import { _EDIT } from '@shell/config/query-params';
 import GitRepo from '@shell/edit/fleet.cattle.io.gitrepo.vue';
 
+const values = {
+  metadata: { namespace: 'test' },
+  spec:     {
+    template:     {},
+    correctDrift: { enabled: false },
+  },
+  targetInfo: { mode: 'all' },
+};
+
 describe('view: fleet.cattle.io.gitrepo should', () => {
   const mockStore = {
     dispatch: jest.fn(),
@@ -25,15 +35,12 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
       }
     },
   };
-  const values = {
-    metadata: { namespace: 'test' }, spec: { template: {}, correctDrift: { enabled: false } }, targetInfo: { mode: 'all' },
-  };
   const wrapper = mount(GitRepo, {
-    props:  { value: values },
+    props:  { value: values, mode: _EDIT },
     global: { mocks }
   });
 
-  it('should have self-healing checkbox and tooltip', () => {
+  it('have self-healing checkbox and tooltip', () => {
     const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"]');
     const tooltip = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"]');
 
@@ -42,7 +49,7 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
     expect(correctDriftCheckbox.attributes().value).toBeFalsy();
   });
 
-  it('should have keep-resources checkbox and tooltip', () => {
+  it('have keep-resources checkbox and tooltip', () => {
     const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-keepResources-checkbox"]');
     const tooltip = wrapper.find('[data-testid="GitRepo-keepResources-checkbox"]');
 
@@ -51,7 +58,7 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
     expect(correctDriftCheckbox.attributes().value).toBeFalsy();
   });
 
-  it('should enable drift if self-healing is checked', async() => {
+  it('enable drift if self-healing is checked', async() => {
     const correctDriftCheckbox = wrapper.findComponent('[data-testid="GitRepo-correctDrift-checkbox"]');
     const correctDriftContainer = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"] .checkbox-container');
 
@@ -63,4 +70,61 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
     expect(correctDriftCheckbox.emitted('update:value')![0][0]).toBe(true);
     expect(correctDriftCheckbox.props().value).toBeTruthy();
   });
+
+  it.each([
+    ['null', 'default 15 seconds', null, '15'],
+    ['0', 'default 15 seconds', 0, '15'],
+    ['1', 'min 15 seconds', 1, '1'],
+    ['15', 'custom 15 seconds', 15, '15'],
+    ['20', 'custom 20 seconds', 20, '20'],
+  ])('show Polling Interval input with source: %p, value: %p', async(
+    source,
+    actual,
+    pollingInterval,
+    unitValue,
+  ) => {
+    const wrapper = mount(GitRepo, {
+      props: {
+        value: {
+          ...values,
+          spec: { pollingInterval }
+        },
+        mode: _EDIT
+      },
+      global: { mocks },
+    });
+
+    const pollingIntervalInput = wrapper.find('[data-testid="GitRepo-pollingInterval-input"]').element as any;
+
+    expect(pollingIntervalInput).toBeDefined();
+    expect(pollingIntervalInput.value).toBe(unitValue);
+  });
+
+  it.each([
+    ['hide', 'source: null, value: equal to 15', null, false],
+    ['hide', 'source: 0, value: equal to 15', 0, false],
+    ['hide', 'source: 15, value: equal to 15', 15, false],
+    ['hide', 'source: 16, value: higher than 15', 16, false],
+    ['show', 'source: 1, value: lower than 15', 1, true],
+  ])('%p Polling Interval warning if %p', async(
+    status,
+    condition,
+    pollingInterval,
+    visible,
+  ) => {
+    const wrapper = mount(GitRepo, {
+      props: {
+        value: {
+          ...values,
+          spec: { pollingInterval }
+        },
+        mode: _EDIT
+      },
+      global: { mocks },
+    });
+
+    const pollingIntervalWarning = wrapper.find('[data-testid="GitRepo-pollingInterval-warning"]');
+
+    expect(pollingIntervalWarning.exists()).toBe(visible);
+  });
 });
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 71a749446d0..9c98f853b2c 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -26,6 +26,9 @@ import { SECRET_TYPES } from '@shell/config/secret';
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 import FormValidation from '@shell/mixins/form-validation';
+import UnitInput from '@shell/components/form/UnitInput';
+
+const DEFAULT_POLLING_INTERVAL = 15;
 
 const _VERIFY = 'verify';
 const _SKIP = 'skip';
@@ -51,6 +54,7 @@ export default {
     NameNsDescription,
     YamlEditor,
     SelectOrCreateAuthSecret,
+    UnitInput,
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -92,6 +96,7 @@ export default {
   },
 
   data() {
+    const pollingInterval = this.value.spec.pollingInterval || DEFAULT_POLLING_INTERVAL;
     const targetInfo = this.value.targetInfo;
     const targetCluster = targetInfo.cluster;
     const targetClusterGroup = targetInfo.clusterGroup;
@@ -144,6 +149,7 @@ export default {
       correctDriftEnabled:     false,
       targetAdvancedErrors:    null,
       matchingClusters:        null,
+      pollingInterval,
       ref,
       refValue,
       targetMode,
@@ -265,6 +271,16 @@ export default {
       ];
     },
 
+    showPollingIntervalWarning() {
+      const isVisible = !this.isView && this.pollingInterval < DEFAULT_POLLING_INTERVAL;
+
+      if (isVisible) {
+        this.scrollToBottom();
+      }
+
+      return isVisible;
+    },
+
     stepOneRequires() {
       return !!this.value.metadata.name && !!this.refValue && !!this.fvFormIsValid;
     },
@@ -512,6 +528,26 @@ export default {
       }
     },
 
+    updatePollingInterval(value) {
+      if (!value || value === DEFAULT_POLLING_INTERVAL) {
+        delete this.value.spec.pollingInterval;
+
+        this.pollingInterval = DEFAULT_POLLING_INTERVAL;
+      } else {
+        this.value.spec.pollingInterval = value.toString();
+      }
+    },
+
+    scrollToBottom() {
+      this.$nextTick(() => {
+        const scrollable = document.getElementsByTagName('main')[0];
+
+        if (scrollable) {
+          scrollable.scrollTop = scrollable.scrollHeight;
+        }
+      });
+    },
+
     onSave() {
       this.value.spec['correctDrift'] = { enabled: this.correctDriftEnabled };
 
@@ -694,6 +730,29 @@ export default {
         :add-label="t('fleet.gitRepo.paths.addLabel')"
         :protip="t('fleet.gitRepo.paths.empty')"
       />
+
+      <div class="spacer" />
+      <h2 v-t="'fleet.gitRepo.syncronization.label'" />
+      <div class="row">
+        <div class="col span-6">
+          <Banner
+            v-if="showPollingIntervalWarning"
+            color="warning"
+            label-key="fleet.gitRepo.syncronization.pollingInterval.warning"
+            data-testid="GitRepo-pollingInterval-warning"
+          />
+          <UnitInput
+            v-model:value="pollingInterval"
+            data-testid="GitRepo-pollingInterval-input"
+            min="1"
+            :suffix="pollingInterval == 1 ? 'Second' : 'Seconds'"
+            :label="t('fleet.gitRepo.syncronization.pollingInterval.label')"
+            :mode="mode"
+            tooltip-key="fleet.gitRepo.syncronization.pollingInterval.tooltip"
+            @update:value="updatePollingInterval"
+          />
+        </div>
+      </div>
     </template>
     <template #stepTargetInfo>
       <h2 v-t="isLocal ? 'fleet.gitRepo.target.labelLocal' : 'fleet.gitRepo.target.label'" />

From 0d9f5114db72ec601d650df0542066e499db038c Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Wed, 12 Feb 2025 09:55:14 +0100
Subject: [PATCH 014/140] Fleet: rename GitRepo Syncronization field -> Polling

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/assets/translations/en-us.yaml   | 4 ++--
 shell/edit/fleet.cattle.io.gitrepo.vue | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 8c8a6a15a52..8c901732f48 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2469,8 +2469,8 @@ fleet:
       keepResourcesTooltip: When enabled, resources will be kept when deleting a GitRepo or Bundle - only Helm release secrets will be deleted.
       correctDrift: Enable Self-Healing
       correctDriftTooltip: When enabled, Fleet will ensure that the cluster resources are kept in sync with the git repository. All resource changes made on the cluster will be lost.
-    syncronization:
-      label: Syncronization
+    polling:
+      label: Polling
       pollingInterval:
         label: Polling Interval
         tooltip: Polling Interval is the time between a push to the Repository and Fleet reacting to it.
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 9c98f853b2c..1df95f5b37c 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -732,13 +732,13 @@ export default {
       />
 
       <div class="spacer" />
-      <h2 v-t="'fleet.gitRepo.syncronization.label'" />
+      <h2 v-t="'fleet.gitRepo.polling.label'" />
       <div class="row">
         <div class="col span-6">
           <Banner
             v-if="showPollingIntervalWarning"
             color="warning"
-            label-key="fleet.gitRepo.syncronization.pollingInterval.warning"
+            label-key="fleet.gitRepo.polling.pollingInterval.warning"
             data-testid="GitRepo-pollingInterval-warning"
           />
           <UnitInput
@@ -746,9 +746,9 @@ export default {
             data-testid="GitRepo-pollingInterval-input"
             min="1"
             :suffix="pollingInterval == 1 ? 'Second' : 'Seconds'"
-            :label="t('fleet.gitRepo.syncronization.pollingInterval.label')"
+            :label="t('fleet.gitRepo.polling.pollingInterval.label')"
             :mode="mode"
-            tooltip-key="fleet.gitRepo.syncronization.pollingInterval.tooltip"
+            tooltip-key="fleet.gitRepo.polling.pollingInterval.tooltip"
             @update:value="updatePollingInterval"
           />
         </div>

From ba799a5cfbe8dc16a45aba7b1f5624328417fc90 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Wed, 12 Feb 2025 10:51:01 +0100
Subject: [PATCH 015/140] Fleet: set default pollingInterval to 60 seconds and
 minimu to 15 seconds

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/assets/translations/en-us.yaml            |  2 +-
 .../__tests__/fleet.cattle.io.gitrepo.test.ts   | 15 ++++++++-------
 shell/edit/fleet.cattle.io.gitrepo.vue          | 17 ++++++++++++-----
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 8c901732f48..c73f8213c2e 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2474,7 +2474,7 @@ fleet:
       pollingInterval:
         label: Polling Interval
         tooltip: Polling Interval is the time between a push to the Repository and Fleet reacting to it.
-        warning: Warning, the recommended value for Polling Interval is 15 seconds. Please consider to increase the interval value if the GitRepo has a large amount of resources, to avoid performance issues.
+        warning: Warning, the recommended minimum value for Polling Interval is 15 seconds. Please consider to increase the interval value if the GitRepo has a large amount of resources, to avoid performance issues.
     add:
       steps:
         repoInfo:
diff --git a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
index 216581d657f..ac1e8ae66d3 100644
--- a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
+++ b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
@@ -72,11 +72,11 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
   });
 
   it.each([
-    ['null', 'default 15 seconds', null, '15'],
-    ['0', 'default 15 seconds', 0, '15'],
-    ['1', 'min 15 seconds', 1, '1'],
-    ['15', 'custom 15 seconds', 15, '15'],
-    ['20', 'custom 20 seconds', 20, '20'],
+    ['null', 'default 60 seconds', null, '60'],
+    ['0', 'default 60 seconds', 0, '60'],
+    ['1', 'custom 1 second', 1, '1'],
+    ['60', 'custom 60 seconds', 60, '60'],
+    ['20', 'custom 15 seconds', 15, '15'],
   ])('show Polling Interval input with source: %p, value: %p', async(
     source,
     actual,
@@ -101,9 +101,10 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
   });
 
   it.each([
-    ['hide', 'source: null, value: equal to 15', null, false],
-    ['hide', 'source: 0, value: equal to 15', 0, false],
+    ['hide', 'source: null, value: equal to 60', null, false],
+    ['hide', 'source: 0, value: equal to 60', 0, false],
     ['hide', 'source: 15, value: equal to 15', 15, false],
+    ['hide', 'source: 60, value: equal to 60', 60, false],
     ['hide', 'source: 16, value: higher than 15', 16, false],
     ['show', 'source: 1, value: lower than 15', 1, true],
   ])('%p Polling Interval warning if %p', async(
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 1df95f5b37c..6cbf4ec6dcb 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -28,7 +28,8 @@ import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 import FormValidation from '@shell/mixins/form-validation';
 import UnitInput from '@shell/components/form/UnitInput';
 
-const DEFAULT_POLLING_INTERVAL = 15;
+const MINIMUM_POLLING_INTERVAL = 15;
+const DEFAULT_POLLING_INTERVAL = 60;
 
 const _VERIFY = 'verify';
 const _SKIP = 'skip';
@@ -272,7 +273,7 @@ export default {
     },
 
     showPollingIntervalWarning() {
-      const isVisible = !this.isView && this.pollingInterval < DEFAULT_POLLING_INTERVAL;
+      const isVisible = !this.isView && this.pollingInterval < MINIMUM_POLLING_INTERVAL;
 
       if (isVisible) {
         this.scrollToBottom();
@@ -529,12 +530,18 @@ export default {
     },
 
     updatePollingInterval(value) {
-      if (!value || value === DEFAULT_POLLING_INTERVAL) {
-        delete this.value.spec.pollingInterval;
+      let interval = (value || DEFAULT_POLLING_INTERVAL).toString();
 
+      if (!value) {
         this.pollingInterval = DEFAULT_POLLING_INTERVAL;
+      }
+
+      if (value === MINIMUM_POLLING_INTERVAL) {
+        delete this.value.spec.pollingInterval;
+
+        interval = MINIMUM_POLLING_INTERVAL.toString();
       } else {
-        this.value.spec.pollingInterval = value.toString();
+        this.value.spec.pollingInterval = interval;
       }
     },
 

From 1b5675f341f92d0438e64927432428a85f185ee0 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Wed, 12 Feb 2025 16:05:03 +0100
Subject: [PATCH 016/140] Fleet: Add Enable Polling checkbox

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/assets/translations/en-us.yaml          |  1 +
 .../__tests__/fleet.cattle.io.gitrepo.test.ts | 32 ++++++++++++++++++
 shell/edit/fleet.cattle.io.gitrepo.vue        | 33 +++++++++++++++++--
 3 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index c73f8213c2e..554355329f2 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2471,6 +2471,7 @@ fleet:
       correctDriftTooltip: When enabled, Fleet will ensure that the cluster resources are kept in sync with the git repository. All resource changes made on the cluster will be lost.
     polling:
       label: Polling
+      enable: Enable Polling
       pollingInterval:
         label: Polling Interval
         tooltip: Polling Interval is the time between a push to the Repository and Fleet reacting to it.
diff --git a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
index ac1e8ae66d3..2060eb00b35 100644
--- a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
+++ b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
@@ -71,6 +71,38 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
     expect(correctDriftCheckbox.props().value).toBeTruthy();
   });
 
+  it.each([
+    ['show Polling Interval', 'enabled', undefined, true],
+    ['show Polling Interval', 'enabled', false, true],
+    ['hide Polling Interval', 'disabled', true, false],
+  ])('show Enable Polling checkbox and %p if %p, with spec.disablePolling: %p', (
+    showPollingIntervalMessage,
+    enabledMessage,
+    disablePolling,
+    enabled
+  ) => {
+    const wrapper = mount(GitRepo, {
+      props: {
+        value: {
+          ...values,
+          spec: {
+            disablePolling,
+            pollingInterval: 60
+          }
+        },
+        mode: _EDIT
+      },
+      global: { mocks },
+    });
+
+    const pollingCheckbox = wrapper.findComponent('[data-testid="GitRepo-enablePolling-checkbox"]') as any;
+    const pollingIntervalInput = wrapper.find('[data-testid="GitRepo-pollingInterval-input"]');
+
+    expect(pollingCheckbox.exists()).toBeTruthy();
+    expect(pollingCheckbox.vm.value).toBe(enabled);
+    expect(pollingIntervalInput.exists()).toBe(enabled);
+  });
+
   it.each([
     ['null', 'default 60 seconds', null, '60'],
     ['0', 'default 60 seconds', 0, '60'],
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 6cbf4ec6dcb..e2f5dd225d5 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -97,6 +97,7 @@ export default {
   },
 
   data() {
+    const isPollingEnabled = !this.value.spec.disablePolling;
     const pollingInterval = this.value.spec.pollingInterval || DEFAULT_POLLING_INTERVAL;
     const targetInfo = this.value.targetInfo;
     const targetCluster = targetInfo.cluster;
@@ -150,6 +151,7 @@ export default {
       correctDriftEnabled:     false,
       targetAdvancedErrors:    null,
       matchingClusters:        null,
+      isPollingEnabled,
       pollingInterval,
       ref,
       refValue,
@@ -529,6 +531,14 @@ export default {
       }
     },
 
+    enablePolling(value) {
+      if (value) {
+        delete this.value.spec.disablePolling;
+      } else {
+        this.value.spec.disablePolling = true;
+      }
+    },
+
     updatePollingInterval(value) {
       let interval = (value || DEFAULT_POLLING_INTERVAL).toString();
 
@@ -740,8 +750,22 @@ export default {
 
       <div class="spacer" />
       <h2 v-t="'fleet.gitRepo.polling.label'" />
-      <div class="row">
+      <div class="row polling">
         <div class="col span-6">
+          <Checkbox
+            v-model:value="isPollingEnabled"
+            data-testid="GitRepo-enablePolling-checkbox"
+            class="check"
+            type="checkbox"
+            label-key="fleet.gitRepo.polling.enable"
+            :mode="mode"
+            @update:value="enablePolling"
+          />
+        </div>
+        <div
+          v-if="isPollingEnabled"
+          class="col span-6"
+        >
           <Banner
             v-if="showPollingIntervalWarning"
             color="warning"
@@ -845,6 +869,11 @@ export default {
   .resource-handling {
     display: flex;
     flex-direction: column;
-    gap: 5px
+    gap: 5px;
+  }
+  .polling {
+    display: flex;
+    flex-direction: column;
+    gap: 5px;
   }
 </style>

From 6aed4b6dd4d4acf0591c00baf91a2abceecece7d Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 13 Feb 2025 12:10:24 +0100
Subject: [PATCH 017/140] Fleet: fix default pollingInterval in edit mode

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 .../__tests__/fleet.cattle.io.gitrepo.test.ts | 23 +++++++++++--------
 shell/edit/fleet.cattle.io.gitrepo.vue        | 14 +++++++++--
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
index 2060eb00b35..f5eff47274a 100644
--- a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
+++ b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import { _EDIT } from '@shell/config/query-params';
+import { _CREATE, _EDIT } from '@shell/config/query-params';
 import GitRepo from '@shell/edit/fleet.cattle.io.gitrepo.vue';
 
 const values = {
@@ -11,7 +11,10 @@ const values = {
   targetInfo: { mode: 'all' },
 };
 
-describe('view: fleet.cattle.io.gitrepo should', () => {
+describe.each([
+  _CREATE,
+  _EDIT
+])('view: fleet.cattle.io.gitrepo should, mode: %p', (mode) => {
   const mockStore = {
     dispatch: jest.fn(),
     getters:  {
@@ -36,7 +39,7 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
     },
   };
   const wrapper = mount(GitRepo, {
-    props:  { value: values, mode: _EDIT },
+    props:  { value: values, mode },
     global: { mocks }
   });
 
@@ -90,7 +93,7 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
             pollingInterval: 60
           }
         },
-        mode: _EDIT
+        realMode: mode
       },
       global: { mocks },
     });
@@ -103,12 +106,14 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
     expect(pollingIntervalInput.exists()).toBe(enabled);
   });
 
+  const defaultPollingInterval = mode === _CREATE ? '60' : '15';
+
   it.each([
-    ['null', 'default 60 seconds', null, '60'],
-    ['0', 'default 60 seconds', 0, '60'],
+    ['null', `default ${ defaultPollingInterval } seconds`, null, defaultPollingInterval],
+    ['0', `default ${ defaultPollingInterval } seconds`, 0, defaultPollingInterval],
     ['1', 'custom 1 second', 1, '1'],
     ['60', 'custom 60 seconds', 60, '60'],
-    ['20', 'custom 15 seconds', 15, '15'],
+    ['15', 'custom 15 seconds', 15, '15'],
   ])('show Polling Interval input with source: %p, value: %p', async(
     source,
     actual,
@@ -121,7 +126,7 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
           ...values,
           spec: { pollingInterval }
         },
-        mode: _EDIT
+        realMode: mode
       },
       global: { mocks },
     });
@@ -151,7 +156,7 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
           ...values,
           spec: { pollingInterval }
         },
-        mode: _EDIT
+        realMode: mode
       },
       global: { mocks },
     });
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index e2f5dd225d5..cd9a33b5fc6 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -19,7 +19,7 @@ import NameNsDescription from '@shell/components/form/NameNsDescription';
 import YamlEditor from '@shell/components/YamlEditor';
 import { base64Decode, base64Encode } from '@shell/utils/crypto';
 import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthSecret';
-import { _CREATE } from '@shell/config/query-params';
+import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 import { isHarvesterCluster } from '@shell/utils/cluster';
 import { CAPI, CATALOG, FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
 import { SECRET_TYPES } from '@shell/config/secret';
@@ -98,7 +98,17 @@ export default {
 
   data() {
     const isPollingEnabled = !this.value.spec.disablePolling;
-    const pollingInterval = this.value.spec.pollingInterval || DEFAULT_POLLING_INTERVAL;
+
+    let pollingInterval = this.value.spec.pollingInterval;
+
+    if (!pollingInterval) {
+      if (this.realMode === _CREATE) {
+        pollingInterval = DEFAULT_POLLING_INTERVAL;
+      } else if (this.realMode === _EDIT || this.realMode === _VIEW) {
+        pollingInterval = MINIMUM_POLLING_INTERVAL;
+      }
+    }
+
     const targetInfo = this.value.targetInfo;
     const targetCluster = targetInfo.cluster;
     const targetClusterGroup = targetInfo.clusterGroup;

From 7eebb19649d80dc46add77c3c7248fb23bfa9362 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 13 Feb 2025 13:23:06 +0100
Subject: [PATCH 018/140] Fleet: Add Webhook is configured warning

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/assets/translations/en-us.yaml          |  3 +-
 .../__tests__/fleet.cattle.io.gitrepo.test.ts | 61 ++++++++++++++-----
 shell/edit/fleet.cattle.io.gitrepo.vue        | 53 +++++++++-------
 3 files changed, 81 insertions(+), 36 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 554355329f2..338250480dd 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2475,7 +2475,8 @@ fleet:
       pollingInterval:
         label: Polling Interval
         tooltip: Polling Interval is the time between a push to the Repository and Fleet reacting to it.
-        warning: Warning, the recommended minimum value for Polling Interval is 15 seconds. Please consider to increase the interval value if the GitRepo has a large amount of resources, to avoid performance issues.
+        webhookWarning: Warning, a webhhok is configured in Rancher to reconcile Git updates and GitRepo resources. The Polling Interval will be automatically adjusted to 1 hour.
+        minimumValuewarning: Warning, the recommended minimum value for Polling Interval is 15 seconds. Please consider to increase the interval value if the GitRepo has a large amount of resources, to avoid performance issues.
     add:
       steps:
         repoInfo:
diff --git a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
index f5eff47274a..601111b73d2 100644
--- a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
+++ b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
@@ -14,7 +14,7 @@ const values = {
 describe.each([
   _CREATE,
   _EDIT
-])('view: fleet.cattle.io.gitrepo should, mode: %p', (mode) => {
+])('view: fleet.cattle.io.gitrepo, mode: %p - should', (mode) => {
   const mockStore = {
     dispatch: jest.fn(),
     getters:  {
@@ -75,12 +75,12 @@ describe.each([
   });
 
   it.each([
-    ['show Polling Interval', 'enabled', undefined, true],
-    ['show Polling Interval', 'enabled', false, true],
-    ['hide Polling Interval', 'disabled', true, false],
+    ['show Polling Interval and warnings', 'enabled', undefined, true],
+    ['show Polling Interval and warnings', 'enabled', false, true],
+    ['hide Polling Interval and warnings', 'disabled', true, false],
   ])('show Enable Polling checkbox and %p if %p, with spec.disablePolling: %p', (
-    showPollingIntervalMessage,
-    enabledMessage,
+    descr1,
+    descr2,
     disablePolling,
     enabled
   ) => {
@@ -90,8 +90,9 @@ describe.each([
           ...values,
           spec: {
             disablePolling,
-            pollingInterval: 60
-          }
+            pollingInterval: 10
+          },
+          status: { webhookCommit: 'sha' },
         },
         realMode: mode
       },
@@ -100,7 +101,11 @@ describe.each([
 
     const pollingCheckbox = wrapper.findComponent('[data-testid="GitRepo-enablePolling-checkbox"]') as any;
     const pollingIntervalInput = wrapper.find('[data-testid="GitRepo-pollingInterval-input"]');
+    const pollingIntervalMinimumValueWarning = wrapper.find('[data-testid="GitRepo-pollingInterval-minimumValueWarning"]');
+    const pollingIntervalWebhookWarning = wrapper.find('[data-testid="GitRepo-pollingInterval-webhookWarning"]');
 
+    expect(pollingIntervalMinimumValueWarning.exists()).toBe(enabled);
+    expect(pollingIntervalWebhookWarning.exists()).toBe(enabled);
     expect(pollingCheckbox.exists()).toBeTruthy();
     expect(pollingCheckbox.vm.value).toBe(enabled);
     expect(pollingIntervalInput.exists()).toBe(enabled);
@@ -115,8 +120,8 @@ describe.each([
     ['60', 'custom 60 seconds', 60, '60'],
     ['15', 'custom 15 seconds', 15, '15'],
   ])('show Polling Interval input with source: %p, value: %p', async(
-    source,
-    actual,
+    descr1,
+    descr2,
     pollingInterval,
     unitValue,
   ) => {
@@ -145,8 +150,8 @@ describe.each([
     ['hide', 'source: 16, value: higher than 15', 16, false],
     ['show', 'source: 1, value: lower than 15', 1, true],
   ])('%p Polling Interval warning if %p', async(
-    status,
-    condition,
+    descr1,
+    descr2,
     pollingInterval,
     visible,
   ) => {
@@ -161,8 +166,36 @@ describe.each([
       global: { mocks },
     });
 
-    const pollingIntervalWarning = wrapper.find('[data-testid="GitRepo-pollingInterval-warning"]');
+    const pollingIntervalMinimumValueWarning = wrapper.find('[data-testid="GitRepo-pollingInterval-minimumValueWarning"]');
 
-    expect(pollingIntervalWarning.exists()).toBe(visible);
+    expect(pollingIntervalMinimumValueWarning.exists()).toBe(visible);
+  });
+
+  it.each([
+    ['hide', 'disabled', null, false],
+    ['hide', 'disabled', false, false],
+    ['hide', 'disabled', '', false],
+    ['show', 'enabled', 'sha', true],
+  ])('%p Webhook configured warning if webhook is %p', (
+    descr1,
+    descr2,
+    webhookCommit,
+    visible
+  ) => {
+    const wrapper = mount(GitRepo, {
+      props: {
+        value: {
+          ...values,
+          spec:   { pollingInterval: 60 },
+          status: { webhookCommit },
+        },
+        realMode: mode
+      },
+      global: { mocks },
+    });
+
+    const pollingIntervalWebhookWarning = wrapper.find('[data-testid="GitRepo-pollingInterval-webhookWarning"]');
+
+    expect(pollingIntervalWebhookWarning.exists()).toBe(visible);
   });
 });
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index cd9a33b5fc6..f41558d685a 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -204,6 +204,10 @@ export default {
       return !(this.value?.spec?.repo || '').startsWith('http://');
     },
 
+    isWebhookConfigured() {
+      return !!this.value.status?.webhookCommit;
+    },
+
     targetOptions() {
       const out = [
         {
@@ -772,27 +776,34 @@ export default {
             @update:value="enablePolling"
           />
         </div>
-        <div
-          v-if="isPollingEnabled"
-          class="col span-6"
-        >
-          <Banner
-            v-if="showPollingIntervalWarning"
-            color="warning"
-            label-key="fleet.gitRepo.polling.pollingInterval.warning"
-            data-testid="GitRepo-pollingInterval-warning"
-          />
-          <UnitInput
-            v-model:value="pollingInterval"
-            data-testid="GitRepo-pollingInterval-input"
-            min="1"
-            :suffix="pollingInterval == 1 ? 'Second' : 'Seconds'"
-            :label="t('fleet.gitRepo.polling.pollingInterval.label')"
-            :mode="mode"
-            tooltip-key="fleet.gitRepo.polling.pollingInterval.tooltip"
-            @update:value="updatePollingInterval"
-          />
-        </div>
+        <template v-if="isPollingEnabled">
+          <div class="col">
+            <Banner
+              v-if="showPollingIntervalWarning"
+              color="warning"
+              label-key="fleet.gitRepo.polling.pollingInterval.minimumValuewarning"
+              data-testid="GitRepo-pollingInterval-minimumValueWarning"
+            />
+            <Banner
+              v-if="isWebhookConfigured"
+              color="warning"
+              label-key="fleet.gitRepo.polling.pollingInterval.webhookWarning"
+              data-testid="GitRepo-pollingInterval-webhookWarning"
+            />
+          </div>
+          <div class="col span-6">
+            <UnitInput
+              v-model:value="pollingInterval"
+              data-testid="GitRepo-pollingInterval-input"
+              min="1"
+              :suffix="pollingInterval == 1 ? 'Second' : 'Seconds'"
+              :label="t('fleet.gitRepo.polling.pollingInterval.label')"
+              :mode="mode"
+              tooltip-key="fleet.gitRepo.polling.pollingInterval.tooltip"
+              @update:value="updatePollingInterval"
+            />
+          </div>
+        </template>
       </div>
     </template>
     <template #stepTargetInfo>

From 98e5c50b94439dbae5e61a15b29d57d5f86d8ff6 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 13 Feb 2025 17:01:39 +0100
Subject: [PATCH 019/140] Fleet: Add Enable/Disable Polling actions

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/edit/fleet.cattle.io.gitrepo.vue  |  7 ++++---
 shell/models/fleet.cattle.io.gitrepo.js | 28 ++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index f41558d685a..ae517fda37c 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -97,8 +97,6 @@ export default {
   },
 
   data() {
-    const isPollingEnabled = !this.value.spec.disablePolling;
-
     let pollingInterval = this.value.spec.pollingInterval;
 
     if (!pollingInterval) {
@@ -161,7 +159,6 @@ export default {
       correctDriftEnabled:     false,
       targetAdvancedErrors:    null,
       matchingClusters:        null,
-      isPollingEnabled,
       pollingInterval,
       ref,
       refValue,
@@ -204,6 +201,10 @@ export default {
       return !(this.value?.spec?.repo || '').startsWith('http://');
     },
 
+    isPollingEnabled() {
+      return !this.value.spec.disablePolling;
+    },
+
     isWebhookConfigured() {
       return !!this.value.status?.webhookCommit;
     },
diff --git a/shell/models/fleet.cattle.io.gitrepo.js b/shell/models/fleet.cattle.io.gitrepo.js
index 484b47293e4..7444888c018 100644
--- a/shell/models/fleet.cattle.io.gitrepo.js
+++ b/shell/models/fleet.cattle.io.gitrepo.js
@@ -83,6 +83,22 @@ export default class GitRepo extends SteveModel {
     });
 
     insertAt(out, 2, {
+      action:   'enablePolling',
+      label:    'Enable Polling',
+      icon:     'icon icon-gear',
+      bulkable: true,
+      enabled:  !!this.links.update && !!this.spec?.disablePolling
+    });
+
+    insertAt(out, 3, {
+      action:   'disablePolling',
+      label:    'Disable Polling',
+      icon:     'icon icon-gear',
+      bulkable: true,
+      enabled:  !!this.links.update && !this.spec?.disablePolling
+    });
+
+    insertAt(out, 4, {
       action:   'forceUpdate',
       label:    'Force Update',
       icon:     'icon icon-refresh',
@@ -90,7 +106,7 @@ export default class GitRepo extends SteveModel {
       enabled:  !!this.links.update
     });
 
-    insertAt(out, 3, { divider: true });
+    insertAt(out, 5, { divider: true });
 
     return out;
   }
@@ -105,6 +121,16 @@ export default class GitRepo extends SteveModel {
     this.save();
   }
 
+  enablePolling() {
+    this.spec.disablePolling = false;
+    this.save();
+  }
+
+  disablePolling() {
+    this.spec.disablePolling = true;
+    this.save();
+  }
+
   forceUpdate() {
     const now = this.spec.forceSyncGeneration || 1;
 

From f101fea03619c8ef68c5826c995f03b6d529ef3a Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Wed, 19 Feb 2025 15:07:10 -0800
Subject: [PATCH 020/140] update message

---
 shell/assets/translations/en-us.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 7085c991b93..90a92cad7a3 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -923,7 +923,7 @@ catalog:
         busy: The related resources will appear when {app} is fully installed.
       values: Values YAML
     upgrade:
-      uncertainUpgradeWarningTooltip: Unable to identify source chart and repository for this application in order to determine if an upgrade is available
+      uncertainUpgradeWarningTooltip: Unable to determine if an upgrade is available (can not identify the repository and chart used to deploy this application)
   chart:
     registry:
       label: Container Registry

From c70353dc7a7029540ec7fbc130c8d2b5d414cdd4 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Wed, 19 Feb 2025 23:28:06 -0800
Subject: [PATCH 021/140] show warning in details page and when switching the
 rke1 toggle

---
 shell/assets/translations/en-us.yaml                | 2 +-
 shell/detail/provisioning.cattle.io.cluster.vue     | 6 ++++++
 shell/edit/provisioning.cattle.io.cluster/index.vue | 9 ++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 061b29a59e2..4029d2163bf 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -1874,7 +1874,7 @@ cluster:
         =1 { {pool_name}: The provided value for {fields} was not found in the list of expected values. This can happen with clusters provisioned outside of Rancher or when options for the provider have changed. }
         other { {pool_name}: The provided values for {fields} were not found in the list of expected values. This can happen with clusters provisioned outside of Rancher or when options for the provider have changed. }
       }
-    rke1DeprecationMessage: 'Rancher Kubernetes Engine (RKE, RKE1) will reach end of life on July 31, 2025. Rancher 2.12.0 and later will no longer support provisioning or managing downstream RKE1 clusters. We recommend replatforming RKE1 clusters to RKE2 to ensure continued support and security updates. Learn more about the transition <a href="https://www.suse.com/support/kb/doc/?id=000021518" target="_blank" rel="noopener noreferrer nofollow">here</a>.'
+    rke1DeprecationMessage: 'Rancher Kubernetes Engine (RKE / RKE1) will reach end of life on July 31, 2025. Rancher 2.12.0 and later will no longer support provisioning or managing downstream RKE1 clusters. We recommend replatforming RKE1 clusters to RKE2 to ensure continued support and security updates. Learn more about the transition <a href="https://www.suse.com/support/kb/doc/?id=000021518" target="_blank" rel="noopener noreferrer nofollow">here</a>.'
   rkeTemplateUpgrade: Template revision {name} available for upgrade
   cloudCredentials:
     renew: Renew Cloud Credentials
diff --git a/shell/detail/provisioning.cattle.io.cluster.vue b/shell/detail/provisioning.cattle.io.cluster.vue
index 563670f74dd..8032824bc33 100644
--- a/shell/detail/provisioning.cattle.io.cluster.vue
+++ b/shell/detail/provisioning.cattle.io.cluster.vue
@@ -745,6 +745,12 @@ export default {
       color="error"
       :label="$fetchState.error"
     />
+
+    <Banner
+      v-if="value.isRke1"
+      color="warning"
+      label-key="cluster.banner.rke1DeprecationMessage"
+    />
     <ResourceTabs
       :value="value"
       :default-tab="defaultTab"
diff --git a/shell/edit/provisioning.cattle.io.cluster/index.vue b/shell/edit/provisioning.cattle.io.cluster/index.vue
index 3900b4926ea..e3ae9c40c05 100644
--- a/shell/edit/provisioning.cattle.io.cluster/index.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/index.vue
@@ -1,6 +1,7 @@
 <script>
 import CreateEditView from '@shell/mixins/create-edit-view';
 import Loading from '@shell/components/Loading';
+import { Banner } from '@components/Banner';
 import CruResource from '@shell/components/CruResource';
 import SelectIconGrid from '@shell/components/SelectIconGrid';
 import EmberPage from '@shell/components/EmberPage';
@@ -50,7 +51,8 @@ export default {
     Loading,
     Rke2Config,
     SelectIconGrid,
-    ToggleSwitch
+    ToggleSwitch,
+    Banner
   },
 
   mixins: [CreateEditView],
@@ -669,6 +671,11 @@ export default {
           </div>
           {{ obj.label }}
         </h4>
+        <Banner
+          v-if="provisioner === _RKE1 && i === 1"
+          color="warning"
+          label-key="cluster.banner.rke1DeprecationMessage"
+        />
         <SelectIconGrid
           :rows="obj.types"
           key-field="id"

From 04a37695038dcad0e4246b6f7e0c26d719622166 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 20 Feb 2025 11:41:44 +0100
Subject: [PATCH 022/140] Update shell/assets/translations/en-us.yaml

Co-authored-by: Richard Cox <18697775+richard-cox@users.noreply.github.com>
---
 shell/assets/translations/en-us.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 338250480dd..e333c6aad13 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2474,7 +2474,7 @@ fleet:
       enable: Enable Polling
       pollingInterval:
         label: Polling Interval
-        tooltip: Polling Interval is the time between a push to the Repository and Fleet reacting to it.
+        tooltip: Polling Interval is the time between a push to the Repository and Fleet's reaction to it.
         webhookWarning: Warning, a webhhok is configured in Rancher to reconcile Git updates and GitRepo resources. The Polling Interval will be automatically adjusted to 1 hour.
         minimumValuewarning: Warning, the recommended minimum value for Polling Interval is 15 seconds. Please consider to increase the interval value if the GitRepo has a large amount of resources, to avoid performance issues.
     add:

From 16a6389abafdf4b3449ec1f304b6f3312c2b0272 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 20 Feb 2025 11:41:52 +0100
Subject: [PATCH 023/140] Update shell/assets/translations/en-us.yaml

Co-authored-by: Richard Cox <18697775+richard-cox@users.noreply.github.com>
---
 shell/assets/translations/en-us.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index e333c6aad13..b3bc23b07a1 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2475,7 +2475,7 @@ fleet:
       pollingInterval:
         label: Polling Interval
         tooltip: Polling Interval is the time between a push to the Repository and Fleet's reaction to it.
-        webhookWarning: Warning, a webhhok is configured in Rancher to reconcile Git updates and GitRepo resources. The Polling Interval will be automatically adjusted to 1 hour.
+        webhookWarning: Warning, a webhook is configured in Rancher to reconcile Git updates and GitRepo resources. The Polling Interval will automatically be adjusted to 1 hour.
         minimumValuewarning: Warning, the recommended minimum value for Polling Interval is 15 seconds. Please consider to increase the interval value if the GitRepo has a large amount of resources, to avoid performance issues.
     add:
       steps:

From b884de441f48d6668503245c67fa1750f05766e8 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 20 Feb 2025 11:22:02 +0100
Subject: [PATCH 024/140] Add second/seconds l10n

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/edit/fleet.cattle.io.gitrepo.vue | 2 +-
 shell/edit/workload/Job.vue            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index ae517fda37c..14c23dc4418 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -797,7 +797,7 @@ export default {
               v-model:value="pollingInterval"
               data-testid="GitRepo-pollingInterval-input"
               min="1"
-              :suffix="pollingInterval == 1 ? 'Second' : 'Seconds'"
+              :suffix="t('suffix.seconds', { count: pollingInterval })"
               :label="t('fleet.gitRepo.polling.pollingInterval.label')"
               :mode="mode"
               tooltip-key="fleet.gitRepo.polling.pollingInterval.tooltip"
diff --git a/shell/edit/workload/Job.vue b/shell/edit/workload/Job.vue
index 1232910e4e9..44ac3fe136c 100644
--- a/shell/edit/workload/Job.vue
+++ b/shell/edit/workload/Job.vue
@@ -254,7 +254,7 @@ export default {
         >
           <UnitInput
             v-model:value="terminationGracePeriodSeconds"
-            :suffix="terminationGracePeriodSeconds == 1 ? 'Second' : 'Seconds'"
+            :suffix="t('suffix.seconds', { count: terminationGracePeriodSeconds })"
             :label="t('workload.upgrading.activeDeadlineSeconds.label')"
             :mode="mode"
             @input="update"
@@ -316,7 +316,7 @@ export default {
       >
         <UnitInput
           v-model:value="terminationGracePeriodSeconds"
-          :suffix="terminationGracePeriodSeconds == 1 ? 'Second' : 'Seconds'"
+          :suffix="t('suffix.seconds', { count: terminationGracePeriodSeconds })"
           :label="t('workload.upgrading.activeDeadlineSeconds.label')"
           :mode="mode"
         >

From 1a8df4d8fa68919d5f7abe7345927517fb90353f Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 20 Feb 2025 11:41:36 +0100
Subject: [PATCH 025/140] Fleet: remove scroll when edit polling

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/edit/fleet.cattle.io.gitrepo.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 14c23dc4418..835c3db823e 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -290,13 +290,7 @@ export default {
     },
 
     showPollingIntervalWarning() {
-      const isVisible = !this.isView && this.pollingInterval < MINIMUM_POLLING_INTERVAL;
-
-      if (isVisible) {
-        this.scrollToBottom();
-      }
-
-      return isVisible;
+      return !this.isView && this.isPollingEnabled && this.pollingInterval < MINIMUM_POLLING_INTERVAL;
     },
 
     stepOneRequires() {

From 1085e942481c743dff7f9bc80be376ac3dd3d6d2 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 20 Feb 2025 11:57:33 +0100
Subject: [PATCH 026/140] Fleet: data-testid camelcase

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 .../__tests__/fleet.cattle.io.gitrepo.test.ts | 26 +++++++++----------
 shell/edit/fleet.cattle.io.gitrepo.vue        | 12 ++++-----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
index 601111b73d2..2c097edf068 100644
--- a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
+++ b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
@@ -44,8 +44,8 @@ describe.each([
   });
 
   it('have self-healing checkbox and tooltip', () => {
-    const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"]');
-    const tooltip = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"]');
+    const correctDriftCheckbox = wrapper.find('[data-testid="gitRepo-correctDrift-checkbox"]');
+    const tooltip = wrapper.find('[data-testid="gitRepo-correctDrift-checkbox"]');
 
     expect(tooltip.element.classList).toContain('v-popper--has-tooltip');
     expect(correctDriftCheckbox.exists()).toBeTruthy();
@@ -53,8 +53,8 @@ describe.each([
   });
 
   it('have keep-resources checkbox and tooltip', () => {
-    const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-keepResources-checkbox"]');
-    const tooltip = wrapper.find('[data-testid="GitRepo-keepResources-checkbox"]');
+    const correctDriftCheckbox = wrapper.find('[data-testid="gitRepo-keepResources-checkbox"]');
+    const tooltip = wrapper.find('[data-testid="gitRepo-keepResources-checkbox"]');
 
     expect(tooltip.element.classList).toContain('v-popper--has-tooltip');
     expect(correctDriftCheckbox.exists()).toBeTruthy();
@@ -62,8 +62,8 @@ describe.each([
   });
 
   it('enable drift if self-healing is checked', async() => {
-    const correctDriftCheckbox = wrapper.findComponent('[data-testid="GitRepo-correctDrift-checkbox"]');
-    const correctDriftContainer = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"] .checkbox-container');
+    const correctDriftCheckbox = wrapper.findComponent('[data-testid="gitRepo-correctDrift-checkbox"]');
+    const correctDriftContainer = wrapper.find('[data-testid="gitRepo-correctDrift-checkbox"] .checkbox-container');
 
     expect(correctDriftContainer.exists()).toBeTruthy();
 
@@ -99,10 +99,10 @@ describe.each([
       global: { mocks },
     });
 
-    const pollingCheckbox = wrapper.findComponent('[data-testid="GitRepo-enablePolling-checkbox"]') as any;
-    const pollingIntervalInput = wrapper.find('[data-testid="GitRepo-pollingInterval-input"]');
-    const pollingIntervalMinimumValueWarning = wrapper.find('[data-testid="GitRepo-pollingInterval-minimumValueWarning"]');
-    const pollingIntervalWebhookWarning = wrapper.find('[data-testid="GitRepo-pollingInterval-webhookWarning"]');
+    const pollingCheckbox = wrapper.findComponent('[data-testid="gitRepo-enablePolling-checkbox"]') as any;
+    const pollingIntervalInput = wrapper.find('[data-testid="gitRepo-pollingInterval-input"]');
+    const pollingIntervalMinimumValueWarning = wrapper.find('[data-testid="gitRepo-pollingInterval-minimumValueWarning"]');
+    const pollingIntervalWebhookWarning = wrapper.find('[data-testid="gitRepo-pollingInterval-webhookWarning"]');
 
     expect(pollingIntervalMinimumValueWarning.exists()).toBe(enabled);
     expect(pollingIntervalWebhookWarning.exists()).toBe(enabled);
@@ -136,7 +136,7 @@ describe.each([
       global: { mocks },
     });
 
-    const pollingIntervalInput = wrapper.find('[data-testid="GitRepo-pollingInterval-input"]').element as any;
+    const pollingIntervalInput = wrapper.find('[data-testid="gitRepo-pollingInterval-input"]').element as any;
 
     expect(pollingIntervalInput).toBeDefined();
     expect(pollingIntervalInput.value).toBe(unitValue);
@@ -166,7 +166,7 @@ describe.each([
       global: { mocks },
     });
 
-    const pollingIntervalMinimumValueWarning = wrapper.find('[data-testid="GitRepo-pollingInterval-minimumValueWarning"]');
+    const pollingIntervalMinimumValueWarning = wrapper.find('[data-testid="gitRepo-pollingInterval-minimumValueWarning"]');
 
     expect(pollingIntervalMinimumValueWarning.exists()).toBe(visible);
   });
@@ -194,7 +194,7 @@ describe.each([
       global: { mocks },
     });
 
-    const pollingIntervalWebhookWarning = wrapper.find('[data-testid="GitRepo-pollingInterval-webhookWarning"]');
+    const pollingIntervalWebhookWarning = wrapper.find('[data-testid="gitRepo-pollingInterval-webhookWarning"]');
 
     expect(pollingIntervalWebhookWarning.exists()).toBe(visible);
   });
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 835c3db823e..c91b46ee0d6 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -729,7 +729,7 @@ export default {
         <Checkbox
           v-model:value="correctDriftEnabled"
           :tooltip="t('fleet.gitRepo.resources.correctDriftTooltip')"
-          data-testid="GitRepo-correctDrift-checkbox"
+          data-testid="gitRepo-correctDrift-checkbox"
           class="check"
           type="checkbox"
           label-key="fleet.gitRepo.resources.correctDrift"
@@ -738,7 +738,7 @@ export default {
         <Checkbox
           v-model:value="value.spec.keepResources"
           :tooltip="t('fleet.gitRepo.resources.keepResourcesTooltip')"
-          data-testid="GitRepo-keepResources-checkbox"
+          data-testid="gitRepo-keepResources-checkbox"
           class="check"
           type="checkbox"
           label-key="fleet.gitRepo.resources.keepResources"
@@ -763,7 +763,7 @@ export default {
         <div class="col span-6">
           <Checkbox
             v-model:value="isPollingEnabled"
-            data-testid="GitRepo-enablePolling-checkbox"
+            data-testid="gitRepo-enablePolling-checkbox"
             class="check"
             type="checkbox"
             label-key="fleet.gitRepo.polling.enable"
@@ -777,19 +777,19 @@ export default {
               v-if="showPollingIntervalWarning"
               color="warning"
               label-key="fleet.gitRepo.polling.pollingInterval.minimumValuewarning"
-              data-testid="GitRepo-pollingInterval-minimumValueWarning"
+              data-testid="gitRepo-pollingInterval-minimumValueWarning"
             />
             <Banner
               v-if="isWebhookConfigured"
               color="warning"
               label-key="fleet.gitRepo.polling.pollingInterval.webhookWarning"
-              data-testid="GitRepo-pollingInterval-webhookWarning"
+              data-testid="gitRepo-pollingInterval-webhookWarning"
             />
           </div>
           <div class="col span-6">
             <UnitInput
               v-model:value="pollingInterval"
-              data-testid="GitRepo-pollingInterval-input"
+              data-testid="gitRepo-pollingInterval-input"
               min="1"
               :suffix="t('suffix.seconds', { count: pollingInterval })"
               :label="t('fleet.gitRepo.polling.pollingInterval.label')"

From 0712fec4ac415a6b7a6dbedc7780d9f234212206 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 20 Feb 2025 12:08:20 +0100
Subject: [PATCH 027/140] Fleet: updatePollingInterval refactoring

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/edit/fleet.cattle.io.gitrepo.vue | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index c91b46ee0d6..68af8074b81 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -549,18 +549,13 @@ export default {
     },
 
     updatePollingInterval(value) {
-      let interval = (value || DEFAULT_POLLING_INTERVAL).toString();
-
       if (!value) {
         this.pollingInterval = DEFAULT_POLLING_INTERVAL;
-      }
-
-      if (value === MINIMUM_POLLING_INTERVAL) {
+        this.value.spec.pollingInterval = DEFAULT_POLLING_INTERVAL.toString();
+      } else if (value === MINIMUM_POLLING_INTERVAL) {
         delete this.value.spec.pollingInterval;
-
-        interval = MINIMUM_POLLING_INTERVAL.toString();
       } else {
-        this.value.spec.pollingInterval = interval;
+        this.value.spec.pollingInterval = value.toString();
       }
     },
 

From 3197c081cbc0df25ded45bd0949c1ac629ab2c2d Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 20 Feb 2025 17:47:50 +0100
Subject: [PATCH 028/140] Fleet: add Disable/Enable polling icons

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 package.json                            | 2 +-
 shell/models/fleet.cattle.io.gitrepo.js | 4 ++--
 yarn.lock                               | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index e8370ff3cea..db327808ce2 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@aws-sdk/client-kms": "3.8.1",
     "@novnc/novnc": "1.2.0",
     "@popperjs/core": "2.11.8",
-    "@rancher/icons": "2.0.29",
+    "@rancher/icons": "2.0.32",
     "ansi_up": "5.0.0",
     "axios": "0.21.4",
     "axios-retry": "3.1.9",
diff --git a/shell/models/fleet.cattle.io.gitrepo.js b/shell/models/fleet.cattle.io.gitrepo.js
index 7444888c018..1fce1d87724 100644
--- a/shell/models/fleet.cattle.io.gitrepo.js
+++ b/shell/models/fleet.cattle.io.gitrepo.js
@@ -85,7 +85,7 @@ export default class GitRepo extends SteveModel {
     insertAt(out, 2, {
       action:   'enablePolling',
       label:    'Enable Polling',
-      icon:     'icon icon-gear',
+      icon:     'icon icon-endpoints_connected',
       bulkable: true,
       enabled:  !!this.links.update && !!this.spec?.disablePolling
     });
@@ -93,7 +93,7 @@ export default class GitRepo extends SteveModel {
     insertAt(out, 3, {
       action:   'disablePolling',
       label:    'Disable Polling',
-      icon:     'icon icon-gear',
+      icon:     'icon icon-endpoints_disconnected',
       bulkable: true,
       enabled:  !!this.links.update && !this.spec?.disablePolling
     });
diff --git a/yarn.lock b/yarn.lock
index 716a5f87a60..2580128a0c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3320,10 +3320,10 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
   integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
-"@rancher/icons@2.0.29":
-  version "2.0.29"
-  resolved "https://registry.npmjs.org/@rancher/icons/-/icons-2.0.29.tgz#6546d69768c706bebd66bfa73b36aef3d105987a"
-  integrity sha512-qBBqfazS9y5VjV7fJDPNXmxd9AP/2uiE05mKFWP41kpbO+tEb62RnUBXCm14XLeScDZQcOuiAKVHMmvCFzF0BA==
+"@rancher/icons@2.0.32":
+  version "2.0.32"
+  resolved "https://registry.yarnpkg.com/@rancher/icons/-/icons-2.0.32.tgz#c6b18c81b87bc9439b1e449b2f6bd859d76c0bbe"
+  integrity sha512-afZlIHPboVgQIwnMuaQT7LTPoWuCIgyqD2Ch277lEAoFIzuU+NwHzpEAvX5xcOpVXYAFlvDE/VlJ6FmYaQBBig==
 
 "@rtsao/scc@^1.1.0":
   version "1.1.0"

From 166fbae067172861ca7f1be85995ea0cb08c1969 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 20 Feb 2025 17:49:16 +0100
Subject: [PATCH 029/140] Update shell/assets/translations/en-us.yaml

Co-authored-by: Richard Cox <18697775+richard-cox@users.noreply.github.com>
---
 shell/assets/translations/en-us.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index b3bc23b07a1..fa739c09b10 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2476,7 +2476,7 @@ fleet:
         label: Polling Interval
         tooltip: Polling Interval is the time between a push to the Repository and Fleet's reaction to it.
         webhookWarning: Warning, a webhook is configured in Rancher to reconcile Git updates and GitRepo resources. The Polling Interval will automatically be adjusted to 1 hour.
-        minimumValuewarning: Warning, the recommended minimum value for Polling Interval is 15 seconds. Please consider to increase the interval value if the GitRepo has a large amount of resources, to avoid performance issues.
+        minimumValuewarning: Warning, the recommended minimum Polling Interval is 15 seconds. To avoid performance issues with GitRepos that contain a large amount of resources please consider increasing this value.
     add:
       steps:
         repoInfo:

From 7e3721006262fb596faf848856e0b67e1e3c2482 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 21 Feb 2025 17:25:22 +0000
Subject: [PATCH 030/140] Use nicer error message for login nonce error
 (#13432)

---
 shell/assets/translations/en-us.yaml | 1 +
 shell/pages/auth/login.vue           | 2 ++
 shell/store/auth.js                  | 9 ++++-----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 174dc992826..cae772ae0c4 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -3402,6 +3402,7 @@ login:
     invalidSamlAttrs: "Invalid saml attributes"
     noResponse: "No response received"
   error: An error occurred logging in. Please try again.
+  invalidResponseError: Invalid response received to login request. Please try again.
   clientError: Invalid username or password. Please try again.
   specificError: 'An error occurred logging in: {msg}'
   useLocal: Use a local user
diff --git a/shell/pages/auth/login.vue b/shell/pages/auth/login.vue
index a34738183d8..408b7c84e57 100644
--- a/shell/pages/auth/login.vue
+++ b/shell/pages/auth/login.vue
@@ -105,6 +105,8 @@ export default {
         return this.t('login.clientError');
       } else if (this.err === LOGIN_ERRORS.CLIENT || this.err === LOGIN_ERRORS.SERVER) {
         return this.t('login.error');
+      } else if (this.err === LOGIN_ERRORS.NONCE) {
+        return this.t('login.invalidResponseError');
       }
 
       return this.err?.length ? this.t('login.specificError', { msg: this.err }) : '';
diff --git a/shell/store/auth.js b/shell/store/auth.js
index cf03a46a751..c1908ca9c2d 100644
--- a/shell/store/auth.js
+++ b/shell/store/auth.js
@@ -18,12 +18,11 @@ export const BASE_SCOPES = {
 
 const KEY = 'rc_nonce';
 
-const ERR_NONCE = 'nonce';
-
 export const LOGIN_ERRORS = {
   CLIENT:              'client',
   CLIENT_UNAUTHORIZED: 'client_unauthorized',
-  SERVER:              'server'
+  SERVER:              'server',
+  NONCE:               'nonce',
 };
 
 export const state = function() {
@@ -267,13 +266,13 @@ export const actions = {
     try {
       parsed = JSON.parse(expectJSON);
     } catch {
-      return ERR_NONCE;
+      return LOGIN_ERRORS.NONCE;
     }
 
     const expect = parsed.nonce;
 
     if ( !expect || expect !== nonce ) {
-      return ERR_NONCE;
+      return LOGIN_ERRORS.NONCE;
     }
 
     const body = { code };

From ab7b8d7e476c995638f63212cea4ba49a992f759 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Fri, 21 Feb 2025 11:07:19 -0800
Subject: [PATCH 031/140] shorter message on rke1 toggle

---
 shell/assets/translations/en-us.yaml                | 1 +
 shell/edit/provisioning.cattle.io.cluster/index.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 4029d2163bf..78a18783467 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -1875,6 +1875,7 @@ cluster:
         other { {pool_name}: The provided values for {fields} were not found in the list of expected values. This can happen with clusters provisioned outside of Rancher or when options for the provider have changed. }
       }
     rke1DeprecationMessage: 'Rancher Kubernetes Engine (RKE / RKE1) will reach end of life on July 31, 2025. Rancher 2.12.0 and later will no longer support provisioning or managing downstream RKE1 clusters. We recommend replatforming RKE1 clusters to RKE2 to ensure continued support and security updates. Learn more about the transition <a href="https://www.suse.com/support/kb/doc/?id=000021518" target="_blank" rel="noopener noreferrer nofollow">here</a>.'
+    rke1DeprecationShortMessage: Rancher Kubernetes Engine (RKE / RKE1) will reach end of life on July 31, 2025. Rancher 2.12.0 and later will no longer support provisioning or managing downstream RKE1 clusters.
   rkeTemplateUpgrade: Template revision {name} available for upgrade
   cloudCredentials:
     renew: Renew Cloud Credentials
diff --git a/shell/edit/provisioning.cattle.io.cluster/index.vue b/shell/edit/provisioning.cattle.io.cluster/index.vue
index e3ae9c40c05..44f5d443694 100644
--- a/shell/edit/provisioning.cattle.io.cluster/index.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/index.vue
@@ -674,7 +674,7 @@ export default {
         <Banner
           v-if="provisioner === _RKE1 && i === 1"
           color="warning"
-          label-key="cluster.banner.rke1DeprecationMessage"
+          label-key="cluster.banner.rke1DeprecationShortMessage"
         />
         <SelectIconGrid
           :rows="obj.types"

From 6f5c1118bf4ecee89363da8274071a0c4187ef43 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Fri, 21 Feb 2025 11:39:43 -0800
Subject: [PATCH 032/140] update OCI repo creation message

---
 shell/assets/translations/en-us.yaml         |  4 ++--
 shell/edit/catalog.cattle.io.clusterrepo.vue | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index cae772ae0c4..4baff8a0411 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -1125,8 +1125,8 @@ catalog:
     oci:
       urlLabel: OCI Repository Host URL
       placeholder: 'e.g. oci://<registry-host>/<namespace>/<chart-name>:<tag>'
-      info: Add OCI URLs that contain ONLY helm charts. For large repositories containing many charts consider targeting a specific namespace or chart to improve performance, for example with oci://<registry-host>/<namespace> or oci://<registry-host>/<namespace>/<chart-name>. The list of charts available from the repository is updated every 6 hours.
-      skipTlsVerifications: Skip TLS Verifications
+      warning: OCI URLs should ONLY contain helm charts.
+      info: For large repositories containing many charts consider targeting a specific namespace or chart to improve performance, for example with oci://<registry-host>/<namespace> or oci://<registry-host>/<namespace>/<chart-name>.
       insecurePlainHttp: Insecure Plain Http
       exponentialBackOff:
         label: Exponential Back Off
diff --git a/shell/edit/catalog.cattle.io.clusterrepo.vue b/shell/edit/catalog.cattle.io.clusterrepo.vue
index cfab9254144..453ad8183c5 100644
--- a/shell/edit/catalog.cattle.io.clusterrepo.vue
+++ b/shell/edit/catalog.cattle.io.clusterrepo.vue
@@ -6,7 +6,7 @@ import { RadioGroup } from '@components/Form/Radio';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import Labels from '@shell/components/form/Labels';
 import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthSecret';
-import InfoBox from '@shell/components/InfoBox';
+import Banner from '@components/Banner/Banner.vue';
 import { Checkbox } from '@components/Form/Checkbox';
 import { MANAGEMENT, NAMESPACE, CLUSTER_REPO_TYPES } from '@shell/config/types';
 import UnitInput from '@shell/components/form/UnitInput.vue';
@@ -23,7 +23,7 @@ export default {
     NameNsDescription,
     Labels,
     SelectOrCreateAuthSecret,
-    InfoBox,
+    Banner,
     Checkbox,
     UnitInput
   },
@@ -153,12 +153,16 @@ export default {
       </div>
     </div>
 
-    <InfoBox
-      v-if="clusterRepoType === CLUSTER_REPO_TYPES.OCI_URL"
-      class="p-10"
-    >
-      {{ t('catalog.repo.oci.info', null, true) }}
-    </InfoBox>
+    <template v-if="clusterRepoType === CLUSTER_REPO_TYPES.OCI_URL">
+      <Banner
+        label-key="catalog.repo.oci.warning"
+        color="warning"
+      />
+      <Banner
+        :label="t('catalog.repo.oci.info', null, true)"
+        color="info"
+      />
+    </template>
 
     <div class="row mb-10">
       <template v-if="clusterRepoType === CLUSTER_REPO_TYPES.GIT_REPO">

From 84c234383a822f6218149c504015d69fd1e0199e Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Mon, 24 Feb 2025 09:00:54 +0000
Subject: [PATCH 033/140] Fix textual descriptions for cluster appearance in
 multiple places (#13416)

* Fix textual descriptions for cluster appearance in multiple places

* address pr comments

* address pr comments
---
 jest.setup.js                                 |  6 ++++--
 .../src/components/Form/Checkbox/Checkbox.vue |  2 ++
 .../Form/LabeledInput/LabeledInput.vue        |  4 +++-
 .../LabeledTooltip/LabeledTooltip.vue         | 14 +++++++++++++-
 shell/assets/translations/en-us.yaml          |  7 ++++++-
 shell/components/ClusterBadge.vue             |  1 +
 shell/components/ClusterIconMenu.vue          |  3 +++
 shell/components/ClusterProviderIcon.vue      | 15 ++++++++++++++-
 shell/components/form/KeyValue.vue            |  4 +++-
 shell/components/formatter/LiveDate.vue       |  4 +++-
 shell/components/nav/Pinned.vue               |  2 +-
 shell/directives/strip-html-aria-label.js     | 19 +++++++++++++++++++
 shell/edit/workload/index.vue                 |  4 +++-
 shell/initialize/install-directives.js        |  2 ++
 .../pages/c/_cluster/explorer/ConfigBadge.vue |  8 +++-----
 shell/pages/c/_cluster/explorer/index.vue     | 12 +++++++-----
 storybook/.storybook/preview.ts               |  2 ++
 17 files changed, 89 insertions(+), 20 deletions(-)
 create mode 100644 shell/directives/strip-html-aria-label.js

diff --git a/jest.setup.js b/jest.setup.js
index 28950a093f2..4e47438d3b1 100644
--- a/jest.setup.js
+++ b/jest.setup.js
@@ -7,6 +7,7 @@ import { floatingVueOptions } from '@shell/plugins/floating-vue';
 import vSelect from 'vue-select';
 import cleanTooltipDirective from '@shell/directives/clean-tooltip';
 import cleanHtmlDirective from '@shell/directives/clean-html';
+import htmlStrippedAriaLabelDirective from '@shell/directives/strip-html-aria-label';
 import '@shell/plugins/replaceall';
 import { TextEncoder, TextDecoder } from 'util';
 
@@ -41,8 +42,9 @@ config.global.directives = {
       el.textContent = `%${ binding.value }%`;
     }
   },
-  'clean-tooltip': cleanTooltipDirective,
-  'clean-html':    cleanHtmlDirective,
+  'clean-tooltip':       cleanTooltipDirective,
+  'clean-html':          cleanHtmlDirective,
+  'stripped-aria-label': htmlStrippedAriaLabelDirective,
 };
 
 config.global.stubs['t'] = { template: '<span><slot /></span>' };
diff --git a/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue b/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
index 7676ce79352..db3205bd42c 100644
--- a/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
+++ b/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
@@ -291,12 +291,14 @@ export default defineComponent({
           <i
             v-if="tooltipKey"
             v-clean-tooltip="{content: t(tooltipKey), triggers: ['hover', 'touch', 'focus']}"
+            v-stripped-aria-label="t(tooltipKey)"
             class="checkbox-info icon icon-info icon-lg"
             :tabindex="isDisabled ? -1 : 0"
           />
           <i
             v-else-if="tooltip"
             v-clean-tooltip="{content: tooltip, triggers: ['hover', 'touch', 'focus']}"
+            v-stripped-aria-label="tooltip"
             class="checkbox-info icon icon-info icon-lg"
             :tabindex="isDisabled ? -1 : 0"
           />
diff --git a/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue b/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue
index 75aeeb49fc1..5fc7e23567c 100644
--- a/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue
+++ b/pkg/rancher-components/src/components/Form/LabeledInput/LabeledInput.vue
@@ -397,12 +397,14 @@ export default defineComponent({
     </slot>
 
     <slot name="suffix" />
+    <!-- informational tooltip about field -->
     <LabeledTooltip
-      v-if="hasTooltip && !focused"
+      v-if="hasTooltip"
       :hover="hoverTooltip"
       :value="tooltipValue"
       :status="status"
     />
+    <!-- validation tooltip -->
     <LabeledTooltip
       v-if="!!validationMessage"
       :hover="hoverTooltip"
diff --git a/pkg/rancher-components/src/components/LabeledTooltip/LabeledTooltip.vue b/pkg/rancher-components/src/components/LabeledTooltip/LabeledTooltip.vue
index 8e73baf54b0..b644f73ddde 100644
--- a/pkg/rancher-components/src/components/LabeledTooltip/LabeledTooltip.vue
+++ b/pkg/rancher-components/src/components/LabeledTooltip/LabeledTooltip.vue
@@ -31,6 +31,16 @@ export default defineComponent({
   computed: {
     iconClass(): string {
       return this.status === 'error' ? 'icon-warning' : 'icon-info';
+    },
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    tooltipContent(): {[key: string]: any} | string {
+      if (this.isObject(this.value)) {
+        return {
+          ...{ content: this.value.content, popperClass: [`tooltip-${ status }`] }, ...this.value, triggers: ['hover', 'touch', 'focus']
+        };
+      }
+
+      return this.value ? { content: this.value, triggers: ['hover', 'touch', 'focus'] } : '';
     }
   },
   methods: {
@@ -49,9 +59,11 @@ export default defineComponent({
   >
     <template v-if="hover">
       <i
-        v-clean-tooltip="isObject(value) ? { ...{content: value.content, popperClass: [`tooltip-${status}`]}, ...value } : value"
+        v-clean-tooltip="tooltipContent"
+        v-stripped-aria-label="isObject(value) ? value.content : value"
         :class="{'hover':!value, [iconClass]: true}"
         class="icon status-icon"
+        tabindex="0"
       />
     </template>
     <template v-else>
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 0dfcb2aad93..1209c9da509 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -137,6 +137,9 @@ locale:
 
 nav:
   ariaLabel:
+    clusterIconKeyCombo: Cluster keyboard shortcut combination icon
+    localClusterIcon: Local Cluster icon
+    clusterProvIcon: Cluster {cluster} provider icon
     topLevelMenu: Main menu
     homePage: Home page navigation menu
     cluster: Cluster menu item
@@ -146,7 +149,7 @@ nav:
     configurationApps: Main menu configuration app menu item
     support: Support page link
     about: About page link
-    pinCluster: Pin/Unpin cluster
+    pinCluster: Pin/Unpin {cluster} cluster
     collapseExpand: Collapse/Expand menu group
     productAboutPage: Product about page link
   alt:
@@ -2645,6 +2648,8 @@ glance:
   secretsTable: Full secrets list
 
 clusterBadge:
+  badgeAppearance: Cluster Badge Appearance
+  clusterComment: "Cluster comment - {text}"
   customizeAppearance: Customize Appearance
   addLabel: Add Cluster Badge
   setClusterAppearance: Cluster Appearance
diff --git a/shell/components/ClusterBadge.vue b/shell/components/ClusterBadge.vue
index f08bff2f8bb..4538c3738f4 100644
--- a/shell/components/ClusterBadge.vue
+++ b/shell/components/ClusterBadge.vue
@@ -23,6 +23,7 @@ export default {
     :style="{ backgroundColor: cluster.badge.color, color: cluster.badge.textColor }"
     class="cluster-badge"
     :class="{'cluster-badge-border': showBorders}"
+    :aria-label="t('clusterBadge.clusterComment', { text: cluster.badge?.text || '' })"
   >
     {{ cluster.badge.text }}
   </div>
diff --git a/shell/components/ClusterIconMenu.vue b/shell/components/ClusterIconMenu.vue
index 6bbe093972f..7e500f42ec1 100644
--- a/shell/components/ClusterIconMenu.vue
+++ b/shell/components/ClusterIconMenu.vue
@@ -76,6 +76,7 @@ export default {
         style="enable-background:new 0 0 100 100;"
         xml:space="preserve"
       >
+        <title>{{ t('nav.ariaLabel.localClusterIcon') }}</title>
         <g>
           <g>
             <path
@@ -106,10 +107,12 @@ export default {
     <i
       v-if="!routeCombo && cluster.pinned"
       class="icon icon-pin cluster-pin-icon"
+      :alt="t('nav.ariaLabel.pinCluster', { cluster: cluster.nameDisplay })"
     />
     <i
       v-else-if="routeCombo"
       class="icon icon-keyboard_tab key-combo-icon"
+      :alt="t('nav.ariaLabel.clusterIconKeyCombo')"
     />
   </div>
 </template>
diff --git a/shell/components/ClusterProviderIcon.vue b/shell/components/ClusterProviderIcon.vue
index 491ea6a8cd1..4c4dcfc2fc7 100644
--- a/shell/components/ClusterProviderIcon.vue
+++ b/shell/components/ClusterProviderIcon.vue
@@ -37,7 +37,19 @@ export default {
       {{ cluster.badge.iconText }}
     </div>
     <!-- eslint-disable -->
-    <svg v-else-if="cluster.isLocal && !cluster.isHarvester" class="cluster-local-logo" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+    <svg 
+      v-else-if="cluster.isLocal && !cluster.isHarvester" 
+      class="cluster-local-logo" 
+      version="1.1" 
+      id="Layer_1" 
+      xmlns="http://www.w3.org/2000/svg" 
+      xmlns:xlink="http://www.w3.org/1999/xlink" 
+      x="0px" 
+      y="0px" 
+      viewBox="0 0 100 100" 
+      style="enable-background:new 0 0 100 100;" 
+      xml:space="preserve">
+      <title>{{ t('nav.ariaLabel.clusterProvIcon', { cluster: 'local' }) }}</title>
       <g>
         <g>
           <path class="rancher-icon-fill" d="M26.0862026,44.4953918H8.6165142c-5.5818157,0-9.3979139-4.6252708-8.4802637-10.1311035l2.858391-17.210701
@@ -60,6 +72,7 @@ export default {
       v-else-if="cluster.providerNavLogo"
       class="cluster-os-logo"
       :src="cluster.providerNavLogo"
+      :alt="t('nav.ariaLabel.clusterProvIcon', { cluster: cluster.nameDisplay })"
     >
   </div>
 </template>
diff --git a/shell/components/form/KeyValue.vue b/shell/components/form/KeyValue.vue
index 9b53896cc63..b70af4fd19e 100644
--- a/shell/components/form/KeyValue.vue
+++ b/shell/components/form/KeyValue.vue
@@ -618,8 +618,10 @@ export default {
               {{ _keyLabel }}
               <i
                 v-if="_protip && !isView && addAllowed"
-                v-clean-tooltip="_protip"
+                v-clean-tooltip="{content: _protip, triggers: ['hover', 'touch', 'focus'] }"
+                v-stripped-aria-label="_protip"
                 class="icon icon-info"
+                tabindex="0"
               />
             </label>
             <label
diff --git a/shell/components/formatter/LiveDate.vue b/shell/components/formatter/LiveDate.vue
index a7e28b1cd29..45b34e280f1 100644
--- a/shell/components/formatter/LiveDate.vue
+++ b/shell/components/formatter/LiveDate.vue
@@ -151,7 +151,9 @@ export default {
   </span>
   <span
     v-else-if="showTooltip"
-    v-clean-tooltip="{content: title, placement: tooltipPlacement}"
+    v-clean-tooltip="{content: title, placement: tooltipPlacement, triggers: ['hover', 'touch', 'focus'] }"
+    v-stripped-aria-label="title"
+    tabindex="0"
     class="live-date"
   >
     {{ suffixedLabel }}
diff --git a/shell/components/nav/Pinned.vue b/shell/components/nav/Pinned.vue
index 2f27a5d0aea..69b07f7feb4 100644
--- a/shell/components/nav/Pinned.vue
+++ b/shell/components/nav/Pinned.vue
@@ -37,7 +37,7 @@ export default {
     class="pin icon"
     :class="{'icon-pin-outlined': !pinned, 'icon-pin': pinned}"
     aria-role="button"
-    :aria-label="`${t('nav.ariaLabel.pinCluster')} ${ cluster.label }`"
+    :aria-label="t('nav.ariaLabel.pinCluster', { cluster: cluster.label })"
     @click.stop.prevent="toggle"
     @keydown.enter.prevent="toggle"
     @keydown.space.prevent="toggle"
diff --git a/shell/directives/strip-html-aria-label.js b/shell/directives/strip-html-aria-label.js
new file mode 100644
index 00000000000..5f0f415b663
--- /dev/null
+++ b/shell/directives/strip-html-aria-label.js
@@ -0,0 +1,19 @@
+/**
+ * Vue directive that strips HTML tags from a string and uses the output as an "aria-label" HTML attribute
+ */
+export default {
+  mounted(el, binding) {
+    if (typeof binding.value === 'string') {
+      const htmlStrippedAriaLabelString = binding.value.replace(/<\/?[^>]+(>|$)/g, '');
+
+      el.setAttribute('aria-label', htmlStrippedAriaLabelString);
+    }
+  },
+  updated(el, binding) {
+    if (typeof binding.value === 'string') {
+      const htmlStrippedAriaLabelString = binding.value.replace(/<\/?[^>]+(>|$)/g, '');
+
+      el.setAttribute('aria-label', htmlStrippedAriaLabelString);
+    }
+  }
+};
diff --git a/shell/edit/workload/index.vue b/shell/edit/workload/index.vue
index 57e659cada3..4cfb050f691 100644
--- a/shell/edit/workload/index.vue
+++ b/shell/edit/workload/index.vue
@@ -262,8 +262,10 @@ export default {
                 <h3>
                   {{ t('workload.container.ports.expose') }}
                   <i
-                    v-clean-tooltip="t('workload.container.ports.toolTip')"
+                    v-clean-tooltip="{content: t('workload.container.ports.toolTip'), triggers: ['hover', 'touch', 'focus'] }"
+                    v-stripped-aria-label="t('workload.container.ports.toolTip')"
                     class="icon icon-info"
+                    tabindex="0"
                   />
                 </h3>
                 <p class="padded">
diff --git a/shell/initialize/install-directives.js b/shell/initialize/install-directives.js
index de02e244114..632c2652781 100644
--- a/shell/initialize/install-directives.js
+++ b/shell/initialize/install-directives.js
@@ -10,6 +10,7 @@ import cleanTooltipDirective from '@shell/directives/clean-tooltip';
 import positiveIntNumberDirective from '@shell/directives/positive-int-number.js';
 import trimWhitespaceDirective from '@shell/directives/trim-whitespace';
 import intNumberDirective from '@shell/directives/int-number';
+import htmlStrippedAriaLabelDirective from '@shell/directives/strip-html-aria-label';
 
 /**
  * Prevent extensions from overriding existing directives
@@ -47,6 +48,7 @@ function addDirectives(vueApp) {
   vueApp.directive('focus', focusDirective);
   vueApp.directive('intNumber', intNumberDirective);
   vueApp.directive('positiveIntNumber', positiveIntNumberDirective);
+  vueApp.directive('stripped-aria-label', htmlStrippedAriaLabelDirective);
 }
 
 /**
diff --git a/shell/pages/c/_cluster/explorer/ConfigBadge.vue b/shell/pages/c/_cluster/explorer/ConfigBadge.vue
index ad8fc81ccfb..990c6f36d6d 100644
--- a/shell/pages/c/_cluster/explorer/ConfigBadge.vue
+++ b/shell/pages/c/_cluster/explorer/ConfigBadge.vue
@@ -27,16 +27,14 @@ export default {
   <div class="config-badge">
     <div>
       <button
+        v-clean-tooltip="{content: tooltip, triggers: ['hover', 'touch', 'focus'] }"
+        v-stripped-aria-label="tooltip"
         class="badge-install btn btn-sm role-secondary"
         data-testid="add-custom-cluster-badge"
         role="button"
-        tabindex="0"
         @click="customBadgeDialog"
       >
-        <i
-          v-clean-tooltip="tooltip"
-          class="icon icon-brush-icon"
-        />
+        <i class="icon icon-brush-icon" />
       </button>
     </div>
   </div>
diff --git a/shell/pages/c/_cluster/explorer/index.vue b/shell/pages/c/_cluster/explorer/index.vue
index 92228517dbf..59de873be05 100644
--- a/shell/pages/c/_cluster/explorer/index.vue
+++ b/shell/pages/c/_cluster/explorer/index.vue
@@ -673,11 +673,13 @@ export default {
       </div>
       <div data-testid="created__label">
         <label>{{ t('glance.created') }}: </label>
-        <span><LiveDate
-          :value="currentCluster.metadata.creationTimestamp"
-          :add-suffix="true"
-          :show-tooltip="true"
-        /></span>
+        <span>
+          <LiveDate
+            :value="currentCluster.metadata.creationTimestamp"
+            :add-suffix="true"
+            :show-tooltip="true"
+          />
+        </span>
       </div>
       <div :style="{'flex':1}" />
       <div v-if="showClusterTools">
diff --git a/storybook/.storybook/preview.ts b/storybook/.storybook/preview.ts
index 8466028f8f1..7348c9ddff4 100644
--- a/storybook/.storybook/preview.ts
+++ b/storybook/.storybook/preview.ts
@@ -10,6 +10,7 @@ import cleanTooltipDirective  from '@shell/directives/clean-tooltip';
 import ShortKey from '@shell/plugins/shortkey';
 import cleanHtmlDirective from '@shell/directives/clean-html';
 import trimWhitespaceDirective from '@shell/directives/trim-whitespace';
+import htmlStrippedAriaLabelDirective from '@shell/directives/strip-html-aria-label';
 import store from './store'
 
 // i18n
@@ -21,6 +22,7 @@ setup((vueApp) => {
   vueApp.directive('clean-html', cleanHtmlDirective);
   vueApp.directive('clean-tooltip', cleanTooltipDirective);
   vueApp.directive('trim-whitespace', trimWhitespaceDirective);
+  vueApp.directive('stripped-aria-label', htmlStrippedAriaLabelDirective);
   
   vueApp.component('v-select', vSelect);
   vueApp.use(ShortKey, { prevent: ['input', 'textarea', 'select'] });

From b15f6d54af8aed7b95952b3025c2adb7271639a6 Mon Sep 17 00:00:00 2001
From: Richard Cox <18697775+richard-cox@users.noreply.github.com>
Date: Mon, 24 Feb 2025 13:24:59 +0000
Subject: [PATCH 034/140] Fix e2e tests given new machine based resource
 finalizer (#13492)

- Looks like on create of the resource a finalizer is added
- The new resourceVersion given change broke edit tests
- The new finalizer broke delete tests
- We now update resourceVersion before editing, and remove finalizer (needs to be done after edit, or it gets added again)
---
 .../cluster-manager/machine-deployments.po.ts |  6 ++-
 .../pages/cluster-manager/machine-sets.po.ts  |  5 ++-
 .../po/pages/cluster-manager/machines.po.ts   |  5 ++-
 .../pages/manager/machine-deployments.spec.ts | 41 +++++++++++++++----
 .../tests/pages/manager/machine-sets.spec.ts  | 40 ++++++++++++++----
 .../e2e/tests/pages/manager/machines.spec.ts  | 20 +++++++--
 6 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/cypress/e2e/po/pages/cluster-manager/machine-deployments.po.ts b/cypress/e2e/po/pages/cluster-manager/machine-deployments.po.ts
index 5f4e7cce619..e396219e6fc 100644
--- a/cypress/e2e/po/pages/cluster-manager/machine-deployments.po.ts
+++ b/cypress/e2e/po/pages/cluster-manager/machine-deployments.po.ts
@@ -4,12 +4,14 @@ import MachineDeploymentsCreateEditPo from '@/cypress/e2e/po/edit/machine-deploy
 import MachineDeploymentsListPo from '@/cypress/e2e/po/lists/machine-deployments-list.po';
 import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
 import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
+
 export default class MachineDeploymentsPagePo extends PagePo {
-  private static createPath(clusterId: string) {
+  private static createPath(clusterId: string = BLANK_CLUSTER) {
     return `/c/${ clusterId }/manager/cluster.x-k8s.io.machinedeployment`;
   }
 
-  static goTo(clusterId: string): Cypress.Chainable<Cypress.AUTWindow> {
+  static goTo(clusterId: string = BLANK_CLUSTER): Cypress.Chainable<Cypress.AUTWindow> {
     return super.goTo(MachineDeploymentsPagePo.createPath(clusterId));
   }
 
diff --git a/cypress/e2e/po/pages/cluster-manager/machine-sets.po.ts b/cypress/e2e/po/pages/cluster-manager/machine-sets.po.ts
index 3e5287a9b1c..2a0ff625bbf 100644
--- a/cypress/e2e/po/pages/cluster-manager/machine-sets.po.ts
+++ b/cypress/e2e/po/pages/cluster-manager/machine-sets.po.ts
@@ -4,13 +4,14 @@ import MachineSetsCreateEditPo from '@/cypress/e2e/po/edit/machine-sets.po';
 import MachineSetsListPo from '@/cypress/e2e/po/lists/machine-set-list.po';
 import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
 import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 export default class MachineSetsPagePo extends PagePo {
-  private static createPath(clusterId: string) {
+  private static createPath(clusterId: string = BLANK_CLUSTER) {
     return `/c/${ clusterId }/manager/cluster.x-k8s.io.machineset`;
   }
 
-  static goTo(clusterId: string): Cypress.Chainable<Cypress.AUTWindow> {
+  static goTo(clusterId: string = BLANK_CLUSTER): Cypress.Chainable<Cypress.AUTWindow> {
     return super.goTo(MachineSetsPagePo.createPath(clusterId));
   }
 
diff --git a/cypress/e2e/po/pages/cluster-manager/machines.po.ts b/cypress/e2e/po/pages/cluster-manager/machines.po.ts
index 34ab164b253..af6e493598e 100644
--- a/cypress/e2e/po/pages/cluster-manager/machines.po.ts
+++ b/cypress/e2e/po/pages/cluster-manager/machines.po.ts
@@ -4,13 +4,14 @@ import MachinesListPo from '@/cypress/e2e/po/lists/machines-list.po';
 import CodeMirrorPo from '@/cypress/e2e/po/components/code-mirror.po';
 import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
 import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 export default class MachinesPagePo extends PagePo {
-  private static createPath(clusterId: string) {
+  private static createPath(clusterId: string = BLANK_CLUSTER) {
     return `/c/${ clusterId }/manager/cluster.x-k8s.io.machine`;
   }
 
-  static goTo(clusterId: string): Cypress.Chainable<Cypress.AUTWindow> {
+  static goTo(clusterId: string = BLANK_CLUSTER): Cypress.Chainable<Cypress.AUTWindow> {
     return super.goTo(MachinesPagePo.createPath(clusterId));
   }
 
diff --git a/cypress/e2e/tests/pages/manager/machine-deployments.spec.ts b/cypress/e2e/tests/pages/manager/machine-deployments.spec.ts
index 6e01ca918f6..f16bd8507dc 100644
--- a/cypress/e2e/tests/pages/manager/machine-deployments.spec.ts
+++ b/cypress/e2e/tests/pages/manager/machine-deployments.spec.ts
@@ -22,7 +22,7 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
   });
 
   it('can create a MachineDeployments', function() {
-    MachineDeploymentsPagePo.navTo();
+    MachineDeploymentsPagePo.goTo();
     machineDeploymentsPage.waitForPage();
 
     machineDeploymentsPage.create();
@@ -34,6 +34,7 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
       const json: any = jsyaml.load(machineDeploymentDoc);
 
       json.metadata.name = this.machineDeploymentsName;
+      json.metadata.namespace = nsName;
       machineDeploymentsPage.yamlEditor().set(jsyaml.dump(json));
     });
 
@@ -41,7 +42,6 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
     machineDeploymentsPage.createEditMachineDeployment().saveCreateForm().resourceYaml().saveOrCreate()
       .click();
     cy.wait('@createMachineDeployment').then((req) => {
-      resourceVersion = req.response?.body.metadata.resourceVersion;
       creationTimestamp = req.response?.body.metadata.creationTimestamp;
       time = req.response?.body.metadata.managedFields[0].time;
       uid = req.response?.body.metadata.uid;
@@ -56,6 +56,11 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
     machineDeploymentsPage.list().actionMenu(this.machineDeploymentsName).getMenuItem('Edit YAML').click();
     machineDeploymentsPage.createEditMachineDeployment(nsName, this.machineDeploymentsName).waitForPage('mode=edit&as=yaml');
 
+    cy.getRancherResource('v1', 'cluster.x-k8s.io.machinedeployments', `${ nsName }/${ this.machineDeploymentsName }`, 200).then((resp) => {
+      // Resource gets updated post create (finalizer added). So refetch it to get the correct resourceVersion
+      resourceVersion = resp.body.metadata.resourceVersion;
+    });
+
     cy.readFile('cypress/e2e/blueprints/cluster_management/machine-deployments-edit.yml').then((machineSetDoc) => {
       // convert yaml into json to update values
       const json: any = jsyaml.load(machineSetDoc);
@@ -85,12 +90,14 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
     machineDeploymentsPage.waitForPage();
     machineDeploymentsPage.list().actionMenu(this.machineDeploymentsName).getMenuItem('Clone').click();
     machineDeploymentsPage.createEditMachineDeployment(nsName, this.machineDeploymentsName).waitForPage('mode=clone&as=yaml');
+    const cloneName = `${ this.machineDeploymentsName }-clone`;
 
     cy.readFile('cypress/e2e/blueprints/cluster_management/machine-deployments.yml').then((machineSetDoc) => {
       // convert yaml into json to update name value
       const json: any = jsyaml.load(machineSetDoc);
 
-      json.metadata.name = `${ this.machineDeploymentsName }-clone`;
+      json.metadata.name = cloneName;
+      json.metadata.namespace = nsName;
       machineDeploymentsPage.yamlEditor().set(jsyaml.dump(json));
     });
 
@@ -101,7 +108,7 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
     machineDeploymentsPage.waitForPage();
 
     // check list details
-    machineDeploymentsPage.list().details(`${ this.machineDeploymentsName }-clone`, 2).should('be.visible');
+    machineDeploymentsPage.list().details(cloneName, 2).should('be.visible');
   });
 
   it('can download YAML', function() {
@@ -125,8 +132,10 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
     MachineDeploymentsPagePo.navTo();
     machineDeploymentsPage.waitForPage();
 
+    const cloneName = `${ this.machineDeploymentsName }-clone`;
+
     // delete original cloned MachineSet
-    machineDeploymentsPage.list().actionMenu(`${ this.machineDeploymentsName }-clone`).getMenuItem('Delete').click();
+    machineDeploymentsPage.list().actionMenu(cloneName).getMenuItem('Delete').click();
 
     const promptRemove = new PromptRemove();
 
@@ -136,8 +145,16 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
     cy.wait('@deleteMachineSet');
     machineDeploymentsPage.waitForPage();
 
+    cy.getRancherResource('v1', 'cluster.x-k8s.io.machinedeployments', `${ nsName }/${ cloneName }`, 200).then((resp) => {
+      // Resource gets updated post create (finalizer added). So refetch it to get the correct resourceVersion
+      const resource = resp.body;
+
+      delete resource.metadata.finalizers;
+      cy.setRancherResource('v1', 'cluster.x-k8s.io.machinedeployments', `${ nsName }/${ cloneName }`, resource);
+    });
+
     // check list details
-    cy.contains(`${ this.machineDeploymentsName }-clone`).should('not.exist');
+    cy.contains(cloneName).should('not.exist');
   });
 
   it('can delete MachineDeployments via bulk actions', function() {
@@ -149,7 +166,9 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
       .set();
     machineDeploymentsPage.list().openBulkActionDropdown();
 
-    cy.intercept('DELETE', `v1/cluster.x-k8s.io.machinedeployments/${ nsName }/${ this.machineDeploymentsName }`).as('deleteMachineSet');
+    const machineName = `${ nsName }/${ this.machineDeploymentsName }`;
+
+    cy.intercept('DELETE', `v1/cluster.x-k8s.io.machinedeployments/${ machineName }`).as('deleteMachineSet');
     machineDeploymentsPage.list().bulkActionButton('Delete').click();
 
     const promptRemove = new PromptRemove();
@@ -158,6 +177,14 @@ describe('MachineDeployments', { testIsolation: 'off', tags: ['@manager', '@admi
     cy.wait('@deleteMachineSet');
     machineDeploymentsPage.waitForPage();
 
+    cy.getRancherResource('v1', 'cluster.x-k8s.io.machinedeployments', `${ machineName }`, 200).then((resp) => {
+      // Resource gets updated post create (finalizer added). So refetch it to get the correct resourceVersion
+      const resource = resp.body;
+
+      delete resource.metadata.finalizers;
+      cy.setRancherResource('v1', 'cluster.x-k8s.io.machinedeployments', `${ machineName }`, resource);
+    });
+
     // check list details
     cy.contains(this.machineDeploymentsName).should('not.exist');
   });
diff --git a/cypress/e2e/tests/pages/manager/machine-sets.spec.ts b/cypress/e2e/tests/pages/manager/machine-sets.spec.ts
index 42ed441ca42..a87451bd4b7 100644
--- a/cypress/e2e/tests/pages/manager/machine-sets.spec.ts
+++ b/cypress/e2e/tests/pages/manager/machine-sets.spec.ts
@@ -22,7 +22,7 @@ describe('MachineSets', { testIsolation: 'off', tags: ['@manager', '@adminUser']
   });
 
   it('can create a MachineSet', function() {
-    MachineSetsPagePo.navTo();
+    MachineSetsPagePo.goTo();
     machineSetsPage.waitForPage();
     machineSetsPage.create();
 
@@ -40,7 +40,6 @@ describe('MachineSets', { testIsolation: 'off', tags: ['@manager', '@adminUser']
     machineSetsPage.createEditMachineSet().saveCreateForm().resourceYaml().saveOrCreate()
       .click();
     cy.wait('@createMachineSet').then((req) => {
-      resourceVersion = req.response?.body.metadata.resourceVersion;
       creationTimestamp = req.response?.body.metadata.creationTimestamp;
       time = req.response?.body.metadata.managedFields[0].time;
       uid = req.response?.body.metadata.uid;
@@ -55,6 +54,11 @@ describe('MachineSets', { testIsolation: 'off', tags: ['@manager', '@adminUser']
     machineSetsPage.list().actionMenu(this.machineSetName).getMenuItem('Edit YAML').click();
     machineSetsPage.createEditMachineSet(nsName, this.machineSetName).waitForPage('mode=edit&as=yaml');
 
+    cy.getRancherResource('v1', 'cluster.x-k8s.io.machinesets', `${ nsName }/${ this.machineSetName }`, 200).then((resp) => {
+      // Resource gets updated post create (finalizer added). So refetch it to get the correct resourceVersion
+      resourceVersion = resp.body.metadata.resourceVersion;
+    });
+
     cy.readFile('cypress/e2e/blueprints/cluster_management/machine-sets-edit.yml').then((machineSetDoc) => {
       // convert yaml into json to update values
       const json: any = jsyaml.load(machineSetDoc);
@@ -89,7 +93,8 @@ describe('MachineSets', { testIsolation: 'off', tags: ['@manager', '@adminUser']
       // convert yaml into json to update name value
       const json: any = jsyaml.load(machineSetDoc);
 
-      json.metadata.name = `${ this.machineDeploymentsName }-clone`;
+      json.metadata.name = `${ this.machineSetName }-clone`;
+      json.metadata.namespace = nsName;
       machineSetsPage.yamlEditor().set(jsyaml.dump(json));
     });
 
@@ -100,7 +105,7 @@ describe('MachineSets', { testIsolation: 'off', tags: ['@manager', '@adminUser']
     machineSetsPage.waitForPage();
 
     // check list details
-    machineSetsPage.list().details(`${ this.machineDeploymentsName }-clone`, 2).should('be.visible');
+    machineSetsPage.list().details(`${ this.machineSetName }-clone`, 2).should('be.visible');
   });
 
   it('can download YAML', function() {
@@ -125,18 +130,27 @@ describe('MachineSets', { testIsolation: 'off', tags: ['@manager', '@adminUser']
     machineSetsPage.waitForPage();
 
     // delete original cloned MachineSet
-    machineSetsPage.list().actionMenu(`${ this.machineDeploymentsName }-clone`).getMenuItem('Delete').click();
+    machineSetsPage.list().actionMenu(`${ this.machineSetName }-clone`).getMenuItem('Delete').click();
 
     const promptRemove = new PromptRemove();
+    const name = `${ nsName }/${ this.machineSetName }-clone`;
 
-    cy.intercept('DELETE', `v1/cluster.x-k8s.io.machinesets/${ nsName }/${ this.machineDeploymentsName }-clone`).as('deleteMachineSet');
+    cy.intercept('DELETE', `v1/cluster.x-k8s.io.machinesets/${ name }`).as('deleteMachineSet');
 
     promptRemove.remove();
     cy.wait('@deleteMachineSet');
     machineSetsPage.waitForPage();
 
+    cy.getRancherResource('v1', 'cluster.x-k8s.io.machinesets', `${ name }`, 200).then((resp) => {
+      // Resource gets updated post create (finalizer added). So refetch it to get the correct resourceVersion
+      const resource = resp.body;
+
+      delete resource.metadata.finalizers;
+      cy.setRancherResource('v1', 'cluster.x-k8s.io.machinesets', `${ name }`, resource);
+    });
+
     // check list details
-    cy.contains(`${ this.machineDeploymentsName }-clone`).should('not.exist');
+    cy.contains(`${ this.machineSetName }-clone`).should('not.exist');
   });
 
   it('can delete MachineSet via bulk actions', function() {
@@ -148,7 +162,9 @@ describe('MachineSets', { testIsolation: 'off', tags: ['@manager', '@adminUser']
       .set();
     machineSetsPage.list().openBulkActionDropdown();
 
-    cy.intercept('DELETE', `v1/cluster.x-k8s.io.machinesets/${ nsName }/${ this.machineSetName }`).as('deleteMachineSet');
+    const name = `${ nsName }/${ this.machineSetName }`;
+
+    cy.intercept('DELETE', `v1/cluster.x-k8s.io.machinesets/${ name }`).as('deleteMachineSet');
     machineSetsPage.list().bulkActionButton('Delete').click();
 
     const promptRemove = new PromptRemove();
@@ -157,6 +173,14 @@ describe('MachineSets', { testIsolation: 'off', tags: ['@manager', '@adminUser']
     cy.wait('@deleteMachineSet');
     machineSetsPage.waitForPage();
 
+    cy.getRancherResource('v1', 'cluster.x-k8s.io.machinesets', `${ name }`, 200).then((resp) => {
+      // Resource gets updated post create (finalizer added). So refetch it to get the correct resourceVersion
+      const resource = resp.body;
+
+      delete resource.metadata.finalizers;
+      cy.setRancherResource('v1', 'cluster.x-k8s.io.machinesets', `${ name }`, resource);
+    });
+
     // check list details
     cy.contains(this.machineSetName).should('not.exist');
   });
diff --git a/cypress/e2e/tests/pages/manager/machines.spec.ts b/cypress/e2e/tests/pages/manager/machines.spec.ts
index a878a46d3bf..a2bf1a5fcd4 100644
--- a/cypress/e2e/tests/pages/manager/machines.spec.ts
+++ b/cypress/e2e/tests/pages/manager/machines.spec.ts
@@ -22,7 +22,7 @@ describe('Machines', { testIsolation: 'off', tags: ['@manager', '@adminUser'] },
   });
 
   it('can create a Machine', function() {
-    MachinesPagePo.navTo();
+    MachinesPagePo.goTo();
     machinesPage.waitForPage();
     machinesPage.create();
 
@@ -44,7 +44,6 @@ describe('Machines', { testIsolation: 'off', tags: ['@manager', '@adminUser'] },
     machinesPage.createEditMachines().saveCreateForm().resourceYaml().saveOrCreate()
       .click();
     cy.wait('@createMachine').then((req) => {
-      resourceVersion = req.response?.body.metadata.resourceVersion;
       creationTimestamp = req.response?.body.metadata.creationTimestamp;
       time = req.response?.body.metadata.managedFields[0].time;
       uid = req.response?.body.metadata.uid;
@@ -59,6 +58,11 @@ describe('Machines', { testIsolation: 'off', tags: ['@manager', '@adminUser'] },
     machinesPage.list().actionMenu(this.machineName).getMenuItem('Edit YAML').click();
     machinesPage.createEditMachines(nsName, this.machineName).waitForPage('mode=edit&as=yaml');
 
+    cy.getRancherResource('v1', 'cluster.x-k8s.io.machines', `${ nsName }/${ this.machineName }`, 200).then((resp) => {
+      // Resource gets updated post create (finalizer added). So refetch it to get the correct resourceVersion
+      resourceVersion = resp.body.metadata.resourceVersion;
+    });
+
     cy.readFile('cypress/e2e/blueprints/cluster_management/machines-edit.yml').then((machineDoc) => {
       // convert yaml into json to update values
       const json: any = jsyaml.load(machineDoc);
@@ -107,12 +111,22 @@ describe('Machines', { testIsolation: 'off', tags: ['@manager', '@adminUser'] },
 
     const promptRemove = new PromptRemove();
 
-    cy.intercept('DELETE', `v1/cluster.x-k8s.io.machines/${ nsName }/${ this.machineName }`).as('deleteCloudCred');
+    const machineName = `${ nsName }/${ this.machineName }`;
+
+    cy.intercept('DELETE', `v1/cluster.x-k8s.io.machines/${ machineName }`).as('deleteCloudCred');
 
     promptRemove.remove();
     cy.wait('@deleteCloudCred');
     machinesPage.waitForPage();
 
+    cy.getRancherResource('v1', 'cluster.x-k8s.io.machines', `${ machineName }`, 200).then((resp) => {
+      // Resource gets updated post create (finalizer added). So refetch it to get the correct resourceVersion
+      const resource = resp.body;
+
+      delete resource.metadata.finalizers;
+      cy.setRancherResource('v1', 'cluster.x-k8s.io.machines', `${ machineName }`, resource);
+    });
+
     // check list details
     cy.contains(this.machineName).should('not.exist');
   });

From d6c6778e164fc2dfcf7d33fbf450817258e431fd Mon Sep 17 00:00:00 2001
From: Cody Jackson <cody.jackson@suse.com>
Date: Fri, 21 Feb 2025 15:35:53 -0700
Subject: [PATCH 035/140] Change the way we size the ns-glass element
 responsible for closing the dropdown if you click outside of the element

Fixes https://github.com/rancher/dashboard/issues/6748
---
 shell/components/nav/NamespaceFilter.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/shell/components/nav/NamespaceFilter.vue b/shell/components/nav/NamespaceFilter.vue
index 5fbf73135e0..238b6a998f7 100644
--- a/shell/components/nav/NamespaceFilter.vue
+++ b/shell/components/nav/NamespaceFilter.vue
@@ -894,12 +894,13 @@ export default {
     display: inline-block;
 
     .ns-glass {
-      height: 100vh;
+      top: 0;
+      bottom: 0;
       left: 0;
+      right: 0;
       opacity: 0;
-      position: absolute;
-      top: 0;
-      width: 100vw;
+      position: fixed;
+
       z-index: z-index('overContent');
     }
 

From 1c360d659f92f221d0562681576e7831c4f04a12 Mon Sep 17 00:00:00 2001
From: Cody Jackson <cody.jackson@suse.com>
Date: Wed, 19 Feb 2025 11:05:57 -0700
Subject: [PATCH 036/140] Adding a after login redirect for the case when a
 user enters a url but gets redirected to the login page

Fixes https://github.com/rancher/dashboard/issues/11224
---
 cypress/e2e/po/pages/page.po.ts               |  14 +-
 .../tests/pages/user-menu/preferences.spec.ts | 167 +++++++++---------
 cypress/globals.d.ts                          |   2 +-
 .../support/commands/rancher-api-commands.ts  |   7 +-
 shell/components/LandingPagePreference.vue    |   4 +-
 shell/components/templates/default.vue        |  45 -----
 .../config/router/navigation-guards/index.js  |   3 +-
 .../navigation-guards/record-last-route.js    |  24 +++
 shell/store/prefs.js                          |  37 +---
 shell/utils/auth.js                           |   4 +
 10 files changed, 143 insertions(+), 164 deletions(-)
 create mode 100644 shell/config/router/navigation-guards/record-last-route.js

diff --git a/cypress/e2e/po/pages/page.po.ts b/cypress/e2e/po/pages/page.po.ts
index 40e459c39f2..34605dcf8f5 100644
--- a/cypress/e2e/po/pages/page.po.ts
+++ b/cypress/e2e/po/pages/page.po.ts
@@ -51,12 +51,18 @@ export default class PagePo extends ComponentPo {
     return cy.url().should('include', `${ Cypress.config().baseUrl + (!!path ? path : this.path) }${ !!params ? `?${ params }` : '' }${ !!fragment ? `#${ fragment }` : '' }`);
   }
 
-  isCurrentPage(): Cypress.Chainable<boolean> {
-    return cy.url().then((url) => url === Cypress.config().baseUrl + this.path);
+  isCurrentPage(isExact = true): Cypress.Chainable<boolean> {
+    return cy.url().then((url) => {
+      if (isExact) {
+        return url === Cypress.config().baseUrl + this.path;
+      } else {
+        return url.indexOf(Cypress.config().baseUrl + this.path) === 0;
+      }
+    });
   }
 
-  checkIsCurrentPage() {
-    return this.isCurrentPage().should('eq', true);
+  checkIsCurrentPage(exact = true) {
+    return this.isCurrentPage(exact).should('eq', true);
   }
 
   mastheadTitle() {
diff --git a/cypress/e2e/tests/pages/user-menu/preferences.spec.ts b/cypress/e2e/tests/pages/user-menu/preferences.spec.ts
index e04f856e9a6..d01c3806c58 100644
--- a/cypress/e2e/tests/pages/user-menu/preferences.spec.ts
+++ b/cypress/e2e/tests/pages/user-menu/preferences.spec.ts
@@ -104,59 +104,6 @@ describe('User can update their preferences', () => {
     }
   });
 
-  // it.skip('[Vue3 Skip]: Can select login landing page', { tags: ['@userMenu', '@adminUser'] }, () => {
-  //   /*
-  //   Select each radio button and verify its highlighted
-  //   Validate http request's payload & response contain correct values per selection
-  //   Verify user is landing on correct page after login
-  //   Verify selection is preserved after logout/login
-  //   */
-
-  //   const landingPageOptions = [
-  //     {
-  //       index: '0', value: '"home"', page: '/home'
-  //     },
-  //     {
-  //       index: '1', value: '"last-visited"', page: 'c/_/manager/provisioning.cattle.io.cluster'
-  //     },
-  //     { // This option only works when there is an existing local cluster
-  //       index: '2', value: '{\"name\":\"c-cluster\",\"params\":{\"cluster\":\"local\"}}', page: '/explore'
-  //     },
-  //   ];
-
-  //   prefPage.goTo();
-  //   prefPage.landingPageRadioBtn().checkVisible();
-  //   landingPageOptions.forEach((key) => {
-  //     cy.intercept('PUT', 'v1/userpreferences/*').as(`prefUpdate${ key.value }`);
-  //     prefPage.landingPageRadioBtn().set(parseInt(key.index));
-  //     cy.wait(`@prefUpdate${ key.value }`).then(({ request, response }) => {
-  //       expect(response?.statusCode).to.eq(200);
-  //       expect(request.body.data).to.have.property('after-login-route', key.value);
-  //       expect(response?.body.data).to.have.property('after-login-route', key.value);
-  //     });
-  //     prefPage.landingPageRadioBtn().isChecked(parseInt(key.index));
-
-  //     // NOTE: Ideally we'd like to verify user is landing on correct page after login however there are issues with the login command
-
-  //     // if key is 1, navigate to cluster manager page and then do validations, else just do validations
-  //     // if (parseInt(key.index) === 1) {
-  //     //   cy.intercept('PUT', 'v1/userpreferences/*').as('userPref');
-  //     //   clusterManagerPage.goTo();
-  //     //   clusterManagerPage.list().checkVisible();
-  //     //   cy.wait('@userPref').its('response.statusCode').should('eq', 200);
-  //     // }
-
-  //   // userMenu.toggle();
-  //   // userMenu.isOpen();
-  //   // userMenu.clickMenuItem('Log Out');
-  //   // cy.login();
-  //   // cy.visit(`${ Cypress.config().baseUrl }`);
-  //   // cy.url().should('include', value[1]);
-  //   // prefPage.goTo();
-  //   // prefPage.landingPageRadioBtn().isChecked(key);
-  //   });
-  // });
-
   it('Can select date format', { tags: ['@userMenu', '@adminUser', '@standardUser'] }, () => {
     /*
     Select each option
@@ -413,45 +360,43 @@ describe('User can update their preferences', () => {
     }
   });
 
-  describe('Check keyboard mapping on YAML Editor', { tags: ['@userMenu', '@adminUser', '@standardUser'] }, () => {
-    it('does not show any indicator for default keyboard mapping', () => {
-      prefPage.goTo();
-      prefPage.keymapButtons().checkVisible();
+  it('YAML Editor does not show any indicator for default keyboard mapping', { tags: ['@userMenu', '@adminUser', '@standardUser'] }, () => {
+    prefPage.goTo();
+    prefPage.keymapButtons().checkVisible();
 
-      const yamlEditor = new ResourceYamlEditorPagePo(RESOURCE_FOR_CREATE_YAML);
+    const yamlEditor = new ResourceYamlEditorPagePo(RESOURCE_FOR_CREATE_YAML);
 
-      yamlEditor.goTo();
-      yamlEditor.waitForPage();
+    yamlEditor.goTo();
+    yamlEditor.waitForPage();
 
-      yamlEditor.keyboardMappingIndicator().checkNotExists();
-    });
+    yamlEditor.keyboardMappingIndicator().checkNotExists();
+  });
 
-    // it.skip('[Vue3 Skip]: does show any indicator for non-default keyboard mapping', () => {
-    //   prefPage.goTo();
-    //   prefPage.keymapButtons().checkVisible();
+  // it.skip('[Vue3 Skip]: YAML Editor does show any indicator for non-default keyboard mapping', { tags: ['@userMenu', '@adminUser', '@standardUser'] }, () => {
+  //   prefPage.goTo();
+  //   prefPage.keymapButtons().checkVisible();
 
-    //   prefPage.keymapButtons().set(VIM);
-    //   prefPage.keymapButtons().isSelected(VIM);
+  //   prefPage.keymapButtons().set(VIM);
+  //   prefPage.keymapButtons().isSelected(VIM);
 
-    //   const yamlEditor = new ResourceYamlEditorPagePo(RESOURCE_FOR_CREATE_YAML);
+  //   const yamlEditor = new ResourceYamlEditorPagePo(RESOURCE_FOR_CREATE_YAML);
 
-    //   yamlEditor.goTo();
-    //   yamlEditor.waitForPage();
+  //   yamlEditor.goTo();
+  //   yamlEditor.waitForPage();
 
-    //   yamlEditor.keyboardMappingIndicator().checkExists();
-    //   yamlEditor.keyboardMappingIndicator().checkVisible();
+  //   yamlEditor.keyboardMappingIndicator().checkExists();
+  //   yamlEditor.keyboardMappingIndicator().checkVisible();
 
-    //   yamlEditor.keyboardMappingIndicator().showTooltip();
-    //   yamlEditor.keyboardMappingIndicator().getTooltipContent().should('be.visible');
-    //   yamlEditor.keyboardMappingIndicator().getTooltipContent().contains('Key mapping: Vim');
+  //   yamlEditor.keyboardMappingIndicator().showTooltip();
+  //   yamlEditor.keyboardMappingIndicator().getTooltipContent().should('be.visible');
+  //   yamlEditor.keyboardMappingIndicator().getTooltipContent().contains('Key mapping: Vim');
 
-    //   // Reset keyboard mapping
-    //   prefPage.goTo();
-    //   prefPage.keymapButtons().checkVisible();
+  //   // Reset keyboard mapping
+  //   prefPage.goTo();
+  //   prefPage.keymapButtons().checkVisible();
 
-    //   prefPage.keymapButtons().set(NORMAL_HUMAN);
-    // });
-  });
+  //   prefPage.keymapButtons().set(NORMAL_HUMAN);
+  // });
 
   it('Can select a Helm Charts option', { tags: ['@userMenu', '@adminUser', '@standardUser'] }, () => {
     /*
@@ -476,4 +421,64 @@ describe('User can update their preferences', () => {
       prefPage.helmButtons().isSelected(key);
     }
   });
+
+  // You want this to be last, there's some issues with logging in and logging out without sessions
+  it('Can select login landing page', { tags: ['@userMenu', '@adminUser'] }, () => {
+    /*
+    Select each radio button and verify its highlighted
+    Validate http request's payload & response contain correct values per selection
+    Verify user is landing on correct page after login
+    Verify selection is preserved after logout/login
+    */
+
+    const landingPageOptions = [
+      {
+        index: '0', value: '"home"', page: '/home'
+      },
+      {
+        index: '1', value: '"last-visited"', page: '/prefs'
+      },
+      { // This option only works when there is an existing local cluster
+        index: '2', value: '{\"name\":\"c-cluster\",\"params\":{\"cluster\":\"local\"}}', page: '/explore'
+      },
+    ];
+
+    landingPageOptions.forEach((key) => {
+      prefPage.goTo();
+      prefPage.landingPageRadioBtn().checkVisible();
+      cy.intercept('PUT', 'v1/userpreferences/*').as(`prefUpdate${ key.value }`);
+      prefPage.landingPageRadioBtn().set(parseInt(key.index));
+      cy.wait(`@prefUpdate${ key.value }`).then(({ request, response }) => {
+        expect(response?.statusCode).to.eq(200);
+        expect(request.body.data).to.have.property('after-login-route', key.value);
+        expect(response?.body.data).to.have.property('after-login-route', key.value);
+      });
+      prefPage.landingPageRadioBtn().isChecked(parseInt(key.index));
+
+      // Verify that an auth redirect works (a user visits a page while not authorized and will be redirect to that page after loggin in, only active when "Take me to the area I last visited" is selected)
+      if (key.index === '1') {
+        userMenu.clickMenuItem('Log Out');
+        cy.url().should('contain', 'auth/login?logged-out');
+
+        const redirectUrl = '/c/local/explorer/node';
+
+        cy.visit(redirectUrl);
+        cy.url().should('contain', 'auth/login?timed-out');
+
+        cy.login(undefined, undefined, false, true);
+        cy.url().should('contain', redirectUrl);
+        prefPage.goTo();
+        prefPage.landingPageRadioBtn().checkVisible();
+      }
+
+      // Verify the option functions after a login
+      userMenu.clickMenuItem('Log Out');
+      cy.url().should('contain', 'auth/login?logged-out');
+      cy.login(undefined, undefined, false);
+      cy.url().should('contain', key.page);
+    });
+
+    prefPage.goTo();
+    prefPage.landingPageRadioBtn().checkVisible();
+  });
 });
diff --git a/cypress/globals.d.ts b/cypress/globals.d.ts
index 071cf54bae9..70fac6d151e 100644
--- a/cypress/globals.d.ts
+++ b/cypress/globals.d.ts
@@ -73,7 +73,7 @@ declare global {
 
       state(state: any): any;
 
-      login(username?: string, password?: string, cacheSession?: boolean): Chainable<Element>;
+      login(username?: string, password?: string, cacheSession?: boolean, skipNavigation?: boolean): Chainable<Element>;
       logout(): Chainable;
       byLabel(label: string): Chainable<Element>;
       getRootE2EResourceName(): Chainable<string>;
diff --git a/cypress/support/commands/rancher-api-commands.ts b/cypress/support/commands/rancher-api-commands.ts
index 8ccb42e9425..775c5fdb92c 100644
--- a/cypress/support/commands/rancher-api-commands.ts
+++ b/cypress/support/commands/rancher-api-commands.ts
@@ -14,15 +14,18 @@ Cypress.Commands.add('login', (
   username = Cypress.env('username'),
   password = Cypress.env('password'),
   cacheSession = true,
+  skipNavigation = false,
 ) => {
   const login = () => {
     cy.intercept('POST', '/v3-public/localProviders/local*').as('loginReq');
 
-    LoginPagePo.goTo(); // Needs to happen before the page element is created/located
+    if (!skipNavigation) {
+      LoginPagePo.goTo(); // Needs to happen before the page element is created/located
+    }
     const loginPage = new LoginPagePo();
 
     loginPage
-      .checkIsCurrentPage();
+      .checkIsCurrentPage(!skipNavigation);
 
     loginPage.switchToLocal();
 
diff --git a/shell/components/LandingPagePreference.vue b/shell/components/LandingPagePreference.vue
index a22e9cc47e5..de6d76234fe 100644
--- a/shell/components/LandingPagePreference.vue
+++ b/shell/components/LandingPagePreference.vue
@@ -94,7 +94,7 @@ export default {
       if (neu) {
         this.afterLoginRoute = neu;
       } else {
-        this.afterLoginRoute = this.routeFromDropdown?.value;
+        this.afterLoginRoute = this.routeFromDropdown?.value || this.routeDropdownOptions[0]?.value;
       }
     },
   }
@@ -120,7 +120,7 @@ export default {
             :val="false"
             :value="afterLoginRoute=== 'home' || afterLoginRoute === 'last-visited'"
             :v-bind="$attrs"
-            @update:value="afterLoginRoute = false"
+            @update:value="afterLoginRoute = routeFromDropdown.value"
           />
           <Select
             v-model:value="routeFromDropdown"
diff --git a/shell/components/templates/default.vue b/shell/components/templates/default.vue
index cd3538e1f88..fb19b33992e 100644
--- a/shell/components/templates/default.vue
+++ b/shell/components/templates/default.vue
@@ -20,14 +20,12 @@ import AwsComplianceBanner from '@shell/components/AwsComplianceBanner';
 import AzureWarning from '@shell/components/auth/AzureWarning';
 import DraggableZone from '@shell/components/DraggableZone';
 import { MANAGEMENT } from '@shell/config/types';
-import isEqual from 'lodash/isEqual';
 import { markSeenReleaseNotes } from '@shell/utils/version';
 import PageHeaderActions from '@shell/mixins/page-actions';
 import BrowserTabVisibility from '@shell/mixins/browser-tab-visibility';
 import { getClusterFromRoute, getProductFromRoute } from '@shell/utils/router';
 import { BOTTOM } from '@shell/utils/position';
 import SideNav from '@shell/components/SideNav';
-import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
 const SET_LOGIN_ACTION = 'set-as-login';
 
@@ -115,35 +113,6 @@ export default {
 
   },
 
-  watch: {
-    clusterId(a, b) {
-      if ( !isEqual(a, b) ) {
-        // Store the last visited route when the cluster changes
-        this.setClusterAsLastRoute();
-      }
-    },
-
-    async currentProduct(a, b) {
-      if ( !isEqual(a, b) ) {
-        if ((a.inStore !== b.inStore || a.inStore !== 'cluster') && this.clusterId && a.name) {
-          const route = {
-            name:   'c-cluster-product',
-            params: {
-              cluster: this.clusterId,
-              product: a.name,
-            }
-          };
-
-          await this.$store.dispatch('prefs/setLastVisited', route);
-        }
-      }
-    },
-  },
-
-  async created() {
-    await this.$store.dispatch('prefs/setLastVisited', this.$route);
-  },
-
   mounted() {
     this.wmPin = window.localStorage.getItem('wm-pin') || BOTTOM;
 
@@ -159,20 +128,6 @@ export default {
   },
 
   methods: {
-    async setClusterAsLastRoute() {
-      if (!this.clusterId || this.clusterId === BLANK_CLUSTER) {
-        return;
-      }
-      const route = {
-        name:   this.$route.name,
-        params: {
-          ...this.$route.params,
-          cluster: this.clusterId,
-        }
-      };
-
-      await this.$store.dispatch('prefs/setLastVisited', route);
-    },
 
     handlePageAction(action) {
       if (action.action === SET_LOGIN_ACTION) {
diff --git a/shell/config/router/navigation-guards/index.js b/shell/config/router/navigation-guards/index.js
index 4319d822490..99d7daa9bf5 100644
--- a/shell/config/router/navigation-guards/index.js
+++ b/shell/config/router/navigation-guards/index.js
@@ -1,4 +1,5 @@
 import { install as installLoadInitialSettings } from '@shell/config/router/navigation-guards/load-initial-settings';
+import { install as installRecordLastRoute } from '@shell/config/router/navigation-guards/record-last-route';
 import { install as installAttemptFirstLogin } from '@shell/config/router/navigation-guards/attempt-first-login';
 import { install as installAuthentication } from '@shell/config/router/navigation-guards/authentication';
 import { install as installRuntimeExtensionRoute } from '@shell/config/router/navigation-guards/runtime-extension-route';
@@ -16,7 +17,7 @@ export function installNavigationGuards(router, context) {
   // NOTE: the order of the installation matters.
   // Be intentional when adding, removing or modifying the guards that are installed.
 
-  const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installServerUpgradeGrowl];
+  const navigationGuardInstallers = [installLoadInitialSettings, installAttemptFirstLogin, installAuthentication, installProducts, installClusters, installRuntimeExtensionRoute, installI18N, installHandleInstallRedirect, installPageTitle, installRecordLastRoute, installServerUpgradeGrowl];
 
   navigationGuardInstallers.forEach((installer) => installer(router, context));
 }
diff --git a/shell/config/router/navigation-guards/record-last-route.js b/shell/config/router/navigation-guards/record-last-route.js
new file mode 100644
index 00000000000..bc22581360e
--- /dev/null
+++ b/shell/config/router/navigation-guards/record-last-route.js
@@ -0,0 +1,24 @@
+export function install(router, context) {
+  router.beforeEach(async(to, from, next) => await recordLastRoute(to, from, next, context));
+}
+
+export async function recordLastRoute(to, from, next, { store }) {
+  try {
+    // - We don't want to record for auth because these handle logging in and logging out
+    // - We don't want to record for index or home because these are the default pages on login and they handle the redirect given the route recorded here.
+    //   If we record then we never actually redirect outside of the home page
+    if (to && !to.name.includes('auth') && to.name !== 'home' && to.name !== 'index') {
+      const route = {
+        name:   to.name,
+        params: to.params,
+
+      };
+
+      store.dispatch('prefs/setLastVisited', route);
+    }
+  } catch (e) {
+    console.error('Failed record last route', e); // eslint-disable-line no-console
+  }
+
+  next();
+}
diff --git a/shell/store/prefs.js b/shell/store/prefs.js
index cd169fc1d17..2bf4b9dd458 100644
--- a/shell/store/prefs.js
+++ b/shell/store/prefs.js
@@ -130,6 +130,7 @@ export const state = function() {
     cookiesLoaded: false,
     data:          {},
     definitions,
+    authRedirect:  null
   };
 };
 
@@ -215,6 +216,9 @@ export const getters = {
     case (afterLoginRoutePref === 'home'):
       return { name: 'home' };
     case (afterLoginRoutePref === 'last-visited'): {
+      if (state.authRedirect) {
+        return state.authRedirect;
+      }
       const lastVisitedPref = getters['get'](LAST_VISITED);
 
       if (lastVisitedPref) {
@@ -265,6 +269,10 @@ export const mutations = {
   setDefinition(state, { name, definition = {} }) {
     state.definitions[name] = definition;
   },
+
+  setAuthRedirect(state, route) {
+    state.authRedirect = route;
+  }
 };
 
 export const actions = {
@@ -491,9 +499,7 @@ export const actions = {
       return;
     }
 
-    const toSave = getLoginRoute(route);
-
-    return dispatch('set', { key: LAST_VISITED, value: toSave });
+    return dispatch('set', { key: LAST_VISITED, value: route });
   },
 
   toggleTheme({ getters, dispatch }) {
@@ -523,28 +529,3 @@ export const actions = {
     }
   }
 };
-
-function getLoginRoute(route) {
-  let parts = route.name?.split('-') || [];
-  const params = {};
-  const routeParams = route.params || {};
-
-  // Find the 'resource' part of the route, if it is there
-  const index = parts.findIndex((p) => p === 'resource');
-
-  if (index >= 0) {
-    parts = parts.slice(0, index);
-  }
-
-  // Just keep the params that are needed
-  parts.forEach((param) => {
-    if (routeParams[param]) {
-      params[param] = routeParams[param];
-    }
-  });
-
-  return {
-    name: parts.join('-'),
-    params
-  };
-}
diff --git a/shell/utils/auth.js b/shell/utils/auth.js
index d59bbf8a56d..68e46a4f049 100644
--- a/shell/utils/auth.js
+++ b/shell/utils/auth.js
@@ -315,6 +315,10 @@ export function isLoggedIn(store, me) {
 export function notLoggedIn(store, redirect, route) {
   store.commit('auth/hasAuth', true);
 
+  if (!route.name.includes('auth')) {
+    store.commit('prefs/setAuthRedirect', route);
+  }
+
   if ( route.name === 'index' ) {
     return redirect('/auth/login');
   } else {

From 5191c0a48f4d54df0513892b68fd3de3f5764e89 Mon Sep 17 00:00:00 2001
From: Cody Jackson <cody.jackson@suse.com>
Date: Thu, 20 Feb 2025 14:12:45 -0700
Subject: [PATCH 037/140] Updating the wording used for etcd snapshots

Fixes https://github.com/rancher/dashboard/issues/12487
---
 shell/assets/translations/en-us.yaml                     | 9 ++++++---
 .../provisioning.cattle.io.cluster/tabs/etcd/index.vue   | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 1209c9da509..372f16c4687 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2063,7 +2063,7 @@ cluster:
         title: Save Machine Configurations
         body: Machine Configurations define how machines in Pools are deployed.<br><br> They will be saved upfront to ensure valid Cluster YAML can be saved.
     snapshots:
-      suffix: Snapshots per node
+      suffix: Snapshots
     systemService:
       rke2-coredns: 'CoreDNS'
       rke2-ingress-nginx: 'NGINX Ingress'
@@ -2155,15 +2155,18 @@ cluster:
         enable: Enable IPv6 support
     etcd:
       disableSnapshots:
-        label: Automatic Snapshots
+        label: Automatic Backups
       snapshotScheduleCron:
         label: Cron Schedule
       snapshotRetention:
-        label: Keep the last
+        label: Snapshot retention count 
+        tooltip: Each backup records 1 snapshot per etcd node. If you specify 3 snapshots and you have 3 etcd nodes you will only retain 1 full backup.
       exportMetric:
         label: Metrics
         false: Only available inside the cluster
         true: Exposed to the public interface
+      s3backups:
+        label: Save Backups to S3
   k3s:
     systemService:
       coredns: 'CoreDNS'
diff --git a/shell/edit/provisioning.cattle.io.cluster/tabs/etcd/index.vue b/shell/edit/provisioning.cattle.io.cluster/tabs/etcd/index.vue
index 504b9431c56..dba3e5c7afe 100644
--- a/shell/edit/provisioning.cattle.io.cluster/tabs/etcd/index.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/tabs/etcd/index.vue
@@ -91,6 +91,7 @@ export default {
           :mode="mode"
           :label="t('cluster.rke2.etcd.snapshotRetention.label')"
           :suffix="t('cluster.rke2.snapshots.suffix')"
+          :tooltip="t('cluster.rke2.etcd.snapshotRetention.tooltip')"
         />
       </div>
     </div>
@@ -102,8 +103,8 @@ export default {
         :value="s3Backup"
         name="etcd-s3"
         :options="[false, true]"
-        label="Backup Snapshots to S3"
-        :labels="['Disable','Enable']"
+        :label="t('cluster.rke2.etcd.s3backups.label')"
+        :labels="[t('generic.disable'),t('generic.enable')]"
         :mode="mode"
         @update:value="$emit('s3-backup-changed', $event)"
       />

From d79c491e8b25f75097fc7a2390c0144473ca4392 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Mon, 24 Feb 2025 15:12:31 +0000
Subject: [PATCH 038/140] Fix keyboard navigation and focus display issues on
 the combobox component (#13352)

* add label connection to dropdown on LabeledSelect + add missing roles and connections

* address pr comments
---
 shell/assets/translations/en-us.yaml       |  1 +
 shell/components/LandingPagePreference.vue |  1 +
 shell/components/PodSecurityAdmission.vue  | 12 ++++++------
 shell/components/form/LabeledSelect.vue    | 11 +++++++++--
 shell/components/form/Select.vue           |  2 +-
 shell/pages/prefs.vue                      |  6 +++++-
 6 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 1209c9da509..bcd5558d7e0 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -3109,6 +3109,7 @@ landing:
     title: You can change what you see when you login via preferences
     userPrefs: Preferences
     body: "You can change where you land when you login"
+    ariaLabelTakeMeToCluster: Select which cluster to take me to after login
     options:
       homePage: Take me to the home page
       lastVisited: Take me to the area I last visited
diff --git a/shell/components/LandingPagePreference.vue b/shell/components/LandingPagePreference.vue
index a22e9cc47e5..d966dd03a89 100644
--- a/shell/components/LandingPagePreference.vue
+++ b/shell/components/LandingPagePreference.vue
@@ -124,6 +124,7 @@ export default {
           />
           <Select
             v-model:value="routeFromDropdown"
+            :aria-label="t('landing.landingPrefs.ariaLabelTakeMeToCluster')"
             :searchable="true"
             :disabled="afterLoginRoute === 'home' || afterLoginRoute === 'last-visited'"
             :clearable="false"
diff --git a/shell/components/PodSecurityAdmission.vue b/shell/components/PodSecurityAdmission.vue
index a525fc5a38c..b4dd3ce9ace 100644
--- a/shell/components/PodSecurityAdmission.vue
+++ b/shell/components/PodSecurityAdmission.vue
@@ -229,17 +229,17 @@ export default defineComponent({
           @update:value="updateLabels()"
         />
         <p v-else>
-          <t :k="`podSecurityAdmission.labels.${level}`" />
+          <t
+            :id="`psa-label-for-level-${ level }`"
+            :k="`podSecurityAdmission.labels.${level}`"
+          />
         </p>
       </span>
 
-      <span
-        class="
-          col
-          span-4"
-      >
+      <span class="col span-4">
         <LabeledSelect
           v-model:value="psaControl.level"
+          :aria-labelledby="`psa-label-for-level-${ level }`"
           :data-testid="componentTestid + '--psaControl-' + i + '-level'"
           :disabled="isPsaControlDisabled(psaControl.active)"
           :options="options"
diff --git a/shell/components/form/LabeledSelect.vue b/shell/components/form/LabeledSelect.vue
index 0bb3c360a62..94229b0cb4e 100644
--- a/shell/components/form/LabeledSelect.vue
+++ b/shell/components/form/LabeledSelect.vue
@@ -5,6 +5,7 @@ import { get } from '@shell/utils/object';
 import { LabeledTooltip } from '@components/LabeledTooltip';
 import VueSelectOverrides from '@shell/mixins/vue-select-overrides';
 import { onClickOption, calculatePosition } from '@shell/utils/select';
+import { generateRandomAlphaString } from '@shell/utils/string';
 import LabeledSelectPagination from '@shell/components/form/labeled-select-utils/labeled-select-pagination';
 import { LABEL_SELECT_NOT_OPTION_KINDS } from '@shell/types/components/labeledSelect';
 import { mapGetters } from 'vuex';
@@ -116,7 +117,8 @@ export default {
   data() {
     return {
       selectedVisibility: 'visible',
-      shouldOpen:         true
+      shouldOpen:         true,
+      uid:                generateRandomAlphaString(10)
     };
   },
 
@@ -302,7 +304,10 @@ export default {
       :class="{ 'labeled-container': true, raised, empty, [mode]: true }"
       :style="{ border: 'none' }"
     >
-      <label v-if="hasLabel">
+      <label
+        v-if="hasLabel"
+        :id="`labeled-select-uid-${uid}`"
+      >
         <t
           v-if="labelKey"
           :k="labelKey"
@@ -317,6 +322,7 @@ export default {
     </div>
     <v-select
       ref="select-input"
+      :aria-labelledby="hasLabel ? `labeled-select-uid-${uid}` : ''"
       v-bind="filteredAttrs"
       class="inline"
       :append-to-body="appendToBody"
@@ -337,6 +343,7 @@ export default {
       :modelValue="value != null && !loading ? value : ''"
       :dropdown-should-open="dropdownShouldOpen"
       :tabindex="-1"
+      role="listbox"
       @update:modelValue="$emit('selecting', $event); $emit('update:value', $event)"
       @search:blur="onBlur"
       @search:focus="onFocus"
diff --git a/shell/components/form/Select.vue b/shell/components/form/Select.vue
index dd1255a70ca..ed836591b8f 100644
--- a/shell/components/form/Select.vue
+++ b/shell/components/form/Select.vue
@@ -281,7 +281,7 @@ export default {
       :modelValue="value != null ? value : ''"
       :dropdownShouldOpen="handleDropdownOpen"
       :tabindex="-1"
-
+      role="listbox"
       @update:modelValue="$emit('update:value', $event)"
       @search:blur="onBlur"
       @search:focus="onFocus"
diff --git a/shell/pages/prefs.vue b/shell/pages/prefs.vue
index 689e1527ceb..5c199e077dd 100644
--- a/shell/pages/prefs.vue
+++ b/shell/pages/prefs.vue
@@ -191,11 +191,15 @@ export default {
       v-if="hasMultipleLocales && !isHarvester"
       class="mt-10 mb-10"
     >
-      <h4 v-t="'prefs.language'" />
+      <h4
+        id="prefs-language"
+        v-t="'prefs.language'"
+      />
       <div class="row">
         <div class="col span-4">
           <LocaleSelector
             data-testid="prefs__languageSelector"
+            aria-labelledby="prefs-language"
           />
         </div>
       </div>

From 46aa2851c0a6939e3c798f5497bdd42d9b0f5924 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Mon, 24 Feb 2025 15:27:30 +0000
Subject: [PATCH 039/140] prevent scroll when hitting arrow down key on selects
 (#13466)

---
 shell/components/form/LabeledSelect.vue | 3 ++-
 shell/components/form/Select.vue        | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/shell/components/form/LabeledSelect.vue b/shell/components/form/LabeledSelect.vue
index 94229b0cb4e..2207b3392e7 100644
--- a/shell/components/form/LabeledSelect.vue
+++ b/shell/components/form/LabeledSelect.vue
@@ -297,7 +297,8 @@ export default {
     ]"
     :tabindex="isView || disabled ? -1 : 0"
     @click="focusSearch"
-    @keydown.enter.down="focusSearch"
+    @keydown.enter="focusSearch"
+    @keydown.down.prevent="focusSearch"
     @keydown.space.prevent="focusSearch"
   >
     <div
diff --git a/shell/components/form/Select.vue b/shell/components/form/Select.vue
index ed836591b8f..74e5807ad0a 100644
--- a/shell/components/form/Select.vue
+++ b/shell/components/form/Select.vue
@@ -256,7 +256,8 @@ export default {
     }"
     :tabindex="disabled || isView ? -1 : 0"
     @click="focusSearch"
-    @keydown.enter.down="focusSearch"
+    @keydown.enter="focusSearch"
+    @keydown.down.prevent="focusSearch"
     @keydown.space.prevent="focusSearch"
   >
     <v-select

From 6f8863c6e70d8ae8b556a8b9dd07502d4a3ba053 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Fri, 21 Feb 2025 16:37:42 -0700
Subject: [PATCH 040/140] Reintroduce destructure assignment of `handleKeydown`

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 pkg/rancher-components/src/components/RcDropdown/RcDropdown.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/rancher-components/src/components/RcDropdown/RcDropdown.vue b/pkg/rancher-components/src/components/RcDropdown/RcDropdown.vue
index f7c1fe7260c..bda0f337edb 100644
--- a/pkg/rancher-components/src/components/RcDropdown/RcDropdown.vue
+++ b/pkg/rancher-components/src/components/RcDropdown/RcDropdown.vue
@@ -37,6 +37,7 @@ const {
   setFocus,
   provideDropdownContext,
   registerDropdownCollection,
+  handleKeydown,
 } = useDropdownContext(emit);
 
 provideDropdownContext();

From 00ec5611804c4acdd5406d006dd733869450bf00 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Fri, 21 Feb 2025 12:07:03 -0700
Subject: [PATCH 041/140] Add ability to modify GroupSearchEnabled for Generic
 OIDC

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 shell/assets/translations/en-us.yaml |  5 ++++-
 shell/edit/auth/oidc.vue             | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index bcd5558d7e0..c35ac7cdd59 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -661,6 +661,9 @@ authConfig:
     key:
       label: Private Key
       placeholder: Paste in the private key, typically starting with -----BEGIN RSA PRIVATE KEY-----
+    groupSearch:
+      label: Enable group search
+      tooltip: Allows users with appropriate permissions to search and view all groups within the OIDC provider's realm. This can be useful for administrators who need to assign global roles to groups that they are not currently a member of.
   stateBanner:
     disabled: 'The {provider} authentication provider is currently disabled.'
     enabled: 'The {provider} authentication provider is currently enabled.'
@@ -8024,4 +8027,4 @@ gitPicker:
 
 networkAttachmentDefinition:
   tabs:
-    config: Config
\ No newline at end of file
+    config: Config
diff --git a/shell/edit/auth/oidc.vue b/shell/edit/auth/oidc.vue
index d625c60053f..993b2d9cc02 100644
--- a/shell/edit/auth/oidc.vue
+++ b/shell/edit/auth/oidc.vue
@@ -11,6 +11,7 @@ import AdvancedSection from '@shell/components/AdvancedSection.vue';
 import ArrayList from '@shell/components/form/ArrayList';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { RadioGroup } from '@components/Form/Radio';
+import { Checkbox } from '@components/Form/Checkbox';
 
 export default {
   components: {
@@ -23,7 +24,8 @@ export default {
     AdvancedSection,
     ArrayList,
     LabeledInput,
-    RadioGroup
+    RadioGroup,
+    Checkbox,
   },
 
   mixins: [CreateEditView, AuthConfig],
@@ -253,6 +255,17 @@ export default {
           </div>
         </div>
 
+        <div class="row mb-20">
+          <div class="col span-6">
+            <Checkbox
+              v-model:value="model.groupSearchEnabled"
+              :label="t('authConfig.oidc.groupSearch.label')"
+              :tooltip="t('authConfig.oidc.groupSearch.tooltip')"
+              :mode="mode"
+            />
+          </div>
+        </div>
+
         <div class="row mb-20">
           <div class="col span-6">
             <ArrayList

From e020b5fb9092783cea376e862e8247884857b000 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 24 Feb 2025 16:25:21 +0000
Subject: [PATCH 042/140]  Accessibility tests (#12900)

* WIP: Accessibility e2e test suite and support

* Add e2e job for accessibility tests

* Fix a11y tests

* Remove test

* Fix lint issues

* Add report upload

* Upload a11y screenshots

* Remove failure gate on a11y screenshots

* Test debugging

* Fix lint

* Fix setup issue

* Tweak tests

* Create a11y report

* Fix screenshot folder

* Build out more tests to cover a11y
---
 .github/workflows/test.yaml                   |  58 +++++
 .gitignore                                    |   2 +
 cypress.config.ts                             |  15 +-
 cypress/e2e/po/pages/account-api-keys.po.ts   |   4 +
 cypress/e2e/tests/accessibility/shell.spec.ts |  95 ++++++++
 cypress/e2e/tests/setup/rancher-setup.spec.ts |   2 +-
 cypress/globals.d.ts                          |  10 +
 cypress/support/commands/accessiblity.ts      | 145 +++++++++++
 cypress/support/e2e.ts                        |   3 +
 .../support/plugins/accessibility/index.ts    | 230 ++++++++++++++++++
 cypress/tsconfig.json                         |   3 +-
 package.json                                  |   3 +
 yarn.lock                                     |  66 ++---
 13 files changed, 593 insertions(+), 43 deletions(-)
 create mode 100644 cypress/e2e/tests/accessibility/shell.spec.ts
 create mode 100644 cypress/support/commands/accessiblity.ts
 create mode 100644 cypress/support/plugins/accessibility/index.ts

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 544c038c9b1..0814e62b80c 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -142,7 +142,65 @@ jobs:
           name: ${{github.run_number}}-${{github.run_attempt}}-screenshots-${{ matrix.role.tag }}+${{ matrix.features[0] }}
           path: cypress/screenshots
 
+  a11y-test:
+    if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')"
+    needs: e2e-ui-build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - name: Setup env
+        uses: ./.github/actions/setup
 
+      # Installing fixed version of Chrome since latest version does not work (128 didn't work)
+      # Leaving this here again in case we need to pin to a specific Chrome version in the future
+      - name: Install Chrome 127
+        run: |
+          sudo apt-get install -y wget libu2f-udev
+          cd /tmp
+          wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb
+          sudo dpkg -i google-chrome-stable_127.0.6533.72-1_amd64.deb
+          sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb
+          google-chrome --version
+
+      - name: Download e2e build
+        uses:  actions/download-artifact@v4
+        with:
+          name: ${{ env.E2E_BUILD_DIST_NAME }}
+          path: ${{ env.E2E_BUILD_DIST_DIR }}
+      - name: Download e2e build ember
+        uses:  actions/download-artifact@v4
+        with:
+          name: ${{ env.E2E_BUILD_DIST_EMBER_NAME }}
+          path: ${{ env.E2E_BUILD_DIST_EMBER_DIR }}
+      
+      - name: Run Rancher
+        run: yarn e2e:docker
+      
+      - name: Setup Rancher and user
+        run: |
+          yarn e2e:prod
+        env: 
+          GREP_TAGS: "@adminUserSetup+@accessibility --@jenkins"
+          TEST_USERNAME: admin
+          TEST_ONLY: setup
+      - name: Run user tests
+        run: |
+          yarn e2e:prod
+          [ "$BUILD_DASHBOARD" != "false" ] || exit 0
+        env: 
+          TEST_SKIP: setup
+          GREP_TAGS: "@adminUser+@accessibility --@jenkins"
+          TEST_USERNAME: admin
+          TEST_A11Y: true
+
+      - name: Upload report
+        uses: actions/upload-artifact@v4
+        with:
+          name: accessibility-report
+          path: cypress/accessibility
+        
   unit-test:
     runs-on: ubuntu-latest
     steps:
diff --git a/.gitignore b/.gitignore
index 302960cdf52..45366e5d13b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,6 +90,8 @@ sw.*
 # Cypress e2e testing
 cypress/videos
 cypress/screenshots
+cypress/accessibility
+setupTestEnv.sh
 
 # Storybook
 storybook-static/
diff --git a/cypress.config.ts b/cypress.config.ts
index 9df70c7d57f..936ba921e75 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -3,6 +3,7 @@ import { defineConfig } from 'cypress';
 import { removeDirectory } from 'cypress-delete-downloads-folder';
 import { getSpecPattern } from '@/scripts/cypress';
 import websocketTasks from './cypress/support/utils/webSocket-utils';
+import path from 'path';
 
 // Required for env vars to be available in cypress
 require('dotenv').config();
@@ -11,13 +12,17 @@ require('dotenv').config();
  * VARIABLES
  */
 const hasCoverage = (process.env.TEST_INSTRUMENT === 'true') || false; // Add coverage if instrumented
-const testDirs = ['priority', 'components', 'setup', 'pages', 'navigation', 'global-ui', 'features', 'extensions'];
+let testDirs = ['priority', 'components', 'setup', 'pages', 'navigation', 'global-ui', 'features', 'extensions'];
 const skipSetup = process.env.TEST_SKIP?.includes('setup');
 const baseUrl = (process.env.TEST_BASE_URL || 'https://localhost:8005').replace(/\/$/, '');
 const DEFAULT_USERNAME = 'admin';
 const username = process.env.TEST_USERNAME || DEFAULT_USERNAME;
 const apiUrl = process.env.API || (baseUrl.endsWith('/dashboard') ? baseUrl.split('/').slice(0, -1).join('/') : baseUrl);
 
+if (process.env.TEST_A11Y) {
+  testDirs = ['accessibility'];
+}
+
 /**
  * LOGS:
  * Summary of the environment variables that we have detected (or are going ot use)
@@ -97,6 +102,8 @@ export default defineConfig({
     azureClientSecret:   process.env.AZURE_CLIENT_SECRET,
     customNodeIp:        process.env.CUSTOM_NODE_IP,
     customNodeKey:       process.env.CUSTOM_NODE_KEY,
+    accessibility:       !!process.env.TEST_A11Y, // Are we running accessibility tests?
+    a11yFolder:          path.join('.', 'cypress', 'accessibility'),
     gkeServiceAccount:   process.env.GKE_SERVICE_ACCOUNT,
   },
   e2e: {
@@ -106,6 +113,12 @@ export default defineConfig({
       require('@cypress/code-coverage/task')(on, config);
       require('@cypress/grep/src/plugin')(config);
       // For more info: https://www.npmjs.com/package/cypress-delete-downloads-folder
+
+      // Load Accessibility plugin if configured
+      if (process.env.TEST_A11Y) {
+        require('./cypress/support/plugins/accessibility').default(on, config);
+      }
+
       on('task', { removeDirectory });
       websocketTasks(on, config);
 
diff --git a/cypress/e2e/po/pages/account-api-keys.po.ts b/cypress/e2e/po/pages/account-api-keys.po.ts
index 280073e19df..0c3ffd31440 100644
--- a/cypress/e2e/po/pages/account-api-keys.po.ts
+++ b/cypress/e2e/po/pages/account-api-keys.po.ts
@@ -56,6 +56,10 @@ export default class AccountPagePo extends PagePo {
     return this.applyButton().click();
   }
 
+  cancel(): Cypress.Chainable {
+    return this.self().get('button[type="reset"]').click();
+  }
+
   currentPassword(): PasswordPo {
     return new PasswordPo('[data-testid="account__current_password"]');
   }
diff --git a/cypress/e2e/tests/accessibility/shell.spec.ts b/cypress/e2e/tests/accessibility/shell.spec.ts
new file mode 100644
index 00000000000..d84dc492564
--- /dev/null
+++ b/cypress/e2e/tests/accessibility/shell.spec.ts
@@ -0,0 +1,95 @@
+import { LoginPagePo } from '@/cypress/e2e/po/pages/login-page.po';
+import HomePagePo from '@/cypress/e2e/po/pages/home.po';
+import AboutPagePo from '@/cypress/e2e/po/pages/about.po';
+import PreferencesPagePo from '@/cypress/e2e/po/pages/preferences.po';
+import UserMenuPo from '@/cypress/e2e/po/side-bars/user-menu.po';
+import AccountPagePo from '@/cypress/e2e/po/pages/account-api-keys.po';
+import CreateKeyPagePo from '@/cypress/e2e/po/pages/account-api-keys-create_key.po';
+
+describe('Shell a11y testing', { tags: ['@adminUser', '@accessibility'] }, () => {
+  it('login page', () => {
+    const loginPage = new LoginPagePo();
+
+    loginPage.goTo();
+    loginPage.waitForPage();
+    cy.injectAxe();
+    loginPage.username().set('test user');
+
+    cy.checkPageAccessibility();
+  });
+
+  it('locale selector', () => {
+    const loginPage = new LoginPagePo();
+
+    loginPage.goTo();
+    loginPage.waitForPage();
+    cy.injectAxe();
+    cy.get('[data-testid="locale-selector"]').click();
+    cy.checkPageAccessibility();
+  });
+
+  describe('Logged in', { testIsolation: 'off' }, () => {
+    const aboutPage = new AboutPagePo();
+    const prefPage = new PreferencesPagePo();
+    const userMenu = new UserMenuPo();
+
+    before(() => {
+      cy.login();
+    });
+
+    it('home page', () => {
+      HomePagePo.goToAndWaitForGet();
+      cy.injectAxe();
+
+      cy.checkPageAccessibility();
+    });
+
+    it('about page', () => {
+      AboutPagePo.navTo();
+      aboutPage.waitForPage();
+
+      cy.checkPageAccessibility();
+    });
+
+    it('preferences page', () => {
+      userMenu.clickMenuItem('Preferences');
+      userMenu.isClosed();
+      prefPage.waitForPage();
+      prefPage.checkIsCurrentPage();
+      prefPage.title();
+      cy.injectAxe();
+
+      cy.checkPageAccessibility();
+    });
+
+    describe('account', () => {
+      const accountPage = new AccountPagePo();
+      const createKeyPage = new CreateKeyPagePo();
+
+      it('account page', () => {
+        userMenu.clickMenuItem('Account & API Keys');
+        accountPage.waitForPage();
+        cy.injectAxe();
+        accountPage.checkIsCurrentPage();
+
+        cy.checkPageAccessibility();
+      });
+
+      it('change password dialog', () => {
+        accountPage.changePassword();
+
+        cy.checkElementAccessibility('.change-password-modal');
+
+        accountPage.cancel();
+      });
+
+      it('create API key', () => {
+        accountPage.create();
+        createKeyPage.waitForPage();
+        createKeyPage.isCurrentPage();
+
+        cy.checkPageAccessibility();
+      });
+    });
+  });
+});
diff --git a/cypress/e2e/tests/setup/rancher-setup.spec.ts b/cypress/e2e/tests/setup/rancher-setup.spec.ts
index 405aab68b86..ff8c25e46e6 100644
--- a/cypress/e2e/tests/setup/rancher-setup.spec.ts
+++ b/cypress/e2e/tests/setup/rancher-setup.spec.ts
@@ -6,7 +6,7 @@ import { serverUrlLocalhostCases, urlWithTrailingForwardSlash, httpUrl, nonUrlCa
 
 // Cypress or the GrepTags avoid to run multiples times the same test for each tag used.
 // This is a temporary solution till initialization is not handled as a test
-describe('Rancher setup', { tags: ['@adminUserSetup', '@standardUserSetup', '@setup', '@components', '@navigation', '@charts', '@explorer', '@explorer2', '@extensions', '@fleet', '@generic', '@globalSettings', '@manager', '@userMenu', '@usersAndAuths', '@elemental', '@vai', '@virtualizationMgmt'] }, () => {
+describe('Rancher setup', { tags: ['@adminUserSetup', '@standardUserSetup', '@setup', '@components', '@navigation', '@charts', '@explorer', '@explorer2', '@extensions', '@fleet', '@generic', '@globalSettings', '@manager', '@userMenu', '@usersAndAuths', '@elemental', '@vai', '@virtualizationMgmt', '@accessibility'] }, () => {
   const rancherSetupLoginPage = new RancherSetupLoginPagePo();
   const rancherSetupConfigurePage = new RancherSetupConfigurePage();
   const homePage = new HomePagePo();
diff --git a/cypress/globals.d.ts b/cypress/globals.d.ts
index 071cf54bae9..1dc7c80dc0e 100644
--- a/cypress/globals.d.ts
+++ b/cypress/globals.d.ts
@@ -175,6 +175,16 @@ declare global {
        * Check if the vai FF is enabled
        */
       isVaiCacheEnabled(): Chainable<boolean>;
+
+      /**
+       * Run an accessibility check on the current page or the specified element
+       */
+      checkPageAccessibility(description?: string);
+
+      /**
+       * Run an accessibility check on the specified element
+       */
+      checkElementAccessibility(selector: any, description?: string);
     }
   }
 }
diff --git a/cypress/support/commands/accessiblity.ts b/cypress/support/commands/accessiblity.ts
new file mode 100644
index 00000000000..b58a46de655
--- /dev/null
+++ b/cypress/support/commands/accessiblity.ts
@@ -0,0 +1,145 @@
+// Custom violation callback function that prints a list of violations
+// Used when logging to the Cypress log
+const severityIndicators = {
+  minor:    '⚪',
+  moderate: '🟡',
+  serious:  '🟠',
+  critical: '🔴',
+};
+
+// Ignore color contrast for now
+const RULES = { rules: { 'color-contrast': { enabled: false } } };
+
+// Used to track where multiple checks are done in a test to ensure we save
+// the screenshots for them to unique filenames
+const screenshotIndexes: {[key: string]: number} = {};
+
+// Log violations to the terminal
+function terminalLog(violations) {
+  cy.task(
+    'log',
+    `${ violations.length } accessibility violation${
+      violations.length === 1 ? '' : 's'
+    } ${ violations.length === 1 ? 'was' : 'were' } detected`
+  );
+  // pluck specific keys to keep the table readable
+  const violationData = violations.map(
+    ({
+      id, impact, description, nodes
+    }) => ({
+      id,
+      impact,
+      description,
+      nodes: nodes.length
+    })
+  );
+
+  cy.task('table', violationData);
+}
+
+/**
+ * Log the violations in several ways:
+ * 1. Log to the terminal
+ * 2. Log to a file
+ * 3. Log to the Cypress log
+ * 4. Save screenshot of the violations
+ */
+function getAccessibilityViolationsCallback(description?: string) {
+  return function printAccessibilityViolations(violations) {
+    terminalLog(violations); // Log to the console
+
+    const title = Cypress.currentTest.titlePath.join(', ');
+    const index = screenshotIndexes[title] || 1;
+    const testPath = Cypress.currentTest.titlePath;
+    const lastName = Cypress.currentTest.titlePath[Cypress.currentTest.titlePath.length - 1];
+
+    testPath.push(description || `${ lastName } (#${ index })`);
+
+    cy.task('a11y', {
+      violations,
+      titlePath: testPath,
+    });
+
+    // Log in Cypress
+    violations.forEach((violation) => {
+      const nodes = Cypress.$(violation.nodes.map((item) => item.target).join(','));
+
+      Cypress.log({
+        name:         `${ severityIndicators[violation.impact] } A11y`,
+        consoleProps: () => violation,
+        $el:          nodes,
+        message:      `[${ violation.help }][${ violation.helpUrl }]`
+      });
+
+      violation.nodes.forEach(({ target }) => {
+        Cypress.log({
+          name:         `🔨`,
+          consoleProps: () => violation,
+          $el:          Cypress.$(target.join(',')),
+          message:      target
+        });
+
+        // Store the existing border and change it to clearly show the elements with violations
+        cy.get(target.join(', ')).invoke('css', 'border').then((border) => {
+          cy.get(target.join(', ')).then(($el) => {
+            const existingBorder = $el.data('border');
+
+            // If we have the original border, don't store again = covers a case an element has multiple violations
+            // and we would lose the original border
+            if (!existingBorder) {
+              $el.data('border', border);
+            }
+
+            $el.css('border', '2px solid red');
+          });
+        });
+      });
+    });
+
+    cy.screenshot(`a11y_${ Cypress.currentTest.title }_${ index }`);
+
+    // Record the screenshot against the test and move it into the a11y folder
+    cy.task('a11yScreenshot', {
+      titlePath: testPath,
+      test:      Cypress.currentTest,
+      name:      `a11y_${ Cypress.currentTest.title }_${ index }`
+    });
+
+    screenshotIndexes[title] = index + 1;
+
+    // Reset the borders that were added to mark the elements with violations
+    violations.forEach((violation) => {
+      violation.nodes.forEach(({ target }) => {
+        cy.get(target.join(', ')).then(($el) => {
+          const border = $el.data('border');
+
+          if (!border.startsWith('0px none')) {
+            $el.css('border', $el.data('border'));
+          } else {
+            $el.css('border', '');
+          }
+
+          if ($el.attr('style')?.length === 0) {
+            $el.removeAttr('style');
+          }
+        });
+      });
+    });
+  };
+}
+
+/**
+ * Checks accessibility of the entire page
+ */
+// skipFailures = true will not fail the test when there are accessibility failures
+Cypress.Commands.add('checkPageAccessibility', (description?: string) => {
+  cy.checkA11y(undefined, RULES, getAccessibilityViolationsCallback(description), true);
+});
+
+/**
+ * Checks accessibility of a specific element
+ */
+// skipFailures = true will not fail the test when there are accessibility failures
+Cypress.Commands.add('checkElementAccessibility', (subject: any, description?: string) => {
+  cy.checkA11y(subject, RULES, getAccessibilityViolationsCallback(description), true);
+});
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index ad19207d05f..267568d8fb0 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -2,10 +2,13 @@ import '@cypress/code-coverage/support';
 import './commands/commands';
 import './commands/chainable';
 import './commands/rancher-api-commands';
+import './commands/accessiblity';
+
 import registerCypressGrep from '@cypress/grep/src/support';
 import { addCustomCommand } from 'cypress-delete-downloads-folder';
 import 'cypress-mochawesome-reporter/register';
 import '@percy/cypress';
+import 'cypress-axe';
 
 registerCypressGrep();
 addCustomCommand();
diff --git a/cypress/support/plugins/accessibility/index.ts b/cypress/support/plugins/accessibility/index.ts
new file mode 100644
index 00000000000..073cc5ab8cd
--- /dev/null
+++ b/cypress/support/plugins/accessibility/index.ts
@@ -0,0 +1,230 @@
+/* eslint-disable no-console */
+import * as fs from 'fs';
+import * as path from 'path';
+import * as sha from 'sha.js';
+import { createHtmlReport } from 'axe-html-reporter';
+
+const calcHash = function(str) {
+  return sha.default('sha256').update(str).digest('hex');
+};
+
+function createPath(testPath: string[]) {
+  const currentSpec = chain[chain.length - 1];
+
+  let found = currentSpec;
+
+  for (const p of testPath) {
+    const f = found.children.filter((item) => item.name === p);
+
+    if (f.length === 1) {
+      found = f[0];
+    } else {
+      const c = {
+        name:       p,
+        children:   [],
+        violations: [],
+        leaf:       false,
+      };
+
+      found.children.push(c);
+      found = c;
+    }
+  }
+
+  return found;
+}
+
+export type TestViolation = {
+  name: string;
+  children: TestViolation[];
+  violations: any[];
+  leaf: boolean;
+  screenshot?: string;
+};
+
+export type Options = {
+  violations: any[];
+  titlePath: string[];
+};
+
+type Screenshot = {
+  name: string;
+  specName: string;
+  path: string;
+};
+
+// Root chain
+const chain: TestViolation[] = [{
+  name:       'Root',
+  children:   [],
+  violations: [],
+  leaf:       false,
+}];
+
+const allViolations = [] as any[];
+const screenshots = [] as Screenshot[];
+let folder;
+
+// Tidy up the chain
+function tidy(item: TestViolation) {
+  item.children.forEach((i) => tidy(i));
+
+  if (item.violations.length === 0 && item.children.length === 1) {
+    if (item.children[0].leaf) {
+      // Collapse up
+      item.violations = item.children[0].violations;
+      item.children = [];
+    }
+  }
+}
+
+export function a11yScreenshot(options: any) {
+  const { titlePath, props } = options;
+  const found = createPath(titlePath);
+
+  found.screenshot = props.path;
+}
+
+function deDuplicate(violations: any[]) {
+  const result: any[] = [];
+  const seen: {[key: string]: any} = {};
+
+  violations.forEach((item) => {
+    const copy = JSON.parse(JSON.stringify(item));
+
+    delete copy.nodes;
+
+    const hash = calcHash(JSON.stringify(copy));
+
+    if (!seen[hash]) {
+      seen[hash] = item;
+      result.push(item);
+    } else {
+      // Merge the nodes
+      const existing = seen[hash];
+
+      item.nodes.forEach((node) => {
+        const str = JSON.stringify(node);
+        const exists = existing.nodes.find((n) => JSON.stringify(n) === str);
+
+        if (!exists) {
+          existing.nodes.push(node);
+        }
+      });
+    }
+  });
+
+  return result;
+}
+
+function registerHooks(on, config) {
+  // Get the folder to write the reports into
+  folder = config.env.a11yFolder;
+
+  // fs.rmdirSync(folder);
+  if (!fs.existsSync(folder)) {
+    fs.mkdirSync(folder);
+  }
+
+  on('task', {
+    a11y(options: Options) {
+      const { violations, titlePath } = options;
+      const found = createPath(titlePath);
+
+      allViolations.push(...violations);
+
+      found.violations.push(...violations);
+      found.leaf = true;
+
+      return null;
+    },
+
+    a11yScreenshot(options: any ) {
+      const { titlePath, name } = options;
+      const found = createPath(titlePath);
+
+      // Move the screenshot to the accessibility folder
+      const details = screenshots.find((s) => s.name === name);
+
+      if (details) {
+        const screenFolder = path.join(folder, details.specName);
+        const destFile = path.join(screenFolder, `${ name }.png`);
+
+        found.screenshot = path.join(details.specName, `${ name }.png`);
+
+        if (!fs.existsSync(screenFolder)) {
+          fs.mkdirSync(screenFolder);
+        }
+        fs.renameSync(details.path, destFile);
+      }
+
+      return null;
+    }
+  });
+
+  on('task', {
+    log(message) {
+      console.log(message);
+
+      return null;
+    },
+    table(message) {
+      console.table(message);
+
+      return null;
+    }
+  });
+
+  on('before:spec', (spec) => {
+    const newSpec = {
+      name:       spec.baseName,
+      children:   [],
+      violations: [],
+      leaf:       false,
+    };
+
+    chain[0].children.push(newSpec);
+
+    // Push the spec onto the chain
+    chain.push(newSpec);
+  });
+
+  on('after:spec', () => {
+    // Pop the spec off of the chain
+    chain.pop();
+  });
+
+  on('after:screenshot', (details) => {
+    const { name, specName, path } = details;
+
+    screenshots.push({
+      name,
+      specName,
+      path
+    });
+  });
+
+  on('after:run', () => {
+    const root = chain[0];
+
+    tidy(root);
+
+    fs.writeFileSync(path.join(folder, 'accessibility.json'), JSON.stringify(root.children, null, 2));
+
+    const reportHTML = createHtmlReport({
+      results: { violations: deDuplicate(allViolations) },
+      options: {
+        projectKey:            'Rancher Manager',
+        doNotCreateReportFile: true,
+      },
+    });
+
+    fs.writeFileSync(path.join(folder, 'accessibility.html'), reportHTML);
+
+    return null;
+  });
+
+  return config;
+}
+
+export default registerHooks;
diff --git a/cypress/tsconfig.json b/cypress/tsconfig.json
index 19ca6aeb9ce..5a16432a6f2 100644
--- a/cypress/tsconfig.json
+++ b/cypress/tsconfig.json
@@ -18,7 +18,8 @@
     "noEmit": true,
     "types": [
       "cypress",
-      "@cypress/grep"
+      "@cypress/grep",
+      "cypress-axe"
     ]
   },
   "include": [
diff --git a/package.json b/package.json
index d00e6141d5f..a9f700a02a8 100644
--- a/package.json
+++ b/package.json
@@ -162,6 +162,8 @@
     "@vue/test-utils": "2.4.6",
     "@vue/vue3-jest": "27.0.0",
     "add": "2.0.6",
+    "axe-core": "^4.10.2",
+    "axe-html-reporter": "^2.2.11",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.1.0",
     "babel-jest": "27.5.1",
@@ -174,6 +176,7 @@
     "csv-loader": "3.0.3",
     "cy2": "4.0.9",
     "cypress": "11.1.0",
+    "cypress-axe": "^1.5.0",
     "cypress-delete-downloads-folder": "0.0.4",
     "cypress-mochawesome-reporter": "3.8.2",
     "eslint": "7.32.0",
diff --git a/yarn.lock b/yarn.lock
index 65e9cc88b97..55d2bb9da6d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5444,6 +5444,18 @@ aws4@^1.8.0:
   resolved "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
   integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
 
+axe-core@^4.10.2:
+  version "4.10.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.10.2.tgz#85228e3e1d8b8532a27659b332e39b7fa0e022df"
+  integrity sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==
+
+axe-html-reporter@^2.2.11:
+  version "2.2.11"
+  resolved "https://registry.yarnpkg.com/axe-html-reporter/-/axe-html-reporter-2.2.11.tgz#749a4d5836f6aebb6780049933c2f6030e06c7d0"
+  integrity sha512-WlF+xlNVgNVWiM6IdVrsh+N0Cw7qupe5HT9N6Uyi+aN7f6SSi92RDomiP1noW8OWIV85V6x404m5oKMeqRV3tQ==
+  dependencies:
+    mustache "^4.0.1"
+
 axios-retry@3.1.9:
   version "3.1.9"
   resolved "https://registry.npmjs.org/axios-retry/-/axios-retry-3.1.9.tgz#6c30fc9aeb4519aebaec758b90ef56fa03fe72e8"
@@ -6911,6 +6923,11 @@ cy2@4.0.9:
     source-map-support "^0.5.21"
     tmp "^0.2.1"
 
+cypress-axe@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.5.0.tgz#95082734583da77b51ce9b7784e14a442016c7a1"
+  integrity sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==
+
 cypress-delete-downloads-folder@0.0.4:
   version "0.0.4"
   resolved "https://registry.npmjs.org/cypress-delete-downloads-folder/-/cypress-delete-downloads-folder-0.0.4.tgz#00693d4d7a36b552e7a11148e49d2c4c34ed3ec3"
@@ -9527,18 +9544,7 @@ html-tags@^3.3.1:
     tapable "^1.1.3"
     util.promisify "1.0.0"
 
-"html-webpack-plugin-5@npm:html-webpack-plugin@^5":
-  version "5.6.0"
-  resolved "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz#50a8fa6709245608cb00e811eacecb8e0d7b7ea0"
-  integrity sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==
-  dependencies:
-    "@types/html-minifier-terser" "^6.0.0"
-    html-minifier-terser "^6.0.2"
-    lodash "^4.17.21"
-    pretty-error "^4.0.0"
-    tapable "^2.0.0"
-
-html-webpack-plugin@^5.0.0, html-webpack-plugin@^5.1.0:
+"html-webpack-plugin-5@npm:html-webpack-plugin@^5", html-webpack-plugin@^5.0.0, html-webpack-plugin@^5.1.0:
   version "5.6.0"
   resolved "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz#50a8fa6709245608cb00e811eacecb8e0d7b7ea0"
   integrity sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==
@@ -11875,6 +11881,11 @@ multicast-dns@^7.2.5:
     dns-packet "^5.2.2"
     thunky "^1.0.2"
 
+mustache@^4.0.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64"
+  integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==
+
 mz@^2.4.0:
   version "2.7.0"
   resolved "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz#95008057a56cafadc2bc63dde7f9ff6955948e32"
@@ -14450,7 +14461,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-cjs@npm:string-width@^4.2.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==
@@ -14467,15 +14478,6 @@ 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"
@@ -14550,7 +14552,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", 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==
@@ -14571,13 +14573,6 @@ 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"
@@ -15901,7 +15896,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-cjs@npm:wrap-ansi@^7.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==
@@ -15927,15 +15922,6 @@ 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 d75cec19c733cdea405093283e018b55b30ad0c4 Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Mon, 24 Feb 2025 08:50:27 -0800
Subject: [PATCH 043/140] revert wrongly removed translation

---
 shell/assets/translations/en-us.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 4ec24a850a2..16e3dd1dff8 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -1127,6 +1127,7 @@ catalog:
       placeholder: 'e.g. oci://<registry-host>/<namespace>/<chart-name>:<tag>'
       warning: OCI URLs should ONLY contain helm charts.
       info: For large repositories containing many charts consider targeting a specific namespace or chart to improve performance, for example with oci://<registry-host>/<namespace> or oci://<registry-host>/<namespace>/<chart-name>.
+      skipTlsVerifications: Skip TLS Verifications
       insecurePlainHttp: Insecure Plain Http
       exponentialBackOff:
         label: Exponential Back Off

From 3229dfc30ee6392f5dcda45e5788f0968e560ef2 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 6 Feb 2025 12:38:51 +0100
Subject: [PATCH 044/140] Fleet: Add created by label in GitRepo details page

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/assets/translations/en-us.yaml         |  1 +
 shell/components/ResourceDetail/Masthead.vue | 24 ++++++++++--
 shell/detail/fleet.cattle.io.gitrepo.vue     |  9 ++++-
 shell/models/fleet.cattle.io.gitrepo.js      | 39 +++++++++++++++++++-
 4 files changed, 67 insertions(+), 6 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index bcd5558d7e0..ff562011128 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -5066,6 +5066,7 @@ resourceDetail:
     view: "{subtype} {name}"
   masthead:
     age: Age
+    createdBy: Created By
     restartCount: Pod Restarts
     defaultBannerMessage:
       error: This resource is currently in an error state, but there isn't a detailed message available.
diff --git a/shell/components/ResourceDetail/Masthead.vue b/shell/components/ResourceDetail/Masthead.vue
index 1a69ea493b7..c718d9c6148 100644
--- a/shell/components/ResourceDetail/Masthead.vue
+++ b/shell/components/ResourceDetail/Masthead.vue
@@ -504,10 +504,26 @@ export default {
               {{ namespace }}
             </span>
           </span>
-          <span v-if="parent.showAge">{{ t("resourceDetail.masthead.age") }}: <LiveDate
-            class="live-date"
-            :value="value.creationTimestamp"
-          /></span>
+          <span v-if="parent.showAge">
+            {{ t("resourceDetail.masthead.age") }}:
+            <LiveDate
+              class="live-date"
+              :value="value.creationTimestamp"
+            />
+          </span>
+          <span v-if="value.showCreatedBy">
+            {{ t("resourceDetail.masthead.createdBy") }}:
+            <router-link
+              v-if="value.createdBy.location"
+              :to="value.createdBy.location"
+              data-testid="masthead-subheader-createdBy"
+            >
+              {{ value.createdBy.displayName }}
+            </router-link>
+            <span v-else>
+              {{ value.createdBy.displayName }}
+            </span>
+          </span>
           <span v-if="value.showPodRestarts">{{ t("resourceDetail.masthead.restartCount") }}:<span class="live-data"> {{ value.restartCount }}</span></span>
         </div>
       </div>
diff --git a/shell/detail/fleet.cattle.io.gitrepo.vue b/shell/detail/fleet.cattle.io.gitrepo.vue
index aa3cc544937..209c6eb61d1 100644
--- a/shell/detail/fleet.cattle.io.gitrepo.vue
+++ b/shell/detail/fleet.cattle.io.gitrepo.vue
@@ -5,7 +5,7 @@ import FleetSummary from '@shell/components/fleet/FleetSummary';
 import { Banner } from '@components/Banner';
 import FleetResources from '@shell/components/fleet/FleetResources';
 import Tab from '@shell/components/Tabbed/Tab';
-import { FLEET } from '@shell/config/types';
+import { FLEET, MANAGEMENT } from '@shell/config/types';
 import { isHarvesterCluster } from '@shell/utils/cluster';
 import FleetBundles from '@shell/components/fleet/FleetBundles.vue';
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
@@ -91,6 +91,13 @@ export default {
       }
     }, this.$store);
 
+    if (this.value.authorId && this.$store.getters['management/schemaFor'](MANAGEMENT.USER)) {
+      this.$store.dispatch(`management/find`, {
+        type: MANAGEMENT.USER,
+        id:   this.value.authorId,
+      }, { root: true });
+    }
+
     this.allBundles = allDispatches.allBundles || [];
     this.allFleetClusters = allDispatches.allFleetClusters || [];
   },
diff --git a/shell/models/fleet.cattle.io.gitrepo.js b/shell/models/fleet.cattle.io.gitrepo.js
index 1fce1d87724..3db5240a349 100644
--- a/shell/models/fleet.cattle.io.gitrepo.js
+++ b/shell/models/fleet.cattle.io.gitrepo.js
@@ -2,7 +2,7 @@ import { convert, matching, convertSelectorObj } from '@shell/utils/selector';
 import jsyaml from 'js-yaml';
 import isEmpty from 'lodash/isEmpty';
 import { escapeHtml } from '@shell/utils/string';
-import { FLEET } from '@shell/config/types';
+import { FLEET, MANAGEMENT } from '@shell/config/types';
 import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { addObject, addObjects, findBy, insertAt } from '@shell/utils/array';
 import { set } from '@shell/utils/object';
@@ -479,4 +479,41 @@ export default class GitRepo extends SteveModel {
   get clustersList() {
     return this.$getters['all'](FLEET.CLUSTER);
   }
+
+  get authorId() {
+    return this.metadata.labels['fleet.cattle.io/created-by-user-id'];
+  }
+
+  get author() {
+    if (this.authorId) {
+      return this.$rootGetters['management/byId'](MANAGEMENT.USER, this.authorId);
+    }
+
+    return null;
+  }
+
+  get createdBy() {
+    const displayName = this.metadata.labels['fleet.cattle.io/created-by-display-name'];
+
+    if (!displayName) {
+      return null;
+    }
+
+    return {
+      displayName,
+      location: !this.author ? null : {
+        name:   'c-cluster-product-resource-id',
+        params: {
+          cluster:  'local',
+          product:  'auth',
+          resource: MANAGEMENT.USER,
+          id:       this.author.id,
+        }
+      }
+    };
+  }
+
+  get showCreatedBy() {
+    return !!this.createdBy;
+  }
 }

From 573406b34187f75398ace5a4c3960ad069f25772 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 6 Feb 2025 12:57:11 +0100
Subject: [PATCH 045/140] Fleet: Add created by label in Bundle details page

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/detail/fleet.cattle.io.bundle.vue | 10 +++++++
 shell/models/fleet.cattle.io.bundle.js  | 39 ++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/shell/detail/fleet.cattle.io.bundle.vue b/shell/detail/fleet.cattle.io.bundle.vue
index 765b19fdf80..55ae64cdbf2 100644
--- a/shell/detail/fleet.cattle.io.bundle.vue
+++ b/shell/detail/fleet.cattle.io.bundle.vue
@@ -1,4 +1,5 @@
 <script>
+import { MANAGEMENT } from '@shell/config/types';
 import FleetBundleResources from '@shell/components/fleet/FleetBundleResources.vue';
 import FleetUtils from '@shell/utils/fleet';
 
@@ -13,6 +14,15 @@ export default {
     }
   },
 
+  async fetch() {
+    if (this.value.authorId && this.$store.getters['management/schemaFor'](MANAGEMENT.USER)) {
+      this.$store.dispatch(`management/find`, {
+        type: MANAGEMENT.USER,
+        id:   this.value.authorId,
+      }, { root: true });
+    }
+  },
+
   computed: {
     bundleResources() {
       return FleetUtils.resourcesFromBundleStatus(this.value?.status);
diff --git a/shell/models/fleet.cattle.io.bundle.js b/shell/models/fleet.cattle.io.bundle.js
index f2609e73740..274410ea3ed 100644
--- a/shell/models/fleet.cattle.io.bundle.js
+++ b/shell/models/fleet.cattle.io.bundle.js
@@ -2,7 +2,7 @@ import { escapeHtml, ucFirst } from '@shell/utils/string';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import typeHelper from '@shell/utils/type-helpers';
 import { addObject, addObjects, findBy } from '@shell/utils/array';
-import { FLEET } from '@shell/config/types';
+import { FLEET, MANAGEMENT } from '@shell/config/types';
 import { convertSelectorObj, matching } from '@shell/utils/selector';
 
 export default class FleetBundle extends SteveModel {
@@ -127,4 +127,41 @@ export default class FleetBundle extends SteveModel {
       );
     }
   }
+
+  get authorId() {
+    return this.metadata.labels['fleet.cattle.io/created-by-user-id'];
+  }
+
+  get author() {
+    if (this.authorId) {
+      return this.$rootGetters['management/byId'](MANAGEMENT.USER, this.authorId);
+    }
+
+    return null;
+  }
+
+  get createdBy() {
+    const displayName = this.metadata.labels['fleet.cattle.io/created-by-display-name'];
+
+    if (!displayName) {
+      return null;
+    }
+
+    return {
+      displayName,
+      location: !this.author ? null : {
+        name:   'c-cluster-product-resource-id',
+        params: {
+          cluster:  'local',
+          product:  'auth',
+          resource: MANAGEMENT.USER,
+          id:       this.author.id,
+        }
+      }
+    };
+  }
+
+  get showCreatedBy() {
+    return !!this.createdBy;
+  }
 }

From b6973366fc25ce7a2cb2fb29c9163f2e5127f1e2 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 6 Feb 2025 17:39:27 +0100
Subject: [PATCH 046/140] Fleet: Labels refactoring

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/config/labels-annotations.js      | 5 ++++-
 shell/models/fleet.cattle.io.bundle.js  | 7 ++++---
 shell/models/fleet.cattle.io.gitrepo.js | 8 ++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/shell/config/labels-annotations.js b/shell/config/labels-annotations.js
index 6b9ac1ab197..bfb2ecd75e1 100644
--- a/shell/config/labels-annotations.js
+++ b/shell/config/labels-annotations.js
@@ -109,6 +109,7 @@ export const CATALOG = {
 };
 
 export const FLEET = {
+  REPO_NAME:            'fleet.cattle.io/repo-name',
   CLUSTER_DISPLAY_NAME: 'management.cattle.io/cluster-display-name',
   CLUSTER_NAME:         'management.cattle.io/cluster-name',
   BUNDLE_ID:            'fleet.cattle.io/bundle-id',
@@ -116,7 +117,9 @@ export const FLEET = {
   BUNDLE_NAMESPACE:     'fleet.cattle.io/bundle-namespace',
   MANAGED:              'fleet.cattle.io/managed',
   CLUSTER_NAMESPACE:    'fleet.cattle.io/cluster-namespace',
-  CLUSTER:              'fleet.cattle.io/cluster'
+  CLUSTER:              'fleet.cattle.io/cluster',
+  CREATED_BY_USER_ID:   'fleet.cattle.io/created-by-user-id',
+  CREATED_BY_USER_NAME: 'fleet.cattle.io/created-by-display-name',
 };
 
 export const RBAC = { PRODUCT: 'management.cattle.io/ui-product' };
diff --git a/shell/models/fleet.cattle.io.bundle.js b/shell/models/fleet.cattle.io.bundle.js
index 274410ea3ed..0256b568c1d 100644
--- a/shell/models/fleet.cattle.io.bundle.js
+++ b/shell/models/fleet.cattle.io.bundle.js
@@ -3,6 +3,7 @@ import SteveModel from '@shell/plugins/steve/steve-class';
 import typeHelper from '@shell/utils/type-helpers';
 import { addObject, addObjects, findBy } from '@shell/utils/array';
 import { FLEET, MANAGEMENT } from '@shell/config/types';
+import { FLEET as FLEET_ANNOTATIONS } from '@shell/config/labels-annotations';
 import { convertSelectorObj, matching } from '@shell/utils/selector';
 
 export default class FleetBundle extends SteveModel {
@@ -21,7 +22,7 @@ export default class FleetBundle extends SteveModel {
   get repoName() {
     const labels = this.metadata?.labels || {};
 
-    return labels['fleet.cattle.io/repo-name'];
+    return labels[FLEET_ANNOTATIONS.REPO_NAME];
   }
 
   get targetClusters() {
@@ -129,7 +130,7 @@ export default class FleetBundle extends SteveModel {
   }
 
   get authorId() {
-    return this.metadata.labels['fleet.cattle.io/created-by-user-id'];
+    return this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
   }
 
   get author() {
@@ -141,7 +142,7 @@ export default class FleetBundle extends SteveModel {
   }
 
   get createdBy() {
-    const displayName = this.metadata.labels['fleet.cattle.io/created-by-display-name'];
+    const displayName = this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
 
     if (!displayName) {
       return null;
diff --git a/shell/models/fleet.cattle.io.gitrepo.js b/shell/models/fleet.cattle.io.gitrepo.js
index 3db5240a349..fb07387aad1 100644
--- a/shell/models/fleet.cattle.io.gitrepo.js
+++ b/shell/models/fleet.cattle.io.gitrepo.js
@@ -352,11 +352,11 @@ export default class GitRepo extends SteveModel {
   }
 
   get bundles() {
-    return this.$getters['matching'](FLEET.BUNDLE, { 'fleet.cattle.io/repo-name': this.name }, this.namespace);
+    return this.$getters['matching'](FLEET.BUNDLE, { [FLEET_ANNOTATIONS.REPO_NAME]: this.name }, this.namespace);
   }
 
   get bundleDeployments() {
-    return this.$getters['matching'](FLEET.BUNDLE_DEPLOYMENT, { 'fleet.cattle.io/repo-name': this.name });
+    return this.$getters['matching'](FLEET.BUNDLE_DEPLOYMENT, { [FLEET_ANNOTATIONS.REPO_NAME]: this.name });
   }
 
   get allBundlesStatuses() {
@@ -481,7 +481,7 @@ export default class GitRepo extends SteveModel {
   }
 
   get authorId() {
-    return this.metadata.labels['fleet.cattle.io/created-by-user-id'];
+    return this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
   }
 
   get author() {
@@ -493,7 +493,7 @@ export default class GitRepo extends SteveModel {
   }
 
   get createdBy() {
-    const displayName = this.metadata.labels['fleet.cattle.io/created-by-display-name'];
+    const displayName = this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
 
     if (!displayName) {
       return null;

From 42b54a80e863a9f87bf46803a7b835cac62662a3 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 6 Feb 2025 17:40:34 +0100
Subject: [PATCH 047/140] Fleet: Save createdBy labels on create GitRepo

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/edit/fleet.cattle.io.gitrepo.vue  | 15 ++++++++++++---
 shell/models/fleet.cattle.io.gitrepo.js | 21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 0137039e44f..c700cb31509 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -569,10 +569,19 @@ export default {
       });
     },
 
-    onSave() {
+    async saveOverride(btnCb) {
       this.value.spec['correctDrift'] = { enabled: this.correctDriftEnabled };
 
-      this.save();
+      try {
+        await this.value.save(this.mode);
+
+        btnCb(true);
+
+        this.$router.replace(this.value.listLocation);
+      } catch (err) {
+        this.errors = exceptionToErrorsArray(err);
+        btnCb(false);
+      }
     }
   }
 };
@@ -594,7 +603,7 @@ export default {
     class="wizard"
     @cancel="done"
     @error="e=>errors = e"
-    @finish="onSave"
+    @finish="saveOverride"
   >
     <template #noticeBanner>
       <Banner
diff --git a/shell/models/fleet.cattle.io.gitrepo.js b/shell/models/fleet.cattle.io.gitrepo.js
index fb07387aad1..e1548ce4d2e 100644
--- a/shell/models/fleet.cattle.io.gitrepo.js
+++ b/shell/models/fleet.cattle.io.gitrepo.js
@@ -1,3 +1,4 @@
+import { _CREATE } from '@shell/config/query-params';
 import { convert, matching, convertSelectorObj } from '@shell/utils/selector';
 import jsyaml from 'js-yaml';
 import isEmpty from 'lodash/isEmpty';
@@ -42,6 +43,19 @@ function normalizeStateCounts(data) {
 }
 
 export default class GitRepo extends SteveModel {
+  get currentUser() {
+    return this.$rootGetters['auth/v3User'] || {};
+  }
+
+  async save(mode) {
+    if (mode === _CREATE) {
+      this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_ID] = this.currentUser.id;
+      this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME] = this.currentUser.username;
+    }
+
+    await super.save();
+  }
+
   applyDefaults() {
     const spec = this.spec || {};
     const meta = this.metadata || {};
@@ -131,6 +145,13 @@ export default class GitRepo extends SteveModel {
     this.save();
   }
 
+  goToClone() {
+    delete this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
+    delete this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
+
+    super.goToClone();
+  }
+
   forceUpdate() {
     const now = this.spec.forceSyncGeneration || 1;
 

From 5d31fab5ae69b8d6f082cfef3a2984641d9e761c Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 6 Feb 2025 19:05:52 +0100
Subject: [PATCH 048/140] [unit-test] Add Masthead, createdBy label

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/ResourceDetail/Masthead.vue  | 12 +++-
 .../ResourceDetail/__tests__/Masthead.test.ts | 61 +++++++++++++++++++
 2 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 shell/components/ResourceDetail/__tests__/Masthead.test.ts

diff --git a/shell/components/ResourceDetail/Masthead.vue b/shell/components/ResourceDetail/Masthead.vue
index c718d9c6148..d77ba2a073a 100644
--- a/shell/components/ResourceDetail/Masthead.vue
+++ b/shell/components/ResourceDetail/Masthead.vue
@@ -511,16 +511,22 @@ export default {
               :value="value.creationTimestamp"
             />
           </span>
-          <span v-if="value.showCreatedBy">
+          <span
+            v-if="value.showCreatedBy"
+            data-testid="masthead-subheader-createdBy"
+          >
             {{ t("resourceDetail.masthead.createdBy") }}:
             <router-link
               v-if="value.createdBy.location"
               :to="value.createdBy.location"
-              data-testid="masthead-subheader-createdBy"
+              data-testid="masthead-subheader-createdBy_link"
             >
               {{ value.createdBy.displayName }}
             </router-link>
-            <span v-else>
+            <span
+              v-else
+              data-testid="masthead-subheader-createdBy_plain-text"
+            >
               {{ value.createdBy.displayName }}
             </span>
           </span>
diff --git a/shell/components/ResourceDetail/__tests__/Masthead.test.ts b/shell/components/ResourceDetail/__tests__/Masthead.test.ts
new file mode 100644
index 00000000000..8a1280154c4
--- /dev/null
+++ b/shell/components/ResourceDetail/__tests__/Masthead.test.ts
@@ -0,0 +1,61 @@
+import { mount, RouterLinkStub } from '@vue/test-utils';
+import { _VIEW } from '@shell/config/query-params';
+import Masthead from '@shell/components/ResourceDetail/Masthead.vue';
+
+const mockedStore = () => {
+  return {
+    getters: {
+      currentStore:              () => 'current_store',
+      currentProduct:            { inStore: 'cluster' },
+      isExplorer:                false,
+      currentCluster:            {},
+      'type-map/labelFor':       jest.fn(),
+      'type-map/optionsFor':     jest.fn(),
+      'current_store/schemaFor': jest.fn(),
+    },
+  };
+};
+
+const requiredSetup = () => {
+  return {
+    stubs: {
+      'router-link': RouterLinkStub,
+      LiveDate:      true
+    },
+    mocks: { $store: mockedStore() }
+  };
+};
+
+describe('component: Masthead', () => {
+  it.each([
+    ['hidden', '', false, { displayName: 'admin', location: { id: 'resource-id' } }, false, false],
+    ['plain-text', 'admin', true, { displayName: 'admin', location: null }, false, true],
+    ['link', 'foo', true, { displayName: 'foo', location: { id: 'resource-id' } }, true, false],
+  ])('"Created By" should be %p, with text: %p', (
+    _,
+    text,
+    showCreatedBy,
+    createdBy,
+    showLink,
+    showPlainText,
+  ) => {
+    const wrapper = mount(Masthead, {
+      props: {
+        mode:  _VIEW,
+        value: {
+          showCreatedBy,
+          createdBy,
+        },
+      },
+      global: { ...requiredSetup() }
+    });
+
+    const container = wrapper.find('[data-testid="masthead-subheader-createdBy"]');
+    const link = wrapper.find('[data-testid="masthead-subheader-createdBy_link"]');
+    const plainText = wrapper.find('[data-testid="masthead-subheader-createdBy_plain-text"]');
+
+    expect(link.exists()).toBe(showLink);
+    expect(plainText.exists()).toBe(showPlainText);
+    expect(showLink || showPlainText ? container.element.textContent : '').toContain(text);
+  });
+});

From 82786d7271d3b228e4f676ec14e4175598be7248 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 17 Feb 2025 16:53:19 +0100
Subject: [PATCH 049/140] Fix Created By capitalization

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/assets/translations/en-us.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index ff562011128..b9188249c7b 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -5066,7 +5066,7 @@ resourceDetail:
     view: "{subtype} {name}"
   masthead:
     age: Age
-    createdBy: Created By
+    createdBy: Created by
     restartCount: Pod Restarts
     defaultBannerMessage:
       error: This resource is currently in an error state, but there isn't a detailed message available.

From baaf5ca23c4de7d0be5d09c0ae3f46c51e0ef4d7 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 18 Feb 2025 11:25:56 +0100
Subject: [PATCH 050/140] Fleet: Add createdBy labels via before_save_hook; Fix
 E2E tests

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 cypress/e2e/blueprints/fleet/gitrepos.ts      |  3 ++-
 cypress/e2e/tests/pages/fleet/gitrepo.spec.ts | 11 ++++++++++
 shell/edit/fleet.cattle.io.gitrepo.vue        | 21 +++++++------------
 shell/models/fleet.cattle.io.bundle.js        |  2 +-
 shell/models/fleet.cattle.io.gitrepo.js       | 12 +----------
 5 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/cypress/e2e/blueprints/fleet/gitrepos.ts b/cypress/e2e/blueprints/fleet/gitrepos.ts
index 9f2e243a9e4..2de0359a1a0 100644
--- a/cypress/e2e/blueprints/fleet/gitrepos.ts
+++ b/cypress/e2e/blueprints/fleet/gitrepos.ts
@@ -2,7 +2,8 @@ export const gitRepoCreateRequest = {
   type:     'fleet.cattle.io.gitrepo',
   metadata: {
     namespace: 'fleet-default',
-    name:      'fleet-e2e-test-gitrepo'
+    name:      'fleet-e2e-test-gitrepo',
+    labels:    {},
   },
   spec: {
     repo:         'https://github.com/rancher/fleet-test-data.git',
diff --git a/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts b/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
index 6c5f6bf5700..a1557a2ba41 100644
--- a/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
@@ -11,6 +11,9 @@ const fakeProvClusterId = 'some-fake-cluster-id';
 const fakeMgmtClusterId = 'some-fake-mgmt-id';
 
 describe('Git Repo', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] }, () => {
+  let adminUsername = '';
+  let adminUserId = '';
+
   describe('Create', () => {
     const listPage = new FleetGitRepoListPagePo();
     const gitRepoCreatePage = new GitRepoCreatePo('_');
@@ -36,6 +39,11 @@ describe('Git Repo', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] }, (
     });
 
     beforeEach(() => {
+      cy.getRancherResource('v3', 'users?me=true').then((resp: Cypress.Response<any>) => {
+        adminUserId = resp.body.data[0].id.trim();
+        adminUsername = resp.body.data[0].username.trim();
+      });
+
       cy.createE2EResourceName('git-repo').as('gitRepo');
     });
 
@@ -91,7 +99,10 @@ describe('Git Repo', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] }, (
           return cy.wait('@interceptGitRepo');
         })
         .then(({ request, response }) => {
+          gitRepoCreateRequest.metadata.labels['fleet.cattle.io/created-by-display-name'] = adminUsername;
+          gitRepoCreateRequest.metadata.labels['fleet.cattle.io/created-by-user-id'] = adminUserId;
           gitRepoCreateRequest.spec.helmSecretName = secretName;
+
           expect(response.statusCode).to.eq(201);
           expect(request.body).to.deep.eq(gitRepoCreateRequest);
 
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index c700cb31509..be13d709af9 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -319,6 +319,7 @@ export default {
   created() {
     this.registerBeforeHook(this.cleanTLS, 'cleanTLS');
     this.registerBeforeHook(this.doCreateSecrets, `registerAuthSecrets${ new Date().getTime() }`, 99);
+    this.registerBeforeHook(this.updateBeforeSave);
   },
 
   methods: {
@@ -569,20 +570,14 @@ export default {
       });
     },
 
-    async saveOverride(btnCb) {
-      this.value.spec['correctDrift'] = { enabled: this.correctDriftEnabled };
+    updateBeforeSave(value) {
+      value.spec['correctDrift'] = { enabled: this.correctDriftEnabled };
 
-      try {
-        await this.value.save(this.mode);
-
-        btnCb(true);
-
-        this.$router.replace(this.value.listLocation);
-      } catch (err) {
-        this.errors = exceptionToErrorsArray(err);
-        btnCb(false);
+      if (this.realMode === _CREATE) {
+        value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_ID] = value.currentUser.id;
+        value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_NAME] = value.currentUser.username;
       }
-    }
+    },
   }
 };
 </script>
@@ -603,7 +598,7 @@ export default {
     class="wizard"
     @cancel="done"
     @error="e=>errors = e"
-    @finish="saveOverride"
+    @finish="save"
   >
     <template #noticeBanner>
       <Banner
diff --git a/shell/models/fleet.cattle.io.bundle.js b/shell/models/fleet.cattle.io.bundle.js
index 0256b568c1d..8644f199b12 100644
--- a/shell/models/fleet.cattle.io.bundle.js
+++ b/shell/models/fleet.cattle.io.bundle.js
@@ -142,7 +142,7 @@ export default class FleetBundle extends SteveModel {
   }
 
   get createdBy() {
-    const displayName = this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
+    const displayName = this.metadata?.labels?.[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
 
     if (!displayName) {
       return null;
diff --git a/shell/models/fleet.cattle.io.gitrepo.js b/shell/models/fleet.cattle.io.gitrepo.js
index e1548ce4d2e..957bf0efd3e 100644
--- a/shell/models/fleet.cattle.io.gitrepo.js
+++ b/shell/models/fleet.cattle.io.gitrepo.js
@@ -1,4 +1,3 @@
-import { _CREATE } from '@shell/config/query-params';
 import { convert, matching, convertSelectorObj } from '@shell/utils/selector';
 import jsyaml from 'js-yaml';
 import isEmpty from 'lodash/isEmpty';
@@ -47,15 +46,6 @@ export default class GitRepo extends SteveModel {
     return this.$rootGetters['auth/v3User'] || {};
   }
 
-  async save(mode) {
-    if (mode === _CREATE) {
-      this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_ID] = this.currentUser.id;
-      this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME] = this.currentUser.username;
-    }
-
-    await super.save();
-  }
-
   applyDefaults() {
     const spec = this.spec || {};
     const meta = this.metadata || {};
@@ -514,7 +504,7 @@ export default class GitRepo extends SteveModel {
   }
 
   get createdBy() {
-    const displayName = this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
+    const displayName = this.metadata?.labels?.[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
 
     if (!displayName) {
       return null;

From 805690623d9e7fbeb824239ff8ad152b7c913082 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Fri, 21 Feb 2025 12:19:54 +0100
Subject: [PATCH 051/140] Fleet: Add createdBy labels null checks

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/models/fleet.cattle.io.bundle.js  |  2 +-
 shell/models/fleet.cattle.io.gitrepo.js | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/shell/models/fleet.cattle.io.bundle.js b/shell/models/fleet.cattle.io.bundle.js
index 8644f199b12..fde118640de 100644
--- a/shell/models/fleet.cattle.io.bundle.js
+++ b/shell/models/fleet.cattle.io.bundle.js
@@ -130,7 +130,7 @@ export default class FleetBundle extends SteveModel {
   }
 
   get authorId() {
-    return this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
+    return this.metadata?.labels?.[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
   }
 
   get author() {
diff --git a/shell/models/fleet.cattle.io.gitrepo.js b/shell/models/fleet.cattle.io.gitrepo.js
index 957bf0efd3e..fb081eb9cc7 100644
--- a/shell/models/fleet.cattle.io.gitrepo.js
+++ b/shell/models/fleet.cattle.io.gitrepo.js
@@ -136,8 +136,13 @@ export default class GitRepo extends SteveModel {
   }
 
   goToClone() {
-    delete this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
-    delete this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
+    if (this.metadata?.labels?.[FLEET_ANNOTATIONS.CREATED_BY_USER_ID]) {
+      delete this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
+    }
+
+    if (this.metadata?.labels?.[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME]) {
+      delete this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_NAME];
+    }
 
     super.goToClone();
   }
@@ -492,7 +497,7 @@ export default class GitRepo extends SteveModel {
   }
 
   get authorId() {
-    return this.metadata.labels[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
+    return this.metadata?.labels?.[FLEET_ANNOTATIONS.CREATED_BY_USER_ID];
   }
 
   get author() {

From 357746bf1904664507951b8d406e37365590f525 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Fri, 21 Feb 2025 12:22:04 +0100
Subject: [PATCH 052/140] Fleet: refactoring data-testids

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/ResourceDetail/Masthead.vue               | 2 +-
 shell/components/ResourceDetail/__tests__/Masthead.test.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/components/ResourceDetail/Masthead.vue b/shell/components/ResourceDetail/Masthead.vue
index d77ba2a073a..ca603849890 100644
--- a/shell/components/ResourceDetail/Masthead.vue
+++ b/shell/components/ResourceDetail/Masthead.vue
@@ -519,7 +519,7 @@ export default {
             <router-link
               v-if="value.createdBy.location"
               :to="value.createdBy.location"
-              data-testid="masthead-subheader-createdBy_link"
+              data-testid="masthead-subheader-createdBy-link"
             >
               {{ value.createdBy.displayName }}
             </router-link>
diff --git a/shell/components/ResourceDetail/__tests__/Masthead.test.ts b/shell/components/ResourceDetail/__tests__/Masthead.test.ts
index 8a1280154c4..785838a7112 100644
--- a/shell/components/ResourceDetail/__tests__/Masthead.test.ts
+++ b/shell/components/ResourceDetail/__tests__/Masthead.test.ts
@@ -51,7 +51,7 @@ describe('component: Masthead', () => {
     });
 
     const container = wrapper.find('[data-testid="masthead-subheader-createdBy"]');
-    const link = wrapper.find('[data-testid="masthead-subheader-createdBy_link"]');
+    const link = wrapper.find('[data-testid="masthead-subheader-createdBy-link"]');
     const plainText = wrapper.find('[data-testid="masthead-subheader-createdBy_plain-text"]');
 
     expect(link.exists()).toBe(showLink);

From e9c900272c67103de4dace1e052889610f94e37f Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Fri, 21 Feb 2025 12:34:41 +0100
Subject: [PATCH 053/140] Fleet: fix createdBy label assignment in case of
 clone action

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/edit/fleet.cattle.io.gitrepo.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index be13d709af9..d9b187d4f55 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -570,12 +570,12 @@ export default {
       });
     },
 
-    updateBeforeSave(value) {
-      value.spec['correctDrift'] = { enabled: this.correctDriftEnabled };
+    updateBeforeSave() {
+      this.value.spec['correctDrift'] = { enabled: this.correctDriftEnabled };
 
-      if (this.realMode === _CREATE) {
-        value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_ID] = value.currentUser.id;
-        value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_NAME] = value.currentUser.username;
+      if (this.mode === _CREATE) {
+        this.value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_ID] = this.value.currentUser.id;
+        this.value.metadata.labels[FLEET_LABELS.CREATED_BY_USER_NAME] = this.value.currentUser.username;
       }
     },
   }

From 8610dd5d9a77157f7f41d8a3464cf2de63e2383f Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Fri, 21 Feb 2025 16:28:24 +0100
Subject: [PATCH 054/140] Fleet: fix find users permissions

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/detail/fleet.cattle.io.bundle.vue  | 5 +----
 shell/detail/fleet.cattle.io.gitrepo.vue | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/shell/detail/fleet.cattle.io.bundle.vue b/shell/detail/fleet.cattle.io.bundle.vue
index 55ae64cdbf2..79a6a07d9dc 100644
--- a/shell/detail/fleet.cattle.io.bundle.vue
+++ b/shell/detail/fleet.cattle.io.bundle.vue
@@ -16,10 +16,7 @@ export default {
 
   async fetch() {
     if (this.value.authorId && this.$store.getters['management/schemaFor'](MANAGEMENT.USER)) {
-      this.$store.dispatch(`management/find`, {
-        type: MANAGEMENT.USER,
-        id:   this.value.authorId,
-      }, { root: true });
+      await this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.USER }, { root: true });
     }
   },
 
diff --git a/shell/detail/fleet.cattle.io.gitrepo.vue b/shell/detail/fleet.cattle.io.gitrepo.vue
index 209c6eb61d1..9dadd3c64af 100644
--- a/shell/detail/fleet.cattle.io.gitrepo.vue
+++ b/shell/detail/fleet.cattle.io.gitrepo.vue
@@ -92,10 +92,7 @@ export default {
     }, this.$store);
 
     if (this.value.authorId && this.$store.getters['management/schemaFor'](MANAGEMENT.USER)) {
-      this.$store.dispatch(`management/find`, {
-        type: MANAGEMENT.USER,
-        id:   this.value.authorId,
-      }, { root: true });
+      await this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.USER }, { root: true });
     }
 
     this.allBundles = allDispatches.allBundles || [];

From a25b27907c6773fb2ebf507fa35be0acd14bf576 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Fri, 21 Feb 2025 20:50:31 +0100
Subject: [PATCH 055/140] Fleet: fix createBy user location; fix duplicated
 bundles and add null checks

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/fleet/FleetSummary.vue       |  8 ++-
 .../fleet/__tests__/FleetSummary.test.ts      | 53 ++++++++++++++++---
 shell/models/fleet.cattle.io.bundle.js        |  2 +-
 shell/models/fleet.cattle.io.gitrepo.js       |  7 ++-
 4 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/shell/components/fleet/FleetSummary.vue b/shell/components/fleet/FleetSummary.vue
index a330041c1d8..a8c5ff73cd8 100644
--- a/shell/components/fleet/FleetSummary.vue
+++ b/shell/components/fleet/FleetSummary.vue
@@ -73,8 +73,12 @@ export default {
       return this.value.metadata.name;
     },
 
+    repoNamespace() {
+      return this.value.metadata.namespace;
+    },
+
     bundleCounts() {
-      const resources = this.bundles.filter((item) => item.repoName === this.repoName);
+      const resources = this.bundles.filter((item) => item.namespace === this.repoNamespace && item.repoName === this.repoName);
 
       if (!resources.length) {
         return [];
@@ -89,7 +93,7 @@ export default {
           return;
         }
 
-        const k = status?.summary.ready > 0 && status?.summary.desiredReady === status.summary.ready;
+        const k = status?.summary?.ready > 0 && status?.summary.desiredReady === status?.summary?.ready;
 
         if (k) {
           out.ready.count += 1;
diff --git a/shell/components/fleet/__tests__/FleetSummary.test.ts b/shell/components/fleet/__tests__/FleetSummary.test.ts
index 58c0fef60b6..e68fc747354 100644
--- a/shell/components/fleet/__tests__/FleetSummary.test.ts
+++ b/shell/components/fleet/__tests__/FleetSummary.test.ts
@@ -14,12 +14,12 @@ const mockedBundlesInRepo = [{
   apiVersion: 'fleet.cattle.io/v1alpha1',
   kind:       'Bundle',
   repoName:   REPO_NAME,
+  namespace:  'fleet-default',
   metadata:   {
     labels: {
       'fleet.cattle.io/commit':    '3640888439d1b7b6a53dbeee291a533eea2632ab',
       'fleet.cattle.io/repo-name': REPO_NAME
     },
-
     name:      `${ REPO_NAME }-${ CLUSTER_NAME }-1234`,
     namespace: 'fleet-default',
     state:     {
@@ -54,12 +54,12 @@ const mockedBundlesInRepo = [{
   apiVersion: 'fleet.cattle.io/v1alpha1',
   kind:       'Bundle',
   repoName:   REPO_NAME,
+  namespace:  'fleet-default',
   metadata:   {
     labels: {
       'fleet.cattle.io/commit':    '3640888439d1b7b6a53dbeee291a533eea2632ab',
       'fleet.cattle.io/repo-name': REPO_NAME
     },
-
     name:      `${ REPO_NAME }-${ CLUSTER_NAME }-5678`,
     namespace: 'fleet-default',
     state:     {
@@ -95,14 +95,54 @@ const mockedBundlesOutOfRepo = [{
   apiVersion: 'fleet.cattle.io/v1alpha1',
   kind:       'Bundle',
   repoName:   REPO_NAME_VARIANT,
+  namespace:  'custom-namespace',
   metadata:   {
     labels: {
       'fleet.cattle.io/commit':    '3640888439d1b7b6a53dbeee291a533eea2632ab',
       'fleet.cattle.io/repo-name': REPO_NAME_VARIANT
     },
-
     name:      `${ REPO_NAME_VARIANT }-${ CLUSTER_NAME }-1234`,
-    namespace: 'fleet-default',
+    namespace: 'custom-namespace',
+    state:     {
+      error:         false,
+      message:       'Resource is Ready',
+      name:          'active',
+      transitioning: false
+    },
+  },
+  spec: {
+    correctDrift:        { },
+    forceSyncGeneration: 2,
+    ignore:              { },
+    namespace:           'custom-namespace-name',
+    resources:           [
+      {
+        content: 'apiVersion: v1\nkind: ConfigMap\nmetadata:\n  name: configmap-test\n  annotations:\n    {}\n#    key: string\n  labels:\n    {}\n#    key: string\ndata:\n  key1: val1\n  key2: val2\n  key3: val3',
+        name:    'test-configmap.yaml'
+      }
+    ],
+    targets: [
+      {
+        clusterName: 'nb-cluster0-28',
+        namespace:   'custom-namespace-name'
+      }
+    ]
+  }
+},
+{
+  id:         `fleet-default/${ REPO_NAME }-${ CLUSTER_NAME }-1234`,
+  type:       'fleet.cattle.io.bundle',
+  apiVersion: 'fleet.cattle.io/v1alpha1',
+  kind:       'Bundle',
+  repoName:   REPO_NAME,
+  namespace:  'custom-namespace',
+  metadata:   {
+    labels: {
+      'fleet.cattle.io/commit':    '3640888439d1b7b6a53dbeee291a533eea2632ab',
+      'fleet.cattle.io/repo-name': REPO_NAME
+    },
+    name:      `${ REPO_NAME }-${ CLUSTER_NAME }-1234`,
+    namespace: 'custom-namespace',
     state:     {
       error:         false,
       message:       'Resource is Ready',
@@ -135,14 +175,14 @@ const mockedBundlesOutOfRepo = [{
   apiVersion: 'fleet.cattle.io/v1alpha1',
   kind:       'Bundle',
   repoName:   REPO_NAME_VARIANT,
+  namespace:  'custom-namespace',
   metadata:   {
     labels: {
       'fleet.cattle.io/commit':    '3640888439d1b7b6a53dbeee291a533eea2632ab',
       'fleet.cattle.io/repo-name': REPO_NAME_VARIANT
     },
-
     name:      `${ REPO_NAME_VARIANT }-${ CLUSTER_NAME }-5678`,
-    namespace: 'fleet-default',
+    namespace: 'custom-namespace',
     state:     {
       error:         false,
       message:       'Resource is Ready',
@@ -176,7 +216,6 @@ const mockRepo = {
   apiVersion: 'fleet.cattle.io/v1alpha1',
   kind:       'GitRepo',
   metadata:   {
-
     name:      `${ REPO_NAME }`,
     namespace: 'fleet-default',
     state:     {
diff --git a/shell/models/fleet.cattle.io.bundle.js b/shell/models/fleet.cattle.io.bundle.js
index fde118640de..84211598a27 100644
--- a/shell/models/fleet.cattle.io.bundle.js
+++ b/shell/models/fleet.cattle.io.bundle.js
@@ -153,7 +153,7 @@ export default class FleetBundle extends SteveModel {
       location: !this.author ? null : {
         name:   'c-cluster-product-resource-id',
         params: {
-          cluster:  'local',
+          cluster:  '_',
           product:  'auth',
           resource: MANAGEMENT.USER,
           id:       this.author.id,
diff --git a/shell/models/fleet.cattle.io.gitrepo.js b/shell/models/fleet.cattle.io.gitrepo.js
index fb081eb9cc7..97f0d2c6bf5 100644
--- a/shell/models/fleet.cattle.io.gitrepo.js
+++ b/shell/models/fleet.cattle.io.gitrepo.js
@@ -377,7 +377,12 @@ export default class GitRepo extends SteveModel {
 
   get allBundlesStatuses() {
     return this.bundles.reduce((acc, bundle) => {
+      if (isEmpty(bundle.status?.summary)) {
+        return acc;
+      }
+
       const { nonReadyResources, ...summary } = bundle.status?.summary;
+
       const bdCounts = normalizeStateCounts(summary);
       const state = primaryDisplayStatusFromCount(bdCounts.states);
 
@@ -520,7 +525,7 @@ export default class GitRepo extends SteveModel {
       location: !this.author ? null : {
         name:   'c-cluster-product-resource-id',
         params: {
-          cluster:  'local',
+          cluster:  '_',
           product:  'auth',
           resource: MANAGEMENT.USER,
           id:       this.author.id,

From 3471b49832a5e264931362dc1c3ba82911d07911 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Fri, 21 Feb 2025 20:29:33 +0100
Subject: [PATCH 056/140] Add Event schema null checks

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/form/ResourceTabs/index.vue  | 28 ++++++++++---------
 .../pages/c/_cluster/explorer/EventsTable.vue |  5 ++--
 shell/store/type-map.utils.ts                 |  4 +++
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/shell/components/form/ResourceTabs/index.vue b/shell/components/form/ResourceTabs/index.vue
index e80d5344a02..ee627f97158 100644
--- a/shell/components/form/ResourceTabs/index.vue
+++ b/shell/components/form/ResourceTabs/index.vue
@@ -75,23 +75,25 @@ export default {
     const inStore = this.$store.getters['currentStore'](EVENT);
     const eventSchema = this.$store.getters[`${ inStore }/schemaFor`](EVENT); // @TODO be smarter about which resources actually ever have events
 
+    const paginationHeaders = eventSchema ? [
+      STEVE_EVENT_LAST_SEEN,
+      STEVE_EVENT_TYPE,
+      REASON,
+      headerFromSchemaColString('Subobject', eventSchema, this.$store.getters, true),
+      headerFromSchemaColString('Source', eventSchema, this.$store.getters, true),
+      MESSAGE,
+      headerFromSchemaColString('First Seen', eventSchema, this.$store.getters, true),
+      headerFromSchemaColString('Count', eventSchema, this.$store.getters, true),
+      STEVE_NAME_COL,
+    ] : [];
+
     return {
       eventSchema,
       EVENT,
-      selectedTab:       this.defaultTab,
+      selectedTab:    this.defaultTab,
       inStore,
-      showConditions:    false,
-      paginationHeaders: [
-        STEVE_EVENT_LAST_SEEN,
-        STEVE_EVENT_TYPE,
-        REASON,
-        headerFromSchemaColString('Subobject', eventSchema, this.$store.getters, true),
-        headerFromSchemaColString('Source', eventSchema, this.$store.getters, true),
-        MESSAGE,
-        headerFromSchemaColString('First Seen', eventSchema, this.$store.getters, true),
-        headerFromSchemaColString('Count', eventSchema, this.$store.getters, true),
-        STEVE_NAME_COL,
-      ]
+      showConditions: false,
+      paginationHeaders
     };
   },
 
diff --git a/shell/pages/c/_cluster/explorer/EventsTable.vue b/shell/pages/c/_cluster/explorer/EventsTable.vue
index 01cfa54cd1b..5321b75566d 100644
--- a/shell/pages/c/_cluster/explorer/EventsTable.vue
+++ b/shell/pages/c/_cluster/explorer/EventsTable.vue
@@ -35,7 +35,7 @@ export default {
 
     const schema = this.$store.getters['cluster/schemaFor'](EVENT);
 
-    const paginationHeaders = [
+    const paginationHeaders = schema ? [
       reason,
       STEVE_EVENT_OBJECT,
       MESSAGE,
@@ -49,7 +49,7 @@ export default {
         defaultSort: true,
       },
       headerFromSchemaColString('Count', schema, this.$store.getters, true),
-    ];
+    ] : [];
 
     return {
       schema,
@@ -88,6 +88,7 @@ export default {
 
 <template>
   <PaginatedResourceTable
+    v-if="!!schema"
     :schema="schema"
     :headers="eventHeaders"
     :pagination-headers="paginationHeaders"
diff --git a/shell/store/type-map.utils.ts b/shell/store/type-map.utils.ts
index 74343e0c859..ffe8ec88c25 100644
--- a/shell/store/type-map.utils.ts
+++ b/shell/store/type-map.utils.ts
@@ -123,6 +123,10 @@ export function createHeaders(
  * Given a schema's attribute.column value create a header
  */
 export function headerFromSchemaColString(colName: string, schema: Schema, rootGetters: VuexStoreGetters, pagination: boolean, ageColumn: TableColumn): TableColumn {
+  if (!schema) {
+    throw new Error(`Schema is null`);
+  }
+  
   const col = schema.attributes.columns.find((c) => c.name === colName);
 
   if (!col) {

From 2a3e9ebc1639e87cb3cf37f3095cc2480d654464 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 12:28:11 +0100
Subject: [PATCH 057/140] Update shell/store/type-map.utils.ts

Co-authored-by: Richard Cox <18697775+richard-cox@users.noreply.github.com>
---
 shell/store/type-map.utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/store/type-map.utils.ts b/shell/store/type-map.utils.ts
index ffe8ec88c25..3e4fe507ac6 100644
--- a/shell/store/type-map.utils.ts
+++ b/shell/store/type-map.utils.ts
@@ -124,7 +124,7 @@ export function createHeaders(
  */
 export function headerFromSchemaColString(colName: string, schema: Schema, rootGetters: VuexStoreGetters, pagination: boolean, ageColumn: TableColumn): TableColumn {
   if (!schema) {
-    throw new Error(`Schema is null`);
+    throw new Error(`Unable to create header for column '${colName}' from schema: schema is missing`);
   }
   
   const col = schema.attributes.columns.find((c) => c.name === colName);

From 68e982012d352c21d3e73e17ec8082f97de0a94c Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 12:38:01 +0100
Subject: [PATCH 058/140] Lint

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/store/type-map.utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/store/type-map.utils.ts b/shell/store/type-map.utils.ts
index 3e4fe507ac6..79c34311511 100644
--- a/shell/store/type-map.utils.ts
+++ b/shell/store/type-map.utils.ts
@@ -124,9 +124,9 @@ export function createHeaders(
  */
 export function headerFromSchemaColString(colName: string, schema: Schema, rootGetters: VuexStoreGetters, pagination: boolean, ageColumn: TableColumn): TableColumn {
   if (!schema) {
-    throw new Error(`Unable to create header for column '${colName}' from schema: schema is missing`);
+    throw new Error(`Unable to create header for column '${ colName }' from schema: schema is missing`);
   }
-  
+
   const col = schema.attributes.columns.find((c) => c.name === colName);
 
   if (!col) {

From ffe0996790aac7bc3f26f02469d06750943a4f61 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 24 Feb 2025 19:46:12 +0000
Subject: [PATCH 059/140] Fix legacy projects redirect (#13488)

---
 shell/pages/c/_cluster/legacy/project/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/pages/c/_cluster/legacy/project/index.vue b/shell/pages/c/_cluster/legacy/project/index.vue
index a243f7bb46a..1c2deb5a174 100644
--- a/shell/pages/c/_cluster/legacy/project/index.vue
+++ b/shell/pages/c/_cluster/legacy/project/index.vue
@@ -17,7 +17,7 @@ export default {
     project(nue, old) {
       if (nue && !old) {
         // User selected a project while on this page, so redirect to the projects view now that we have a project
-        this.$router.replace({ name: 'c-cluster-legacy-project-page', params: { page: 'apps' } });
+        this.$router.replace({ name: 'c-cluster-legacy-project-page', params: { page: 'config-maps' } });
       }
     }
   }

From 20e24730971460f9d5f523f7402a0b7b3e4aa90a Mon Sep 17 00:00:00 2001
From: a-arias <abraham.arias@suse.com>
Date: Thu, 20 Feb 2025 14:46:32 -0700
Subject: [PATCH 060/140] update path

---
 cypress/jenkins/cypress.config.jenkins.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/jenkins/cypress.config.jenkins.ts b/cypress/jenkins/cypress.config.jenkins.ts
index a24be00432d..cf57b8fc139 100644
--- a/cypress/jenkins/cypress.config.jenkins.ts
+++ b/cypress/jenkins/cypress.config.jenkins.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { defineConfig } from 'cypress';
 import { removeDirectory } from 'cypress-delete-downloads-folder';
-import websocketTasks from './cypress/support/utils/webSocket-utils';
+import websocketTasks from '../../cypress/support/utils/webSocket-utils';
 
 // Required for env vars to be available in cypress
 require('dotenv').config();

From 3643ecd9313d8983fae3de7cee7fb8102398219d Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Mon, 24 Feb 2025 14:53:32 -0800
Subject: [PATCH 061/140] explicit value for managed identity + enable user
 field when editing

---
 pkg/aks/components/CruAks.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkg/aks/components/CruAks.vue b/pkg/aks/components/CruAks.vue
index b391ca1ab3d..db480b5b8f1 100644
--- a/pkg/aks/components/CruAks.vue
+++ b/pkg/aks/components/CruAks.vue
@@ -1003,12 +1003,7 @@ export default defineComponent({
 
     onNetworkingAuthModeChange(authMode) {
       this.networkingAuthMode = authMode;
-
-      if (authMode === NETWORKING_AUTH_MODES.MANAGED_IDENTITY) {
-        this.config.managedIdentity = true;
-      } else {
-        delete this.config.managedIdentity;
-      }
+      this.config.managedIdentity = authMode === NETWORKING_AUTH_MODES.MANAGED_IDENTITY;
     }
   },
 
@@ -1385,7 +1380,6 @@ export default defineComponent({
                 :mode="mode"
                 label-key="aks.userAssignedIdentity.label"
                 :tooltip="t('aks.userAssignedIdentity.tooltip')"
-                :disabled="!isNewOrUnprovisioned"
                 data-testid="cruaks-user-assigned-identity"
               />
             </div>

From 9305cbc89f4d3d880b3806551aabad59eb90a3bc Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 20 Feb 2025 13:54:41 +0100
Subject: [PATCH 062/140] PromptRemove.vue - fix Vue3 warnings

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/PromptRemove.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shell/components/PromptRemove.vue b/shell/components/PromptRemove.vue
index b16951fe5b3..d369f498a70 100644
--- a/shell/components/PromptRemove.vue
+++ b/shell/components/PromptRemove.vue
@@ -1,4 +1,5 @@
 <script>
+import { shallowRef } from 'vue';
 import { mapState, mapGetters } from 'vuex';
 import { get, isEmpty } from '@shell/utils/object';
 import { escapeHtml, resourceNames } from '@shell/utils/string';
@@ -38,7 +39,7 @@ export default {
       error:               '',
       warning:             '',
       preventDelete:       false,
-      removeComponent:     this.$store.getters['type-map/importCustomPromptRemove'](resource),
+      removeComponent:     shallowRef(this.$store.getters['type-map/importCustomPromptRemove'](resource)),
       chartsToRemoveIsApp: false,
       chartsDeleteCrd:     false,
       showModal:           false,
@@ -183,7 +184,7 @@ export default {
 
         this.hasCustomRemove = this.$store.getters['type-map/hasCustomPromptRemove'](resource);
 
-        this.removeComponent = this.$store.getters['type-map/importCustomPromptRemove'](resource);
+        this.removeComponent = shallowRef(this.$store.getters['type-map/importCustomPromptRemove'](resource));
       } else {
         this.showModal = false;
       }
@@ -368,8 +369,7 @@ export default {
             v-if="hasCustomRemove"
             ref="customPrompt"
             v-model:value="toRemove"
-            v-bind="_data"
-            :close="close"
+                        :close="close"
             :needs-confirm="needsConfirm"
             :value="toRemove"
             :names="names"

From fab51d0be3d283af920650d6dc8aaf71e6e2ed21 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 20 Feb 2025 14:06:11 +0100
Subject: [PATCH 063/140] Delete message, list of items refactoring:

- Remove plusMore from dialogs and use a default one
- Fix double and string in resourceNames
- Fix pods remove dialog

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/PromptRemove.vue             | 12 ++-----
 shell/dialog/DeactivateDriverDialog.vue       | 10 +++---
 .../management.cattle.io.globalrole.vue       |  2 +-
 .../management.cattle.io.project.vue          | 10 ++----
 .../management.cattle.io.roletemplate.vue     |  2 +-
 shell/promptRemove/mixin/roleDeletionCheck.js |  8 +----
 shell/promptRemove/pod.vue                    | 35 ++++---------------
 shell/utils/string.js                         | 34 ++++++++++++++----
 8 files changed, 47 insertions(+), 66 deletions(-)

diff --git a/shell/components/PromptRemove.vue b/shell/components/PromptRemove.vue
index d369f498a70..dc3a85794c4 100644
--- a/shell/components/PromptRemove.vue
+++ b/shell/components/PromptRemove.vue
@@ -47,7 +47,7 @@ export default {
   },
   computed: {
     names() {
-      return this.toRemove.map((obj) => obj.nameDisplay).slice(0, 5);
+      return this.toRemove.map((obj) => obj.nameDisplay);
     },
 
     nameToMatchPosition() {
@@ -93,12 +93,6 @@ export default {
       return first?.confirmRemove;
     },
 
-    plusMore() {
-      const remaining = this.toRemove.length - this.names.length;
-
-      return this.t('promptRemove.andOthers', { count: remaining });
-    },
-
     // if the current route ends with the ID of the resource being deleted, whatever page this is wont be valid after successful deletion: navigate away
     doneLocation() {
       // if deleting more than one resource, this is happening in list view and shouldn't redirect anywhere
@@ -360,7 +354,7 @@ export default {
         <div class="mb-10">
           <template v-if="!hasCustomRemove">
             {{ t('promptRemove.attemptingToRemove', { type }) }} <span
-              v-clean-html="resourceNames(names, plusMore, t)"
+              v-clean-html="resourceNames(names, t)"
             />
           </template>
 
@@ -369,7 +363,7 @@ export default {
             v-if="hasCustomRemove"
             ref="customPrompt"
             v-model:value="toRemove"
-                        :close="close"
+            :close="close"
             :needs-confirm="needsConfirm"
             :value="toRemove"
             :names="names"
diff --git a/shell/dialog/DeactivateDriverDialog.vue b/shell/dialog/DeactivateDriverDialog.vue
index 97e51987d4f..c07372b1d03 100644
--- a/shell/dialog/DeactivateDriverDialog.vue
+++ b/shell/dialog/DeactivateDriverDialog.vue
@@ -31,15 +31,15 @@ export default {
   },
   computed: {
     formattedText() {
-      const namesSliced = this.drivers.map((obj) => obj.nameDisplay).slice(0, 5);
-      const remaining = this.drivers.length - namesSliced.length;
+      const namesSliced = this.drivers.map((obj) => obj.nameDisplay);
+      const count = namesSliced.length;
+      const remaining = namesSliced.length > 5 ? namesSliced.length - 5 : 0;
 
       const plusMore = this.t('drivers.deactivate.andOthers', { count: remaining });
-      const names = resourceNames(namesSliced, plusMore, this.t);
-      const count = remaining || namesSliced.length;
+      const names = resourceNames(namesSliced, this.t, { plusMore, endString: false });
       const warningDrivers = this.t('drivers.deactivate.warningDrivers', { names, count });
 
-      return this.t('drivers.deactivate.warning', { warningDrivers, count: namesSliced.length });
+      return this.t('drivers.deactivate.warning', { warningDrivers, count });
     },
     ...mapGetters({ t: 'i18n/t' }),
   },
diff --git a/shell/promptRemove/management.cattle.io.globalrole.vue b/shell/promptRemove/management.cattle.io.globalrole.vue
index c8ae9d05852..94c465568ba 100644
--- a/shell/promptRemove/management.cattle.io.globalrole.vue
+++ b/shell/promptRemove/management.cattle.io.globalrole.vue
@@ -21,7 +21,7 @@ export default {
 
 <template>
   <div>
-    {{ t('promptRemove.attemptingToRemove', { type }) }} <span v-clean-html="resourceNames(names, plusMore, t)" />
+    {{ t('promptRemove.attemptingToRemove', { type }) }} <span v-clean-html="resourceNames(names, t)" />
     <div
       v-if="info"
       class="text info mb-10 mt-20"
diff --git a/shell/promptRemove/management.cattle.io.project.vue b/shell/promptRemove/management.cattle.io.project.vue
index 5191293ad6d..8f9bd857681 100644
--- a/shell/promptRemove/management.cattle.io.project.vue
+++ b/shell/promptRemove/management.cattle.io.project.vue
@@ -58,12 +58,6 @@ export default {
       return [];
     },
 
-    plusMore() {
-      const remaining = this.filteredNamespaces.length > 5 ? this.filteredNamespaces.length - 5 : 0;
-
-      return this.t('promptRemove.andOthers', { count: remaining });
-    },
-
     displayName() {
       return this.currentProject?.spec?.displayName;
     },
@@ -100,7 +94,7 @@ export default {
         <template v-if="!canSeeProjectlessNamespaces">
           <span class="delete-warning"> {{ t('promptRemove.willDeleteAssociatedNamespaces') }}</span> <br>
           <div
-            v-clean-html="resourceNames(names, plusMore, t)"
+            v-clean-html="resourceNames(names, t)"
             class="mt-10"
           />
         </template>
@@ -114,7 +108,7 @@ export default {
           :label="t('promptRemove.deleteAssociatedNamespaces')"
         />
         <div class="mt-10 ml-20">
-          <span v-clean-html="resourceNames(names, plusMore, t)" />
+          <span v-clean-html="resourceNames(names, t)" />
         </div>
       </div>
     </div>
diff --git a/shell/promptRemove/management.cattle.io.roletemplate.vue b/shell/promptRemove/management.cattle.io.roletemplate.vue
index 070b60ea5e1..a1c8c76b4f8 100644
--- a/shell/promptRemove/management.cattle.io.roletemplate.vue
+++ b/shell/promptRemove/management.cattle.io.roletemplate.vue
@@ -22,7 +22,7 @@ export default {
 <template>
   <div>
     {{ t('promptRemove.attemptingToRemove', { type }) }} <span
-      v-clean-html="resourceNames(names, plusMore, t)"
+      v-clean-html="resourceNames(names, t)"
     />
     <div
       v-if="info"
diff --git a/shell/promptRemove/mixin/roleDeletionCheck.js b/shell/promptRemove/mixin/roleDeletionCheck.js
index a0e8598d2fa..7f38d0e12ab 100644
--- a/shell/promptRemove/mixin/roleDeletionCheck.js
+++ b/shell/promptRemove/mixin/roleDeletionCheck.js
@@ -17,13 +17,7 @@ export default {
     ...mapGetters({ t: 'i18n/t' }),
 
     names() {
-      return this.toRemove.map((obj) => obj.nameDisplay).slice(0, 5);
-    },
-
-    plusMore() {
-      const remaining = this.toRemove.length - this.names.length;
-
-      return this.t('promptRemove.andOthers', { count: remaining });
+      return this.toRemove.map((obj) => obj.nameDisplay);
     },
   },
   watch: {
diff --git a/shell/promptRemove/pod.vue b/shell/promptRemove/pod.vue
index f36cc8ceb01..00585ee3a9e 100644
--- a/shell/promptRemove/pod.vue
+++ b/shell/promptRemove/pod.vue
@@ -1,4 +1,5 @@
 <script>
+import { resourceNames } from '@shell/utils/string';
 import { Banner } from '@components/Banner';
 import Checkbox from '@components/Form/Checkbox/Checkbox.vue';
 import { mapGetters, mapState } from 'vuex';
@@ -55,31 +56,10 @@ export default {
   computed: {
     ...mapState('action-menu', ['toRemove']),
     ...mapGetters({ t: 'i18n/t' }),
-
-    plusMore() {
-      const count = this.names.length - this.names.length;
-
-      return this.t('promptRemove.andOthers', { count });
-    },
-
-    podNames() {
-      return this.names.reduce((res, name, i) => {
-        if (i >= 5) {
-          return res;
-        }
-        res += `<b>${ name }</b>`;
-        if (i === this.names.length - 1) {
-          res += this.plusMore;
-        } else {
-          res += i === this.toRemove.length - 2 ? ' and ' : ', ';
-        }
-
-        return res;
-      }, '');
-    },
   },
 
   methods: {
+    resourceNames,
     async remove(confirm) {
       let goTo;
 
@@ -118,8 +98,8 @@ export default {
   <div class="mt-10">
     <div class="mb-30">
       {{ t('promptRemove.attemptingToRemove', { type }) }} <span
-        v-clean-html="podNames"
-        class="machine-name"
+        v-clean-html="resourceNames(names, t)"
+        class="body"
       />
     </div>
     <div class="mb-30">
@@ -143,11 +123,10 @@ export default {
 </template>
 
 <style lang='scss' scoped>
+  .body {
+    font-weight: 600;
+  }
   .actions {
     text-align: right;
   }
-
-  .machine-name {
-    font-weight: 600;
-  }
 </style>
diff --git a/shell/utils/string.js b/shell/utils/string.js
index 0a2fc8dffbc..cb86054a925 100644
--- a/shell/utils/string.js
+++ b/shell/utils/string.js
@@ -151,16 +151,36 @@ export function pluralize(str) {
   }
 }
 
-export function resourceNames(names, plusMore, t) {
+export function resourceNames(names, t, options = {}) {
+  const MAX_NAMES_COUNT = 5;
+
+  let { plusMore, endString } = options;
+
+  // plusMore default value
+  if (!plusMore) {
+    plusMore = t('promptRemove.andOthers', { count: names.length > MAX_NAMES_COUNT ? names.length - MAX_NAMES_COUNT : 0 });
+  }
+
+  // endString default value
+  if (!endString) {
+    endString = endString === false ? ' ' : '.';
+  }
+
   return names.reduce((res, name, i) => {
-    if (i >= 5) {
-      return res;
+    if (i < MAX_NAMES_COUNT) {
+      res += `<b>${ escapeHtml( name ) }</b>`;
+
+      if (i === names.length - 1) {
+        res += endString;
+      } else if (i === names.length - 2) {
+        res += names.length <= 5 ? t('generic.and') : '';
+      } else {
+        res += i < MAX_NAMES_COUNT - 1 ? t('generic.comma') : '';
+      }
     }
-    res += `<b>${ escapeHtml( name ) }</b>`;
-    if (i === names.length - 1) {
+
+    if (i === MAX_NAMES_COUNT) {
       res += plusMore;
-    } else {
-      res += i === names.length - 2 ? t('generic.and') : t('generic.comma');
     }
 
     return res;

From ef040e0d04bc41898cd7f9a015de6cab24f6e68d Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 20 Feb 2025 17:07:09 +0100
Subject: [PATCH 064/140] [unit-tests] Add resourceNames tests

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/utils/__tests__/string.test.ts | 81 +++++++++++++++++++++++++++-
 1 file changed, 80 insertions(+), 1 deletion(-)

diff --git a/shell/utils/__tests__/string.test.ts b/shell/utils/__tests__/string.test.ts
index 829c12904c0..255719936d8 100644
--- a/shell/utils/__tests__/string.test.ts
+++ b/shell/utils/__tests__/string.test.ts
@@ -1,4 +1,4 @@
-import { decodeHtml } from '@shell/utils/string';
+import { decodeHtml, resourceNames } from '@shell/utils/string';
 
 describe('fx: decodeHtml', () => {
   it('should decode HTML values from escaped string into valid markup', () => {
@@ -10,3 +10,82 @@ describe('fx: decodeHtml', () => {
     expect(result).toStrictEqual(expectation);
   });
 });
+
+describe('fx: resourceNames', () => {
+  // default plusMore function
+  const t = (key: string, options: { count: number }) => {
+    switch (key) {
+    case 'generic.and':
+      return ' and ';
+    case 'generic.comma':
+      return ', ';
+    case 'promptRemove.andOthers': {
+      if (options.count === 0) {
+        return '.';
+      }
+      if (options.count === 1) {
+        return 'and <b>one other</b>.';
+      }
+
+      return `and <b>${ options.count } others</b>.`;
+    }
+    }
+  };
+
+  describe.each([
+    ['no options',
+      [
+        [[], '', {}],
+        [['item1'], '<b>item1</b>.', {}],
+        [['item1', 'item2'], '<b>item1</b> and <b>item2</b>.', {}],
+        [['item1', 'item2', 'item3'], '<b>item1</b>, <b>item2</b> and <b>item3</b>.', {}],
+        [['item1', 'item2', 'item3', 'item4', 'item5'], '<b>item1</b>, <b>item2</b>, <b>item3</b>, <b>item4</b> and <b>item5</b>.', {}],
+        [['item1', 'item2', 'item3', 'item4', 'item5', 'item6'], '<b>item1</b>, <b>item2</b>, <b>item3</b>, <b>item4</b>, <b>item5</b>and <b>one other</b>.', {}],
+        [['item1', 'item2', 'item3', 'item4', 'item5', 'item6', 'item7'], '<b>item1</b>, <b>item2</b>, <b>item3</b>, <b>item4</b>, <b>item5</b>and <b>2 others</b>.', {}],
+      ]
+    ],
+    ['plusMore option',
+      [
+        [[], '', { plusMore: 'foo' }],
+        [['item1'], '<b>item1</b>.', { plusMore: 'foo' }],
+        [['item1', 'item2'], '<b>item1</b> and <b>item2</b>.', { plusMore: 'foo' }],
+        [['item1', 'item2', 'item3'], '<b>item1</b>, <b>item2</b> and <b>item3</b>.', { plusMore: 'foo' }],
+        [['item1', 'item2', 'item3', 'item4', 'item5'], '<b>item1</b>, <b>item2</b>, <b>item3</b>, <b>item4</b> and <b>item5</b>.', { plusMore: 'foo' }],
+        [['item1', 'item2', 'item3', 'item4', 'item5', 'item6'], '<b>item1</b>, <b>item2</b>, <b>item3</b>, <b>item4</b>, <b>item5</b>foo', { plusMore: 'foo' }],
+        [['item1', 'item2', 'item3', 'item4', 'item5', 'item6', 'item7'], '<b>item1</b>, <b>item2</b>, <b>item3</b>, <b>item4</b>, <b>item5</b>foo', { plusMore: 'foo' }],
+      ]
+    ],
+    ['endString option',
+      [
+        [[], '', { endString: false }],
+        [['item1'], '<b>item1</b> ', { endString: false }],
+        [['item1', 'item2'], '<b>item1</b> and <b>item2</b> ', { endString: false }],
+        [['item1', 'item2'], '<b>item1</b> and <b>item2</b>.', { endString: '' }],
+        [['item1', 'item2'], '<b>item1</b> and <b>item2</b>foo', { endString: 'foo' }],
+      ]
+    ],
+    [
+      'plusMore & endString options', [
+        [[], '', { plusMore: '', endString: false }],
+        [[], '', { plusMore: 'foo', endString: 'foo' }],
+        [['item1'], '<b>item1</b>foo', { plusMore: 'foo', endString: 'foo' }],
+        [['item1', 'item2'], '<b>item1</b> and <b>item2</b>foo', { plusMore: 'foo', endString: 'foo' }],
+        [['item1', 'item2'], '<b>item1</b> and <b>item2</b> ', { plusMore: 'foo', endString: false }],
+        [['item1', 'item2', 'item3', 'item4', 'item5', 'item6'], '<b>item1</b>, <b>item2</b>, <b>item3</b>, <b>item4</b>, <b>item5</b>foo', { plusMore: 'foo', endString: 'foo' }],
+        [['item1', 'item2', 'item3', 'item4', 'item5', 'item6', 'item7'], '<b>item1</b>, <b>item2</b>, <b>item3</b>, <b>item4</b>, <b>item5</b>foo', { plusMore: 'foo', endString: 'foo' }],
+        [['item1', 'item2', 'item3', 'item4', 'item5', 'item6'], '<b>item1</b>, <b>item2</b>, <b>item3</b>, <b>item4</b>, <b>item5</b>foo', { plusMore: 'foo', endString: false }],
+        [['item1', 'item2', 'item3', 'item4', 'item5', 'item6', 'item7'], '<b>item1</b>, <b>item2</b>, <b>item3</b>, <b>item4</b>, <b>item5</b>foo', { plusMore: 'foo', endString: false }],
+      ]
+    ]
+  ])('should build a single message from a list of names, with: %p', (_, args) => {
+    it.each(args)(`having: %p`, (
+      names,
+      expectation,
+      options,
+    ) => {
+      const result = resourceNames(names, t, options);
+
+      expect(result).toStrictEqual(expectation);
+    });
+  });
+});

From 8c7a4684b8623cfc6425548178eed883c86f19ca Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Fri, 21 Feb 2025 09:54:21 +0100
Subject: [PATCH 065/140] Add v-bind="$data" to PromptRemove.vue

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/PromptRemove.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/shell/components/PromptRemove.vue b/shell/components/PromptRemove.vue
index dc3a85794c4..187ab4ca40c 100644
--- a/shell/components/PromptRemove.vue
+++ b/shell/components/PromptRemove.vue
@@ -363,6 +363,7 @@ export default {
             v-if="hasCustomRemove"
             ref="customPrompt"
             v-model:value="toRemove"
+            v-bind="$data"
             :close="close"
             :needs-confirm="needsConfirm"
             :value="toRemove"

From b1b9b756e6fa05360060d3269aa9d664bd6724a8 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 19:37:43 +0100
Subject: [PATCH 066/140] Fleet: Implement force update dialog

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/assets/translations/en-us.yaml      |  19 ++++
 shell/dialog/GitRepoForceUpdateDialog.vue | 132 ++++++++++++++++++++++
 shell/models/fleet.cattle.io.gitrepo.js   |  34 +++---
 3 files changed, 172 insertions(+), 13 deletions(-)
 create mode 100644 shell/dialog/GitRepoForceUpdateDialog.vue

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index e58b1e02b6c..2df54ada810 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2455,6 +2455,25 @@ fleet:
       waitApplied: Wait Applied
   gitRepo:
     createLocalBanner: When deploying a Git Repo to the Local workspace you are unable to target any specific Cluster or Cluster Groups
+    actions:
+      forceUpdate:
+        label: Force Update
+        promptTitle: Force Update
+        promptNames: 'You are attempting to update: '
+        promptWarning: |-
+          {
+            count, plural,
+            =1 {Force update could be a long running process, the repository will be cloned again.}
+            other {Force update could be a long running process, the repositories will be cloned again.}
+          }
+      enablePolling:
+        label: Enable Polling
+      disablePolling:
+        label: Disable Polling
+      unpause:
+        label: Unpause
+      pause:
+        label: Pause
     tabs:
       resources: Resources
       unready: Non-Ready
diff --git a/shell/dialog/GitRepoForceUpdateDialog.vue b/shell/dialog/GitRepoForceUpdateDialog.vue
new file mode 100644
index 00000000000..ac64c91c66f
--- /dev/null
+++ b/shell/dialog/GitRepoForceUpdateDialog.vue
@@ -0,0 +1,132 @@
+<script>
+import { mapGetters, mapState } from 'vuex';
+import { resourceNames } from '@shell/utils/string';
+import { exceptionToErrorsArray } from '@shell/utils/error';
+import { Banner } from '@components/Banner';
+import { Card } from '@components/Card';
+import AsyncButton from '@shell/components/AsyncButton';
+
+export default {
+  name: 'GitRepoForceUpdateDialog',
+
+  emits: ['close'],
+
+  components: {
+    AsyncButton,
+    Banner,
+    Card,
+  },
+
+  props: {
+    repositories: {
+      type:     Array,
+      required: true,
+    },
+  },
+
+  data() {
+    return { errors: [] };
+  },
+
+  computed: {
+    ...mapState('action-menu', ['toRemove']),
+    ...mapGetters({ t: 'i18n/t' }),
+
+    names() {
+      return this.repositories.map((repository) => repository.nameDisplay);
+    }
+  },
+
+  methods: {
+    resourceNames,
+
+    close(buttonDone) {
+      if (buttonDone && typeof buttonDone === 'function') {
+        buttonDone(true);
+      }
+      this.$emit('close');
+    },
+
+    async apply(buttonDone) {
+      try {
+        await Promise.all(this.repositories.map((repository) => this.updateGitRepo(repository)));
+
+        this.close();
+      } catch (err) {
+        this.errors = exceptionToErrorsArray(err);
+        buttonDone(false);
+      }
+    },
+
+    updateGitRepo(repository) {
+      const now = repository.spec.forceSyncGeneration || 1;
+
+      repository.spec.forceSyncGeneration = now + 1;
+
+      return repository.save();
+    },
+  }
+};
+</script>
+
+<template>
+  <Card
+    class="prompt-force-update"
+    :show-highlight-border="false"
+  >
+    <template #title>
+      <h4
+        v-clean-html="t('fleet.gitRepo.actions.forceUpdate.promptTitle')"
+        class="text-default-text"
+      />
+    </template>
+
+    <template #body>
+      <div class="mb-30">
+        {{ t('fleet.gitRepo.actions.forceUpdate.promptNames') }} <span
+          v-clean-html="resourceNames(names, t)"
+          class="body"
+        />
+      </div>
+      <Banner
+        color="warning"
+        label-key="fleet.gitRepo.actions.forceUpdate.promptWarning"
+      >
+        <span v-clean-html="t('fleet.gitRepo.actions.forceUpdate.promptWarning', { count: names.length}, true)" />
+      </Banner>
+      <Banner
+        v-for="(err, i) in errors"
+        :key="i"
+        color="error"
+        :label="err"
+      />
+    </template>
+
+    <template #actions>
+      <button
+        class="btn role-secondary"
+        @click="close"
+      >
+        {{ t('generic.cancel') }}
+      </button>
+      <div class="spacer" />
+      <AsyncButton
+        mode="update"
+        class="btn bg-info ml-10"
+        :data-testid="'deactivate-driver-confirm'"
+        @click="apply"
+      />
+    </template>
+  </Card>
+</template>
+
+<style lang='scss' scoped>
+  .card-container {
+    box-shadow: none;
+  }
+
+  :deep() .card-actions {
+    display: flex;
+    justify-content: end;
+  }
+</style>
diff --git a/shell/models/fleet.cattle.io.gitrepo.js b/shell/models/fleet.cattle.io.gitrepo.js
index 97f0d2c6bf5..8874467683d 100644
--- a/shell/models/fleet.cattle.io.gitrepo.js
+++ b/shell/models/fleet.cattle.io.gitrepo.js
@@ -72,7 +72,7 @@ export default class GitRepo extends SteveModel {
 
     insertAt(out, 0, {
       action:   'pause',
-      label:    'Pause',
+      label:    this.t('fleet.gitRepo.actions.pause.label'),
       icon:     'icon icon-pause',
       bulkable: true,
       enabled:  !!this.links.update && !this.spec?.paused
@@ -80,7 +80,7 @@ export default class GitRepo extends SteveModel {
 
     insertAt(out, 1, {
       action:   'unpause',
-      label:    'Unpause',
+      label:    this.t('fleet.gitRepo.actions.unpause.label'),
       icon:     'icon icon-play',
       bulkable: true,
       enabled:  !!this.links.update && this.spec?.paused === true
@@ -88,7 +88,7 @@ export default class GitRepo extends SteveModel {
 
     insertAt(out, 2, {
       action:   'enablePolling',
-      label:    'Enable Polling',
+      label:    this.t('fleet.gitRepo.actions.enablePolling.label'),
       icon:     'icon icon-endpoints_connected',
       bulkable: true,
       enabled:  !!this.links.update && !!this.spec?.disablePolling
@@ -96,18 +96,19 @@ export default class GitRepo extends SteveModel {
 
     insertAt(out, 3, {
       action:   'disablePolling',
-      label:    'Disable Polling',
+      label:    this.t('fleet.gitRepo.actions.disablePolling.label'),
       icon:     'icon icon-endpoints_disconnected',
       bulkable: true,
       enabled:  !!this.links.update && !this.spec?.disablePolling
     });
 
     insertAt(out, 4, {
-      action:   'forceUpdate',
-      label:    'Force Update',
-      icon:     'icon icon-refresh',
-      bulkable: true,
-      enabled:  !!this.links.update
+      action:     'forceUpdate',
+      label:      this.t('fleet.gitRepo.actions.forceUpdate.label'),
+      icon:       'icon icon-refresh',
+      bulkable:   true,
+      bulkAction: 'forceUpdateBulk',
+      enabled:    !!this.links.update
     });
 
     insertAt(out, 5, { divider: true });
@@ -147,11 +148,18 @@ export default class GitRepo extends SteveModel {
     super.goToClone();
   }
 
-  forceUpdate() {
-    const now = this.spec.forceSyncGeneration || 1;
+  forceUpdate(resources = [this]) {
+    this.$dispatch('promptModal', {
+      componentProps: { repositories: resources },
+      component:      'GitRepoForceUpdateDialog'
+    });
+  }
 
-    this.spec.forceSyncGeneration = now + 1;
-    this.save();
+  forceUpdateBulk(resources) {
+    this.$dispatch('promptModal', {
+      componentProps: { repositories: resources },
+      component:      'GitRepoForceUpdateDialog'
+    });
   }
 
   get state() {

From bc66cc6835416400db97a4fe6984056fadeb27c5 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:10:24 +0000
Subject: [PATCH 067/140] Fix GitHub auth error (#13493)

* Fix auth error message for GitHub

* Apply to all oauth providers

* Increase timeout on Harvester e2e tests to reduce flakiness
---
 .../pages/virtualization-mgmt/harvester.spec.ts      |  4 ++--
 shell/assets/translations/en-us.yaml                 |  1 +
 shell/pages/auth/login.vue                           |  2 ++
 shell/pages/auth/verify.vue                          | 12 +++++++++++-
 shell/store/auth.js                                  |  1 +
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/cypress/e2e/tests/pages/virtualization-mgmt/harvester.spec.ts b/cypress/e2e/tests/pages/virtualization-mgmt/harvester.spec.ts
index 0859885b1e1..62dd79a5fc2 100644
--- a/cypress/e2e/tests/pages/virtualization-mgmt/harvester.spec.ts
+++ b/cypress/e2e/tests/pages/virtualization-mgmt/harvester.spec.ts
@@ -33,8 +33,8 @@ describe('Harvester', { tags: ['@virtualizationMgmt', '@adminUser'] }, () => {
 
     // install harvester extension
     harvesterPo.updateOrInstallButton().click();
-    cy.wait('@createHarvesterChart').its('response.statusCode').should('eq', 201);
-    cy.wait('@updateHarvesterChart').its('response.statusCode').should('eq', 200);
+    cy.wait('@createHarvesterChart', MEDIUM_TIMEOUT_OPT).its('response.statusCode').should('eq', 201);
+    cy.wait('@updateHarvesterChart', MEDIUM_TIMEOUT_OPT).its('response.statusCode').should('eq', 200);
     cy.wait('@installHarvesterExtension', MEDIUM_TIMEOUT_OPT).its('response.statusCode').should('eq', 201);
     harvesterPo.waitForPage();
     cy.wait('@updateHarvesterChart', LONG_TIMEOUT_OPT).its('response.statusCode').should('eq', 200);
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index e58b1e02b6c..79ae9a99168 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -3420,6 +3420,7 @@ login:
   error: An error occurred logging in. Please try again.
   invalidResponseError: Invalid response received to login request. Please try again.
   clientError: Invalid username or password. Please try again.
+  userUnauthorized: You are not authorized to use this system.
   specificError: 'An error occurred logging in: {msg}'
   useLocal: Use a local user
   loginWithProvider: Log in with {provider}
diff --git a/shell/pages/auth/login.vue b/shell/pages/auth/login.vue
index 408b7c84e57..75671c514f3 100644
--- a/shell/pages/auth/login.vue
+++ b/shell/pages/auth/login.vue
@@ -107,6 +107,8 @@ export default {
         return this.t('login.error');
       } else if (this.err === LOGIN_ERRORS.NONCE) {
         return this.t('login.invalidResponseError');
+      } else if (this.err === LOGIN_ERRORS.USER_UNAUTHORIZED) {
+        return this.t('login.userUnauthorized');
       }
 
       return this.err?.length ? this.t('login.specificError', { msg: this.err }) : '';
diff --git a/shell/pages/auth/verify.vue b/shell/pages/auth/verify.vue
index 58f7eef431f..dc47d3a7270 100644
--- a/shell/pages/auth/verify.vue
+++ b/shell/pages/auth/verify.vue
@@ -5,9 +5,12 @@ import {
 import { get } from '@shell/utils/object';
 import { base64Decode } from '@shell/utils/crypto';
 import loadPlugins from '@shell/plugins/plugin';
+import { LOGIN_ERRORS } from '@shell/store/auth';
 
 const samlProviders = ['ping', 'adfs', 'keycloak', 'okta', 'shibboleth'];
 
+const oauthProviders = ['github', 'googleoauth', 'azuread'];
+
 function reply(err, code) {
   try {
     window.opener.window.onAuthTest(err, code);
@@ -114,7 +117,14 @@ export default {
         this.$router.replace(`/auth/login?err=${ escape(res) }`);
       }
     } catch (err) {
-      this.$router.replace(`/auth/login?err=${ escape(err) }`);
+      let errCode = err;
+
+      // If the provider is OAUTH, then the client error is not that the credentials are wrong, but that the user is not authorized
+      if (oauthProviders.includes(provider) && err === LOGIN_ERRORS.CLIENT_UNAUTHORIZED) {
+        errCode = LOGIN_ERRORS.USER_UNAUTHORIZED;
+      }
+
+      this.$router.replace(`/auth/login?err=${ escape(errCode) }`);
     }
   },
 
diff --git a/shell/store/auth.js b/shell/store/auth.js
index c1908ca9c2d..96d2c66b435 100644
--- a/shell/store/auth.js
+++ b/shell/store/auth.js
@@ -23,6 +23,7 @@ export const LOGIN_ERRORS = {
   CLIENT_UNAUTHORIZED: 'client_unauthorized',
   SERVER:              'server',
   NONCE:               'nonce',
+  USER_UNAUTHORIZED:   'user_unauthorized',
 };
 
 export const state = function() {

From f13e7c25ca449afe13f3f893a2b51b4e0392b594 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 25 Feb 2025 13:46:20 +0000
Subject: [PATCH 068/140] add loadPLugins method to ldap login interface
 (#13501)

---
 shell/components/auth/login/ldap.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/shell/components/auth/login/ldap.vue b/shell/components/auth/login/ldap.vue
index 745f613d34c..55723bd7319 100644
--- a/shell/components/auth/login/ldap.vue
+++ b/shell/components/auth/login/ldap.vue
@@ -2,6 +2,7 @@
 import { LabeledInput } from '@components/Form/LabeledInput';
 import AsyncButton from '@shell/components/AsyncButton';
 import Login from '@shell/mixins/login';
+import loadPlugins from '@shell/plugins/plugin';
 
 export default {
   emits: ['error', 'showInputs'],
@@ -32,6 +33,12 @@ export default {
           }
         });
 
+        await loadPlugins({
+          app:     this.$store.app,
+          store:   this.$store,
+          $plugin: this.$store.$plugin
+        });
+
         buttonCb(true);
         this.$router.replace('/');
       } catch (err) {

From 5131092561185ad88519c25a487fef005f3928fe Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 25 Feb 2025 16:47:15 +0100
Subject: [PATCH 069/140] Fleet: fix graph zoomFit function in case of root
 node is null

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/fleet/ForceDirectedTreeChart/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/shell/components/fleet/ForceDirectedTreeChart/index.vue b/shell/components/fleet/ForceDirectedTreeChart/index.vue
index b97517cd6dc..1ddada685db 100644
--- a/shell/components/fleet/ForceDirectedTreeChart/index.vue
+++ b/shell/components/fleet/ForceDirectedTreeChart/index.vue
@@ -238,8 +238,12 @@ export default {
     },
     zoomFit() {
       const rootNode = d3.select('.root-node');
-      const paddingBuffer = 30;
 
+      if (!rootNode?.node()) {
+        return;
+      }
+
+      const paddingBuffer = 30;
       const chartDimentions = rootNode.node().getBoundingClientRect();
       const chartCoordinates = rootNode.node().getBBox();
       const parent = rootNode.node().parentElement;

From 88347f776f363853302d60cd6be0e8ab7ab2de72 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Tue, 25 Feb 2025 10:21:46 -0700
Subject: [PATCH 070/140] Add unit tests for new GrouprSearchEnabled input

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 shell/edit/auth/__tests__/oidc.test.ts | 35 +++++++++++++++++++-------
 shell/edit/auth/oidc.vue               |  1 +
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/shell/edit/auth/__tests__/oidc.test.ts b/shell/edit/auth/__tests__/oidc.test.ts
index 2ed09aa0918..98e318dab88 100644
--- a/shell/edit/auth/__tests__/oidc.test.ts
+++ b/shell/edit/auth/__tests__/oidc.test.ts
@@ -19,15 +19,16 @@ const validAuthEndpoint = 'http://localhost:8080/realms/rancherrealm/protocol/op
 const validScope = 'openid profile email';
 
 const mockModel = {
-  enabled:      false,
-  id:           'genericoidc',
-  rancherUrl:   validRancherUrl,
-  issuer:       validIssuer,
-  authEndpoint: validAuthEndpoint,
-  scope:        validScope,
-  clientId:     validClientId,
-  clientSecret: validClientSecret,
-  type:         'genericOIDCConfig',
+  enabled:            false,
+  id:                 'genericoidc',
+  rancherUrl:         validRancherUrl,
+  issuer:             validIssuer,
+  authEndpoint:       validAuthEndpoint,
+  scope:              validScope,
+  clientId:           validClientId,
+  clientSecret:       validClientSecret,
+  type:               'genericOIDCConfig',
+  groupSearchEnabled: false,
 };
 
 describe('oidc.vue', () => {
@@ -131,4 +132,20 @@ describe('oidc.vue', () => {
 
     expect(wrapper.vm.model.issuer).toBe(`${ validUrl }/realms/${ validRealm }`);
   });
+
+  it('`groupSearchEnabled` defaults to false', async() => {
+    const groupSearchCheckbox = wrapper.getComponent('[data-testid="input-group-search"]');
+
+    expect(groupSearchCheckbox.isVisible()).toBe(true);
+    expect(wrapper.vm.model.groupSearchEnabled).toBe(false);
+  });
+
+  it('`groupSearchEnabled` updates when checkbox is clicked', async() => {
+    const groupSearchCheckbox = wrapper.getComponent('[data-testid="input-group-search"]');
+
+    await groupSearchCheckbox.find('[role="checkbox"]').trigger('click');
+
+    expect(groupSearchCheckbox.isVisible()).toBe(true);
+    expect(wrapper.vm.model.groupSearchEnabled).toBe(true);
+  });
 });
diff --git a/shell/edit/auth/oidc.vue b/shell/edit/auth/oidc.vue
index 993b2d9cc02..fc842555f40 100644
--- a/shell/edit/auth/oidc.vue
+++ b/shell/edit/auth/oidc.vue
@@ -259,6 +259,7 @@ export default {
           <div class="col span-6">
             <Checkbox
               v-model:value="model.groupSearchEnabled"
+              data-testid="input-group-search"
               :label="t('authConfig.oidc.groupSearch.label')"
               :tooltip="t('authConfig.oidc.groupSearch.tooltip')"
               :mode="mode"

From 4e725f76f09c7fc6224f3536b334cf45d4d0bd0f Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 25 Feb 2025 18:28:20 +0100
Subject: [PATCH 071/140] Fleet: fix Force update banner color and margin

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/dialog/GitRepoForceUpdateDialog.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/dialog/GitRepoForceUpdateDialog.vue b/shell/dialog/GitRepoForceUpdateDialog.vue
index ac64c91c66f..b98ad3e0500 100644
--- a/shell/dialog/GitRepoForceUpdateDialog.vue
+++ b/shell/dialog/GitRepoForceUpdateDialog.vue
@@ -82,14 +82,14 @@ export default {
     </template>
 
     <template #body>
-      <div class="mb-30">
+      <div class="mb-20">
         {{ t('fleet.gitRepo.actions.forceUpdate.promptNames') }} <span
           v-clean-html="resourceNames(names, t)"
           class="body"
         />
       </div>
       <Banner
-        color="warning"
+        color="info"
         label-key="fleet.gitRepo.actions.forceUpdate.promptWarning"
       >
         <span v-clean-html="t('fleet.gitRepo.actions.forceUpdate.promptWarning', { count: names.length}, true)" />

From 93a4befad9b568ae91d09ddd2a535c260e4485c2 Mon Sep 17 00:00:00 2001
From: Evgeniya Vashkevich <evgeniya.vashkevich@suse.com>
Date: Tue, 25 Feb 2025 14:05:44 -0800
Subject: [PATCH 072/140] Merged cluster import and editing imported cluster
 (#13332)

---
 .../po/extensions/imported/cluster-edit.po.ts |  12 +-
 .../imported/cluster-import-generic.po.ts}    |   3 +-
 cypress/e2e/tests/pages/generic/home.spec.ts  |   2 +-
 .../pages/manager/cluster-manager.spec.ts     |  56 ++---
 pkg/aks/components/CruAks.vue                 |   2 +-
 pkg/aks/l10n/en-us.yaml                       |   1 -
 pkg/eks/components/CruEKS.vue                 |   2 +-
 pkg/gke/components/CruGKE.vue                 |   2 +-
 pkg/gke/l10n/en-us.yaml                       |   1 -
 pkg/imported/assets/generic.svg               |  99 +++++++++
 pkg/imported/components/CruImported.vue       | 182 +++++++++++-----
 pkg/imported/index.ts                         |   7 +-
 pkg/imported/l10n/en-us.yaml                  |   8 +-
 pkg/imported/provisioner.ts                   |  74 ++++++-
 pkg/imported/util/validators.ts               |  60 ++++++
 shell/assets/translations/en-us.yaml          |   1 +
 shell/core/types-provisioning.ts              |   7 +
 .../provisioning.cattle.io.cluster/import.vue | 198 ------------------
 .../provisioning.cattle.io.cluster/index.vue  |  20 +-
 shell/models/cluster.js                       |  10 +
 20 files changed, 433 insertions(+), 314 deletions(-)
 rename cypress/e2e/po/{edit/provisioning.cattle.io.cluster/import/cluster-import.generic.po.ts => extensions/imported/cluster-import-generic.po.ts} (82%)
 create mode 100644 pkg/imported/assets/generic.svg
 create mode 100644 pkg/imported/util/validators.ts
 delete mode 100644 shell/edit/provisioning.cattle.io.cluster/import.vue

diff --git a/cypress/e2e/po/extensions/imported/cluster-edit.po.ts b/cypress/e2e/po/extensions/imported/cluster-edit.po.ts
index c5b580d1b95..0f44b2f96db 100644
--- a/cypress/e2e/po/extensions/imported/cluster-edit.po.ts
+++ b/cypress/e2e/po/extensions/imported/cluster-edit.po.ts
@@ -1,7 +1,7 @@
 import PagePo from '@/cypress/e2e/po/pages/page.po';
-import LabeledInputPo from '@/cypress/e2e/po/components/labeled-input.po';
 import ACE from '@/cypress/e2e/po/components/ace.po';
 import ResourceDetailPo from '@/cypress/e2e/po/edit/resource-detail.po';
+import NameNsDescription from '@/cypress/e2e/po/components/name-ns-description.po';
 
 /**
  * Edit page for imported cluster
@@ -11,7 +11,7 @@ export default class ClusterManagerEditImportedPagePo extends PagePo {
     return `/c/${ clusterId }/manager/provisioning.cattle.io.cluster/fleet-default/${ clusterName }`;
   }
 
-  static goTo(clusterId: string, clusterName: string): Cypress.Chainable<Cypress.AUTWindow> {
+  static goTo(clusterId: string, clusterName: string ): Cypress.Chainable<Cypress.AUTWindow> {
     return super.goTo(ClusterManagerEditImportedPagePo.createPath(clusterId, clusterName));
   }
 
@@ -19,14 +19,18 @@ export default class ClusterManagerEditImportedPagePo extends PagePo {
     super(ClusterManagerEditImportedPagePo.createPath(clusterId, clusterName));
   }
 
-  name(): LabeledInputPo {
-    return LabeledInputPo.byLabel(this.self(), 'Name');
+  nameNsDescription() {
+    return new NameNsDescription(this.self());
   }
 
   ace(): ACE {
     return new ACE();
   }
 
+  enableNetworkAccordion() {
+    return this.self().find('[data-testid="network-accordion"]').click();
+  }
+
   resourceDetail() {
     return new ResourceDetailPo(this.self());
   }
diff --git a/cypress/e2e/po/edit/provisioning.cattle.io.cluster/import/cluster-import.generic.po.ts b/cypress/e2e/po/extensions/imported/cluster-import-generic.po.ts
similarity index 82%
rename from cypress/e2e/po/edit/provisioning.cattle.io.cluster/import/cluster-import.generic.po.ts
rename to cypress/e2e/po/extensions/imported/cluster-import-generic.po.ts
index 6c20ad1551e..1dbb349ee7c 100644
--- a/cypress/e2e/po/edit/provisioning.cattle.io.cluster/import/cluster-import.generic.po.ts
+++ b/cypress/e2e/po/extensions/imported/cluster-import-generic.po.ts
@@ -1,7 +1,8 @@
 import ClusterManagerImportPagePo from '@/cypress/e2e/po/edit/provisioning.cattle.io.cluster/import/cluster-import.po';
 
 /**
- * Create page for a generic imported cluster
+ * Import page for generic cluster
  */
 export default class ClusterManagerImportGenericPagePo extends ClusterManagerImportPagePo {
+
 }
diff --git a/cypress/e2e/tests/pages/generic/home.spec.ts b/cypress/e2e/tests/pages/generic/home.spec.ts
index dc00f604e9a..ea6dafe287f 100644
--- a/cypress/e2e/tests/pages/generic/home.spec.ts
+++ b/cypress/e2e/tests/pages/generic/home.spec.ts
@@ -2,7 +2,7 @@ import { CURRENT_RANCHER_VERSION } from '@shell/config/version.js';
 import HomePagePo from '@/cypress/e2e/po/pages/home.po';
 import PreferencesPagePo from '@/cypress/e2e/po/pages/preferences.po';
 import ClusterManagerListPagePo from '@/cypress/e2e/po/pages/cluster-manager/cluster-manager-list.po';
-import ClusterManagerImportGenericPagePo from '@/cypress/e2e/po/edit/provisioning.cattle.io.cluster/import/cluster-import.generic.po';
+import ClusterManagerImportGenericPagePo from '@/cypress/e2e/po/extensions/imported/cluster-import-generic.po';
 import { PARTIAL_SETTING_THRESHOLD } from '@/cypress/support/utils/settings-utils';
 import { RANCHER_PAGE_EXCEPTIONS, catchTargetPageException } from '~/cypress/support/utils/exception-utils';
 
diff --git a/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts b/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
index fd87aa90fd2..d266073d943 100644
--- a/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
+++ b/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
@@ -9,7 +9,7 @@ import ClusterManagerDetailSnapshotsPo from '@/cypress/e2e/po/detail/provisionin
 import ClusterManagerDetailImportedGenericPagePo from '@/cypress/e2e/po/detail/provisioning.cattle.io.cluster/cluster-detail-import-generic.po';
 import ClusterManagerCreateRke2CustomPagePo from '@/cypress/e2e/po/edit/provisioning.cattle.io.cluster/create/cluster-create-rke2-custom.po';
 import ClusterManagerEditRke2CustomPagePo from '@/cypress/e2e/po/edit/provisioning.cattle.io.cluster/edit/cluster-edit-rke2-custom.po';
-import ClusterManagerImportGenericPagePo from '@/cypress/e2e/po/edit/provisioning.cattle.io.cluster/import/cluster-import.generic.po';
+import ClusterManagerImportGenericPagePo from '@/cypress/e2e/po/extensions/imported/cluster-import-generic.po';
 import ClusterManagerEditImportedPagePo from '@/cypress/e2e/po/extensions/imported/cluster-edit.po';
 import ClusterManagerNamespacePagePo from '@/cypress/e2e/po/pages/cluster-manager/namespace.po';
 import PromptRemove from '@/cypress/e2e/po/prompts/promptRemove.po';
@@ -35,11 +35,13 @@ const runPrefix = `e2e-test-${ runTimestamp }`;
 // File specific consts
 const namespace = 'fleet-default';
 const type = 'provisioning.cattle.io.cluster';
+const importType = 'cluster';
 const clusterNamePartial = `${ runPrefix }-create`;
 const rke1CustomName = `${ clusterNamePartial }-rke1-custom`;
 const rke2CustomName = `${ clusterNamePartial }-rke2-custom`;
 const importGenericName = `${ clusterNamePartial }-import-generic`;
 let reenableAKS = false;
+let importedClusterName = '';
 
 const downloadsFolder = Cypress.config('downloadsFolder');
 
@@ -592,12 +594,8 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
     const cacert = 'cacert';
 
     describe('Generic', () => {
-      const editImportedClusterPage = new ClusterManagerEditImportedPagePo(undefined, importGenericName);
-
       it('can create new cluster', () => {
-        const detailClusterPage = new ClusterManagerDetailImportedGenericPagePo(undefined, importGenericName);
-
-        cy.intercept('POST', `/v1/${ type }s`).as('importRequest');
+        cy.intercept('POST', `/v3/${ importType }s`).as('importRequest');
 
         clusterList.goTo();
         clusterList.checkIsCurrentPage();
@@ -609,25 +607,32 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
         importClusterPage.create();
 
         cy.wait('@importRequest').then((intercept) => {
+          importedClusterName = intercept.response.body.id;
+          cy.wrap(intercept.response.body.id).as('importedClusterId');
+
           expect(intercept.request.body).to.deep.equal({
-            type,
-            metadata: {
-              namespace,
-              name: importGenericName
-            },
-            spec: {}
+            type:         importType,
+            agentEnvVars: [],
+            annotations:  {},
+            labels:       {},
+            name:         importGenericName
+
           });
         });
-        detailClusterPage.waitForPage(undefined, 'registration');
-        detailClusterPage.kubectlCommandForImported().contains('--insecure').then(($value) => {
-          const kubectlCommand = $value.text();
-
-          expect(kubectlCommand).to.contain('--insecure');
-          cy.log(kubectlCommand);
-          cy.exec(kubectlCommand, { failOnNonZeroExit: false }).then((result) => {
-            cy.log(result.stderr);
-            cy.log(result.stdout);
-            expect(result.code).to.eq(0);
+        cy.get('@importedClusterId').then((importedClusterId) => {
+          const detailClusterPage = new ClusterManagerDetailImportedGenericPagePo(undefined, importedClusterId.toString());
+
+          detailClusterPage.waitForPage(undefined, 'registration');
+          detailClusterPage.kubectlCommandForImported().contains('--insecure').then(($value) => {
+            const kubectlCommand = $value.text();
+
+            expect(kubectlCommand).to.contain('--insecure');
+            cy.log(kubectlCommand);
+            cy.exec(kubectlCommand, { failOnNonZeroExit: false }).then((result) => {
+              cy.log(result.stderr);
+              cy.log(result.stdout);
+              expect(result.code).to.eq(0);
+            });
           });
         });
 
@@ -642,15 +647,18 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
       });
 
       it('can edit imported cluster and see changes afterwards', () => {
+        const editImportedClusterPage = new ClusterManagerEditImportedPagePo(undefined, importedClusterName);
+
         cy.intercept('GET', '/v1-rke2-release/releases').as('getRke2Releases');
         clusterList.goTo();
         clusterList.list().actionMenu(importGenericName).getMenuItem('Edit Config').click();
         editImportedClusterPage.waitForPage('mode=edit');
 
-        editImportedClusterPage.name().value().should('eq', importGenericName );
+        editImportedClusterPage.nameNsDescription().name().value().should('eq', importGenericName );
         // Issue #10432: Edit Cluster screen falsely gives impression imported cluster's name and description can be edited
-        editImportedClusterPage.name().expectToBeDisabled();
+        editImportedClusterPage.nameNsDescription().name().expectToBeDisabled();
 
+        editImportedClusterPage.enableNetworkAccordion();
         editImportedClusterPage.ace().enable();
         editImportedClusterPage.ace().enterFdqn(fqdn);
         editImportedClusterPage.ace().enterCaCerts(cacert);
diff --git a/pkg/aks/components/CruAks.vue b/pkg/aks/components/CruAks.vue
index db480b5b8f1..376d7349648 100644
--- a/pkg/aks/components/CruAks.vue
+++ b/pkg/aks/components/CruAks.vue
@@ -1459,7 +1459,7 @@ export default defineComponent({
         </Accordion>
         <Accordion
           class="mb-20"
-          title-key="aks.accordions.clusterMembers"
+          title-key="members.memberRoles"
         >
           <Banner
             v-if="isEdit"
diff --git a/pkg/aks/l10n/en-us.yaml b/pkg/aks/l10n/en-us.yaml
index c914b5a3ae0..48213e6d91c 100644
--- a/pkg/aks/l10n/en-us.yaml
+++ b/pkg/aks/l10n/en-us.yaml
@@ -77,7 +77,6 @@ aks:
   accordions:
     basics: Basics
     networking: Networking
-    clusterMembers: Cluster Members
     labels: Labels and Annotations
   containerMonitoring:
     label: Configure Container Monitoring
diff --git a/pkg/eks/components/CruEKS.vue b/pkg/eks/components/CruEKS.vue
index ca08cb9e538..3a061b9efad 100644
--- a/pkg/eks/components/CruEKS.vue
+++ b/pkg/eks/components/CruEKS.vue
@@ -765,7 +765,7 @@ export default defineComponent({
       </Accordion>
       <Accordion
         class="mb-20"
-        :title="t('members.clusterMembership')"
+        :title="t('members.memberRoles')"
       >
         <Banner
           v-if="isEdit"
diff --git a/pkg/gke/components/CruGKE.vue b/pkg/gke/components/CruGKE.vue
index d959ce7bdb6..d38645e44af 100644
--- a/pkg/gke/components/CruGKE.vue
+++ b/pkg/gke/components/CruGKE.vue
@@ -886,7 +886,7 @@ export default defineComponent({
 
         <Accordion
           class="mb-20"
-          :title="t('gke.accordion.members')"
+          :title="t('members.memberRoles')"
         >
           <Banner
             v-if="isEdit"
diff --git a/pkg/gke/l10n/en-us.yaml b/pkg/gke/l10n/en-us.yaml
index 9b90f0c0914..238dd8058c7 100644
--- a/pkg/gke/l10n/en-us.yaml
+++ b/pkg/gke/l10n/en-us.yaml
@@ -9,7 +9,6 @@ gke:
     config: Config
     labels: Labels and Annotations
     import: Choose Cluster
-    members: Cluster Members
     networking: Networking
     nodePools: Node Pools
   authScopes:
diff --git a/pkg/imported/assets/generic.svg b/pkg/imported/assets/generic.svg
new file mode 100644
index 00000000000..ec251481086
--- /dev/null
+++ b/pkg/imported/assets/generic.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#326CE5;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M49.7,1.5c-0.9,0-1.8,0.3-2.6,0.6L12.4,18.8c-1.8,0.9-3.2,2.5-3.6,4.5L0.2,60.6c-0.4,1.7-0.1,3.6,0.9,5.1
+		l0.4,0.5L25.5,96c1.3,1.6,3.2,2.5,5.2,2.5h38.6c2,0,3.9-0.9,5.2-2.5l24.1-29.9c1.3-1.6,1.7-3.6,1.3-5.6l-8.5-37.3
+		c-0.5-2-1.8-3.6-3.6-4.5L52.9,2.2C51.9,1.7,50.8,1.5,49.7,1.5L49.7,1.5z"/>
+	<path class="st1" d="M50,14.2c-1.2,0.1-2.1,1.1-2.1,2.3c0,0,0,0,0,0l0,0c0,0.2,0,0.4,0,0.5c0.1,0.7,0.1,1.3,0.3,2
+		c0.2,1.2,0.3,2.5,0.2,3.8c-0.1,0.4-0.3,0.8-0.7,1.1v0.9c-1.3,0.1-2.5,0.3-3.8,0.6c-5.2,1.2-10,3.9-13.7,7.8l-0.7-0.5
+		c-0.4,0.1-0.8,0.1-1.2-0.1c-1-0.8-2-1.6-2.8-2.5c-0.4-0.5-0.9-1-1.4-1.5l-0.5-0.4c-0.4-0.3-0.9-0.5-1.5-0.6c-0.6,0-1.3,0.2-1.7,0.7
+		c-0.7,1-0.5,2.4,0.5,3.1l0,0l0.4,0.4c0.6,0.4,1.1,0.7,1.7,1c1.1,0.6,2.2,1.4,3.1,2.2c0.2,0.4,0.4,0.8,0.4,1.2l0.7,0.6
+		c-3.7,5.5-5.2,12.2-4.2,18.8l-0.8,0.4c-0.2,0.4-0.5,0.7-0.9,0.9c-1.2,0.3-2.5,0.5-3.7,0.6c-0.7,0-1.3,0.1-2,0.2l-0.6,0.1l0,0
+		c-1.1,0.2-1.9,1.2-1.8,2.4c0.2,1.1,1.2,1.9,2.4,1.8c0.1,0,0.2,0,0.3-0.1l0,0l0.5-0.1c0.6-0.2,1.2-0.5,1.7-0.8
+		c1.2-0.4,2.4-0.8,3.6-1c0.4,0,0.8,0.2,1.2,0.4l0.9-0.2c2,6.3,6.3,11.6,12,14.9l-0.4,0.9c0.2,0.4,0.2,0.8,0.2,1.2
+		c-0.5,1.2-1.2,2.3-2,3.4c-0.4,0.5-0.8,1.1-1.1,1.7l-0.3,0.6c-0.6,1-0.2,2.3,0.8,2.8c1,0.6,2.3,0.2,2.8-0.8c0-0.1,0.1-0.2,0.1-0.2
+		l0,0l0.3-0.5c0.2-0.6,0.4-1.3,0.6-2c0.4-1.3,0.9-2.6,1.6-3.7c0.3-0.2,0.6-0.4,0.9-0.4l0.5-0.8c6.2,2.4,13,2.4,19.2,0l0.5,0.8
+		c0.4,0.1,0.8,0.3,1.1,0.6c0.6,1.1,1.1,2.3,1.4,3.5c0.2,0.7,0.4,1.3,0.6,2l0.3,0.5c0.4,1.1,1.6,1.6,2.7,1.2s1.6-1.6,1.2-2.7
+		c0-0.1-0.1-0.2-0.2-0.3l-0.3-0.6c-0.3-0.6-0.7-1.1-1-1.7c-0.7-1-1.3-2.1-1.8-3.3c-0.1-0.4-0.1-0.8,0.2-1.2
+		c-0.1-0.3-0.2-0.6-0.3-0.8c5.7-3.4,10-8.8,12-15.1l0.9,0.2c0.3-0.3,0.7-0.4,1.2-0.4c1.2,0.2,2.4,0.6,3.6,1.1
+		c0.6,0.3,1.2,0.5,1.9,0.7l0.5,0.1l0,0c1.1,0.3,2.3-0.3,2.6-1.4c0.3-1.1-0.3-2.3-1.4-2.6c-0.1,0-0.2-0.1-0.3-0.1l-0.6-0.1
+		c-0.7-0.1-1.3-0.1-2-0.2c-1.3-0.1-2.5-0.3-3.7-0.6c-0.4-0.2-0.7-0.5-0.9-0.9l-0.8-0.2c0.9-6.6-0.6-13.2-4.3-18.7l0.7-0.7
+		c0-0.4,0.1-0.9,0.4-1.2c1-0.8,2-1.6,3.1-2.2c0.6-0.3,1.2-0.6,1.7-1l0.5-0.4c1-0.6,1.2-1.9,0.6-2.9c-0.6-1-1.9-1.2-2.9-0.6
+		c-0.1,0.1-0.2,0.1-0.3,0.2l-0.5,0.4c-0.5,0.5-0.9,0.9-1.4,1.5c-0.8,0.9-1.7,1.8-2.7,2.5c-0.4,0.2-0.8,0.2-1.3,0.1l-0.8,0.6
+		c-4.6-4.8-10.7-7.7-17.3-8.3c0-0.3,0-0.8,0-0.9c-0.4-0.2-0.6-0.6-0.7-1c0-1.3,0-2.5,0.2-3.8c0.1-0.6,0.2-1.3,0.3-2
+		c0-0.2,0-0.4,0-0.6C52.2,15.3,51.3,14.3,50,14.2C50.1,14.2,50,14.2,50,14.2L50,14.2z M47.4,30.3l-0.6,10.9l0,0c0,1-0.9,1.8-1.9,1.7
+		c-0.4,0-0.7-0.1-1-0.4l0,0l-9-6.3c2.8-2.8,6.4-4.7,10.3-5.6C45.9,30.5,46.7,30.4,47.4,30.3z M52.6,30.3c4.7,0.6,9.1,2.7,12.5,6
+		l-8.9,6.3l0,0c-0.8,0.6-2,0.4-2.6-0.4c-0.2-0.3-0.3-0.6-0.4-1l0,0L52.6,30.3z M31.6,40.4l8.2,7.3l0,0c0.8,0.7,0.8,1.8,0.2,2.6
+		c-0.2,0.3-0.6,0.5-0.9,0.6l0,0l-10.5,3C28.1,49.2,29.1,44.4,31.6,40.4L31.6,40.4L31.6,40.4z M68.4,40.4c2.5,4,3.6,8.8,3.1,13.5
+		l-10.5-3l0,0c-1-0.3-1.6-1.3-1.3-2.2c0.1-0.4,0.3-0.7,0.6-0.9l0,0L68.4,40.4L68.4,40.4L68.4,40.4z M48.3,48.3h3.3l2.1,2.6L53,54.1
+		l-3,1.5l-3-1.5l-0.7-3.2L48.3,48.3z M59.1,57.2h0.4l0,0L70.3,59c-1.6,4.5-4.6,8.3-8.7,10.9l-4.2-10.1l0,0c-0.4-0.9,0.1-2,1-2.4
+		C58.7,57.3,58.9,57.3,59.1,57.2L59.1,57.2L59.1,57.2z M40.9,57.2c1,0,1.8,0.8,1.8,1.9c0,0.2-0.1,0.5-0.2,0.7l0,0l-4.2,10
+		c-4-2.6-7-6.4-8.6-10.8l10.7-1.8l0,0L40.9,57.2L40.9,57.2L40.9,57.2z M50,61.6c0.7,0,1.3,0.4,1.7,1l0,0l5.3,9.6
+		c-0.7,0.2-1.4,0.4-2.1,0.6c-3.9,0.9-8,0.7-11.8-0.6l5.3-9.6l0,0C48.7,62,49.3,61.6,50,61.6z"/>
+	<path class="st1" d="M34.6,85.8c-0.3,0-0.6-0.1-0.8-0.2c-1.1-0.6-1.5-1.9-0.9-3v-0.2l0.2-0.4c0.2-0.4,0.5-0.8,0.7-1.1l0.4-0.6
+		c0.8-1.1,1.4-2.2,2-3.4c0.1-0.4,0-0.8-0.2-1.2l0,0l0.3-0.9c-5.7-3.4-10-8.7-12-15l-0.9,0.2l0,0l0,0c-0.3-0.2-0.7-0.3-1.1-0.4l0,0
+		c-1.3,0.2-2.5,0.5-3.7,1l0,0L18,61c-0.4,0.2-0.8,0.3-1.3,0.5h-0.4h-0.2l0,0c-1.1,0.4-2.3-0.3-2.6-1.4c-0.4-1.1,0.3-2.3,1.4-2.6
+		c0.1,0,0.2-0.1,0.3-0.1l0,0h0.2h0.4c0.4-0.1,0.9-0.1,1.3-0.1h0.7l0,0c1.2-0.1,2.5-0.3,3.7-0.6c0.3-0.2,0.6-0.5,0.8-0.8v-0.1l0,0
+		l0.9-0.3c-0.9-6.6,0.6-13.2,4.2-18.8l-0.6-0.5l0,0l0,0c0-0.4-0.2-0.8-0.4-1.1c-1-0.8-2-1.5-3.1-2.2l-0.6-0.3
+		c-0.4-0.2-0.8-0.4-1.1-0.7l-0.3-0.2l-0.1-0.1l0,0c-1-0.7-1.4-2-0.7-3.1c0-0.1,0.1-0.1,0.1-0.2c0.4-0.5,1-0.8,1.6-0.7l0,0
+		c0.5,0,1,0.2,1.5,0.6h0.1l0.3,0.3c0.3,0.3,0.6,0.6,0.9,1l0.5,0.5l0,0c0.9,1,1.8,1.8,2.9,2.6c0.3,0.2,0.7,0.2,1.1,0.1h0.2l0.7,0.5
+		c3.7-3.9,8.4-6.6,13.6-7.8c1.2-0.3,2.5-0.5,3.8-0.6v-0.9l0,0c0.3-0.3,0.6-0.7,0.7-1.1c0-1.2,0-2.5-0.2-3.7l0,0c0-0.2,0-0.5-0.1-0.7
+		c-0.1-0.4-0.2-0.9-0.2-1.3c0-0.1,0-0.2,0-0.4v-0.3l0,0l0,0c-0.1-1.2,0.9-2.3,2.1-2.4c0,0,0.1,0,0.1,0c0.6,0,1.1,0.3,1.5,0.7
+		c0.4,0.5,0.6,1,0.6,1.7c0,0,0,0.1,0,0.2s0,0.3,0,0.4c0,0.5,0,0.9-0.1,1.4c0,0.2,0,0.4-0.1,0.7v0.1c-0.2,1.2-0.3,2.4-0.2,3.7
+		c0.1,0.4,0.3,0.7,0.6,0.9l0.1,0.1l0,0c0,0.2,0,0.6,0,0.9c3.3,0.3,6.5,1.1,9.5,2.6c2.9,1.4,5.6,3.4,7.9,5.7l0.8-0.6h0.1
+		c0.4,0,0.7,0,1.1-0.2c1-0.7,1.9-1.6,2.7-2.5l0,0l0.4-0.5c0.3-0.3,0.6-0.7,0.9-1l0.3-0.3l0.1-0.1c0.9-0.8,2.3-0.7,3.1,0.2
+		c0.4,0.4,0.5,1,0.4,1.6c-0.1,0.6-0.4,1.1-0.9,1.5l-0.2,0.1l-0.3,0.3c-0.4,0.3-0.7,0.5-1.1,0.7l-0.6,0.3c-1.1,0.6-2.1,1.3-3,2.1
+		c-0.3,0.3-0.4,0.6-0.4,1v0.2l0,0l-0.3,0.3l-0.4,0.4c3.7,5.5,5.2,12.2,4.3,18.7l0.7,0.2l0,0l0,0c0.2,0.3,0.5,0.6,0.8,0.8
+		c1.2,0.3,2.4,0.5,3.7,0.6l0,0h0.7c0.4,0,0.9,0,1.3,0.1h0.4h0.2c1.2,0.2,2,1.2,1.8,2.4c-0.2,1.2-1.2,2-2.4,1.8c-0.1,0-0.2,0-0.3-0.1
+		l0,0h-0.2h-0.3c-0.4-0.1-0.8-0.3-1.2-0.5l-0.5-0.1l0,0c-1.1-0.5-2.3-0.8-3.6-1c-0.4,0-0.7,0.1-1,0.3h-0.1l0,0l-0.9-0.2
+		c-1,3.1-2.5,6-4.6,8.6c-2.1,2.6-4.6,4.8-7.5,6.5l0.1,0.3c0.1,0.2,0.1,0.4,0.2,0.6l0,0V76c-0.2,0.3-0.2,0.7-0.1,1.1
+		c0.5,1.2,1,2.3,1.7,3.3l0.4,0.6c0.3,0.3,0.5,0.7,0.7,1.1l0.2,0.4v0.2c0.6,1.1,0.2,2.4-0.9,3c-0.5,0.2-1.1,0.2-1.6,0
+		c-0.6-0.2-1-0.7-1.3-1.2v-0.2l-0.2-0.4c-0.2-0.4-0.3-0.8-0.4-1.3c0-0.2-0.1-0.4-0.2-0.6l0,0c-0.4-1.2-0.8-2.3-1.4-3.4
+		c-0.2-0.3-0.5-0.5-0.9-0.6h-0.1l0,0l-0.2-0.4l-0.2-0.4c-6.2,2.4-13,2.4-19.2,0L40,77.9l0,0c-0.3,0.1-0.6,0.2-0.9,0.4
+		c-0.5,0.8-0.9,1.6-1.2,2.5c-0.1,0.4-0.3,0.8-0.5,1.2c-0.2,0.4-0.1,0.4-0.2,0.6c-0.1,0.4-0.2,0.9-0.4,1.3l-0.2,0.4v0.2l0,0
+		C36.3,85.3,35.5,85.8,34.6,85.8z M36,75.9c0.2,0.4,0.2,0.8,0.2,1.2c-0.5,1.2-1.2,2.3-2,3.4L33.8,81c-0.3,0.4-0.5,0.7-0.7,1.1
+		l-0.2,0.4v0.2c-0.6,1-0.2,2.2,0.8,2.8c1,0.6,2.2,0.2,2.8-0.8c0.1-0.1,0.1-0.2,0.1-0.3l0,0v-0.2l0.2-0.4c0.2-0.4,0.3-0.8,0.4-1.3
+		c0-0.2,0.1-0.4,0.2-0.6c0.1-0.2,0.3-0.8,0.5-1.2c0.2-0.9,0.6-1.8,1.2-2.5c0.3-0.2,0.6-0.4,0.9-0.4l0.5-0.9l0,0
+		c6.2,2.4,13,2.4,19.2,0l0,0l0.3,0.6l0.2,0.4h0.1c0.4,0.1,0.7,0.3,0.9,0.6c0.6,1.1,1.1,2.3,1.4,3.4l0,0c0,0.2,0.1,0.4,0.2,0.6
+		c0.1,0.4,0.2,0.8,0.4,1.3l0.2,0.4v0.2c0.3,0.5,0.7,1,1.2,1.2c0.5,0.2,1.1,0.2,1.6,0c1-0.6,1.4-1.9,0.9-2.9v-0.2L66.8,82
+		c-0.2-0.4-0.5-0.8-0.7-1.1l-0.4-0.5c-0.7-1-1.3-2.1-1.8-3.3c-0.1-0.4-0.1-0.8,0.1-1.1v-0.1c-0.1-0.2-0.2-0.4-0.2-0.6V75l0,0
+		c5.7-3.4,10-8.8,12-15.1l0,0l0.9,0.2h0.1c0.3-0.2,0.7-0.4,1-0.4c1.2,0.2,2.4,0.6,3.6,1l0,0l0.6,0.3c0.4,0.2,0.8,0.3,1.2,0.5h0.3
+		h0.2l0,0c1,0.5,2.3,0,2.7-1c0.5-1,0-2.3-1-2.7c-0.3-0.1-0.5-0.2-0.8-0.2h-0.2h-0.4c-0.4-0.1-0.9-0.1-1.3-0.1h-0.7l0,0
+		c-1.2-0.1-2.5-0.3-3.7-0.6c-0.3-0.2-0.6-0.6-0.7-1l0,0l-0.8-0.3l0,0c0.9-6.6-0.6-13.2-4.3-18.7l0,0l0.4-0.4l0.3-0.3v-0.3
+		c0-0.4,0.1-0.8,0.4-1c1-0.8,2-1.6,3.1-2.2l0.6-0.3c0.4-0.2,0.8-0.4,1.1-0.7l0.3-0.2l0.2-0.1c0.5-0.4,0.8-0.9,0.9-1.5
+		c0.1-0.5,0-1.1-0.4-1.6c-0.8-0.9-2.2-1-3.1-0.2c0,0,0,0,0,0l-0.1,0.1l-0.3,0.3c-0.3,0.3-0.6,0.6-0.9,1L74.5,30l0,0
+		c-0.9,0.9-1.8,1.8-2.9,2.5c-0.4,0.2-0.8,0.2-1.2,0.2h-0.1l-0.8,0.6l0,0c-2.3-2.4-4.9-4.3-7.9-5.7c-3-1.4-6.1-2.3-9.4-2.6l0,0
+		c0-0.3,0-0.8,0-0.9l-0.1-0.1c-0.3-0.2-0.5-0.6-0.6-0.9c0-1.2,0-2.5,0.2-3.7v-0.2c0-0.2,0-0.5,0.1-0.7c0.1-0.4,0.2-0.9,0.2-1.3
+		c0-0.1,0-0.3,0-0.4c0-0.1-0.1-0.2-0.1-0.2c0-0.6-0.2-1.2-0.6-1.6c-0.3-0.4-0.8-0.6-1.4-0.7l0,0c-1.2,0.1-2,1.1-2,2.3l0,0v0.2
+		c0,0.1,0,0.3,0,0.4c0,0.5,0,0.9,0,1.4c0,0.2,0,0.4,0.1,0.7l0,0c0.2,1.2,0.3,2.5,0.2,3.8c-0.1,0.4-0.3,0.8-0.7,1.1v0.9l0,0
+		c-1.3,0.1-2.5,0.3-3.8,0.6c-5.2,1.2-10,3.8-13.6,7.7l0,0l-0.7-0.5h-0.1c-0.4,0.1-0.7,0.1-1.1-0.1c-1-0.7-1.9-1.6-2.8-2.5l0,0
+		l-0.5-0.5c-0.3-0.3-0.6-0.7-0.9-0.9l-0.4-0.3h-0.1c-0.4-0.3-0.9-0.5-1.4-0.6c-0.6,0-1.3,0.2-1.7,0.7c-0.7,1-0.5,2.3,0.5,3
+		c0,0,0,0,0,0l0,0l0.1,0.1l0.3,0.2c0.4,0.3,0.7,0.5,1.1,0.7l0.6,0.3c1.1,0.6,2.2,1.3,3.1,2c0.2,0.3,0.4,0.7,0.4,1.1l0,0l0.7,0.6l0,0
+		c-3.7,5.5-5.2,12.2-4.2,18.8l0,0l-0.8,0.4V56c-0.2,0.3-0.5,0.6-0.8,0.8c-1.2,0.3-2.4,0.5-3.7,0.6l0,0h-0.7c-0.4,0-0.9,0-1.3,0.1
+		h-0.4h-0.2l0,0c-1.1,0-2,1-2,2.1c0,1.1,1,2,2.1,2c0.3,0,0.6-0.1,0.8-0.2l0,0h0.2h0.4c0.4-0.1,0.8-0.3,1.2-0.5l0.5-0.2l0,0
+		c1.2-0.4,2.4-0.8,3.6-1c0.4,0,0.8,0.1,1.1,0.4l0,0l0.9-0.2l0,0c2,6.3,6.3,11.6,12,14.9l0,0L36,75.9z M50,73.3
+		c-2.4,0-4.7-0.4-6.9-1.1l0,0l5.3-9.6l0,0c0.3-0.6,1-1,1.7-1c0.7,0,1.3,0.4,1.7,1l0,0l5.3,9.6l0,0c-0.7,0.2-1.4,0.4-2.1,0.6
+		C53.3,73.1,51.7,73.3,50,73.3z M43.1,72.1c3.8,1.3,7.9,1.5,11.8,0.6c0.7-0.2,1.4-0.4,2.1-0.6l-5.3-9.5l0,0c-0.3-0.6-1-1-1.7-0.9
+		l0,0c-0.6,0-1.2,0.4-1.5,1l0,0L43.1,72.1z M61.6,69.9L61.6,69.9l-4.2-10.1l0,0c-0.4-1,0.1-2,1-2.4c0.2-0.1,0.4-0.1,0.6-0.1h0.5
+		L70.4,59l0,0C68.8,63.5,65.7,67.4,61.6,69.9L61.6,69.9L61.6,69.9z M57.5,59.8l4.2,10.1c4-2.6,7-6.4,8.6-10.9l-10.8-1.8l0,0h-0.4
+		l0,0c-1,0-1.8,0.9-1.8,1.9C57.3,59.4,57.4,59.6,57.5,59.8L57.5,59.8z M38.4,69.9L38.4,69.9c-4-2.6-7-6.4-8.6-10.8l0,0l10.8-1.8h0.4
+		c1,0,1.8,0.9,1.8,1.9c0,0.2,0,0.4-0.1,0.6l0,0l0,0L38.4,69.9z M29.8,59.1c1.6,4.4,4.6,8.2,8.6,10.8l4.1-10.1l0,0l0,0
+		c0.4-0.9,0-2-0.9-2.4c-0.2-0.1-0.5-0.2-0.7-0.2h-0.4l0,0L29.8,59.1z M50,55.6L50,55.6l-3-1.5l0,0l-0.7-3.2l0,0l2.1-2.6h3.4l2.1,2.6
+		L53,54.2l0,0L50,55.6z M47,54.1l3,1.4l3-1.4l0.7-3.2l-2.1-2.6h-3.3l-2.1,2.6L47,54.1z M28.6,54L28.6,54c-0.5-4.7,0.6-9.5,3-13.6
+		l0,0l8.2,7.3l0,0c0.8,0.7,0.8,1.8,0.2,2.6c-0.2,0.3-0.5,0.5-0.9,0.6l0,0l0,0L28.6,54z M31.6,40.5c-2.5,4-3.5,8.8-3,13.4l10.4-3l0,0
+		l0,0c1-0.3,1.5-1.2,1.3-2.2c-0.1-0.4-0.3-0.7-0.6-0.9l0,0l0,0L31.6,40.5z M71.5,53.9L71.5,53.9l-10.5-3l0,0c-1-0.3-1.6-1.3-1.3-2.3
+		c0.1-0.3,0.3-0.7,0.6-0.9l0,0l8.1-7.3l0,0C70.8,44.4,71.9,49.2,71.5,53.9L71.5,53.9L71.5,53.9z M61,50.8l10.5,3.1
+		c0.4-4.7-0.7-9.4-3.1-13.5l-8.1,7.3l0,0c-0.8,0.6-0.9,1.8-0.2,2.5C60.3,50.5,60.6,50.7,61,50.8L61,50.8L61,50.8L61,50.8z M44.9,43
+		c-0.4,0-0.8-0.1-1.1-0.4l0,0l-9-6.3l0,0c2.9-2.8,6.4-4.7,10.3-5.6c0.7-0.1,1.5-0.3,2.2-0.3l0,0l-0.6,10.9l0,0
+		C46.8,42.2,45.9,43.1,44.9,43L44.9,43z M43.8,42.6L43.8,42.6c0.8,0.6,1.9,0.4,2.5-0.4c0.2-0.3,0.3-0.7,0.4-1l0,0l0.7-10.9
+		c-0.7,0.1-1.5,0.2-2.2,0.4c-3.9,0.9-7.5,2.8-10.3,5.6L43.8,42.6L43.8,42.6L43.8,42.6z M55.1,42.9c-1,0-1.8-0.8-1.8-1.8l0,0
+		l-0.6-10.9l0,0c4.7,0.6,9.1,2.7,12.5,6l0,0l-8.9,6.3l0,0C55.9,42.9,55.5,43,55.1,42.9L55.1,42.9z M53.2,41.1L53.2,41.1
+		c0.1,1,0.9,1.8,1.9,1.7c0.4,0,0.7-0.1,1-0.3l0,0l8.9-6.3c-3.4-3.3-7.8-5.3-12.4-5.9L53.2,41.1z"/>
+</g>
+</svg>
diff --git a/pkg/imported/components/CruImported.vue b/pkg/imported/components/CruImported.vue
index ec62a99841e..38ce76bd35b 100644
--- a/pkg/imported/components/CruImported.vue
+++ b/pkg/imported/components/CruImported.vue
@@ -9,22 +9,34 @@ import CreateEditView from '@shell/mixins/create-edit-view';
 import FormValidation from '@shell/mixins/form-validation';
 import CruResource from '@shell/components/CruResource.vue';
 import Loading from '@shell/components/Loading.vue';
-import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
 import Accordion from '@components/Accordion/Accordion.vue';
 import Banner from '@components/Banner/Banner.vue';
 import ClusterMembershipEditor, { canViewClusterMembershipEditor } from '@shell/components/form/Members/ClusterMembershipEditor.vue';
 import Labels from '@shell/components/form/Labels.vue';
 import Basics from '@pkg/imported/components/Basics.vue';
 import ACE from '@shell/edit/provisioning.cattle.io.cluster/tabs/networking/ACE';
-import { MANAGEMENT } from '@shell/config/types';
+import { NORMAN, MANAGEMENT, CAPI, HCI } from '@shell/config/types';
 import KeyValue from '@shell/components/form/KeyValue';
 import { Checkbox } from '@components/Form/Checkbox';
+import { NAME as HARVESTER_MANAGER } from '@shell/config/harvester-manager-types';
+import { HARVESTER as HARVESTER_FEATURE, mapFeature } from '@shell/store/features';
+import { HIDE_DESC, mapPref } from '@shell/store/prefs';
+import { addObject } from '@shell/utils/array';
+import NameNsDescription from '@shell/components/form/NameNsDescription';
+import genericImportedClusterValidators from '../util/validators';
+
+const HARVESTER_HIDE_KEY = 'cm-harvester-import';
+const defaultCluster = {
+  agentEnvVars: [],
+  labels:       {},
+  annotations:  {}
+};
 
 export default defineComponent({
   name: 'CruImported',
 
   components: {
-    Basics, ACE, Loading, CruResource, KeyValue, LabeledInput, Accordion, Banner, ClusterMembershipEditor, Labels, Checkbox
+    Basics, ACE, Loading, CruResource, KeyValue, NameNsDescription, Accordion, Banner, ClusterMembershipEditor, Labels, Checkbox
   },
 
   mixins: [CreateEditView, FormValidation],
@@ -60,6 +72,8 @@ export default defineComponent({
         this.normanCluster.agentEnvVars = [];
       }
       this.getVersions();
+    } else {
+      this.normanCluster = await store.dispatch('rancher/create', { type: NORMAN.CLUSTER, ...defaultCluster }, { root: true });
     }
   },
 
@@ -68,18 +82,19 @@ export default defineComponent({
       normanCluster:    { name: '' },
       loadingVersions:  false,
       membershipUpdate: {},
-      config:           {},
+      config:           null,
       allVersions:      [],
       defaultVer:       '',
       fvFormRuleSets:   [{
+        path:  'name',
+        rules: ['clusterNameRequired', 'clusterNameChars', 'clusterNameStartEnd', 'clusterNameLength'],
+      }, {
         path:  'workerConcurrency',
         rules: ['workerConcurrencyRule']
-      },
-      {
+      }, {
         path:  'controlPlaneConcurrency',
         rules: ['controlPlaneConcurrencyRule']
-      },
-
+      }
       ],
     };
   },
@@ -92,22 +107,12 @@ export default defineComponent({
     ...mapGetters({ t: 'i18n/t' }),
     fvExtraRules() {
       return {
-        workerConcurrencyRule: () => {
-          const val = this?.normanCluster?.k3sConfig?.k3supgradeStrategy?.workerConcurrency || this?.normanCluster?.rke2Config?.rke2upgradeStrategy?.workerConcurrency || '';
-          const exists = this?.normanCluster?.k3sConfig?.k3supgradeStrategy || this?.normanCluster?.rke2Config?.rke2upgradeStrategy;
-          // BE is only checking that the value is an integer >= 1
-          const valIsInvalid = Number(val) < 1 || !Number.isInteger(+val) || `${ val }`.match(/\.+/g);
-
-          return !!exists && valIsInvalid ? this.t('imported.errors.concurrency', { key: 'Worker Concurrency' }) : undefined ;
-        },
-        controlPlaneConcurrencyRule: () => {
-          const val = this?.normanCluster?.k3sConfig?.k3supgradeStrategy?.serverConcurrency || this?.normanCluster?.rke2Config?.rke2upgradeStrategy?.serverConcurrency || '';
-          const exists = this?.normanCluster?.k3sConfig?.k3supgradeStrategy || this?.normanCluster?.rke2Config?.rke2upgradeStrategy;
-          // BE is only checking that the value is an integer >= 1
-          const valIsInvalid = Number(val) < 1 || !Number.isInteger(+val) || `${ val }`.match(/\.+/g);
-
-          return !!exists && valIsInvalid ? this.t('imported.errors.concurrency', { key: 'Control Plane Concurrency' }) : undefined ;
-        },
+        clusterNameRequired:         genericImportedClusterValidators.clusterNameRequired(this),
+        clusterNameChars:            genericImportedClusterValidators.clusterNameChars(this),
+        clusterNameStartEnd:         genericImportedClusterValidators.clusterNameStartEnd(this),
+        clusterNameLength:           genericImportedClusterValidators.clusterNameLength(this),
+        workerConcurrencyRule:       genericImportedClusterValidators.workerConcurrency(this),
+        controlPlaneConcurrencyRule: genericImportedClusterValidators.controlPlaneConcurrency(this),
       };
     },
 
@@ -130,7 +135,7 @@ export default defineComponent({
     },
 
     isEdit() {
-      return this.mode === _CREATE || this.mode === _EDIT;
+      return this.mode === _EDIT;
     },
     isK3s() {
       return !!this.value.isK3s;
@@ -161,6 +166,22 @@ export default defineComponent({
     // and Basics should be hidden
     showBasics() {
       return !!this.config;
+    },
+    showInstanceDescription() {
+      return this.isLocal || !this.isEdit;
+    },
+    hideDescriptions: mapPref(HIDE_DESC),
+
+    harvesterEnabled: mapFeature(HARVESTER_FEATURE),
+
+    harvesterLocation() {
+      return this.isCreate && !this.hideDescriptions.includes(HARVESTER_HIDE_KEY) && this.harvesterEnabled ? {
+        name:   `c-cluster-product-resource`,
+        params: {
+          product:  HARVESTER_MANAGER,
+          resource: HCI.CLUSTER,
+        }
+      } : null;
     }
   },
 
@@ -175,7 +196,13 @@ export default defineComponent({
       }
     },
     async actuallySave() {
-      return await this.normanCluster.save();
+      if (this.isEdit) {
+        return await this.normanCluster.save();
+      } else {
+        await this.normanCluster.save();
+
+        return await this.normanCluster.waitForProvisioning();
+      }
     },
 
     async getVersions() {
@@ -243,6 +270,35 @@ export default defineComponent({
         delete this.normanCluster.localClusterAuthEndpoint.fqdn;
       }
     },
+    async done() {
+      if (!this.isEdit) {
+        return this.$router.replace({
+          name:   'c-cluster-product-resource-namespace-id',
+          params: {
+            resource:  CAPI.RANCHER_CLUSTER,
+            namespace: this.value.metadata.namespace,
+            id:        this.normanCluster.id,
+          },
+        });
+      } else {
+        if ( !this.doneRoute ) {
+          return;
+        }
+
+        this.$router.replace({
+          name:   this.doneRoute,
+          params: this.doneParams || { resource: this.value.type }
+        });
+      }
+    },
+
+    hideHarvesterNotice() {
+      const neu = this.hideDescriptions.slice();
+
+      addObject(neu, HARVESTER_HIDE_KEY);
+
+      this.hideDescriptions = neu;
+    },
   },
 
 });
@@ -254,7 +310,7 @@ export default defineComponent({
     :mode="mode"
     :can-yaml="false"
     :done-route="doneRoute"
-    :errors="fvUnreportedValidationErrors"
+    :errors="errors"
     :validation-passed="fvFormIsValid"
     @error="e=>errors=e"
     @finish="save"
@@ -264,35 +320,40 @@ export default defineComponent({
       mode="relative"
     />
     <div v-else>
-      <div class="mt-10">
-        <div class="row mb-10">
-          <div class="col span-3">
-            <LabeledInput
-              v-model:value="normanCluster.name"
-              :mode="mode"
-              :disabled="true"
-              label-key="generic.name"
-              data-testid="imported-name"
-            />
-          </div>
-          <div
-            v-if="isLocal"
-            class="col span-3"
-          >
-            <LabeledInput
-              v-model:value="normanCluster.description"
-              :mode="mode"
-              label-key="nameNsDescription.description.label"
-              :placeholder="t('nameNsDescription.description.placeholder')"
-            />
-          </div>
-        </div>
+      <div>
+        <Banner
+          v-if="harvesterLocation"
+          color="info"
+          :closable="true"
+          class="mb-20"
+          @close="hideHarvesterNotice"
+        >
+          {{ t('cluster.harvester.importNotice') }}
+          <router-link :to="harvesterLocation">
+            {{ t('product.harvesterManager') }}
+          </router-link>
+        </Banner>
+        <NameNsDescription
+          v-if="!isView"
+          v-model:value="normanCluster"
+          :mode="mode"
+          :namespaced="false"
+          :nameEditable="!isEdit"
+          :descriptionDisabled="!showInstanceDescription"
+          nameKey="name"
+          descriptionKey="description"
+          name-label="cluster.name.label"
+          name-placeholder="cluster.name.placeholder"
+          description-label="cluster.description.label"
+          description-placeholder="cluster.description.placeholder"
+          :rules="{name: fvGetAndReportPathRules('name')}"
+        />
       </div>
       <Accordion
         v-if="showBasics"
         :title="providerTabKey"
         :open-initially="true"
-        class="mb-20"
+        class="mb-20 accordion"
       >
         <Basics
           :value="normanCluster"
@@ -311,8 +372,8 @@ export default defineComponent({
         />
       </Accordion>
       <Accordion
-        class="mb-20"
-        title-key="imported.accordions.clusterMembers"
+        class="mb-20 accordion"
+        title-key="members.memberRoles"
         :open-initially="true"
       >
         <Banner
@@ -329,9 +390,9 @@ export default defineComponent({
         />
       </Accordion>
       <Accordion
-        class="mb-20"
+        class="mb-20 accordion"
         title-key="imported.accordions.labels"
-        :open-initially="true"
+        :open-initially="false"
       >
         <Labels
           v-model:value="normanCluster"
@@ -339,9 +400,11 @@ export default defineComponent({
         />
       </Accordion>
       <Accordion
-        class="mb-20"
+        v-if="isEdit"
+        class="mb-20 accordion"
         title-key="imported.accordions.networking"
-        :open-initially="true"
+        data-testid="network-accordion"
+        :open-initially="false"
       >
         <div
           v-if="enableNetworkPolicySupported"
@@ -368,7 +431,7 @@ export default defineComponent({
         />
       </Accordion>
       <Accordion
-        class="mb-20"
+        class="mb-20 accordion"
         title-key="imported.accordions.advanced"
         :open-initially="false"
       >
@@ -393,4 +456,7 @@ export default defineComponent({
 </template>
 
 <style lang="scss" scoped>
+    .accordion {
+        border-radius: 16px;
+    }
 </style>
diff --git a/pkg/imported/index.ts b/pkg/imported/index.ts
index 0799c89ea4d..b647d0e0f20 100644
--- a/pkg/imported/index.ts
+++ b/pkg/imported/index.ts
@@ -1,6 +1,6 @@
 import { importTypes } from '@rancher/auto-import';
 import { IPlugin } from '@shell/core/types';
-import { ImportedProvisioner, LocalProvisioner } from './provisioner';
+import { EditImportedGenericCluster, ImportGenericCluster, EditLocalCluster } from './provisioner';
 
 // Init the package
 export default function(plugin: IPlugin): void {
@@ -11,6 +11,7 @@ export default function(plugin: IPlugin): void {
   plugin.metadata = require('./package.json');
 
   // Register custom provisioner object
-  plugin.register('provisioner', ImportedProvisioner.ID, ImportedProvisioner);
-  plugin.register('provisioner', LocalProvisioner.ID, LocalProvisioner);
+  plugin.register('provisioner', EditImportedGenericCluster.ID, EditImportedGenericCluster);
+  plugin.register('provisioner', ImportGenericCluster.ID, ImportGenericCluster);
+  plugin.register('provisioner', EditLocalCluster.ID, EditLocalCluster);
 }
diff --git a/pkg/imported/l10n/en-us.yaml b/pkg/imported/l10n/en-us.yaml
index 86000f3dd53..6b05f754efe 100644
--- a/pkg/imported/l10n/en-us.yaml
+++ b/pkg/imported/l10n/en-us.yaml
@@ -1,3 +1,5 @@
+import:
+  label: Generic
 imported:
   label: Imported
   agentEnv:
@@ -13,12 +15,16 @@ imported:
     basics: Basics
     upgrade: Upgrade Strategy
     networking: Networking
-    clusterMembers: Cluster Members
     labels: Labels and Annotations
     k3sOptions: K3S Options
     rke2Options: RKE2 Options
   upgradeStrategy:
     header: Upgrade Strategy
   errors:
+    clusterName: 
+      required: Name is required
+      chars: Name may only contain lowercase alphanumerics and hyphens
+      startEnd: Name must start and end with a lowercase alphanumeric
+      length: Name may not exceed 63 characters
     concurrency: '{key} must be an integer greater than 0'
     kubernetesVersions: 'An error occured while fetching the available kubernetes versions: {e}'
diff --git a/pkg/imported/provisioner.ts b/pkg/imported/provisioner.ts
index 75e45114738..bb0b16aa148 100644
--- a/pkg/imported/provisioner.ts
+++ b/pkg/imported/provisioner.ts
@@ -1,12 +1,24 @@
-import { IClusterProvisioner } from '@shell/core/types';
+import { IClusterProvisioner, ClusterProvisionerContext } from '@shell/core/types';
 import CruImported from './components/CruImported.vue';
 import { Component } from 'vue';
+import { mapDriver } from '@shell/store/plugins';
+/**
+ * We need to have different provisioners for these cases because they need to behave differently
+ * ie we want to hide local and imported provisioners from create/import wizards, but they are used as type options
+ * during cluster edit (shell/edit/provisioning.cattle.io.cluster/index.vue). On the other hand, 'generic' import provisioner
+ * should be shown as available type on cluster import only.
+ * Provisioner also determines what we show in ResourceDetail's Masthead. ie we don't want to show "Imported" when importing
+ * a generic cluster, since is hasn't been imported yet.
+ */
 
-export class ImportedProvisioner implements IClusterProvisioner {
+/**
+ * EditImportedGenericCluster handles editing already imported generic cluster.
+ */
+export class EditImportedGenericCluster implements IClusterProvisioner {
   static ID = 'imported'
 
   get id(): string {
-    return ImportedProvisioner.ID;
+    return EditImportedGenericCluster.ID;
   }
 
   get component(): Component {
@@ -17,20 +29,70 @@ export class ImportedProvisioner implements IClusterProvisioner {
     return {};
   }
 
+  // Since it is only used for edit, we want to hide it from both create and import wizards
   get hidden(): boolean {
     return true;
   }
 
+  // It is not rke2-specific and we want to have it available independently from RKE2 or RKE1 toggle
   get group(): string {
     return 'kontainer';
   }
 }
 
-export class LocalProvisioner implements IClusterProvisioner {
+/**
+ * ImportGenericCluster is used to import a new generic cluster.
+ */
+export class ImportGenericCluster implements IClusterProvisioner {
+    static ID = 'import'
+
+    constructor(private context: ClusterProvisionerContext) {
+      mapDriver(this.id, 'generic' );
+    }
+
+    get id(): string {
+      return ImportGenericCluster.ID;
+    }
+
+    get component(): Component {
+      return CruImported;
+    }
+
+    get detailTabs(): any {
+      return {};
+    }
+
+    get label(): string {
+      return this.context.t('import.label');
+    }
+
+    // We want to show it in the import wizard only and hide it on create
+    get showImport(): boolean {
+      return true;
+    }
+
+    get hideCreate(): boolean {
+      return true;
+    }
+
+    // It is not rke2-specific and we want to have it available independently from RKE2 or RKE1 toggle
+    get group(): string {
+      return 'custom';
+    }
+
+    get icon(): any {
+      return require('./assets/generic.svg');
+    }
+}
+
+/**
+ * EditLocalCluster edits a local cluster.
+ */
+export class EditLocalCluster implements IClusterProvisioner {
     static ID = 'local'
 
     get id(): string {
-      return LocalProvisioner.ID;
+      return EditLocalCluster.ID;
     }
 
     get component(): Component {
@@ -41,10 +103,12 @@ export class LocalProvisioner implements IClusterProvisioner {
       return {};
     }
 
+    // Since it is only used for edit, we want to hide it from both create and import wizards
     get hidden(): boolean {
       return true;
     }
 
+    // It is not rke2-specific and we want to have it available independently from RKE2 or RKE1 toggle
     get group(): string {
       return 'kontainer';
     }
diff --git a/pkg/imported/util/validators.ts b/pkg/imported/util/validators.ts
new file mode 100644
index 00000000000..821f4c76a49
--- /dev/null
+++ b/pkg/imported/util/validators.ts
@@ -0,0 +1,60 @@
+import { get } from '@shell/utils/object';
+
+class GenericImportedClusterValidators {
+  clusterNameRequired(ctx: any): () => string | undefined {
+    return function() :string | undefined {
+      return !ctx.isEdit && !get(ctx.normanCluster, 'name') ? ctx.t('imported.errors.clusterName.required') : undefined;
+    };
+  }
+
+  clusterNameChars(ctx: any): () => string | undefined {
+    return function() :string | undefined {
+      const { name = '' } = get(ctx, 'normanCluster');
+      const nameIsValid = name.match(/^[a-z0-9\-]*$/);
+
+      return nameIsValid ? undefined : ctx.t('imported.errors.clusterName.chars');
+    };
+  }
+
+  clusterNameStartEnd(ctx: any): () => string | undefined {
+    return function() :string | undefined {
+      const { name = '' } = get(ctx, 'normanCluster');
+      const nameIsValid = !!name.match(/^[a-z0-9]$|^[a-z0-9].*[a-z0-9]$/) || !name.length;
+
+      return nameIsValid ? undefined : ctx.t('imported.errors.clusterName.startEnd');
+    };
+  }
+
+  clusterNameLength(ctx: any): () => string | undefined {
+    return function() :string | undefined {
+      const { name = '' } = get(ctx, 'normanCluster');
+      const isValid = name.length <= 63;
+
+      return isValid ? undefined : ctx.t('imported.errors.clusterName.length');
+    };
+  }
+
+  workerConcurrency(ctx: any): () => string | undefined {
+    return function() :string | undefined {
+      const val = ctx.normanCluster?.k3sConfig?.k3supgradeStrategy?.workerConcurrency || ctx?.normanCluster?.rke2Config?.rke2upgradeStrategy?.workerConcurrency || '';
+      const exists = ctx.normanCluster?.k3sConfig?.k3supgradeStrategy || ctx?.normanCluster?.rke2Config?.rke2upgradeStrategy;
+      // BE is only checking that the value is an integer >= 1
+      const valIsInvalid = Number(val) < 1 || !Number.isInteger(+val) || `${ val }`.match(/\.+/g);
+
+      return !!exists && valIsInvalid ? ctx.t('imported.errors.concurrency', { key: 'Worker Concurrency' }) : undefined ;
+    };
+  }
+
+  controlPlaneConcurrency(ctx: any): () => string | undefined {
+    return function() :string | undefined {
+      const val = ctx?.normanCluster?.k3sConfig?.k3supgradeStrategy?.serverConcurrency || ctx?.normanCluster?.rke2Config?.rke2upgradeStrategy?.serverConcurrency || '';
+      const exists = ctx?.normanCluster?.k3sConfig?.k3supgradeStrategy || ctx?.normanCluster?.rke2Config?.rke2upgradeStrategy;
+      // BE is only checking that the value is an integer >= 1
+      const valIsInvalid = Number(val) < 1 || !Number.isInteger(+val) || `${ val }`.match(/\.+/g);
+
+      return !!exists && valIsInvalid ? ctx.t('imported.errors.concurrency', { key: 'Control Plane Concurrency' }) : undefined ;
+    };
+  }
+}
+
+export default new GenericImportedClusterValidators();
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 79e593f09ff..ab2522b470e 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -3467,6 +3467,7 @@ managementNode:
 
 members:
   clusterMembers: Cluster Members
+  memberRoles: Member Roles
   clusterAndProject: Cluster and Project Members
   createActionLabel: Add
   clusterMembership: Cluster Membership
diff --git a/shell/core/types-provisioning.ts b/shell/core/types-provisioning.ts
index c6a81b8603c..138bf7e8afe 100644
--- a/shell/core/types-provisioning.ts
+++ b/shell/core/types-provisioning.ts
@@ -150,6 +150,13 @@ export interface IClusterProvisioner {
    * Text to show top right on the cluster provider card. For example `Experimental`
    */
   tag?: string;
+  /**
+   * Hide the provider card in the cluster creation flow.
+   * By default we show providers in create wizard, however, there are some providers we want to only show on import.
+   * For that case, we should set hideCreate to true and showImport to true.
+   * If not set, the card will be shown in the cluster creation page
+   */
+  hideCreate?: boolean
 
   /**
    * Also show the provider card in the cluster importing flow
diff --git a/shell/edit/provisioning.cattle.io.cluster/import.vue b/shell/edit/provisioning.cattle.io.cluster/import.vue
deleted file mode 100644
index ab90eb6917f..00000000000
--- a/shell/edit/provisioning.cattle.io.cluster/import.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<script>
-import CreateEditView from '@shell/mixins/create-edit-view';
-
-import CruResource from '@shell/components/CruResource';
-import Loading from '@shell/components/Loading';
-import NameNsDescription from '@shell/components/form/NameNsDescription';
-import Tab from '@shell/components/Tabbed/Tab';
-import Tabbed from '@shell/components/Tabbed';
-import { CAPI, HCI } from '@shell/config/types';
-import ClusterMembershipEditor, { canViewClusterMembershipEditor } from '@shell/components/form/Members/ClusterMembershipEditor';
-import { Banner } from '@components/Banner';
-
-import { NAME as HARVESTER_MANAGER } from '@shell/config/harvester-manager-types';
-import { HARVESTER as HARVESTER_FEATURE, mapFeature } from '@shell/store/features';
-import { addObject } from '@shell/utils/array';
-import { HIDE_DESC, mapPref } from '@shell/store/prefs';
-import Labels from '@shell/edit/provisioning.cattle.io.cluster/Labels';
-import AgentEnv from '@shell/edit/provisioning.cattle.io.cluster/AgentEnv';
-
-const HARVESTER_HIDE_KEY = 'cm-harvester-import';
-
-export default {
-  emits: ['input'],
-
-  components: {
-    Banner,
-    ClusterMembershipEditor,
-    Loading,
-    NameNsDescription,
-    CruResource,
-    Tab,
-    Tabbed,
-    Labels,
-    AgentEnv
-  },
-
-  mixins: [CreateEditView],
-
-  inheritAttrs: false,
-
-  props: {
-    mode: {
-      type:     String,
-      required: true,
-    },
-
-    value: {
-      type:     Object,
-      required: true,
-    },
-
-    provider: {
-      type:     String,
-      required: true,
-    },
-  },
-
-  fetch() {
-    // if ( !this.value.spec.rkeConfig ) {
-    // set(this.value.spec, 'rkeConfig', {});
-    // }
-  },
-
-  data() {
-    return { membershipUpdate: {} };
-  },
-
-  computed: {
-    canManageMembers() {
-      return canViewClusterMembershipEditor(this.$store);
-    },
-
-    hideDescriptions: mapPref(HIDE_DESC),
-
-    harvesterEnabled: mapFeature(HARVESTER_FEATURE),
-
-    harvesterLocation() {
-      return this.isCreate && !this.hideDescriptions.includes(HARVESTER_HIDE_KEY) && this.harvesterEnabled ? {
-        name:   `c-cluster-product-resource`,
-        params: {
-          product:  HARVESTER_MANAGER,
-          resource: HCI.CLUSTER,
-        }
-      } : null;
-    }
-  },
-
-  created() {
-    this.registerAfterHook(this.saveRoleBindings, 'save-role-bindings');
-  },
-
-  methods: {
-    done() {
-      return this.$router.replace({
-        name:   'c-cluster-product-resource-namespace-id',
-        params: {
-          resource:  CAPI.RANCHER_CLUSTER,
-          namespace: this.value.metadata.namespace,
-          id:        this.value.metadata.name,
-        },
-      });
-    },
-
-    async saveRoleBindings() {
-      await this.value.waitForMgmt();
-
-      if (this.membershipUpdate.save) {
-        await this.membershipUpdate.save(this.value.mgmt.id);
-      }
-    },
-
-    async saveOverride(btnCb) {
-      await this.save(btnCb);
-    },
-
-    onMembershipUpdate(update) {
-      this['membershipUpdate'] = update;
-    },
-
-    hideHarvesterNotice() {
-      const neu = this.hideDescriptions.slice();
-
-      addObject(neu, HARVESTER_HIDE_KEY);
-
-      this.hideDescriptions = neu;
-    },
-  },
-};
-</script>
-
-<template>
-  <Loading v-if="$fetchState.pending" />
-  <CruResource
-    v-else
-    :mode="mode"
-    :resource="value"
-    :errors="errors"
-    component-testid="cluster-manager-import"
-    @finish="saveOverride"
-    @error="e=>errors = e"
-  >
-    <Banner
-      v-if="harvesterLocation"
-      color="info"
-      :closable="true"
-      class="mb-20"
-      @close="hideHarvesterNotice"
-    >
-      {{ t('cluster.harvester.importNotice') }}
-      <router-link :to="harvesterLocation">
-        {{ t('product.harvesterManager') }}
-      </router-link>
-    </Banner>
-
-    <NameNsDescription
-      v-if="!isView"
-      :value="value"
-      :mode="mode"
-      :namespaced="false"
-      name-label="cluster.name.label"
-      name-placeholder="cluster.name.placeholder"
-      description-label="cluster.description.label"
-      description-placeholder="cluster.description.placeholder"
-      @update:value="$emit('input', $event)"
-    />
-
-    <Tabbed :side-tabs="true">
-      <Tab
-        v-if="canManageMembers"
-        name="memberRoles"
-        label-key="cluster.tabs.memberRoles"
-        :weight="3"
-      >
-        <Banner
-          v-if="isEdit"
-          color="info"
-        >
-          {{ t('cluster.memberRoles.removeMessage') }}
-        </Banner>
-        <ClusterMembershipEditor
-          :mode="mode"
-          :parent-id="value.mgmt ? value.mgmt.id : null"
-          @membership-update="onMembershipUpdate"
-        />
-      </Tab>
-      <AgentEnv
-        :value="value"
-        :mode="mode"
-        @update:value="$emit('input', $event)"
-      />
-      <Labels
-        :value="value"
-        :mode="mode"
-        @update:value="$emit('input', $event)"
-      />
-    </Tabbed>
-  </CruResource>
-</template>
diff --git a/shell/edit/provisioning.cattle.io.cluster/index.vue b/shell/edit/provisioning.cattle.io.cluster/index.vue
index 95f6ef29edf..1a61e14922a 100644
--- a/shell/edit/provisioning.cattle.io.cluster/index.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/index.vue
@@ -20,7 +20,6 @@ import { allHash } from '@shell/utils/promise';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { ELEMENTAL_PRODUCT_NAME, ELEMENTAL_CLUSTER_PROVIDER } from '../../config/elemental-types';
 import Rke2Config from './rke2';
-import Import from './import';
 import { DRIVER_TO_IMPORT } from '@shell/models/management.cattle.io.kontainerdriver';
 
 const SORT_GROUPS = {
@@ -47,7 +46,6 @@ export default {
   components: {
     CruResource,
     EmberPage,
-    Import,
     Loading,
     Rke2Config,
     SelectIconGrid,
@@ -347,10 +345,7 @@ export default {
           addType(this.$plugin, obj.driverName, 'kontainer', false, (isImport ? obj.emberImportPath : obj.emberCreatePath));
         }
       });
-
-      if ( isImport ) {
-        addType(this.$plugin, 'import', 'custom', false);
-      } else {
+      if (!isImport) {
         templates.forEach((chart) => {
           out.push({
             id:          `chart:${ chart.id }`,
@@ -399,6 +394,10 @@ export default {
         if (isImport && !ext.showImport) {
           return;
         }
+        // Do not show the extension provisioner on create if it is disabled
+        if (!isImport && !!ext.hideCreate) {
+          return;
+        }
         // Allow extensions to overwrite provisioners with the same id
         out = out.filter((type) => type.id !== ext.id);
         addExtensionType(ext, getters);
@@ -687,14 +686,7 @@ export default {
       </div>
     </template>
 
-    <Import
-      v-if="isImport && (selectedSubType && !selectedSubType.component)"
-      v-model:value="localValue"
-      :mode="mode"
-      :provider="subType"
-      @update:value="$emit('input', $event)"
-    />
-    <template v-else-if="subType">
+    <template v-if="subType">
       <!-- allow extensions to provide their own cluster provisioning form -->
       <component
         :is="selectedSubType.component"
diff --git a/shell/models/cluster.js b/shell/models/cluster.js
index 739ecadbcf9..0a91ddabdf6 100644
--- a/shell/models/cluster.js
+++ b/shell/models/cluster.js
@@ -1,4 +1,5 @@
 import NormanModel from '@shell/plugins/steve/norman-class';
+import { CAPI } from '@shell/config/types';
 
 export const LABEL_CONTAINS_PROTECTED = [
   'io.cattle.lifecycle',
@@ -30,4 +31,13 @@ export default class NormanCluster extends NormanModel {
   get hasSystemAnnotations() {
     return !!(this.systemAnnotations || []).length;
   }
+
+  waitForProvisioning(timeout = 60000, interval) {
+    return this.waitForTestFn(() => {
+      const ns = this.annotations['objectset.rio.cattle.io/owner-namespace'] || 'fleet-default';
+      const id = `${ ns }/${ this.id }`;
+
+      return id && !!this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, id);
+    }, this.$rootGetters['i18n/t']('cluster.managementTimeout'), timeout, interval);
+  }
 }

From ecbd3fe64ae44a227fc4cf8c5a76782b57bb5aa1 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 13:29:55 +0100
Subject: [PATCH 073/140] Fleet: Add GitRepo edit steps

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/assets/translations/en-us.yaml   |  13 +-
 shell/assets/translations/zh-hans.yaml |   1 -
 shell/components/Wizard.vue            | 212 +++++++++++++------------
 shell/edit/fleet.cattle.io.gitrepo.vue | 132 ++++++++-------
 4 files changed, 183 insertions(+), 175 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index dc7b15113fc..279bd6a51d0 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2459,7 +2459,6 @@ fleet:
       notReady: Not Ready
       waitApplied: Wait Applied
   gitRepo:
-    createLocalBanner: When deploying a Git Repo to the Local workspace you are unable to target any specific Cluster or Cluster Groups
     actions:
       forceUpdate:
         label: Force Update
@@ -2518,11 +2517,21 @@ fleet:
         minimumValuewarning: Warning, the recommended minimum Polling Interval is 15 seconds. To avoid performance issues with GitRepos that contain a large amount of resources please consider increasing this value.
     add:
       steps:
-        repoInfo:
+        metadata:
+          label: Metadata
+          title: Placeholder title
+          subtext: Placeholder subtext
+          description: Placeholder description
+        repo:
           label: Repository Details
           title: Specify the Git Repository to add to fleet
           subtext: 'Define repository details'
           description: Fleet will continuously monitor the Git Repository you configure below and synchronise the resources contained in it to the configured targets.
+        advanced:
+          label: Advanced
+          title: Placeholder title
+          subtext: Placeholder subtext
+          description: Placeholder description
         targetInfo:
           label: Target Details
           title: Specify which target to synchronise this repository to
diff --git a/shell/assets/translations/zh-hans.yaml b/shell/assets/translations/zh-hans.yaml
index db1b30138de..2802030a15b 100644
--- a/shell/assets/translations/zh-hans.yaml
+++ b/shell/assets/translations/zh-hans.yaml
@@ -2131,7 +2131,6 @@ fleet:
       notReady: 未就绪
       waitApplied: 等待应用
   gitRepo:
-    createLocalBanner: 将 Git 仓库部署到本地工作区时，你无法定位任何集群或集群组
     tabs:
       resources: 资源
       unready: 未就绪
diff --git a/shell/components/Wizard.vue b/shell/components/Wizard.vue
index 8515c5bbdeb..d339a07e25d 100644
--- a/shell/components/Wizard.vue
+++ b/shell/components/Wizard.vue
@@ -154,7 +154,9 @@ export default {
     },
 
     canNext() {
-      return (this.activeStepIndex < this.visibleSteps.length - 1) && this.activeStep.ready;
+      const activeStep = this.visibleSteps[this.activeStepIndex];
+
+      return (this.activeStepIndex < this.visibleSteps.length - 1) && activeStep.ready;
     },
 
     readySteps() {
@@ -277,124 +279,126 @@ export default {
       class="outer-container"
       :class="{'hide': !stepsLoaded}"
     >
-      <div class="header">
-        <div class="title">
-          <div
-            v-if="showBanner"
-            class="top choice-banner"
-          >
-            <slot
-              v-if="!!bannerImage || !!bannerTitle"
-              name="bannerTitle"
+      <div>
+        <div class="header">
+          <div class="title">
+            <div
+              v-if="showBanner"
+              class="top choice-banner"
             >
-              <div
-                v-show="initialTitle || activeStepIndex > 0"
-                class="title"
+              <slot
+                v-if="!!bannerImage || !!bannerTitle"
+                name="bannerTitle"
               >
-                <!-- Logo -->
-                <slot name="bannerTitleImage">
-                  <div
-                    v-if="bannerImage"
-                    class="round-image"
-                  >
-                    <LazyImage
-                      :src="bannerImage"
-                      class="logo"
-                    />
+                <div
+                  v-show="initialTitle || activeStepIndex > 0"
+                  class="title"
+                >
+                  <!-- Logo -->
+                  <slot name="bannerTitleImage">
+                    <div
+                      v-if="bannerImage"
+                      class="round-image"
+                    >
+                      <LazyImage
+                        :src="bannerImage"
+                        class="logo"
+                      />
+                    </div>
+                  </slot>
+                  <!-- Title with subtext -->
+                  <div class="subtitle">
+                    <h2 v-if="bannerTitle">
+                      {{ bannerTitle }}
+                    </h2>
+                    <span
+                      v-if="bannerTitleSubtext"
+                      class="subtext"
+                    >{{ bannerTitleSubtext }}</span>
                   </div>
-                </slot>
-                <!-- Title with subtext -->
-                <div class="subtitle">
-                  <h2 v-if="bannerTitle">
-                    {{ bannerTitle }}
-                  </h2>
+                </div>
+              </slot>
+              <!-- Step number with subtext -->
+              <div
+                v-if="activeStep && showSteps"
+                class="subtitle"
+              >
+                <h2>{{ !!headerMode ? t(`wizard.${headerMode}`) : t(`asyncButton.${finishMode}.action`) }}: {{ t('wizard.step', {number:activeStepIndex+1}) }}</h2>
+                <slot name="bannerSubtext">
                   <span
-                    v-if="bannerTitleSubtext"
+                    v-if="activeStep.subtext !== null"
                     class="subtext"
-                  >{{ bannerTitleSubtext }}</span>
-                </div>
+                  >{{ activeStep.subtext || activeStep.label }}</span>
+                </slot>
               </div>
-            </slot>
-            <!-- Step number with subtext -->
-            <div
-              v-if="activeStep && showSteps"
-              class="subtitle"
-            >
-              <h2>{{ !!headerMode ? t(`wizard.${headerMode}`) : t(`asyncButton.${finishMode}.action`) }}: {{ t('wizard.step', {number:activeStepIndex+1}) }}</h2>
-              <slot name="bannerSubtext">
-                <span
-                  v-if="activeStep.subtext !== null"
-                  class="subtext"
-                >{{ activeStep.subtext || activeStep.label }}</span>
-              </slot>
             </div>
-          </div>
-          <div class="step-sequence">
-            <ul
-              v-if="showSteps"
-              class="steps"
-              tabindex="0"
-              @keyup.right.stop="selectNext(1)"
-              @keyup.left.stop="selectNext(-1)"
-            >
-              <template
-                v-for="(step, idx ) in visibleSteps"
-                :key="idx"
+            <div class="step-sequence">
+              <ul
+                v-if="showSteps"
+                class="steps"
+                tabindex="0"
+                @keyup.right.stop="selectNext(1)"
+                @keyup.left.stop="selectNext(-1)"
               >
-                <li
-
-                  :id="step.name"
-                  :class="{step: true, active: step.name === activeStep.name, disabled: !isAvailable(step)}"
-                  role="presentation"
+                <template
+                  v-for="(step, idx ) in visibleSteps"
+                  :key="idx"
                 >
-                  <span
-                    :aria-controls="'step' + idx+1"
-                    :aria-selected="step.name === activeStep.name"
-                    role="tab"
-                    class="controls"
-                    @click.prevent="goToStep(idx+1, true)"
+                  <li
+
+                    :id="step.name"
+                    :class="{step: true, active: step.name === activeStep.name, disabled: !isAvailable(step)}"
+                    role="presentation"
                   >
                     <span
-                      class="icon icon-lg"
-                      :class="{'icon-dot': step.name === activeStep.name, 'icon-dot-open':step.name !== activeStep.name}"
-                    />
-                    <span>
-                      {{ step.label }}
+                      :aria-controls="'step' + idx+1"
+                      :aria-selected="step.name === activeStep.name"
+                      role="tab"
+                      class="controls"
+                      @click.prevent="goToStep(idx+1, true)"
+                    >
+                      <span
+                        class="icon icon-lg"
+                        :class="{'icon-dot': step.name === activeStep.name, 'icon-dot-open':step.name !== activeStep.name}"
+                      />
+                      <span>
+                        {{ step.label }}
+                      </span>
                     </span>
-                  </span>
-                </li>
-                <div
-                  v-if="idx!==visibleSteps.length-1"
-                  :key="step.name"
-                  class="divider"
-                />
-              </template>
-            </ul>
+                  </li>
+                  <div
+                    v-if="idx!==visibleSteps.length-1"
+                    :key="step.name"
+                    class="divider"
+                  />
+                </template>
+              </ul>
+            </div>
           </div>
         </div>
-      </div>
-      <slot
-        class="step-container"
-        name="stepContainer"
-        :activeStep="activeStep"
-      >
-        <template
-          v-for="(step, i) in steps"
-          :key="i"
+        <slot
+          class="step-container"
+          name="stepContainer"
+          :activeStep="activeStep"
         >
-          <div
-            v-if="step.name === activeStep.name || step.hidden"
-            :key="step.name"
-            class="step-container__step"
-            :class="{'hide': step.name !== activeStep.name && step.hidden}"
+          <template
+            v-for="(step, i) in steps"
+            :key="i"
           >
-            <slot
-              :step="step"
-              :name="step.name"
-            />
-          </div>
-        </template>
-      </slot>
+            <div
+              v-if="step.name === activeStep.name || step.hidden"
+              :key="step.name"
+              class="step-container__step"
+              :class="{'hide': step.name !== activeStep.name && step.hidden}"
+            >
+              <slot
+                :step="step"
+                :name="step.name"
+              />
+            </div>
+          </template>
+        </slot>
+      </div>
       <slot
         name="controlsContainer"
         :showPrevious="showPrevious"
@@ -491,7 +495,7 @@ $spacer: 10px;
   flex-direction: column;
   flex: 1;
   padding: 0;
-  justify-content: flex-start;
+  justify-content: space-between;
 }
 
 .header {
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index d9b187d4f55..0bcaed14c1e 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -125,26 +125,6 @@ export default {
       targetMode = `group://${ targetClusterGroup }`;
     }
 
-    const stepRepoInfo = {
-      name:           'stepRepoInfo',
-      title:          this.t('fleet.gitRepo.add.steps.repoInfo.title'),
-      label:          this.t('fleet.gitRepo.add.steps.repoInfo.label'),
-      subtext:        this.t('fleet.gitRepo.add.steps.repoInfo.subtext'),
-      descriptionKey: 'fleet.gitRepo.add.steps.repoInfo.description',
-      ready:          false,
-      weight:         1
-    };
-
-    const stepTargetInfo = {
-      name:           'stepTargetInfo',
-      title:          this.t('fleet.gitRepo.add.steps.targetInfo.title'),
-      label:          this.t('fleet.gitRepo.add.steps.targetInfo.label'),
-      subtext:        this.t('fleet.gitRepo.add.steps.targetInfo.subtext'),
-      descriptionKey: 'fleet.gitRepo.steps.add.targetInfo.description',
-      ready:          true,
-      weight:         1
-    };
-
     return {
       allClusters:             [],
       allClusterGroups:        [],
@@ -166,8 +146,6 @@ export default {
       targetCluster,
       targetClusterGroup,
       targetAdvanced,
-      stepRepoInfo,
-      stepTargetInfo,
       displayHelmRepoURLRegex: false,
       fvFormRuleSets:          [{
         path:  'spec.repo',
@@ -188,8 +166,42 @@ export default {
 
     steps() {
       return [
-        this.stepRepoInfo,
-        this.stepTargetInfo
+        {
+          name:           'stepMetadata',
+          title:          this.t('fleet.gitRepo.add.steps.metadata.title'),
+          label:          this.t('fleet.gitRepo.add.steps.metadata.label'),
+          subtext:        this.t('fleet.gitRepo.add.steps.metadata.subtext'),
+          descriptionKey: 'fleet.gitRepo.add.steps.metadata.description',
+          ready:          this.isView || !!this.value.metadata.name,
+          weight:         1
+        },
+        {
+          name:           'stepRepo',
+          title:          this.t('fleet.gitRepo.add.steps.repo.title'),
+          label:          this.t('fleet.gitRepo.add.steps.repo.label'),
+          subtext:        this.t('fleet.gitRepo.add.steps.repo.subtext'),
+          descriptionKey: 'fleet.gitRepo.add.steps.repo.description',
+          ready:          this.isView || (!!this.refValue && !!this.fvFormIsValid),
+          weight:         1
+        },
+        {
+          name:           'stepAdvanced',
+          title:          this.t('fleet.gitRepo.add.steps.advanced.title'),
+          label:          this.t('fleet.gitRepo.add.steps.advanced.label'),
+          subtext:        this.t('fleet.gitRepo.add.steps.advanced.subtext'),
+          descriptionKey: 'fleet.gitRepo.add.steps.advanced.description',
+          ready:          true,
+          weight:         1,
+        },
+        {
+          name:           'stepTarget',
+          title:          this.t('fleet.gitRepo.add.steps.targetInfo.title'),
+          label:          this.t('fleet.gitRepo.add.steps.targetInfo.label'),
+          subtext:        this.t('fleet.gitRepo.add.steps.targetInfo.subtext'),
+          descriptionKey: 'fleet.gitRepo.steps.add.targetInfo.description',
+          ready:          this.isView || !!this.fvFormIsValid,
+          weight:         1
+        }
       ];
     },
 
@@ -292,10 +304,6 @@ export default {
     showPollingIntervalWarning() {
       return !this.isView && this.isPollingEnabled && this.pollingInterval < MINIMUM_POLLING_INTERVAL;
     },
-
-    stepOneRequires() {
-      return !!this.value.metadata.name && !!this.refValue && !!this.fvFormIsValid;
-    },
   },
 
   watch: {
@@ -306,8 +314,6 @@ export default {
     targetAdvanced:             'updateTargets',
     tlsMode:                    'updateTls',
     caBundle:                   'updateTls',
-    'value.metadata.name':      'stepOneReady',
-    'value.spec.repo':          'stepOneReady',
 
     workspace(neu) {
       if ( this.isCreate ) {
@@ -406,8 +412,6 @@ export default {
       } else {
         spec.targets = [];
       }
-
-      this.stepOneReady();
     },
 
     changeRef({ text, selected }) {
@@ -422,8 +426,6 @@ export default {
         delete spec.branch;
         spec.revision = text;
       }
-
-      this.stepOneReady();
     },
 
     async doCreateSecrets() {
@@ -510,10 +512,6 @@ export default {
       this.tlsMode = event;
     },
 
-    stepOneReady() {
-      this.stepRepoInfo['ready'] = this.stepOneRequires;
-    },
-
     updateTls() {
       const spec = this.value.spec;
 
@@ -600,15 +598,7 @@ export default {
     @error="e=>errors = e"
     @finish="save"
   >
-    <template #noticeBanner>
-      <Banner
-        v-if="isLocal && mode === 'create'"
-        color="info"
-      >
-        {{ t('fleet.gitRepo.createLocalBanner') }}
-      </Banner>
-    </template>
-    <template #stepRepoInfo>
+    <template #stepMetadata>
       <NameNsDescription
         v-if="!isView"
         :value="value"
@@ -616,10 +606,16 @@ export default {
         :mode="mode"
         @update:value="$emit('input', $event)"
       />
-
+      <Labels
+        :value="value"
+        :mode="mode"
+        :display-side-by-side="false"
+      />
+    </template>
+    <template #stepRepo>
       <h2 v-t="'fleet.gitRepo.repo.title'" />
       <div
-        class="row"
+        class="row mb-20"
         :class="{'mt-20': isView}"
       >
         <div class="col span-6">
@@ -648,7 +644,19 @@ export default {
         </div>
       </div>
 
-      <div class="spacer" />
+      <ArrayList
+        v-model:value="value.spec.paths"
+        data-testid="gitRepo-paths"
+        :title="t('fleet.gitRepo.paths.label')"
+        :mode="mode"
+        :initial-empty-row="false"
+        :value-placeholder="t('fleet.gitRepo.paths.placeholder')"
+        :add-label="t('fleet.gitRepo.paths.addLabel')"
+        :protip="t('fleet.gitRepo.paths.empty')"
+      />
+    </template>
+
+    <template #stepAdvanced>
       <h2 v-t="'fleet.gitRepo.auth.title'" />
 
       <SelectOrCreateAuthSecret
@@ -746,17 +754,6 @@ export default {
           :mode="mode"
         />
       </div>
-      <div class="spacer" />
-      <ArrayList
-        v-model:value="value.spec.paths"
-        data-testid="gitRepo-paths"
-        :title="t('fleet.gitRepo.paths.label')"
-        :mode="mode"
-        :initial-empty-row="false"
-        :value-placeholder="t('fleet.gitRepo.paths.placeholder')"
-        :add-label="t('fleet.gitRepo.paths.addLabel')"
-        :protip="t('fleet.gitRepo.paths.empty')"
-      />
 
       <div class="spacer" />
       <h2 v-t="'fleet.gitRepo.polling.label'" />
@@ -802,7 +799,8 @@ export default {
         </template>
       </div>
     </template>
-    <template #stepTargetInfo>
+
+    <template #stepTarget>
       <h2 v-t="isLocal ? 'fleet.gitRepo.target.labelLocal' : 'fleet.gitRepo.target.label'" />
 
       <template v-if="!isLocal">
@@ -867,12 +865,6 @@ export default {
           />
         </div>
       </div>
-      <div class="spacer" />
-      <Labels
-        :value="value"
-        :mode="mode"
-        :display-side-by-side="false"
-      />
     </template>
   </CruResource>
 </template>
@@ -883,6 +875,10 @@ export default {
       margin-top: 10px !important;
     }
   }
+  :deep() .input-container .in-input.labeled-select {
+    min-width: 110px;
+    width: 20%;
+  }
   .resource-handling {
     display: flex;
     flex-direction: column;

From aa9ac4d60aca416e02f78c868ea9b45652c55bf5 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 13:30:48 +0100
Subject: [PATCH 074/140] Fleet: add plus icons to buttons

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/form/ArrayList.vue    | 8 ++++++--
 shell/components/form/KeyValue.vue     | 6 +++---
 shell/components/form/Labels.vue       | 9 ++++++++-
 shell/edit/fleet.cattle.io.gitrepo.vue | 2 ++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/shell/components/form/ArrayList.vue b/shell/components/form/ArrayList.vue
index dabf937be27..efc7df865a3 100644
--- a/shell/components/form/ArrayList.vue
+++ b/shell/components/form/ArrayList.vue
@@ -48,6 +48,10 @@ export default {
       type:    Boolean,
       default: false,
     },
+    addIcon: {
+      type:    String,
+      default: '',
+    },
     addLabel: {
       type:    String,
       default: '',
@@ -367,8 +371,8 @@ export default {
           @click="add()"
         >
           <i
-            v-if="loading"
-            class="mr-5 icon icon-spinner icon-spin icon-lg"
+            class="mr-5 icon"
+            :class="loading ? ['icon-lg', 'icon-spinner','icon-spin']: [addIcon]"
           />
           {{ _addLabel }}
         </button>
diff --git a/shell/components/form/KeyValue.vue b/shell/components/form/KeyValue.vue
index b70af4fd19e..5969aee0333 100644
--- a/shell/components/form/KeyValue.vue
+++ b/shell/components/form/KeyValue.vue
@@ -182,7 +182,7 @@ export default {
     },
     addIcon: {
       type:    String,
-      default: 'icon-plus',
+      default: '',
     },
     addAllowed: {
       type:    Boolean,
@@ -857,8 +857,8 @@ export default {
           @click="add()"
         >
           <i
-            v-if="loading"
-            class="mr-5 icon icon-spinner icon-spin icon-lg"
+            class="mr-5 icon"
+            :class="loading ? ['icon-lg', 'icon-spinner','icon-spin']: [addIcon]"
           /> {{ _addLabel }}
         </button>
         <FileSelector
diff --git a/shell/components/form/Labels.vue b/shell/components/form/Labels.vue
index 32ebb90ae4d..0e8f4df880f 100644
--- a/shell/components/form/Labels.vue
+++ b/shell/components/form/Labels.vue
@@ -52,7 +52,12 @@ export default {
     showLabelTitle: {
       type:    Boolean,
       default: true,
-    }
+    },
+
+    addIcon: {
+      type:    String,
+      default: '',
+    },
   },
 
   data() {
@@ -103,6 +108,7 @@ export default {
               :protected-keys="value.systemLabels || []"
               :toggle-filter="toggler"
               :add-label="t('labels.addLabel')"
+              :add-icon="addIcon"
               :mode="mode"
               :read-allowed="false"
               :value-can-be-empty="true"
@@ -121,6 +127,7 @@ export default {
         key="annotations"
         :value="value.annotations"
         :add-label="t('labels.addAnnotation')"
+        :add-icon="addIcon"
         :mode="mode"
         :protected-keys="value.systemAnnotations || []"
         :toggle-filter="toggler"
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 0bcaed14c1e..85b8b80d990 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -610,6 +610,7 @@ export default {
         :value="value"
         :mode="mode"
         :display-side-by-side="false"
+        :add-icon="'icon-plus'"
       />
     </template>
     <template #stepRepo>
@@ -652,6 +653,7 @@ export default {
         :initial-empty-row="false"
         :value-placeholder="t('fleet.gitRepo.paths.placeholder')"
         :add-label="t('fleet.gitRepo.paths.addLabel')"
+        :add-icon="'icon-plus'"
         :protip="t('fleet.gitRepo.paths.empty')"
       />
     </template>

From 30d19c9230ac3687ead7b4202e49e0bc84bb9eba Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 13:44:50 +0100
Subject: [PATCH 075/140] Fleet: move Advanced step in last position of GitRepo
 wizard; add info banner and fix labels

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/assets/translations/en-us.yaml   |  9 +++++----
 shell/edit/fleet.cattle.io.gitrepo.vue | 26 ++++++++++++++++----------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 279bd6a51d0..3a1f633a31b 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2503,9 +2503,9 @@ fleet:
       noWorkspaces: There are no workspaces. <br/> Please create a workspace before adding repositories
     resources:
       label: 'Resource Handling'
-      keepResources: Always Keep Resources
+      keepResources: Always keep resources
       keepResourcesTooltip: When enabled, resources will be kept when deleting a GitRepo or Bundle - only Helm release secrets will be deleted.
-      correctDrift: Enable Self-Healing
+      correctDrift: Enable self-healing
       correctDriftTooltip: When enabled, Fleet will ensure that the cluster resources are kept in sync with the git repository. All resource changes made on the cluster will be lost.
     polling:
       label: Polling
@@ -2523,7 +2523,7 @@ fleet:
           subtext: Placeholder subtext
           description: Placeholder description
         repo:
-          label: Repository Details
+          label: Repository details
           title: Specify the Git Repository to add to fleet
           subtext: 'Define repository details'
           description: Fleet will continuously monitor the Git Repository you configure below and synchronise the resources contained in it to the configured targets.
@@ -2532,8 +2532,9 @@ fleet:
           title: Placeholder title
           subtext: Placeholder subtext
           description: Placeholder description
+          info: These settings are for advanced usage and optional. You can skip them and finish the creation process.
         targetInfo:
-          label: Target Details
+          label: Target details
           title: Specify which target to synchronise this repository to
           subtext: 'Define target details'
           description: You can configure which clusters will be used as the target of synchronisation with the resources in the repository.
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 85b8b80d990..051aa4bfc1c 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -184,15 +184,6 @@ export default {
           ready:          this.isView || (!!this.refValue && !!this.fvFormIsValid),
           weight:         1
         },
-        {
-          name:           'stepAdvanced',
-          title:          this.t('fleet.gitRepo.add.steps.advanced.title'),
-          label:          this.t('fleet.gitRepo.add.steps.advanced.label'),
-          subtext:        this.t('fleet.gitRepo.add.steps.advanced.subtext'),
-          descriptionKey: 'fleet.gitRepo.add.steps.advanced.description',
-          ready:          true,
-          weight:         1,
-        },
         {
           name:           'stepTarget',
           title:          this.t('fleet.gitRepo.add.steps.targetInfo.title'),
@@ -201,7 +192,16 @@ export default {
           descriptionKey: 'fleet.gitRepo.steps.add.targetInfo.description',
           ready:          this.isView || !!this.fvFormIsValid,
           weight:         1
-        }
+        },
+        {
+          name:           'stepAdvanced',
+          title:          this.t('fleet.gitRepo.add.steps.advanced.title'),
+          label:          this.t('fleet.gitRepo.add.steps.advanced.label'),
+          subtext:        this.t('fleet.gitRepo.add.steps.advanced.subtext'),
+          descriptionKey: 'fleet.gitRepo.add.steps.advanced.description',
+          ready:          !!this.fvFormIsValid,
+          weight:         1,
+        },
       ];
     },
 
@@ -659,6 +659,12 @@ export default {
     </template>
 
     <template #stepAdvanced>
+      <Banner
+        class="mb-20"
+        color="info"
+        label-key="fleet.gitRepo.add.steps.advanced.info"
+      />
+
       <h2 v-t="'fleet.gitRepo.auth.title'" />
 
       <SelectOrCreateAuthSecret

From 24a2dfdf694a72195f47106637bc1dfc18691086 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 14:17:40 +0100
Subject: [PATCH 076/140] Fleet: fix e2e tests

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 cypress/e2e/tests/pages/fleet/gitrepo.spec.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts b/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
index a1557a2ba41..fc522d84628 100644
--- a/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
@@ -65,17 +65,24 @@ describe('Git Repo', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] }, (
       } = gitRepoCreateRequest.spec;
 
       gitRepoCreatePage.setRepoName(name);
-      gitRepoCreatePage.setGitRepoUrl(repo);
       headerPo.selectWorkspace('fleet-default');
-      gitRepoCreatePage.setBranchName(branch);
-      gitRepoCreatePage.helmAuthSelectOrCreate().createBasicAuth('test', 'test');
-      gitRepoCreatePage.setHelmRepoURLRegex(helmRepoURLRegex);
 
+      gitRepoCreatePage.goToNext();
+
+      gitRepoCreatePage.setGitRepoUrl(repo);
+      gitRepoCreatePage.setBranchName(branch);
       gitRepoCreatePage.gitRepoPaths().setValueAtIndex(paths[0], 0);
+
       gitRepoCreatePage.goToNext();
 
       gitRepoCreatePage.targetCluster().toggle();
       gitRepoCreatePage.targetCluster().clickOption(6);
+
+      gitRepoCreatePage.goToNext();
+
+      gitRepoCreatePage.helmAuthSelectOrCreate().createBasicAuth('test', 'test');
+      gitRepoCreatePage.setHelmRepoURLRegex(helmRepoURLRegex);
+
       gitRepoCreatePage.create().then(() => {
         reposToDelete.push(`fleet-default/${ name }`);
       });

From 340e342cae154936756b47a3330502e4c947f3be Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 17:54:15 +0100
Subject: [PATCH 077/140] Fleet: Add GitRepo known host e2e tests

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 cypress/e2e/blueprints/fleet/gitrepos.ts      |   3 +-
 .../po/components/select-or-create-auth.po.ts |  20 ++-
 .../e2e/po/pages/fleet/gitrepo-create.po.ts   |   4 +
 .../e2e/po/prompts/KnownHostsEditDialog.po.ts |  15 ++
 cypress/e2e/tests/pages/fleet/gitrepo.spec.ts | 166 ++++++++++--------
 .../SSHKnownHosts/KnownHostsEditDialog.vue    |   7 +-
 shell/edit/fleet.cattle.io.gitrepo.vue        |   1 +
 7 files changed, 132 insertions(+), 84 deletions(-)
 create mode 100644 cypress/e2e/po/prompts/KnownHostsEditDialog.po.ts

diff --git a/cypress/e2e/blueprints/fleet/gitrepos.ts b/cypress/e2e/blueprints/fleet/gitrepos.ts
index 2de0359a1a0..452a94bccaf 100644
--- a/cypress/e2e/blueprints/fleet/gitrepos.ts
+++ b/cypress/e2e/blueprints/fleet/gitrepos.ts
@@ -15,7 +15,8 @@ export const gitRepoCreateRequest = {
     ],
     insecureSkipTLSVerify: false,
     helmRepoURLRegex:      'https://charts.rancher.io/*',
-    helmSecretName:        'auth-95j88'
+    helmSecretName:        '',
+    clientSecretName:      '',
   }
 };
 
diff --git a/cypress/e2e/po/components/select-or-create-auth.po.ts b/cypress/e2e/po/components/select-or-create-auth.po.ts
index a6fc2d978c7..d0c3f7820a9 100644
--- a/cypress/e2e/po/components/select-or-create-auth.po.ts
+++ b/cypress/e2e/po/components/select-or-create-auth.po.ts
@@ -1,6 +1,7 @@
 import LabeledSelectPo from '@/cypress/e2e/po/components/labeled-select.po';
 import ComponentPo from '@/cypress/e2e/po/components/component.po';
 import LabeledInputPo from '@/cypress/e2e/po/components/labeled-input.po';
+import KnownHostsEditDialog from '@/cypress/e2e/po/prompts/KnownHostsEditDialog.po';
 
 export default class SelectOrCreateAuthPo extends ComponentPo {
   authSelect() {
@@ -11,6 +12,10 @@ export default class SelectOrCreateAuthPo extends ComponentPo {
     return this.self().get(`${ this.selector } i.icon-spinner`);
   }
 
+  openKnowHostsEditDialog() {
+    return this.self().find('[data-testid="input-known-ssh-hosts_open-dialog"]').click({ force: true });
+  }
+
   setBasicAuthSecret(username: string, password: string) {
     const usernameInput = new LabeledInputPo(`${ this.selector } [data-testid="auth-secret-basic-username"]`, this.self());
     const passwordInput = new LabeledInputPo(`${ this.selector } [data-testid="auth-secret-basic-password"]`, this.self());
@@ -19,12 +24,21 @@ export default class SelectOrCreateAuthPo extends ComponentPo {
     passwordInput.set(password);
   }
 
-  setSSHSecret(privateKey: string, publicKey: string) {
+  setSSHSecret(privateKey: string, publicKey: string, knownHosts?: string) {
     const privateKeyInput = new LabeledInputPo(`${ this.selector } [data-testid="auth-secret-ssh-private-key"]`, this.self());
     const publicKeyInput = new LabeledInputPo(`${ this.selector } [data-testid="auth-secret-ssh-public-key"]`, this.self());
 
     privateKeyInput.set(privateKey);
     publicKeyInput.set(publicKey);
+
+    if (knownHosts) {
+      this.openKnowHostsEditDialog();
+
+      const knownHostsEditDialog = new KnownHostsEditDialog();
+
+      knownHostsEditDialog.set(knownHosts);
+      knownHostsEditDialog.save();
+    }
   }
 
   createBasicAuth(username = 'auth-test-user', password = 'auth-test-password') {
@@ -33,10 +47,10 @@ export default class SelectOrCreateAuthPo extends ComponentPo {
     this.setBasicAuthSecret(username, password);
   }
 
-  createSSHAuth(privateKey: string, publicKey: string) {
+  createSSHAuth(privateKey: string, publicKey: string, knownHosts?: string) {
     this.authSelect().toggle();
     this.authSelect().clickOptionWithLabel('Create an SSH Key Secret');
-    this.setSSHSecret(privateKey, publicKey);
+    this.setSSHSecret(privateKey, publicKey, knownHosts);
   }
 
   createRKEAuth(username = 'auth-test-user', password = 'auth-test-password') {
diff --git a/cypress/e2e/po/pages/fleet/gitrepo-create.po.ts b/cypress/e2e/po/pages/fleet/gitrepo-create.po.ts
index e236caa06ac..3689bdbf15a 100644
--- a/cypress/e2e/po/pages/fleet/gitrepo-create.po.ts
+++ b/cypress/e2e/po/pages/fleet/gitrepo-create.po.ts
@@ -84,6 +84,10 @@ export class GitRepoCreatePo extends PagePo {
   }
 
   helmAuthSelectOrCreate() {
+    return this.authSelectOrCreate('[data-testid="gitrepo-git-auth"]');
+  }
+
+  gitAuthSelectOrCreate() {
     return this.authSelectOrCreate('[data-testid="gitrepo-helm-auth"]');
   }
 
diff --git a/cypress/e2e/po/prompts/KnownHostsEditDialog.po.ts b/cypress/e2e/po/prompts/KnownHostsEditDialog.po.ts
new file mode 100644
index 00000000000..2d42ca20a95
--- /dev/null
+++ b/cypress/e2e/po/prompts/KnownHostsEditDialog.po.ts
@@ -0,0 +1,15 @@
+import ComponentPo from '@/cypress/e2e/po/components/component.po';
+
+export default class KnownHostsEditDialogPo extends ComponentPo {
+  constructor() {
+    super(cy.getId('sshKnownHostsDialog'));
+  }
+
+  set(value: string): Cypress.Chainable {
+    return this.self().get('[data-testid="ssh-known-hosts-dialog_code-mirror"]').type(value);
+  }
+
+  save() {
+    return this.self().get('[data-testid="ssh-known-hosts-dialog_save-btn"]').click({ force: true });
+  }
+}
diff --git a/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts b/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
index fc522d84628..6caa0073e42 100644
--- a/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
@@ -57,111 +57,123 @@ describe('Git Repo', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] }, (
 
       gitRepoCreatePage.goTo();
       gitRepoCreatePage.waitForPage();
-      cy.wait('@getSecrets', EXTRA_LONG_TIMEOUT_OPT).its('response.statusCode').should('eq', 200);
 
       const { name } = gitRepoCreateRequest.metadata;
       const {
         repo, branch, paths, helmRepoURLRegex
       } = gitRepoCreateRequest.spec;
 
-      gitRepoCreatePage.setRepoName(name);
       headerPo.selectWorkspace('fleet-default');
 
+      // Metadata step
+      gitRepoCreatePage.setRepoName(name);
+
       gitRepoCreatePage.goToNext();
 
+      // Repository details step
       gitRepoCreatePage.setGitRepoUrl(repo);
       gitRepoCreatePage.setBranchName(branch);
       gitRepoCreatePage.gitRepoPaths().setValueAtIndex(paths[0], 0);
 
       gitRepoCreatePage.goToNext();
 
+      // Target info step
       gitRepoCreatePage.targetCluster().toggle();
       gitRepoCreatePage.targetCluster().clickOption(6);
 
       gitRepoCreatePage.goToNext();
 
+      // Advanced info step
+      gitRepoCreatePage.gitAuthSelectOrCreate().createSSHAuth('test1', 'test1', 'KNOWN_HOSTS');
       gitRepoCreatePage.helmAuthSelectOrCreate().createBasicAuth('test', 'test');
       gitRepoCreatePage.setHelmRepoURLRegex(helmRepoURLRegex);
 
+      cy.wait('@getSecrets', EXTRA_LONG_TIMEOUT_OPT).its('response.statusCode').should('eq', 200);
+
       gitRepoCreatePage.create().then(() => {
         reposToDelete.push(`fleet-default/${ name }`);
       });
 
-      // First request is for creating credentials
-      let secretName = '';
-      let requestLabels = null;
-      let secretLabels = null;
-
-      cy.wait('@interceptSecret')
-        .then(({ request, response }) => {
-          requestLabels = request.body.metadata.labels;
-          expect(requestLabels).to.be.an('object').and.to.have.property('fleet.cattle.io/managed').that.equals('true');
-          expect(response.statusCode).to.eq(201);
-          secretName = response.body.metadata.name;
-          secretLabels = response.body.metadata.labels;
-          expect(secretName).not.to.eq('');
-          expect(secretLabels).to.be.an('object').and.to.have.property('fleet.cattle.io/managed').that.equals('true');
-
-          // Second request is for creating the git repo
-          return cy.wait('@interceptGitRepo');
-        })
-        .then(({ request, response }) => {
-          gitRepoCreateRequest.metadata.labels['fleet.cattle.io/created-by-display-name'] = adminUsername;
-          gitRepoCreateRequest.metadata.labels['fleet.cattle.io/created-by-user-id'] = adminUserId;
-          gitRepoCreateRequest.spec.helmSecretName = secretName;
-
-          expect(response.statusCode).to.eq(201);
-          expect(request.body).to.deep.eq(gitRepoCreateRequest);
-
-          const listPage = new FleetGitRepoListPagePo();
-
-          listPage.waitForPage();
-
-          const prefPage = new PreferencesPagePo();
-
-          // START TESTING https://github.com/rancher/dashboard/issues/9984
-          // change language to chinese
-          prefPage.goTo();
-          prefPage.languageDropdownMenu().checkVisible();
-          prefPage.languageDropdownMenu().toggle();
-          prefPage.languageDropdownMenu().isOpened();
-
-          cy.intercept({
-            method: 'PUT', url: 'v1/userpreferences/*', times: 1
-          }).as(`prefUpdateZhHans`);
-          prefPage.languageDropdownMenu().clickOption(2);
-          cy.wait('@prefUpdateZhHans').then(({ response }) => {
-            expect(response?.statusCode).to.eq(200);
-            expect(response?.body.data).to.have.property('locale', 'zh-hans');
-          });
-          prefPage.languageDropdownMenu().isClosed();
-
-          listPage.goTo();
-          listPage.waitForPage();
-          listPage.repoList().resourceTable().checkVisible();
-          listPage.repoList().resourceTable().sortableTable().checkVisible();
-          listPage.repoList().resourceTable().sortableTable().checkLoadingIndicatorNotVisible();
-          listPage.repoList().resourceTable().sortableTable().noRowsShouldNotExist();
-
-          // TESTING https://github.com/rancher/dashboard/issues/9984 make sure details page loads fine
-          listPage.goToDetailsPage('fleet-e2e-test-gitrepo');
-          gitRepoCreatePage.title().contains('Git 仓库: fleet-e2e-test-gitrepo').should('be.visible');
-
-          // https://github.com/rancher/dashboard/issues/9984 reset lang to EN so that delete action can be performed
-          prefPage.goTo();
-          prefPage.languageDropdownMenu().checkVisible();
-          prefPage.languageDropdownMenu().toggle();
-          prefPage.languageDropdownMenu().isOpened();
-
-          cy.intercept('PUT', 'v1/userpreferences/*').as(`prefUpdateEnUs`);
-          prefPage.languageDropdownMenu().clickOptionWithLabel('English');
-          cy.wait('@prefUpdateEnUs').then(({ response }) => {
-            expect(response?.statusCode).to.eq(200);
-            expect(response?.body.data).to.have.property('locale', 'en-us'); // Flake: This can sometimes be zh-hans.....?!
-          });
-          prefPage.languageDropdownMenu().isClosed();
-        })
-      ;
+      let gitSecretName = '';
+      let helmSecretName = '';
+
+      // Intercept 2nd interceptSecret call - Git SSH secret creation, see https://docs.cypress.io/api/commands/intercept#Interception-lifecycle
+      cy.wait('@interceptSecret').then(({ request, response }) => {
+        gitSecretName = response.body.metadata.name;
+
+        expect(request.body.metadata.labels).to.be.an('object').and.to.have.property('fleet.cattle.io/managed').that.equals('true');
+        expect(response.statusCode).to.eq(201);
+        expect(gitSecretName).not.to.eq('');
+        expect(response.body.metadata.labels).to.be.an('object').and.to.have.property('fleet.cattle.io/managed').that.equals('true');
+      });
+
+      // Intercept 1st interceptSecret call - Helm secret creation see https://docs.cypress.io/api/commands/intercept#Interception-lifecycle
+      cy.wait('@interceptSecret').then(({ request, response }) => {
+        helmSecretName = response.body.metadata.name;
+
+        expect(request.body.metadata.labels).to.be.an('object').and.to.have.property('fleet.cattle.io/managed').that.equals('true');
+        expect(response.statusCode).to.eq(201);
+        expect(helmSecretName).not.to.eq('');
+        expect(response.body.metadata.labels).to.be.an('object').and.to.have.property('fleet.cattle.io/managed').that.equals('true');
+      });
+
+      cy.wait('@interceptGitRepo').then(({ request, response }) => {
+        gitRepoCreateRequest.metadata.labels['fleet.cattle.io/created-by-display-name'] = adminUsername;
+        gitRepoCreateRequest.metadata.labels['fleet.cattle.io/created-by-user-id'] = adminUserId;
+        gitRepoCreateRequest.spec.helmSecretName = helmSecretName;
+        gitRepoCreateRequest.spec.clientSecretName = gitSecretName; // Git SSH credentials
+
+        expect(response.statusCode).to.eq(201);
+        expect(request.body).to.deep.eq(gitRepoCreateRequest);
+
+        const listPage = new FleetGitRepoListPagePo();
+
+        listPage.waitForPage();
+
+        const prefPage = new PreferencesPagePo();
+
+        // START TESTING https://github.com/rancher/dashboard/issues/9984
+        // change language to chinese
+        prefPage.goTo();
+        prefPage.languageDropdownMenu().checkVisible();
+        prefPage.languageDropdownMenu().toggle();
+        prefPage.languageDropdownMenu().isOpened();
+
+        cy.intercept({
+          method: 'PUT', url: 'v1/userpreferences/*', times: 1
+        }).as(`prefUpdateZhHans`);
+        prefPage.languageDropdownMenu().clickOption(2);
+        cy.wait('@prefUpdateZhHans').then(({ response }) => {
+          expect(response?.statusCode).to.eq(200);
+          expect(response?.body.data).to.have.property('locale', 'zh-hans');
+        });
+        prefPage.languageDropdownMenu().isClosed();
+
+        listPage.goTo();
+        listPage.waitForPage();
+        listPage.repoList().resourceTable().checkVisible();
+        listPage.repoList().resourceTable().sortableTable().checkVisible();
+        listPage.repoList().resourceTable().sortableTable().checkLoadingIndicatorNotVisible();
+        listPage.repoList().resourceTable().sortableTable().noRowsShouldNotExist();
+
+        // TESTING https://github.com/rancher/dashboard/issues/9984 make sure details page loads fine
+        listPage.goToDetailsPage('fleet-e2e-test-gitrepo');
+        gitRepoCreatePage.title().contains('Git 仓库: fleet-e2e-test-gitrepo').should('be.visible');
+
+        // https://github.com/rancher/dashboard/issues/9984 reset lang to EN so that delete action can be performed
+        prefPage.goTo();
+        prefPage.languageDropdownMenu().checkVisible();
+        prefPage.languageDropdownMenu().toggle();
+        prefPage.languageDropdownMenu().isOpened();
+
+        cy.intercept('PUT', 'v1/userpreferences/*').as(`prefUpdateEnUs`);
+        prefPage.languageDropdownMenu().clickOptionWithLabel('English');
+        cy.wait('@prefUpdateEnUs').then(({ response }) => {
+          expect(response?.statusCode).to.eq(200);
+          expect(response?.body.data).to.have.property('locale', 'en-us'); // Flake: This can sometimes be zh-hans.....?!
+        });
+        prefPage.languageDropdownMenu().isClosed();
+      });
     });
 
     it('check table headers are available in list and details view', { tags: ['@vai', '@adminUser'] }, function() {
diff --git a/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue b/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue
index ca65739214e..6b851ab0c6e 100644
--- a/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue
+++ b/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue
@@ -80,6 +80,7 @@ export default {
   <app-modal
     v-if="showModal"
     ref="sshKnownHostsDialog"
+    data-testid="sshKnownHostsDialog"
     height="auto"
     :scrollable="true"
     @close="closeDialog(false)"
@@ -151,13 +152,13 @@ export default {
         display: flex;
         flex-direction: column;
         resize: none;
-        max-height: 400px;
+        max-height: 350px;
         height: 50vh;
 
         .CodeMirror,
         .CodeMirror-gutters {
-          min-height: 400px;
-          max-height: 400px;
+          min-height: 350px;
+          max-height: 350px;
           background-color: var(--yaml-editor-bg);
         }
 
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 051aa4bfc1c..3c16aa9f9b8 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -668,6 +668,7 @@ export default {
       <h2 v-t="'fleet.gitRepo.auth.title'" />
 
       <SelectOrCreateAuthSecret
+        data-testid="gitrepo-git-auth"
         :value="value.spec.clientSecretName"
         :register-before-hook="registerBeforeHook"
         :namespace="value.metadata.namespace"

From 638750d8ea7292798b4009906835d44571df980c Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 18:02:00 +0100
Subject: [PATCH 078/140] Fleet: Add GitRepo pollingInterval e2e tests

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 cypress/e2e/blueprints/fleet/gitrepos.ts        | 1 +
 cypress/e2e/po/pages/fleet/gitrepo-create.po.ts | 4 ++++
 cypress/e2e/tests/pages/fleet/gitrepo.spec.ts   | 1 +
 3 files changed, 6 insertions(+)

diff --git a/cypress/e2e/blueprints/fleet/gitrepos.ts b/cypress/e2e/blueprints/fleet/gitrepos.ts
index 452a94bccaf..d5ed27e65ba 100644
--- a/cypress/e2e/blueprints/fleet/gitrepos.ts
+++ b/cypress/e2e/blueprints/fleet/gitrepos.ts
@@ -17,6 +17,7 @@ export const gitRepoCreateRequest = {
     helmRepoURLRegex:      'https://charts.rancher.io/*',
     helmSecretName:        '',
     clientSecretName:      '',
+    pollingInterval:       '13'
   }
 };
 
diff --git a/cypress/e2e/po/pages/fleet/gitrepo-create.po.ts b/cypress/e2e/po/pages/fleet/gitrepo-create.po.ts
index 3689bdbf15a..3b453c61604 100644
--- a/cypress/e2e/po/pages/fleet/gitrepo-create.po.ts
+++ b/cypress/e2e/po/pages/fleet/gitrepo-create.po.ts
@@ -91,6 +91,10 @@ export class GitRepoCreatePo extends PagePo {
     return this.authSelectOrCreate('[data-testid="gitrepo-helm-auth"]');
   }
 
+  setPollingInterval(value: number) {
+    return LabeledInputPo.byLabel(this.self(), 'Polling Interval').set(value);
+  }
+
   title() {
     return this.self().get('.title .primaryheader  h1');
   }
diff --git a/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts b/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
index 6caa0073e42..4e195d45495 100644
--- a/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/gitrepo.spec.ts
@@ -87,6 +87,7 @@ describe('Git Repo', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] }, (
       gitRepoCreatePage.gitAuthSelectOrCreate().createSSHAuth('test1', 'test1', 'KNOWN_HOSTS');
       gitRepoCreatePage.helmAuthSelectOrCreate().createBasicAuth('test', 'test');
       gitRepoCreatePage.setHelmRepoURLRegex(helmRepoURLRegex);
+      gitRepoCreatePage.setPollingInterval(13);
 
       cy.wait('@getSecrets', EXTRA_LONG_TIMEOUT_OPT).its('response.statusCode').should('eq', 200);
 

From d48f732a2864c5a9b627b0d1e2c33796d51f8d1b Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 24 Feb 2025 20:27:55 +0100
Subject: [PATCH 079/140] Fleet: fix unit tests given the new GitRepo wizard

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 .../__tests__/fleet.cattle.io.gitrepo.test.ts | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
index 2c097edf068..3d30c7f360a 100644
--- a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
+++ b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
@@ -19,6 +19,7 @@ describe.each([
     dispatch: jest.fn(),
     getters:  {
       'i18n/t':                  (text: string) => text,
+      'i18n/exists':             jest.fn(),
       t:                         (text: string) => text,
       currentStore:              () => 'current_store',
       'current_store/schemaFor': jest.fn(),
@@ -38,9 +39,22 @@ describe.each([
       }
     },
   };
+  const mockComputed = {
+    ...GitRepo.computed,
+    steps: () => [{
+      name:           'stepAdvanced',
+      title:          'title',
+      label:          'label',
+      subtext:        'subtext',
+      descriptionKey: 'description',
+      ready:          true,
+      weight:         1,
+    }],
+  };
   const wrapper = mount(GitRepo, {
-    props:  { value: values, mode },
-    global: { mocks }
+    props:    { value: values, mode },
+    computed: mockComputed,
+    global:   { mocks }
   });
 
   it('have self-healing checkbox and tooltip', () => {
@@ -62,7 +76,7 @@ describe.each([
   });
 
   it('enable drift if self-healing is checked', async() => {
-    const correctDriftCheckbox = wrapper.findComponent('[data-testid="gitRepo-correctDrift-checkbox"]');
+    const correctDriftCheckbox = wrapper.findComponent('[data-testid="gitRepo-correctDrift-checkbox"]') as any;
     const correctDriftContainer = wrapper.find('[data-testid="gitRepo-correctDrift-checkbox"] .checkbox-container');
 
     expect(correctDriftContainer.exists()).toBeTruthy();
@@ -96,7 +110,8 @@ describe.each([
         },
         realMode: mode
       },
-      global: { mocks },
+      computed: mockComputed,
+      global:   { mocks },
     });
 
     const pollingCheckbox = wrapper.findComponent('[data-testid="gitRepo-enablePolling-checkbox"]') as any;
@@ -133,7 +148,8 @@ describe.each([
         },
         realMode: mode
       },
-      global: { mocks },
+      computed: mockComputed,
+      global:   { mocks },
     });
 
     const pollingIntervalInput = wrapper.find('[data-testid="gitRepo-pollingInterval-input"]').element as any;
@@ -163,7 +179,8 @@ describe.each([
         },
         realMode: mode
       },
-      global: { mocks },
+      computed: mockComputed,
+      global:   { mocks },
     });
 
     const pollingIntervalMinimumValueWarning = wrapper.find('[data-testid="gitRepo-pollingInterval-minimumValueWarning"]');
@@ -191,7 +208,8 @@ describe.each([
         },
         realMode: mode
       },
-      global: { mocks },
+      computed: mockComputed,
+      global:   { mocks },
     });
 
     const pollingIntervalWebhookWarning = wrapper.find('[data-testid="gitRepo-pollingInterval-webhookWarning"]');

From 3ffb694a1c8381053be4798229c5d52f5f005055 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 25 Feb 2025 09:42:26 +0100
Subject: [PATCH 080/140] Fleet: fix knownHosts dialog height

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 .../components/form/SSHKnownHosts/KnownHostsEditDialog.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue b/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue
index 6b851ab0c6e..b9c17c05d88 100644
--- a/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue
+++ b/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue
@@ -152,13 +152,12 @@ export default {
         display: flex;
         flex-direction: column;
         resize: none;
-        max-height: 350px;
-        height: 50vh;
+        max-height: 400px;
 
         .CodeMirror,
         .CodeMirror-gutters {
-          min-height: 350px;
-          max-height: 350px;
+          min-height: 400px;
+          max-height: 400px;
           background-color: var(--yaml-editor-bg);
         }
 

From 0b088081cc8d9bd04ca93faa941ba72bd2a49ad5 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 25 Feb 2025 13:21:46 +0100
Subject: [PATCH 081/140] Fleet: fix GitRepos steps descriptions and messages

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/assets/translations/en-us.yaml   | 16 ++++++++--------
 shell/edit/fleet.cattle.io.gitrepo.vue |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 3a1f633a31b..11883c28f35 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -2513,15 +2513,15 @@ fleet:
       pollingInterval:
         label: Polling Interval
         tooltip: Polling Interval is the time between a push to the Repository and Fleet's reaction to it.
-        webhookWarning: Warning, a webhook is configured in Rancher to reconcile Git updates and GitRepo resources. The Polling Interval will automatically be adjusted to 1 hour.
-        minimumValuewarning: Warning, the recommended minimum Polling Interval is 15 seconds. To avoid performance issues with GitRepos that contain a large amount of resources please consider increasing this value.
+        webhookWarning: A webhook is configured in Rancher to reconcile Git updates and GitRepo resources. The Polling Interval will automatically be adjusted to 1 hour.
+        minimumValuewarning: The recommended minimum Polling Interval is 15 seconds. To avoid performance issues with GitRepos that contain a large amount of resources please consider increasing this value.
     add:
       steps:
         metadata:
           label: Metadata
-          title: Placeholder title
-          subtext: Placeholder subtext
-          description: Placeholder description
+          title: Specify the Git Repository name and labels/annotations
+          subtext: 'Define metadata details'
+          description: Git repository basic info
         repo:
           label: Repository details
           title: Specify the Git Repository to add to fleet
@@ -2529,9 +2529,9 @@ fleet:
           description: Fleet will continuously monitor the Git Repository you configure below and synchronise the resources contained in it to the configured targets.
         advanced:
           label: Advanced
-          title: Placeholder title
-          subtext: Placeholder subtext
-          description: Placeholder description
+          title: Specify advanced settings like authenticaion credentials and polling
+          subtext: 'Define advanced settings'
+          description: Fleet will use the authentication settings and polling to synchronise the resources contained in it.
           info: These settings are for advanced usage and optional. You can skip them and finish the creation process.
         targetInfo:
           label: Target details
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 3c16aa9f9b8..fa0333f291e 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -660,7 +660,6 @@ export default {
 
     <template #stepAdvanced>
       <Banner
-        class="mb-20"
         color="info"
         label-key="fleet.gitRepo.add.steps.advanced.info"
       />

From be8f609728103039d1017c5f490ec3d660022d45 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 25 Feb 2025 13:45:11 +0100
Subject: [PATCH 082/140] Nit

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/edit/fleet.cattle.io.gitrepo.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index fa0333f291e..976863d0a71 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -878,6 +878,9 @@ export default {
 </template>
 
 <style lang="scss" scoped>
+  .spacer {
+    padding: 30px 0 0 0;
+  }
   :deep() .select-or-create-auth-secret {
     .row {
       margin-top: 10px !important;

From 9664a29373547bcca78afc41b3d3b3c584a35e72 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Wed, 26 Feb 2025 09:45:34 +0000
Subject: [PATCH 083/140] Fix issue with configmap description and pressing
 `space` shifting focus (#13509)

* update computed patterns that use refs

* update pattern
---
 shell/components/CodeMirror.vue               | 16 ++++----
 .../nav/WindowManager/ContainerShell.vue      | 39 ++++++++++---------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/shell/components/CodeMirror.vue b/shell/components/CodeMirror.vue
index 01c7564849a..e9c8f00e576 100644
--- a/shell/components/CodeMirror.vue
+++ b/shell/components/CodeMirror.vue
@@ -36,12 +36,13 @@ export default {
 
   data() {
     return {
-      codeMirrorRef:       null,
-      loaded:              false,
-      removeKeyMapBox:     false,
-      hasLintErrors:       false,
-      currFocusedElem:     undefined,
-      isCodeMirrorFocused: false
+      codeMirrorRef:          null,
+      loaded:                 false,
+      removeKeyMapBox:        false,
+      hasLintErrors:          false,
+      currFocusedElem:        undefined,
+      isCodeMirrorFocused:    false,
+      codeMirrorContainerRef: undefined
     };
   },
 
@@ -103,7 +104,7 @@ export default {
     },
 
     isCodeMirrorContainerFocused() {
-      return this.currFocusedElem === this.$refs?.codeMirrorContainer;
+      return this.currFocusedElem === this.codeMirrorContainerRef;
     },
 
     codeMirrorContainerTabIndex() {
@@ -123,6 +124,7 @@ export default {
 
   async mounted() {
     document.addEventListener('keyup', this.handleKeyPress);
+    this.codeMirrorContainerRef = this.$refs.codeMirrorContainer;
   },
 
   beforeUnmount() {
diff --git a/shell/components/nav/WindowManager/ContainerShell.vue b/shell/components/nav/WindowManager/ContainerShell.vue
index 8a915ce80ef..5cd6ad994e7 100644
--- a/shell/components/nav/WindowManager/ContainerShell.vue
+++ b/shell/components/nav/WindowManager/ContainerShell.vue
@@ -74,23 +74,24 @@ export default {
 
   data() {
     return {
-      container:       this.initialContainer || this.pod?.defaultContainerName,
-      socket:          null,
-      terminal:        null,
-      fitAddon:        null,
-      searchAddon:     null,
-      webglAddon:      null,
-      canvasAddon:     null,
-      isOpen:          false,
-      isOpening:       false,
-      backlog:         [],
-      node:            null,
-      keepAliveTimer:  null,
-      errorMsg:        '',
-      backupShells:    ['linux', 'windows'],
-      os:              undefined,
-      retries:         0,
-      currFocusedElem: undefined
+      container:         this.initialContainer || this.pod?.defaultContainerName,
+      socket:            null,
+      terminal:          null,
+      fitAddon:          null,
+      searchAddon:       null,
+      webglAddon:        null,
+      canvasAddon:       null,
+      isOpen:            false,
+      isOpening:         false,
+      backlog:           [],
+      node:              null,
+      keepAliveTimer:    null,
+      errorMsg:          '',
+      backupShells:      ['linux', 'windows'],
+      os:                undefined,
+      retries:           0,
+      currFocusedElem:   undefined,
+      xtermContainerRef: undefined
     };
   },
 
@@ -115,7 +116,7 @@ export default {
     },
 
     isXtermContainerFocused() {
-      return this.currFocusedElem === this.$refs?.xterm;
+      return this.currFocusedElem === this.xtermContainerRef;
     },
 
     xTermContainerTabIndex() {
@@ -177,6 +178,8 @@ export default {
     this.keepAliveTimer = setInterval(() => {
       this.fit();
     }, 60 * 1000);
+
+    this.xtermContainerRef = this.$refs?.xterm;
   },
 
   methods: {

From b3babd5cf82712c5185befe0e59d4c80111e70ca Mon Sep 17 00:00:00 2001
From: Giuseppe Leo <giuseppe.leo@suse.com>
Date: Wed, 26 Feb 2025 10:49:48 +0100
Subject: [PATCH 084/140] Generic OIDC group scope is not sent in the request
 formed by the UI (#13514)

* Add basic store auth tests for redirect

* Define mixin tests

* Correct tests to cover all the cases correctly and ensure that this function works as expected

* Add scopes to the redirectTo request when testing the model

* Add unit tests for action test

* Add comment to save auth config method

* Correct unit tests

* Correct test to avoid the same term to be used for different parts

* Correct key value from scope to scopes to match existing implementation

* Update tests to use scopesJoinChar

* Add further tests for merging default scopes and UI scopes

* Add joinStringList function

* Correct scopes merging issues
---
 shell/mixins/__tests__/auth-config.test.ts |  74 +++++++++++++
 shell/mixins/auth-config.js                |   8 ++
 shell/store/__tests__/auth.test.ts         | 120 +++++++++++++++++++++
 shell/store/auth.js                        |  13 ++-
 shell/utils/__tests__/array.test.ts        |  14 ++-
 shell/utils/array.ts                       |  13 +++
 6 files changed, 237 insertions(+), 5 deletions(-)
 create mode 100644 shell/mixins/__tests__/auth-config.test.ts
 create mode 100644 shell/store/__tests__/auth.test.ts

diff --git a/shell/mixins/__tests__/auth-config.test.ts b/shell/mixins/__tests__/auth-config.test.ts
new file mode 100644
index 00000000000..254ddb55657
--- /dev/null
+++ b/shell/mixins/__tests__/auth-config.test.ts
@@ -0,0 +1,74 @@
+import { mount } from '@vue/test-utils';
+import authConfigMixin from '@shell/mixins/auth-config';
+
+describe('mixin: authConfigMixin', () => {
+  describe('method: save', () => {
+    const componentMock = (model: any) => ({
+      data: () => ({
+        value: { configType: 'oidc' },
+        model,
+      }),
+      computed: { principal: () => ({ me: {} }) },
+      global:   {
+        mocks: {
+          $store: {
+            dispatch: () => model,
+            commit:   () => ({ 'auth/loggedInAs': jest.fn() }),
+          },
+          $route: {
+            params: { id: '123' },
+            query:  { mode: 'edit' },
+          },
+        }
+      }
+    });
+    const FakeComponent = {
+      render() {},
+      mixins:  [authConfigMixin],
+      methods: { applyHooks: jest.fn() },
+    };
+
+    it('should return error', async() => {
+      const instance = mount(FakeComponent, componentMock({
+        doAction: jest.fn(),
+        save:     'make it fail'
+      })).vm as any;
+      const fakeCallback = jest.fn();
+
+      await instance.save(fakeCallback);
+
+      expect(fakeCallback).toHaveBeenCalledWith(false);
+    });
+
+    it('should not return error', async() => {
+      const model = {
+        authConfigName: 'whatever',
+        doAction:       jest.fn(),
+        save:           async() => {}
+      };
+      const instance = mount(FakeComponent, componentMock(model)).vm as any;
+      const fakeCallback = jest.fn();
+
+      await instance.save(fakeCallback);
+
+      expect(fakeCallback).toHaveBeenCalledWith(true);
+    });
+
+    it.each([
+      'oidc'
+    ])('should keep custom scope on save', async(type) => {
+      const scope = 'openid profile email groups whatever';
+      const model = {
+        scope,
+        authConfigName: 'whatever',
+        doAction:       jest.fn(),
+        save:           async() => {}
+      };
+      const instance = mount(FakeComponent, componentMock(model)).vm as any;
+
+      await instance.save(jest.fn());
+
+      expect(instance.model.scope).toStrictEqual(scope);
+    });
+  });
+});
diff --git a/shell/mixins/auth-config.js b/shell/mixins/auth-config.js
index cdfba8281d7..7a5af9053b2 100644
--- a/shell/mixins/auth-config.js
+++ b/shell/mixins/auth-config.js
@@ -137,6 +137,14 @@ export default {
       }
     },
 
+    /**
+     * On save several operations are executed to return a URL or open pop-up:
+     * - Retrieve data from the UI
+     * - "Test" the configuration through action and override the model
+     * - Retrieve scopes from redirect URL
+     * - Set default scopes and merge them with the ones from the redirect URL and from the "test" action
+     * @param {*} btnCb
+     */
     async save(btnCb) {
       await this.applyHooks(BEFORE_SAVE_HOOKS);
 
diff --git a/shell/store/__tests__/auth.test.ts b/shell/store/__tests__/auth.test.ts
new file mode 100644
index 00000000000..1be02ea8026
--- /dev/null
+++ b/shell/store/__tests__/auth.test.ts
@@ -0,0 +1,120 @@
+import { actions } from '@shell/store/auth';
+import { createStore } from 'vuex';
+
+// jest.mock('@shell/utils/url', () => ({
+//   addParams:   () => ({}),
+//   parse:       () => ({}),
+//   removeParam: () => ({}),
+// }));
+
+describe('action: redirectTo', () => {
+  it('should include query parameters from redirect', async() => {
+    jest.spyOn(window, 'window', 'get');
+    const store = { dispatch: jest.fn() };
+    const clientId = '123';
+    const uri = 'anyURI';
+    const scope = 'anything';
+    const expectation = `:///?client_id=${ clientId }&redirect_uri=${ uri }&response_type=code&response_mode=query&scope=${ scope }&state=undefined`;
+    const options = {
+      provider:    'azuread',
+      redirect:    false,
+      redirectUrl: `?client_id=${ clientId }&redirect_uri=${ uri }&scope=${ scope }`,
+    };
+
+    const url = await actions.redirectTo(store as any, options);
+
+    expect(url).toStrictEqual(expectation);
+  });
+
+  it.each([
+    ['genericoidc', '://myhost/?redirect_uri=anyURI&scope=openid%20profile%20email&state=undefined'],
+  ])('given provider %p should return URL %p', async(provider, expectation) => {
+    jest.spyOn(window, 'window', 'get');
+    const store = { dispatch: jest.fn() };
+    const uri = 'anyURI'; // This field is added anyway, so we set a random value
+    const options = {
+      provider,
+      redirect:    false,
+      redirectUrl: `myhost?redirect_uri=${ uri }`,
+    };
+
+    const url = await actions.redirectTo(store as any, options);
+
+    expect(url).toStrictEqual(expectation);
+  });
+
+  describe.each([
+    // 'whatever',
+    // 'github',
+    // 'googleoauth',
+    // 'azuread',
+    // 'keycloakoidc',
+    'genericoidc',
+  ])('given provider %p', (provider) => {
+    it('should keep scope from options', async() => {
+      const customScope = 'myScope';
+      const options = {
+        provider,
+        redirectUrl: 'anyURL',
+        scopes:      customScope,
+        // scopesJoinChar: ' ', // it's not used for genericoidc
+        test:        true,
+        redirect:    false
+      };
+      const store = { dispatch: jest.fn() };
+
+      jest.spyOn(window, 'window', 'get');
+      const url = await actions.redirectTo(store as any, options);
+
+      expect(url).toContain(customScope);
+    });
+
+    it('should merge scopes into a single string and avoid duplication', async() => {
+      const defaultScopes = 'openid profile email';
+      const customScope = 'myScope';
+      const options = {
+        provider,
+        redirectUrl: 'anyURL',
+        scopes:      `${ defaultScopes } ${ customScope }`,
+        test:        true,
+        redirect:    false
+      };
+      const store = { dispatch: jest.fn() };
+
+      jest.spyOn(window, 'window', 'get');
+      const url = await actions.redirectTo(store as any, options);
+
+      expect(url).toContain('scope=openid%20profile%20email%20myScope&');
+    });
+  });
+});
+
+jest.mock('@shell/utils/auth');
+
+describe('action: test', () => {
+  describe('given providers with an action (github, google, azuread, oidc)', () => {
+    it('should call redirectTo with all the options', async() => {
+      const dispatchSpy = jest.fn().mockReturnValue('anyURL');
+      const store = createStore({
+        actions: {
+          getAuthConfig: () => ({ doAction: () => 'no action' }),
+          redirectTo:    dispatchSpy,
+        }
+      });
+      const provider = 'anyProvider';
+      const redirectUrl = undefined;
+      const body = { scope: ['any scope'] };
+      const options = {
+        provider,
+        redirectUrl,
+        scopes:   body.scope,
+        test:     true,
+        redirect: false
+      };
+
+      await actions.test(store, { provider, body });
+
+      expect(dispatchSpy.mock.calls[0][1]).toStrictEqual(options);
+    });
+  });
+});
diff --git a/shell/store/auth.js b/shell/store/auth.js
index 96d2c66b435..f73fe459e40 100644
--- a/shell/store/auth.js
+++ b/shell/store/auth.js
@@ -1,7 +1,7 @@
 import { GITHUB_NONCE, GITHUB_REDIRECT, GITHUB_SCOPE } from '@shell/config/query-params';
 import { NORMAN } from '@shell/config/types';
 import { _MULTI } from '@shell/plugins/dashboard-store/actions';
-import { addObjects, findBy } from '@shell/utils/array';
+import { addObjects, findBy, joinStringList } from '@shell/utils/array';
 import { openAuthPopup, returnTo } from '@shell/utils/auth';
 import { base64Encode } from '@shell/utils/crypto';
 import { removeEmberPage } from '@shell/utils/ember-page';
@@ -230,18 +230,22 @@ export const actions = {
     const encodedNonce = await dispatch('encodeNonce', baseNonce);
 
     const fromQuery = unescape(parseUrl(redirectUrl).query?.[GITHUB_SCOPE] || '');
-    const scopes = fromQuery.split(/[, ]+/).filter((x) => !!x);
+    let scopes = fromQuery.split(/[, ]+/).filter((x) => !!x);
 
     if (BASE_SCOPES[provider]) {
       addObjects(scopes, BASE_SCOPES[provider]);
     }
 
-    if ( opt.scopes ) {
-      addObjects(scopes, opt.scopes);
+    // Need to merge these 2 formats preventing duplicates between code and UI, e.g.
+    // [ 'openid profile email' ] from BASE_SCOPES
+    // 'openid profile email customScope' from the UI
+    if (opt.scopes) {
+      scopes = [joinStringList(scopes[0], opt.scopes)];
     }
 
     let url = removeParam(redirectUrl, GITHUB_SCOPE);
 
+    // TODO: #13457 - Verify use case of scopesJoinChar anywhere outside this repository
     const params = {
       [GITHUB_SCOPE]: scopes.join(opt.scopesJoinChar || ','), // Some providers won't accept comma separated scopes
       [GITHUB_NONCE]: encodedNonce
@@ -310,6 +314,7 @@ export const actions = {
         const url = await dispatch('redirectTo', {
           provider,
           redirectUrl,
+          scopes:   body.scope,
           test:     true,
           redirect: false
         });
diff --git a/shell/utils/__tests__/array.test.ts b/shell/utils/__tests__/array.test.ts
index d35ace5eba6..c63172307f9 100644
--- a/shell/utils/__tests__/array.test.ts
+++ b/shell/utils/__tests__/array.test.ts
@@ -1,5 +1,5 @@
 import {
-  addObject, addObjects, clear, filterBy, findBy, getUniqueLabelKeys, insertAt, isArray, removeAt, removeObject, removeObjects, replaceWith, sameContents, uniq
+  addObject, addObjects, clear, filterBy, findBy, getUniqueLabelKeys, insertAt, isArray, joinStringList, removeAt, removeObject, removeObjects, replaceWith, sameContents, uniq
 } from '@shell/utils/array';
 
 interface Obj {
@@ -500,3 +500,15 @@ describe('fx: getUniqueLabelKeys', () => {
     expect(result).toStrictEqual(expected);
   });
 });
+
+describe('fx: joinStringList', () => {
+  it('should join two lists of strings', () => {
+    const a = 'a b c';
+    const b = 'b c d';
+    const separator = ' ';
+
+    const result = joinStringList(a, b, separator);
+
+    expect(result).toBe('a b c d');
+  });
+});
diff --git a/shell/utils/array.ts b/shell/utils/array.ts
index faea3ff5f12..8f2ea89c5b6 100644
--- a/shell/utils/array.ts
+++ b/shell/utils/array.ts
@@ -241,3 +241,16 @@ export function getUniqueLabelKeys<T extends KubeResource>(aryResources: T[]): s
 
   return Object.keys(uniqueObj).sort();
 }
+
+/**
+ * Join list as string into a new string without duplicates
+ * @param {string} a 'a b c'
+ * @param {string} b 'b c d'
+ * @param {string} [separator=' ']
+ * @return {string} 'a b c d'
+ */
+export const joinStringList = (a: string, b: string, separator = ' '): string => {
+  const all = a.split(separator).concat(b.split(separator));
+
+  return [...new Set(all)].join(separator);
+};

From 7f2c00143e2f896cfae6d43fc521e0c50f3ed701 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 5 Feb 2025 11:24:01 +0000
Subject: [PATCH 085/140] Wire in newly supported mgmt cluster status.connected
 property

---
 shell/components/nav/TopLevelMenu.helper.ts   | 10 +++++-----
 shell/plugins/steve/steve-pagination-utils.ts |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/shell/components/nav/TopLevelMenu.helper.ts b/shell/components/nav/TopLevelMenu.helper.ts
index 7c80ffe172b..b8f50a84bd1 100644
--- a/shell/components/nav/TopLevelMenu.helper.ts
+++ b/shell/components/nav/TopLevelMenu.helper.ts
@@ -37,7 +37,7 @@ type ProvCluster = {
 }
 
 /**
- * Order
+ * Order of v1 mgmt clusters
  * 1. local cluster - https://github.com/rancher/dashboard/issues/10975
  * 2. working clusters
  * 3. name
@@ -47,10 +47,10 @@ const DEFAULT_SORT: Array<PaginationSort> = [
     asc:   false,
     field: 'spec.internal',
   },
-  // {
-  //   asc:   true,
-  //   field: 'status.conditions[0].status' // Pending API changes https://github.com/rancher/rancher/issues/48092
-  // },
+  {
+    asc:   false,
+    field: 'status.connected'
+  },
   {
     asc:   true,
     field: 'spec.displayName',
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index ef94c2c5fc8..89c4ddd7f22 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -142,7 +142,7 @@ class StevePaginationUtils extends NamespaceProjectFilters {
       { field: 'spec.displayName' },
       { field: `status.provider` },
       { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` },
-
+      { field: `status.connected` },
     ],
     [CONFIG_MAP]: [
       { field: 'metadata.labels[harvesterhci.io/cloud-init-template]' }

From 6913c700974f958fe19e747e2918b601c43d93b0 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 26 Feb 2025 14:53:58 +0000
Subject: [PATCH 086/140] Fix to track backend changes for exact/partial
 matches

---
 shell/plugins/steve/steve-pagination-utils.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 89c4ddd7f22..90874a5ab27 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -433,9 +433,15 @@ class StevePaginationUtils extends NamespaceProjectFilters {
               this.validateField(validateFields, schema, field.field);
 
               const value = encodeURIComponent(field.value);
-              const exactPartial = field.exact ? `'${ value }'` : value;
 
-              return `${ this.convertArrayPath(field.field) }${ field.equals ? '=' : '!=' }${ exactPartial }`;
+              // = exact match
+              // ~ partial match
+              // != not exact match
+              // !~ not partial match
+
+              const operator = `${ field.equals ? '' : '!' }${ field.exact ? '=' : '~' }`;
+
+              return `${ this.convertArrayPath(field.field) }${ operator }${ value }`;
             }
 
             return field.value;

From d18fdef8904a2db1d6448019da10af90831fed0b Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Wed, 26 Feb 2025 08:06:06 -0800
Subject: [PATCH 087/140] update message

---
 shell/assets/translations/en-us.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 3b942d0e305..a1de106a0eb 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -1133,7 +1133,7 @@ catalog:
     oci:
       urlLabel: OCI Repository Host URL
       placeholder: 'e.g. oci://<registry-host>/<namespace>/<chart-name>:<tag>'
-      warning: OCI URLs should ONLY contain helm charts.
+      warning: OCI URLs must ONLY target helm chart/s.
       info: For large repositories containing many charts consider targeting a specific namespace or chart to improve performance, for example with oci://<registry-host>/<namespace> or oci://<registry-host>/<namespace>/<chart-name>.
       skipTlsVerifications: Skip TLS Verifications
       insecurePlainHttp: Insecure Plain Http

From 3665e77a1cc943ec090e07933e06d26412208ab6 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Wed, 26 Feb 2025 18:06:46 +0000
Subject: [PATCH 088/140] Don't show built-in extensions by default (#13469)

* Don't show built-in extensions by default

* Fix e2e tests and add tests for builtin tab

* Address PR feedback

* Address PR e2e test feedback

* Fix lint
---
 cypress/e2e/po/components/tabbed.po.ts        |  8 +++++
 cypress/e2e/po/pages/extensions.po.ts         |  8 +++++
 .../tests/pages/extensions/extensions.spec.ts | 30 ++++++++++++++++---
 .../support/commands/rancher-api-commands.ts  |  6 ++--
 shell/assets/translations/en-us.yaml          |  1 +
 shell/pages/c/_cluster/uiplugins/index.vue    | 16 ++++++++--
 6 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/cypress/e2e/po/components/tabbed.po.ts b/cypress/e2e/po/components/tabbed.po.ts
index 1e74ffe5144..21f17306d64 100644
--- a/cypress/e2e/po/components/tabbed.po.ts
+++ b/cypress/e2e/po/components/tabbed.po.ts
@@ -13,6 +13,10 @@ export default class TabbedPo extends ComponentPo {
     return this.self().find(`${ selector }`).click();
   }
 
+  clickTabWithName(name: string) {
+    return this.self().get(`[data-testid="btn-${ name }"]`).click();
+  }
+
   allTabs() {
     return this.self().get('[data-testid="tabbed-block"] > li');
   }
@@ -21,6 +25,10 @@ export default class TabbedPo extends ComponentPo {
     return this.self().find(`${ selector }`).should('have.class', 'active');
   }
 
+  getTab(name: string) {
+    return new ComponentPo(`[data-testid="${ name }"]`, this.self());
+  }
+
   /**
    * Get tab labels
    * @param tabLabelsSelector
diff --git a/cypress/e2e/po/pages/extensions.po.ts b/cypress/e2e/po/pages/extensions.po.ts
index 9944a27b648..f0aac7ba25a 100644
--- a/cypress/e2e/po/pages/extensions.po.ts
+++ b/cypress/e2e/po/pages/extensions.po.ts
@@ -228,6 +228,14 @@ export default class ExtensionsPagePo extends PagePo {
     return this.extensionTabs.clickNthTab(4);
   }
 
+  extensionTabBuiltinClick(): Cypress.Chainable {
+    return this.extensionTabs.clickTabWithName('builtin');
+  }
+
+  extensionTabBuiltin() {
+    return this.extensionTabs.getTab('builtin');
+  }
+
   // ------------------ extension reload banner ------------------
   extensionReloadBanner() {
     return this.self().getId('extension-reload-banner');
diff --git a/cypress/e2e/tests/pages/extensions/extensions.spec.ts b/cypress/e2e/tests/pages/extensions/extensions.spec.ts
index da074f61380..0a2b7756467 100644
--- a/cypress/e2e/tests/pages/extensions/extensions.spec.ts
+++ b/cypress/e2e/tests/pages/extensions/extensions.spec.ts
@@ -24,14 +24,34 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     cy.login();
   });
 
-  it('versions for built-in extensions should display as expected', () => {
-    const pluginVersion = '1.0.0';
+  it('should go to the available tab by default', () => {
     const extensionsPo = new ExtensionsPagePo();
 
     extensionsPo.goTo();
     extensionsPo.waitForPage(null, 'available');
-    extensionsPo.extensionTabInstalledClick();
-    extensionsPo.waitForPage(null, 'installed');
+  });
+
+  it('should show built-in extensions only when configured', () => {
+    const extensionsPo = new ExtensionsPagePo();
+    const pluginVersion = '1.0.0';
+
+    cy.setUserPreference({ 'plugin-developer': false });
+    extensionsPo.goTo();
+    extensionsPo.waitForPage(null, 'available');
+
+    // Should not be able to see the built-in tab
+    extensionsPo.extensionTabBuiltin().checkNotExists();
+
+    // Set the preference
+    cy.setUserPreference({ 'plugin-developer': true });
+    extensionsPo.goTo();
+    extensionsPo.waitForPage(null, 'available');
+
+    // Reload
+    extensionsPo.extensionTabBuiltin().checkExists();
+    extensionsPo.waitForPage(null, 'available');
+    extensionsPo.extensionTabBuiltinClick();
+    extensionsPo.waitForPage(null, 'builtin');
 
     // AKS Provisioning
     extensionsPo.extensionCardVersion('aks').should('contain', pluginVersion);
@@ -60,6 +80,8 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     extensionsPo.extensionDetailsTitle().should('contain', 'Virtualization Manager');
     extensionsPo.extensionDetailsVersion().should('contain', pluginVersion);
     extensionsPo.extensionDetailsCloseClick();
+
+    cy.setUserPreference({ 'plugin-developer': false });
   });
 
   it('add repository', () => {
diff --git a/cypress/support/commands/rancher-api-commands.ts b/cypress/support/commands/rancher-api-commands.ts
index 775c5fdb92c..ad3c820064f 100644
--- a/cypress/support/commands/rancher-api-commands.ts
+++ b/cypress/support/commands/rancher-api-commands.ts
@@ -1092,9 +1092,9 @@ Cypress.Commands.add('tableRowsPerPageAndNamespaceFilter', (rows: number, cluste
   });
 });
 
-// Update the user preferences by over-writing the given prefrence
+// Update the user preferences by over-writing the given preference
 Cypress.Commands.add('setUserPreference', (prefs: any) => {
-  return cy.getRancherResource('v3', 'users?me=true').then((resp: Cypress.Response<any>) => {
+  return cy.getRancherResource('v1', 'userpreferences').then((resp: Cypress.Response<any>) => {
     const update = resp.body.data[0];
 
     update.data = {
@@ -1102,6 +1102,8 @@ Cypress.Commands.add('setUserPreference', (prefs: any) => {
       ...prefs
     };
 
+    delete update.links;
+
     return cy.setRancherResource('v1', 'userpreferences', update.id, update);
   });
 });
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 0c11845d351..bc2e82bec03 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -4544,6 +4544,7 @@ plugins:
   tabs:
     all: All
     available: Available
+    builtin: Built-in
     images: Images
     installed: Installed
     updates: Updates
diff --git a/shell/pages/c/_cluster/uiplugins/index.vue b/shell/pages/c/_cluster/uiplugins/index.vue
index d7a4e12bdbd..0644e77027b 100644
--- a/shell/pages/c/_cluster/uiplugins/index.vue
+++ b/shell/pages/c/_cluster/uiplugins/index.vue
@@ -45,7 +45,8 @@ const TABS_VALUES = {
   INSTALLED: 'installed',
   UPDATES:   'updates',
   AVAILABLE: 'available',
-  ALL:       'all'
+  BUILTIN:   'builtin',
+  ALL:       'all',
 };
 
 export default {
@@ -210,7 +211,8 @@ export default {
     },
 
     list() {
-      const all = this.available;
+      // If not an extension developer, then don't include built-in extensions
+      const all = this.pluginDeveloper ? this.available : this.available.filter((p) => !p.builtin);
 
       switch (this.view) {
       case TABS_VALUES.INSTALLED:
@@ -219,6 +221,8 @@ export default {
         return this.updates;
       case TABS_VALUES.AVAILABLE:
         return all.filter((p) => !p.installed);
+      case TABS_VALUES.BUILTIN:
+        return all.filter((p) => p.builtin);
       default:
         return all;
       }
@@ -790,10 +794,16 @@ export default {
             :weight="18"
             :badge="updates.length"
           />
+          <Tab
+            v-if="pluginDeveloper"
+            :name="TABS_VALUES.BUILTIN"
+            label-key="plugins.tabs.builtin"
+            :weight="17"
+          />
           <Tab
             :name="TABS_VALUES.ALL"
             label-key="plugins.tabs.all"
-            :weight="17"
+            :weight="16"
           />
         </Tabbed>
         <div

From 897baaac764c2e3da1bb2cad9bee9b341e98938b Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Wed, 26 Feb 2025 19:07:24 +0100
Subject: [PATCH 089/140] Fix supportsSshKnownHosts in secret.js model

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/edit/secret/ssh.vue | 5 ++++-
 shell/models/secret.js    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/shell/edit/secret/ssh.vue b/shell/edit/secret/ssh.vue
index b371d5c9d49..05c6e08153c 100644
--- a/shell/edit/secret/ssh.vue
+++ b/shell/edit/secret/ssh.vue
@@ -44,7 +44,10 @@ export default {
     update() {
       this.value.setData('ssh-publickey', this.username);
       this.value.setData('ssh-privatekey', this.password);
-      this.value.setData('known_hosts', this.knownHosts);
+
+      if (this.showKnownHosts) {
+        this.value.setData('known_hosts', this.knownHosts);
+      }
     }
   }
 };
diff --git a/shell/models/secret.js b/shell/models/secret.js
index 302d00fb182..5f6f09312ea 100644
--- a/shell/models/secret.js
+++ b/shell/models/secret.js
@@ -51,7 +51,7 @@ export default class Secret extends SteveModel {
 
   // For Fleet SSH secrets - does the secret have the 'known_hosts' data key?
   get supportsSshKnownHosts() {
-    return this._type === TYPES.SSH && 'known_hosts' in this.data;
+    return this._type === TYPES.SSH && !!this.data && 'known_hosts' in this.data;
   }
 
   get issuer() {

From 6708040c2532ef4f23358b17dbaa40896789679f Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Wed, 26 Feb 2025 19:09:09 +0100
Subject: [PATCH 090/140] [unit-tests] add ssh and secret tests

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 pkg/aks/components/__tests__/Taint.test.ts |  2 +-
 shell/edit/secret/__tests__/ssh.test.ts    | 79 ++++++++++++++++++++++
 shell/edit/secret/ssh.vue                  |  3 +
 shell/models/__tests__/secret.test.ts      | 41 +++++++++++
 4 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 shell/edit/secret/__tests__/ssh.test.ts

diff --git a/pkg/aks/components/__tests__/Taint.test.ts b/pkg/aks/components/__tests__/Taint.test.ts
index 81a003afb4e..b385fcdd43a 100644
--- a/pkg/aks/components/__tests__/Taint.test.ts
+++ b/pkg/aks/components/__tests__/Taint.test.ts
@@ -53,11 +53,11 @@ describe('aks taint component', () => {
     }],
   ])('on edit, should populate each input field with parsed taint value', (taint, expected) => {
     const wrapper = shallowMount(Taint, {
+      ...requiredSetup(),
       propsData: {
         mode: _EDIT,
         taint
       },
-      ...requiredSetup()
     });
 
     const keyInput = wrapper.find('[data-testid="aks-taint-key-input"]');
diff --git a/shell/edit/secret/__tests__/ssh.test.ts b/shell/edit/secret/__tests__/ssh.test.ts
new file mode 100644
index 00000000000..8ff3680eb0b
--- /dev/null
+++ b/shell/edit/secret/__tests__/ssh.test.ts
@@ -0,0 +1,79 @@
+import { mount } from '@vue/test-utils';
+import { _VIEW, _EDIT, _CREATE } from '@shell/config/query-params';
+import Ssh from '@shell/edit/secret/ssh.vue';
+
+const mockedStore = () => {
+  return { getters: { 'i18n/t': jest.fn() } };
+};
+
+const mockedRoute = { query: {} };
+
+const requiredSetup = () => {
+  return {
+    global: {
+      mocks: {
+        $store:      mockedStore(),
+        $route:      mockedRoute,
+        $fetchState: {},
+      }
+    }
+  };
+};
+
+const decodedData = {
+  known_hosts:      'S05PV05fSE9TVFM=',
+  'ssh-privatekey': 'dGVzdDE=',
+  'ssh-publickey':  'dGVzdDE='
+};
+
+describe.each([
+  _CREATE,
+  _EDIT,
+  _VIEW
+])('component: Ssh.vue', (mode) => {
+  it(`mode: ${ mode }, should show input fields`, () => {
+    const wrapper = mount(Ssh, {
+      ...requiredSetup(),
+      props: {
+        value: {
+          name:                  'foo',
+          decodedData,
+          supportsSshKnownHosts: true
+        },
+        mode,
+      },
+    });
+
+    const publicKey = wrapper.find('[data-testid="ssh-public-key"]').element as HTMLInputElement;
+    const privateKey = wrapper.find('[data-testid="ssh-private-key"]').element as HTMLInputElement;
+    const knownHosts = wrapper.find('[data-testid="ssh-known-hosts"]').element as HTMLInputElement;
+
+    expect(publicKey.value).toBe('dGVzdDE=');
+    expect(privateKey.value).toBe('dGVzdDE=');
+    expect(knownHosts.value).toBe('S05PV05fSE9TVFM=');
+  });
+
+  it.each([
+    ['show', true],
+    ['hide', false],
+  ])(`mode: ${ mode }, should %p known_hosts`, (
+    _,
+    supportsSshKnownHosts,
+  ) => {
+    const wrapper = mount(Ssh, {
+      ...requiredSetup(),
+      props: {
+        value: {
+          name: 'foo',
+          decodedData,
+          supportsSshKnownHosts
+        },
+        mode: _EDIT,
+      },
+    });
+
+    const knownHosts = wrapper.find('[data-testid="ssh-known-hosts"]');
+
+    expect(knownHosts.exists()).toBe(supportsSshKnownHosts);
+  });
+});
diff --git a/shell/edit/secret/ssh.vue b/shell/edit/secret/ssh.vue
index 05c6e08153c..31cbdcb3895 100644
--- a/shell/edit/secret/ssh.vue
+++ b/shell/edit/secret/ssh.vue
@@ -60,6 +60,7 @@ export default {
         <LabeledInput
           v-model:value="username"
           type="multiline"
+          data-testid="ssh-public-key"
           :label="t('secret.ssh.public')"
           :mode="mode"
           required
@@ -75,6 +76,7 @@ export default {
         <LabeledInput
           v-model:value="password"
           type="multiline"
+          data-testid="ssh-private-key"
           :label="t('secret.ssh.private')"
           :mode="mode"
           required
@@ -93,6 +95,7 @@ export default {
           v-if="showKnownHosts"
           v-model:value="knownHosts"
           type="multiline"
+          data-testid="ssh-known-hosts"
           :label="t('secret.ssh.knownHosts')"
           :mode="mode"
           :placeholder="t('secret.ssh.knownHostsPlaceholder')"
diff --git a/shell/models/__tests__/secret.test.ts b/shell/models/__tests__/secret.test.ts
index 7e27786d3a3..9fbfd368e68 100644
--- a/shell/models/__tests__/secret.test.ts
+++ b/shell/models/__tests__/secret.test.ts
@@ -1,4 +1,45 @@
 import Secret from '@shell/models/secret';
+import { SECRET_TYPES as TYPES } from '@shell/config/secret';
+
+describe('model: Secret.js', () => {
+  it.each([
+    [
+      false,
+      'type is not SSH',
+      'generic',
+      { known_hosts: 'S05PV05fSE9TVFM=' },
+    ],
+    [
+      false,
+      'missing known_hosts',
+      TYPES.SSH,
+      {},
+    ],
+    [
+      false,
+      'data is null',
+      TYPES.SSH,
+      null,
+    ],
+    [
+      true,
+      'type is SSH key and known_hosts exists',
+      TYPES.SSH,
+      { known_hosts: 'S05PV05fSE9TVFM=' },
+    ],
+  ])('fn: supportsSshKnownHosts, returns %p if %p', (
+    supported,
+    descr,
+    _type,
+    data
+  ) => {
+    const secret = new Secret({ _type, data });
+
+    const result = secret.supportsSshKnownHosts;
+
+    expect(result).toBe(supported);
+  });
+});
 
 describe('class Secret', () => {
   it('should contains the type attribute if cleanForDownload', async() => {

From 2f9c16aff0f6c00ba7d093b1d8375ce096618e2f Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Thu, 20 Feb 2025 14:57:47 -0700
Subject: [PATCH 091/140] Add `User Login Filter` input to ldap config

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 shell/assets/translations/en-us.yaml |  1 +
 shell/edit/auth/ldap/config.vue      | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 79ae9a99168..cb3b9d1577f 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -548,6 +548,7 @@ authConfig:
     tls: TLS
     userEnabledAttribute: User Enabled Attribute
     userMemberAttribute: User Member Attribute
+    userLoginFilter: User Login Filter
     userSearchBase:
       label: User Search Base
       placeholder: 'e.g. ou=users,dc=mycompany,dc=com'
diff --git a/shell/edit/auth/ldap/config.vue b/shell/edit/auth/ldap/config.vue
index 54b49a6664f..b0778d846ef 100644
--- a/shell/edit/auth/ldap/config.vue
+++ b/shell/edit/auth/ldap/config.vue
@@ -351,6 +351,16 @@ export default {
         />
       </div>
     </div>
+    <div class="row mb-20">
+      <div class="col span-6">
+        <LabeledInput
+          v-model:value="model.userLoginFilter"
+          data-testid="user-login-filter"
+          :mode="mode"
+          :label="t('authConfig.ldap.userLoginFilter')"
+        />
+      </div>
+    </div>
     <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput

From 32dd237fbf6c28b7f025b28f2271c36a19f6b48e Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Thu, 20 Feb 2025 14:59:14 -0700
Subject: [PATCH 092/140] Re-flow ldap form inputs

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 shell/edit/auth/ldap/config.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/shell/edit/auth/ldap/config.vue b/shell/edit/auth/ldap/config.vue
index b0778d846ef..0ca9f593aa9 100644
--- a/shell/edit/auth/ldap/config.vue
+++ b/shell/edit/auth/ldap/config.vue
@@ -360,8 +360,6 @@ export default {
           :label="t('authConfig.ldap.userLoginFilter')"
         />
       </div>
-    </div>
-    <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput
           v-model:value="model.userSearchAttribute"
@@ -369,6 +367,8 @@ export default {
           :label="t('authConfig.ldap.searchAttribute')"
         />
       </div>
+    </div>
+    <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput
           v-model:value="model.groupSearchFilter"
@@ -376,8 +376,6 @@ export default {
           :label="t('authConfig.ldap.searchFilter')"
         />
       </div>
-    </div>
-    <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput
           v-model:value="model.userSearchFilter"
@@ -385,6 +383,8 @@ export default {
           :label="t('authConfig.ldap.searchFilter')"
         />
       </div>
+    </div>
+    <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput
           v-model:value="model.groupMemberMappingAttribute"
@@ -392,8 +392,6 @@ export default {
           :label="t('authConfig.ldap.groupMemberMappingAttribute')"
         />
       </div>
-    </div>
-    <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput
           v-model:value="model.userEnabledAttribute"
@@ -401,6 +399,8 @@ export default {
           :label="t('authConfig.ldap.userEnabledAttribute')"
         />
       </div>
+    </div>
+    <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput
           v-model:value="model.groupDNAttribute"
@@ -408,8 +408,6 @@ export default {
           :label="t('authConfig.ldap.groupDNAttribute')"
         />
       </div>
-    </div>
-    <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput
           v-model:value="model.disabledStatusBitmask"
@@ -417,6 +415,8 @@ export default {
           :label="t('authConfig.ldap.disabledStatusBitmask')"
         />
       </div>
+    </div>
+    <div class="row mb-20">
       <div
         v-if="!isSamlProvider"
         class=" col span-6"

From 1fa73c0a5e8172d94915b65c7461f2aa2478ab19 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Wed, 26 Feb 2025 11:57:01 -0700
Subject: [PATCH 093/140] Add unit tests for new user login filter input

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 shell/edit/auth/ldap/__tests__/config.test.ts | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/shell/edit/auth/ldap/__tests__/config.test.ts b/shell/edit/auth/ldap/__tests__/config.test.ts
index 945a05c82b4..fec2ffb7b8a 100644
--- a/shell/edit/auth/ldap/__tests__/config.test.ts
+++ b/shell/edit/auth/ldap/__tests__/config.test.ts
@@ -15,4 +15,44 @@ describe('lDAP config', () => {
 
     expect(checkbox).toBeDefined();
   });
+
+  it('updates user login filter when value is entered', async() => {
+    const wrapper = mount(
+      LDAPConfig,
+      {
+        props: {
+          value: {},
+          type:  'openldap',
+        }
+      });
+
+    const userLoginFilter = wrapper.find('[data-testid="user-login-filter"]');
+
+    await userLoginFilter.setValue('Test Filter');
+
+    const expectedValue = 'Test Filter';
+
+    expect(userLoginFilter.exists()).toBe(true);
+    expect(userLoginFilter.element.value).toBe(expectedValue);
+    expect(wrapper.vm.model.userLoginFilter).toBe(expectedValue);
+  });
+
+  it('defaults to undefined for user login filter', () => {
+    const wrapper = mount(
+      LDAPConfig,
+      {
+        props: {
+          value: {},
+          type:  'openldap',
+        }
+      });
+
+    const userLoginFilter = wrapper.find('[data-testid="user-login-filter"]');
+
+    const expectedValue = '';
+
+    expect(userLoginFilter.exists()).toBe(true);
+    expect(userLoginFilter.element.value).toBe(expectedValue);
+    expect(wrapper.vm.model.userLoginFilter).toBeUndefined();
+  });
 });

From 60ac57d2780bef6dc7b42e29d0f5bded4298168f Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Wed, 26 Feb 2025 15:31:30 -0800
Subject: [PATCH 094/140] hide filtered items in KeyValue

---
 shell/components/form/KeyValue.vue | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/shell/components/form/KeyValue.vue b/shell/components/form/KeyValue.vue
index b70af4fd19e..bab4c83b13c 100644
--- a/shell/components/form/KeyValue.vue
+++ b/shell/components/form/KeyValue.vue
@@ -295,12 +295,6 @@ export default {
      */
     canRemove() {
       return !this.isView && this.removeAllowed;
-    },
-    /**
-     * Filter rows based on toggler, keeping to still emit all the values
-     */
-    filteredRows() {
-      return this.rows.filter((row) => !(this.isProtected(row.key) && !this.toggleFilter));
     }
   },
   created() {
@@ -665,11 +659,14 @@ export default {
         </div>
       </template>
       <template
-        v-for="(row,i) in filteredRows"
+        v-for="(row,i) in rows"
         v-else
         :key="i"
       >
-        <div class="rowgroup">
+        <div
+          class="rowgroup"
+          :class="{'hidden': isProtected(row.key) && !toggleFilter}"
+        >
           <div class="row">
             <!-- Key -->
             <div
@@ -921,6 +918,10 @@ export default {
     grid-column-start: 1;
     grid-column-end: span end;
     grid-template-columns: subgrid;
+
+    &.hidden {
+      display: none;
+    }
   }
 
   .row {

From ef05aab4f4e7b5e1343576d49be7ea0becc098f4 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 20 Jan 2025 14:08:29 +0000
Subject: [PATCH 095/140] Update pagination settings (almost) ready for
 production - 'almost' applies to enabling SSP by default - Previously the
 ui-performance object contained a required set of resources to apply SSP to -
 This isn't workable going forward where the available resources will be
 updated between versions - Now the default is to use a set of default
 resources which can change between versions - Users can override if they wish

---
 shell/assets/translations/en-us.yaml          |  5 +-
 shell/config/settings.ts                      | 36 ++------------
 .../pages/c/_cluster/settings/performance.vue | 49 ++++++++++++++-----
 shell/plugins/steve/steve-pagination-utils.ts | 37 +++++++++++++-
 shell/types/resources/settings.d.ts           | 47 ++++++++++--------
 shell/utils/pagination-utils.ts               | 17 ++++++-
 6 files changed, 121 insertions(+), 70 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 714e53db81d..4f11daa631e 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -7729,7 +7729,10 @@ performance:
     label: Server-side Pagination
     description: By default Lists will fetch all resources and paginate in the browser (create the page given sorting and filtering settings). Change this setting to enable pagination server-side. This should help the responsiveness of the UI in systems with a lot of resources.
     checkboxLabel: Enable Server-side Pagination
-    applicable: "This applies to the following resource types"
+    checkboxUseDefault:
+      label: Apply to default resource types
+      placeholder: Default types will be updated in future versions. Check this setting to override the default with your own manually supplied settings.
+    applicable: Applies to the following resource types
     incompatibleDescription: "Server-side Pagination is incompatible with Manual Refresh and Incremental Loading. Enabling this will disable them."
     featureFlag: The&nbsp;<a href="{ffUrl}">Feature Flag</a>&nbsp;`ui-sql-cache` must be enabled to use this feature
     resources:
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 43c76e5bec3..25b567ddae2 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -253,38 +253,8 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
     }
   },
   serverPagination: {
-    enabled: false,
-    stores:  {
-      cluster: {
-        resources: {
-          enableAll:  false,
-          enableSome: {
-            // 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,
-              WORKLOAD_TYPES.CRON_JOB, WORKLOAD_TYPES.DAEMON_SET, WORKLOAD_TYPES.DEPLOYMENT, WORKLOAD_TYPES.JOB, WORKLOAD_TYPES.STATEFUL_SET, POD,
-              CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION,
-              HPA, INGRESS, SERVICE,
-              PV, CONFIG_MAP, STORAGE_CLASS, PVC, SECRET,
-              WORKLOAD_TYPES.REPLICA_SET, WORKLOAD_TYPES.REPLICATION_CONTROLLER
-            ],
-            generic: true,
-          }
-        }
-      },
-      management: {
-        resources: {
-          enableAll:  false,
-          enableSome: {
-            enabled: [
-              { resource: CAPI.RANCHER_CLUSTER, context: ['home', 'side-bar'] },
-              { resource: MANAGEMENT.CLUSTER, context: ['side-bar'] },
-            ],
-            generic: false,
-          }
-        }
-      }
-    }
+    enabled:          false,
+    useDefaultStores: true,
+    stores:           undefined,
   }
 };
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index afa266f9265..7bfc218a270 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -10,6 +10,8 @@ import { _EDIT, _VIEW } from '@shell/config/query-params';
 import UnitInput from '@shell/components/form/UnitInput';
 import { STEVE_CACHE } from '@shell/store/features';
 import { NAME as SETTING_PRODUCT } from '@shell/config/product/settings';
+import paginationUtils from '@shell/utils/pagination-utils';
+import { isDevBuild } from '@shell/utils/version';
 
 const incompatible = {
   incrementalLoading: ['forceNsFilterV2', 'serverPagination'],
@@ -74,7 +76,8 @@ export default {
           product:  SETTING_PRODUCT,
           resource: MANAGEMENT.FEATURE
         }
-      }).href
+      }).href,
+      isDev: process.env.NODE_ENV === 'dev',
     };
   },
 
@@ -93,10 +96,15 @@ export default {
       return this.$store.getters['features/get'](STEVE_CACHE);
     },
 
-    steveCacheApplicableResources() {
+    steveCacheAndSSPEnabled() {
+      return this.steveCacheEnabled && this.value.serverPagination.enabled
+    },
+
+    sspApplicableResources() {
       const storeResources = [];
+      const stores = paginationUtils.getStoreSettings(this.value.serverPagination);
 
-      Object.entries(this.value.serverPagination.stores).forEach(([store, settings]) => {
+      Object.entries(stores).forEach(([store, settings]) => {
         const resources = [];
 
         if (settings.resources.enableAll) {
@@ -173,7 +181,7 @@ export default {
       this.$store.dispatch('cluster/promptModal', {
         component:      'GenericPrompt',
         componentProps: {
-          applyMode: 'enable',
+          applyMode: 'continue',
           confirm:   (confirmed) => {
             this.value[property].enabled = confirmed;
           },
@@ -189,11 +197,15 @@ export default {
       });
     },
 
-    setPaginationDefaults() {
+    sspApplyDefaults(defaultStore) {
       this.value = {
         ...this.value,
         serverPagination: { ...DEFAULT_PERF_SETTING.serverPagination }
       };
+
+      if (defaultStore) {
+        this.value.serverPagination.stores = paginationUtils.getStoreDefault()
+      }
     }
   },
 };
@@ -213,10 +225,6 @@ export default {
             {{ t('performance.serverPagination.label') }}
           </h2>
           <p>{{ t('performance.serverPagination.description') }}</p>
-          <Banner
-            color="error"
-            label-key="performance.experimental"
-          />
           <Banner
             v-if="!steveCacheEnabled"
             v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)"
@@ -226,22 +234,37 @@ export default {
             v-model:value="value.serverPagination.enabled"
             :mode="mode"
             :label="t('performance.serverPagination.checkboxLabel')"
-            class="mt-10 mb-20"
+            class="mt-10 mb-10"
             :primary="true"
-            :disabled="(!steveCacheEnabled && !value.serverPagination.enabled)"
+            :disabled="!steveCacheEnabled"
             @update:value="compatibleWarning('serverPagination', $event)"
           />
+
+          <div>
+            <Checkbox
+              v-model:value="value.serverPagination.useDefaultStores"
+              :mode="mode"
+              :label-key="'performance.serverPagination.checkboxUseDefault.label'"
+              :tooltip-key="'performance.serverPagination.checkboxUseDefault.placeholder'"
+              class="mt-10 mb-10"
+              :primary="true"
+              :disabled="!steveCacheAndSSPEnabled"
+            />
+          </div>
+
           <p :class="{ 'text-muted': !value.serverPagination.enabled }">
             {{ t('performance.serverPagination.applicable') }}
           </p>
           <p
-            v-clean-html="steveCacheApplicableResources"
+            v-clean-html="sspApplicableResources"
             :class="{ 'text-muted': !value.serverPagination.enabled }"
           />
           <button
+            v-if="isDev"
             class="btn btn-sm role-primary"
             style="width: fit-content;"
-            @click.prevent="setPaginationDefaults()"
+            @click.prevent="sspApplyDefaults(true)"
+            :disabled="!steveCacheAndSSPEnabled"
           >
             {{ t('performance.serverPagination.populateDefaults') }}
           </button>
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 90874a5ab27..7b1cdad805f 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -12,10 +12,12 @@ import {
   SERVICE,
   INGRESS,
   WORKLOAD_TYPES,
-  HPA
+  HPA,
+  SECRET
 } from '@shell/config/types';
 import { CAPI as CAPI_LABELS, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
+import { PaginationSettingsStore } from '@shell/types/resources/settings';
 
 class NamespaceProjectFilters {
   /**
@@ -466,4 +468,37 @@ class StevePaginationUtils extends NamespaceProjectFilters {
   }
 }
 
+export const PAGINATION_SETTINGS_STORE_DEFAULTS: PaginationSettingsStore = {
+  cluster: {
+    resources: {
+      enableAll:  false,
+      enableSome: {
+        // 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,
+          WORKLOAD_TYPES.CRON_JOB, WORKLOAD_TYPES.DAEMON_SET, WORKLOAD_TYPES.DEPLOYMENT, WORKLOAD_TYPES.JOB, WORKLOAD_TYPES.STATEFUL_SET, POD,
+          CATALOG.APP, CATALOG.CLUSTER_REPO, CATALOG.OPERATION,
+          HPA, INGRESS, SERVICE,
+          PV, CONFIG_MAP, STORAGE_CLASS, PVC, SECRET,
+          WORKLOAD_TYPES.REPLICA_SET, WORKLOAD_TYPES.REPLICATION_CONTROLLER
+        ],
+        generic: true,
+      }
+    }
+  },
+  management: {
+    resources: {
+      enableAll:  false,
+      enableSome: {
+        enabled: [
+          { resource: CAPI.RANCHER_CLUSTER, context: ['home', 'side-bar'] },
+          { resource: MANAGEMENT.CLUSTER, context: ['side-bar'] },
+        ],
+        generic: false,
+      }
+    }
+  }
+};
+
 export default new StevePaginationUtils();
diff --git a/shell/types/resources/settings.d.ts b/shell/types/resources/settings.d.ts
index 7259b1097c0..7a2af9ee31f 100644
--- a/shell/types/resources/settings.d.ts
+++ b/shell/types/resources/settings.d.ts
@@ -1,3 +1,25 @@
+
+export interface PaginationSettingsStore {
+  [name: string]: {
+    resources: {
+      /**
+       * Enable for all resources in this store
+       */
+      enableAll: boolean,
+      enableSome: {
+        /**
+         * Specific resource type to enable
+         */
+        enabled: (string | { resource: string, context: string[]})[],
+        /**
+         * There's no hardcoded headers or custom list for the resource type, headers will be generated from schema attributes.columns
+         */
+        generic: boolean,
+      },
+    }
+  }
+}
+
 /**
  * Settings to handle server side pagination
  */
@@ -6,29 +28,14 @@ export interface PaginationSettings {
    * Global setting to enable or disable
    */
   enabled: boolean,
+  /**
+   * Override `stores` and apply pagination to a set of default resource types that can change between versions
+   */
+  useDefaultStores: boolean,
   /**
    * Should pagination be enabled for resources in a store
    */
-  stores: {
-    [name: string]: {
-      resources: {
-        /**
-         * Enable for all resources in this store
-         */
-        enableAll: boolean,
-        enableSome: {
-          /**
-           * Specific resource type to enable
-           */
-          enabled: (string | { resource: string, context: string[]})[],
-          /**
-           * There's no hardcoded headers or custom list for the resource type, headers will be generated from schema attributes.columns
-           */
-          generic: boolean,
-        },
-      }
-    }
-  }
+  stores: PaginationSettingsStore | undefined
 }
 
 type Links = {
diff --git a/shell/utils/pagination-utils.ts b/shell/utils/pagination-utils.ts
index db40dc104a3..b6c4f396227 100644
--- a/shell/utils/pagination-utils.ts
+++ b/shell/utils/pagination-utils.ts
@@ -1,4 +1,4 @@
-import { PaginationSettings } from '@shell/types/resources/settings';
+import { PaginationSettings, PaginationSettingsStore } from '@shell/types/resources/settings';
 import {
   NAMESPACE_FILTER_ALL_USER as ALL_USER,
   NAMESPACE_FILTER_ALL as ALL,
@@ -14,6 +14,7 @@ import { sameArrayObjects } from '@shell/utils/array';
 import { isEqual } from '@shell/utils/object';
 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';
 
 /**
  * Helper functions for server side pagination
@@ -32,6 +33,18 @@ class PaginationUtils {
     return perf.serverPagination;
   }
 
+  public getStoreSettings(ctx: any): PaginationSettingsStore
+  public getStoreSettings(serverPagination: PaginationSettings): PaginationSettingsStore
+  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();
+  }
+
+  public getStoreDefault(): PaginationSettingsStore {
+    return PAGINATION_SETTINGS_STORE_DEFAULTS;
+  }
+
   isSteveCacheEnabled({ rootGetters }: any): boolean {
     // We always get Feature flags as part of start up (see `dispatch('features/loadServer')` in loadManagement)
     return rootGetters['features/get']?.(STEVE_CACHE);
@@ -58,7 +71,7 @@ class PaginationUtils {
       return false;
     }
 
-    const storeSettings = settings.stores?.[enabledFor.store];
+    const storeSettings = this.getStoreSettings(settings)?.[enabledFor.store];
 
     // No pagination setting for target store, not enabled
     if (!storeSettings) {

From e8bfb2f580118e0139408391fbcfe59a8c7b5119 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Mon, 20 Jan 2025 15:42:24 +0000
Subject: [PATCH 096/140] Fix e2e + lint

---
 .../tests/pages/global-settings/performance.spec.ts    |  2 +-
 cypress/e2e/tests/priority/vai-setup.spec.ts           |  2 +-
 shell/config/settings.ts                               | 10 ----------
 shell/pages/c/_cluster/settings/performance.vue        |  7 +++----
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/cypress/e2e/tests/pages/global-settings/performance.spec.ts b/cypress/e2e/tests/pages/global-settings/performance.spec.ts
index e57aca64d46..00c397ccc14 100644
--- a/cypress/e2e/tests/pages/global-settings/performance.spec.ts
+++ b/cypress/e2e/tests/pages/global-settings/performance.spec.ts
@@ -175,7 +175,7 @@ describe('Performance', { testIsolation: 'off', tags: ['@globalSettings', '@admi
     performancePage.namespaceFilteringCheckbox().set();
 
     performancePage.incompatibleModal().getBody().contains('Required Namespace / Project Filtering is incompatible with Manual Refresh and Incremental Loading. Enabling this will disable them.');
-    performancePage.incompatibleModal().submit('Enable');
+    performancePage.incompatibleModal().submit('Continue');
     performancePage.namespaceFilteringCheckbox().isChecked();
     performancePage.applyAndWait('forceNsFilterV2-true').then(({ request, response }) => {
       expect(response?.statusCode).to.eq(200);
diff --git a/cypress/e2e/tests/priority/vai-setup.spec.ts b/cypress/e2e/tests/priority/vai-setup.spec.ts
index f2548059316..eeb04ef569f 100644
--- a/cypress/e2e/tests/priority/vai-setup.spec.ts
+++ b/cypress/e2e/tests/priority/vai-setup.spec.ts
@@ -34,7 +34,7 @@ describe('Setup Vai', { testIsolation: 'off', tags: ['@vai', '@adminUser'] }, ()
     performancePage.serverSidePaginationCheckbox().set();
 
     performancePage.incompatibleModal().checkVisible();
-    performancePage.incompatibleModal().submit('Enable');
+    performancePage.incompatibleModal().submit('Continue');
 
     performancePage.serverSidePaginationCheckbox().isChecked();
 
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 25b567ddae2..b71ac036619 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -1,16 +1,6 @@
 // Settings
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
-import {
-  CAPI, MANAGEMENT, EVENT, CATALOG, HPA, INGRESS, SERVICE,
-  CONFIG_MAP,
-  SECRET,
-  POD, NODE,
-  STORAGE_CLASS,
-  PVC,
-  PV,
-  WORKLOAD_TYPES
-} from '@shell/config/types';
 
 interface GlobalSettingRuleset {
   name: string,
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index 7bfc218a270..768ab72adc5 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -11,7 +11,6 @@ import UnitInput from '@shell/components/form/UnitInput';
 import { STEVE_CACHE } from '@shell/store/features';
 import { NAME as SETTING_PRODUCT } from '@shell/config/product/settings';
 import paginationUtils from '@shell/utils/pagination-utils';
-import { isDevBuild } from '@shell/utils/version';
 
 const incompatible = {
   incrementalLoading: ['forceNsFilterV2', 'serverPagination'],
@@ -97,7 +96,7 @@ export default {
     },
 
     steveCacheAndSSPEnabled() {
-      return this.steveCacheEnabled && this.value.serverPagination.enabled
+      return this.steveCacheEnabled && this.value.serverPagination.enabled;
     },
 
     sspApplicableResources() {
@@ -204,7 +203,7 @@ export default {
       };
 
       if (defaultStore) {
-        this.value.serverPagination.stores = paginationUtils.getStoreDefault()
+        this.value.serverPagination.stores = paginationUtils.getStoreDefault();
       }
     }
   },
@@ -263,8 +262,8 @@ export default {
             v-if="isDev"
             class="btn btn-sm role-primary"
             style="width: fit-content;"
-            @click.prevent="sspApplyDefaults(true)"
             :disabled="!steveCacheAndSSPEnabled"
+            @click.prevent="sspApplyDefaults(true)"
           >
             {{ t('performance.serverPagination.populateDefaults') }}
           </button>

From 7d154b1ec872cba2a0f0933a632450e7ef420fdb Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Tue, 4 Feb 2025 16:20:10 +0000
Subject: [PATCH 097/140] Updates

---
 shell/assets/styles/themes/_light.scss        |  4 +++
 shell/assets/translations/en-us.yaml          |  6 ++--
 shell/components/Collapse.vue                 | 19 +++++++++++--
 .../pages/c/_cluster/settings/performance.vue | 28 +++++++++++++++----
 4 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/shell/assets/styles/themes/_light.scss b/shell/assets/styles/themes/_light.scss
index 967495e1d18..92b49142fb3 100644
--- a/shell/assets/styles/themes/_light.scss
+++ b/shell/assets/styles/themes/_light.scss
@@ -91,6 +91,10 @@ BODY, .theme-light {
 
   .text-link {
     color: var(--link) !important;
+
+    &.disabled {
+      color: var(--disabled-text) !important;
+    }
   }
 
   .bg-link {
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 4f11daa631e..0b777ff5427 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -7730,9 +7730,9 @@ performance:
     description: By default Lists will fetch all resources and paginate in the browser (create the page given sorting and filtering settings). Change this setting to enable pagination server-side. This should help the responsiveness of the UI in systems with a lot of resources.
     checkboxLabel: Enable Server-side Pagination
     checkboxUseDefault:
-      label: Apply to default resource types
-      placeholder: Default types will be updated in future versions. Check this setting to override the default with your own manually supplied settings.
-    applicable: Applies to the following resource types
+      label: Override default applicable resources types
+      placeholder: This is an advanced feature configured outside of this UI. Overriding applicable resource types will ignore updates to default values in later versions
+    applicable: Applicable Resource Types
     incompatibleDescription: "Server-side Pagination is incompatible with Manual Refresh and Incremental Loading. Enabling this will disable them."
     featureFlag: The&nbsp;<a href="{ffUrl}">Feature Flag</a>&nbsp;`ui-sql-cache` must be enabled to use this feature
     resources:
diff --git a/shell/components/Collapse.vue b/shell/components/Collapse.vue
index 73b57f0dd77..8bfd2280caf 100644
--- a/shell/components/Collapse.vue
+++ b/shell/components/Collapse.vue
@@ -13,7 +13,12 @@ export default {
     title: {
       type:    String,
       default: ''
-    }
+    },
+
+    isDisabled: {
+      type:    Boolean,
+      default: false
+    },
   },
 
   methods: {
@@ -25,10 +30,15 @@ export default {
 </script>
 
 <template>
-  <div class="collapse">
+  <div
+    class="collapse"
+    :class="{ 'disabled': isDisabled }"
+  >
     <slot name="title">
       <div
         class="advanced text-link"
+        :class="{ 'disabled': isDisabled }"
+        :disabled="isDisabled"
         data-testid="collapse-div"
         @click="showAdvanced"
       >
@@ -59,11 +69,14 @@ export default {
 <style lang="scss" scoped>
 .advanced {
   user-select: none;
-  padding: 0 5px;
   cursor: pointer;
   line-height: 40px;
   font-size: 15px;
   font-weight: 500;
+
+  .disabled {
+    cursor: not-allowed;
+  }
 }
 .content {
   background: var(--nav-active);
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index 768ab72adc5..d0009ecb9b8 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -11,6 +11,7 @@ import UnitInput from '@shell/components/form/UnitInput';
 import { STEVE_CACHE } from '@shell/store/features';
 import { NAME as SETTING_PRODUCT } from '@shell/config/product/settings';
 import paginationUtils from '@shell/utils/pagination-utils';
+import Collapse from '@shell/components/Collapse';
 
 const incompatible = {
   incrementalLoading: ['forceNsFilterV2', 'serverPagination'],
@@ -33,7 +34,8 @@ export default {
     AsyncButton,
     Banner,
     LabeledInput,
-    UnitInput
+    UnitInput,
+    Collapse,
   },
 
   async fetch() {
@@ -76,7 +78,8 @@ export default {
           resource: MANAGEMENT.FEATURE
         }
       }).href,
-      isDev: process.env.NODE_ENV === 'dev',
+      isDev:                  process.env.NODE_ENV === 'dev',
+      ssPApplicableTypesOpen: false,
     };
   },
 
@@ -239,28 +242,41 @@ export default {
             @update:value="compatibleWarning('serverPagination', $event)"
           />
 
+          <Collapse
+            :title="t('performance.serverPagination.applicable')"
+            :open="steveCacheAndSSPEnabled && ssPApplicableTypesOpen"
+            :isDisabled="!steveCacheAndSSPEnabled"
+            @update:open="ssPApplicableTypesOpen = !ssPApplicableTypesOpen"
+          >
+            <p
+              v-clean-html="sspApplicableResources"
+              :class="{ 'text-muted': !value.serverPagination.enabled }"
+            />
+          </Collapse>
+
           <div>
             <Checkbox
-              v-model:value="value.serverPagination.useDefaultStores"
+              :value="!value.serverPagination.useDefaultStores"
               :mode="mode"
               :label-key="'performance.serverPagination.checkboxUseDefault.label'"
               :tooltip-key="'performance.serverPagination.checkboxUseDefault.placeholder'"
               class="mt-10 mb-10"
               :primary="true"
               :disabled="!steveCacheAndSSPEnabled"
+              @update:value="value.serverPagination.useDefaultStores = !value.serverPagination.useDefaultStores"
             />
           </div>
 
-          <p :class="{ 'text-muted': !value.serverPagination.enabled }">
+          <!-- <p :class="{ 'text-muted': !value.serverPagination.enabled }">
             {{ t('performance.serverPagination.applicable') }}
           </p>
           <p
             v-clean-html="sspApplicableResources"
             :class="{ 'text-muted': !value.serverPagination.enabled }"
-          />
+          /> -->
           <button
             v-if="isDev"
-            class="btn btn-sm role-primary"
+            class="btn btn-sm role-primary mt-10"
             style="width: fit-content;"
             :disabled="!steveCacheAndSSPEnabled"
             @click.prevent="sspApplyDefaults(true)"

From de82273de8edcd9a3e493673a2c945ffa8c412a1 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 26 Feb 2025 15:59:12 +0000
Subject: [PATCH 098/140] Address failing plugin builds TS failure

 error  in ../../shell/plugins/steve/steve-pagination-utils.ts:37:50

TS2339: Property 'name' does not exist on type 'Namespace'.
    35 |       if (hideObscure || hideSystem) {
    36 |         res.push(PaginationParamFilter.createSingleField({
  > 37 |           field: 'metadata.namespace', value: ns.name, equals: false
       |                                                  ^^^^
    38 |         }));
    39 |       }
---
 shell/plugins/steve/steve-pagination-utils.ts | 11 ++++++++++-
 shell/scripts/typegen.sh                      |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index 7b1cdad805f..a3f5ebcc921 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -1,7 +1,7 @@
 import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
 import { PaginationParam, PaginationFilterField, PaginationParamProjectOrNamespace, PaginationParamFilter } from '@shell/types/store/pagination.types';
 import { NAMESPACE_FILTER_ALL_SYSTEM, NAMESPACE_FILTER_ALL_USER, NAMESPACE_FILTER_P_FULL_PREFIX } from '@shell/utils/namespace-filter';
-import Namespace from '@shell/models/namespace';
+import ModelNamespace from '@shell/models/namespace';
 import { uniq } from '@shell/utils/array';
 import {
   CAPI,
@@ -19,6 +19,15 @@ import { CAPI as CAPI_LABELS, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labe
 import { Schema } from '@shell/plugins/steve/schema';
 import { PaginationSettingsStore } from '@shell/types/resources/settings';
 
+/**
+ * This is a workaround for a ts build issue found in check-plugins-build.
+ *
+ * The build would error on <ns>.name, it somehow doesn't know about the steve model's properties (they are included in typegen)
+ */
+interface Namespace extends ModelNamespace {
+  name: string;
+}
+
 class NamespaceProjectFilters {
   /**
    * User needs all resources.... except if there's some settings which should remove resources in specific circumstances
diff --git a/shell/scripts/typegen.sh b/shell/scripts/typegen.sh
index 17be6eae20c..ee050bf8239 100755
--- a/shell/scripts/typegen.sh
+++ b/shell/scripts/typegen.sh
@@ -34,6 +34,7 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/resource-
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/classify.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/actions.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/steve/steve-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/steve/ > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/steve/hybrid-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/steve/ > /dev/null
 
 # # 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

From 896214cef15e919970096f742b8df31d9df1b744 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Wed, 26 Feb 2025 16:57:02 +0000
Subject: [PATCH 099/140] Improve wording / layout

---
 shell/assets/translations/en-us.yaml          |  6 +--
 .../pages/c/_cluster/settings/performance.vue | 48 ++++++++-----------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 0b777ff5427..0acb2f22078 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -7730,9 +7730,9 @@ performance:
     description: By default Lists will fetch all resources and paginate in the browser (create the page given sorting and filtering settings). Change this setting to enable pagination server-side. This should help the responsiveness of the UI in systems with a lot of resources.
     checkboxLabel: Enable Server-side Pagination
     checkboxUseDefault:
-      label: Override default applicable resources types
-      placeholder: This is an advanced feature configured outside of this UI. Overriding applicable resource types will ignore updates to default values in later versions
-    applicable: Applicable Resource Types
+      label: Enable Custom Resources
+      placeholder: Customize the resources that server-side pagination applies to. This is an advanced feature and must be managed outside of the UI. Customized resource types are not updated on Rancher upgrade and must be manually changed.
+    applicable: "Server-side pagination applies to:"
     incompatibleDescription: "Server-side Pagination is incompatible with Manual Refresh and Incremental Loading. Enabling this will disable them."
     featureFlag: The&nbsp;<a href="{ffUrl}">Feature Flag</a>&nbsp;`ui-sql-cache` must be enabled to use this feature
     resources:
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index d0009ecb9b8..ba8ddd3e4f3 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -242,18 +242,6 @@ export default {
             @update:value="compatibleWarning('serverPagination', $event)"
           />
 
-          <Collapse
-            :title="t('performance.serverPagination.applicable')"
-            :open="steveCacheAndSSPEnabled && ssPApplicableTypesOpen"
-            :isDisabled="!steveCacheAndSSPEnabled"
-            @update:open="ssPApplicableTypesOpen = !ssPApplicableTypesOpen"
-          >
-            <p
-              v-clean-html="sspApplicableResources"
-              :class="{ 'text-muted': !value.serverPagination.enabled }"
-            />
-          </Collapse>
-
           <div>
             <Checkbox
               :value="!value.serverPagination.useDefaultStores"
@@ -266,23 +254,27 @@ export default {
               @update:value="value.serverPagination.useDefaultStores = !value.serverPagination.useDefaultStores"
             />
           </div>
-
-          <!-- <p :class="{ 'text-muted': !value.serverPagination.enabled }">
-            {{ t('performance.serverPagination.applicable') }}
-          </p>
-          <p
-            v-clean-html="sspApplicableResources"
-            :class="{ 'text-muted': !value.serverPagination.enabled }"
-          /> -->
-          <button
-            v-if="isDev"
-            class="btn btn-sm role-primary mt-10"
-            style="width: fit-content;"
-            :disabled="!steveCacheAndSSPEnabled"
-            @click.prevent="sspApplyDefaults(true)"
+          <Collapse
+            :title="t('performance.serverPagination.applicable')"
+            :open="steveCacheAndSSPEnabled && ssPApplicableTypesOpen"
+            :isDisabled="!steveCacheAndSSPEnabled"
+            @update:open="ssPApplicableTypesOpen = !ssPApplicableTypesOpen"
           >
-            {{ t('performance.serverPagination.populateDefaults') }}
-          </button>
+            <p
+              v-clean-html="sspApplicableResources"
+              :class="{ 'text-muted': !value.serverPagination.enabled }"
+            />
+          </Collapse>
+          <div v-if="isDev">
+            <button
+              class="btn btn-sm role-primary mt-10"
+              style="width: fit-content;"
+              :disabled="!steveCacheAndSSPEnabled"
+              @click.prevent="sspApplyDefaults(true)"
+            >
+              {{ t('performance.serverPagination.populateDefaults') }}
+            </button>
+          </div>
         </div>
         <!-- Inactivity -->
         <div class="mt-20">

From dcea7c6847fdde55ed683554cec7ac2f69ad7b0c Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 27 Feb 2025 08:55:16 +0000
Subject: [PATCH 100/140] Remove advanced settings, neaten up vertical spacing

---
 shell/assets/translations/en-us.yaml          |  6 +--
 .../pages/c/_cluster/settings/performance.vue | 41 ++-----------------
 2 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 0acb2f22078..a29642e7bf5 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -7729,16 +7729,12 @@ performance:
     label: Server-side Pagination
     description: By default Lists will fetch all resources and paginate in the browser (create the page given sorting and filtering settings). Change this setting to enable pagination server-side. This should help the responsiveness of the UI in systems with a lot of resources.
     checkboxLabel: Enable Server-side Pagination
-    checkboxUseDefault:
-      label: Enable Custom Resources
-      placeholder: Customize the resources that server-side pagination applies to. This is an advanced feature and must be managed outside of the UI. Customized resource types are not updated on Rancher upgrade and must be manually changed.
-    applicable: "Server-side pagination applies to:"
+    applicable: "Server-side pagination applies to Resource Types"
     incompatibleDescription: "Server-side Pagination is incompatible with Manual Refresh and Incremental Loading. Enabling this will disable them."
     featureFlag: The&nbsp;<a href="{ffUrl}">Feature Flag</a>&nbsp;`ui-sql-cache` must be enabled to use this feature
     resources:
       generic: most resources in the cluster's 'More Resources' section
       all: All Resources
-    populateDefaults: Populate with latest pagination defaults
 banner:
   label: Fixed Banners
   settingName: Banners
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index ba8ddd3e4f3..6f1cf70d205 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -78,7 +78,6 @@ export default {
           resource: MANAGEMENT.FEATURE
         }
       }).href,
-      isDev:                  process.env.NODE_ENV === 'dev',
       ssPApplicableTypesOpen: false,
     };
   },
@@ -198,17 +197,6 @@ export default {
         },
       });
     },
-
-    sspApplyDefaults(defaultStore) {
-      this.value = {
-        ...this.value,
-        serverPagination: { ...DEFAULT_PERF_SETTING.serverPagination }
-      };
-
-      if (defaultStore) {
-        this.value.serverPagination.stores = paginationUtils.getStoreDefault();
-      }
-    }
   },
 };
 </script>
@@ -222,7 +210,7 @@ export default {
     <div>
       <div class="ui-perf-setting">
         <!-- Server Side Pagination -->
-        <div class="mt-40">
+        <div class="mt-20">
           <h2 id="ssp-setting">
             {{ t('performance.serverPagination.label') }}
           </h2>
@@ -241,19 +229,6 @@ export default {
             :disabled="!steveCacheEnabled"
             @update:value="compatibleWarning('serverPagination', $event)"
           />
-
-          <div>
-            <Checkbox
-              :value="!value.serverPagination.useDefaultStores"
-              :mode="mode"
-              :label-key="'performance.serverPagination.checkboxUseDefault.label'"
-              :tooltip-key="'performance.serverPagination.checkboxUseDefault.placeholder'"
-              class="mt-10 mb-10"
-              :primary="true"
-              :disabled="!steveCacheAndSSPEnabled"
-              @update:value="value.serverPagination.useDefaultStores = !value.serverPagination.useDefaultStores"
-            />
-          </div>
           <Collapse
             :title="t('performance.serverPagination.applicable')"
             :open="steveCacheAndSSPEnabled && ssPApplicableTypesOpen"
@@ -265,16 +240,6 @@ export default {
               :class="{ 'text-muted': !value.serverPagination.enabled }"
             />
           </Collapse>
-          <div v-if="isDev">
-            <button
-              class="btn btn-sm role-primary mt-10"
-              style="width: fit-content;"
-              :disabled="!steveCacheAndSSPEnabled"
-              @click.prevent="sspApplyDefaults(true)"
-            >
-              {{ t('performance.serverPagination.populateDefaults') }}
-            </button>
-          </div>
         </div>
         <!-- Inactivity -->
         <div class="mt-20">
@@ -318,7 +283,7 @@ export default {
           />
         </div>
         <!-- Incremental Loading -->
-        <div class="mt-40">
+        <div class="mt-20">
           <h2>{{ t('performance.incrementalLoad.label') }}</h2>
           <Banner
             color="warning"
@@ -481,7 +446,7 @@ export default {
           />
         </div>
         <!-- Advanced Websocket Worker -->
-        <div class="mt-40">
+        <div class="mt-20">
           <h2>{{ t('performance.advancedWorker.label') }}</h2>
           <Banner
             color="warning"

From bf12d8f07392f963d001686a0adff0f7220aee51 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Thu, 27 Feb 2025 09:43:38 +0000
Subject: [PATCH 101/140] re-enable sorry cypress in master

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a9f700a02a8..d50c9767535 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "e2e:dev": "START_SERVER_AND_TEST_INSECURE=1 server-test start:dev https-get://localhost:8005 cy:run:sorry",
     "e2e:build": "mkdir dist && TEST_INSTRUMENT=false ./scripts/build-e2e",
     "e2e:docker": "yarn docker:local:stop && ./scripts/e2e-docker-start $RANCHER_VERSION_E2E",
-    "e2e:prod": "BUILD_DASHBOARD=$BUILD_DASHBOARD GREP_TAGS=$GREP_TAGS TEST_USERNAME=$TEST_USERNAME TEST_BASE_URL=https://127.0.0.1/dashboard yarn cy:run", 
+    "e2e:prod": "BUILD_DASHBOARD=$BUILD_DASHBOARD GREP_TAGS=$GREP_TAGS TEST_USERNAME=$TEST_USERNAME TEST_BASE_URL=https://127.0.0.1/dashboard yarn cy:run:sorry", 
     "coverage": "npx nyc merge coverage coverage/coverage.json",
     "storybook": "cd storybook && yarn storybook",
     "build-storybook": "cd storybook && yarn install --no-lockfile && NODE_OPTIONS=--max_old_space_size=4096 yarn build-storybook --quiet",

From 194a42efd27d8a003d947e0762f21a9ed54c8e69 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 27 Feb 2025 10:01:47 +0000
Subject: [PATCH 102/140] Split `Can select login landing page` into individual
 tests to improve reliability - there's some flakeyness in the test - running
 it locally though crashes cypress browser session - split into three to
 improve tests, which now pass locally

---
 cypress/e2e/po/side-bars/user-menu.po.ts      |  7 +-
 .../tests/pages/user-menu/preferences.spec.ts | 88 ++++++++++---------
 2 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/cypress/e2e/po/side-bars/user-menu.po.ts b/cypress/e2e/po/side-bars/user-menu.po.ts
index 30f4deb28e1..2f7fbf0ae46 100644
--- a/cypress/e2e/po/side-bars/user-menu.po.ts
+++ b/cypress/e2e/po/side-bars/user-menu.po.ts
@@ -92,6 +92,11 @@ export default class UserMenuPo extends ComponentPo {
    * @returns
    */
   clickMenuItem(label: 'Preferences' | 'Account & API Keys' | 'Log Out') {
-    return this.getMenuItem(label).click();
+    this.getMenuItem(label).click();
+
+    if (label === 'Log Out') {
+      // This ensures that if cy.login runs again it doesn't use the stale session
+      Cypress.session.clearAllSavedSessions();
+    }
   }
 }
diff --git a/cypress/e2e/tests/pages/user-menu/preferences.spec.ts b/cypress/e2e/tests/pages/user-menu/preferences.spec.ts
index d01c3806c58..91e42c896a7 100644
--- a/cypress/e2e/tests/pages/user-menu/preferences.spec.ts
+++ b/cypress/e2e/tests/pages/user-menu/preferences.spec.ts
@@ -423,7 +423,8 @@ describe('User can update their preferences', () => {
   });
 
   // You want this to be last, there's some issues with logging in and logging out without sessions
-  it('Can select login landing page', { tags: ['@userMenu', '@adminUser'] }, () => {
+
+  function testLandingPageOption(key: { index: string, value: string, page: string}) {
     /*
     Select each radio button and verify its highlighted
     Validate http request's payload & response contain correct values per selection
@@ -431,54 +432,55 @@ describe('User can update their preferences', () => {
     Verify selection is preserved after logout/login
     */
 
-    const landingPageOptions = [
-      {
-        index: '0', value: '"home"', page: '/home'
-      },
-      {
-        index: '1', value: '"last-visited"', page: '/prefs'
-      },
-      { // This option only works when there is an existing local cluster
-        index: '2', value: '{\"name\":\"c-cluster\",\"params\":{\"cluster\":\"local\"}}', page: '/explore'
-      },
-    ];
-
-    landingPageOptions.forEach((key) => {
-      prefPage.goTo();
-      prefPage.landingPageRadioBtn().checkVisible();
-      cy.intercept('PUT', 'v1/userpreferences/*').as(`prefUpdate${ key.value }`);
-      prefPage.landingPageRadioBtn().set(parseInt(key.index));
-      cy.wait(`@prefUpdate${ key.value }`).then(({ request, response }) => {
-        expect(response?.statusCode).to.eq(200);
-        expect(request.body.data).to.have.property('after-login-route', key.value);
-        expect(response?.body.data).to.have.property('after-login-route', key.value);
-      });
-      prefPage.landingPageRadioBtn().isChecked(parseInt(key.index));
+    prefPage.goTo();
+    prefPage.landingPageRadioBtn().checkVisible();
+    cy.intercept('PUT', 'v1/userpreferences/*').as(`prefUpdate${ key.value }`);
+    prefPage.landingPageRadioBtn().set(parseInt(key.index));
+    cy.wait(`@prefUpdate${ key.value }`).then(({ request, response }) => {
+      expect(response?.statusCode).to.eq(200);
+      expect(request.body.data).to.have.property('after-login-route', key.value);
+      expect(response?.body.data).to.have.property('after-login-route', key.value);
+    });
+    prefPage.landingPageRadioBtn().isChecked(parseInt(key.index));
+
+    // Verify that an auth redirect works (a user visits a page while not authorized and will be redirect to that page after loggin in, only active when "Take me to the area I last visited" is selected)
+    if (key.index === '1') {
+      userMenu.clickMenuItem('Log Out');
+      cy.url().should('contain', 'auth/login?logged-out');
 
-      // Verify that an auth redirect works (a user visits a page while not authorized and will be redirect to that page after loggin in, only active when "Take me to the area I last visited" is selected)
-      if (key.index === '1') {
-        userMenu.clickMenuItem('Log Out');
-        cy.url().should('contain', 'auth/login?logged-out');
+      const redirectUrl = '/c/local/explorer/node';
 
-        const redirectUrl = '/c/local/explorer/node';
+      cy.visit(redirectUrl);
+      cy.url().should('contain', 'auth/login?timed-out');
 
-        cy.visit(redirectUrl);
-        cy.url().should('contain', 'auth/login?timed-out');
+      cy.login(undefined, undefined, false, true);
+      cy.url().should('contain', redirectUrl);
+      prefPage.goTo();
+      prefPage.landingPageRadioBtn().checkVisible();
+    }
 
-        cy.login(undefined, undefined, false, true);
-        cy.url().should('contain', redirectUrl);
-        prefPage.goTo();
-        prefPage.landingPageRadioBtn().checkVisible();
-      }
+    // Verify the option functions after a login
+    userMenu.clickMenuItem('Log Out');
+    cy.url().should('contain', 'auth/login?logged-out');
+    cy.login(undefined, undefined, false);
+    cy.url().should('contain', key.page);
+  }
 
-      // Verify the option functions after a login
-      userMenu.clickMenuItem('Log Out');
-      cy.url().should('contain', 'auth/login?logged-out');
-      cy.login(undefined, undefined, false);
-      cy.url().should('contain', key.page);
+  it('Can select login landing page - home page', { tags: ['@userMenu', '@adminUser'] }, () => {
+    testLandingPageOption({
+      index: '0', value: '"home"', page: '/home'
+    });
+  });
+
+  it('Can select login landing page - last visited', { tags: ['@userMenu', '@adminUser'] }, () => {
+    testLandingPageOption( {
+      index: '1', value: '"last-visited"', page: '/prefs'
     });
+  });
 
-    prefPage.goTo();
-    prefPage.landingPageRadioBtn().checkVisible();
+  it('Can select login landing page - specific cluster', { tags: ['@userMenu', '@adminUser'] }, () => {
+    testLandingPageOption({ // This option only works when there is an existing local cluster
+      index: '2', value: '{\"name\":\"c-cluster\",\"params\":{\"cluster\":\"local\"}}', page: '/explore'
+    });
   });
 });

From 18788f4192fe01ff7b2d468faab282fc66329563 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 27 Feb 2025 11:47:52 +0000
Subject: [PATCH 103/140] Update settings given SSP isn't on by default - bring
 back 'liable to change' notice and add 'not in prod' - move location down
 below long term settings

---
 shell/assets/translations/en-us.yaml          |  4 +-
 .../pages/c/_cluster/settings/performance.vue | 68 ++++++++++---------
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index a29642e7bf5..d204e2691c2 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -7664,8 +7664,7 @@ featureFlags:
 performance:
   label: UI Performance Settings
   settingName: Performance
-  experimental: This setting is experimental and may be removed or updated in future versions.
-  deprecatedForSSP: The <i class="mr-5">"{setting}"</i> setting is now deprecated and will be removed in a future release. Please use the <a href="#ssp-setting" class="ml-5 mr-5">Server-side Pagination</a> setting instead.
+  deprecatedForSSP: The <i class="mr-5">"{setting}"</i> setting is now deprecated and will be removed in a future release.
   incrementalLoad:
     label: Incremental Loading
     setting: You can configure the threshold above which incremental loading will be used.
@@ -7735,6 +7734,7 @@ performance:
     resources:
       generic: most resources in the cluster's 'More Resources' section
       all: All Resources
+    experimental: This setting is experimental and may be removed or updated in future versions. We do not recommend enabling this setting in production environments.
 banner:
   label: Fixed Banners
   settingName: Banners
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index 6f1cf70d205..0387da00f00 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -209,38 +209,6 @@ export default {
     </h1>
     <div>
       <div class="ui-perf-setting">
-        <!-- Server Side Pagination -->
-        <div class="mt-20">
-          <h2 id="ssp-setting">
-            {{ t('performance.serverPagination.label') }}
-          </h2>
-          <p>{{ t('performance.serverPagination.description') }}</p>
-          <Banner
-            v-if="!steveCacheEnabled"
-            v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)"
-            color="warning"
-          />
-          <Checkbox
-            v-model:value="value.serverPagination.enabled"
-            :mode="mode"
-            :label="t('performance.serverPagination.checkboxLabel')"
-            class="mt-10 mb-10"
-            :primary="true"
-            :disabled="!steveCacheEnabled"
-            @update:value="compatibleWarning('serverPagination', $event)"
-          />
-          <Collapse
-            :title="t('performance.serverPagination.applicable')"
-            :open="steveCacheAndSSPEnabled && ssPApplicableTypesOpen"
-            :isDisabled="!steveCacheAndSSPEnabled"
-            @update:open="ssPApplicableTypesOpen = !ssPApplicableTypesOpen"
-          >
-            <p
-              v-clean-html="sspApplicableResources"
-              :class="{ 'text-muted': !value.serverPagination.enabled }"
-            />
-          </Collapse>
-        </div>
         <!-- Inactivity -->
         <div class="mt-20">
           <h2>{{ t('performance.inactivity.title') }}</h2>
@@ -282,6 +250,42 @@ export default {
             :primary="true"
           />
         </div>
+        <!-- Server Side Pagination -->
+        <div class="mt-20">
+          <h2 id="ssp-setting">
+            {{ t('performance.serverPagination.label') }}
+          </h2>
+          <p>{{ t('performance.serverPagination.description') }}</p>
+          <Banner
+            v-if="!steveCacheEnabled"
+            v-clean-html="t(`performance.serverPagination.featureFlag`, { ffUrl }, true)"
+            color="warning"
+          />
+          <Banner
+            color="error"
+            label-key="performance.serverPagination.experimental"
+          />
+          <Checkbox
+            v-model:value="value.serverPagination.enabled"
+            :mode="mode"
+            :label="t('performance.serverPagination.checkboxLabel')"
+            class="mt-10 mb-10"
+            :primary="true"
+            :disabled="!steveCacheEnabled"
+            @update:value="compatibleWarning('serverPagination', $event)"
+          />
+          <Collapse
+            :title="t('performance.serverPagination.applicable')"
+            :open="steveCacheAndSSPEnabled && ssPApplicableTypesOpen"
+            :isDisabled="!steveCacheAndSSPEnabled"
+            @update:open="ssPApplicableTypesOpen = !ssPApplicableTypesOpen"
+          >
+            <p
+              v-clean-html="sspApplicableResources"
+              :class="{ 'text-muted': !value.serverPagination.enabled }"
+            />
+          </Collapse>
+        </div>
         <!-- Incremental Loading -->
         <div class="mt-20">
           <h2>{{ t('performance.incrementalLoad.label') }}</h2>

From 805251727b25704c545127780cd241a7cdc78237 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 27 Feb 2025 17:22:53 +0100
Subject: [PATCH 104/140] Fleet: hide advanced info bannerin view mode and vue3
 errors fix

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/fleet/FleetRepos.vue         |  2 +-
 .../__tests__/fleet.cattle.io.gitrepo.test.ts | 97 +++++++++++--------
 shell/edit/fleet.cattle.io.gitrepo.vue        |  2 +
 3 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/shell/components/fleet/FleetRepos.vue b/shell/components/fleet/FleetRepos.vue
index 8ab7dd209df..4ce9a8d1273 100644
--- a/shell/components/fleet/FleetRepos.vue
+++ b/shell/components/fleet/FleetRepos.vue
@@ -120,7 +120,7 @@ export default {
       <template #cell:repo="{ row }">
         <Link
           :row="row"
-          :value="row.spec.repo"
+          :value="row.spec.repo || ''"
           label-key="repoDisplay"
           before-icon-key="repoIcon"
           url-key="spec.repo"
diff --git a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
index 3d30c7f360a..748dbb71d3c 100644
--- a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
+++ b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
@@ -1,7 +1,44 @@
 import { mount } from '@vue/test-utils';
-import { _CREATE, _EDIT } from '@shell/config/query-params';
+import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 import GitRepo from '@shell/edit/fleet.cattle.io.gitrepo.vue';
 
+const mockStore = {
+  dispatch: jest.fn(),
+  getters:  {
+    'i18n/t':                  (text: string) => text,
+    'i18n/exists':             jest.fn(),
+    t:                         (text: string) => text,
+    currentStore:              () => 'current_store',
+    'current_store/schemaFor': jest.fn(),
+    'current_store/all':       jest.fn(),
+    workspace:                 jest.fn(),
+  }
+};
+const mocks = {
+  $store:      mockStore,
+  $fetchState: { pending: false },
+  $route:      {
+    query: { AS: '' },
+    name:  {
+      endsWith: () => {
+        return false;
+      }
+    }
+  },
+};
+const mockComputed = {
+  ...GitRepo.computed,
+  steps: () => [{
+    name:           'stepAdvanced',
+    title:          'title',
+    label:          'label',
+    subtext:        'subtext',
+    descriptionKey: 'description',
+    ready:          true,
+    weight:         1,
+  }],
+};
+
 const values = {
   metadata: { namespace: 'test' },
   spec:     {
@@ -11,52 +48,36 @@ const values = {
   targetInfo: { mode: 'all' },
 };
 
+describe('view: fleet.cattle.io.gitrepo, mode: view - should', () => {
+  it('hide advanced options banner', () => {
+    const wrapper = mount(GitRepo, {
+      props:    { value: values, mode: _VIEW },
+      computed: mockComputed,
+      global:   { mocks }
+    });
+
+    const advancedInfoBanner = wrapper.find('[data-testid="gitrepo-advanced-info"]');
+
+    expect(advancedInfoBanner.exists()).toBeFalsy();
+  });
+});
+
 describe.each([
   _CREATE,
-  _EDIT
+  _EDIT,
 ])('view: fleet.cattle.io.gitrepo, mode: %p - should', (mode) => {
-  const mockStore = {
-    dispatch: jest.fn(),
-    getters:  {
-      'i18n/t':                  (text: string) => text,
-      'i18n/exists':             jest.fn(),
-      t:                         (text: string) => text,
-      currentStore:              () => 'current_store',
-      'current_store/schemaFor': jest.fn(),
-      'current_store/all':       jest.fn(),
-      workspace:                 jest.fn(),
-    }
-  };
-  const mocks = {
-    $store:      mockStore,
-    $fetchState: { pending: false },
-    $route:      {
-      query: { AS: '' },
-      name:  {
-        endsWith: () => {
-          return false;
-        }
-      }
-    },
-  };
-  const mockComputed = {
-    ...GitRepo.computed,
-    steps: () => [{
-      name:           'stepAdvanced',
-      title:          'title',
-      label:          'label',
-      subtext:        'subtext',
-      descriptionKey: 'description',
-      ready:          true,
-      weight:         1,
-    }],
-  };
   const wrapper = mount(GitRepo, {
     props:    { value: values, mode },
     computed: mockComputed,
     global:   { mocks }
   });
 
+  it('show advanced options banner', () => {
+    const advancedInfoBanner = wrapper.find('[data-testid="gitrepo-advanced-info"]');
+
+    expect(advancedInfoBanner.exists()).toBeTruthy();
+  });
+
   it('have self-healing checkbox and tooltip', () => {
     const correctDriftCheckbox = wrapper.find('[data-testid="gitRepo-correctDrift-checkbox"]');
     const tooltip = wrapper.find('[data-testid="gitRepo-correctDrift-checkbox"]');
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 976863d0a71..b01deff197d 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -660,8 +660,10 @@ export default {
 
     <template #stepAdvanced>
       <Banner
+        v-if="!isView"
         color="info"
         label-key="fleet.gitRepo.add.steps.advanced.info"
+        data-testid="gitrepo-advanced-info"
       />
 
       <h2 v-t="'fleet.gitRepo.auth.title'" />

From 4289c9e3da845f5b552f3d52e4f19d15eaba05ce Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Thu, 27 Feb 2025 08:31:39 -0800
Subject: [PATCH 105/140] use global css class to hide elements

---
 shell/components/form/KeyValue.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/shell/components/form/KeyValue.vue b/shell/components/form/KeyValue.vue
index bab4c83b13c..468e1f67926 100644
--- a/shell/components/form/KeyValue.vue
+++ b/shell/components/form/KeyValue.vue
@@ -665,7 +665,7 @@ export default {
       >
         <div
           class="rowgroup"
-          :class="{'hidden': isProtected(row.key) && !toggleFilter}"
+          :class="{'hide': isProtected(row.key) && !toggleFilter}"
         >
           <div class="row">
             <!-- Key -->
@@ -918,10 +918,6 @@ export default {
     grid-column-start: 1;
     grid-column-end: span end;
     grid-template-columns: subgrid;
-
-    &.hidden {
-      display: none;
-    }
   }
 
   .row {

From c568af1dd3d5b6bb189578c8ebf57678a93c91c0 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 27 Feb 2025 17:26:59 +0100
Subject: [PATCH 106/140] [e2e] Fix users.spec.ts

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 cypress/e2e/tests/pages/users-and-auth/users.spec.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/tests/pages/users-and-auth/users.spec.ts b/cypress/e2e/tests/pages/users-and-auth/users.spec.ts
index e0a6d9263cb..4a5448bc878 100644
--- a/cypress/e2e/tests/pages/users-and-auth/users.spec.ts
+++ b/cypress/e2e/tests/pages/users-and-auth/users.spec.ts
@@ -126,11 +126,12 @@ describe('Users', { tags: ['@usersAndAuths', '@adminUser'] }, () => {
     it('can Deactivate and Activate user', () => {
       // Deactivate user and check state is Inactive
       usersPo.goTo();
-      usersPo.list().clickRowActionMenuItem(standardUsername, 'Disable');
+
+      usersPo.list().actionMenu(standardUsername).getMenuItem('Disable').click();
       usersPo.list().details(standardUsername, 1).find('i').should('have.class', 'icon-user-xmark');
 
       // Activate user and check state is Active
-      usersPo.list().clickRowActionMenuItem(standardUsername, 'Enable');
+      usersPo.list().actionMenu(standardUsername).getMenuItem('Enable').click();
       usersPo.list().details(standardUsername, 1).find('i').should('have.class', 'icon-user-check');
     });
 

From 844fd3fcca2cd47f3096fa5fd1ebfb2db0850307 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Fri, 28 Feb 2025 07:41:05 +0000
Subject: [PATCH 107/140] Disable editing and detail view for kev1 clusters.
 Add back in labels with unsupported info. (#13535)

---
 shell/assets/translations/en-us.yaml          |  4 +++-
 .../management.cattle.io.kontainerdriver.js   |  7 ++++++
 .../models/provisioning.cattle.io.cluster.js  | 24 +++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 38b8378e8bd..e22c073c8f7 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -1998,11 +1998,12 @@ cluster:
     aliyun:  Alibaba ACK
     amazonec2: Amazon EC2
     amazoneks: Amazon EKS
+    amazonelasticcontainerservice: Amazon EKS (Unsupported Kev1)
     aws: Amazon
     azure: Azure
     azureaks: Azure AKS
     aks: Azure AKS
-    azurekubernetesservice: Azure AKS
+    azurekubernetesservice: Azure AKS (Unsupported Kev1)
     baiducloudcontainerengine: Baidu CCE
     baidu: Baidu CCE
     cloudca: Cloud.ca
@@ -2016,6 +2017,7 @@ cluster:
     google: Google GCE
     googlegke: Google GKE
     gke: Google GKE
+    googlekubernetesengine: Google GKE (Unsupported Kev1)
     harvester: Harvester
     huaweicce: Huawei CCE
     import: Generic
diff --git a/shell/models/management.cattle.io.kontainerdriver.js b/shell/models/management.cattle.io.kontainerdriver.js
index f79dc4d1776..37b1962421a 100644
--- a/shell/models/management.cattle.io.kontainerdriver.js
+++ b/shell/models/management.cattle.io.kontainerdriver.js
@@ -29,6 +29,13 @@ export const KONTAINER_TO_DRIVER = {
   opentelekomcloudcontainerengine:  'otccce',
 };
 
+// Legacy KEV1 Hosted cluster drivers
+export const KEV1 = [
+  'amazonelasticcontainerservice',
+  'azurekubernetesservice',
+  'googlekubernetesengine',
+];
+
 // And the Import page has even shorter ones that don't match kontainer or create...
 export const DRIVER_TO_IMPORT = {
   googlegke: 'gke',
diff --git a/shell/models/provisioning.cattle.io.cluster.js b/shell/models/provisioning.cattle.io.cluster.js
index 8368a1611ef..09e021f0e2f 100644
--- a/shell/models/provisioning.cattle.io.cluster.js
+++ b/shell/models/provisioning.cattle.io.cluster.js
@@ -10,6 +10,7 @@ import { compare } from '@shell/utils/version';
 import { AS, MODE, _VIEW, _YAML } from '@shell/config/query-params';
 import { HARVESTER_NAME as HARVESTER } from '@shell/config/features';
 import { CAPI as CAPI_ANNOTATIONS, NODE_ARCHITECTURE } from '@shell/config/labels-annotations';
+import { KEV1 } from '@shell/models/management.cattle.io.kontainerdriver';
 
 /**
  * Class representing Cluster resource.
@@ -180,6 +181,15 @@ export default class ProvCluster extends SteveModel {
 
     const all = actions.concat(out);
 
+    // If the cluster is a KEV1 cluster then prevent edit
+    if (this.isKev1) {
+      const edit = all.find((action) => action.action === 'goToEdit');
+
+      if (edit) {
+        edit.enabled = false;
+      }
+    }
+
     // If we have a helper that wants to modify the available actions, let it do it
     if (this.customProvisionerHelper?.availableActions) {
       // Provider can either modify the provided list or return one of its own
@@ -189,6 +199,15 @@ export default class ProvCluster extends SteveModel {
     return all;
   }
 
+  get detailLocation() {
+    // Prevent going to detail page for a KEV1 cluster
+    if (this.isKev1) {
+      return undefined;
+    }
+
+    return super.detailLocation;
+  }
+
   get normanCluster() {
     const name = this.status?.clusterName;
 
@@ -289,6 +308,11 @@ export default class ProvCluster extends SteveModel {
     return this.mgmt?.isLocal;
   }
 
+  // Is the cluster a legacy (unsupported) KEV1 cluster?
+  get isKev1() {
+    return KEV1.includes(this.mgmt?.spec?.genericEngineConfig?.driverName);
+  }
+
   get isImported() {
     if (this.isLocal) {
       return false;

From 32796f1283bed04ff3ae72313b80c9268e7978d4 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 09:51:35 +0000
Subject: [PATCH 108/140] fix space scrolling page selecting radio inputs and
 color inputs (#13491)

* fix space scrolling page selecting radio inputs and color inputs + improve keyboard navigation in radio groups

* remove unused argument

* fix radio group value in user pref for landing page + fix e2e test on same area
---
 .../src/components/Form/Radio/RadioButton.vue | 20 +++++++--
 .../src/components/Form/Radio/RadioGroup.vue  | 43 ++++++++++++++++---
 shell/components/LandingPagePreference.vue    |  3 +-
 shell/components/form/ColorInput.vue          |  1 +
 4 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/pkg/rancher-components/src/components/Form/Radio/RadioButton.vue b/pkg/rancher-components/src/components/Form/Radio/RadioButton.vue
index e7c67d2e2ff..21e1b3ae6d3 100644
--- a/pkg/rancher-components/src/components/Form/Radio/RadioButton.vue
+++ b/pkg/rancher-components/src/components/Form/Radio/RadioButton.vue
@@ -68,6 +68,14 @@ export default defineComponent({
     description: {
       type:    String,
       default: null
+    },
+
+    /**
+     * Prevent focus when using radio in the context of a Radio group
+     */
+    preventFocusOnRadioGroups: {
+      type:    Boolean,
+      default: false
     }
   },
 
@@ -111,7 +119,7 @@ export default defineComponent({
   watch: {
     value(neu) {
       this.isChecked = this.val === neu;
-      if (this.isChecked) {
+      if (this.isChecked && !this.preventFocusOnRadioGroups) {
         (this.$refs.custom as HTMLElement).focus();
       }
     }
@@ -136,7 +144,11 @@ export default defineComponent({
 
 <template>
   <label
-    :class="{'disabled': isDisabled, 'radio-container': true}"
+    :class="{
+      'disabled': isDisabled,
+      'radio-container': true,
+      'radio-button-checked': isChecked
+    }"
     @keydown.enter="clicked($event)"
     @keydown.space="clicked($event)"
     @click.stop="clicked($event)"
@@ -154,7 +166,7 @@ export default defineComponent({
     <span
       ref="custom"
       :class="[ isDisabled ? 'text-muted' : '', 'radio-custom']"
-      :tabindex="isDisabled ? -1 : 0"
+      :tabindex="isDisabled || preventFocusOnRadioGroups ? -1 : 0"
       :aria-label="label"
       :aria-checked="isChecked"
       role="radio"
@@ -220,9 +232,11 @@ $fontColor: var(--input-label);
   display: inline-flex;
   align-items: flex-start;
   margin: 0;
+  left: -4px;
   user-select: none;
   border-radius: var(--border-radius);
   padding-bottom: 5px;
+  padding-left: 4px;
 
   &,
   .radio-label,
diff --git a/pkg/rancher-components/src/components/Form/Radio/RadioGroup.vue b/pkg/rancher-components/src/components/Form/Radio/RadioGroup.vue
index 3220d58d78c..52804337ea5 100644
--- a/pkg/rancher-components/src/components/Form/Radio/RadioGroup.vue
+++ b/pkg/rancher-components/src/components/Form/Radio/RadioGroup.vue
@@ -105,6 +105,10 @@ export default defineComponent({
 
   emits: ['update:value'],
 
+  data() {
+    return { currFocusedElem: undefined as undefined | EventTarget | null };
+  },
+
   computed: {
     /**
      * Creates a collection of Options from the provided props.
@@ -151,12 +155,33 @@ export default defineComponent({
     }
   },
 
+  beforeUnmount() {
+    const radioGroup = this.$refs?.radioGroup as HTMLInputElement;
+
+    radioGroup.removeEventListener('focusin', this.focusChanged);
+  },
+
+  mounted() {
+    const radioGroup = this.$refs?.radioGroup as HTMLInputElement;
+
+    radioGroup.addEventListener('focusin', this.focusChanged);
+  },
+
   methods: {
+    focusChanged(ev: Event) {
+      this.currFocusedElem = ev.target;
+    },
     /**
      * Keyboard left/right event listener to select next/previous option. Emits
      * the input event.
      */
     clickNext(direction: number): void {
+      // moving focus away from a custom group element and pressing arrow keys
+      // should not have any effect on the group - custom UI for radiogroup option(s)
+      if (this.currFocusedElem !== this.$refs?.radioGroup) {
+        return;
+      }
+
       const opts = this.normalizedOptions;
       const selected = opts.find((x) => x.value === this.value);
       let newIndex = (selected ? opts.indexOf(selected) : -1) + direction;
@@ -205,12 +230,15 @@ export default defineComponent({
 
     <!-- Group -->
     <div
+      ref="radioGroup"
       role="radiogroup"
       :aria-label="radioGroupLabel"
       class="radio-group"
       :class="{'row':row}"
-      @keyup.down.stop="clickNext(1)"
-      @keyup.up.stop="clickNext(-1)"
+      tabindex="0"
+      @keydown.down.prevent.stop="clickNext(1)"
+      @keydown.up.prevent.stop="clickNext(-1)"
+      @keydown.space.enter.stop.prevent
     >
       <div
         v-for="(option, i) in normalizedOptions"
@@ -231,6 +259,7 @@ export default defineComponent({
             :val="option.value"
             :disabled="isDisabled"
             :mode="mode"
+            :prevent-focus-on-radio-groups="true"
             @update:value="$emit('update:value', $event)"
           />
         </slot>
@@ -241,9 +270,13 @@ export default defineComponent({
 
 <style lang='scss'>
 .radio-group {
-  &:focus {
-    border:none;
-    outline:none;
+  &:focus, &:focus-visible {
+    border: none;
+    outline: none;
+  }
+
+  &:focus-visible .radio-button-checked {
+    @include focus-outline;
   }
 
   h3 {
diff --git a/shell/components/LandingPagePreference.vue b/shell/components/LandingPagePreference.vue
index b19c7683d14..0dc1bde3157 100644
--- a/shell/components/LandingPagePreference.vue
+++ b/shell/components/LandingPagePreference.vue
@@ -120,7 +120,8 @@ export default {
             :val="false"
             :value="afterLoginRoute=== 'home' || afterLoginRoute === 'last-visited'"
             :v-bind="$attrs"
-            @update:value="afterLoginRoute = routeFromDropdown.value"
+            :prevent-focus-on-radio-groups="true"
+            @update:value="updateLoginRoute(null)"
           />
           <Select
             v-model:value="routeFromDropdown"
diff --git a/shell/components/form/ColorInput.vue b/shell/components/form/ColorInput.vue
index ea2dad2bb22..f8ecad67495 100644
--- a/shell/components/form/ColorInput.vue
+++ b/shell/components/form/ColorInput.vue
@@ -97,6 +97,7 @@ export default {
     :class="{[mode]:mode, disabled: isDisabled}"
     :data-testid="componentTestid + '-color-input'"
     :tabindex="isDisabled ? -1 : 0"
+    @keydown.space.prevent
     @keyup.enter.space.stop="handleKeyup($event)"
   >
     <label class="text-label"><t

From 8e2071d82e499a57a49ba0b544a72e64b941ba4c Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 09:53:24 +0000
Subject: [PATCH 109/140] fix misc issues with codemirror and a11y (#13530)

---
 shell/components/CodeMirror.vue                     | 13 +++++++++----
 shell/components/ResourceYaml.vue                   |  1 +
 shell/components/YamlEditor.vue                     |  6 ++++++
 .../form/SSHKnownHosts/KnownHostsEditDialog.vue     |  7 ++++---
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/shell/components/CodeMirror.vue b/shell/components/CodeMirror.vue
index e9c8f00e576..cf305ca2aad 100644
--- a/shell/components/CodeMirror.vue
+++ b/shell/components/CodeMirror.vue
@@ -239,6 +239,7 @@ export default {
 <template>
   <div
     ref="codeMirrorContainer"
+    :inert="isDisabled ? true : false"
     :tabindex="codeMirrorContainerTabIndex"
     class="code-mirror code-mirror-container"
     :class="{['as-text-area']: asTextArea}"
@@ -291,10 +292,6 @@ export default {
 <style lang="scss">
   $code-mirror-animation-time: 0.1s;
 
-  .escape-text {
-    font-size: 12px;
-  }
-
   .code-mirror {
     &.code-mirror-container:focus-visible {
       @include focus-outline;
@@ -395,6 +392,14 @@ export default {
 
   .code-mirror {
     position: relative;
+    margin-bottom: 20px;
+
+    .escape-text {
+      font-size: 12px;
+      position: absolute;
+      bottom: -20px;
+      left: 0;
+    }
 
     .codemirror-container {
       z-index: 0;
diff --git a/shell/components/ResourceYaml.vue b/shell/components/ResourceYaml.vue
index b3ab30ae25e..f8b2ac44b21 100644
--- a/shell/components/ResourceYaml.vue
+++ b/shell/components/ResourceYaml.vue
@@ -298,6 +298,7 @@ export default {
     <YamlEditor
       ref="yamleditor"
       v-model:value="currentYaml"
+      :mode="mode"
       :initial-yaml-values="initialYaml"
       class="yaml-editor flex-content"
       :editor-mode="editorMode"
diff --git a/shell/components/YamlEditor.vue b/shell/components/YamlEditor.vue
index 6af32e546da..94556f64667 100644
--- a/shell/components/YamlEditor.vue
+++ b/shell/components/YamlEditor.vue
@@ -28,6 +28,11 @@ export default {
       }
     },
 
+    mode: {
+      type:    String,
+      default: '',
+    },
+
     asObject: {
       type:    Boolean,
       default: false,
@@ -238,6 +243,7 @@ export default {
       :options="codeMirrorOptions"
       :showKeyMapBox="true"
       :data-testid="componentTestid + '-code-mirror'"
+      :mode="mode"
       @onInput="onInput"
       @onReady="onReady"
       @onChanges="onChanges"
diff --git a/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue b/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue
index b9c17c05d88..c90880e3e70 100644
--- a/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue
+++ b/shell/components/form/SSHKnownHosts/KnownHostsEditDialog.vue
@@ -94,7 +94,6 @@ export default {
       <div class="custom mt-10">
         <div class="dialog-panel">
           <CodeMirror
-            class="code-mirror"
             :value="text"
             data-testid="ssh-known-hosts-dialog_code-mirror"
             :options="codeMirrorOptions"
@@ -146,13 +145,15 @@ export default {
       display: flex;
       flex-direction: column;
       min-height: 100px;
-      border: 1px solid var(--border);
 
       :deep() .code-mirror {
         display: flex;
         flex-direction: column;
         resize: none;
-        max-height: 400px;
+
+        .codemirror-container {
+          border: 1px solid var(--border);
+        }
 
         .CodeMirror,
         .CodeMirror-gutters {

From 43c227c24dc760f610ce7460f62ea68118e8a234 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 09:53:47 +0000
Subject: [PATCH 110/140] fix error with option selected having index -1 and
 not being handled properly (#13533)

---
 shell/mixins/vue-select-overrides.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/shell/mixins/vue-select-overrides.js b/shell/mixins/vue-select-overrides.js
index a4721a6ceba..1bd7a7fc876 100644
--- a/shell/mixins/vue-select-overrides.js
+++ b/shell/mixins/vue-select-overrides.js
@@ -36,6 +36,13 @@ export default {
           return;
         }
 
+        // if the index of the option is -1
+        // it means are pressing enter on an invalid option
+        // we should exit
+        if (vm.typeAheadPointer === -1) {
+          return;
+        }
+
         let option = vm.filteredOptions[vm.typeAheadPointer];
 
         vm.$emit('option:selecting', option);

From 138e981dff4fd28de1b35614c92b087921568caa Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:05:37 +0000
Subject: [PATCH 111/140] test wf

---
 .github/workflows/check-plugins.yaml        |  38 ---
 .github/workflows/docusaurus.yaml           |  54 ----
 .github/workflows/storybook.yaml            |  27 --
 .github/workflows/test-wf.yml               |  43 +++
 .github/workflows/test.yaml                 | 319 --------------------
 .github/workflows/valid-pr-description.yaml |  20 --
 6 files changed, 43 insertions(+), 458 deletions(-)
 delete mode 100644 .github/workflows/check-plugins.yaml
 delete mode 100644 .github/workflows/docusaurus.yaml
 delete mode 100644 .github/workflows/storybook.yaml
 create mode 100644 .github/workflows/test-wf.yml
 delete mode 100644 .github/workflows/test.yaml
 delete mode 100644 .github/workflows/valid-pr-description.yaml

diff --git a/.github/workflows/check-plugins.yaml b/.github/workflows/check-plugins.yaml
deleted file mode 100644
index de3f416eff1..00000000000
--- a/.github/workflows/check-plugins.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: check-plugins-build
-on:
-  pull_request:
-    branches:
-      - master
-env:
-  TEST_PERSIST_BUILD: true
-jobs:
-  validate:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Enable Corepack
-        run: corepack enable
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'yarn'
-
-      - name: Validate Plugin build system
-        run: ./shell/scripts/test-plugins-build.sh
-        shell: bash
-
-      - name: Upload files
-        uses: actions/upload-artifact@v4
-        if: failure()
-        with:
-          name: test
-          path: |
-            /tmp/tmp.**/test-app
-            !/tmp/tmp.**/test-app/dist/js/*.map
-            !/tmp/tmp.**/test-app/node_modules/
-            !/tmp/tmp.**/test-app/pkg/test-pkg/node_modules/
-          retention-days: 2
diff --git a/.github/workflows/docusaurus.yaml b/.github/workflows/docusaurus.yaml
deleted file mode 100644
index 8992a5d71dc..00000000000
--- a/.github/workflows/docusaurus.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-name: Publish Docusaurus
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-          cache: yarn
-
-      - name: Install dependencies
-        run: cd docusaurus/ && yarn install:ci
-      - name: Build website
-        run: cd docusaurus/ && yarn build
-      - name: Add CNAME
-        run: |
-          echo "extensions.rancher.io" > ./docusaurus/build/CNAME
-
-      - name: Upload artifact
-        if: ${{ github.event_name == 'push' && github.repository_owner == 'rancher' }}
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: ./docusaurus/build
-          retention-days: 10
-          compression-level: 9
-
-  # Seperate the deploy job to isolate write permissions
-  deploy:
-    name: Publish
-    if: ${{ github.event_name == 'push' && github.repository_owner == 'rancher' }}
-    runs-on: ubuntu-latest
-    needs: build
-
-    # This is required to avoid https://github.com/actions/deploy-pages/issues/271
-    environment:
-      name: github-pages
-
-    permissions:
-      pages: write
-      id-token: write
-
-    steps:
-      - name: Deploy to GitHub Pages
-        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/storybook.yaml b/.github/workflows/storybook.yaml
deleted file mode 100644
index 8c73d3364fd..00000000000
--- a/.github/workflows/storybook.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: storybook
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-jobs:
-  storybook:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Use Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version-file: '.nvmrc'
-    - name: Install packages
-      run: yarn install
-    - name: Build Storybook
-      run: |
-        yarn build-storybook
-    - name: Publish Storybook
-      if: ${{ github.event_name == 'push' && github.repository_owner == 'rancher'}}
-      env:
-        STORYBOOK_TOKEN: ${{ secrets.STORYBOOK_TOKEN }}
-      run: .github/workflows/scripts/publish-storybook
diff --git a/.github/workflows/test-wf.yml b/.github/workflows/test-wf.yml
new file mode 100644
index 00000000000..d003b8e69b0
--- /dev/null
+++ b/.github/workflows/test-wf.yml
@@ -0,0 +1,43 @@
+name: Test Extension workflows - Master (3.x) - TEST!!!
+
+on:
+  pull_request:
+    branches:
+      - master
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./
+
+jobs:
+  test-extensions-creators-and-update-paths:
+    if: ${{ github.repository_owner == 'rancher' }}
+    runs-on: ubuntu-latest
+    outputs:
+      test-extensions-creators-and-update-paths-job-status: ${{ job.status }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Retrieve Shell and Creators versions
+        run: .github/workflows/scripts/test-extensions-creators-build.sh
+        id: test-extensions-and-creators
+        shell: bash
+
+  branch-checks:
+    if: ${{ github.repository_owner == 'rancher' }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        branch: [master, release-2.9, release-2.8]
+    outputs:
+      status-${{ matrix.branch }}: ${{ job.status }}
+    steps:
+      - name: Checkout ${{ matrix.branch }}
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ matrix.branch }}
+
+      - name: Validate workflows
+        run: .github/workflows/scripts/check-creators-workflows-code.sh "${{ matrix.branch }}"
\ No newline at end of file
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
deleted file mode 100644
index 0814e62b80c..00000000000
--- a/.github/workflows/test.yaml
+++ /dev/null
@@ -1,319 +0,0 @@
-name: Tests
-on:
-  push:
-    branches:
-      - master
-      - 'release-*'
-  pull_request:
-    branches:
-      - master
-      - 'release-*'
-  workflow_dispatch:
-    inputs:
-      environment:
-        description: 'Environment to run tests against'
-        type: environment
-        required: true
-
-env:
-  TEST_USERNAME: admin
-  TEST_PASSWORD: password
-  CATTLE_BOOTSTRAP_PASSWORD: password
-  TEST_BASE_URL: https://127.0.0.1/dashboard
-  API: https://127.0.0.1
-  TEST_PROJECT_ID: rancher-dashboard
-  TEST_DISABLE_DASHBOARD: ${{ vars.TEST_DISABLE_DASHBOARD }} # This is required to get it from the project configuration
-  TEST_DISABLE_DASHBOARD_LABEL: "${{ contains(github.event.pull_request.labels.*.name, 'ci/skip-e2e-cypress-dashboard')}}"
-  CYPRESS_API_URL: http://139.59.134.103:1234/
-  TEST_RUN_ID: ${{github.run_number}}-${{github.run_attempt}}-${{github.event.pull_request.title || github.event.head_commit.message}}
-  # Build the dashboard to use in tests. When set to false it will grab `latest` from CDN (useful for running e2e tests quickly)
-  BUILD_DASHBOARD: true
-
-  E2E_BUILD_DIST_NAME: dist
-  E2E_BUILD_DIST_DIR: dist
-  E2E_BUILD_DIST_EMBER_NAME: dist_ember
-  E2E_BUILD_DIST_EMBER_DIR: dist_ember
-
-jobs:
-  e2e-ui-build:
-    if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      - name: Setup env
-        uses: ./.github/actions/setup
-      - name: Build e2e
-        run: yarn e2e:build
-      - name: Upload e2e build
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.E2E_BUILD_DIST_NAME }}
-          path: ${{ env.E2E_BUILD_DIST_DIR }}/
-          if-no-files-found: error
-          retention-days: 10
-          compression-level: 9
-      - name: Upload e2e build ember
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.E2E_BUILD_DIST_EMBER_NAME }}
-          path: ${{ env.E2E_BUILD_DIST_EMBER_DIR }}/
-          if-no-files-found: error
-          retention-days: 10
-          compression-level: 9
-
-
-  e2e-test:
-    if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')"
-    needs: e2e-ui-build
-    strategy:
-      fail-fast: false
-      matrix:
-        role: [
-          { username: 'admin', tag: '@adminUser' }, 
-          { username: 'standard_user', tag: '@standardUser' }
-        ]
-        features:  [
-          ['@navigation', '@extensions'],
-          ['@charts'],
-          ['@explorer'],
-          ['@explorer2'],
-          ['@virtualizationMgmt', '@fleet'],
-          ['@generic', '@globalSettings'],
-          ['@manager'],
-          ['@userMenu', '@usersAndAuths'],
-          ['@components'],
-          #TODO: #13317 Reenable vai ['@vai']
-        ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      - name: Setup env
-        uses: ./.github/actions/setup
-
-      # Installing fixed version of Chrome since latest version does not work (128 didn't work)
-      # Leaving this here again in case we need to pin to a specific Chrome version in the future
-      # - name: Install Chrome 127
-      #   run: |
-      #     sudo apt-get install -y wget libu2f-udev
-      #     cd /tmp
-      #     wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb
-      #     sudo dpkg -i google-chrome-stable_127.0.6533.72-1_amd64.deb
-      #     sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb
-      #     google-chrome --version
-
-      - name: Download e2e build
-        uses:  actions/download-artifact@v4
-        with:
-         name: ${{ env.E2E_BUILD_DIST_NAME }}
-         path: ${{ env.E2E_BUILD_DIST_DIR }}
-      - name: Download e2e build ember
-        uses:  actions/download-artifact@v4
-        with:
-         name: ${{ env.E2E_BUILD_DIST_EMBER_NAME }}
-         path: ${{ env.E2E_BUILD_DIST_EMBER_DIR }}
-      
-      - name: Run Rancher
-        run: yarn e2e:docker
-      
-      - name: Setup Rancher and user
-        run: |
-          yarn e2e:prod
-        env: 
-          GREP_TAGS: ${{ matrix.role.tag }}Setup+${{ matrix.features[0] }} --@jenkins ${{ matrix.role.tag }}Setup+${{ matrix.features[1] || matrix.features[0] }} --@jenkins
-          TEST_USERNAME: admin
-          TEST_ONLY: setup
-      - name: Run user tests
-        run: |
-          yarn e2e:prod
-          [ "$BUILD_DASHBOARD" != "false" ] || exit 0
-        env: 
-          TEST_SKIP: setup
-          GREP_TAGS: ${{ matrix.role.tag }}+${{ matrix.features[0] }} --@jenkins ${{ matrix.role.tag }}+${{ matrix.features[1] || matrix.features[0] }} --@jenkins
-          TEST_USERNAME: ${{ matrix.role.username }}
-          
-      - name: Upload screenshots
-        uses: actions/upload-artifact@v4
-        if: ${{ failure() }}
-        with:
-          name: ${{github.run_number}}-${{github.run_attempt}}-screenshots-${{ matrix.role.tag }}+${{ matrix.features[0] }}
-          path: cypress/screenshots
-
-  a11y-test:
-    if: "!contains( github.event.pull_request.labels.*.name, 'ci/skip-e2e')"
-    needs: e2e-ui-build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      - name: Setup env
-        uses: ./.github/actions/setup
-
-      # Installing fixed version of Chrome since latest version does not work (128 didn't work)
-      # Leaving this here again in case we need to pin to a specific Chrome version in the future
-      - name: Install Chrome 127
-        run: |
-          sudo apt-get install -y wget libu2f-udev
-          cd /tmp
-          wget -q http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_127.0.6533.72-1_amd64.deb
-          sudo dpkg -i google-chrome-stable_127.0.6533.72-1_amd64.deb
-          sudo apt-get install -y --allow-downgrades ./google-chrome-stable_127.0.6533.72-1_amd64.deb
-          google-chrome --version
-
-      - name: Download e2e build
-        uses:  actions/download-artifact@v4
-        with:
-          name: ${{ env.E2E_BUILD_DIST_NAME }}
-          path: ${{ env.E2E_BUILD_DIST_DIR }}
-      - name: Download e2e build ember
-        uses:  actions/download-artifact@v4
-        with:
-          name: ${{ env.E2E_BUILD_DIST_EMBER_NAME }}
-          path: ${{ env.E2E_BUILD_DIST_EMBER_DIR }}
-      
-      - name: Run Rancher
-        run: yarn e2e:docker
-      
-      - name: Setup Rancher and user
-        run: |
-          yarn e2e:prod
-        env: 
-          GREP_TAGS: "@adminUserSetup+@accessibility --@jenkins"
-          TEST_USERNAME: admin
-          TEST_ONLY: setup
-      - name: Run user tests
-        run: |
-          yarn e2e:prod
-          [ "$BUILD_DASHBOARD" != "false" ] || exit 0
-        env: 
-          TEST_SKIP: setup
-          GREP_TAGS: "@adminUser+@accessibility --@jenkins"
-          TEST_USERNAME: admin
-          TEST_A11Y: true
-
-      - name: Upload report
-        uses: actions/upload-artifact@v4
-        with:
-          name: accessibility-report
-          path: cypress/accessibility
-        
-  unit-test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      
-      - name: Run tests
-        uses: ./.github/actions/unit-tests
-
-      - name: Collect Coverage
-        run: |
-          mkdir -p coverage-artifacts/coverage
-          cp coverage/unit/coverage-final.json coverage-artifacts/coverage/coverage-unit.json
-          cp -r coverage/unit/ coverage-artifacts/coverage/unit/
-
-      - name: Upload coverage
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{github.run_number}}-${{github.run_attempt}}-coverage
-          path: coverage-artifacts/**/*
-
-
-  i18n:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Run i18n lint
-        uses: ./.github/actions/i18n-lint
-
-
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Run tests
-        uses: ./.github/actions/lint
-      
-
-  check-i18n:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-      
-      - name: Install packages
-        run: yarn install:ci
-      
-      - name: Run i18n string check
-        run: |
-          # Falure won't fail the job (remove -x when all current issues are fixed)
-          ./scripts/check-i18n -s -x
-
-  check-i18n-links:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-      
-      - name: Install packages
-        run: yarn install:ci
-      
-      - name: Run check of all http links in the i18n files (broken link check)
-        run: |
-          ./scripts/check-i18n-links
-
-  # coverage:
-  #   runs-on: ubuntu-latest
-  #   needs:
-  #     - unit-test
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         fetch-depth: 1
-
-  #     - uses: actions/setup-node@v4
-  #       with:
-  #         node-version-file: '.nvmrc'
-
-  #     - name: Download Coverage Artifacts
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: ${{github.run_number}}-${{github.run_attempt}}-coverage
-
-  #     - name: Install Codecov CLI
-  #       run : .github/workflows/scripts/install-codecov.sh
-
-  #     - name: Upload tests coverage report to Codecov
-  #       run: ./codecov --verbose upload-process -t ${{ secrets.CODECOV_TOKEN }} -n ${{github.run_number}}-${{github.run_attempt}}-coverage -F unit -f ./coverage/coverage-unit.json
-
-  check-e2e-tags:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-      - name: Check e2e tags
-        run: |
-          ./scripts/check-e2e-tests-for-tags
diff --git a/.github/workflows/valid-pr-description.yaml b/.github/workflows/valid-pr-description.yaml
deleted file mode 100644
index c69cf309673..00000000000
--- a/.github/workflows/valid-pr-description.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Validate Pull Request Description
-
-on:
-  pull_request:
-    types: [opened, edited, synchronize]
-
-jobs:
-  validate-description:
-    name: Validate Description
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Validate checklist has been completed
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_URL: ${{ github.event.pull_request.url }}
-        run: ./.github/workflows/scripts/pr-check-checklist.sh
\ No newline at end of file

From ad1ce3aa81cf8f6a40c04f200f4d4099664f8228 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:09:40 +0000
Subject: [PATCH 112/140] test wf

---
 .github/workflows/test-wf.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-wf.yml b/.github/workflows/test-wf.yml
index d003b8e69b0..734d6676e8e 100644
--- a/.github/workflows/test-wf.yml
+++ b/.github/workflows/test-wf.yml
@@ -32,7 +32,9 @@ jobs:
       matrix:
         branch: [master, release-2.9, release-2.8]
     outputs:
-      status-${{ matrix.branch }}: ${{ job.status }}
+      status-master: ${{ job.status }}
+      status-release-2.9: ${{ job.status }}
+      status-release-2.8: ${{ job.status }}
     steps:
       - name: Checkout ${{ matrix.branch }}
         uses: actions/checkout@v4

From 407c62080db0f86bf2cbe973e89ad61e465de327 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:12:06 +0000
Subject: [PATCH 113/140] test wf

---
 .github/workflows/test-wf.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-wf.yml b/.github/workflows/test-wf.yml
index 734d6676e8e..11a6f183b77 100644
--- a/.github/workflows/test-wf.yml
+++ b/.github/workflows/test-wf.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Retrieve Shell and Creators versions
-        run: .github/workflows/scripts/test-extensions-creators-build.sh
+        run: ./.github/workflows/scripts/test-extensions-creators-build.sh
         id: test-extensions-and-creators
         shell: bash
 
@@ -42,4 +42,4 @@ jobs:
           ref: ${{ matrix.branch }}
 
       - name: Validate workflows
-        run: .github/workflows/scripts/check-creators-workflows-code.sh "${{ matrix.branch }}"
\ No newline at end of file
+        run: ./.github/workflows/scripts/check-creators-workflows-code.sh "${{ matrix.branch }}"
\ No newline at end of file

From 419be22607f96161ba9f4c6ba4b230e8eb37e5fb Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:15:12 +0000
Subject: [PATCH 114/140] test wf

---
 .github/workflows/test-wf.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test-wf.yml b/.github/workflows/test-wf.yml
index 11a6f183b77..0d55b152cfa 100644
--- a/.github/workflows/test-wf.yml
+++ b/.github/workflows/test-wf.yml
@@ -11,19 +11,19 @@ defaults:
     working-directory: ./
 
 jobs:
-  test-extensions-creators-and-update-paths:
-    if: ${{ github.repository_owner == 'rancher' }}
-    runs-on: ubuntu-latest
-    outputs:
-      test-extensions-creators-and-update-paths-job-status: ${{ job.status }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+  # test-extensions-creators-and-update-paths:
+  #   if: ${{ github.repository_owner == 'rancher' }}
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     test-extensions-creators-and-update-paths-job-status: ${{ job.status }}
+  #   steps:
+  #     - name: Checkout code
+  #       uses: actions/checkout@v4
 
-      - name: Retrieve Shell and Creators versions
-        run: ./.github/workflows/scripts/test-extensions-creators-build.sh
-        id: test-extensions-and-creators
-        shell: bash
+  #     - name: Retrieve Shell and Creators versions
+  #       run: ./.github/workflows/scripts/test-extensions-creators-build.sh
+  #       id: test-extensions-and-creators
+  #       shell: bash
 
   branch-checks:
     if: ${{ github.repository_owner == 'rancher' }}
@@ -42,4 +42,4 @@ jobs:
           ref: ${{ matrix.branch }}
 
       - name: Validate workflows
-        run: ./.github/workflows/scripts/check-creators-workflows-code.sh "${{ matrix.branch }}"
\ No newline at end of file
+        run: .github/workflows/scripts/check-creators-workflows-code.sh "${{ matrix.branch }}"
\ No newline at end of file

From 2d905fddd8125c369bbf6a0909ead5b4ce0c58b2 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:20:08 +0000
Subject: [PATCH 115/140] test wf

---
 .github/workflows/test-wf.yml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-wf.yml b/.github/workflows/test-wf.yml
index 0d55b152cfa..5c9c16734a1 100644
--- a/.github/workflows/test-wf.yml
+++ b/.github/workflows/test-wf.yml
@@ -42,4 +42,22 @@ jobs:
           ref: ${{ matrix.branch }}
 
       - name: Validate workflows
-        run: .github/workflows/scripts/check-creators-workflows-code.sh "${{ matrix.branch }}"
\ No newline at end of file
+        shell: bash
+        run: source ./.github/workflows/scripts/check-creators-workflows-code.sh "${{ matrix.branch }}"
+  
+  matching-creators-workflows:
+    if: ${{ github.repository_owner == 'rancher' }}
+    runs-on: ubuntu-latest
+    needs: [branch-checks]
+    outputs:
+      matching-creators-workflows-job-status: ${{ steps.aggregate.outputs.result }}
+    steps:
+      - name: Aggregate results
+        id: aggregate
+        run: |
+          # Check all branch check outcomes
+          if [[ '${{ needs.branch-checks.result }}' == 'failure' ]]; then
+            echo "result=failure" >> $GITHUB_OUTPUT
+          else
+            echo "result=success" >> $GITHUB_OUTPUT
+          fi
\ No newline at end of file

From 0f06b06693d8596c8e5b5f20c4014561a9012298 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:22:15 +0000
Subject: [PATCH 116/140] test wf

---
 .github/workflows/scripts/check-creators-workflows-code.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 7b30e154ee2..d6fdfd0dfa7 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -eo pipefail
 
+echo "inside script!!!"
+
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 BASE_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
 CREATOR_WORKFLOWS_DIR="$BASE_DIR/creators/extension/app/files/.github/workflows"

From 86fc351b818f968e659092d74325cb3ec40f6eb8 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:24:26 +0000
Subject: [PATCH 117/140] test wf

---
 .github/workflows/test-wf.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/test-wf.yml b/.github/workflows/test-wf.yml
index 5c9c16734a1..f60bc7b2254 100644
--- a/.github/workflows/test-wf.yml
+++ b/.github/workflows/test-wf.yml
@@ -26,7 +26,6 @@ jobs:
   #       shell: bash
 
   branch-checks:
-    if: ${{ github.repository_owner == 'rancher' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -43,10 +42,9 @@ jobs:
 
       - name: Validate workflows
         shell: bash
-        run: source ./.github/workflows/scripts/check-creators-workflows-code.sh "${{ matrix.branch }}"
+        run: .github/workflows/scripts/check-creators-workflows-code.sh "${{ matrix.branch }}"
   
   matching-creators-workflows:
-    if: ${{ github.repository_owner == 'rancher' }}
     runs-on: ubuntu-latest
     needs: [branch-checks]
     outputs:

From 1d6275a485e42c9dd935007b21322fcb251facb7 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:27:01 +0000
Subject: [PATCH 118/140] test wf

---
 .github/workflows/scripts/check-creators-workflows-code.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index d6fdfd0dfa7..7ec4ac7a04c 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -4,7 +4,7 @@ set -eo pipefail
 echo "inside script!!!"
 
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-BASE_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+BASE_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)"
 CREATOR_WORKFLOWS_DIR="$BASE_DIR/creators/extension/app/files/.github/workflows"
 WORKFLOW_BRANCH="$1"
 

From 663b55caca24825fe2577bac0fe3bb14d1519b30 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:29:00 +0000
Subject: [PATCH 119/140] test wf

---
 .github/workflows/scripts/check-creators-workflows-code.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 7ec4ac7a04c..9482f94d492 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -4,7 +4,7 @@ set -eo pipefail
 echo "inside script!!!"
 
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-BASE_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+BASE_DIR="$(cd "$SCRIPT_DIR/../../../.." && pwd)"
 CREATOR_WORKFLOWS_DIR="$BASE_DIR/creators/extension/app/files/.github/workflows"
 WORKFLOW_BRANCH="$1"
 

From c91082918930d83fae91806ef82bd775a9ae4a94 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:30:56 +0000
Subject: [PATCH 120/140] test wf

---
 .../workflows/scripts/check-creators-workflows-code.sh    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 9482f94d492..0e65446b818 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
 set -eo pipefail
 
-echo "inside script!!!"
-
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-BASE_DIR="$(cd "$SCRIPT_DIR/../../../.." && pwd)"
+BASE_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
 CREATOR_WORKFLOWS_DIR="$BASE_DIR/creators/extension/app/files/.github/workflows"
 WORKFLOW_BRANCH="$1"
 
@@ -81,6 +79,10 @@ main() {
   charts_expected=$(generate_proper_charts)
   catalog_expected=$(generate_proper_catalog)
 
+  echo "SCRIPT_DIR: $SCRIPT_DIR"
+  echo "BASE_DIR: $BASE_DIR"
+  echo "CREATOR_WORKFLOWS_DIR: $CREATOR_WORKFLOWS_DIR"
+
   compare_files "$charts_expected" \
     "$CREATOR_WORKFLOWS_DIR/build-extension-charts.yml" \
     "build-extension-charts workflow"

From fcb8a59c81ab4fd7eb0ad4c33cb48dbeb401c6b7 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:32:13 +0000
Subject: [PATCH 121/140] test wf

---
 .../scripts/check-creators-workflows-code.sh     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 0e65446b818..562434acde7 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -76,20 +76,20 @@ compare_files() {
 }
 
 main() {
-  charts_expected=$(generate_proper_charts)
-  catalog_expected=$(generate_proper_catalog)
+  # charts_expected=$(generate_proper_charts)
+  # catalog_expected=$(generate_proper_catalog)
 
   echo "SCRIPT_DIR: $SCRIPT_DIR"
   echo "BASE_DIR: $BASE_DIR"
   echo "CREATOR_WORKFLOWS_DIR: $CREATOR_WORKFLOWS_DIR"
 
-  compare_files "$charts_expected" \
-    "$CREATOR_WORKFLOWS_DIR/build-extension-charts.yml" \
-    "build-extension-charts workflow"
+  # compare_files "$charts_expected" \
+  #   "$CREATOR_WORKFLOWS_DIR/build-extension-charts.yml" \
+  #   "build-extension-charts workflow"
 
-  compare_files "$catalog_expected" \
-    "$CREATOR_WORKFLOWS_DIR/build-extension-catalog.yml" \
-    "build-extension-catalog workflow"
+  # compare_files "$catalog_expected" \
+  #   "$CREATOR_WORKFLOWS_DIR/build-extension-catalog.yml" \
+  #   "build-extension-catalog workflow"
 
   echo "All workflows validated successfully for $WORKFLOW_BRANCH"
 }

From 4419b1a5839363c621273445ff915a76387595de Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:34:31 +0000
Subject: [PATCH 122/140] test wf

---
 .github/workflows/scripts/check-creators-workflows-code.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 562434acde7..ed3a04fc6aa 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-BASE_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
+BASE_DIR="$(cd "$SCRIPT_DIR/../.." && cd .. && pwd)"
 CREATOR_WORKFLOWS_DIR="$BASE_DIR/creators/extension/app/files/.github/workflows"
 WORKFLOW_BRANCH="$1"
 

From d96f4f4f4e8a0f5650a47f7ba48915e21d38a48d Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:35:22 +0000
Subject: [PATCH 123/140] test wf

---
 .github/workflows/test-wf.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-wf.yml b/.github/workflows/test-wf.yml
index f60bc7b2254..a44ace20c97 100644
--- a/.github/workflows/test-wf.yml
+++ b/.github/workflows/test-wf.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        branch: [master, release-2.9, release-2.8]
+        branch: [master]
     outputs:
       status-master: ${{ job.status }}
       status-release-2.9: ${{ job.status }}

From d7c56d12b722bb86191ffb76a7426c9a7e93e805 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:37:06 +0000
Subject: [PATCH 124/140] test wf

---
 .../scripts/check-creators-workflows-code.sh  | 136 +++++++++---------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index ed3a04fc6aa..0c536d8f16c 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -6,74 +6,74 @@ BASE_DIR="$(cd "$SCRIPT_DIR/../.." && cd .. && pwd)"
 CREATOR_WORKFLOWS_DIR="$BASE_DIR/creators/extension/app/files/.github/workflows"
 WORKFLOW_BRANCH="$1"
 
-generate_proper_charts() {
-  cat <<EOF
-name: Build and Release Extension Charts
-
-on:
-  workflow_dispatch:
-  release:  
-    types: [released]
-
-defaults:
-  run:
-    shell: bash
-    working-directory: ./
-
-jobs:
-  build-extension-charts:
-    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@$WORKFLOW_BRANCH
-    permissions:
-      actions: write
-      contents: write
-      deployments: write
-      pages: write
-    with:
-      target_branch: gh-pages
-      tagged_release: \${{ github.ref_name }}
-EOF
-}
-
-generate_proper_catalog() {
-  cat <<EOF
-name: Build and Release Extension Catalog
-
-on:
-  workflow_dispatch:
-  release:
-    types: [released]
-
-defaults:
-  run:
-    shell: bash
-    working-directory: ./
-
-jobs:
-  build-extension-catalog:
-    uses: rancher/dashboard/.github/workflows/build-extension-catalog.yml@$WORKFLOW_BRANCH
-    permissions:
-      actions: write
-      contents: read
-      packages: write
-    with:
-      registry_target: ghcr.io
-      registry_user: \${{ github.actor }}
-      tagged_release: \${{ github.ref_name }}
-    secrets: 
-      registry_token: \${{ secrets.GITHUB_TOKEN }}
-EOF
-}
-
-compare_files() {
-  local expected="$1"
-  local actual_file="$2"
-  local description="$3"
-
-  if ! diff <(echo "$expected") "$actual_file" >/dev/null; then
-    echo "::error::$description validation failed for branch $WORKFLOW_BRANCH"
-    exit 1
-  fi
-}
+# generate_proper_charts() {
+#   cat <<EOF
+# name: Build and Release Extension Charts
+
+# on:
+#   workflow_dispatch:
+#   release:  
+#     types: [released]
+
+# defaults:
+#   run:
+#     shell: bash
+#     working-directory: ./
+
+# jobs:
+#   build-extension-charts:
+#     uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@$WORKFLOW_BRANCH
+#     permissions:
+#       actions: write
+#       contents: write
+#       deployments: write
+#       pages: write
+#     with:
+#       target_branch: gh-pages
+#       tagged_release: \${{ github.ref_name }}
+# EOF
+# }
+
+# generate_proper_catalog() {
+#   cat <<EOF
+# name: Build and Release Extension Catalog
+
+# on:
+#   workflow_dispatch:
+#   release:
+#     types: [released]
+
+# defaults:
+#   run:
+#     shell: bash
+#     working-directory: ./
+
+# jobs:
+#   build-extension-catalog:
+#     uses: rancher/dashboard/.github/workflows/build-extension-catalog.yml@$WORKFLOW_BRANCH
+#     permissions:
+#       actions: write
+#       contents: read
+#       packages: write
+#     with:
+#       registry_target: ghcr.io
+#       registry_user: \${{ github.actor }}
+#       tagged_release: \${{ github.ref_name }}
+#     secrets: 
+#       registry_token: \${{ secrets.GITHUB_TOKEN }}
+# EOF
+# }
+
+# compare_files() {
+#   local expected="$1"
+#   local actual_file="$2"
+#   local description="$3"
+
+#   if ! diff <(echo "$expected") "$actual_file" >/dev/null; then
+#     echo "::error::$description validation failed for branch $WORKFLOW_BRANCH"
+#     exit 1
+#   fi
+# }
 
 main() {
   # charts_expected=$(generate_proper_charts)

From 6865d8860a32522e7492c56457e943e3b02d9913 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:39:43 +0000
Subject: [PATCH 125/140] test wf

---
 .../scripts/check-creators-workflows-code.sh  | 136 +++++++++---------
 .github/workflows/test-wf.yml                 |   3 +-
 2 files changed, 70 insertions(+), 69 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 0c536d8f16c..ed3a04fc6aa 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -6,74 +6,74 @@ BASE_DIR="$(cd "$SCRIPT_DIR/../.." && cd .. && pwd)"
 CREATOR_WORKFLOWS_DIR="$BASE_DIR/creators/extension/app/files/.github/workflows"
 WORKFLOW_BRANCH="$1"
 
-# generate_proper_charts() {
-#   cat <<EOF
-# name: Build and Release Extension Charts
-
-# on:
-#   workflow_dispatch:
-#   release:  
-#     types: [released]
-
-# defaults:
-#   run:
-#     shell: bash
-#     working-directory: ./
-
-# jobs:
-#   build-extension-charts:
-#     uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@$WORKFLOW_BRANCH
-#     permissions:
-#       actions: write
-#       contents: write
-#       deployments: write
-#       pages: write
-#     with:
-#       target_branch: gh-pages
-#       tagged_release: \${{ github.ref_name }}
-# EOF
-# }
-
-# generate_proper_catalog() {
-#   cat <<EOF
-# name: Build and Release Extension Catalog
-
-# on:
-#   workflow_dispatch:
-#   release:
-#     types: [released]
-
-# defaults:
-#   run:
-#     shell: bash
-#     working-directory: ./
-
-# jobs:
-#   build-extension-catalog:
-#     uses: rancher/dashboard/.github/workflows/build-extension-catalog.yml@$WORKFLOW_BRANCH
-#     permissions:
-#       actions: write
-#       contents: read
-#       packages: write
-#     with:
-#       registry_target: ghcr.io
-#       registry_user: \${{ github.actor }}
-#       tagged_release: \${{ github.ref_name }}
-#     secrets: 
-#       registry_token: \${{ secrets.GITHUB_TOKEN }}
-# EOF
-# }
-
-# compare_files() {
-#   local expected="$1"
-#   local actual_file="$2"
-#   local description="$3"
-
-#   if ! diff <(echo "$expected") "$actual_file" >/dev/null; then
-#     echo "::error::$description validation failed for branch $WORKFLOW_BRANCH"
-#     exit 1
-#   fi
-# }
+generate_proper_charts() {
+  cat <<EOF
+name: Build and Release Extension Charts
+
+on:
+  workflow_dispatch:
+  release:  
+    types: [released]
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./
+
+jobs:
+  build-extension-charts:
+    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@$WORKFLOW_BRANCH
+    permissions:
+      actions: write
+      contents: write
+      deployments: write
+      pages: write
+    with:
+      target_branch: gh-pages
+      tagged_release: \${{ github.ref_name }}
+EOF
+}
+
+generate_proper_catalog() {
+  cat <<EOF
+name: Build and Release Extension Catalog
+
+on:
+  workflow_dispatch:
+  release:
+    types: [released]
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./
+
+jobs:
+  build-extension-catalog:
+    uses: rancher/dashboard/.github/workflows/build-extension-catalog.yml@$WORKFLOW_BRANCH
+    permissions:
+      actions: write
+      contents: read
+      packages: write
+    with:
+      registry_target: ghcr.io
+      registry_user: \${{ github.actor }}
+      tagged_release: \${{ github.ref_name }}
+    secrets: 
+      registry_token: \${{ secrets.GITHUB_TOKEN }}
+EOF
+}
+
+compare_files() {
+  local expected="$1"
+  local actual_file="$2"
+  local description="$3"
+
+  if ! diff <(echo "$expected") "$actual_file" >/dev/null; then
+    echo "::error::$description validation failed for branch $WORKFLOW_BRANCH"
+    exit 1
+  fi
+}
 
 main() {
   # charts_expected=$(generate_proper_charts)
diff --git a/.github/workflows/test-wf.yml b/.github/workflows/test-wf.yml
index a44ace20c97..b4c9c9e55e2 100644
--- a/.github/workflows/test-wf.yml
+++ b/.github/workflows/test-wf.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        branch: [master]
+        branch: [fix-wf-master]
     outputs:
       status-master: ${{ job.status }}
       status-release-2.9: ${{ job.status }}
@@ -38,6 +38,7 @@ jobs:
       - name: Checkout ${{ matrix.branch }}
         uses: actions/checkout@v4
         with:
+          repository: aalves08/dashboard
           ref: ${{ matrix.branch }}
 
       - name: Validate workflows

From 85d458062e355e531d16501d974a08c722ad6fbb Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:42:50 +0000
Subject: [PATCH 126/140] test wf

---
 .../scripts/check-creators-workflows-code.sh   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index ed3a04fc6aa..b6abefb8752 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-BASE_DIR="$(cd "$SCRIPT_DIR/../.." && cd .. && pwd)"
+BASE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 CREATOR_WORKFLOWS_DIR="$BASE_DIR/creators/extension/app/files/.github/workflows"
 WORKFLOW_BRANCH="$1"
 
@@ -76,20 +76,20 @@ compare_files() {
 }
 
 main() {
-  # charts_expected=$(generate_proper_charts)
-  # catalog_expected=$(generate_proper_catalog)
+  charts_expected=$(generate_proper_charts)
+  catalog_expected=$(generate_proper_catalog)
 
   echo "SCRIPT_DIR: $SCRIPT_DIR"
   echo "BASE_DIR: $BASE_DIR"
   echo "CREATOR_WORKFLOWS_DIR: $CREATOR_WORKFLOWS_DIR"
 
-  # compare_files "$charts_expected" \
-  #   "$CREATOR_WORKFLOWS_DIR/build-extension-charts.yml" \
-  #   "build-extension-charts workflow"
+  compare_files "$charts_expected" \
+    "$CREATOR_WORKFLOWS_DIR/build-extension-charts.yml" \
+    "build-extension-charts workflow"
 
-  # compare_files "$catalog_expected" \
-  #   "$CREATOR_WORKFLOWS_DIR/build-extension-catalog.yml" \
-  #   "build-extension-catalog workflow"
+  compare_files "$catalog_expected" \
+    "$CREATOR_WORKFLOWS_DIR/build-extension-catalog.yml" \
+    "build-extension-catalog workflow"
 
   echo "All workflows validated successfully for $WORKFLOW_BRANCH"
 }

From 4485d7f2459534658b6a93b00654998613540f4c Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:44:01 +0000
Subject: [PATCH 127/140] test wf

---
 .github/workflows/scripts/check-creators-workflows-code.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index b6abefb8752..885c253b0f5 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -2,7 +2,7 @@
 set -eo pipefail
 
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
-BASE_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+BASE_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)"
 CREATOR_WORKFLOWS_DIR="$BASE_DIR/creators/extension/app/files/.github/workflows"
 WORKFLOW_BRANCH="$1"
 

From 8300ec756548c34429a6462b377b91f4a9ae1a95 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Fri, 28 Feb 2025 14:46:06 +0000
Subject: [PATCH 128/140] test wf

---
 .github/workflows/scripts/check-creators-workflows-code.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 885c253b0f5..e79558ca875 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -22,7 +22,7 @@ defaults:
 
 jobs:
   build-extension-charts:
-    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@$WORKFLOW_BRANCH
+    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@master
     permissions:
       actions: write
       contents: write
@@ -50,7 +50,7 @@ defaults:
 
 jobs:
   build-extension-catalog:
-    uses: rancher/dashboard/.github/workflows/build-extension-catalog.yml@$WORKFLOW_BRANCH
+    uses: rancher/dashboard/.github/workflows/build-extension-catalog.yml@master
     permissions:
       actions: write
       contents: read

From 0eef865817b1fe4cb0f1b947279bcc25455d80b4 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 11:54:47 +0000
Subject: [PATCH 129/140] check output of job

---
 .github/workflows/scripts/check-creators-workflows-code.sh | 2 +-
 .github/workflows/test-wf.yml                              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index e79558ca875..9abd18fb79e 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -71,7 +71,7 @@ compare_files() {
 
   if ! diff <(echo "$expected") "$actual_file" >/dev/null; then
     echo "::error::$description validation failed for branch $WORKFLOW_BRANCH"
-    exit 1
+    exit 0
   fi
 }
 
diff --git a/.github/workflows/test-wf.yml b/.github/workflows/test-wf.yml
index b4c9c9e55e2..da1b10e9b94 100644
--- a/.github/workflows/test-wf.yml
+++ b/.github/workflows/test-wf.yml
@@ -54,6 +54,8 @@ jobs:
       - name: Aggregate results
         id: aggregate
         run: |
+          echo "RESULT::: ${{ needs.branch-checks.result }}"
+          
           # Check all branch check outcomes
           if [[ '${{ needs.branch-checks.result }}' == 'failure' ]]; then
             echo "result=failure" >> $GITHUB_OUTPUT

From 2099cb2bd127ef96d761d9dd78025db7fb122d60 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 12:12:48 +0000
Subject: [PATCH 130/140] test branch checkout mechanism

---
 .../workflows/scripts/check-creators-workflows-code.sh | 10 +++++++---
 .github/workflows/test-wf.yml                          | 10 +++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 9abd18fb79e..90578ced811 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -3,7 +3,9 @@ set -eo pipefail
 
 SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 BASE_DIR="$(cd "$SCRIPT_DIR/../../.." && pwd)"
-CREATOR_WORKFLOWS_DIR="$BASE_DIR/creators/extension/app/files/.github/workflows"
+DASHBOARD_REPO=https://github.com/rancher/dashboard.git
+DASHBOARD_REPO_DIR=dashboard-repo
+CREATOR_WORKFLOWS_DIR="$BASE_DIR/$DASHBOARD_REPO_DIR/creators/extension/app/files/.github/workflows"
 WORKFLOW_BRANCH="$1"
 
 generate_proper_charts() {
@@ -22,7 +24,7 @@ defaults:
 
 jobs:
   build-extension-charts:
-    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@master
+    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@$WORKFLOW_BRANCH
     permissions:
       actions: write
       contents: write
@@ -50,7 +52,7 @@ defaults:
 
 jobs:
   build-extension-catalog:
-    uses: rancher/dashboard/.github/workflows/build-extension-catalog.yml@master
+    uses: rancher/dashboard/.github/workflows/build-extension-catalog.yml@$WORKFLOW_BRANCH
     permissions:
       actions: write
       contents: read
@@ -79,6 +81,8 @@ main() {
   charts_expected=$(generate_proper_charts)
   catalog_expected=$(generate_proper_catalog)
 
+  git clone -b "$WORKFLOW_BRANCH" "$DASHBOARD_REPO" "$DASHBOARD_REPO_DIR"
+
   echo "SCRIPT_DIR: $SCRIPT_DIR"
   echo "BASE_DIR: $BASE_DIR"
   echo "CREATOR_WORKFLOWS_DIR: $CREATOR_WORKFLOWS_DIR"
diff --git a/.github/workflows/test-wf.yml b/.github/workflows/test-wf.yml
index da1b10e9b94..8ab49e84664 100644
--- a/.github/workflows/test-wf.yml
+++ b/.github/workflows/test-wf.yml
@@ -29,17 +29,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        branch: [fix-wf-master]
-    outputs:
-      status-master: ${{ job.status }}
-      status-release-2.9: ${{ job.status }}
-      status-release-2.8: ${{ job.status }}
+        branch: [master, release-2.9, release-2.8]
     steps:
-      - name: Checkout ${{ matrix.branch }}
+      - name: Checkout master branch
         uses: actions/checkout@v4
         with:
           repository: aalves08/dashboard
-          ref: ${{ matrix.branch }}
+          ref: fix-wf-master
 
       - name: Validate workflows
         shell: bash

From 399f5a83e5d1b6ac92e968b485001a2a751cf430 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 12:16:57 +0000
Subject: [PATCH 131/140] check outpus

---
 .github/workflows/scripts/check-creators-workflows-code.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 90578ced811..6ec728b8b9c 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -71,6 +71,9 @@ compare_files() {
   local actual_file="$2"
   local description="$3"
 
+  echo "expected for $description ::: $expected"
+  echo "actual_file for $description ::: $actual_file"
+
   if ! diff <(echo "$expected") "$actual_file" >/dev/null; then
     echo "::error::$description validation failed for branch $WORKFLOW_BRANCH"
     exit 0

From 19cd8642367891ccec26116b68bf5d36aa5b3624 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 12:25:55 +0000
Subject: [PATCH 132/140] check outputs

---
 .../workflows/scripts/check-creators-workflows-code.sh    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 6ec728b8b9c..3fd504c729a 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -71,8 +71,12 @@ compare_files() {
   local actual_file="$2"
   local description="$3"
 
-  echo "expected for $description ::: $expected"
-  echo "actual_file for $description ::: $actual_file"
+  echo "actual_file for $description :::"
+  cat "$actual_file"
+
+  echo "expected for $description :::"
+  echo "$expected"
+  
 
   if ! diff <(echo "$expected") "$actual_file" >/dev/null; then
     echo "::error::$description validation failed for branch $WORKFLOW_BRANCH"

From 6319142c9f5a2bceedbc317e53d5d7b3e79a67a9 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 13:58:23 +0000
Subject: [PATCH 133/140] check outputs

---
 .../workflows/scripts/check-creators-workflows-code.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 3fd504c729a..70985b04a13 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -71,11 +71,13 @@ compare_files() {
   local actual_file="$2"
   local description="$3"
 
-  echo "actual_file for $description :::"
-  cat "$actual_file"
-
-  echo "expected for $description :::"
+  echo "expected ::: "
   echo "$expected"
+  echo ""
+  echo "actual_file ::: "
+  echo "$actual_file"
+  echo ""
+  diff <(printf '%s' "$expected") <(printf '%s' "$actual_file")
   
 
   if ! diff <(echo "$expected") "$actual_file" >/dev/null; then

From 8e56d0f59720441c9aa519e8bf19eb770527f34c Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 14:01:18 +0000
Subject: [PATCH 134/140] check outputs

---
 .../workflows/scripts/check-creators-workflows-code.sh    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 70985b04a13..4ab4095da80 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -77,12 +77,14 @@ compare_files() {
   echo "actual_file ::: "
   echo "$actual_file"
   echo ""
-  diff <(printf '%s' "$expected") <(printf '%s' "$actual_file")
+  echo "diff output ::: "
+  echo ""
+  diff --ignore-all-space <(printf '%s' "$expected") <(printf '%s' "$actual_file")
   
 
-  if ! diff <(echo "$expected") "$actual_file" >/dev/null; then
+  if ! diff --ignore-all-space <(echo "$expected") "$actual_file" >/dev/null; then
     echo "::error::$description validation failed for branch $WORKFLOW_BRANCH"
-    exit 0
+    exit 1
   fi
 }
 

From 3a7bd7b4dd0c8a73e31ef4e156fab776277bb2fb Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 14:02:51 +0000
Subject: [PATCH 135/140] check outputs

---
 .github/workflows/scripts/check-creators-workflows-code.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index 4ab4095da80..bc30209c448 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -33,6 +33,7 @@ jobs:
     with:
       target_branch: gh-pages
       tagged_release: \${{ github.ref_name }}
+
 EOF
 }
 
@@ -63,6 +64,7 @@ jobs:
       tagged_release: \${{ github.ref_name }}
     secrets: 
       registry_token: \${{ secrets.GITHUB_TOKEN }}
+
 EOF
 }
 

From dd253ad8091278bbbd5c1ae6d35bff61b5e84a47 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 14:07:28 +0000
Subject: [PATCH 136/140] check outputs

---
 .../scripts/check-creators-workflows-code.sh      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index bc30209c448..ca0903336e1 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -33,7 +33,6 @@ jobs:
     with:
       target_branch: gh-pages
       tagged_release: \${{ github.ref_name }}
-
 EOF
 }
 
@@ -64,7 +63,6 @@ jobs:
       tagged_release: \${{ github.ref_name }}
     secrets: 
       registry_token: \${{ secrets.GITHUB_TOKEN }}
-
 EOF
 }
 
@@ -73,15 +71,20 @@ compare_files() {
   local actual_file="$2"
   local description="$3"
 
-  echo "expected ::: "
-  echo "$expected"
+  echo "******* expected ********"
   echo ""
-  echo "actual_file ::: "
-  echo "$actual_file"
+  echo <(printf '%s' "$expected")
+  echo "******* actual_file ********"
   echo ""
+  echo <(printf '%s' "$actual_file")
+
   echo "diff output ::: "
   echo ""
   diff --ignore-all-space <(printf '%s' "$expected") <(printf '%s' "$actual_file")
+
+  echo "diff output2 ::: "
+  echo ""
+  diff --ignore-all-space <(echo "$expected") "$actual_file" >/dev/null
   
 
   if ! diff --ignore-all-space <(echo "$expected") "$actual_file" >/dev/null; then

From aece63417eb96649fe64aac6dd07ca94f5ad07e7 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 14:09:40 +0000
Subject: [PATCH 137/140] check outputs

---
 .../scripts/check-creators-workflows-code.sh  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index ca0903336e1..d2e04d6faf8 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -71,23 +71,23 @@ compare_files() {
   local actual_file="$2"
   local description="$3"
 
-  echo "******* expected ********"
-  echo ""
-  echo <(printf '%s' "$expected")
-  echo "******* actual_file ********"
-  echo ""
-  echo <(printf '%s' "$actual_file")
+  # echo "******* expected ********"
+  # echo ""
+  # echo <(printf '%s' "$expected")
+  # echo "******* actual_file ********"
+  # echo ""
+  # echo <(printf '%s' "$actual_file")
 
-  echo "diff output ::: "
-  echo ""
-  diff --ignore-all-space <(printf '%s' "$expected") <(printf '%s' "$actual_file")
+  # echo "diff output ::: "
+  # echo ""
+  # diff --ignore-all-space <(printf '%s' "$expected") <(printf '%s' "$actual_file")
 
   echo "diff output2 ::: "
   echo ""
-  diff --ignore-all-space <(echo "$expected") "$actual_file" >/dev/null
+  diff --ignore-all-space <(echo "$expected") <(cat "$actual_file")
   
 
-  if ! diff --ignore-all-space <(echo "$expected") "$actual_file" >/dev/null; then
+  if ! diff --ignore-all-space <(echo "$expected") <(cat "$actual_file") >/dev/null; then
     echo "::error::$description validation failed for branch $WORKFLOW_BRANCH"
     exit 1
   fi

From 8c9a05c9ef274a0657b54d7d2d485caa1cf90d3d Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 14:10:43 +0000
Subject: [PATCH 138/140] check outputs

---
 .github/workflows/scripts/check-creators-workflows-code.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index d2e04d6faf8..edbfe7b4fa2 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -10,7 +10,7 @@ WORKFLOW_BRANCH="$1"
 
 generate_proper_charts() {
   cat <<EOF
-name: Build and Release Extension Charts
+name: Build and Release Extension Charts1
 
 on:
   workflow_dispatch:

From 9cf158fdb3d20e4b2d1465cc345df0196b98a72f Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 14:45:12 +0000
Subject: [PATCH 139/140] check outputs

---
 .../scripts/check-creators-workflows-code.sh      | 15 ++-------------
 .github/workflows/test-wf.yml                     | 14 --------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index edbfe7b4fa2..ee1cba45889 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -10,7 +10,7 @@ WORKFLOW_BRANCH="$1"
 
 generate_proper_charts() {
   cat <<EOF
-name: Build and Release Extension Charts1
+name: Build and Release Extension Charts
 
 on:
   workflow_dispatch:
@@ -71,18 +71,7 @@ compare_files() {
   local actual_file="$2"
   local description="$3"
 
-  # echo "******* expected ********"
-  # echo ""
-  # echo <(printf '%s' "$expected")
-  # echo "******* actual_file ********"
-  # echo ""
-  # echo <(printf '%s' "$actual_file")
-
-  # echo "diff output ::: "
-  # echo ""
-  # diff --ignore-all-space <(printf '%s' "$expected") <(printf '%s' "$actual_file")
-
-  echo "diff output2 ::: "
+  echo "diff output for ""$description ::: "
   echo ""
   diff --ignore-all-space <(echo "$expected") <(cat "$actual_file")
   
diff --git a/.github/workflows/test-wf.yml b/.github/workflows/test-wf.yml
index 8ab49e84664..beb9cda0686 100644
--- a/.github/workflows/test-wf.yml
+++ b/.github/workflows/test-wf.yml
@@ -11,20 +11,6 @@ defaults:
     working-directory: ./
 
 jobs:
-  # test-extensions-creators-and-update-paths:
-  #   if: ${{ github.repository_owner == 'rancher' }}
-  #   runs-on: ubuntu-latest
-  #   outputs:
-  #     test-extensions-creators-and-update-paths-job-status: ${{ job.status }}
-  #   steps:
-  #     - name: Checkout code
-  #       uses: actions/checkout@v4
-
-  #     - name: Retrieve Shell and Creators versions
-  #       run: ./.github/workflows/scripts/test-extensions-creators-build.sh
-  #       id: test-extensions-and-creators
-  #       shell: bash
-
   branch-checks:
     runs-on: ubuntu-latest
     strategy:

From 4895588b73509b6a99a7194907f487e3c7b258ee Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 4 Mar 2025 14:46:56 +0000
Subject: [PATCH 140/140] check outputs

---
 .github/workflows/scripts/check-creators-workflows-code.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scripts/check-creators-workflows-code.sh b/.github/workflows/scripts/check-creators-workflows-code.sh
index ee1cba45889..963a104138e 100755
--- a/.github/workflows/scripts/check-creators-workflows-code.sh
+++ b/.github/workflows/scripts/check-creators-workflows-code.sh
@@ -24,7 +24,7 @@ defaults:
 
 jobs:
   build-extension-charts:
-    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@$WORKFLOW_BRANCH
+    uses: rancher/dashboard/.github/workflows/build-extension-charts.yml@master
     permissions:
       actions: write
       contents: write