From 7fc7813aa49acb0998645114f1bb49ed102e9311 Mon Sep 17 00:00:00 2001
From: Isabela Guimaraes <isabela.guimaraes@suse.com>
Date: Thu, 19 Dec 2024 13:22:19 -0800
Subject: [PATCH 01/57] adding data-testid to mandatory GKE elements for e2e
 tests locators

Signed-off-by: Isabela Guimaraes <isabela.guimaraes@suse.com>
---
 pkg/gke/components/CruGKE.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/gke/components/CruGKE.vue b/pkg/gke/components/CruGKE.vue
index 59bfd16012..714ffe3c4b 100644
--- a/pkg/gke/components/CruGKE.vue
+++ b/pkg/gke/components/CruGKE.vue
@@ -705,6 +705,7 @@ export default defineComponent({
               required
               :rules="fvGetAndReportPathRules('clusterName')"
               @update:value="setClusterName"
+              data-testid="gke-cluster-name"
             />
           </div>
           <div class="col span-6">
@@ -714,6 +715,7 @@ export default defineComponent({
               label-key="nameNsDescription.description.label"
               :placeholder="t('nameNsDescription.description.placeholder')"
               @update:value="setClusterDescription"
+              data-testid="gke-cluster-description"
             />
           </div>
         </div>

From 4cfd15a1f01af1e78b14976faccb6a81d16352f6 Mon Sep 17 00:00:00 2001
From: Isabela Guimaraes <isabela.guimaraes@suse.com>
Date: Thu, 19 Dec 2024 13:44:00 -0800
Subject: [PATCH 02/57] changed order of data-testid to fix eslint error

Signed-off-by: Isabela Guimaraes <isabela.guimaraes@suse.com>
---
 pkg/gke/components/CruGKE.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/gke/components/CruGKE.vue b/pkg/gke/components/CruGKE.vue
index 714ffe3c4b..2ea85145e4 100644
--- a/pkg/gke/components/CruGKE.vue
+++ b/pkg/gke/components/CruGKE.vue
@@ -704,8 +704,8 @@ export default defineComponent({
               label-key="generic.name"
               required
               :rules="fvGetAndReportPathRules('clusterName')"
-              @update:value="setClusterName"
               data-testid="gke-cluster-name"
+              @update:value="setClusterName"
             />
           </div>
           <div class="col span-6">
@@ -714,8 +714,8 @@ export default defineComponent({
               :mode="mode"
               label-key="nameNsDescription.description.label"
               :placeholder="t('nameNsDescription.description.placeholder')"
-              @update:value="setClusterDescription"
               data-testid="gke-cluster-description"
+              @update:value="setClusterDescription"
             />
           </div>
         </div>

From b8ddea2d39e73129a1007a5ac2f1a7e878418ed2 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Fri, 20 Dec 2024 12:42:00 -0700
Subject: [PATCH 03/57] Remove unused `dagre-d3` dependency

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 package.json       |   1 -
 shell/package.json |   1 -
 shell/yarn.lock    | 284 ++------------------------------------------
 yarn.lock          | 286 ++-------------------------------------------
 4 files changed, 15 insertions(+), 557 deletions(-)

diff --git a/package.json b/package.json
index 53d9ddb972..16c317a5a9 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,6 @@
     "custom-event-polyfill": "1.0.7",
     "d3": "7.3.0",
     "d3-selection": "1.4.1",
-    "dagre-d3": "0.6.4",
     "dayjs": "1.8.29",
     "defu": "5.0.1",
     "diff2html": "3.4.24",
diff --git a/shell/package.json b/shell/package.json
index 046af30d52..1d72b060a1 100644
--- a/shell/package.json
+++ b/shell/package.json
@@ -72,7 +72,6 @@
     "cypress": "10.3.1",
     "d3": "7.3.0",
     "d3-selection": "1.4.1",
-    "dagre-d3": "0.6.4",
     "dayjs": "1.8.29",
     "defu": "5.0.1",
     "diff2html": "3.4.24",
diff --git a/shell/yarn.lock b/shell/yarn.lock
index eed0a94580..e010f3982c 100644
--- a/shell/yarn.lock
+++ b/shell/yarn.lock
@@ -5762,11 +5762,6 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2, commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 commander@7, commander@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
@@ -5777,6 +5772,11 @@ commander@^10.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
   integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
 
+commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 commander@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
@@ -6296,11 +6296,6 @@ cypress@10.3.1:
     untildify "^4.0.0"
     yauzl "^2.10.0"
 
-d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
-  integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
-
 "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.4.tgz#15fec33b237f97ac5d7c986dc77da273a8ed0bb5"
@@ -6308,27 +6303,11 @@ d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
   dependencies:
     internmap "1 - 2"
 
-d3-axis@1:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9"
-  integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==
-
 d3-axis@3:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-3.0.0.tgz#c42a4a13e8131d637b745fc2973824cfeaf93322"
   integrity sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==
 
-d3-brush@1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b"
-  integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==
-  dependencies:
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-interpolate "1"
-    d3-selection "1"
-    d3-transition "1"
-
 d3-brush@3:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-3.0.0.tgz#6f767c4ed8dcb79de7ede3e1c0f89e63ef64d31c"
@@ -6340,14 +6319,6 @@ d3-brush@3:
     d3-selection "3"
     d3-transition "3"
 
-d3-chord@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f"
-  integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==
-  dependencies:
-    d3-array "1"
-    d3-path "1"
-
 d3-chord@3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-3.0.1.tgz#d156d61f485fce8327e6abf339cb41d8cbba6966"
@@ -6355,23 +6326,11 @@ d3-chord@3:
   dependencies:
     d3-path "1 - 3"
 
-d3-collection@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
-  integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
-
-d3-color@1, "d3-color@1 - 3", d3-color@3, d3-color@3.1.0:
+"d3-color@1 - 3", d3-color@3, d3-color@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
   integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
 
-d3-contour@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3"
-  integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==
-  dependencies:
-    d3-array "^1.1.1"
-
 d3-contour@3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-3.1.0.tgz#708484a5d89be9558dfdda4a95b3df2fdebb65ab"
@@ -6386,24 +6345,11 @@ d3-delaunay@6:
   dependencies:
     delaunator "5"
 
-d3-dispatch@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
-  integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
-
 "d3-dispatch@1 - 3", d3-dispatch@3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e"
   integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==
 
-d3-drag@1:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70"
-  integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==
-  dependencies:
-    d3-dispatch "1"
-    d3-selection "1"
-
 "d3-drag@2 - 3", d3-drag@3:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba"
@@ -6412,15 +6358,6 @@ d3-drag@1:
     d3-dispatch "1 - 3"
     d3-selection "3"
 
-d3-dsv@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c"
-  integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==
-  dependencies:
-    commander "2"
-    iconv-lite "0.4"
-    rw "1"
-
 "d3-dsv@1 - 3", d3-dsv@3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-3.0.1.tgz#c63af978f4d6a0d084a52a673922be2160789b73"
@@ -6430,23 +6367,11 @@ d3-dsv@1:
     iconv-lite "0.6"
     rw "1"
 
-d3-ease@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"
-  integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==
-
 "d3-ease@1 - 3", d3-ease@3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4"
   integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
 
-d3-fetch@1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7"
-  integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==
-  dependencies:
-    d3-dsv "1"
-
 d3-fetch@3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-3.0.1.tgz#83141bff9856a0edb5e38de89cdcfe63d0a60a22"
@@ -6454,16 +6379,6 @@ d3-fetch@3:
   dependencies:
     d3-dsv "1 - 3"
 
-d3-force@1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b"
-  integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==
-  dependencies:
-    d3-collection "1"
-    d3-dispatch "1"
-    d3-quadtree "1"
-    d3-timer "1"
-
 d3-force@3:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-3.0.0.tgz#3e2ba1a61e70888fe3d9194e30d6d14eece155c4"
@@ -6473,23 +6388,11 @@ d3-force@3:
     d3-quadtree "1 - 3"
     d3-timer "1 - 3"
 
-d3-format@1:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4"
-  integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==
-
 "d3-format@1 - 3", d3-format@3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641"
   integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==
 
-d3-geo@1:
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f"
-  integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==
-  dependencies:
-    d3-array "1"
-
 d3-geo@3:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-3.1.1.tgz#6027cf51246f9b2ebd64f99e01dc7c3364033a4d"
@@ -6497,23 +6400,11 @@ d3-geo@3:
   dependencies:
     d3-array "2.5.0 - 3"
 
-d3-hierarchy@1:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83"
-  integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==
-
 d3-hierarchy@3:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz#b01cd42c1eed3d46db77a5966cf726f8c09160c6"
   integrity sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==
 
-d3-interpolate@1:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
-  integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
-  dependencies:
-    d3-color "1"
-
 "d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
@@ -6521,54 +6412,26 @@ d3-interpolate@1:
   dependencies:
     d3-color "1 - 3"
 
-d3-path@1:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf"
-  integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==
-
 "d3-path@1 - 3", d3-path@3, d3-path@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.1.0.tgz#22df939032fb5a71ae8b1800d61ddb7851c42526"
   integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==
 
-d3-polygon@1:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e"
-  integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==
-
 d3-polygon@3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-3.0.1.tgz#0b45d3dd1c48a29c8e057e6135693ec80bf16398"
   integrity sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==
 
-d3-quadtree@1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135"
-  integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==
-
 "d3-quadtree@1 - 3", d3-quadtree@3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz#6dca3e8be2b393c9a9d514dabbd80a92deef1a4f"
   integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==
 
-d3-random@1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291"
-  integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==
-
 d3-random@3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-3.0.1.tgz#d4926378d333d9c0bfd1e6fa0194d30aebaa20f4"
   integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==
 
-d3-scale-chromatic@1:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98"
-  integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==
-  dependencies:
-    d3-color "1"
-    d3-interpolate "1"
-
 d3-scale-chromatic@3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz#34c39da298b23c20e02f1a4b239bd0f22e7f1314"
@@ -6577,18 +6440,6 @@ d3-scale-chromatic@3:
     d3-color "1 - 3"
     d3-interpolate "1 - 3"
 
-d3-scale@2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f"
-  integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==
-  dependencies:
-    d3-array "^1.2.0"
-    d3-collection "1"
-    d3-format "1"
-    d3-interpolate "1"
-    d3-time "1"
-    d3-time-format "2"
-
 d3-scale@4:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396"
@@ -6600,11 +6451,6 @@ d3-scale@4:
     d3-time "2.1.1 - 3"
     d3-time-format "2 - 4"
 
-d3-selection@1, d3-selection@^1.1.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
-  integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
-
 d3-selection@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.1.tgz#98eedbbe085fbda5bafa2f9e3f3a2f4d7d622a98"
@@ -6615,13 +6461,6 @@ d3-selection@1.4.1:
   resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31"
   integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==
 
-d3-shape@1:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7"
-  integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==
-  dependencies:
-    d3-path "1"
-
 d3-shape@3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.2.0.tgz#a1a839cbd9ba45f28674c69d7f855bcf91dfc6a5"
@@ -6629,13 +6468,6 @@ d3-shape@3:
   dependencies:
     d3-path "^3.1.0"
 
-d3-time-format@2:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850"
-  integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==
-  dependencies:
-    d3-time "1"
-
 "d3-time-format@2 - 4", d3-time-format@4:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-4.1.0.tgz#7ab5257a5041d11ecb4fe70a5c7d16a195bb408a"
@@ -6643,11 +6475,6 @@ d3-time-format@2:
   dependencies:
     d3-time "1 - 3"
 
-d3-time@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1"
-  integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==
-
 "d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.1.0.tgz#9310db56e992e3c0175e1ef385e545e48a9bb5c7"
@@ -6655,28 +6482,11 @@ d3-time@1:
   dependencies:
     d3-array "2 - 3"
 
-d3-timer@1:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
-  integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
-
 "d3-timer@1 - 3", d3-timer@3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0"
   integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
 
-d3-transition@1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
-  integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
-  dependencies:
-    d3-color "1"
-    d3-dispatch "1"
-    d3-ease "1"
-    d3-interpolate "1"
-    d3-selection "^1.1.0"
-    d3-timer "1"
-
 "d3-transition@2 - 3", d3-transition@3:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-3.0.1.tgz#6869fdde1448868077fdd5989200cb61b2a1645f"
@@ -6688,22 +6498,6 @@ d3-transition@1:
     d3-interpolate "1 - 3"
     d3-timer "1 - 3"
 
-d3-voronoi@1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297"
-  integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==
-
-d3-zoom@1:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a"
-  integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==
-  dependencies:
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-interpolate "1"
-    d3-selection "1"
-    d3-transition "1"
-
 d3-zoom@3:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3"
@@ -6751,61 +6545,6 @@ d3@7.3.0:
     d3-transition "3"
     d3-zoom "3"
 
-d3@^5.14:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877"
-  integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==
-  dependencies:
-    d3-array "1"
-    d3-axis "1"
-    d3-brush "1"
-    d3-chord "1"
-    d3-collection "1"
-    d3-color "1"
-    d3-contour "1"
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-dsv "1"
-    d3-ease "1"
-    d3-fetch "1"
-    d3-force "1"
-    d3-format "1"
-    d3-geo "1"
-    d3-hierarchy "1"
-    d3-interpolate "1"
-    d3-path "1"
-    d3-polygon "1"
-    d3-quadtree "1"
-    d3-random "1"
-    d3-scale "2"
-    d3-scale-chromatic "1"
-    d3-selection "1"
-    d3-shape "1"
-    d3-time "1"
-    d3-time-format "2"
-    d3-timer "1"
-    d3-transition "1"
-    d3-voronoi "1"
-    d3-zoom "1"
-
-dagre-d3@0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/dagre-d3/-/dagre-d3-0.6.4.tgz#0728d5ce7f177ca2337df141ceb60fbe6eeb7b29"
-  integrity sha512-e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ==
-  dependencies:
-    d3 "^5.14"
-    dagre "^0.8.5"
-    graphlib "^2.1.8"
-    lodash "^4.17.15"
-
-dagre@^0.8.5:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee"
-  integrity sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==
-  dependencies:
-    graphlib "^2.1.8"
-    lodash "^4.17.15"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -8451,13 +8190,6 @@ graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0,
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-graphlib@^2.1.8:
-  version "2.1.8"
-  resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da"
-  integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==
-  dependencies:
-    lodash "^4.17.15"
-
 gzip-size@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
@@ -8791,7 +8523,7 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-iconv-lite@0.4, iconv-lite@0.4.24:
+iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -10257,7 +9989,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
diff --git a/yarn.lock b/yarn.lock
index 9a487d7b49..bcc0aecd51 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6099,11 +6099,6 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2, commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 commander@7, commander@^7.2.0:
   version "7.2.0"
   resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
@@ -6114,6 +6109,11 @@ commander@^10.0.0, commander@^10.0.1:
   resolved "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
   integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
 
+commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 commander@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
@@ -6700,11 +6700,6 @@ cypress@11.1.0:
     untildify "^4.0.0"
     yauzl "^2.10.0"
 
-d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
-  version "1.2.4"
-  resolved "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f"
-  integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==
-
 "d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3:
   version "3.2.4"
   resolved "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz#15fec33b237f97ac5d7c986dc77da273a8ed0bb5"
@@ -6712,27 +6707,11 @@ d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0:
   dependencies:
     internmap "1 - 2"
 
-d3-axis@1:
-  version "1.0.12"
-  resolved "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9"
-  integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==
-
 d3-axis@3:
   version "3.0.0"
   resolved "https://registry.npmjs.org/d3-axis/-/d3-axis-3.0.0.tgz#c42a4a13e8131d637b745fc2973824cfeaf93322"
   integrity sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==
 
-d3-brush@1:
-  version "1.1.6"
-  resolved "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b"
-  integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA==
-  dependencies:
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-interpolate "1"
-    d3-selection "1"
-    d3-transition "1"
-
 d3-brush@3:
   version "3.0.0"
   resolved "https://registry.npmjs.org/d3-brush/-/d3-brush-3.0.0.tgz#6f767c4ed8dcb79de7ede3e1c0f89e63ef64d31c"
@@ -6744,14 +6723,6 @@ d3-brush@3:
     d3-selection "3"
     d3-transition "3"
 
-d3-chord@1:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f"
-  integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==
-  dependencies:
-    d3-array "1"
-    d3-path "1"
-
 d3-chord@3:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-chord/-/d3-chord-3.0.1.tgz#d156d61f485fce8327e6abf339cb41d8cbba6966"
@@ -6759,28 +6730,11 @@ d3-chord@3:
   dependencies:
     d3-path "1 - 3"
 
-d3-collection@1:
-  version "1.0.7"
-  resolved "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e"
-  integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A==
-
-d3-color@1:
-  version "1.4.1"
-  resolved "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
-  integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
-
 "d3-color@1 - 3", d3-color@3:
   version "3.1.0"
   resolved "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
   integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
 
-d3-contour@1:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3"
-  integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==
-  dependencies:
-    d3-array "^1.1.1"
-
 d3-contour@3:
   version "3.1.0"
   resolved "https://registry.npmjs.org/d3-contour/-/d3-contour-3.1.0.tgz#708484a5d89be9558dfdda4a95b3df2fdebb65ab"
@@ -6795,24 +6749,11 @@ d3-delaunay@6:
   dependencies:
     delaunator "5"
 
-d3-dispatch@1:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
-  integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
-
 "d3-dispatch@1 - 3", d3-dispatch@3:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e"
   integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==
 
-d3-drag@1:
-  version "1.2.5"
-  resolved "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70"
-  integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==
-  dependencies:
-    d3-dispatch "1"
-    d3-selection "1"
-
 "d3-drag@2 - 3", d3-drag@3:
   version "3.0.0"
   resolved "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba"
@@ -6821,15 +6762,6 @@ d3-drag@1:
     d3-dispatch "1 - 3"
     d3-selection "3"
 
-d3-dsv@1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c"
-  integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==
-  dependencies:
-    commander "2"
-    iconv-lite "0.4"
-    rw "1"
-
 "d3-dsv@1 - 3", d3-dsv@3:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-dsv/-/d3-dsv-3.0.1.tgz#c63af978f4d6a0d084a52a673922be2160789b73"
@@ -6839,23 +6771,11 @@ d3-dsv@1:
     iconv-lite "0.6"
     rw "1"
 
-d3-ease@1:
-  version "1.0.7"
-  resolved "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"
-  integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==
-
 "d3-ease@1 - 3", d3-ease@3:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4"
   integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
 
-d3-fetch@1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7"
-  integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA==
-  dependencies:
-    d3-dsv "1"
-
 d3-fetch@3:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-fetch/-/d3-fetch-3.0.1.tgz#83141bff9856a0edb5e38de89cdcfe63d0a60a22"
@@ -6863,16 +6783,6 @@ d3-fetch@3:
   dependencies:
     d3-dsv "1 - 3"
 
-d3-force@1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b"
-  integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==
-  dependencies:
-    d3-collection "1"
-    d3-dispatch "1"
-    d3-quadtree "1"
-    d3-timer "1"
-
 d3-force@3:
   version "3.0.0"
   resolved "https://registry.npmjs.org/d3-force/-/d3-force-3.0.0.tgz#3e2ba1a61e70888fe3d9194e30d6d14eece155c4"
@@ -6882,23 +6792,11 @@ d3-force@3:
     d3-quadtree "1 - 3"
     d3-timer "1 - 3"
 
-d3-format@1:
-  version "1.4.5"
-  resolved "https://registry.npmjs.org/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4"
-  integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==
-
 "d3-format@1 - 3", d3-format@3:
   version "3.1.0"
   resolved "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641"
   integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==
 
-d3-geo@1:
-  version "1.12.1"
-  resolved "https://registry.npmjs.org/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f"
-  integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg==
-  dependencies:
-    d3-array "1"
-
 d3-geo@3:
   version "3.1.1"
   resolved "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz#6027cf51246f9b2ebd64f99e01dc7c3364033a4d"
@@ -6906,23 +6804,11 @@ d3-geo@3:
   dependencies:
     d3-array "2.5.0 - 3"
 
-d3-hierarchy@1:
-  version "1.1.9"
-  resolved "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83"
-  integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ==
-
 d3-hierarchy@3:
   version "3.1.2"
   resolved "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz#b01cd42c1eed3d46db77a5966cf726f8c09160c6"
   integrity sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==
 
-d3-interpolate@1:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
-  integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
-  dependencies:
-    d3-color "1"
-
 "d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
@@ -6930,54 +6816,26 @@ d3-interpolate@1:
   dependencies:
     d3-color "1 - 3"
 
-d3-path@1:
-  version "1.0.9"
-  resolved "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf"
-  integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg==
-
 "d3-path@1 - 3", d3-path@3, d3-path@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz#22df939032fb5a71ae8b1800d61ddb7851c42526"
   integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==
 
-d3-polygon@1:
-  version "1.0.6"
-  resolved "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e"
-  integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ==
-
 d3-polygon@3:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-polygon/-/d3-polygon-3.0.1.tgz#0b45d3dd1c48a29c8e057e6135693ec80bf16398"
   integrity sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==
 
-d3-quadtree@1:
-  version "1.0.7"
-  resolved "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135"
-  integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA==
-
 "d3-quadtree@1 - 3", d3-quadtree@3:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-3.0.1.tgz#6dca3e8be2b393c9a9d514dabbd80a92deef1a4f"
   integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==
 
-d3-random@1:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291"
-  integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ==
-
 d3-random@3:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-random/-/d3-random-3.0.1.tgz#d4926378d333d9c0bfd1e6fa0194d30aebaa20f4"
   integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==
 
-d3-scale-chromatic@1:
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98"
-  integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==
-  dependencies:
-    d3-color "1"
-    d3-interpolate "1"
-
 d3-scale-chromatic@3:
   version "3.1.0"
   resolved "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz#34c39da298b23c20e02f1a4b239bd0f22e7f1314"
@@ -6986,18 +6844,6 @@ d3-scale-chromatic@3:
     d3-color "1 - 3"
     d3-interpolate "1 - 3"
 
-d3-scale@2:
-  version "2.2.2"
-  resolved "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f"
-  integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==
-  dependencies:
-    d3-array "^1.2.0"
-    d3-collection "1"
-    d3-format "1"
-    d3-interpolate "1"
-    d3-time "1"
-    d3-time-format "2"
-
 d3-scale@4:
   version "4.0.2"
   resolved "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396"
@@ -7009,11 +6855,6 @@ d3-scale@4:
     d3-time "2.1.1 - 3"
     d3-time-format "2 - 4"
 
-d3-selection@1, d3-selection@^1.1.0:
-  version "1.4.2"
-  resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
-  integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
-
 d3-selection@1.4.1:
   version "1.4.1"
   resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.1.tgz#98eedbbe085fbda5bafa2f9e3f3a2f4d7d622a98"
@@ -7024,13 +6865,6 @@ d3-selection@1.4.1:
   resolved "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31"
   integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==
 
-d3-shape@1:
-  version "1.3.7"
-  resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7"
-  integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==
-  dependencies:
-    d3-path "1"
-
 d3-shape@3:
   version "3.2.0"
   resolved "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz#a1a839cbd9ba45f28674c69d7f855bcf91dfc6a5"
@@ -7038,13 +6872,6 @@ d3-shape@3:
   dependencies:
     d3-path "^3.1.0"
 
-d3-time-format@2:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850"
-  integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ==
-  dependencies:
-    d3-time "1"
-
 "d3-time-format@2 - 4", d3-time-format@4:
   version "4.1.0"
   resolved "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz#7ab5257a5041d11ecb4fe70a5c7d16a195bb408a"
@@ -7052,11 +6879,6 @@ d3-time-format@2:
   dependencies:
     d3-time "1 - 3"
 
-d3-time@1:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1"
-  integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA==
-
 "d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@3:
   version "3.1.0"
   resolved "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz#9310db56e992e3c0175e1ef385e545e48a9bb5c7"
@@ -7064,28 +6886,11 @@ d3-time@1:
   dependencies:
     d3-array "2 - 3"
 
-d3-timer@1:
-  version "1.0.10"
-  resolved "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
-  integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
-
 "d3-timer@1 - 3", d3-timer@3:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0"
   integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
 
-d3-transition@1:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
-  integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
-  dependencies:
-    d3-color "1"
-    d3-dispatch "1"
-    d3-ease "1"
-    d3-interpolate "1"
-    d3-selection "^1.1.0"
-    d3-timer "1"
-
 "d3-transition@2 - 3", d3-transition@3:
   version "3.0.1"
   resolved "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz#6869fdde1448868077fdd5989200cb61b2a1645f"
@@ -7097,22 +6902,6 @@ d3-transition@1:
     d3-interpolate "1 - 3"
     d3-timer "1 - 3"
 
-d3-voronoi@1:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297"
-  integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==
-
-d3-zoom@1:
-  version "1.8.3"
-  resolved "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a"
-  integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==
-  dependencies:
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-interpolate "1"
-    d3-selection "1"
-    d3-transition "1"
-
 d3-zoom@3:
   version "3.0.0"
   resolved "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3"
@@ -7160,61 +6949,6 @@ d3@7.3.0:
     d3-transition "3"
     d3-zoom "3"
 
-d3@^5.14:
-  version "5.16.0"
-  resolved "https://registry.npmjs.org/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877"
-  integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw==
-  dependencies:
-    d3-array "1"
-    d3-axis "1"
-    d3-brush "1"
-    d3-chord "1"
-    d3-collection "1"
-    d3-color "1"
-    d3-contour "1"
-    d3-dispatch "1"
-    d3-drag "1"
-    d3-dsv "1"
-    d3-ease "1"
-    d3-fetch "1"
-    d3-force "1"
-    d3-format "1"
-    d3-geo "1"
-    d3-hierarchy "1"
-    d3-interpolate "1"
-    d3-path "1"
-    d3-polygon "1"
-    d3-quadtree "1"
-    d3-random "1"
-    d3-scale "2"
-    d3-scale-chromatic "1"
-    d3-selection "1"
-    d3-shape "1"
-    d3-time "1"
-    d3-time-format "2"
-    d3-timer "1"
-    d3-transition "1"
-    d3-voronoi "1"
-    d3-zoom "1"
-
-dagre-d3@0.6.4:
-  version "0.6.4"
-  resolved "https://registry.npmjs.org/dagre-d3/-/dagre-d3-0.6.4.tgz#0728d5ce7f177ca2337df141ceb60fbe6eeb7b29"
-  integrity sha512-e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ==
-  dependencies:
-    d3 "^5.14"
-    dagre "^0.8.5"
-    graphlib "^2.1.8"
-    lodash "^4.17.15"
-
-dagre@^0.8.5:
-  version "0.8.5"
-  resolved "https://registry.npmjs.org/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee"
-  integrity sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==
-  dependencies:
-    graphlib "^2.1.8"
-    lodash "^4.17.15"
-
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -8029,6 +7763,7 @@ eslint-plugin-jest@24.4.0:
 
 "eslint-plugin-local-rules@link:./eslint-plugin-local-rules":
   version "0.0.0"
+  uid ""
 
 "eslint-plugin-local-rules@link:eslint-plugin-local-rules":
   version "0.0.0"
@@ -9089,13 +8824,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-graphlib@^2.1.8:
-  version "2.1.8"
-  resolved "https://registry.npmjs.org/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da"
-  integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==
-  dependencies:
-    lodash "^4.17.15"
-
 gzip-size@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
@@ -9479,7 +9207,7 @@ human-signals@^2.1.0:
   resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-iconv-lite@0.4, iconv-lite@0.4.24:
+iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==

From 77ad7c17a9dbc93368e64343d7e6c71b4d268e42 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Fri, 20 Dec 2024 15:19:01 -0700
Subject: [PATCH 04/57] Add `dependabot.yml`

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 .github/dependabot.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..65a7a360f6
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,21 @@
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 5
+    labels: ["component/dependencies"]
+
+  # Maintain dependencies for dashboard, shell, and packages
+  - package-ecosystem: "npm"
+    directories:
+      - "/"
+      - "/shell"
+      - "/pkg/*"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 5
+    labels: ["component/dependencies"]

From 289f638bae61c6d4ca367937d991d67d69d4a3c9 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 2 Jan 2025 10:38:11 +0100
Subject: [PATCH 05/57] Fix Node Selector value update

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

diff --git a/shell/components/form/NodeScheduling.vue b/shell/components/form/NodeScheduling.vue
index f2b4150afd..7414224d49 100644
--- a/shell/components/form/NodeScheduling.vue
+++ b/shell/components/form/NodeScheduling.vue
@@ -182,7 +182,7 @@ export default {
             :mode="mode"
             :multiple="false"
             :loading="loading"
-            @input="update"
+            @update:value="update"
           />
         </div>
       </div>

From 55cf3b3a7c42b18f3309a40ac578a8d5ea0ae771 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 2 Jan 2025 12:04:15 +0100
Subject: [PATCH 06/57] Implement NodeScheduling.test

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/components/form/NodeScheduling.vue      |  4 ++
 .../form/__tests__/NodeScheduling.test.ts     | 45 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 shell/components/form/__tests__/NodeScheduling.test.ts

diff --git a/shell/components/form/NodeScheduling.vue b/shell/components/form/NodeScheduling.vue
index 7414224d49..9905578754 100644
--- a/shell/components/form/NodeScheduling.vue
+++ b/shell/components/form/NodeScheduling.vue
@@ -32,6 +32,7 @@ export default {
       type:    String,
       default: 'create'
     },
+
     loading: {
       default: false,
       type:    Boolean
@@ -169,6 +170,7 @@ export default {
         name="selectNode"
         :options="selectNodeOptions"
         :mode="mode"
+        :data-testid="'node-scheduling-selectNode'"
         @input="update"
       />
     </div>
@@ -182,6 +184,7 @@ export default {
             :mode="mode"
             :multiple="false"
             :loading="loading"
+            :data-testid="'node-scheduling-nodeSelector'"
             @update:value="update"
           />
         </div>
@@ -191,6 +194,7 @@ export default {
       <NodeAffinity
         v-model:value="nodeAffinity"
         :mode="mode"
+        :data-testid="'node-scheduling-nodeAffinity'"
         @input="update"
       />
     </template>
diff --git a/shell/components/form/__tests__/NodeScheduling.test.ts b/shell/components/form/__tests__/NodeScheduling.test.ts
new file mode 100644
index 0000000000..1d8cd1c1dd
--- /dev/null
+++ b/shell/components/form/__tests__/NodeScheduling.test.ts
@@ -0,0 +1,45 @@
+import { mount } from '@vue/test-utils';
+import NodeScheduling from '@shell/components/form/NodeScheduling.vue';
+import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
+
+const requiredSetup = () => {
+  return {
+    global: {
+      mocks: {
+        $store: {
+          getters: {
+            currentProduct: { inStore: 'cluster' },
+            'i18n/t':                  (text: string) => text,
+            t:                         (text: string) => text,
+          }
+        }
+      },
+    }
+  };
+};
+
+describe('component: NodeScheduling', () => {
+
+  const value = {
+    nodeName: "node-1",
+  };
+
+  const nodes = ["node-0",'node-1'];
+
+  it.each([
+    _VIEW,
+    _CREATE,
+    _EDIT
+  ])('should show NodeName option', (mode) => {
+    const wrapper = mount(
+      NodeScheduling,
+      {
+        props: { mode, loading: false, value, nodes },
+        ...requiredSetup(),
+      }
+    );
+
+    expect(wrapper.find('[data-testid="node-scheduling-selectNode"]').exists()).toBeTruthy();
+    expect(wrapper.find('[data-testid="node-scheduling-nodeSelector"]').element.textContent).toContain(value.nodeName);
+  });
+});

From cd73a687a45128931ab5c9404ad73a8585afb02c Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 2 Jan 2025 12:29:38 +0100
Subject: [PATCH 07/57] Lint

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 .../form/__tests__/NodeScheduling.test.ts         | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/shell/components/form/__tests__/NodeScheduling.test.ts b/shell/components/form/__tests__/NodeScheduling.test.ts
index 1d8cd1c1dd..ed185373bb 100644
--- a/shell/components/form/__tests__/NodeScheduling.test.ts
+++ b/shell/components/form/__tests__/NodeScheduling.test.ts
@@ -9,8 +9,8 @@ const requiredSetup = () => {
         $store: {
           getters: {
             currentProduct: { inStore: 'cluster' },
-            'i18n/t':                  (text: string) => text,
-            t:                         (text: string) => text,
+            'i18n/t':       (text: string) => text,
+            t:              (text: string) => text,
           }
         }
       },
@@ -19,12 +19,9 @@ const requiredSetup = () => {
 };
 
 describe('component: NodeScheduling', () => {
+  const value = { nodeName: 'node-1' };
 
-  const value = {
-    nodeName: "node-1",
-  };
-
-  const nodes = ["node-0",'node-1'];
+  const nodes = ['node-0', 'node-1'];
 
   it.each([
     _VIEW,
@@ -34,7 +31,9 @@ describe('component: NodeScheduling', () => {
     const wrapper = mount(
       NodeScheduling,
       {
-        props: { mode, loading: false, value, nodes },
+        props: {
+          mode, loading: false, value, nodes
+        },
         ...requiredSetup(),
       }
     );

From b893bfaa7110054c5a19c67febc0c38b47d5a8b4 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 2 Jan 2025 17:31:37 +0100
Subject: [PATCH 08/57] Support caBundle plain text

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 .../tabs/registries/RegistryConfigs.vue                | 10 ++++++++--
 .../tabs/registries/__tests__/RegistryConfigs.test.ts  |  9 ++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/shell/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue b/shell/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue
index f377781073..62a0eceb56 100644
--- a/shell/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue
@@ -1,4 +1,5 @@
 <script>
+import { clone } from '@shell/utils/object';
 import ArrayListGrouped from '@shell/components/form/ArrayListGrouped';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { Checkbox } from '@components/Form/Checkbox';
@@ -6,6 +7,7 @@ import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthS
 import CreateEditView from '@shell/mixins/create-edit-view';
 import SecretSelector from '@shell/components/form/SecretSelector';
 import { SECRET_TYPES as TYPES } from '@shell/config/secret';
+import isBase64 from 'is-base64';
 import { base64Decode, base64Encode } from '@shell/utils/crypto';
 
 export default {
@@ -42,7 +44,7 @@ export default {
   },
 
   data() {
-    const configMap = this.value.spec.rkeConfig?.registries?.configs || {};
+    const configMap = clone(this.value.spec.rkeConfig?.registries?.configs) || {};
     const entries = [];
 
     const defaultAddValue = {
@@ -57,7 +59,11 @@ export default {
       if (configMap[hostname]) {
         configMap[hostname].insecureSkipVerify = configMap[hostname].insecureSkipVerify ?? defaultAddValue.insecureSkipVerify;
         configMap[hostname].authConfigSecretName = configMap[hostname].authConfigSecretName ?? defaultAddValue.authConfigSecretName;
-        configMap[hostname].caBundle = base64Decode(configMap[hostname].caBundle ?? defaultAddValue.caBundle);
+
+        const caBundle = configMap[hostname].caBundle ?? defaultAddValue.caBundle;
+
+        configMap[hostname].caBundle = isBase64(caBundle) ? base64Decode(caBundle) : caBundle;
+
         configMap[hostname].tlsSecretName = configMap[hostname].tlsSecretName ?? defaultAddValue.tlsSecretName;
       }
       entries.push({
diff --git a/shell/edit/provisioning.cattle.io.cluster/tabs/registries/__tests__/RegistryConfigs.test.ts b/shell/edit/provisioning.cattle.io.cluster/tabs/registries/__tests__/RegistryConfigs.test.ts
index f2120a9716..e310ea0626 100644
--- a/shell/edit/provisioning.cattle.io.cluster/tabs/registries/__tests__/RegistryConfigs.test.ts
+++ b/shell/edit/provisioning.cattle.io.cluster/tabs/registries/__tests__/RegistryConfigs.test.ts
@@ -23,10 +23,13 @@ describe('component: RegistryConfigs', () => {
   };
 
   describe('key CA Cert Bundle', () => {
-    it('should display default key', () => {
+    it.each([
+      ['source is plain text', 'Zm9vYmFy', 'foobar'],
+      ['source is base64', 'foobar', 'foobar'],
+    ])('should display key, %p', (_, sourceCaBundle, displayedCaBundle) => {
       const value = clone(PROV_CLUSTER);
 
-      value.spec.rkeConfig.registries.configs = { foo: { caBundle: 'Zm9vYmFy' } };
+      value.spec.rkeConfig.registries.configs = { foo: { caBundle: sourceCaBundle } };
 
       mountOptions.propsData.value = value;
 
@@ -37,7 +40,7 @@ describe('component: RegistryConfigs', () => {
 
       const registry = wrapper.findComponent('[data-testid^="registry-caBundle"]');
 
-      expect(registry.props().value).toBe('foobar');
+      expect(registry.props().value).toBe(displayedCaBundle);
     });
 
     it('should update key in base64 format', async() => {

From 710fe9da86381d94c759a07c9b7a70905783bb84 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Fri, 3 Jan 2025 12:17:30 +0100
Subject: [PATCH 09/57] Remove is-base64 dependency

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 package.json                                  |  1 -
 .../machine-config/harvester.vue              |  2 +-
 .../tabs/registries/RegistryConfigs.vue       |  2 +-
 shell/utils/string.js                         |  6 +++
 yarn.lock                                     | 50 +++++++++++++++----
 5 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 53d9ddb972..7cd6e8cfdb 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,6 @@
     "intl-messageformat": "7.8.4",
     "ip": "2.0.1",
     "ipaddr.js": "2.2.0",
-    "is-base64": "1.1.0",
     "is-url": "1.2.4",
     "jexl": "2.2.2",
     "jquery": "3.5.1",
diff --git a/pkg/harvester-manager/machine-config/harvester.vue b/pkg/harvester-manager/machine-config/harvester.vue
index 28dc209dce..af1539f762 100644
--- a/pkg/harvester-manager/machine-config/harvester.vue
+++ b/pkg/harvester-manager/machine-config/harvester.vue
@@ -3,7 +3,7 @@ import draggable from 'vuedraggable';
 import isEmpty from 'lodash/isEmpty';
 import jsyaml from 'js-yaml';
 import YAML from 'yaml';
-import isBase64 from 'is-base64';
+import { isBase64 } from '@shell/utils/string';
 
 import NodeAffinity from '@shell/components/form/NodeAffinity';
 import PodAffinity from '@shell/components/form/PodAffinity';
diff --git a/shell/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue b/shell/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue
index 62a0eceb56..5bd2bd32d5 100644
--- a/shell/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue
@@ -7,7 +7,7 @@ import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthS
 import CreateEditView from '@shell/mixins/create-edit-view';
 import SecretSelector from '@shell/components/form/SecretSelector';
 import { SECRET_TYPES as TYPES } from '@shell/config/secret';
-import isBase64 from 'is-base64';
+import { isBase64 } from '@shell/utils/string';
 import { base64Decode, base64Encode } from '@shell/utils/crypto';
 
 export default {
diff --git a/shell/utils/string.js b/shell/utils/string.js
index 898ec79069..060521c0f0 100644
--- a/shell/utils/string.js
+++ b/shell/utils/string.js
@@ -330,3 +330,9 @@ export function sanitizeIP(v) {
 export function xOfy(x, y) {
   return `${ typeof x === 'number' ? x : '?' }/${ typeof y === 'number' ? y : '?' }`;
 }
+
+export function isBase64(value) {
+  const base64regex = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/;
+
+  return base64regex.test(value);
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 9a487d7b49..2f6e87ed5c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8029,6 +8029,7 @@ eslint-plugin-jest@24.4.0:
 
 "eslint-plugin-local-rules@link:./eslint-plugin-local-rules":
   version "0.0.0"
+  uid ""
 
 "eslint-plugin-local-rules@link:eslint-plugin-local-rules":
   version "0.0.0"
@@ -9329,7 +9330,18 @@ html-tags@^3.3.1:
     tapable "^1.1.3"
     util.promisify "1.0.0"
 
-"html-webpack-plugin-5@npm:html-webpack-plugin@^5", html-webpack-plugin@^5.0.0, html-webpack-plugin@^5.1.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:
   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==
@@ -9667,11 +9679,6 @@ is-arrayish@^0.3.1:
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
   integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
-is-base64@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/is-base64/-/is-base64-1.1.0.tgz#8ce1d719895030a457c59a7dcaf39b66d99d56b4"
-  integrity sha512-Nlhg7Z2dVC4/PTvIFkgVVNvPHSO2eR/Yd0XzhGiXCXEvWnptXlXa/clQ8aePPiMuxEGcWfzWbGw2Fe3d+Y3v1g==
-
 is-bigint@^1.0.1:
   version "1.0.4"
   resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
@@ -13933,7 +13940,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -13950,6 +13957,15 @@ string-width@^2.1.1:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
 string-width@^5.0.1, string-width@^5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
@@ -14001,7 +14017,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -14022,6 +14038,13 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -15297,7 +15320,7 @@ worker-loader@3.0.8:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -15323,6 +15346,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 7632c5192b9c0206d06917ea3eb5cadead605bce Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Mon, 6 Jan 2025 19:03:04 +0000
Subject: [PATCH 10/57] fix keyboard nav on login screen (#12956)

* fix keyboard nav on login screen

* adjust for dark mode

* remove border radius from focus styles + dont open locale selector on focus

* add missing aria label

* minor fixes based on another PR comment

* remove tabbingindex from components + fix checkbox component disabled state

* remove tabbingindex from checkbox

* remove tabbingindex from LocaleSelector

* address pr comments
---
 .../src/components/Form/Checkbox/Checkbox.vue | 11 ++--
 shell/assets/translations/en-us.yaml          |  1 +
 shell/components/LocaleSelector.vue           | 54 +++++++++++++++++--
 shell/components/form/Password.vue            | 36 ++++++++-----
 4 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue b/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
index 22c6cdcce9..b54db05695 100644
--- a/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
+++ b/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
@@ -113,7 +113,7 @@ export default defineComponent({
     primary: {
       type:    Boolean,
       default: false
-    },
+    }
   },
 
   emits: ['update:value'],
@@ -227,7 +227,7 @@ export default defineComponent({
         :checked="isChecked"
         :value="valueWhenTrue"
         type="checkbox"
-        :tabindex="-1"
+        tabindex="-1"
         :name="id"
         @click.stop.prevent
       >
@@ -325,9 +325,14 @@ $fontColor: var(--input-label);
     width: 14px;
     background-color: var(--body-bg);
     border-radius: var(--border-radius);
-    transition: all 0.3s ease-out;
     border: 1px solid var(--border);
     flex-shrink: 0;
+
+    &:focus-visible {
+      @include focus-outline;
+      outline-offset: 2px;
+      border-radius: 0;
+    }
   }
 
   input {
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index b976eab397..da3170feb5 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -115,6 +115,7 @@ generic:
   basic: Basic
 
 locale:
+  menu: Locale selector menu
   en-us: English
   zh-hans: 简体中文
   none: (None)
diff --git a/shell/components/LocaleSelector.vue b/shell/components/LocaleSelector.vue
index e2abf5d0cb..3a310b61ea 100644
--- a/shell/components/LocaleSelector.vue
+++ b/shell/components/LocaleSelector.vue
@@ -11,7 +11,11 @@ export default {
     mode: {
       type:    String,
       default: ''
-    },
+    }
+  },
+
+  data() {
+    return { isLocaleSelectorOpen: false };
   },
 
   computed: {
@@ -40,8 +44,15 @@ export default {
   },
 
   methods: {
+    openLocaleSelector() {
+      this.isLocaleSelectorOpen = true;
+    },
+    closeLocaleSelector() {
+      this.isLocaleSelectorOpen = false;
+    },
     switchLocale($event) {
       this.$store.dispatch('i18n/switchTo', $event);
+      this.closeLocaleSelector();
     },
   }
 };
@@ -50,13 +61,28 @@ export default {
 <template>
   <div>
     <div v-if="mode === 'login'">
-      <div v-if="showLocale">
+      <div
+        v-if="showLocale"
+        role="menu"
+        :aria-label="t('locale.menu')"
+        class="locale-login-container"
+        tabindex="0"
+        @click="openLocaleSelector"
+        @blur.capture="closeLocaleSelector"
+        @keyup.enter="openLocaleSelector"
+        @keyup.space="openLocaleSelector"
+      >
         <v-dropdown
           popperClass="localeSelector"
+          :shown="isLocaleSelectorOpen"
           placement="top"
           distance="8"
           skidding="12"
-          :triggers="['click']"
+          :triggers="[]"
+          :autoHide="false"
+          :flip="false"
+          :container="false"
+          @focus.capture="openLocaleSelector"
         >
           <a
             data-testid="locale-selector"
@@ -74,13 +100,21 @@ export default {
                 v-if="showNone"
                 v-t="'locale.none'"
                 class="hand"
-                @click="switchLocale('none')"
+                tabindex="0"
+                role="menuitem"
+                @click.stop="switchLocale('none')"
+                @keyup.enter.stop="switchLocale('none')"
+                @keyup.space.stop="switchLocale('none')"
               />
               <li
                 v-for="(label, name) in availableLocales"
                 :key="name"
+                tabindex="0"
+                role="menuitem"
                 class="hand"
-                @click="switchLocale(name)"
+                @click.stop="switchLocale(name)"
+                @keyup.enter.stop="switchLocale(name)"
+                @keyup.space.stop="switchLocale(name)"
               >
                 {{ label }}
               </li>
@@ -114,6 +148,11 @@ export default {
   border-radius: 4px;
 }
 
+.hand:focus-visible {
+  @include focus-outline;
+  outline-offset: 4px;
+}
+
 .locale-chooser {
   cursor: pointer;
 
@@ -121,4 +160,9 @@ export default {
     text-decoration: none;
   }
 }
+
+.locale-login-container:focus-visible {
+  @include focus-outline;
+  outline-offset: 2px;
+}
 </style>
diff --git a/shell/components/form/Password.vue b/shell/components/form/Password.vue
index e9e81d75ee..6bd7dabf44 100644
--- a/shell/components/form/Password.vue
+++ b/shell/components/form/Password.vue
@@ -41,7 +41,7 @@ export default {
     mode: {
       type:    String,
       default: _CREATE,
-    },
+    }
   },
   data() {
     return { reveal: false };
@@ -68,6 +68,9 @@ export default {
       }
 
       return attributes;
+    },
+    hideShowLabel() {
+      return this.reveal ? this.t('action.hide') : this.t('action.show');
     }
   },
   watch: {
@@ -92,6 +95,9 @@ export default {
     },
     focus() {
       this.$refs.input.$refs.value.focus();
+    },
+    hideShowFn() {
+      this.reveal ? this.reveal = false : this.reveal = true;
     }
   }
 };
@@ -127,17 +133,15 @@ export default {
           class="addon"
         >
           <a
-            v-if="reveal"
-            tabindex="-1"
             href="#"
-            @click.prevent.stop="reveal = false"
-          >{{ t('action.hide') }}</a>
-          <a
-            v-else
-            tabindex="-1"
-            href="#"
-            @click.prevent.stop="reveal=true"
-          >{{ t('action.show') }}</a>
+            tabindex="0"
+            class="hide-show"
+            role="button"
+            @click.prevent.stop="hideShowFn"
+            @keyup.space.prevent.stop="hideShowFn"
+          >
+            {{ hideShowLabel }}
+          </a>
         </div>
       </template>
     </LabeledInput>
@@ -157,10 +161,16 @@ export default {
   .password {
     display: flex;
     flex-direction: column;
+
     .labeled-input {
       .addon {
-          padding-left: 12px;
-          min-width: 65px;
+        padding-left: 12px;
+        min-width: 65px;
+
+        .hide-show:focus-visible {
+          @include focus-outline;
+          outline-offset: 4px;
+        }
       }
     }
     .genPassword {

From 8a5cd702a4ff0f629f2421792dad3d703f4900b2 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 7 Jan 2025 09:28:29 +0000
Subject: [PATCH 11/57] fix keyboard nav for app bar (#12958)

* fix keyboard nav for app bar

* remove dones

* minor fixes based on another PR comment

* removed all space key for links + move floating-vue config to plugin definition

* rename tabbing-index to tab-order + add aria-label to main menu
---
 shell/assets/styles/base/_mixins.scss |   2 +-
 shell/assets/translations/en-us.yaml  |  15 +++
 shell/components/nav/Pinned.vue       |   7 +-
 shell/components/nav/TopLevelMenu.vue | 128 ++++++++++++++++++++++++--
 shell/plugins/floating-vue.js         |   2 +-
 5 files changed, 142 insertions(+), 12 deletions(-)

diff --git a/shell/assets/styles/base/_mixins.scss b/shell/assets/styles/base/_mixins.scss
index 8ee2d872b4..6e1496b302 100755
--- a/shell/assets/styles/base/_mixins.scss
+++ b/shell/assets/styles/base/_mixins.scss
@@ -159,4 +159,4 @@
 @mixin focus-outline {
   // Focus for form like elements (not to be confused with basic :focus style)
   outline: 2px solid var(--primary-keyboard-focus);
-}
\ No newline at end of file
+}
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index da3170feb5..cc01d7d5c6 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -121,6 +121,20 @@ locale:
   none: (None)
 
 nav:
+  ariaLabel:
+    topLevelMenu: Main menu
+    homePage: Home page navigation menu
+    cluster: Cluster menu item
+    harvesterCluster: Harvester cluster menu item
+    seeAll: See all clusters menu item
+    multiClusterApps: Main menu multi cluster app menu item
+    configurationApps: Main menu configuration app menu item
+    support: Support page link
+    about: About page link
+    pinCluster: Pin/Unpin cluster
+  alt:
+    mainMenuIcon: Main menu icon
+    mainMenuRancherLogo: Main menu Rancher logo
   expandCollapseAppBar: Expand/Collapse the Application Bar
   harvesterDashboard: Harvester Dashboard
   backToRancher: Cluster Manager
@@ -197,6 +211,7 @@ nav:
     placeholder: Filter clusters by...
     noResults: No matching clusters
     clusters: clusters
+    ariaLabel: Filter clusters on main menu
   resourceSearch:
     label: Resource Search
     toolTip: Resource Search {key}
diff --git a/shell/components/nav/Pinned.vue b/shell/components/nav/Pinned.vue
index 89f79eab95..2f27a5d0ae 100644
--- a/shell/components/nav/Pinned.vue
+++ b/shell/components/nav/Pinned.vue
@@ -5,6 +5,10 @@ export default {
     cluster: {
       type:     Object,
       required: true,
+    },
+    tabOrder: {
+      type:    Number,
+      default: null,
     }
   },
 
@@ -28,11 +32,12 @@ export default {
 
 <template>
   <i
-    :tabindex="0"
+    :tabindex="tabOrder"
     :aria-checked="!!pinned"
     class="pin icon"
     :class="{'icon-pin-outlined': !pinned, 'icon-pin': pinned}"
     aria-role="button"
+    :aria-label="`${t('nav.ariaLabel.pinCluster')} ${ cluster.label }`"
     @click.stop.prevent="toggle"
     @keydown.enter.prevent="toggle"
     @keydown.space.prevent="toggle"
diff --git a/shell/components/nav/TopLevelMenu.vue b/shell/components/nav/TopLevelMenu.vue
index b5905a2d56..03065c629e 100644
--- a/shell/components/nav/TopLevelMenu.vue
+++ b/shell/components/nav/TopLevelMenu.vue
@@ -485,6 +485,8 @@ export default {
         :class="{'menu-open': shown, 'menu-close':!shown}"
         :style="sideMenuStyle"
         tabindex="-1"
+        role="navigation"
+        :aria-label="t('nav.ariaLabel.topLevelMenu')"
       >
         <!-- Logo and name -->
         <div class="title">
@@ -504,6 +506,7 @@ export default {
               height="24"
               viewBox="0 0 24 24"
               width="24"
+              :alt="t('nav.alt.mainMenuIcon')"
             ><path
               d="M0 0h24v24H0z"
               fill="none"
@@ -512,6 +515,7 @@ export default {
           <div class="side-menu-logo">
             <BrandImage
               data-testid="side-menu__brand-img"
+              :alt="t('nav.alt.mainMenuRancherLogo')"
               file-name="rancher-logo.svg"
             />
           </div>
@@ -525,9 +529,12 @@ export default {
               <router-link
                 class="option cluster selector home"
                 :to="{ name: 'home' }"
+                role="link"
+                :aria-label="t('nav.ariaLabel.homePage')"
               >
                 <svg
                   v-clean-tooltip="getTooltipConfig(t('nav.home'))"
+                  class="top-menu-icon"
                   xmlns="http://www.w3.org/2000/svg"
                   height="24"
                   viewBox="0 0 24 24"
@@ -562,6 +569,8 @@ export default {
                   ref="clusterFilter"
                   v-model="clusterFilter"
                   :placeholder="t('nav.search.placeholder')"
+                  :tabindex="!shown ? -1 : 0"
+                  :aria-label="t('nav.search.ariaLabel')"
                 >
                 <i
                   class="magnifier icon icon-search"
@@ -583,10 +592,11 @@ export default {
               <a
                 v-if="isRancherInHarvester"
                 class="option"
+                tabindex="0"
                 @click="goToHarvesterCluster()"
               >
                 <i
-                  class="icon icon-dashboard"
+                  class="icon icon-dashboard app-icon"
                 />
                 <div>
                   {{ t('nav.harvesterDashboard') }}
@@ -602,8 +612,11 @@ export default {
                 class="option"
                 :to="a.to"
                 :class="{'active-menu-link': a.isMenuActive }"
+                role="link"
+                :aria-label="`${t('nav.ariaLabel.harvesterCluster')} ${ a.label }`"
               >
                 <IconOrSvg
+                  class="app-icon"
                   :icon="a.icon"
                   :src="a.svg"
                 />
@@ -637,6 +650,8 @@ export default {
                     class="cluster selector option"
                     :class="{'active-menu-link': c.isMenuActive }"
                     :to="c.clusterRoute"
+                    role="button"
+                    :aria-label="`${t('nav.ariaLabel.cluster')} ${ c.label }`"
                     @click.prevent="clusterMenuClick($event, c)"
                     @shortkey="handleKeyComboClick"
                   >
@@ -660,6 +675,7 @@ export default {
                     </div>
                     <Pinned
                       :cluster="c"
+                      :tab-order="shown ? 0 : -1"
                     />
                   </button>
                   <span
@@ -686,6 +702,7 @@ export default {
                     </div>
                     <Pinned
                       :cluster="c"
+                      :tab-order="shown ? 0 : -1"
                     />
                   </span>
                 </div>
@@ -712,6 +729,8 @@ export default {
                     class="cluster selector option"
                     :class="{'active-menu-link': c.isMenuActive }"
                     :to="c.clusterRoute"
+                    role="button"
+                    :aria-label="`${t('nav.ariaLabel.cluster')} ${ c.label }`"
                     @click="clusterMenuClick($event, c)"
                     @shortkey="handleKeyComboClick"
                   >
@@ -725,7 +744,6 @@ export default {
                       v-clean-tooltip="getTooltipConfig(c)"
                       class="cluster-name"
                     >
-                      <!-- HERE LOCAL CLUSTER! -->
                       <p>{{ c.label }}</p>
                       <p
                         v-if="c.description"
@@ -736,6 +754,7 @@ export default {
                     </div>
                     <Pinned
                       :class="{'showPin': c.pinned}"
+                      :tab-order="shown ? 0 : -1"
                       :cluster="c"
                     />
                   </button>
@@ -763,6 +782,7 @@ export default {
                     </div>
                     <Pinned
                       :class="{'showPin': c.pinned}"
+                      :tab-order="shown ? 0 : -1"
                       :cluster="c"
                     />
                   </span>
@@ -788,6 +808,8 @@ export default {
                 product: 'manager',
                 resource: 'provisioning.cattle.io.cluster'
               } }"
+              role="link"
+              :aria-label="t('nav.ariaLabel.seeAll')"
             >
               <span>
                 {{ shown ? t('nav.seeAllClusters') : t('nav.seeAllClustersCollapsed') }}
@@ -796,6 +818,7 @@ export default {
             </router-link>
           </template>
 
+          <!-- MULTI CLUSTER APPS -->
           <div class="category">
             <template v-if="multiClusterApps.length">
               <div
@@ -815,9 +838,12 @@ export default {
                   class="option"
                   :class="{'active-menu-link': a.isMenuActive }"
                   :to="a.to"
+                  role="link"
+                  :aria-label="`${t('nav.ariaLabel.multiClusterApps')} ${ a.label }`"
                 >
                   <IconOrSvg
                     v-clean-tooltip="getTooltipConfig(a.label)"
+                    class="app-icon"
                     :icon="a.icon"
                     :src="a.svg"
                   />
@@ -826,7 +852,7 @@ export default {
               </div>
             </template>
 
-            <!-- App menu -->
+            <!-- Configuration apps menu -->
             <template v-if="configurationApps.length">
               <div
                 class="category-title"
@@ -845,9 +871,12 @@ export default {
                   class="option"
                   :class="{'active-menu-link': a.isMenuActive }"
                   :to="a.to"
+                  role="link"
+                  :aria-label="`${t('nav.ariaLabel.configurationApps')} ${ a.label }`"
                 >
                   <IconOrSvg
                     v-clean-tooltip="getTooltipConfig(a.label)"
+                    class="app-icon"
                     :icon="a.icon"
                     :src="a.svg"
                   />
@@ -869,6 +898,8 @@ export default {
           >
             <router-link
               :to="{name: 'support'}"
+              role="link"
+              :aria-label="t('nav.ariaLabel.support')"
             >
               {{ t('nav.support', {hasSupport}) }}
             </router-link>
@@ -880,6 +911,8 @@ export default {
           >
             <router-link
               :to="{ name: 'about' }"
+              role="link"
+              :aria-label="t('nav.ariaLabel.about')"
             >
               {{ aboutText }}
             </router-link>
@@ -983,13 +1016,27 @@ export default {
     overflow: hidden;
     transition: width 250ms;
 
-    &:focus {
+    &:focus, &:focus-visible {
       outline: 0;
     }
 
-     &.menu-open {
+    .option:focus-visible {
+      outline: 0;
+    }
+
+    &.menu-open {
       width: 300px;
       box-shadow: 3px 1px 3px var(--shadow);
+
+      // because of accessibility, we force pin action to be visible on menu open
+      .pin {
+        display: block !important;
+
+        &:focus-visible {
+          @include focus-outline;
+          outline-offset: 4px;
+        }
+      }
     }
 
     .title {
@@ -1099,10 +1146,6 @@ export default {
         &:focus {
           outline: 0;
           box-shadow: none;
-
-          > div {
-            text-decoration: underline;
-          }
         }
 
         > i, > img {
@@ -1120,7 +1163,22 @@ export default {
           fill: var(--link);
         }
 
+        .top-menu-icon {
+          outline-offset: 4px;
+        }
+
         &.router-link-active, &.active-menu-link {
+          &:focus-visible {
+            .top-menu-icon, .app-icon {
+              @include focus-outline;
+            }
+          }
+
+          &:focus-visible .rancher-provider-icon {
+            @include focus-outline;
+            outline-offset: -4px;
+          }
+
           background: var(--primary-hover-bg);
           color: var(--primary-hover-text);
 
@@ -1137,6 +1195,12 @@ export default {
           }
         }
 
+        &:focus-visible {
+          .top-menu-icon, .rancher-provider-icon, .app-icon {
+            @include focus-outline;
+          }
+        }
+
         &:hover {
           color: var(--primary-hover-text);
           background: var(--primary-hover-bg);
@@ -1213,10 +1277,19 @@ export default {
         margin-right: 16px;
         margin-top: 10px;
 
+        &:focus-visible {
+          outline: none;
+        }
+
         span {
           display: flex;
           align-items: center;
         }
+
+        &:focus-visible span {
+          @include focus-outline;
+          outline-offset: 4px;
+        }
       }
 
       .clusters {
@@ -1339,6 +1412,33 @@ export default {
       }
     }
 
+    &.menu-open {
+      .option {
+        &.router-link-active, &.active-menu-link {
+          &:focus-visible {
+            @include focus-outline;
+            border-radius: 0;
+            outline-offset: -4px;
+
+            .top-menu-icon, .app-icon, .rancher-provider-icon {
+              outline: none;
+              border-radius: 0;
+            }
+          }
+        }
+
+        &:focus-visible {
+          @include focus-outline;
+          outline-offset: -4px;
+
+          .top-menu-icon, .app-icon, .rancher-provider-icon {
+            outline: none;
+            border-radius: 0;
+          }
+        }
+      }
+    }
+
     &.menu-close {
       .side-menu-logo  {
         opacity: 0;
@@ -1412,8 +1512,18 @@ export default {
         text-align: center;
       }
 
+      .support a:focus-visible {
+        @include focus-outline;
+        outline-offset: 4px;
+      }
+
       .version {
         cursor: pointer;
+
+        a:focus-visible {
+          @include focus-outline;
+          outline-offset: 4px;
+        }
       }
     }
   }
diff --git a/shell/plugins/floating-vue.js b/shell/plugins/floating-vue.js
index 69d66dfa5f..b9cb2ff148 100644
--- a/shell/plugins/floating-vue.js
+++ b/shell/plugins/floating-vue.js
@@ -1 +1 @@
-export const floatingVueOptions = { themes: { tooltip: { html: true } } };
+export const floatingVueOptions = { themes: { tooltip: { html: true, triggers: ['hover', 'touch'] } } };

From a7f1872970771d695ff0da83bcbc2be11be4c880 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 7 Jan 2025 11:10:39 +0100
Subject: [PATCH 12/57] Lint

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 shell/utils/string.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/utils/string.js b/shell/utils/string.js
index 060521c0f0..ac8d6f4892 100644
--- a/shell/utils/string.js
+++ b/shell/utils/string.js
@@ -335,4 +335,4 @@ export function isBase64(value) {
   const base64regex = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/;
 
   return base64regex.test(value);
-}
\ No newline at end of file
+}

From 3ef4c729be2a59435b5226bc12bb1ec45ebc8f53 Mon Sep 17 00:00:00 2001
From: ly5156 <361112237@qq.com>
Date: Tue, 7 Jan 2025 18:42:40 +0800
Subject: [PATCH 13/57] chore(workload): disable access to unreturned data
 attributes in data method

---
 shell/edit/workload/mixins/workload.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/shell/edit/workload/mixins/workload.js b/shell/edit/workload/mixins/workload.js
index c26dc28906..dce1633416 100644
--- a/shell/edit/workload/mixins/workload.js
+++ b/shell/edit/workload/mixins/workload.js
@@ -250,7 +250,6 @@ export default {
       }
     }
 
-    this.selectContainer(container);
     if (this.realMode === _CLONE && this.value.type === WORKLOAD_TYPES.JOB) {
       this.cleanUpClonedJobData();
     }
@@ -280,12 +279,10 @@ export default {
       podFsGroup:                 podTemplateSpec.securityContext?.fsGroup,
       savePvcHookName:            'savePvcHook',
       tabWeightMap:               TAB_WEIGHT_MAP,
-      fvFormRuleSets:             [{
-        path: 'image', rootObject: this.container, rules: ['required'], translationKey: 'workload.container.image'
-      }],
-      fvReportedValidationPaths: ['spec'],
-      isNamespaceNew:            false,
-      idKey:                     ID_KEY
+      fvFormRuleSets:             [],
+      fvReportedValidationPaths:  ['spec'],
+      isNamespaceNew:             false,
+      idKey:                      ID_KEY
     };
   },
 
@@ -605,6 +602,15 @@ export default {
       this.value['type'] = neu;
       delete this.value.apiVersion;
     },
+
+    container: {
+      handler(c) {
+        this.fvFormRuleSets = [{
+          path: 'image', rootObject: c, rules: ['required'], translationKey: 'workload.container.image'
+        }];
+      },
+      immediate: true
+    }
   },
 
   created() {
@@ -612,6 +618,8 @@ export default {
     this.registerBeforeHook(this.getPorts, 'getPorts');
 
     this.registerAfterHook(this.saveService, 'saveService');
+
+    this.selectContainer(this.container);
   },
 
   methods: {

From bf91d2298840638b34ba2b8b0fa854d2915022f8 Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 7 Jan 2025 16:55:18 +0000
Subject: [PATCH 14/57] fix wf catalog build on creators + creators version
 bump (#13002)

* fix wf catalog build on creators + creators version bump

* update extension docs with known issue from dependencies
---
 .../workflows/build-extension-catalog.yml     |  1 +
 creators/extension/package.json               |  2 +-
 docusaurus/docs/extensions/known-issues.md    | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/creators/extension/app/files/.github/workflows/build-extension-catalog.yml b/creators/extension/app/files/.github/workflows/build-extension-catalog.yml
index 61400830ef..1c2bb812a9 100644
--- a/creators/extension/app/files/.github/workflows/build-extension-catalog.yml
+++ b/creators/extension/app/files/.github/workflows/build-extension-catalog.yml
@@ -20,5 +20,6 @@ jobs:
     with:
       registry_target: ghcr.io
       registry_user: ${{ github.actor }}
+      tagged_release: ${{ github.ref_name }}
     secrets: 
       registry_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/creators/extension/package.json b/creators/extension/package.json
index 84c149a28f..9fc4d23e7f 100644
--- a/creators/extension/package.json
+++ b/creators/extension/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@rancher/create-extension",
   "description": "Rancher UI Extension generator",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "license": "Apache-2.0",
   "author": "SUSE",
   "packageManager": "yarn@4.5.0",
diff --git a/docusaurus/docs/extensions/known-issues.md b/docusaurus/docs/extensions/known-issues.md
index 12aa363ade..51b517621a 100644
--- a/docusaurus/docs/extensions/known-issues.md
+++ b/docusaurus/docs/extensions/known-issues.md
@@ -19,3 +19,23 @@ To resolve this add the following `resolution` to the root application's `packag
   ...
 }
 ```
+
+- Running `yarn install` might throw the following errors:
+```
+error @aws-sdk/types@3.723.0: The engine "node" is incompatible with this module. Expected version ">=18.0.0". Got "16.20.2"
+error @aws-sdk/util-locate-window@3.723.0: The engine "node" is incompatible with this module. Expected version ">=18.0.0". Got "16.20.2"
+```
+
+To resolve this add the following `resolutions` to the root application's `package.json`:
+```
+{
+  "name": "app-name",
+  "version": "0.1.0",
+  ...
+  resolutions": {
+    "@aws-sdk/types": "3.714.0",
+    "@aws-sdk/util-locate-window": "3.693.0"
+  },
+  ...
+}
+```

From 9553614394244581ecd96aa28bd9deb82122615a Mon Sep 17 00:00:00 2001
From: Alexandre Alves <alexandre.alves@suse.com>
Date: Tue, 7 Jan 2025 17:19:09 +0000
Subject: [PATCH 15/57] fix keyboard nav for home page (#12966)

* fix keyboard nav for home page

* minor fixes based on another PR comment

* add aria-sort to table column headers + remove space key bindings for links

* revert small change on Checkbox

* revert small change on Checkbox

* clear key space to trigger links

* change role for links that are in fact buttons + keep space key
---
 .../src/components/Banner/Banner.vue          | 12 +++++++++
 .../src/components/Form/Checkbox/Checkbox.vue |  7 ++++++
 shell/assets/styles/global/_button.scss       |  5 ++++
 shell/assets/translations/en-us.yaml          |  2 ++
 shell/components/ActionMenu.vue               |  8 ++++++
 shell/components/BannerGraphic.vue            | 10 ++++++++
 shell/components/ButtonMultiAction.vue        |  6 +++++
 shell/components/CommunityLinks.vue           | 13 ++++++++++
 shell/components/SortableTable/THead.vue      | 18 +++++++++++++
 shell/components/SortableTable/index.vue      |  3 +++
 shell/components/SortableTable/selection.js   | 24 ++++++++++++++----
 shell/pages/home.vue                          | 25 +++++++++++++++++--
 12 files changed, 126 insertions(+), 7 deletions(-)

diff --git a/pkg/rancher-components/src/components/Banner/Banner.vue b/pkg/rancher-components/src/components/Banner/Banner.vue
index 24d172a21c..8ca20a5670 100644
--- a/pkg/rancher-components/src/components/Banner/Banner.vue
+++ b/pkg/rancher-components/src/components/Banner/Banner.vue
@@ -67,6 +67,7 @@ export default defineComponent({
     :class="{
       [color]: true,
     }"
+    role="banner"
   >
     <div
       v-if="icon"
@@ -102,7 +103,12 @@ export default defineComponent({
       <div
         v-if="closable"
         class="banner__content__closer"
+        tabindex="0"
+        role="button"
+        :aria-label="t('generic.close')"
         @click="$emit('close')"
+        @keyup.enter="$emit('close')"
+        @keyup.space="$emit('close')"
       >
         <i
           data-testid="banner-close"
@@ -226,6 +232,7 @@ $icon-size: 24px;
       width: $icon-size;
       line-height: $icon-size;
       text-align: center;
+      outline: none;
 
       .closer-icon {
         opacity: 0.7;
@@ -235,6 +242,11 @@ $icon-size: 24px;
           color: var(--link);
         }
       }
+
+      &:focus-visible i {
+        @include focus-outline;
+        outline-offset: 2px;
+      }
     }
 
     &.icon {
diff --git a/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue b/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
index b54db05695..9bf64f0ad1 100644
--- a/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
+++ b/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
@@ -230,6 +230,7 @@ export default defineComponent({
         tabindex="-1"
         :name="id"
         @click.stop.prevent
+        @keyup.enter.stop.prevent
       >
       <span
         class="checkbox-custom"
@@ -342,6 +343,12 @@ $fontColor: var(--input-label);
     z-index: -1;
   }
 
+  input:focus-visible ~ .checkbox-custom {
+    @include focus-outline;
+    outline-offset: 2px;
+    border-radius: 0;
+  }
+
   input:checked ~ .checkbox-custom {
     background-color:var(--primary);
     -webkit-transform: rotate(0deg) scale(1);
diff --git a/shell/assets/styles/global/_button.scss b/shell/assets/styles/global/_button.scss
index 53b624a94a..fd8528a273 100644
--- a/shell/assets/styles/global/_button.scss
+++ b/shell/assets/styles/global/_button.scss
@@ -106,6 +106,11 @@ button,
       border: 0;
     }
   }
+
+  &:focus-visible {
+    @include focus-outline;
+    outline-offset: 2px;
+  }
 }
 
 .role-tertiary {
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index cc01d7d5c6..50e30986c8 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -4,6 +4,7 @@
 generic:
   add: Add
   all: All
+  ascending: ascending
   and: ' and '
   back: Back
   cancel: Cancel
@@ -19,6 +20,7 @@ generic:
   customize: Customize
   dashboard: Dashboard
   default: Default
+  descending: descending
   disabled: Disabled
   done: Done
   enabled: Enabled
diff --git a/shell/components/ActionMenu.vue b/shell/components/ActionMenu.vue
index ee8c0a806e..3dcc51236d 100644
--- a/shell/components/ActionMenu.vue
+++ b/shell/components/ActionMenu.vue
@@ -264,7 +264,10 @@ export default {
         :disabled="opt.disabled ? true : null"
         :class="{divider: opt.divider}"
         :data-testid="componentTestid + '-' + i + '-item'"
+        :tabindex="opt.divider ? -1 : 0"
         @click="execute(opt, $event)"
+        @keyup.enter="execute(opt, $event)"
+        @keyup.space="execute(opt, $event)"
       >
         <IconOrSvg
           v-if="opt.icon || opt.svg"
@@ -311,6 +314,11 @@ export default {
       padding: 8px 10px;
       margin: 0;
 
+      &:focus-visible {
+        @include focus-outline;
+        outline-offset: -2px;
+      }
+
       &[disabled] {
         cursor: not-allowed  !important;
         color: var(--disabled-text);
diff --git a/shell/components/BannerGraphic.vue b/shell/components/BannerGraphic.vue
index ba1b8d1d24..4e1dc69982 100644
--- a/shell/components/BannerGraphic.vue
+++ b/shell/components/BannerGraphic.vue
@@ -55,7 +55,12 @@ export default {
       v-if="pref"
       class="close-button"
       data-testid="graphic-banner-close"
+      tabindex="0"
+      :aria-label="t('generic.close')"
+      role="button"
       @click="hide()"
+      @keyup.enter="hide()"
+      @keyup.space="hide()"
     >
       <i class="icon icon-close" />
     </div>
@@ -72,6 +77,11 @@ export default {
     .close-button {
       position: absolute;
       visibility: hidden;
+
+      &:focus-visible {
+        @include focus-outline;
+        outline-offset: 2px;
+      }
     }
 
     &:hover .close-button {
diff --git a/shell/components/ButtonMultiAction.vue b/shell/components/ButtonMultiAction.vue
index a762013873..c9992fa400 100644
--- a/shell/components/ButtonMultiAction.vue
+++ b/shell/components/ButtonMultiAction.vue
@@ -33,6 +33,12 @@ const buttonClass = computed(() => {
 .borderless {
   background-color: transparent;
   border: none;
+
+  &:focus-visible {
+    @include focus-outline;
+    outline-offset: -2px;
+  }
+
   &:hover, &:focus {
     background-color: var(--accent-btn);
     box-shadow: none;
diff --git a/shell/components/CommunityLinks.vue b/shell/components/CommunityLinks.vue
index 70b39a2b61..37c31532d6 100644
--- a/shell/components/CommunityLinks.vue
+++ b/shell/components/CommunityLinks.vue
@@ -110,6 +110,8 @@ export default {
         <router-link
           v-if="link.value.startsWith('/') "
           :to="link.value"
+          role="link"
+          :aria-label="link.label"
         >
           {{ link.label }}
         </router-link>
@@ -118,6 +120,8 @@ export default {
           :href="link.value"
           rel="noopener noreferrer nofollow"
           target="_blank"
+          role="link"
+          :aria-label="link.label"
         > {{ link.label }} </a>
       </div>
       <slot />
@@ -127,7 +131,11 @@ export default {
       >
         <a
           class="link"
+          tabindex="0"
+          :aria-label="t('footer.wechat.title')"
+          role="link"
           @click="show"
+          @keyup.enter="show"
         >
           {{ t('footer.wechat.title') }}
         </a>
@@ -147,7 +155,12 @@ export default {
         <div>
           <button
             class="btn role-primary"
+            tabindex="0"
+            :aria-label="t('generic.close')"
+            role="button"
             @click="close"
+            @keyup.enter="close"
+            @keyup.space="close"
           >
             {{ t('generic.close') }}
           </button>
diff --git a/shell/components/SortableTable/THead.vue b/shell/components/SortableTable/THead.vue
index c08e249dad..8e215dad1f 100644
--- a/shell/components/SortableTable/THead.vue
+++ b/shell/components/SortableTable/THead.vue
@@ -162,6 +162,14 @@ export default {
       return col.name === this.sortBy;
     },
 
+    ariaSort(col) {
+      if (this.isCurrent(col)) {
+        return this.descending ? this.t('generic.descending') : this.t('generic.ascending');
+      }
+
+      return this.t('generic.none');
+    },
+
     tableColsOptionsClick(ev) {
       // set menu position
       const menu = document.querySelector('.table-options-container');
@@ -235,7 +243,12 @@ export default {
         :align="col.align || 'left'"
         :width="col.width"
         :class="{ sortable: col.sort, [col.breakpoint]: !!col.breakpoint}"
+        :tabindex="col.sort ? 0 : -1"
+        class="sortable-table-head-element"
+        :aria-sort="ariaSort(col)"
         @click.prevent="changeSort($event, col)"
+        @keyup.enter="changeSort($event, col)"
+        @keyup.space="changeSort($event, col)"
       >
         <div
           class="table-header-container"
@@ -428,6 +441,11 @@ export default {
       border: 0;
       color: var(--body-text);
 
+      &.sortable-table-head-element:focus-visible {
+        @include focus-outline;
+        outline-offset: -4px;
+      }
+
       .table-header-container {
         display: inline-flex;
 
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index 118e2ef239..d57fa4a40b 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -1222,6 +1222,7 @@ export default {
       class="sortable-table"
       :class="classObject"
       width="100%"
+      role="table"
     >
       <THead
         v-if="showHeaders"
@@ -1451,6 +1452,8 @@ export default {
                       :data-testid="componentTestid + '-' + i + '-action-button'"
                       :borderless="true"
                       @click="handleActionButtonClick(i, $event)"
+                      @keyup.enter="handleActionButtonClick(i, $event)"
+                      @keyup.space="handleActionButtonClick(i, $event)"
                     />
                   </slot>
                 </td>
diff --git a/shell/components/SortableTable/selection.js b/shell/components/SortableTable/selection.js
index c76b9db42d..ebc979cdb3 100644
--- a/shell/components/SortableTable/selection.js
+++ b/shell/components/SortableTable/selection.js
@@ -1,3 +1,4 @@
+import { mapGetters } from 'vuex';
 import { isMore, isRange, suppressContextMenu, isAlternate } from '@shell/utils/platform';
 import { get } from '@shell/utils/object';
 import { filterBy } from '@shell/utils/array';
@@ -29,6 +30,13 @@ export default {
   },
 
   computed: {
+    ...mapGetters({
+      // Use either these Vuex getters
+      // OR the props to set the action menu state,
+      // but don't use both.
+      targetElem: 'action-menu/elem',
+      shouldShow: 'action-menu/showing',
+    }),
     // Used for the table-level selection check-box to show checked (all selected)/intermediate (some selected)/unchecked (none selected)
     howMuchSelected() {
       const total = this.pagedRows.length;
@@ -270,11 +278,17 @@ export default {
           }
         }
 
-        this.$store.commit(`action-menu/show`, {
-          resources,
-          event: e,
-          elem:  actionElement
-        });
+        if (!this.targetElem && !this.shouldShow) {
+          this.$store.commit(`action-menu/show`, {
+            resources,
+            event: e,
+            elem:  actionElement
+          });
+        } else if (this.targetElem === actionElement && this.shouldShow) {
+          // this condition is needed so that we can "toggle" the action menu with
+          // the keyboard for accessibility (row action menu)
+          this.$store.commit('action-menu/hide');
+        }
 
         return;
       }
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index c9d3e16735..058087f927 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -504,16 +504,18 @@ export default defineComponent({
               {{ t('landing.seeWhatsNew') }}
             </div>
             <a
-              class="hand"
+              class="hand banner-link"
               :href="releaseNotesUrl"
+              role="link"
               target="_blank"
               rel="noopener noreferrer nofollow"
+              :aria-label="t('landing.whatsNewLink')"
               @click.stop="showWhatsNew"
+              @keyup.stop.enter="showWhatsNew"
             ><span v-clean-html="t('landing.whatsNewLink')" /></a>
           </Banner>
         </div>
       </div>
-
       <div class="row home-panels">
         <div class="col main-panel">
           <div
@@ -532,7 +534,11 @@ export default defineComponent({
                 </div>
                 <a
                   class="hand mr-20"
+                  tabindex="0"
+                  :aria-label="t('landing.landingPrefs.userPrefs')"
                   @click.prevent.stop="showUserPrefs"
+                  @keyup.prevent.stop.enter="showUserPrefs"
+                  @keyup.prevent.stop.space="showUserPrefs"
                 ><span v-clean-html="t('landing.landingPrefs.userPrefs')" /></a>
               </Banner>
             </div>
@@ -583,6 +589,9 @@ export default defineComponent({
                       :to="manageLocation"
                       class="btn btn-sm role-secondary"
                       data-testid="cluster-management-manage-button"
+                      role="button"
+                      :aria-label="t('cluster.manageAction')"
+                      @keyup.space="$router.push(manageLocation)"
                     >
                       {{ t('cluster.manageAction') }}
                     </router-link>
@@ -591,6 +600,9 @@ export default defineComponent({
                       :to="importLocation"
                       class="btn btn-sm role-primary"
                       data-testid="cluster-create-import-button"
+                      role="button"
+                      :aria-label="t('cluster.importAction')"
+                      @keyup.space="$router.push(importLocation)"
                     >
                       {{ t('cluster.importAction') }}
                     </router-link>
@@ -599,6 +611,9 @@ export default defineComponent({
                       :to="createLocation"
                       class="btn btn-sm role-primary"
                       data-testid="cluster-create-button"
+                      role="button"
+                      :aria-label="t('generic.create')"
+                      @keyup.space="$router.push(createLocation)"
                     >
                       {{ t('generic.create') }}
                     </router-link>
@@ -614,6 +629,8 @@ export default defineComponent({
                         <router-link
                           v-if="row.mgmt.isReady && !row.hasError"
                           :to="{ name: 'c-cluster-explorer', params: { cluster: row.mgmt.id }}"
+                          role="link"
+                          :aria-label="row.nameDisplay"
                         >
                           {{ row.nameDisplay }}
                         </router-link>
@@ -687,6 +704,10 @@ export default defineComponent({
 </template>
 
 <style lang='scss' scoped>
+  .banner-link:focus-visible {
+    @include focus-outline;
+  }
+
   .home-panels {
     display: flex;
     align-items: stretch;

From f980283813a608d102b04a2c330f2813027343c8 Mon Sep 17 00:00:00 2001
From: Richard Cox <18697775+richard-cox@users.noreply.github.com>
Date: Tue, 7 Jan 2025 22:13:42 +0000
Subject: [PATCH 16/57] Add server-side pagination to cluster explorer lists
 (#11672)

* cluster list now uses resource table

* New PaginatedResourceTable

* WIP

* add context to pag setting

* tidying up

* Add server-side pagination to cluster explorer events and general events list

* Servier-side pagination for catalog apps, cluster repo and operation

* Servier-side pagination for Service --> HPA, inmgress, services

* Server-side pagination for home page clusters list and side bar clusters

- Functional Changes
  - SSP now works after vue3 bump
  - Home Page Clusters list now uses server-side pagination
  - Side Bar clusters list now uses server-side pagination
  - Wire in now supported sorting / filtering by id and name used for table columns
  - Allow pagination to be enabled given a specific context
  - Call findPage without persisting to store

- New Pagination Tools
  - PaginatedResourceTable - Convenience Component, wraps ResourceTable with pagination specific props
  - PaginationWrapper - Convenience class to handle requests for resources and updates to them (avoiding store)

- Regressions
  - Side Nav menu ready state was `mgmtCluster.isReady && !pCluster?.hasError`, now ???

* fixes after merge. apply PagResTable to node list, vue3 fixes

* - Fix issue where list components containing PaginatedResourceTables would incorrectly fetch all resources anyway
- convert reminaing storage lists

* policy section

* fix async button in manual refresh mode

* fgh

* aaaaa

* Server-side pagination for home page clusters list and side bar clusters

- Functional Changes
  - SSP now works after vue3 bump
  - Home Page Clusters list now uses server-side pagination
  - Side Bar clusters list now uses server-side pagination
  - Wire in now supported sorting / filtering by id and name used for table columns
  - Allow pagination to be enabled given a specific context
  - Call findPage without persisting to store

- New Pagination Tools
  - PaginatedResourceTable - Convenience Component, wraps ResourceTable with pagination specific props
  - PaginationWrapper - Convenience class to handle requests for resources and updates to them (avoiding store)

- Regressions
  - Side Nav menu ready state was `mgmtCluster.isReady && !pCluster?.hasError`, now ???

* Iteration

Note - prov clusters is broken (only fetches local) due to blocking pr. breals
- notPinned list

* Fix dupe inStore
- remove from resource list, put in resource-fetch (used also by pag res table)

* Fix dupe inStore
- remove from resource list, put in resource-fetch (used also by pag res table)

* Two fixes
- changes namespaces kicked of side nav cluster requests (thought pinnedIds changed)
- fix generic lists re-fetching given ns filter changes (they don't have namespaced arg)

* fixes / updates

* testing/tidying

* WIP - Rest of workload lists

* finish off workloads

* tidying up

* fix non-generic list filtering by namespace

* remove comment, backport fix

* test fixes

* E2E: Ensure we wait for cluster entries to exist before clicking on them

* backport fix for local/api filtering

* Remove debug code

* Changes after review

* e2e fixes / debugging

* More e2e fixes

* More e2e fixes

* More e2e fixes

* Fix generic pages that filter on pagination

* Attempt to fix flaky vai test

* Fix after merge from master

* Updates following new indexed files

* Fix lint and test

* Changes given real cluster tests
- general fixes
- correct issue were sorting prov clusters on mgmt cluster props (issue in master as well...)
- bit the bullet, we now don't fetch all mgmt clusters on dashboard visit.
  - there could be knock on affects, but we'd need to remove it sometime in 2.11....

* Fix issues with diplaying rke1 data in home page
- includes https://github.com/rancher/dashboard/pull/12881

* Fix unit tests

* remove invalid sort/filter type

* Running through new indexed fields

* fix unit tests

* lint fixes

* Fixes after small review

* lint

* Test for check-plugin-gates pkg build from shell

* e2e fixes

* Testing new indexed fields with dev image

* tidyuing up imports in hope to fix ts error in check-plugins gate

* Fix failing check-plugin-gates
- caused by shell/scripts/test-plugins-build.sh importing list/catalog.cattle.io.clusterrepo.vue
- the component had been updated to a TS component
- check-plugin build outputs TS errors for a component file imports
- vs code shows no errors for imported file

* tidying up a smidge

* Many tweaks
- Remove final todo's
  - includes fix for service type clusterip/headless overlap
- Removed ununused ENDPOINT column (note ENDPOINT formatter used in other columns)
- Testing freshly added index fields

* Improve location of new place where componentWillFetch is set

* fix lint, comment updated

* Fix failing e2e tests
- fix cluster dashboard events test
- fix and greatly improve flaky events test
- fix hpa test
- functional fixes
  - fix sorting/filtering events by object type
  - fix hpa columns
---
 cypress/e2e/blueprints/nav/fake-cluster.ts    |   2 +-
 .../po/pages/explorer/cluster-dashboard.po.ts |   2 +-
 .../side-nav/main-side-menu.spec.ts           |   2 +-
 .../dashboard/cluster-dashboard.spec.ts       |  57 +++--
 .../pages/explorer/dashboard/events.spec.ts   | 202 ++++++++++++------
 .../horizontal-pod-autoscalers.spec.ts        |   9 +-
 cypress/globals.d.ts                          |   8 +-
 .../support/commands/rancher-api-commands.ts  |  41 +++-
 shell/assets/translations/en-us.yaml          |   1 +
 shell/components/AsyncButton.vue              |  12 +-
 shell/components/PaginatedResourceTable.vue   |   5 +-
 shell/components/ResourceList/index.vue       |   6 +-
 shell/components/ResourceTable.vue            |   2 +-
 shell/components/SortableTable/index.vue      |  10 +-
 .../components/form/ResourceLabeledSelect.vue |   2 +-
 shell/components/formatter/Endpoints.vue      |   2 +-
 shell/components/formatter/ServiceTargets.vue |   2 +-
 shell/components/formatter/ServiceType.vue    |  40 ++--
 shell/components/nav/TopLevelMenu.helper.ts   |   2 +-
 shell/config/pagination-table-headers.js      |  10 +-
 shell/config/product/apps.js                  |  93 +++++---
 shell/config/product/explorer.js              | 196 +++++++++++++++--
 shell/config/settings.ts                      |  22 +-
 shell/config/table-headers.js                 |  25 +--
 shell/list/catalog.cattle.io.app.vue          |  15 +-
 shell/list/catalog.cattle.io.clusterrepo.vue  |  84 +++++---
 shell/list/namespace.vue                      |   5 +-
 shell/list/networking.k8s.io.ingress.vue      |  25 ++-
 shell/list/node.vue                           | 128 +++++------
 shell/list/persistentvolume.vue               |  75 +++++--
 shell/list/persistentvolumeclaim.vue          |  18 +-
 shell/list/service.vue                        |  35 ++-
 shell/list/workload.vue                       |  84 +++-----
 shell/models/persistentvolume.js              |   4 +-
 shell/models/storage.k8s.io.storageclass.js   |   4 +
 .../pages/c/_cluster/explorer/EventsTable.vue |  74 +++++--
 shell/pages/c/_cluster/explorer/index.vue     |  19 +-
 .../pages/c/_cluster/settings/performance.vue |  27 ++-
 shell/pages/home.vue                          |   2 +-
 shell/pages/support/index.vue                 |   2 +-
 shell/plugins/steve/steve-pagination-utils.ts | 100 +++++++--
 shell/scripts/test-plugins-build.sh           |  17 +-
 shell/scripts/typegen.sh                      |   1 +
 shell/store/type-map.utils.ts                 |  15 +-
 shell/utils/cluster.js                        |   4 +-
 45 files changed, 1004 insertions(+), 487 deletions(-)

diff --git a/cypress/e2e/blueprints/nav/fake-cluster.ts b/cypress/e2e/blueprints/nav/fake-cluster.ts
index 8391e69528..de9a85f57b 100644
--- a/cypress/e2e/blueprints/nav/fake-cluster.ts
+++ b/cypress/e2e/blueprints/nav/fake-cluster.ts
@@ -2474,7 +2474,7 @@ function generateFakeNavClusterData(provClusterId = 'some-prov-cluster-id', mgmt
 }
 
 export function generateFakeClusterDataAndIntercepts(fakeProvClusterId = 'some-prov-cluster-id', fakeMgmtClusterId = 'some-mgmt-cluster-id', addEditClusterCapabilities = false): {} {
-  const longClusterDescription = 'this-is-some-really-really-really-really-really-really-long-decription';
+  const longClusterDescription = 'this-is-some-really-really-really-really-really-really-long-description';
   const fakeNavClusterData = generateFakeNavClusterData(fakeProvClusterId, fakeMgmtClusterId, addEditClusterCapabilities);
 
   // add cluster to fleet clusters for testing https://github.com/rancher/dashboard/issues/9984
diff --git a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
index 6eb0c38a2e..e3e6ad73d7 100644
--- a/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
+++ b/cypress/e2e/po/pages/explorer/cluster-dashboard.po.ts
@@ -57,7 +57,7 @@ export default class ClusterDashboardPagePo extends PagePo {
   }
 
   fullEventsLink() {
-    return cy.get('.events-table-link').contains('Full events list');
+    return cy.get('[data-testid="events-link"]').contains('Full events list');
   }
 
   fullSecretsList() {
diff --git a/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts b/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts
index 560a43f17f..ffc0ca298a 100644
--- a/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts
+++ b/cypress/e2e/tests/navigation/side-nav/main-side-menu.spec.ts
@@ -4,7 +4,7 @@ import PagePo from '@/cypress/e2e/po/pages/page.po';
 import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
 import { generateFakeClusterDataAndIntercepts } from '@/cypress/e2e/blueprints/nav/fake-cluster';
 
-const longClusterDescription = 'this-is-some-really-really-really-really-really-really-long-decription';
+const longClusterDescription = 'this-is-some-really-really-really-really-really-really-long-description';
 const fakeProvClusterId = 'some-fake-cluster-id';
 const fakeMgmtClusterId = 'some-fake-mgmt-id';
 
diff --git a/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts b/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
index 739bb22bff..5ea576f367 100644
--- a/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/dashboard/cluster-dashboard.spec.ts
@@ -48,7 +48,7 @@ describe('Cluster Dashboard', { testIsolation: 'off', tags: ['@explorer', '@admi
 
     clusterDashboard.waitForPage(undefined, 'cluster-events');
 
-    // check if burguer menu nav is highlighted correctly for local cluster
+    // check if burger menu nav is highlighted correctly for local cluster
     BurgerMenuPo.checkIfClusterMenuLinkIsHighlighted('local');
   });
 
@@ -257,48 +257,47 @@ describe('Cluster Dashboard', { testIsolation: 'off', tags: ['@explorer', '@admi
   });
 
   it('can view events table empty if no events', { tags: ['@vai', '@adminUser'] }, () => {
-    cy.visit(clusterDashboard.urlPath(), {
-      onBeforeLoad(win) {
-        cy.stub(win.console, 'error').as('consoleError');
-        cy.stub(win.console, 'warn').as('consoleWarn');
-      },
-    });
-
     eventsNoDataset();
     clusterDashboard.goTo();
 
-    cy.get('@consoleError').should('not.be.called'); // See error lot
-    cy.get('@consoleWarn').should('not.be.called'); // See warning log (there will be some....)
-
     cy.wait('@eventsNoData');
     clusterDashboard.waitForPage(undefined, 'cluster-events');
 
     clusterDashboard.eventsList().resourceTable().sortableTable().checkRowCount(true, 1);
 
-    const expectedHeaders = ['Reason', 'Object', 'Message', 'Name', 'Date'];
+    let expectedHeaders = ['Reason', 'Object', 'Message', 'Name', 'Date'];
 
-    clusterDashboard.eventsList().resourceTable().sortableTable().tableHeaderRow()
-      .within('.table-header-container .content')
-      .each((el, i) => {
-        expect(el.text().trim()).to.eq(expectedHeaders[i]);
-      });
+    cy.isVaiCacheEnabled().then((isVaiCacheEnabled) => {
+      if (isVaiCacheEnabled) {
+        expectedHeaders = ['Reason', 'Object', 'Message', 'Name', 'First Seen', 'Last Seen', 'Count'];
+      }
 
-    clusterDashboard.fullEventsLink().click();
-    cy.wait('@eventsNoData');
-    const events = new EventsPagePo('local');
+      clusterDashboard.eventsList().resourceTable().sortableTable().tableHeaderRow()
+        .self()
+        .scrollIntoView();
+      clusterDashboard.eventsList().resourceTable().sortableTable().tableHeaderRow()
+        .within('.table-header-container .content')
+        .each((el, i) => {
+          expect(el.text().trim()).to.eq(expectedHeaders[i]);
+        });
 
-    events.waitForPage();
+      clusterDashboard.fullEventsLink().click();
+      cy.wait('@eventsNoData');
+      const events = new EventsPagePo('local');
 
-    events.eventslist().resourceTable().sortableTable().checkRowCount(true, 1);
+      events.waitForPage();
 
-    const expectedFullHeaders = ['State', 'Last Seen', 'Type', 'Reason', 'Object',
-      'Subobject', 'Source', 'Message', 'First Seen', 'Count', 'Name', 'Namespace'];
+      events.eventslist().resourceTable().sortableTable().checkRowCount(true, 1);
 
-    events.eventslist().resourceTable().sortableTable().tableHeaderRow()
-      .within('.table-header-container .content')
-      .each((el, i) => {
-        expect(el.text().trim()).to.eq(expectedFullHeaders[i]);
-      });
+      const expectedFullHeaders = ['State', 'Last Seen', 'Type', 'Reason', 'Object',
+        'Subobject', 'Source', 'Message', 'First Seen', 'Count', 'Name', 'Namespace'];
+
+      events.eventslist().resourceTable().sortableTable().tableHeaderRow()
+        .within('.table-header-container .content')
+        .each((el, i) => {
+          expect(el.text().trim()).to.eq(expectedFullHeaders[i]);
+        });
+    });
   });
 
   describe('Cluster dashboard with limited permissions', () => {
diff --git a/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts b/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts
index 913405b771..4bac54da0c 100644
--- a/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/dashboard/events.spec.ts
@@ -7,6 +7,27 @@ import SortableTablePo from '@/cypress/e2e/po/components/sortable-table.po';
 const cluster = 'local';
 const clusterDashboard = new ClusterDashboardPagePo(cluster);
 const events = new EventsPagePo(cluster);
+const pageSize = 10;
+// Should be enough to create at least 3 pages of events
+const podCount = 15;
+
+const countHelper = {
+  setupCount: (vaiCacheEnabled: boolean, initialCount: number) => {
+    if (vaiCacheEnabled) {
+      cy.intercept('GET', '/v1/events?*').as('getCount');
+    } else {
+      cy.wrap(initialCount).as('count');
+    }
+  },
+  handleCount: (vaiCacheEnabled) => {
+    if (vaiCacheEnabled) {
+      cy.wait('@getCount').then((interception) => {
+        cy.wrap(interception.response.body.count).as('count');
+      });
+    }
+  },
+  getCount: () => cy.get('@count').then((count) => count as any as number),
+};
 
 describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] }, () => {
   before(() => {
@@ -20,7 +41,12 @@ describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] },
     let nsName2: string;
 
     before('set up', () => {
-      cy.updateNamespaceFilter(cluster, 'none', '{\"local\":[]}');
+      cy.tableRowsPerPageAndPreferences(pageSize, {
+        clusterName:     cluster,
+        groupBy:         'none',
+        namespaceFilter: '{\"local\":[]}',
+        allNamespaces:   'true',
+      });
 
       cy.createE2EResourceName('ns1').then((ns1) => {
         nsName1 = ns1;
@@ -30,7 +56,7 @@ describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] },
         // create pods
         let i = 0;
 
-        while (i < 125) {
+        while (i < podCount) {
           const podName = Cypress._.uniqueId(Date.now().toString());
 
           cy.createPod(nsName1, podName, 'nginx:latest', false, { createNameOptions: { prefixContext: true } }).then((resp) => {
@@ -52,6 +78,9 @@ describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] },
           uniquePod = resp.body.metadata.name;
         });
       });
+
+      // I'm loathed to do this, but the events created from the pods need to settle before we start
+      cy.wait(20000); // eslint-disable-line cypress/no-unnecessary-waiting
     });
 
     it('pagination is visible and user is able to navigate through events data', () => {
@@ -61,73 +90,113 @@ describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] },
       EventsPagePo.navTo();
       events.waitForPage();
 
-      cy.getRancherResource('v1', 'events').then((resp: Cypress.Response<any>) => {
-        // Why 500? there's a hardcoded figure to stops ui from storing more than 500 events ...
-        const count = resp.body.count < 500 ? resp.body.count : 500;
+      let vaiCacheEnabled = false;
 
-        // Test break down if less than 400...
-        expect(count).to.be.greaterThan(400);
+      cy.isVaiCacheEnabled()
+        .then((isVaiCacheEnabled) => {
+          vaiCacheEnabled = isVaiCacheEnabled;
 
-        // pagination is visible
-        events.sortableTable().pagination().checkVisible();
+          return cy.getRancherResource('v1', 'events');
+        })
+        .then((resp: Cypress.Response<any>) => {
+          let initialCount = resp.body.count;
 
-        const loadingPo = new LoadingPo('.title .resource-loading-indicator');
+          if (!vaiCacheEnabled && resp.body.count > 500) {
+            // Why 500? there's a hardcoded figure to stops ui from storing more than 500 events ...
+            initialCount = 500;
+          }
 
-        loadingPo.checkNotExists();
+          // Test break down if less than 3 pages...
+          expect(initialCount).to.be.greaterThan(3 * pageSize);
 
-        // basic checks on navigation buttons
-        events.sortableTable().pagination().beginningButton().isDisabled();
-        events.sortableTable().pagination().leftButton().isDisabled();
-        events.sortableTable().pagination().rightButton().isEnabled();
-        events.sortableTable().pagination().endButton().isEnabled();
+          // pagination is visible
+          events.sortableTable().pagination().checkVisible();
 
-        // check text before navigation
-        events.sortableTable().pagination().paginationText().then((el) => {
-          expect(el.trim()).to.eq(`1 - 100 of ${ count } Events`);
+          const loadingPo = new LoadingPo('.title .resource-loading-indicator');
+
+          loadingPo.checkNotExists();
+
+          // basic checks on navigation buttons
+          events.sortableTable().pagination().beginningButton().isDisabled();
+          events.sortableTable().pagination().leftButton().isDisabled();
+          events.sortableTable().pagination().rightButton().isEnabled();
+          events.sortableTable().pagination().endButton().isEnabled();
+
+          // check text before navigation
+          events.sortableTable().pagination().self().scrollIntoView();
+          events.sortableTable().pagination().paginationText().then((el) => {
+            expect(el.trim()).to.eq(`1 - ${ pageSize } of ${ initialCount } Events`);
+          });
+
+          // navigate to next page - right button
+          countHelper.setupCount(vaiCacheEnabled, initialCount);
+          events.sortableTable().pagination().rightButton().click();
+          countHelper.handleCount(vaiCacheEnabled);
+
+          // check text and buttons after navigation
+          events.sortableTable().pagination().self().scrollIntoView();
+          countHelper.getCount().then((count) => {
+            return events.sortableTable().pagination().paginationText().then((el) => {
+              expect(el.trim()).to.eq(`${ pageSize + 1 } - ${ 2 * pageSize } of ${ count } Events`);
+            });
+          });
+          events.sortableTable().pagination().beginningButton().isEnabled();
+          events.sortableTable().pagination().leftButton().isEnabled();
+
+          // navigate to first page - left button
+          countHelper.setupCount(vaiCacheEnabled, initialCount);
+          events.sortableTable().pagination().leftButton().click();
+          countHelper.handleCount(vaiCacheEnabled);
+
+          // check text and buttons after navigation
+          events.sortableTable().pagination().self().scrollIntoView();
+          countHelper.getCount().then((count) => {
+            return events.sortableTable().pagination().paginationText().then((el) => {
+              expect(el.trim()).to.eq(`1 - ${ pageSize } of ${ count } Events`);
+            });
+          });
+
+          events.sortableTable().pagination().beginningButton().isDisabled();
+          events.sortableTable().pagination().leftButton().isDisabled();
+
+          // navigate to last page - end button
+          countHelper.setupCount(vaiCacheEnabled, initialCount);
+          events.sortableTable().pagination().endButton().scrollIntoView()
+            .click();
+          countHelper.handleCount(vaiCacheEnabled);
+
+          // check text after navigation
+          events.sortableTable().pagination().self().scrollIntoView();
+          countHelper.getCount().then((count) => {
+            return events.sortableTable().pagination().paginationText().then((el) => {
+              let pages = Math.floor(count / pageSize);
+
+              if (count % pageSize === 0) {
+                pages--;
+              }
+              const from = (pages * pageSize) + 1;
+              const to = count;
+
+              expect(el.trim()).to.eq(`${ from } - ${ to } of ${ to } Events`);
+            });
+          });
+
+          // navigate to first page - beginning button
+          countHelper.setupCount(vaiCacheEnabled, initialCount);
+          events.sortableTable().pagination().beginningButton().click();
+          countHelper.handleCount(vaiCacheEnabled);
+
+          // check text and buttons after navigation
+          events.sortableTable().pagination().self().scrollIntoView();
+          countHelper.getCount().then((count) => {
+            events.sortableTable().pagination().paginationText().then((el) => {
+              expect(el.trim()).to.eq(`1 - ${ pageSize } of ${ count } Events`);
+            });
+          });
+
+          events.sortableTable().pagination().beginningButton().isDisabled();
+          events.sortableTable().pagination().leftButton().isDisabled();
         });
-
-        // navigate to next page - right button
-        events.sortableTable().pagination().rightButton().click();
-
-        // check text and buttons after navigation
-        events.sortableTable().pagination().paginationText().then((el) => {
-          expect(el.trim()).to.eq(`101 - 200 of ${ count } Events`);
-        });
-        events.sortableTable().pagination().beginningButton().isEnabled();
-        events.sortableTable().pagination().leftButton().isEnabled();
-
-        // navigate to first page - left button
-        events.sortableTable().pagination().leftButton().click();
-
-        // check text and buttons after navigation
-        events.sortableTable().pagination().paginationText().then((el) => {
-          expect(el.trim()).to.eq(`1 - 100 of ${ count } Events`);
-        });
-        events.sortableTable().pagination().beginningButton().isDisabled();
-        events.sortableTable().pagination().leftButton().isDisabled();
-
-        // navigate to last page - end button
-        events.sortableTable().pagination().endButton().scrollIntoView()
-          .click();
-
-        // check row count on last page
-        events.sortableTable().checkRowCount(false, 100);
-
-        // check text after navigation
-        events.sortableTable().pagination().paginationText().then((el) => {
-          expect(el.trim()).to.eq(`401 - ${ count } of ${ count } Events`);
-        });
-
-        // navigate to first page - beginning button
-        events.sortableTable().pagination().beginningButton().click();
-
-        // check text and buttons after navigation
-        events.sortableTable().pagination().paginationText().then((el) => {
-          expect(el.trim()).to.eq(`1 - 100 of ${ count } Events`);
-        });
-        events.sortableTable().pagination().beginningButton().isDisabled();
-        events.sortableTable().pagination().leftButton().isDisabled();
-      });
     });
 
     it('filter events', () => {
@@ -138,7 +207,7 @@ describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] },
 
       events.sortableTable().checkVisible();
       events.sortableTable().checkLoadingIndicatorNotVisible();
-      events.sortableTable().checkRowCount(false, 100);
+      events.sortableTable().checkRowCount(false, pageSize);
 
       // filter by namespace
       events.sortableTable().filter(nsName2);
@@ -201,7 +270,12 @@ describe('Events', { testIsolation: 'off', tags: ['@explorer', '@adminUser'] },
     });
 
     after('clean up', () => {
-      cy.updateNamespaceFilter(cluster, 'none', '{"local":["all://user"]}');
+      cy.tableRowsPerPageAndPreferences(100, {
+        clusterName:     cluster,
+        groupBy:         'none',
+        namespaceFilter: '{"local":["all://user"]}',
+        allNamespaces:   'false',
+      });
 
       // delete namespace (this will also delete all pods in it)
       cy.deleteRancherResource('v1', 'namespaces', nsName1);
diff --git a/cypress/e2e/tests/pages/explorer/service-discovery/horizontal-pod-autoscalers.spec.ts b/cypress/e2e/tests/pages/explorer/service-discovery/horizontal-pod-autoscalers.spec.ts
index 2fd6984c29..d7ba6706b1 100644
--- a/cypress/e2e/tests/pages/explorer/service-discovery/horizontal-pod-autoscalers.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/service-discovery/horizontal-pod-autoscalers.spec.ts
@@ -19,8 +19,11 @@ describe('HorizontalPodAutoscalers', { testIsolation: 'off', tags: ['@explorer',
       horizontalPodAutoscalersPage.waitForPage();
       cy.wait('@horizontalpodautoscalerNoData');
 
-      const expectedHeaders = ['State', 'Name', 'Workload', 'Minimum Replicas', 'Maximum Replicas', 'Current Replicas', 'Age'];
+      const expectedHeaders = ['State', 'Name', 'Namespace', 'Workload', 'Minimum Replicas', 'Maximum Replicas', 'Current Replicas', 'Age'];
 
+      horizontalPodAutoscalersPage.list().resourceTable().sortableTable().tableHeaderRow()
+        .self()
+        .scrollIntoView();
       horizontalPodAutoscalersPage.list().resourceTable().sortableTable().tableHeaderRow()
         .get('.table-header-container .content')
         .each((el, i) => {
@@ -39,7 +42,7 @@ describe('HorizontalPodAutoscalers', { testIsolation: 'off', tags: ['@explorer',
       horizontalPodAutoscalersPage.header().selectNamespaceFilterOption('All Namespaces');
 
       // check table headers are visible
-      const expectedHeaders = ['State', 'Name', 'Workload', 'Minimum Replicas', 'Maximum Replicas', 'Current Replicas', 'Age'];
+      const expectedHeaders = ['State', 'Name', 'Namespace', 'Workload', 'Minimum Replicas', 'Maximum Replicas', 'Current Replicas', 'Age'];
 
       horizontalPodAutoscalersPage.list().resourceTable().sortableTable().tableHeaderRow()
         .get('.table-header-container .content')
@@ -65,7 +68,7 @@ describe('HorizontalPodAutoscalers', { testIsolation: 'off', tags: ['@explorer',
       horizontalPodAutoscalersPage.list().resourceTable().sortableTable().groupByButtons(1)
         .click();
 
-      //  check table headers are visible
+      //  check table headers are visible (minus namespace given we're now grouped by it)
       const expectedHeaders = ['State', 'Name', 'Workload', 'Minimum Replicas', 'Maximum Replicas', 'Current Replicas', 'Age'];
 
       horizontalPodAutoscalersPage.list().resourceTable().sortableTable().tableHeaderRow()
diff --git a/cypress/globals.d.ts b/cypress/globals.d.ts
index 8d5b99566d..060c3b6e1e 100644
--- a/cypress/globals.d.ts
+++ b/cypress/globals.d.ts
@@ -99,7 +99,8 @@ declare global {
       deleteRancherResource(prefix: 'v3' | 'v1' | 'k8s', resourceType: string, resourceId: string, failOnStatusCode?: boolean): Chainable;
       deleteNodeTemplate(nodeTemplateId: string, timeout?: number, failOnStatusCode?: boolean)
 
-      tableRowsPerPageAndNamespaceFilter(rows: number, cluster: string, groupBy: string, namespacefilter: string, interation?: number)
+      tableRowsPerPageAndNamespaceFilter(rows: number, clusterName: string, groupBy: string, namespaceFilter: string)
+      tableRowsPerPageAndPreferences(rows: number, preferences: { clusterName: string, groupBy: string, namespaceFilter: string, allNamespaces: string}, iteration?: number)
 
       /**
        * update namespace filter
@@ -162,6 +163,11 @@ declare global {
        * Fetch the steve `revision` / timestamp of request
        */
       fetchRevision(): Chainable<string>;
+
+      /**
+       * Check if the vai FF is enabled
+       */
+      isVaiCacheEnabled(): Chainable<boolean>;
     }
   }
 }
diff --git a/cypress/support/commands/rancher-api-commands.ts b/cypress/support/commands/rancher-api-commands.ts
index 70a09fdb08..7afc70efa1 100644
--- a/cypress/support/commands/rancher-api-commands.ts
+++ b/cypress/support/commands/rancher-api-commands.ts
@@ -1024,39 +1024,58 @@ Cypress.Commands.add('fetchRevision', () => {
     });
 });
 
-Cypress.Commands.add('tableRowsPerPageAndNamespaceFilter', (rows: number, clusterName: string, groupBy: string, namespaceFilter: string, iteration = 0) => {
+/**
+ * Check if the vai FF is enabled
+ */
+Cypress.Commands.add('isVaiCacheEnabled', () => {
+  return cy.getRancherResource('v1', 'management.cattle.io.features', 'ui-sql-cache', 200)
+    .then((res) => res.body.spec.value === true || res.body.spec.value === 'true');
+});
+
+Cypress.Commands.add('tableRowsPerPageAndPreferences', (rows: number, preferences: { clusterName: string, groupBy: string, namespaceFilter: string, allNamespaces: string}, iteration = 0) => {
+  const {
+    clusterName, groupBy, namespaceFilter, allNamespaces
+  } = preferences;
+
   return cy.getRancherResource('v3', 'users?me=true').then((resp: Cypress.Response<any>) => {
     const userId = resp.body.data[0].id.trim();
     const payload = {
       id:   `${ userId }`,
       type: 'userpreference',
       data: {
-        cluster:         clusterName,
-        'per-page':      `${ rows }`,
-        'group-by':      groupBy,
-        'ns-by-cluster': namespaceFilter
+        cluster:          clusterName,
+        'per-page':       `${ rows }`,
+        'group-by':       groupBy,
+        'ns-by-cluster':  namespaceFilter,
+        'all-namespaces': allNamespaces,
       }
     };
 
-    cy.log(`tableRowsPerPageAndNamespaceFilter: /v1/userpreferences/${ userId }. Payload: ${ JSON.stringify(payload) }`);
+    cy.log(`tableRowsPerPageAndPreferences: /v1/userpreferences/${ userId }. Payload: ${ JSON.stringify(payload) }`);
 
     cy.setRancherResource('v1', 'userpreferences', userId, payload).then(() => {
       return cy.waitForRancherResource('v1', 'userpreferences', userId, (resp: any) => compare(resp?.body, payload))
         .then((res) => {
           if (res) {
-            cy.log(`tableRowsPerPageAndNamespaceFilter: Success!`);
+            cy.log(`tableRowsPerPageAndPreferences: Success!`);
           } else {
             if (iteration < 3) {
-              cy.log(`tableRowsPerPageAndNamespaceFilter: Failed! Going to retry...`);
+              cy.log(`tableRowsPerPageAndPreferences: Failed! Going to retry...`);
 
-              return cy.tableRowsPerPageAndNamespaceFilter(rows, clusterName, groupBy, namespaceFilter, iteration + 1);
+              return cy.tableRowsPerPageAndPreferences(rows, preferences, iteration + 1);
             }
 
-            cy.log(`tableRowsPerPageAndNamespaceFilter: Failed! Giving up...`);
+            cy.log(`tableRowsPerPageAndPreferences: Failed! Giving up...`);
 
-            return Promise.reject(new Error('tableRowsPerPageAndNamespaceFilter failed'));
+            return Promise.reject(new Error('tableRowsPerPageAndPreferences failed'));
           }
         });
     });
   });
 });
+
+Cypress.Commands.add('tableRowsPerPageAndNamespaceFilter', (rows: number, clusterName: string, groupBy: string, namespaceFilter: string) => {
+  return cy.tableRowsPerPageAndPreferences(rows, {
+    clusterName, groupBy, namespaceFilter
+  });
+});
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 50e30986c8..758c7a19d3 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -7583,6 +7583,7 @@ performance:
     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/components/AsyncButton.vue b/shell/components/AsyncButton.vue
index f847dc07df..e80d265d89 100644
--- a/shell/components/AsyncButton.vue
+++ b/shell/components/AsyncButton.vue
@@ -208,6 +208,10 @@ export default defineComponent({
       return this.disabled || this.phase === ASYNC_BUTTON_STATES.WAITING;
     },
 
+    isManualRefresh() {
+      return this.mode === 'manual-refresh';
+    },
+
     tooltip(): { content: string, hideOnTargetClick: boolean} | null {
       if ( this.labelAs === TOOLTIP ) {
         return {
@@ -283,12 +287,14 @@ export default defineComponent({
     :data-testid="componentTestid + '-async-button'"
     @click="clicked"
   >
-    <span v-if="mode === 'manual-refresh'">{{ t('action.refresh') }}</span>
+    <span
+      v-if="isManualRefresh"
+      :class="{'mr-10': displayIcon && size !== 'sm', 'mr-5': displayIcon && size === 'sm'}"
+    >{{ t('action.refresh') }}</span>
     <i
       v-if="displayIcon"
       v-clean-tooltip="tooltip"
-      :class="{icon: true, 'icon-lg': true, [displayIcon]: true}"
-      class="ml-5 mr-0"
+      :class="{icon: true, 'icon-lg': true, [displayIcon]: true, 'mr-0': isManualRefresh}"
     />
     <span
       v-if="labelAs === 'text' && displayLabel"
diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index 1099a75398..1861836414 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -93,8 +93,8 @@ export default defineComponent({
   },
 
   computed: {
-    safeHeaders() {
-      const customHeaders = this.canPaginate ? this.paginationHeaders : this.headers;
+    safeHeaders(): any[] {
+      const customHeaders: any[] = this.canPaginate ? this.paginationHeaders : this.headers;
 
       return customHeaders || this.$store.getters['type-map/headersFor'](this.schema, this.canPaginate);
     }
@@ -124,6 +124,7 @@ export default defineComponent({
       <template
         v-for="(_, slot) of $slots"
         v-slot:[slot]="scope"
+        :key="slot"
       >
         <slot
           :name="slot"
diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index 7d66ac2376..b19ceeca48 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -54,8 +54,10 @@ export default {
         this.customTypeDisplay = component.typeDisplay.apply(this);
       }
 
-      // If your list page has a fetch then it's responsible for populating rows itself
-      if ( component?.fetch ) {
+      // Is the custom component responsible fetching the resources?
+      // - Component has a fetch method - legacy method. fetch will handle the requests
+      // - Component contains the PaginatedResourceTable component - go forward method. PaginatedResourceTable owns fetching the resources
+      if ( component?.fetch || component?.components?.['PaginatedResourceTable']) {
         this.componentWillFetch = true;
       }
 
diff --git a/shell/components/ResourceTable.vue b/shell/components/ResourceTable.vue
index 86b4add452..76a89db545 100644
--- a/shell/components/ResourceTable.vue
+++ b/shell/components/ResourceTable.vue
@@ -167,7 +167,7 @@ export default {
       default: false
     },
     /**
-     * Manaul force the update of live and delayed cells. Change this number to kick off the update
+     * Manual force the update of live and delayed cells. Change this number to kick off the update
      */
     forceUpdateLiveAndDelayed: {
       type:    Number,
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index d57fa4a40b..5ec08d68f8 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -504,7 +504,7 @@ export default {
           if (neu) {
             this._altLoadingDelayTimer = setTimeout(() => {
               this.isLoading = true;
-            }, 200); // this should be higher than the targetted quick response
+            }, 200); // this should be higher than the targeted quick response
           } else {
             clearTimeout(this._altLoadingDelayTimer);
             this.isLoading = false;
@@ -575,11 +575,13 @@ export default {
     },
 
     showHeaderRow() {
+      // All of these are used to show content in the header
       return this.search ||
         this.tableActions ||
-        this.$slots['header-left']?.() ||
-        this.$slots['header-middle']?.() ||
-        this.$slots['header-right']?.();
+        this.$slots['header-left'] ||
+        this.$slots['header-middle'] ||
+        this.$slots['header-right'] ||
+        this.isTooManyItemsToAutoUpdate;
     },
 
     columns() {
diff --git a/shell/components/form/ResourceLabeledSelect.vue b/shell/components/form/ResourceLabeledSelect.vue
index dd9e0e16e4..3326a99279 100644
--- a/shell/components/form/ResourceLabeledSelect.vue
+++ b/shell/components/form/ResourceLabeledSelect.vue
@@ -27,7 +27,7 @@ export interface ResourceLabeledSelectPaginateSettings extends SharedSettings {
    */
   overrideRequest?: LabelSelectPaginateFn,
   /**
-   * Override the default settings used in the convience function to fetch a page of results
+   * Override the default settings used in the convenience function to fetch a page of results
    */
   requestSettings?: PaginateTypeOverridesFn,
 }
diff --git a/shell/components/formatter/Endpoints.vue b/shell/components/formatter/Endpoints.vue
index 57035bb1e0..9742006141 100644
--- a/shell/components/formatter/Endpoints.vue
+++ b/shell/components/formatter/Endpoints.vue
@@ -27,7 +27,7 @@ export default {
       const nodeWithExternal = nodes.find((node) => !!node.externalIp) || {};
       const externalIp = nodeWithExternal.externalIp;
 
-      if ( this.value && this.value.length ) {
+      if ( this.value?.length ) {
         let out ;
 
         try {
diff --git a/shell/components/formatter/ServiceTargets.vue b/shell/components/formatter/ServiceTargets.vue
index 15abb015cf..87b1c01848 100644
--- a/shell/components/formatter/ServiceTargets.vue
+++ b/shell/components/formatter/ServiceTargets.vue
@@ -95,7 +95,7 @@ export default {
     },
   },
 };
-</script>>
+</script>
 
 <template>
   <div>
diff --git a/shell/components/formatter/ServiceType.vue b/shell/components/formatter/ServiceType.vue
index 6521ad3e71..b35f01f757 100644
--- a/shell/components/formatter/ServiceType.vue
+++ b/shell/components/formatter/ServiceType.vue
@@ -17,28 +17,30 @@ export default {
     },
   },
   data() {
-    const { row } = this;
-    let cloned = this.value.toLowerCase();
+    const cloned = this.getLabel(this.value.toLowerCase());
+    const headless = this.value === 'ClusterIP' && this.row?.spec?.clusterIP === 'None' ? this.getLabel('headless') : undefined;
 
-    if (this.value === 'ClusterIP' && row?.spec?.clusterIP === 'None') {
-      cloned = 'headless';
-    }
-
-    const match = DEFAULT_SERVICE_TYPES.find((s) => s.id.toLowerCase() === cloned);
-    const translationLabel = match?.label;
-    let translated;
-
-    if (translationLabel && this.$store.getters['i18n/exists'](translationLabel)) {
-      translated = this.$store.getters['i18n/t'](translationLabel);
-    } else {
-      translated = this.value;
-    }
-
-    return { translated };
+    return { translated: cloned, headless };
   },
+
+  methods: {
+    getLabel(type) {
+      const match = DEFAULT_SERVICE_TYPES.find((s) => s.id.toLowerCase() === type);
+      const translationLabel = match?.label;
+      let translated;
+
+      if (translationLabel && this.$store.getters['i18n/exists'](translationLabel)) {
+        translated = this.$store.getters['i18n/t'](translationLabel);
+      } else {
+        translated = this.value;
+      }
+
+      return translated;
+    }
+  }
 };
-</script>>
+</script>
 
 <template>
-  <span>{{ translated }}</span>
+  <span>{{ translated }}{{ headless ? ` (${headless})` : '' }}</span>
 </template>
diff --git a/shell/components/nav/TopLevelMenu.helper.ts b/shell/components/nav/TopLevelMenu.helper.ts
index 706e1789a4..072f2a47e3 100644
--- a/shell/components/nav/TopLevelMenu.helper.ts
+++ b/shell/components/nav/TopLevelMenu.helper.ts
@@ -390,7 +390,7 @@ export class TopLevelMenuHelperPagination extends BaseTopLevelMenuHelper impleme
 }
 
 /**
- * Helper designed to supply non-pagainted results for the top level menu cluster resources
+ * Helper designed to supply non-paginated results for the top level menu cluster resources
  */
 export class TopLevelMenuHelperLegacy extends BaseTopLevelMenuHelper implements TopLevelMenuHelper {
   constructor({ $store }: {
diff --git a/shell/config/pagination-table-headers.js b/shell/config/pagination-table-headers.js
index 53d524ab03..6ae3cce8bd 100644
--- a/shell/config/pagination-table-headers.js
+++ b/shell/config/pagination-table-headers.js
@@ -1,4 +1,6 @@
-import { STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE } from '@shell/config/table-headers';
+import {
+  STATE, NAME as NAME_COL, NAMESPACE as NAMESPACE_COL, AGE, OBJECT
+} from '@shell/config/table-headers';
 
 // This file contains table headers
 // These table headers are used for server side pagination
@@ -44,6 +46,12 @@ export const STEVE_NAMESPACE_COL = {
   search: 'metadata.namespace',
 };
 
+export const STEVE_EVENT_OBJECT = {
+  ...OBJECT,
+  sort:   'involvedObject.kind',
+  search: 'involvedObject.kind',
+};
+
 export const STEVE_LIST_GROUPS = [{
   tooltipKey: 'resourceTable.groupBy.none',
   icon:       'icon-list-flat',
diff --git a/shell/config/product/apps.js b/shell/config/product/apps.js
index 5aa56a1365..cd37affb07 100644
--- a/shell/config/product/apps.js
+++ b/shell/config/product/apps.js
@@ -10,6 +10,7 @@ import {
 
 import { CATALOG } from '@shell/config/types';
 import { DSL } from '@shell/store/type-map';
+import { STEVE_AGE_COL, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL } from '@shell/config/pagination-table-headers';
 
 export const NAME = 'apps';
 
@@ -75,41 +76,73 @@ export function init(store) {
     dashIfEmpty: true,
   };
 
-  headers(CATALOG.APP, [STATE, NAME_COL, NAMESPACE, CHART, CHART_UPGRADE, APP_SUMMARY, AGE]);
+  headers(CATALOG.APP,
+    [STATE, NAME_COL, NAMESPACE, CHART, CHART_UPGRADE, APP_SUMMARY, AGE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, {
+      ...CHART,
+      sort:   ['spec.chart.metadata.name'],
+      search: ['spec.chart.metadata.name'],
+    }, {
+      ...CHART_UPGRADE,
+      sort:   false,
+      search: false,
+    },
+    APP_SUMMARY,
+    STEVE_AGE_COL]
+  );
   headers(CATALOG.REPO, [STATE, NAME_COL, NAMESPACE, repoType, repoUrl, repoBranch, AGE]);
-  headers(CATALOG.CLUSTER_REPO, [STATE, NAME_COL, repoType, repoUrl, repoBranch, AGE]);
+  headers(CATALOG.CLUSTER_REPO,
+    [STATE, NAME_COL, repoType, repoUrl, repoBranch, AGE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, {
+      ...repoType,
+      sort:   false,
+      search: false,
+    }, {
+      ...repoUrl,
+      sort:   false,
+      search: false,
+    },
+    repoBranch]
+  );
+
+  const opAction = {
+    name:     'action',
+    label:    'Action',
+    sort:     'status.action',
+    value:    'status.action',
+    labelKey: 'catalog.operation.tableHeaders.action',
+  };
+  const opReleaseNs = {
+    name:     'releaseNamespace',
+    label:    'Tgt Namespace',
+    sort:     'status.namespace',
+    value:    'status.namespace',
+    labelKey: 'catalog.operation.tableHeaders.releaseNamespace',
+  };
+  const opReleaseName = {
+    name:     'releaseName',
+    label:    'Tgt Release',
+    sort:     'status.releaseName',
+    value:    'status.releaseName',
+    labelKey: 'catalog.operation.tableHeaders.releaseName',
+  };
+
   headers(CATALOG.OPERATION, [
     STATE,
     NAME_COL,
     NAMESPACE,
-    {
-      name:     'action',
-      label:    'Action',
-      sort:     'status.action',
-      value:    'status.action',
-      labelKey: 'catalog.operation.tableHeaders.action',
-    },
-    {
-      name:     'releaseNamespace',
-      label:    'Tgt Namespace',
-      sort:     'status.namespace',
-      value:    'status.namespace',
-      labelKey: 'catalog.operation.tableHeaders.releaseNamespace',
-    },
-    {
-      name:     'releaseName',
-      label:    'Tgt Release',
-      sort:     'status.releaseName',
-      value:    'status.releaseName',
-      labelKey: 'catalog.operation.tableHeaders.releaseName',
-    },
+    opAction,
+    opReleaseNs,
+    opReleaseName,
     AGE
+  ],
+  [
+    STEVE_STATE_COL,
+    STEVE_NAME_COL,
+    STEVE_NAMESPACE_COL,
+    opAction,
+    opReleaseNs,
+    opReleaseName,
+    STEVE_AGE_COL
   ]);
 }
-
-//   name:      'cpu',
-//   labelKey:  'tableHeaders.cpu',
-//   sort:      'cpu',
-//   value:     'cpuUsagePercentage',
-//   formatter: 'PercentageBar'
-// };
diff --git a/shell/config/product/explorer.js b/shell/config/product/explorer.js
index 4ff4af1157..d5e2cece26 100644
--- a/shell/config/product/explorer.js
+++ b/shell/config/product/explorer.js
@@ -25,12 +25,13 @@ import {
 
 import { DSL } from '@shell/store/type-map';
 import {
-  STEVE_AGE_COL, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
+  STEVE_AGE_COL, STEVE_EVENT_OBJECT, STEVE_LIST_GROUPS, STEVE_NAMESPACE_COL, STEVE_NAME_COL, STEVE_STATE_COL
 } from '@shell/config/pagination-table-headers';
 
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 import { STEVE_CACHE } from '@shell/store/features';
 import { configureConditionalDepaginate } from '@shell/store/type-map.utils';
+import { CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
 
 export const NAME = 'explorer';
 
@@ -81,6 +82,7 @@ export function init(store) {
     POD_DISRUPTION_BUDGET,
     RESOURCE_QUOTA,
   ], 'policy');
+
   basicType([
     SERVICE,
     INGRESS,
@@ -216,7 +218,25 @@ export function init(store) {
    */
   configureType(MANAGEMENT.PSA, { localOnly: true });
 
-  headers(PV, [STATE, NAME_COL, RECLAIM_POLICY, PERSISTENT_VOLUME_CLAIM, PERSISTENT_VOLUME_SOURCE, PV_REASON, AGE]);
+  headers(PV,
+    [STATE, NAME_COL, RECLAIM_POLICY, PERSISTENT_VOLUME_CLAIM, PERSISTENT_VOLUME_SOURCE, PV_REASON, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      RECLAIM_POLICY,
+      {
+        ...PERSISTENT_VOLUME_CLAIM,
+        sort:   ['metadata.fields.5'],
+        search: ['metadata.fields.5'],
+      }, {
+        ...PERSISTENT_VOLUME_SOURCE,
+        sort:   false,
+        search: false,
+      },
+      PV_REASON,
+      STEVE_AGE_COL,
+    ]
+  );
 
   headers(CONFIG_MAP,
     [NAME_COL, NAMESPACE_COL, KEYS, AGE],
@@ -254,18 +274,142 @@ export function init(store) {
     STEVE_AGE_COL
   ]);
 
-  headers(INGRESS, [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, INGRESS_CLASS, AGE]);
-  headers(SERVICE, [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE]);
-  headers(EVENT, [STATE, { ...LAST_SEEN_TIME, defaultSort: true }, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL]);
-  headers(HPA, [STATE, NAME_COL, HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA, AGE]);
+  headers(INGRESS,
+    [STATE, NAME_COL, NAMESPACE_COL, INGRESS_TARGET, INGRESS_DEFAULT_BACKEND, INGRESS_CLASS, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+      {
+        ...INGRESS_TARGET,
+        sort:   'spec.rules[0].host', // Pending API support https://github.com/rancher/rancher/issues/48473 (index fields)
+        search: false, // This is broken in normal world, so disable here
+      },
+      {
+        ...INGRESS_DEFAULT_BACKEND,
+        sort:   false,
+        search: false,
+      },
+      {
+        ...INGRESS_CLASS,
+        sort:   'spec.ingressClassName',
+        search: 'spec.ingressClassName', // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
+      },
+      STEVE_AGE_COL
+    ]
+  );
+
+  headers(SERVICE,
+    [STATE, NAME_COL, NAMESPACE_COL, TARGET_PORT, SELECTOR, SPEC_TYPE, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+      TARGET_PORT,
+      {
+        // Selector is an object. This is broken in non-SSP world anyway (won't sort on object, filtering on `$[x][y]` paths are broken )
+        ...SELECTOR,
+        sort:   false,
+        search: false,
+      },
+      {
+        ...SPEC_TYPE,
+        sort:   false, // ['spec.type', 'spec.clusterIP'] Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
+        search: 'spec.type',
+      },
+      STEVE_AGE_COL
+    ]
+  );
+
+  const eventLastSeenTime = {
+    ...LAST_SEEN_TIME,
+    defaultSort: true,
+  };
+
+  headers(EVENT,
+    [STATE, eventLastSeenTime, EVENT_TYPE, REASON, OBJECT, 'Subobject', 'Source', MESSAGE, 'First Seen', 'Count', NAME_COL, NAMESPACE_COL],
+    [
+      STEVE_STATE_COL, {
+        ...eventLastSeenTime,
+        value: 'metadata.fields.0',
+        sort:  'metadata.fields.0',
+      }, {
+        ...EVENT_TYPE,
+        value: '_type',
+        sort:  '_type',
+      },
+      REASON,
+      STEVE_EVENT_OBJECT,
+      'Subobject',
+      'Source',
+      MESSAGE,
+      'First Seen',
+      'Count',
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+    ]
+  );
+  headers(HPA,
+    [STATE, NAME_COL, NAMESPACE_COL, HPA_REFERENCE, MIN_REPLICA, MAX_REPLICA, CURRENT_REPLICA, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      STEVE_NAMESPACE_COL,
+      HPA_REFERENCE, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      MIN_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      MAX_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      CURRENT_REPLICA, // Pending API support https://github.com/rancher/rancher/issues/48479 (hpa filtering)
+      STEVE_AGE_COL
+    ]
+  );
+
+  const STEVE_WORKLOAD_ENDPOINTS = {
+    ...WORKLOAD_ENDPOINTS,
+    sort:   [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`],
+    search: [`metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]`],
+  };
+
+  const createSteveWorkloadImageCol = (resourceFieldPos) => ({
+    ...WORKLOAD_IMAGES,
+    sort:   `metadata.fields.${ resourceFieldPos }`,
+    search: `metadata.fields.${ resourceFieldPos }`,
+  });
+
   headers(WORKLOAD, [STATE, NAME_COL, NAMESPACE_COL, TYPE, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.DEPLOYMENT, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.DAEMON_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.REPLICA_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.STATEFUL_SET, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.JOB, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Completions', DURATION, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.CRON_JOB, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
-  headers(WORKLOAD_TYPES.REPLICATION_CONTROLLER, [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE]);
+  headers(WORKLOAD_TYPES.DEPLOYMENT,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Up-to-date', 'Available', STEVE_AGE_COL],
+  );
+  headers(WORKLOAD_TYPES.DAEMON_SET,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(9), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', STEVE_AGE_COL]
+  );
+  headers(WORKLOAD_TYPES.REPLICA_SET,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', STEVE_AGE_COL],
+  );
+  headers(WORKLOAD_TYPES.STATEFUL_SET,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(4), STEVE_WORKLOAD_ENDPOINTS, 'Ready', STEVE_AGE_COL],
+  );
+  headers(WORKLOAD_TYPES.JOB,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Completions', DURATION, POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Completions', {
+      ...DURATION,
+      value:     'metadata.fields.3',
+      sort:      false,
+      search:    'metadata.fields.3',
+      formatter: undefined, // Now that sort/search is remote we're not doing weird things with start time (see `duration` in model)
+    }, STEVE_AGE_COL],
+  );
+  headers(WORKLOAD_TYPES.CRON_JOB,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(8), STEVE_WORKLOAD_ENDPOINTS, 'Schedule', 'Last Schedule', STEVE_AGE_COL]
+  );
+  headers(WORKLOAD_TYPES.REPLICATION_CONTROLLER,
+    [STATE, NAME_COL, NAMESPACE_COL, WORKLOAD_IMAGES, WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', POD_RESTARTS, AGE, WORKLOAD_HEALTH_SCALE],
+    [STEVE_STATE_COL, STEVE_NAME_COL, STEVE_NAMESPACE_COL, createSteveWorkloadImageCol(6), STEVE_WORKLOAD_ENDPOINTS, 'Ready', 'Current', 'Desired', STEVE_AGE_COL],
+  );
 
   headers(POD,
     [STATE, NAME_COL, NAMESPACE_COL, POD_IMAGES, 'Ready', 'Restarts', 'IP', NODE_COL, AGE],
@@ -281,7 +425,8 @@ export function init(store) {
         search: 'spec.nodeName'
       },
       STEVE_AGE_COL
-    ]);
+    ]
+  );
 
   headers(NODE,
     [
@@ -341,13 +486,32 @@ export function init(store) {
         search:     false,
       },
       STEVE_AGE_COL
-    ]);
+    ]
+  );
 
   headers(MANAGEMENT.PSA, [STATE, NAME_COL, {
     ...DESCRIPTION,
     width: undefined
   }, AGE]);
-  headers(STORAGE_CLASS, [STATE, NAME_COL, STORAGE_CLASS_PROVISIONER, STORAGE_CLASS_DEFAULT, AGE]);
+
+  headers(STORAGE_CLASS,
+    [STATE, NAME_COL, STORAGE_CLASS_PROVISIONER, STORAGE_CLASS_DEFAULT, AGE],
+    [
+      STEVE_STATE_COL,
+      STEVE_NAME_COL,
+      {
+        ...STORAGE_CLASS_PROVISIONER,
+        sort:   ['provisioner'],
+        search: ['provisioner']
+      },
+      {
+        ...STORAGE_CLASS_DEFAULT,
+        sort:   false, // [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
+        search: false, // [`metadata.annotations[${ STORAGE.DEFAULT_STORAGE_CLASS }]`], // Pending API Support - https://github.com/rancher/rancher/issues/48453
+      },
+      STEVE_AGE_COL
+    ]
+  );
 
   configureType(MANAGEMENT.CLUSTER_ROLE_TEMPLATE_BINDING, {
     listGroups: [
diff --git a/shell/config/settings.ts b/shell/config/settings.ts
index 70a29fe190..43c76e5bec 100644
--- a/shell/config/settings.ts
+++ b/shell/config/settings.ts
@@ -1,7 +1,16 @@
 // Settings
 import { GC_DEFAULTS, GC_PREFERENCES } from '@shell/utils/gc/gc-types';
 import { PaginationSettings } from '@shell/types/resources/settings';
-import { CAPI, MANAGEMENT } from '@shell/config/types';
+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,
@@ -250,7 +259,16 @@ export const DEFAULT_PERF_SETTING: PerfSettings = {
         resources: {
           enableAll:  false,
           enableSome: {
-            enabled: ['configmap', 'secret', 'pod', 'node'],
+            // 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,
           }
         }
diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js
index 3fdc317af8..05f3c723f9 100644
--- a/shell/config/table-headers.js
+++ b/shell/config/table-headers.js
@@ -82,7 +82,7 @@ export const EFFECT = {
 export const STORAGE_CLASS_PROVISIONER = {
   name:     'storage_class_provisioner',
   labelKey: 'tableHeaders.storage_class_provisioner',
-  value:    'provisionerDisplay',
+  value:    'provisionerListDisplay',
   sort:     ['provisioner'],
 };
 
@@ -94,6 +94,9 @@ export const STORAGE_CLASS_DEFAULT = {
   formatter: 'Checked',
 };
 
+/**
+ * spec.csi.driver OR spec[known driver type]
+ */
 export const PERSISTENT_VOLUME_SOURCE = {
   name:     'persistent_volume_source',
   labelKey: 'tableHeaders.persistentVolumeSource',
@@ -101,13 +104,16 @@ export const PERSISTENT_VOLUME_SOURCE = {
   sort:     ['provisioner'],
 };
 
+/**
+ * Link to the PVC associated with PV
+ */
 export const PERSISTENT_VOLUME_CLAIM = {
   name:          'persistent-volume-claim',
   labelKey:      'tableHeaders.persistentVolumeClaim',
-  sort:          ['nameSort'],
+  sort:          ['claimName'],
   value:         'claimName',
   formatter:     'LinkDetail',
-  formatterOpts: { reference: 'claim.detailLocation' },
+  formatterOpts: { reference: 'claim.detailLocation' }
 };
 
 export const OUTPUT = {
@@ -320,15 +326,6 @@ export const POD_RESTARTS = {
   liveUpdates:  true
 };
 
-export const ENDPOINTS = {
-  name:      'endpoint',
-  labelKey:  'tableHeaders.endpoints',
-  value:     'status.endpoints',
-  formatter: 'Endpoints',
-  width:     60,
-  align:     'center',
-};
-
 export const SCALE = {
   name:      'scale',
   labelKey:  'tableHeaders.scale',
@@ -657,8 +654,8 @@ export const TARGET_PORT = {
   formatter: 'ServiceTargets',
   labelKey:  'tableHeaders.targetPort',
   name:      'targetPort',
-  sort:      `$['spec']['targetPort']`,
-  value:     `$['spec']['targetPort']`,
+  sort:      false,
+  value:     false,
 };
 
 export const SELECTOR = {
diff --git a/shell/list/catalog.cattle.io.app.vue b/shell/list/catalog.cattle.io.app.vue
index 7d1b39d63c..05aaa0c460 100644
--- a/shell/list/catalog.cattle.io.app.vue
+++ b/shell/list/catalog.cattle.io.app.vue
@@ -1,11 +1,9 @@
 <script>
-import ResourceTable from '@shell/components/ResourceTable';
-import ResourceFetch from '@shell/mixins/resource-fetch';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
 
 export default {
   name:       'ListApps',
-  components: { ResourceTable },
-  mixins:     [ResourceFetch],
+  components: { PaginatedResourceTable },
 
   props: {
     resource: {
@@ -25,20 +23,15 @@ export default {
 
   async fetch() {
     await this.$store.dispatch('catalog/load');
-
-    await this.$fetchType(this.resource);
   },
 };
 </script>
 
 <template>
-  <ResourceTable
+  <PaginatedResourceTable
     class="apps"
     :schema="schema"
-    :rows="rows"
-    :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
     data-testid="installed-app-catalog-list"
   >
     <template #cell:upgrade="{row}">
@@ -56,7 +49,7 @@ export default {
         class="text-muted"
       />
     </template>
-  </ResourceTable>
+  </PaginatedResourceTable>
 </template>
 
 <style scoped>
diff --git a/shell/list/catalog.cattle.io.clusterrepo.vue b/shell/list/catalog.cattle.io.clusterrepo.vue
index 343ac972fb..ba7d66b64a 100644
--- a/shell/list/catalog.cattle.io.clusterrepo.vue
+++ b/shell/list/catalog.cattle.io.clusterrepo.vue
@@ -1,47 +1,81 @@
-<script>
-import ResourceTable from '@shell/components/ResourceTable';
+<script lang="ts">
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable.vue';
 import { CATALOG as CATALOG_ANNOTATIONS } from '@shell/config/labels-annotations';
+import ClusterRepo from '@shell/models/catalog.cattle.io.clusterrepo';
+import { PaginationArgs, PaginationParamFilter } from '@shell/types/store/pagination.types';
+import { defineComponent } from 'vue';
 
-export default {
-  name:       'ListClusterReposApps',
-  components: { ResourceTable },
-  props:      {
-    resource: {
-      type:     String,
-      required: true,
-    },
+export default defineComponent({
+  name: 'ListClusterReposApps',
+
+  components: { PaginatedResourceTable },
+
+  props: {
     schema: {
       type:     Object,
       required: true,
     },
-    rows: {
-      type:     Array,
-      required: true,
-    },
-    loading: {
-      type:     Boolean,
-      required: false,
-    },
     useQueryParamsForSimpleFiltering: {
       type:    Boolean,
       default: false
     }
   },
 
-  computed: {
-    filterHideRows() {
-      return this.rows.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
+  methods: {
+    /**
+     * Filter out hidden repos from list of all repos
+     */
+    filterRowsLocal(rows: ClusterRepo[]) {
+      return rows.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
+    },
+
+    /**
+     * Filter out hidden repos via api
+     */
+    filterRowsApi(pagination: PaginationArgs): PaginationArgs {
+      if (!pagination.filters) {
+        pagination.filters = [];
+      }
+
+      const field = `metadata.annotations[${ CATALOG_ANNOTATIONS.HIDDEN_REPO }]`;
+
+      let existing: PaginationParamFilter | null = null;
+
+      for (let i = 0; i < pagination.filters.length; i++) {
+        const filter = pagination.filters[i];
+
+        if (!!filter.fields.find((f) => f.field === field)) {
+          existing = filter;
+          break;
+        }
+      }
+
+      const required = PaginationParamFilter.createSingleField({
+        field,
+        exact:  true,
+        value:  'true',
+        equals: false
+      });
+
+      if (!!existing) {
+        Object.assign(existing, required);
+      } else {
+        pagination.filters.push(required);
+      }
+
+      return pagination;
     }
   }
-};
+
+});
 </script>
 
 <template>
   <div>
-    <ResourceTable
+    <PaginatedResourceTable
       :schema="schema"
-      :rows="filterHideRows"
-      :loading="loading"
+      :local-filter="filterRowsLocal"
+      :api-filter="filterRowsApi"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
       data-testid="app-cluster-repo-list"
     />
diff --git a/shell/list/namespace.vue b/shell/list/namespace.vue
index 3f2264f410..d9c12fe851 100644
--- a/shell/list/namespace.vue
+++ b/shell/list/namespace.vue
@@ -1,6 +1,9 @@
 <script>
+/**
+ * This file is used in shell/scripts/test-plugins-build.sh (creates an extension with it in, and builds using a shell built from source)
+ */
 import { mapGetters } from 'vuex';
-import { NS_SNAPSHOT_QUOTA } from '../config/table-headers';
+import { NS_SNAPSHOT_QUOTA } from '@shell/config/table-headers';
 import ResourceTable from '@shell/components/ResourceTable';
 import { HCI } from '@shell/config/types';
 export default {
diff --git a/shell/list/networking.k8s.io.ingress.vue b/shell/list/networking.k8s.io.ingress.vue
index beb13bb7e3..c01c022274 100644
--- a/shell/list/networking.k8s.io.ingress.vue
+++ b/shell/list/networking.k8s.io.ingress.vue
@@ -1,9 +1,8 @@
 <script>
-import ResourceTable from '@shell/components/ResourceTable';
-import ResourceFetch from '@shell/mixins/resource-fetch';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
+
 export default {
-  components: { ResourceTable },
-  mixins:     [ResourceFetch],
+  components: { PaginatedResourceTable },
   props:      {
     resource: {
       type:     String,
@@ -18,19 +17,23 @@ export default {
       default: false
     }
   },
-  async fetch() {
-    // pathExistsInSchema requires schema networking.k8s.io.ingress to have resources fields via schema definition but none were found. has the schema 'fetchResourceFields' been called?
-    await Promise.all([this.schema.fetchResourceFields(), this.$fetchType(this.resource)]);
+
+  methods: {
+    /**
+     * opts: FetchSecondaryResourcesOpts
+     */
+    async fetchSecondaryResources(opts) {
+      // pathExistsInSchema requires schema networking.k8s.io.ingress to have resources fields via schema definition but none were found. has the schema 'fetchResourceFields' been called?
+      await this.schema.fetchResourceFields();
+    }
   }
 };
 </script>
 
 <template>
-  <ResourceTable
+  <PaginatedResourceTable
     :schema="schema"
-    :rows="rows"
-    :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+    :fetchSecondaryResources="fetchSecondaryResources"
   />
 </template>
diff --git a/shell/list/node.vue b/shell/list/node.vue
index 0c0595320b..cc4c6303b0 100644
--- a/shell/list/node.vue
+++ b/shell/list/node.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import ResourceTable from '@shell/components/ResourceTable.vue';
+import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
 import Tag from '@shell/components/Tag.vue';
 import { Banner } from '@components/Banner';
 import { PODS } from '@shell/config/table-headers';
@@ -15,22 +15,21 @@ import {
   CAPI,
   MANAGEMENT, METRIC, NODE, NORMAN, POD
 } from '@shell/config/types';
-import { allHash } from '@shell/utils/promise';
 import { GROUP_RESOURCES, mapPref } from '@shell/store/prefs';
 import { COLUMN_BREAKPOINTS } from '@shell/types/store/type-map';
 
-import ResourceFetch from '@shell/mixins/resource-fetch';
 import { mapGetters } from 'vuex';
-import { FetchPageSecondaryResourcesOpts } from 'components/PaginatedResourceTable.vue';
 
 export default defineComponent({
-  name:       'ListNode',
+  name: 'ListNode',
+
   components: {
-    ResourceTable,
+    PaginatedResourceTable,
     Tag,
     Banner
   },
-  mixins: [metricPoller, ResourceFetch],
+
+  mixins: [metricPoller],
 
   props: {
     resource: {
@@ -54,15 +53,6 @@ export default defineComponent({
     }
   },
 
-  async fetch() {
-    this.$initializeFetchData(this.resource);
-
-    await allHash({
-      kubeNodes: this.$fetchType(this.resource),
-      ...this.fetchSecondaryResources(),
-    });
-  },
-
   data() {
     return {
       // Pods required for `Pods` column's running pods metrics
@@ -91,38 +81,27 @@ export default defineComponent({
 
   computed: {
     ...mapGetters(['currentCluster']),
+
+    kubeNodes() {
+      // Note if server side pagination is used this is only the current page
+      return this.$store.getters[`cluster/all`](this.resource);
+    },
+
     hasWindowsNodes() {
       // Note if server side pagination is used this is only applicable to the current page
-      return (this.rows || []).some((node: any) => node.status.nodeInfo.operatingSystem === 'windows');
+      return (this.kubeNodes || []).some((node: any) => node.status.nodeInfo.operatingSystem === 'windows');
     },
 
     tableGroup: mapPref(GROUP_RESOURCES),
 
+    canPaginate() {
+      const args = { id: this.resource?.id || this.resource };
+
+      return this.resource && this.$store.getters[`cluster/paginationEnabled`]?.(args);
+    },
+
     headers() {
       // This is all about adding the pods column... if the user can see pods
-
-      if (this.canPaginate) {
-        const paginationHeaders = [...this.$store.getters['type-map/headersFor'](this.schema, true)];
-
-        if (paginationHeaders) {
-          if (this.canViewPods) {
-            paginationHeaders.splice(paginationHeaders.length - 1, 0, {
-              ...PODS,
-              breakpoint: COLUMN_BREAKPOINTS.DESKTOP,
-              sort:       false,
-              search:     false,
-              getValue:   (row: any) => row.podConsumedUsage
-            });
-          }
-
-          return paginationHeaders;
-        } else {
-          console.warn('Nodes list expects pagination headers but none found'); // eslint-disable-line no-console
-
-          return [];
-        }
-      }
-
       const headers = [...this.$store.getters['type-map/headersFor'](this.schema, false)];
 
       if (this.canViewPods) {
@@ -135,6 +114,34 @@ export default defineComponent({
 
       return headers;
     },
+
+    paginationHeaders() {
+      // This is all about adding the pods column... if the user can see pods
+
+      if (!this.canPaginate) {
+        return [];
+      }
+
+      const paginationHeaders = [...this.$store.getters['type-map/headersFor'](this.schema, true)];
+
+      if (paginationHeaders) {
+        if (this.canViewPods) {
+          paginationHeaders.splice(paginationHeaders.length - 1, 0, {
+            ...PODS,
+            breakpoint: COLUMN_BREAKPOINTS.DESKTOP,
+            sort:       false,
+            search:     false,
+            getValue:   (row: any) => row.podConsumedUsage
+          });
+        }
+
+        return paginationHeaders;
+      } else {
+        console.warn('Nodes list expects pagination headers but none found'); // eslint-disable-line no-console
+
+        return [];
+      }
+    },
   },
 
   methods: {
@@ -144,7 +151,7 @@ export default defineComponent({
       }
 
       if (this.canPaginate) {
-        if (!this.rows.length) {
+        if (!this.kubeNodes.length) {
           return;
         }
 
@@ -152,7 +159,7 @@ export default defineComponent({
           force:      true,
           pagination: new FilterArgs({
             filters: new PaginationParamFilter({
-              fields: this.rows.map((r: any) => new PaginationFilterField({
+              fields: this.kubeNodes.map((r: any) => new PaginationFilterField({
                 field: 'metadata.name',
                 value: r.id
               }))
@@ -179,27 +186,23 @@ export default defineComponent({
     },
 
     fetchSecondaryResources(): { [key: string]: Promise<any>} {
-      if (this.canPaginate) {
-        return {};
-      }
-
       const hash: { [key: string]: Promise<any>} = {};
 
       if (this.canViewMgmtNodes) {
-        hash.mgmtNodes = this.$fetchType(MANAGEMENT.NODE, [], 'management');
+        hash.mgmtNodes = this.$store.dispatch(`management/findAll`, { type: MANAGEMENT.NODE });
       }
 
       if (this.canViewNormanNodes) {
-        hash.normanNodes = this.$fetchType(NORMAN.NODE, [], 'rancher');
+        hash.normanNodes = this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE });
       }
 
       if (this.canViewMachines) {
-        hash.machines = this.$fetchType(CAPI.MACHINE, [], 'management');
+        hash.machines = this.$store.dispatch(`management/findAll`, { type: CAPI.MACHINE });
       }
 
       if (this.canViewPods) {
         // No need to block on this
-        this.$fetchType(POD);
+        this.$store.dispatch(`cluster/findAll`, { type: POD });
       }
 
       return hash;
@@ -208,7 +211,7 @@ export default defineComponent({
     /**
      * Nodes columns need other resources in order to show data in some columns
      *
-     * In the paginated world we want to resrict the fetch of those resources to only the one's we need
+     * In the paginated world we want to restrict the fetch of those resources to only the one's we need
      *
      * So when we have a page.... use those entries as filters when fetching the other resources
      */
@@ -218,6 +221,11 @@ export default defineComponent({
       }
 
       if (this.canViewMgmtNodes && this.canViewNormanNodes) {
+        if (this.canViewNormanNodes) {
+          // Ideally we only fetch the nodes we need....
+          this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE });
+        }
+
         // We only fetch mgmt node to get norman node. We only fetch node to get node actions
         // See https://github.com/rancher/dashboard/issues/10743
         const opt: ActionFindPageArgs = {
@@ -230,10 +238,7 @@ export default defineComponent({
           })
         };
 
-        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE, opt })
-          .then(() => {
-            this.$store.dispatch(`rancher/findAll`, { type: NORMAN.NODE, opt: { force } });
-          });
+        this.$store.dispatch(`management/findPage`, { type: MANAGEMENT.NODE, opt });
       }
 
       if (this.canViewMachines) {
@@ -296,19 +301,16 @@ export default defineComponent({
       color="info"
       :label="t('cluster.custom.registrationCommand.windowsWarning')"
     />
-    <ResourceTable
+    <PaginatedResourceTable
       v-bind="$attrs"
       :schema="schema"
       :headers="headers"
-      :rows="rows"
+      :paginationHeaders="paginationHeaders"
       :sub-rows="true"
-      :loading="loading"
+      :fetchSecondaryResources="fetchSecondaryResources"
+      :fetchPageSecondaryResources="fetchPageSecondaryResources"
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
       data-testid="cluster-node-list"
-      :external-pagination-enabled="canPaginate"
-      :external-pagination-result="paginationResult"
-      @pagination-changed="paginationChanged"
     >
       <template #sub-row="{fullColspan, row, onRowMouseEnter, onRowMouseLeave}">
         <tr
@@ -371,7 +373,7 @@ export default defineComponent({
           </td>
         </tr>
       </template>
-    </ResourceTable>
+    </PaginatedResourceTable>
   </div>
 </template>
 
diff --git a/shell/list/persistentvolume.vue b/shell/list/persistentvolume.vue
index 3bb6c697bb..1daf5583b1 100644
--- a/shell/list/persistentvolume.vue
+++ b/shell/list/persistentvolume.vue
@@ -1,13 +1,16 @@
-<script>
-import ResourceTable from '@shell/components/ResourceTable';
+<script lang="ts">
+import { defineComponent } from 'vue';
+import PaginatedResourceTable, { FetchPageSecondaryResourcesOpts } from '@shell/components/PaginatedResourceTable.vue';
 import { PVC } from '@shell/config/types';
-import ResourceFetch from '@shell/mixins/resource-fetch';
+import { ActionFindPageArgs } from '@shell/types/store/dashboard-store.types';
+import { FilterArgs, PaginationFilterField, PaginationParamFilter } from '@shell/types/store/pagination.types';
 
-export default {
-  name:       'ListPersistentVolume',
-  components: { ResourceTable },
-  mixins:     [ResourceFetch],
-  props:      {
+export default defineComponent({
+  name: 'ListPersistentVolume',
+
+  components: { PaginatedResourceTable },
+
+  props: {
     resource: {
       type:     String,
       required: true,
@@ -21,26 +24,58 @@ export default {
     useQueryParamsForSimpleFiltering: {
       type:    Boolean,
       default: false
-    }
+    },
+
+    overflowX: {
+      type:    Boolean,
+      default: false
+    },
+
+    overflowY: {
+      type:    Boolean,
+      default: false
+    },
   },
 
-  async fetch() {
-    this.$initializeFetchData(this.resource);
+  methods: {
+    fetchSecondaryResources(): { [key: string]: Promise<any>} {
+      return { pvc: this.$store.dispatch(`cluster/findAll`, { type: PVC }) };
+    },
 
-    this.$fetchType(PVC);
-    await this.$fetchType(this.resource);
+    /**
+     * PV columns need other resources in order to show data in some columns
+     *
+     * So when we have a page.... use those entries as filters when fetching the other resources
+     */
+    async fetchPageSecondaryResources({ canPaginate, force, page }: FetchPageSecondaryResourcesOpts) {
+      if (!page?.length) {
+        return;
+      }
+
+      const opt: ActionFindPageArgs = {
+        force,
+        pagination: new FilterArgs({
+          filters: PaginationParamFilter.createMultipleFields(page.map((r: any) => new PaginationFilterField({
+            field: 'spec.volumeName',
+            value: r.metadata.name
+          }))),
+        })
+      };
+
+      return this.$store.dispatch(`cluster/findPage`, { type: PVC, opt });
+    },
   }
-};
+});
 </script>
 
 <template>
-  <ResourceTable
+  <PaginatedResourceTable
     :schema="schema"
-    :rows="rows"
-    :headers="$attrs.headers"
-    :group-by="$attrs.groupBy"
-    :loading="loading"
+    :fetchSecondaryResources="fetchSecondaryResources"
+    :fetchPageSecondaryResources="fetchPageSecondaryResources"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+
+    :overflow-x="overflowX"
+    :overflow-y="overflowY"
   />
 </template>
diff --git a/shell/list/persistentvolumeclaim.vue b/shell/list/persistentvolumeclaim.vue
index d6f872196f..965875b2fb 100644
--- a/shell/list/persistentvolumeclaim.vue
+++ b/shell/list/persistentvolumeclaim.vue
@@ -1,12 +1,9 @@
 <script>
-import ResourceTable from '@shell/components/ResourceTable';
-import { STORAGE_CLASS } from '@shell/config/types';
-import ResourceFetch from '@shell/mixins/resource-fetch';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
 
 export default {
   name:       'ListPersistentVolumeClaim',
-  components: { ResourceTable },
-  mixins:     [ResourceFetch],
+  components: { PaginatedResourceTable },
   props:      {
     resource: {
       type:     String,
@@ -24,21 +21,12 @@ export default {
     }
   },
 
-  async fetch() {
-    this.$initializeFetchData(this.resource);
-
-    this.$fetchType(STORAGE_CLASS);
-    await this.$fetchType(this.resource);
-  }
 };
 </script>
 
 <template>
-  <ResourceTable
-    :loading="loading"
+  <PaginatedResourceTable
     :schema="schema"
-    :rows="rows"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
   />
 </template>
diff --git a/shell/list/service.vue b/shell/list/service.vue
index 6e4de4eaff..458785c919 100644
--- a/shell/list/service.vue
+++ b/shell/list/service.vue
@@ -1,12 +1,10 @@
 <script>
-import ResourceTable from '@shell/components/ResourceTable';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
 import { NODE } from '@shell/config/types';
-import ResourceFetch from '@shell/mixins/resource-fetch';
 
 export default {
   name:       'ListService',
-  components: { ResourceTable },
-  mixins:     [ResourceFetch],
+  components: { PaginatedResourceTable },
   props:      {
     resource: {
       type:     String,
@@ -24,30 +22,27 @@ export default {
     }
   },
 
-  // fetch nodes before loading this page, as they may be referenced in the Target table column
-  async fetch() {
-    const store = this.$store;
-    const inStore = store.getters['currentStore']();
+  methods: {
+    /**
+     * opts: FetchSecondaryResourcesOpts
+     */
+    async fetchSecondaryResources(opts) {
+      const inStore = this.$store.getters['currentStore']();
 
-    this.$initializeFetchData(this.resource);
-
-    if (store.getters[`${ inStore }/schemaFor`](NODE)) {
-      this.$fetchType(NODE);
+      if (this.$store.getters[`${ inStore }/schemaFor`](NODE)) {
+        // fetch nodes before loading this page, as they may be referenced in the Target table column
+        // shell/components/formatter/ServiceTargets.vue --> shell/components/formatter/Endpoints.vue --> Picks the first one that has a model's externalIp
+        await this.$store.dispatch(`${ inStore }/findAll`, { type: NODE });
+      }
     }
-
-    await this.$fetchType(this.resource);
   }
 };
 </script>
 
 <template>
-  <ResourceTable
+  <PaginatedResourceTable
     :schema="schema"
-    :rows="rows"
-    :headers="$attrs.headers"
-    :group-by="$attrs.groupBy"
-    :loading="loading"
     :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+    :fetchSecondaryResources="fetchSecondaryResources"
   />
 </template>
diff --git a/shell/list/workload.vue b/shell/list/workload.vue
index e8373b79e4..18907e605c 100644
--- a/shell/list/workload.vue
+++ b/shell/list/workload.vue
@@ -4,9 +4,9 @@ import {
   WORKLOAD_TYPES, SCHEMA, NODE, POD, LIST_WORKLOAD_TYPES
 } from '@shell/config/types';
 import ResourceFetch from '@shell/mixins/resource-fetch';
-import { WORKLOAD_HEALTH_SCALE } from '@shell/config/table-headers';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
 
-const schema = {
+const workloadSchema = {
   id:         'workload',
   type:       SCHEMA,
   attributes: {
@@ -26,7 +26,7 @@ const $loadingResources = ($route, $store) => {
     }
   });
 
-  const allTypes = $route.params.resource === schema.id;
+  const allTypes = $route.params.resource === workloadSchema.id;
 
   return {
     loadResources:     allTypes ? allowedResources : [$route.params.resource],
@@ -36,7 +36,7 @@ const $loadingResources = ($route, $store) => {
 
 export default {
   name:       'ListWorkload',
-  components: { ResourceTable },
+  components: { ResourceTable, PaginatedResourceTable },
   mixins:     [ResourceFetch],
 
   props: {
@@ -47,6 +47,10 @@ export default {
   },
 
   async fetch() {
+    if (this.paginationEnabled) {
+      return;
+    }
+
     if (this.allTypes && this.loadResources.length) {
       this.$initializeFetchData(this.loadResources[0], this.loadResources);
     } else {
@@ -57,6 +61,7 @@ export default {
       const schema = this.$store.getters[`cluster/schemaFor`](NODE);
 
       if (schema) {
+        // Used for shell/components/formatter/Endpoints.vue (too see column page needs to be wide and per page setting 25 or under)
         this.$fetchType(NODE);
       }
     } catch {}
@@ -82,7 +87,15 @@ export default {
     // Ensure these are set on load (to determine if the NS filter is required) rather than too late on `fetch`
     const { loadResources, loadIndeterminate } = $loadingResources(this.$route, this.$store);
 
+    const { params:{ resource: type } } = this.$route;
+    const allTypes = this.$route.params.resource === workloadSchema.id;
+    const schema = type !== workloadSchema.id ? this.$store.getters['cluster/schemaFor'](type) : workloadSchema;
+    const paginationEnabled = !allTypes && this.$store.getters[`cluster/paginationEnabled`]?.({ id: type });
+
     return {
+      allTypes,
+      schema,
+      paginationEnabled,
       resources: [],
       loadResources,
       loadIndeterminate
@@ -90,24 +103,6 @@ export default {
   },
 
   computed: {
-    allTypes() {
-      return this.$route.params.resource === schema.id;
-    },
-
-    paginationEnabled() {
-      return !this.allTypes && this.$store.getters[`cluster/paginationEnabled`]();
-    },
-
-    schema() {
-      const { params:{ resource:type } } = this.$route;
-
-      if (type !== schema.id) {
-        return this.$store.getters['cluster/schemaFor'](type);
-      }
-
-      return schema;
-    },
-
     filteredRows() {
       const out = [];
 
@@ -127,14 +122,7 @@ export default {
     },
 
     headers() {
-      const headers = this.$store.getters['type-map/headersFor'](this.schema, false);
-
-      if (this.paginationEnabled) {
-        // See https://github.com/rancher/dashboard/issues/10417, health comes from selectors applied locally to all pods (bad)
-        return headers.filter((h) => h.name !== WORKLOAD_HEALTH_SCALE.name);
-      }
-
-      return headers;
+      return this.$store.getters['type-map/headersFor'](this.schema, false);
     }
   },
 
@@ -171,27 +159,25 @@ export default {
     }
   },
 
-  typeDisplay() {
-    const { params:{ resource:type } } = this.$route;
-    let paramSchema = schema;
-
-    if (type !== schema.id) {
-      paramSchema = this.$store.getters['cluster/schemaFor'](type);
-    }
-
-    return this.$store.getters['type-map/labelFor'](paramSchema, 99);
-  },
 };
 </script>
 
 <template>
-  <ResourceTable
-    :loading="$fetchState.pending"
-    :schema="schema"
-    :headers="headers"
-    :rows="filteredRows"
-    :overflow-y="true"
-    :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
-  />
+  <div>
+    <PaginatedResourceTable
+      v-if="paginationEnabled"
+      :schema="schema"
+      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+    />
+    <ResourceTable
+      v-else
+      :loading="$fetchState.pending"
+      :schema="schema"
+      :headers="headers"
+      :rows="filteredRows"
+      :overflow-y="true"
+      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+    />
+  </div>
 </template>
diff --git a/shell/models/persistentvolume.js b/shell/models/persistentvolume.js
index 0759ab73fa..a4558c2e17 100644
--- a/shell/models/persistentvolume.js
+++ b/shell/models/persistentvolume.js
@@ -30,9 +30,7 @@ export default class PV extends SteveModel {
       return null;
     }
 
-    const allClaims = this.$rootGetters['cluster/all'](PVC);
-
-    return allClaims.find((claim) => claim.spec.volumeName === this.name);
+    return this.$getters['all'](PVC).find((claim) => claim.spec.volumeName === this.name);
   }
 
   get claimName() {
diff --git a/shell/models/storage.k8s.io.storageclass.js b/shell/models/storage.k8s.io.storageclass.js
index e78f2b4e4d..fd05e53660 100644
--- a/shell/models/storage.k8s.io.storageclass.js
+++ b/shell/models/storage.k8s.io.storageclass.js
@@ -82,6 +82,10 @@ export const PROVISIONER_OPTIONS = [
 ];
 
 export default class extends SteveModel {
+  get provisionerListDisplay() {
+    return `${ this.provisioner } (${ this.provisionerDisplay })`;
+  }
+
   get provisionerDisplay() {
     const option = PROVISIONER_OPTIONS.find((o) => o.value === this.provisioner);
     const fallback = `${ this.provisioner } ${ this.t('persistentVolume.csi.suffix') }`;
diff --git a/shell/pages/c/_cluster/explorer/EventsTable.vue b/shell/pages/c/_cluster/explorer/EventsTable.vue
index 34b95ca833..01cfa54cd1 100644
--- a/shell/pages/c/_cluster/explorer/EventsTable.vue
+++ b/shell/pages/c/_cluster/explorer/EventsTable.vue
@@ -1,16 +1,14 @@
 <script>
 
-import SortableTable from '@shell/components/SortableTable';
 import { MESSAGE, NAME, OBJECT, REASON } from '@shell/config/table-headers';
 import { EVENT } from '@shell/config/types';
-import { fetchClusterResources } from './explorer-utils';
+import PaginatedResourceTable from '@shell/components/PaginatedResourceTable';
+import { STEVE_EVENT_OBJECT, STEVE_NAME_COL } from '@shell/config/pagination-table-headers';
+import { headerFromSchemaColString } from '@shell/store/type-map.utils';
+import { NAME as EXPLORER } from '@shell/config/product/explorer';
 
 export default {
-  components: { SortableTable },
-
-  async fetch() {
-    this.events = await fetchClusterResources(this.$store, EVENT);
-  },
+  components: { PaginatedResourceTable },
 
   data() {
     const reason = {
@@ -23,8 +21,7 @@ export default {
       reason,
       OBJECT,
       MESSAGE,
-      NAME,
-      {
+      NAME, {
         name:        'date',
         label:       'Date',
         labelKey:    'clusterIndexPage.sections.events.date.label',
@@ -36,9 +33,36 @@ export default {
       },
     ];
 
+    const schema = this.$store.getters['cluster/schemaFor'](EVENT);
+
+    const paginationHeaders = [
+      reason,
+      STEVE_EVENT_OBJECT,
+      MESSAGE,
+      {
+        ...STEVE_NAME_COL,
+        defaultSort: false,
+      },
+      headerFromSchemaColString('First Seen', schema, this.$store.getters, true),
+      {
+        ...headerFromSchemaColString('Last Seen', schema, this.$store.getters, true),
+        defaultSort: true,
+      },
+      headerFromSchemaColString('Count', schema, this.$store.getters, true),
+    ];
+
     return {
-      events: [],
+      schema,
+      events:        [],
       eventHeaders,
+      paginationHeaders,
+      allEventsLink: {
+        name:   'c-cluster-product-resource',
+        params: {
+          product:  EXPLORER,
+          resource: EVENT,
+        }
+      }
     };
   },
 
@@ -63,16 +87,34 @@ export default {
 </script>
 
 <template>
-  <SortableTable
-    :loading="$fetchState.pending"
-    :rows="events"
+  <PaginatedResourceTable
+    :schema="schema"
     :headers="eventHeaders"
+    :pagination-headers="paginationHeaders"
+
     key-field="id"
     :search="false"
     :table-actions="false"
     :row-actions="false"
-    :paging="true"
+    :groupable="false"
     :rows-per-page="10"
-    default-sort-by="date"
-  />
+  >
+    <template v-slot:header-right>
+      <router-link
+        data-testid="events-link"
+        :to="allEventsLink"
+        class="events-link"
+      >
+        <span>{{ t('glance.eventsTable') }}</span>
+      </router-link>
+    </template>
+  </PaginatedResourceTable>
 </template>
+
+<style lang="scss" scoped>
+.events-link {
+  align-self: center;
+  padding-right: 20px;
+  min-width: 200px;
+}
+</style>
diff --git a/shell/pages/c/_cluster/explorer/index.vue b/shell/pages/c/_cluster/explorer/index.vue
index 1183be7ec9..1c5e8218e7 100644
--- a/shell/pages/c/_cluster/explorer/index.vue
+++ b/shell/pages/c/_cluster/explorer/index.vue
@@ -155,6 +155,7 @@ export default {
       clusterCounts,
       selectedTab:        'cluster-events',
       extensionCards:     getApplicableExtensionEnhancements(this, ExtensionPoint.CARD, CardLocation.CLUSTER_DASHBOARD_CARD, this.$route),
+      canViewEvents:      !!this.$store.getters['cluster/schemaFor'](EVENT),
       clusterServiceIcons,
     };
   },
@@ -473,16 +474,6 @@ export default {
       return !!this.currentCluster?.spec?.description;
     },
 
-    allEventsLink() {
-      return {
-        name:   'c-cluster-product-resource',
-        params: {
-          product:  EXPLORER,
-          resource: EVENT,
-        }
-      };
-    },
-
     allSecretsLink() {
       return {
         name:   'c-cluster-product-resource',
@@ -785,15 +776,11 @@ export default {
     <div class="mt-30">
       <Tabbed @changed="tabChange">
         <Tab
+          v-if="canViewEvents"
           name="cluster-events"
           :label="t('clusterIndexPage.sections.events.label')"
           :weight="2"
         >
-          <span class="events-table-link">
-            <router-link :to="allEventsLink">
-              <span>{{ t('glance.eventsTable') }}</span>
-            </router-link>
-          </span>
           <EventsTable />
         </Tab>
         <Tab
@@ -954,7 +941,7 @@ export default {
   }
 }
 
-.events-table-link, .cert-table-link {
+.cert-table-link {
   display: flex;
   justify-content: flex-end;
   margin-bottom: 20px;
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index de2936eb71..ab4f2e62fc 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -103,17 +103,17 @@ export default {
           resources.push(this.t('performance.serverPagination.resources.all'));
         } else {
           settings.resources.enableSome.enabled.forEach((resource) => {
-            resources.push(resource);
+            resources.push(!!resource.length ? resource : `${ resource.resource } (${ resource.context })`);
           });
           if (settings.resources.enableSome.generic) {
             resources.push(this.t('performance.serverPagination.resources.generic', {}, true));
           }
         }
 
-        storeResources.push(`${ store }: ${ resources.join(', ') }`);
+        storeResources.push(`Resources in store '${ store }': ${ resources.join(', ') }`);
       });
 
-      return storeResources.join('. ');
+      return storeResources.join('<br><br>');
     }
   },
 
@@ -187,6 +187,13 @@ export default {
           body:  this.t(`performance.${ l10n[property] }.incompatibleDescription`, {}, true),
         },
       });
+    },
+
+    setPaginationDefaults() {
+      this.value = {
+        ...this.value,
+        serverPagination: { ...DEFAULT_PERF_SETTING.serverPagination }
+      };
     }
   },
 };
@@ -225,9 +232,17 @@ export default {
           <p :class="{ 'text-muted': !value.serverPagination.enabled }">
             {{ t('performance.serverPagination.applicable') }}
           </p>
-          <p :class="{ 'text-muted': !value.serverPagination.enabled }">
-            {{ steveCacheApplicableResources }}
-          </p>
+          <p
+            v-clean-html="steveCacheApplicableResources"
+            :class="{ 'text-muted': !value.serverPagination.enabled }"
+          />
+          <button
+            class="btn btn-sm role-primary"
+            style="width: fit-content;"
+            @click.prevent="setPaginationDefaults()"
+          >
+            {{ t('performance.serverPagination.populateDefaults') }}
+          </button>
         </div>
         <!-- Inactivity -->
         <div class="mt-20">
diff --git a/shell/pages/home.vue b/shell/pages/home.vue
index 058087f927..e1cca6320b 100644
--- a/shell/pages/home.vue
+++ b/shell/pages/home.vue
@@ -27,7 +27,7 @@ import { RESET_CARDS_ACTION, SET_LOGIN_ACTION } from '@shell/config/page-actions
 import { STEVE_NAME_COL, STEVE_STATE_COL } from '@shell/config/pagination-table-headers';
 import { PaginationParamFilter, FilterArgs, PaginationFilterField, PaginationArgs } from '@shell/types/store/pagination.types';
 import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
-import { sameContents } from 'utils/array';
+import { sameContents } from '@shell/utils/array';
 
 export default defineComponent({
   name:       'Home',
diff --git a/shell/pages/support/index.vue b/shell/pages/support/index.vue
index eb2f064a73..cae7611e6b 100644
--- a/shell/pages/support/index.vue
+++ b/shell/pages/support/index.vue
@@ -7,7 +7,7 @@ import { getVendor } from '@shell/config/private-label';
 import { SETTING } from '@shell/config/settings';
 import { addParam } from '@shell/utils/url';
 import { isRancherPrime } from '@shell/config/version';
-import { hasCspAdapter } from 'mixins/brand';
+import { hasCspAdapter } from '@shell/mixins/brand';
 import TabTitle from '@shell/components/TabTitle';
 
 export default {
diff --git a/shell/plugins/steve/steve-pagination-utils.ts b/shell/plugins/steve/steve-pagination-utils.ts
index c00ebf4a17..84eac5f4d0 100644
--- a/shell/plugins/steve/steve-pagination-utils.ts
+++ b/shell/plugins/steve/steve-pagination-utils.ts
@@ -5,9 +5,16 @@ import Namespace from '@shell/models/namespace';
 import { uniq } from '@shell/utils/array';
 import {
   CAPI,
-  CONFIG_MAP, MANAGEMENT, NAMESPACE, NODE, POD
+  CATALOG,
+  CONFIG_MAP, MANAGEMENT, EVENT, NAMESPACE, NODE, POD, PVC,
+  PV,
+  STORAGE_CLASS,
+  SERVICE,
+  INGRESS,
+  WORKLOAD_TYPES,
+  HPA
 } from '@shell/config/types';
-import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
+import { CAPI as CAPI_LABELS, CATTLE_PUBLIC_ENDPOINTS } from '@shell/config/labels-annotations';
 import { Schema } from '@shell/plugins/steve/schema';
 
 class NamespaceProjectFilters {
@@ -133,8 +140,8 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     [MANAGEMENT.CLUSTER]: [
       { field: 'spec.internal' },
       { field: 'spec.displayName' },
-      // { field: `status.provider` }, // Pending API Support - https://github.com/rancher/rancher/issues/48256
-      // { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` }, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+      { field: `status.provider` },
+      { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` },
 
     ],
     [CONFIG_MAP]: [
@@ -146,11 +153,71 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     [CAPI.MACHINE]: [
       { field: 'spec.clusterName' }
     ],
+    [EVENT]: [
+      { field: '_type' },
+      { field: 'reason' },
+      { field: 'involvedObject.kind' },
+      { field: 'message' },
+    ],
+    [CATALOG.CLUSTER_REPO]: [
+      { field: 'spec.gitRepo' },
+      { field: 'spec.gitBranch' },
+      { field: `metadata.annotations[clusterrepo.cattle.io/hidden]` }
+    ],
+    [CATALOG.OPERATION]: [
+      { field: 'status.action' },
+      { field: 'status.namespace' },
+      { field: 'status.releaseName' },
+    ],
     [CAPI.RANCHER_CLUSTER]: [
       { field: `metadata.labels."${ CAPI_LABELS.PROVIDER }"` },
       { field: `status.provider` },
       { field: 'status.clusterName' },
+    ],
+    [SERVICE]: [
+      { field: 'spec.type' },
+      // { field: 'spec.clusterIP' }, // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
+    ],
+    [INGRESS]: [
+      // { field: 'spec.rules.host' }, // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
+      // { field: 'spec.ingressClassName' }, // Pending API support  (blocked https://github.com/rancher/rancher/issues/48473 (index fields)
+    ],
+    [HPA]: [
+      // { field: 'spec.scaleTargetRef.name' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix)
+      // { field: 'spec.minReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix)
+      // { field: 'spec.maxReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix)
+      // { field: 'spec.currentReplicas' }, // Pending API support https://github.com/rancher/rancher/issues/48473 (hpa filtering fix)
+    ],
+    [PVC]: [
+      { field: 'spec.volumeName' },
+    ],
+    [PV]: [
+      { field: 'status.reason' },
+      { field: 'spec.persistentVolumeReclaimPolicy' },
+    ],
+    [STORAGE_CLASS]: [
+      { field: 'provisioner' },
+      // { field: `metadata.annotations[STORAGE.DEFAULT_STORAGE_CLASS]` }, // Pending API Support - https://github.com/rancher/rancher/issues/48453
+    ],
+    [CATALOG.APP]: [
+      { field: 'spec.chart.metadata.name' }
+    ],
+    [WORKLOAD_TYPES.CRON_JOB]: [
+      { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` }
+    ],
+    [WORKLOAD_TYPES.DAEMON_SET]: [
+      { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` }
+    ],
+    [WORKLOAD_TYPES.DEPLOYMENT]: [
+      { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` }
+    ],
+    [WORKLOAD_TYPES.JOB]: [
+      { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` }
+    ],
+    [WORKLOAD_TYPES.STATEFUL_SET]: [
+      { field: `metadata.annotations[${ CATTLE_PUBLIC_ENDPOINTS }]` }
     ]
+
   }
 
   private convertArrayPath(path: string): string {
@@ -318,18 +385,21 @@ class StevePaginationUtils extends NamespaceProjectFilters {
     state.checked.push(field);
 
     // First check in our hardcoded list of supported filters
-    if ([
-      StevePaginationUtils.VALID_FIELDS[''], // Global
-      StevePaginationUtils.VALID_FIELDS[schema.id], // Type specific
-    ].find((fields) => fields?.find((f) => {
-      if (f.startsWith) {
-        if (field.startsWith(f.field)) {
-          return true;
+    if (
+      process.env.NODE_ENV === 'dev' &&
+      [
+        StevePaginationUtils.VALID_FIELDS[''], // Global
+        StevePaginationUtils.VALID_FIELDS[schema.id], // Type specific
+      ].find((fields) => fields?.find((f) => {
+        if (f.startsWith) {
+          if (field.startsWith(f.field)) {
+            return true;
+          }
+        } else {
+          return field === f.field;
         }
-      } else {
-        return field === f.field;
-      }
-    }))) {
+      }))
+    ) {
       return;
     }
 
diff --git a/shell/scripts/test-plugins-build.sh b/shell/scripts/test-plugins-build.sh
index 39c06cbacf..a81beac1d1 100755
--- a/shell/scripts/test-plugins-build.sh
+++ b/shell/scripts/test-plugins-build.sh
@@ -93,6 +93,19 @@ update_version_in_package_json "${SHELL_DIR}/package.json" "${SHELL_VERSION}"
 update_version_in_package_json "${BASE_DIR}/pkg/rancher-components/package.json" "${SHELL_VERSION}"
 update_version_in_package_json "${BASE_DIR}/creators/extension/package.json" "${SHELL_VERSION}"
 
+
+createTestComponent() {
+  # Add test list component to the test package
+  # Validates rancher-components imports
+
+  # NOTE - This fails if importing some components with TS imports...
+  # cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
+  # See https://github.com/rancher/dashboard/issues/12918
+
+  # Use a basic list instead
+  cp ${SHELL_DIR}/list/namespace.vue pkg/test-pkg/list
+}
+
 # Publish shell pkg (tag is needed as publish-shell is optimized to work with release-shell-pkg workflow)
 echo "Publishing Shell package to local registry"
 yarn install
@@ -133,7 +146,7 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
   # Add test list component to the test package
   # Validates rancher-components imports
   mkdir -p pkg/test-pkg/list
-  cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue pkg/test-pkg/list
+  createTestComponent
 
   FORCE_COLOR=true yarn build-pkg test-pkg | cat
 
@@ -159,7 +172,7 @@ if [ "${TEST_PERSIST_BUILD}" != "true" ]; then
 fi
 
 yarn create @rancher/extension test-pkg -i
-cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue ./pkg/test-pkg/list
+createTestComponent
 FORCE_COLOR=true yarn build-pkg test-pkg | cat
 
 if [ "${TEST_PERSIST_BUILD}" != "true" ]; then
diff --git a/shell/scripts/typegen.sh b/shell/scripts/typegen.sh
index 0c3dbe977e..e52e8ad0d9 100755
--- a/shell/scripts/typegen.sh
+++ b/shell/scripts/typegen.sh
@@ -40,6 +40,7 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch.js --declar
 # # models
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/namespace.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/networking.k8s.io.ingress.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/catalog.cattle.io.clusterrepo.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
 
 #./node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/*.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store
 
diff --git a/shell/store/type-map.utils.ts b/shell/store/type-map.utils.ts
index 5052987736..74343e0c85 100644
--- a/shell/store/type-map.utils.ts
+++ b/shell/store/type-map.utils.ts
@@ -1,4 +1,4 @@
-import { SchemaAttribute, SchemaAttributeColumn } from '@shell/plugins/steve/schema';
+import { Schema, SchemaAttribute, SchemaAttributeColumn } from '@shell/plugins/steve/schema';
 import { TableColumn } from '@shell/types/store/type-map';
 import { VuexStoreGetters } from '@shell/types/store/vuex';
 import { findBy, insertAt, removeObject } from '@shell/utils/array';
@@ -119,6 +119,19 @@ export function createHeaders(
   return out;
 }
 
+/**
+ * Given a schema's attribute.column value create a header
+ */
+export function headerFromSchemaColString(colName: string, schema: Schema, rootGetters: VuexStoreGetters, pagination: boolean, ageColumn: TableColumn): TableColumn {
+  const col = schema.attributes.columns.find((c) => c.name === colName);
+
+  if (!col) {
+    throw new Error(`Unable to find column '${ colName }' in schema '${ schema.id }'`);
+  }
+
+  return headerFromSchemaCol(col, rootGetters, pagination, ageColumn);
+}
+
 /**
  * Given a schema's attribute.column value create a header
  */
diff --git a/shell/utils/cluster.js b/shell/utils/cluster.js
index beaf7c1474..ac05751ae4 100644
--- a/shell/utils/cluster.js
+++ b/shell/utils/cluster.js
@@ -79,13 +79,13 @@ export function paginationFilterOnlyKubernetesClusters(store) {
 
   return PaginationParamFilter.createMultipleFields([
     new PaginationFilterField({
-      field:  `metadata.labels."${ CAPI.PROVIDER }"`, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+      field:  `metadata.labels."${ CAPI.PROVIDER }"`,
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true
     }),
     new PaginationFilterField({
-      field:  `status.provider`, // Pending API Support - https://github.com/rancher/rancher/issues/48256
+      field:  `status.provider`,
       equals: false,
       value:  VIRTUAL_HARVESTER_PROVIDER,
       exact:  true

From 3c8e3b15000df403e6af5ac0c099d2c100a10218 Mon Sep 17 00:00:00 2001
From: Yonas Berhe <yberhe@Yonass-MacBook-Pro.local>
Date: Wed, 11 Dec 2024 06:56:26 -0800
Subject: [PATCH 17/57] automation: fleet dashboard tests

---
 cypress/e2e/po/components/header.po.ts        |   6 +
 cypress/e2e/po/edit/fleet/gitrepo-edit.po.ts  |  65 +++++
 .../e2e/po/pages/fleet/fleet-dashboard.po.ts  |  17 ++
 .../e2e/tests/pages/fleet/dashboard.spec.ts   | 228 +++++++++++++++---
 cypress/support/types/menu-actions.ts         |   3 +
 5 files changed, 279 insertions(+), 40 deletions(-)
 create mode 100644 cypress/e2e/po/edit/fleet/gitrepo-edit.po.ts

diff --git a/cypress/e2e/po/components/header.po.ts b/cypress/e2e/po/components/header.po.ts
index 1915f0e4d7..1888f5ebdd 100644
--- a/cypress/e2e/po/components/header.po.ts
+++ b/cypress/e2e/po/components/header.po.ts
@@ -28,6 +28,12 @@ export class HeaderPo extends ComponentPo {
     return wsFilter.clickOptionWithLabel(name);
   }
 
+  checkCurrentWorkspace(name: string) {
+    const wsFilter = new WorkspaceSwitcherPo();
+
+    return wsFilter.checkOptionSelected(name);
+  }
+
   importYamlHeaderAction() {
     return this.self().find('[data-testid="header-action-import-yaml"]');
   }
diff --git a/cypress/e2e/po/edit/fleet/gitrepo-edit.po.ts b/cypress/e2e/po/edit/fleet/gitrepo-edit.po.ts
new file mode 100644
index 0000000000..93bf3c2b20
--- /dev/null
+++ b/cypress/e2e/po/edit/fleet/gitrepo-edit.po.ts
@@ -0,0 +1,65 @@
+import PagePo from '@/cypress/e2e/po/pages/page.po';
+import ArrayListPo from '@/cypress/e2e/po/components/array-list.po';
+import CreateEditViewPo from '@/cypress/e2e/po/components/create-edit-view.po';
+import LabeledInputPo from '@/cypress/e2e/po/components/labeled-input.po';
+import LabeledSelectPo from '@/cypress/e2e/po/components/labeled-select.po';
+import SelectOrCreateAuthPo from '@/cypress/e2e/po/components/select-or-create-auth.po';
+import NameNsDescription from '@/cypress/e2e/po/components/name-ns-description.po';
+
+export class GitRepoEditPo extends PagePo {
+  private static createPath(fleetWorkspace: string, gitRepoName: string) {
+    return `/c/_/fleet/fleet.cattle.io.gitrepo/${ fleetWorkspace }/${ gitRepoName }`;
+  }
+
+  static goTo(path: string): Cypress.Chainable<Cypress.AUTWindow> {
+    throw new Error('invalid');
+  }
+
+  constructor(fleetWorkspace: string, gitRepoName: string) {
+    super(GitRepoEditPo.createPath(fleetWorkspace, gitRepoName));
+  }
+
+  title() {
+    return this.self().get('.title .primaryheader  h1');
+  }
+
+  nameNsDescription() {
+    return new NameNsDescription(this.self());
+  }
+
+  setBranchName(branch = 'dashboard-e2e-basic') {
+    return LabeledInputPo.byLabel(this.self(), 'Branch').set(branch);
+  }
+
+  setGitRepoUrl(url: string) {
+    return LabeledInputPo.byLabel(this.self(), 'Repository URL').set(url);
+  }
+
+  setHelmRepoURLRegex(regexStr = 'https://charts.rancher.io/*') {
+    return LabeledInputPo.bySelector(this.self(), '[data-testid="gitrepo-helm-repo-url-regex"]').set(regexStr);
+  }
+
+  setGitRepoPath(path: string, index = 0) {
+    return this.gitRepoPaths().setValueAtIndex(path, index);
+  }
+
+  targetCluster(): LabeledSelectPo {
+    return new LabeledSelectPo('[data-testid="fleet-gitrepo-target-cluster"]');
+  }
+
+  footer() {
+    return new CreateEditViewPo(this.self());
+  }
+
+  gitRepoPaths() {
+    return new ArrayListPo('[data-testid="gitRepo-paths"]');
+  }
+
+  authSelectOrCreate(selector: string) {
+    return new SelectOrCreateAuthPo(selector);
+  }
+
+  helmAuthSelectOrCreate() {
+    return this.authSelectOrCreate('[data-testid="gitrepo-helm-auth"]');
+  }
+}
diff --git a/cypress/e2e/po/pages/fleet/fleet-dashboard.po.ts b/cypress/e2e/po/pages/fleet/fleet-dashboard.po.ts
index be82a80b99..e2a3699d08 100644
--- a/cypress/e2e/po/pages/fleet/fleet-dashboard.po.ts
+++ b/cypress/e2e/po/pages/fleet/fleet-dashboard.po.ts
@@ -2,6 +2,7 @@ import PagePo from '@/cypress/e2e/po/pages/page.po';
 import ResourceTablePo from '@/cypress/e2e/po/components/resource-table.po';
 import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
 import { LONG_TIMEOUT_OPT } from '@/cypress/support/utils/timeouts';
+import BaseResourceList from '@/cypress/e2e/po/lists/base-resource-list.po';
 
 export class FleetDashboardPagePo extends PagePo {
     static url: string;
@@ -44,4 +45,20 @@ export class FleetDashboardPagePo extends PagePo {
     sortableTable(tableName = 'fleet-local') {
       return this.resourceTable(tableName).sortableTable();
     }
+
+    goToGitRepoListLink(name: 'fleet-local' | 'fleet-default') {
+      return this.self().find(`[data-testid="collapsible-card-${ name }"] h2 span` );
+    }
+
+    list() {
+      return new BaseResourceList('[data-testid="sortable-table-list-container"]');
+    }
+
+    fleetDashboardEmptyState() {
+      return this.self().get('.fleet-empty-dashboard');
+    }
+
+    getStartedButton() {
+      return this.self().get('.btn').contains('Get started');
+    }
 }
diff --git a/cypress/e2e/tests/pages/fleet/dashboard.spec.ts b/cypress/e2e/tests/pages/fleet/dashboard.spec.ts
index 8e8401a176..32125926db 100644
--- a/cypress/e2e/tests/pages/fleet/dashboard.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/dashboard.spec.ts
@@ -1,65 +1,213 @@
 import { FleetDashboardPagePo } from '@/cypress/e2e/po/pages/fleet/fleet-dashboard.po';
-// import { GitRepoCreatePo } from '@/cypress/e2e/po/pages/fleet/gitrepo-create.po';
-// import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
-// import { LONG_TIMEOUT_OPT } from '@/cypress/support/utils/timeouts';
+import FleetGitRepoDetailsPo from '@/cypress/e2e/po/detail/fleet/fleet.cattle.io.gitrepo.po';
+import { GitRepoCreatePo } from '@/cypress/e2e/po/pages/fleet/gitrepo-create.po';
+import { GitRepoEditPo } from '@/cypress/e2e/po/edit/fleet/gitrepo-edit.po';
+import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
+import { LONG_TIMEOUT_OPT } from '@/cypress/support/utils/timeouts';
+import { gitRepoTargetAllClustersRequest } from '@/cypress/e2e/blueprints/fleet/gitrepos';
+import { HeaderPo } from '@/cypress/e2e/po/components/header.po';
+import { MenuActions } from '@/cypress/support/types/menu-actions';
+import * as path from 'path';
+import * as jsyaml from 'js-yaml';
+import { FleetGitRepoListPagePo } from '@/cypress/e2e/po/pages/fleet/fleet.cattle.io.gitrepo.po';
+const downloadsFolder = Cypress.config('downloadsFolder');
 
-describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser'] }, () => {
-  let fleetDashboardPage: FleetDashboardPagePo;
-  // const repoName = 'fleet-e2e-test-dashboard';
+describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () => {
+  const fleetDashboardPage = new FleetDashboardPagePo('_');
+  const gitRepoCreatePage = new GitRepoCreatePo('_');
+  const headerPo = new HeaderPo();
 
-  // Note - The 'describe` previously had `.only`, which ironically meant this was not tested in our CI (probably something to so with grep tags)
-  // Enabling the test results results in consistent failures (bundle does not become ready). For the short term comment these out
+  let repoName;
+  const gitRepoUrl = 'https://github.com/rancher/fleet-test-data';
+  const branch = 'master';
+  const paths = 'qa-test-apps/nginx-app';
+  const localWorkspace = 'fleet-local';
+  let removeGitRepo = false;
+  const reposToDelete = [];
 
   beforeEach(() => {
     cy.login();
-    fleetDashboardPage = new FleetDashboardPagePo('_');
-    fleetDashboardPage.goTo();
+    cy.createE2EResourceName('git-repo').then((name) => {
+      repoName = name;
+    });
   });
 
   it('has the correct title', () => {
-    cy.get('.fleet-empty-dashboard').should('be.visible');
+    fleetDashboardPage.goTo();
+    fleetDashboardPage.waitForPage();
+
+    fleetDashboardPage.fleetDashboardEmptyState().should('be.visible');
 
     cy.title().should('eq', 'Rancher - Continuous Delivery - Dashboard');
   });
 
-  // before(() => {
-  //   cy.login();
+  it('Get Started button takes you to the correct page', () => {
+    fleetDashboardPage.goTo();
+    fleetDashboardPage.waitForPage();
 
-  //   const gitRepoCreatePage = new GitRepoCreatePo('_');
+    fleetDashboardPage.fleetDashboardEmptyState().should('be.visible');
+    fleetDashboardPage.getStartedButton().click();
+    gitRepoCreatePage.waitForPage();
+    gitRepoCreatePage.title().contains('Git Repo: Create').should('be.visible');
+  });
 
-  //   gitRepoCreatePage.goTo();
+  it('Should display cluster status', () => {
+    // create gitrepo
+    cy.createRancherResource('v1', 'fleet.cattle.io.gitrepos', gitRepoTargetAllClustersRequest(localWorkspace, repoName, gitRepoUrl, branch, paths)).then(() => {
+      removeGitRepo = true;
+      reposToDelete.push(`fleet-local/${ repoName }`);
+    });
 
-  //   gitRepoCreatePage.setRepoName(repoName);
-  //   gitRepoCreatePage.selectWorkspace('fleet-local');
-  //   gitRepoCreatePage.setGitRepoUrl('https://github.com/rancher/fleet-test-data.git');
-  //   gitRepoCreatePage.setBranchName();
-  //   // NB - This step is here because DOM may not be ready
-  //   gitRepoCreatePage.goToNext();
-  //   gitRepoCreatePage.create();
-  // });
+    fleetDashboardPage.goTo();
+    fleetDashboardPage.waitForPage();
 
-  // it('Should display cluster status', () => {
-  //   // check if burguer menu nav is highlighted correctly for Fleet
-  //   BurgerMenuPo.checkIfMenuItemLinkIsHighlighted('Continuous Delivery');
+    // check if burguer menu nav is highlighted correctly for Fleet
+    BurgerMenuPo.checkIfMenuItemLinkIsHighlighted('Continuous Delivery');
 
-  //   const row = fleetDashboardPage.sortableTable('fleet-local').row(0);
+    const row = fleetDashboardPage.sortableTable(localWorkspace).row(0);
 
-  //   row.get('.bg-success[data-testid="clusters-ready"]', LONG_TIMEOUT_OPT).should('exist');
-  //   row.get('.bg-success[data-testid="clusters-ready"] span').should('have.text', '1/1');
+    row.get('.bg-success[data-testid="clusters-ready"]', LONG_TIMEOUT_OPT).should('exist');
+    row.get('.bg-success[data-testid="clusters-ready"] span').should('have.text', '1/1');
 
-  //   row.get('.bg-success[data-testid="bundles-ready"]').should('exist');
-  //   row.get('.bg-success[data-testid="bundles-ready"] span').should('have.text', '1/1');
+    row.get('.bg-success[data-testid="bundles-ready"]').should('exist');
+    row.get('.bg-success[data-testid="bundles-ready"] span').should('have.text', '1/1');
 
-  //   row.get('.bg-success[data-testid="resources-ready"]').should('exist');
-  //   row.get('.bg-success[data-testid="resources-ready"] span').should('have.text', '1/1');
-  // });
+    row.get('.bg-success[data-testid="resources-ready"]').should('exist');
+    row.get('.bg-success[data-testid="resources-ready"] span').should('have.text', '1/1');
+  });
 
-  // after(() => {
-  //   fleetDashboardPage = new FleetDashboardPagePo('_');
-  //   fleetDashboardPage.goTo();
+  it('can navigate to Git Repo details page from Fleet Dashboard', () => {
+    const gitRepoDetails = new FleetGitRepoDetailsPo(localWorkspace, repoName);
 
-  //   const fleetLocalResourceTable = fleetDashboardPage.resourceTable('fleet-local');
+    fleetDashboardPage.goTo();
+    fleetDashboardPage.waitForPage();
+    fleetDashboardPage.list().rowWithName(repoName).column(0).find('a')
+      .click();
+    gitRepoDetails.waitForPage(null, 'bundles');
+  });
 
-  //   fleetLocalResourceTable.sortableTable().deleteItemWithUI(repoName);
-  // });
+  it('should only display action menu with allowed actions only', () => {
+    fleetDashboardPage.goTo();
+    fleetDashboardPage.waitForPage();
+    headerPo.selectWorkspace(localWorkspace);
+
+    const constActionMenu = fleetDashboardPage.sortableTable().rowActionMenuOpen(repoName);
+
+    const allowedActions: MenuActions[] = [
+      MenuActions.Pause,
+      MenuActions.ForceUpdate,
+      MenuActions.EditYaml,
+      MenuActions.EditConfig,
+      MenuActions.Clone,
+      MenuActions.DownloadYaml,
+      MenuActions.Delete
+    ];
+
+    const disabledActions: MenuActions[] = [MenuActions.ChangeWorkspace];
+
+    allowedActions.forEach((action) => {
+      constActionMenu.getMenuItem(action).should('exist');
+    });
+
+    // Disabled actions should not exist
+    disabledActions.forEach((action) => {
+      constActionMenu.getMenuItem(action).should('not.exist');
+    });
+  });
+
+  it('can clone a git repo', () => {
+    const gitRepoEditPage = new GitRepoEditPo(localWorkspace, repoName);
+
+    fleetDashboardPage.goTo();
+    fleetDashboardPage.waitForPage();
+    fleetDashboardPage.sortableTable().rowActionMenuOpen(repoName).getMenuItem('Clone').click();
+
+    gitRepoEditPage.waitForPage('mode=clone');
+    gitRepoEditPage.title().contains(`Git Repo: Clone from ${ repoName }`).should('be.visible');
+    headerPo.selectWorkspace('fleet-default');
+    gitRepoEditPage.nameNsDescription().name().set(`clone-${ repoName }`);
+    gitRepoEditPage.footer().nextPage();
+    gitRepoEditPage.footer().create().then(() => {
+      removeGitRepo = true;
+      reposToDelete.push(`fleet-default/clone-${ repoName }`);
+    });
+
+    FleetDashboardPagePo.navTo();
+    fleetDashboardPage.waitForPage();
+    fleetDashboardPage.sortableTable('fleet-default').rowElementWithName(`clone-${ repoName }`).should('be.visible');
+    fleetDashboardPage.sortableTable('fleet-local').rowElementWithName(repoName).should('be.visible');
+  });
+
+  it('user lands in correct git repo workspace when using workspace link on Fleet Dashboard', () => {
+    const gitrepoListPage = new FleetGitRepoListPagePo();
+
+    fleetDashboardPage.goTo();
+    fleetDashboardPage.waitForPage();
+    fleetDashboardPage.sortableTable('fleet-default').rowElementWithName(`clone-${ repoName }`).should('be.visible');
+    fleetDashboardPage.sortableTable('fleet-local').rowElementWithName(repoName).should('be.visible');
+
+    // click workspace link: fleet default
+    fleetDashboardPage.goToGitRepoListLink('fleet-default').click();
+    gitrepoListPage.waitForPage();
+    headerPo.checkCurrentWorkspace('fleet-default');
+
+    // click workspace link: fleet local
+    fleetDashboardPage.goTo();
+    fleetDashboardPage.waitForPage();
+    fleetDashboardPage.goToGitRepoListLink('fleet-local').click();
+    gitrepoListPage.waitForPage();
+    headerPo.checkCurrentWorkspace('fleet-local');
+  });
+
+  it('can Edit Yaml', () => {
+    const gitRepoEditPage = new GitRepoEditPo(localWorkspace, repoName);
+
+    fleetDashboardPage.goTo();
+    fleetDashboardPage.waitForPage();
+    fleetDashboardPage.sortableTable().rowActionMenuOpen(repoName).getMenuItem('Edit YAML').click();
+    gitRepoEditPage.waitForPage('mode=edit&as=yaml');
+    gitRepoEditPage.title().contains(`Git Repo: ${ repoName }`).should('be.visible');
+  });
+
+  it('can Download Yaml', () => {
+    cy.deleteDownloadsFolder();
+
+    fleetDashboardPage.goTo();
+    fleetDashboardPage.waitForPage();
+    fleetDashboardPage.sortableTable().rowActionMenuOpen(repoName).getMenuItem('Download YAML').click();
+
+    const downloadedFilename = path.join(downloadsFolder, `${ repoName }.yaml`);
+
+    cy.readFile(downloadedFilename).then((buffer) => {
+      const obj: any = jsyaml.load(buffer);
+
+      // Basic checks on the downloaded YAML
+      expect(obj.kind).to.equal('GitRepo');
+      expect(obj.metadata['name']).to.equal(repoName);
+      expect(obj.metadata['namespace']).to.equal(localWorkspace);
+      expect(obj.spec['repo']).to.equal(gitRepoUrl);
+    });
+  });
+
+  it('can Edit Config', () => {
+    const gitRepoEditPage = new GitRepoEditPo(localWorkspace, repoName);
+    const description = `${ repoName }-desc`;
+
+    fleetDashboardPage.goTo();
+    fleetDashboardPage.waitForPage();
+    fleetDashboardPage.sortableTable().rowActionMenuOpen(repoName).getMenuItem('Edit Config').click();
+
+    gitRepoEditPage.waitForPage('mode=edit');
+    gitRepoEditPage.nameNsDescription().description().set(description);
+    gitRepoEditPage.footer().nextPage();
+    gitRepoEditPage.footer().save();
+    fleetDashboardPage.waitForPage();
+  });
+
+  after(() => {
+    if (removeGitRepo) {
+      // delete gitrepo
+      reposToDelete.forEach((r) => cy.deleteRancherResource('v1', 'fleet.cattle.io.gitrepo', r));
+    }
+  });
 });
diff --git a/cypress/support/types/menu-actions.ts b/cypress/support/types/menu-actions.ts
index 72c1b46d00..9ea6fe0c67 100644
--- a/cypress/support/types/menu-actions.ts
+++ b/cypress/support/types/menu-actions.ts
@@ -8,4 +8,7 @@ export enum MenuActions {
     ViewInApi = 'View in API', // eslint-disable-line no-unused-vars
     ChangeWorkspace = 'Change workspace', // eslint-disable-line no-unused-vars
     Delete = 'Delete', // eslint-disable-line no-unused-vars
+    Clone = 'Clone', // eslint-disable-line no-unused-vars
+    DownloadYaml = 'Download YAML', // eslint-disable-line no-unused-vars
+
   }

From 728bc64cef82c3c8ed8114d20807335564eec979 Mon Sep 17 00:00:00 2001
From: Cody Jackson <cody.jackson@suse.com>
Date: Thu, 12 Dec 2024 21:07:16 -0700
Subject: [PATCH 18/57] Resolving some issues around rendering pagination
 loading on resource list pages

fixes https://github.com/rancher/dashboard/issues/12748
---
 shell/components/PaginatedResourceTable.vue | 2 +-
 shell/components/ResourceList/index.vue     | 2 +-
 shell/components/SortableTable/THead.vue    | 5 +----
 shell/components/SortableTable/index.vue    | 9 ++++-----
 shell/mixins/resource-fetch.js              | 9 ++++++++-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/shell/components/PaginatedResourceTable.vue b/shell/components/PaginatedResourceTable.vue
index 1861836414..db4dce7767 100644
--- a/shell/components/PaginatedResourceTable.vue
+++ b/shell/components/PaginatedResourceTable.vue
@@ -109,7 +109,7 @@ export default defineComponent({
       v-bind="$attrs"
       :schema="schema"
       :rows="rows"
-      :alt-loading="canPaginate"
+      :alt-loading="canPaginate && !isFirstLoad"
       :loading="loading"
       :groupable="groupable"
 
diff --git a/shell/components/ResourceList/index.vue b/shell/components/ResourceList/index.vue
index b19ceeca48..7f7d69d21a 100644
--- a/shell/components/ResourceList/index.vue
+++ b/shell/components/ResourceList/index.vue
@@ -271,7 +271,7 @@ export default {
       v-else
       :schema="schema"
       :rows="rows"
-      :alt-loading="canPaginate"
+      :alt-loading="canPaginate && !isFirstLoad"
       :loading="loading"
       :headers="headers"
       :group-by="groupBy"
diff --git a/shell/components/SortableTable/THead.vue b/shell/components/SortableTable/THead.vue
index 8e215dad1f..b5d263058c 100644
--- a/shell/components/SortableTable/THead.vue
+++ b/shell/components/SortableTable/THead.vue
@@ -428,10 +428,7 @@ export default {
         background-color: var(--sortable-table-header-bg);
         color: var(--body-text);
         text-align: left;
-
-        &:not(.loading) {
-          border-bottom: 1px solid var(--sortable-table-top-divider);
-        }
+        border-bottom: 1px solid var(--sortable-table-top-divider);
       }
     }
 
diff --git a/shell/components/SortableTable/index.vue b/shell/components/SortableTable/index.vue
index 5ec08d68f8..9d3d7604c7 100644
--- a/shell/components/SortableTable/index.vue
+++ b/shell/components/SortableTable/index.vue
@@ -380,8 +380,10 @@ export default {
       eventualSearchQuery = this.$route.query?.q;
     }
 
+    const isLoading = this.loading || false;
+
     return {
-      refreshButtonPhase:         ASYNC_BUTTON_STATES.WAITING,
+      refreshButtonPhase:         isLoading ? ASYNC_BUTTON_STATES.WAITING : ASYNC_BUTTON_STATES.ACTION,
       expanded:                   {},
       searchQuery,
       eventualSearchQuery,
@@ -392,7 +394,7 @@ export default {
       /**
        * The is the bool the DOM uses to show loading state. it's proxied from `loading` to avoid blipping the indicator (see usages)
        */
-      isLoading:                  false,
+      isLoading
     };
   },
 
@@ -536,9 +538,6 @@ export default {
     manualRefreshLoadingFinished() {
       const res = !!(!this.isLoading && this._didinit && this.rows?.length && !this.isManualRefreshLoading);
 
-      // Always ensure the Refresh button phase aligns with loading state (regardless of if manualRefreshLoadingFinished has changed or not)
-      this.refreshButtonPhase = !res || this.loading ? ASYNC_BUTTON_STATES.WAITING : ASYNC_BUTTON_STATES.ACTION;
-
       return res;
     },
 
diff --git a/shell/mixins/resource-fetch.js b/shell/mixins/resource-fetch.js
index 57ba466391..fddc322797 100644
--- a/shell/mixins/resource-fetch.js
+++ b/shell/mixins/resource-fetch.js
@@ -52,6 +52,7 @@ export default {
       incremental:                false,
       fetchedResourceType:        [],
       paginating:                 null,
+      isFirstLoad:                true,
     };
   },
 
@@ -110,7 +111,7 @@ export default {
 
     loading() {
       if (this.canPaginate) {
-        return this.paginating;
+        return this.paginating === null ? true : this.paginating;
       }
 
       return this.rows.length ? false : this.$fetchState.pending;
@@ -128,6 +129,12 @@ export default {
           });
         }
       }
+    },
+
+    loading(newValue, oldValue) {
+      if (oldValue && !newValue) {
+        this.isFirstLoad = false;
+      }
     }
   },
 

From 4085c8637fceca422489e7b7abf272a021301cc7 Mon Sep 17 00:00:00 2001
From: Nancy <42977925+mantis-toboggan-md@users.noreply.github.com>
Date: Thu, 9 Jan 2025 13:08:05 -0800
Subject: [PATCH 19/57] update gke networking to select the default network by
 default (#13030)

add unit test for gke default network selection
---
 pkg/gke/components/Networking.vue             | 10 ++-
 .../components/__tests__/Networking.test.ts   |  6 +-
 pkg/gke/util/__mocks__/gcp.ts                 | 83 ++++++++++++++++++-
 3 files changed, 93 insertions(+), 6 deletions(-)

diff --git a/pkg/gke/components/Networking.vue b/pkg/gke/components/Networking.vue
index 0e6cd4f146..2d5e593581 100644
--- a/pkg/gke/components/Networking.vue
+++ b/pkg/gke/components/Networking.vue
@@ -203,9 +203,15 @@ export default defineComponent({
 
     networkOptions(neu) {
       if (neu && neu.length && !this.network) {
-        const firstnetwork = neu.find((network: GKENetwork) => network.kind !== 'group');
+        const defaultNetwork = neu.find((network: GKENetwork) => network?.name === 'default');
 
-        this.$emit('update:network', firstnetwork?.name);
+        if (defaultNetwork) {
+          this.$emit('update:network', defaultNetwork.name);
+        } else {
+          const firstnetwork = neu.find((network: GKENetwork) => network.kind !== 'group');
+
+          this.$emit('update:network', firstnetwork?.name);
+        }
       }
     },
 
diff --git a/pkg/gke/components/__tests__/Networking.test.ts b/pkg/gke/components/__tests__/Networking.test.ts
index 3577549cb5..0ecda4b5f7 100644
--- a/pkg/gke/components/__tests__/Networking.test.ts
+++ b/pkg/gke/components/__tests__/Networking.test.ts
@@ -67,7 +67,7 @@ describe('gke Networking', () => {
     expect(spy).toHaveBeenCalledTimes(4);
   });
 
-  it('should populate network dropdown and select the first option after loading gcp data', async() => {
+  it('should populate network dropdown and select the default network after loading gcp data', async() => {
     const setup = requiredSetup();
 
     const wrapper = shallowMount(Networking, {
@@ -85,8 +85,8 @@ describe('gke Networking', () => {
 
     const networksDropdown = wrapper.getComponent('[data-testid="gke-networks-dropdown"]');
 
-    expect(networksDropdown.props().options).toHaveLength(4);
-    expect(wrapper.emitted('update:network')?.[0]?.[0]).toBe('host-shared-vpc');
+    expect(networksDropdown.props().options).toHaveLength(5);
+    expect(wrapper.emitted('update:network')?.[0]?.[0]).toBe('default');
   });
 
   it('should populate subnetworks dropdown dependent on network selection', async() => {
diff --git a/pkg/gke/util/__mocks__/gcp.ts b/pkg/gke/util/__mocks__/gcp.ts
index e0df338150..c4f3dec34a 100644
--- a/pkg/gke/util/__mocks__/gcp.ts
+++ b/pkg/gke/util/__mocks__/gcp.ts
@@ -247,6 +247,64 @@ const mockedGKENetworksResponse = {
       'https://www.googleapis.com/compute/v1/projects/test-project/regions/me-central1/subnetworks/test-network',
       'https://www.googleapis.com/compute/v1/projects/test-project/regions/asia-east2/subnetworks/test-network',
       'https://www.googleapis.com/compute/v1/projects/test-project/regions/me-central2/subnetworks/test-network']
+  },
+  {
+    autoCreateSubnetworks:                 true,
+    creationTimestamp:                     '2022-10-26T14:50:30.702-07:00',
+    id:                                    '11111111',
+    kind:                                  'compute#network',
+    mtu:                                   1460,
+    name:                                  'default',
+    networkFirewallPolicyEnforcementOrder: 'AFTER_CLASSIC_FIREWALL',
+    routingConfig:                         { routingMode: 'REGIONAL' },
+    selfLink:                              'https://www.googleapis.com/compute/v1/projects/test-data-project/global/networks/default',
+    selfLinkWithId:                        'https://www.googleapis.com/compute/v1/projects/test-data-project/global/networks/11111111',
+    subnetworks:                           [
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/africa-south1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-west8/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-northeast3/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-northeast2/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-south2/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west3/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-west3/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-west2/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-northeast1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west12/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-southeast1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-south1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/southamerica-west1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-southeast2/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/me-west1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-east7/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-central1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/southamerica-east1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west9/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-north1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-east4/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-east1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west10/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-central2/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-north2/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-south1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/northamerica-south1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-east5/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-east1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west4/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west2/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west8/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/northamerica-northeast1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/australia-southeast2/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-west4/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west6/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/northamerica-northeast2/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-southwest1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-west1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/australia-southeast1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/europe-west1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/me-central1/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/asia-east2/subnetworks/default',
+      'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/me-central2/subnetworks/default'
+    ]
   }]
 };
 
@@ -267,7 +325,30 @@ const mockedGKESubnetworksResponse = {
     secondaryIpRanges:       [{ ipCidrRange: '10.0.1.0/24', rangeName: 'range-1' }],
     selfLink:                'https://www.googleapis.com/compute/v1/projects/test-project/regions/us-central1/subnetworks/test-network',
     stackType:               'IPV4_ONLY',
-  }]
+  },
+  {
+    creationTimestamp:       '2022-10-26T14:50:38.688-07:00',
+    fingerprint:             '3456',
+    gatewayAddress:          '10.128.0.1',
+    id:                      '1234',
+    ipCidrRange:             '10.128.0.0/20',
+    kind:                    'compute#subnetwork',
+    name:                    'default',
+    network:                 'https://www.googleapis.com/compute/v1/projects/test-data-project/global/networks/default',
+    privateIpGoogleAccess:   true,
+    privateIpv6GoogleAccess: 'DISABLE_GOOGLE_ACCESS',
+    purpose:                 'PRIVATE',
+    region:                  'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-central1',
+    secondaryIpRanges:       [
+      {
+        ipCidrRange: '10.0.1.0/24',
+        rangeName:   'range-1'
+      }
+    ],
+    selfLink:  'https://www.googleapis.com/compute/v1/projects/test-data-project/regions/us-central1/subnetworks/default',
+    stackType: 'IPV4_ONLY'
+  },
+  ]
 };
 
 const mockedGKESharedSubnetworksResponse = {

From 23c0cdb82b14875ca581fc5fe3300374347e62ac Mon Sep 17 00:00:00 2001
From: Nancy <42977925+mantis-toboggan-md@users.noreply.github.com>
Date: Thu, 9 Jan 2025 13:08:39 -0800
Subject: [PATCH 20/57] Fix rke2 addon validation (#13017)

* add codemirror error reporting

wire in codemirror validation to rke2 addon config

update addon config validation status when list of available addons changes

* added e2e test for addon config validation;

* account for codemirror being used with no options
---
 cypress/e2e/po/components/addon-config.po.ts  | 12 ++++++++
 .../e2e/po/components/create-edit-view.po.ts  |  4 +++
 .../create/cluster-create-rke2-custom.po.ts   |  5 ++++
 .../pages/manager/cluster-manager.spec.ts     | 25 ++++++++++++++++
 shell/components/CodeMirror.vue               | 29 ++++++++++++++++++-
 shell/components/YamlEditor.vue               |  3 +-
 .../provisioning.cattle.io.cluster/rke2.vue   | 15 ++++++++--
 .../tabs/AddOnConfig.vue                      | 12 ++++++--
 8 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 cypress/e2e/po/components/addon-config.po.ts

diff --git a/cypress/e2e/po/components/addon-config.po.ts b/cypress/e2e/po/components/addon-config.po.ts
new file mode 100644
index 0000000000..fc9c4760fa
--- /dev/null
+++ b/cypress/e2e/po/components/addon-config.po.ts
@@ -0,0 +1,12 @@
+import ComponentPo from '@/cypress/e2e/po/components/component.po';
+import YamlEditorPo from '~/cypress/e2e/po/components/yaml-editor.po';
+
+export default class AddonConfigPo extends ComponentPo {
+  constructor(selector = '.dashboard-root') {
+    super(selector);
+  }
+
+  yamlEditor() :YamlEditorPo {
+    return new YamlEditorPo(this.self().find('[data-testid="addon-yaml-editor"]'));
+  }
+}
diff --git a/cypress/e2e/po/components/create-edit-view.po.ts b/cypress/e2e/po/components/create-edit-view.po.ts
index 169e8a6ffb..b94c8091ac 100644
--- a/cypress/e2e/po/components/create-edit-view.po.ts
+++ b/cypress/e2e/po/components/create-edit-view.po.ts
@@ -17,4 +17,8 @@ export default class CreateEditViewPo extends ComponentPo {
   nextPage() {
     return new AsyncButtonPo(this.self().find('.cru-resource-footer .role-primary')).click();
   }
+
+  saveButtonPo() :AsyncButtonPo {
+    return new AsyncButtonPo(this.self().find('.cru-resource-footer .role-primary'));
+  }
 }
diff --git a/cypress/e2e/po/edit/provisioning.cattle.io.cluster/create/cluster-create-rke2-custom.po.ts b/cypress/e2e/po/edit/provisioning.cattle.io.cluster/create/cluster-create-rke2-custom.po.ts
index ff4685a09d..6690cffd94 100644
--- a/cypress/e2e/po/edit/provisioning.cattle.io.cluster/create/cluster-create-rke2-custom.po.ts
+++ b/cypress/e2e/po/edit/provisioning.cattle.io.cluster/create/cluster-create-rke2-custom.po.ts
@@ -4,6 +4,7 @@ import ClusterManagerCreatePagePo from '@/cypress/e2e/po/edit/provisioning.cattl
 import TabbedPo from '@/cypress/e2e/po/components/tabbed.po';
 import RegistriesTabPo from '@/cypress/e2e/po/components/registries-tab.po';
 import NetworkTabPo from '@/cypress/e2e/po/components/network-tab.po';
+import AddonConfigPo from '@/cypress/e2e/po/components/addon-config.po';
 
 /**
  * Create page for an RKE2 custom cluster
@@ -44,4 +45,8 @@ export default class ClusterManagerCreateRke2CustomPagePo extends ClusterManager
   network(): NetworkTabPo {
     return new NetworkTabPo();
   }
+
+  calicoAddonConfig(): AddonConfigPo {
+    return new AddonConfigPo();
+  }
 }
diff --git a/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts b/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
index 10dd81531d..e68b4adc71 100644
--- a/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
+++ b/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
@@ -311,6 +311,31 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
         editCreatedClusterPage.nameNsDescription().description().self().should('have.value', rke2CustomName);
       });
 
+      it('will disbable saving if an addon config has invalid data', () => {
+        clusterList.goTo();
+
+        clusterList.checkIsCurrentPage();
+        clusterList.createCluster();
+
+        createRKE2ClusterPage.waitForPage();
+
+        createRKE2ClusterPage.rkeToggle().set('RKE2/K3s');
+
+        createRKE2ClusterPage.selectCustom(0);
+
+        createRKE2ClusterPage.nameNsDescription().name().set('abc');
+
+        createRKE2ClusterPage.clusterConfigurationTabs().clickTabWithSelector('#rke2-calico');
+
+        createRKE2ClusterPage.resourceDetail().createEditView().saveButtonPo().expectToBeEnabled();
+
+        createRKE2ClusterPage.calicoAddonConfig().yamlEditor().input().set('badvalue: -');
+        createRKE2ClusterPage.resourceDetail().createEditView().saveButtonPo().expectToBeDisabled();
+
+        createRKE2ClusterPage.calicoAddonConfig().yamlEditor().input().set('goodvalue: yay');
+        createRKE2ClusterPage.resourceDetail().createEditView().saveButtonPo().expectToBeEnabled();
+      });
+
       it('can view cluster YAML editor', () => {
         clusterList.goTo();
         clusterList.list().actionMenu(rke2CustomName).getMenuItem('Edit YAML').click();
diff --git a/shell/components/CodeMirror.vue b/shell/components/CodeMirror.vue
index b15a8d976a..d125007f20 100644
--- a/shell/components/CodeMirror.vue
+++ b/shell/components/CodeMirror.vue
@@ -5,7 +5,7 @@ import { _EDIT, _VIEW } from '@shell/config/query-params';
 export default {
   name: 'CodeMirror',
 
-  emits: ['onReady', 'onInput', 'onChanges', 'onFocus'],
+  emits: ['onReady', 'onInput', 'onChanges', 'onFocus', 'validationChanged'],
 
   props: {
     /**
@@ -39,6 +39,7 @@ export default {
       codeMirrorRef:   null,
       loaded:          false,
       removeKeyMapBox: false,
+      hasLintErrors:   false,
     };
   },
 
@@ -65,6 +66,7 @@ export default {
         foldGutter:              true,
         styleSelectedText:       true,
         showCursorWhenSelecting: true,
+        autocorrect:             false,
       };
 
       if (this.asTextArea) {
@@ -76,6 +78,11 @@ export default {
 
       Object.assign(out, this.options);
 
+      // parent components control lint with a boolean; if linting is enabled, we need to override that boolean with a custom error handler to wire lint errors into dashboard validation
+      if (this.options?.lint) {
+        out.lint = { onUpdateLinting: this.handleLintErrors };
+      }
+
       return out;
     },
 
@@ -104,7 +111,25 @@ export default {
     }
   },
 
+  watch: {
+    hasLintErrors(neu) {
+      this.$emit('validationChanged', !neu);
+    }
+  },
+
   methods: {
+    /**
+     * Codemirror yaml linting uses js-yaml parse
+     * it does not distinguish between warnings and errors so we will treat all yaml lint messages as errors
+     * other codemirror linters (eg json) will report from, to, severity where severity may be 'warning' or 'error'
+     * only 'error' level linting will trigger a validation event from this component
+    */
+    handleLintErrors(diagnostics = []) {
+      const hasLintErrors = diagnostics.filter((d) => !d.severity || d.severity === 'error').length > 0;
+
+      this.hasLintErrors = hasLintErrors;
+    },
+
     focus() {
       if ( this.$refs.codeMirrorRef ) {
         this.$refs.codeMirrorRef.cminstance.focus();
@@ -118,6 +143,8 @@ export default {
     },
 
     onReady(codeMirrorRef) {
+      this.$emit('validationChanged', true);
+
       this.$nextTick(() => {
         codeMirrorRef.refresh();
         this.codeMirrorRef = codeMirrorRef;
diff --git a/shell/components/YamlEditor.vue b/shell/components/YamlEditor.vue
index 05f695b3f7..4d2d0a0da2 100644
--- a/shell/components/YamlEditor.vue
+++ b/shell/components/YamlEditor.vue
@@ -13,7 +13,7 @@ export const EDITOR_MODES = {
 };
 
 export default {
-  emits: ['update:value', 'newObject', 'onInput', 'onReady', 'onChanges'],
+  emits: ['update:value', 'newObject', 'onInput', 'onReady', 'onChanges', 'validationChanged'],
 
   components: {
     CodeMirror,
@@ -236,6 +236,7 @@ export default {
       @onInput="onInput"
       @onReady="onReady"
       @onChanges="onChanges"
+      @validationChanged="$emit('validationChanged', $event)"
     />
     <FileDiff
       v-else
diff --git a/shell/edit/provisioning.cattle.io.cluster/rke2.vue b/shell/edit/provisioning.cattle.io.cluster/rke2.vue
index ea9c4117bf..f304a8bfe1 100644
--- a/shell/edit/provisioning.cattle.io.cluster/rke2.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/rke2.vue
@@ -248,6 +248,7 @@ export default {
       busy:                  false,
       machinePoolValidation: {}, // map of validation states for each machine pool
       machinePoolErrors:     {},
+      addonConfigValidation: {}, // validation state of each addon config (boolean of whether codemirror's yaml lint passed)
       allNamespaces:         [],
       extensionTabs:         getApplicableExtensionEnhancements(this, ExtensionPoint.TAB, TabLocation.CLUSTER_CREATE_RKE2, this.$route, this),
       labelForAddon
@@ -797,7 +798,9 @@ export default {
       // and in all of the validation statuses for each machine pool
       Object.values(this.machinePoolValidation).forEach((v) => (base = base && v));
 
-      return validRequiredPools && base;
+      const hasAddonConfigErrors = Object.values(this.addonConfigValidation).filter((v) => v === false).length > 0;
+
+      return validRequiredPools && base && !hasAddonConfigErrors;
     },
     currentCluster() {
       if (this.mode === _EDIT) {
@@ -1565,6 +1568,8 @@ export default {
      * 2) We're ready to cache any values the user provides for each addon
      */
     async initAddons() {
+      this.addonConfigValidation = {};
+
       for (const chartName of this.addonNames) {
         const entry = this.chartVersions[chartName];
 
@@ -2133,7 +2138,11 @@ export default {
           }
         }
       }
-    }
+    },
+
+    addonConfigValidationChanged(configName, isValid) {
+      this.addonConfigValidation[configName] = isValid;
+    },
   }
 };
 </script>
@@ -2430,6 +2439,7 @@ export default {
           :label="labelForAddon($store, v.name, false)"
           :weight="9"
           :showHeader="false"
+          :error="addonConfigValidation[v.name]===false"
           @active="showAddons(v.name)"
         >
           <AddOnConfig
@@ -2444,6 +2454,7 @@ export default {
             @update:value="$emit('input', $event)"
             @update-questions="syncChartValues"
             @update-values="updateValues"
+            @validationChanged="e => addonConfigValidationChanged(v.name, e)"
           />
         </Tab>
 
diff --git a/shell/edit/provisioning.cattle.io.cluster/tabs/AddOnConfig.vue b/shell/edit/provisioning.cattle.io.cluster/tabs/AddOnConfig.vue
index 720bd3dc53..671036ee0f 100644
--- a/shell/edit/provisioning.cattle.io.cluster/tabs/AddOnConfig.vue
+++ b/shell/edit/provisioning.cattle.io.cluster/tabs/AddOnConfig.vue
@@ -7,7 +7,7 @@ import { labelForAddon } from '@shell/utils/cluster';
 import { _EDIT } from '@shell/config/query-params';
 
 export default {
-  emits: ['additional-manifest-changed', 'update-questions', 'update-values'],
+  emits: ['additional-manifest-changed', 'update-questions', 'update-values', 'validationChanged'],
 
   components: {
     Banner,
@@ -60,7 +60,13 @@ export default {
     isEdit() {
       return this.mode === _EDIT;
     }
-  }
+  },
+
+  methods: {
+    handleValidationChanged(e) {
+      this.$emit('validationChanged', e);
+    }
+  },
 };
 </script>
 
@@ -91,12 +97,14 @@ export default {
       <YamlEditor
         v-else
         ref="yaml-values"
+        data-testid="addon-yaml-editor"
         :value="initYamlEditor(addonVersion.name)"
         :scrolling="true"
         :as-object="true"
         :editor-mode="mode === 'view' ? 'VIEW_CODE' : 'EDIT_CODE'"
         :hide-preview-buttons="true"
         @update:value="$emit('update-values', addonVersion.name, $event)"
+        @validationChanged="handleValidationChanged"
       />
       <div class="spacer" />
     </div>

From 05462046a3c3680745ff997c378d7be8686e6ffa Mon Sep 17 00:00:00 2001
From: Jordon Leach <jordonleach@gmail.com>
Date: Fri, 10 Jan 2025 08:42:45 -0500
Subject: [PATCH 21/57] Update extension gitlab workflow node version (#13032)

* Update node and yq versions for extension gitlab workflow

* Add warning for gitlab workflow target branch
---
 docusaurus/docs/extensions/publishing.md      | 23 +++++++++++++++++++
 .../version-v2/publishing.md                  | 16 +++++++++++++
 .../build-extension-catalog.gitlab-ci.yml     |  4 ++--
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/docusaurus/docs/extensions/publishing.md b/docusaurus/docs/extensions/publishing.md
index 1cddca51d2..9ae69c7438 100644
--- a/docusaurus/docs/extensions/publishing.md
+++ b/docusaurus/docs/extensions/publishing.md
@@ -205,6 +205,29 @@ When building an extension that will be housed in a GitLab repository or hosted
 This pipeline will build an ECI and publish it to container registry (`registry.gitlab.com` by default) to allow for importing into Rancher Manager.
 The actual pipeline jobs are defined in the [Dashboard repo](https://github.com/rancher/dashboard/blob/master/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml) to allow for proper versioning and to apply any updates to the pipeline without any additional work from the Extension developer.
 
+> **_WARNING:_** Ensure the branch of `rancher/dashboard` in the `remote` url containing the reusable workflow matches the release version of your `@rancher/shell` npm dependency. For example:
+> - If building for the latest version of Rancher:
+> ```yaml
+> #.gitlab-ci.yml
+> ...
+> include:
+> - remote: 'https://raw.githubusercontent.com/rancher/dashboard/master/shell/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml'
+> ```
+> - If building for Rancher `v2.9`:
+> ```yaml
+> #.gitlab-ci.yml
+> ...
+> include:
+> - remote: 'https://raw.githubusercontent.com/rancher/dashboard/release-2.9/shell/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml'
+> ```
+> - If building for Rancher `v2.8`:
+> ```yaml
+> #.gitlab-ci.yml
+> ...
+> include:
+> - remote: 'https://raw.githubusercontent.com/rancher/dashboard/release-2.8/shell/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml'
+> ```
+
 ### Pipeline Configuration
 
 There are a few pipeline configuration options, mostly tied to the container registry:
diff --git a/docusaurus/extensions_versioned_docs/version-v2/publishing.md b/docusaurus/extensions_versioned_docs/version-v2/publishing.md
index 1cddca51d2..f06ecdd33f 100644
--- a/docusaurus/extensions_versioned_docs/version-v2/publishing.md
+++ b/docusaurus/extensions_versioned_docs/version-v2/publishing.md
@@ -205,6 +205,22 @@ When building an extension that will be housed in a GitLab repository or hosted
 This pipeline will build an ECI and publish it to container registry (`registry.gitlab.com` by default) to allow for importing into Rancher Manager.
 The actual pipeline jobs are defined in the [Dashboard repo](https://github.com/rancher/dashboard/blob/master/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml) to allow for proper versioning and to apply any updates to the pipeline without any additional work from the Extension developer.
 
+> **_WARNING:_** Ensure the branch of `rancher/dashboard` in the `remote` url containing the reusable workflow matches the release version of your `@rancher/shell` npm dependency. For example:
+> - If building for Rancher `v2.9`:
+> ```yaml
+> #.gitlab-ci.yml
+> ...
+> include:
+> - remote: 'https://raw.githubusercontent.com/rancher/dashboard/release-2.9/shell/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml'
+> ```
+> - If building for Rancher `v2.8`:
+> ```yaml
+> #.gitlab-ci.yml
+> ...
+> include:
+> - remote: 'https://raw.githubusercontent.com/rancher/dashboard/release-2.8/shell/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml'
+> ```
+
 ### Pipeline Configuration
 
 There are a few pipeline configuration options, mostly tied to the container registry:
diff --git a/shell/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml b/shell/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml
index ad92204db2..e6f415dc4e 100644
--- a/shell/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml
+++ b/shell/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
-  NODE_VERSION: "v16.20.2"
+  NODE_VERSION: "v20.17.0"
   NODE_DISTRO: "node-${NODE_VERSION}-linux-x64"
-  YQ_VERSION: "v4.44.1"
+  YQ_VERSION: "v4.44.6"
   YQ_URL: "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64"
 
 .podman-setup: &podman-setup

From c42139c067ac708792fb163774d5e51d1d1c6a32 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Fri, 10 Jan 2025 08:54:17 -0700
Subject: [PATCH 22/57] Add creators, docusaurus, and storybook to dependabot
 schedule

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 .github/dependabot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 65a7a360f6..b1aad7ed2e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,6 +14,10 @@ updates:
     directories:
       - "/"
       - "/shell"
+      - "/creators/extension"
+      - "/creators/extension/*"
+      - "/docusaurus"
+      - "/storybook"
       - "/pkg/*"
     schedule:
       interval: "daily"

From 36e7f23102c60c2a58930531b0b53194e2f17be0 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Fri, 10 Jan 2025 10:40:05 -0700
Subject: [PATCH 23/57] Allow HMR in Rancher Components and Harvester

This allows HMR to trigger when changes are made to Rancher Components and Harvester by omitting the `excludes` argument from `getWatcherIgnored()`. Watch and WatchOptions work to allow Webpack to watch files and recompile whenever they change - I don't see any benefit in excluding Rancher Components and Harvester from this process by default.

As I understand, the `excludes` variable exists to control production builds; this change will only affect development.

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 shell/vue.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell/vue.config.js b/shell/vue.config.js
index e20d125568..a1f2623172 100644
--- a/shell/vue.config.js
+++ b/shell/vue.config.js
@@ -456,7 +456,7 @@ const printLogs = (dev, dashboardVersion, resourceBase, routerBasePath, pl, ranc
  * - as list: [/.shell/, /dist-pkg/, /scripts\/standalone/, /\/pkg.test-pkg/, /\/pkg.harvester/]
  * - as chained regex rule: /.shell|dist-pkg|scripts\/standalone|\/pkg.test-pkg|\/pkg.harvester/
  */
-const getWatcherIgnored = (excludes) => {
+const getWatcherIgnored = (excludes = []) => {
   const paths = [
     /node_modules/,
     /dist-pkg/,
@@ -557,7 +557,7 @@ module.exports = function(dir, _appConfig) {
       config.resolve.extensions.push(...['.tsx', '.ts', '.js', '.vue', '.scss']);
       config.watchOptions = {
         ...(config.watchOptions || {}),
-        ignored: getWatcherIgnored(excludes)
+        ignored: getWatcherIgnored()
       };
 
       if (dev) {

From f8ee34426c9206483d90b9006e77d07b37c7e61a Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Fri, 10 Jan 2025 10:47:29 -0700
Subject: [PATCH 24/57] Clean up `appConfig` param in `vue.config`

The prefix `_` is a convention to indicate that a parameter is expected, but unused within a function. We make use of `appConfig` in the default export, so we can remove the `_` and supply a default value for `appConfig` if nothing is passed.

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 shell/vue.config.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shell/vue.config.js b/shell/vue.config.js
index a1f2623172..7815cd0a35 100644
--- a/shell/vue.config.js
+++ b/shell/vue.config.js
@@ -474,12 +474,11 @@ const getWatcherIgnored = (excludes = []) => {
  * This takes the directory of the application as the first argument so that we can derive folder locations
  * from it, rather than from the location of this file
  */
-module.exports = function(dir, _appConfig) {
+module.exports = function(dir, appConfig = {}) {
   require('events').EventEmitter.defaultMaxListeners = 20;
   require('dotenv').config();
 
   const { SHELL_ABS, COMPONENTS_DIR } = getShellPaths(dir);
-  const appConfig = _appConfig || {};
   const excludes = appConfig.excludes || [];
 
   const includePkg = (name) => {

From 938b866e002fa2ba85462cd3a5a15e8bf42a0b87 Mon Sep 17 00:00:00 2001
From: Nancy <42977925+mantis-toboggan-md@users.noreply.github.com>
Date: Fri, 10 Jan 2025 11:47:48 -0800
Subject: [PATCH 25/57] fix aks region being overwritten when editing
 unprovisioned aks clusters (#13037)

* fix aks region being overwritten when editing unprovisioned aks clusters

* update aks unit tests
---
 pkg/aks/components/CruAks.vue               |  9 ++++++---
 pkg/aks/components/__tests__/CruAks.test.ts | 15 +++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkg/aks/components/CruAks.vue b/pkg/aks/components/CruAks.vue
index 3c2b3f038a..5515d46f2a 100644
--- a/pkg/aks/components/CruAks.vue
+++ b/pkg/aks/components/CruAks.vue
@@ -645,7 +645,7 @@ export default defineComponent({
 
     virtualNetwork: {
       get() {
-        return this.virtualNetworkOptions.find((opt) => opt.value === this.config.subnet) || this.t('generic.none');
+        return this.virtualNetworkOptions.find((opt) => opt.value === this.config.subnet) || { label: this.t('generic.none') };
       },
       set(neu: {label: string, kind?: string, disabled?: boolean, value?: string, virtualNetwork?: any}) {
         if (neu.label === this.t('generic.none')) {
@@ -804,8 +804,6 @@ export default defineComponent({
         return;
       }
       this.loadingLocations = true;
-      // this will force the resourceLocation watcher to re-run every time new locations are fetched even if the default one selected hasn't changed
-      this.config['resourceLocation'] = '';
 
       const { azureCredentialSecret } = this.config;
 
@@ -839,6 +837,11 @@ export default defineComponent({
 
         errors.push(this.t('aks.errors.regions', { e: parsedError || err }));
       }
+
+      // once regions are loaded and a default selected, fetch resources that are region-scoped
+      this.getAksVersions();
+      this.getVmSizes();
+      this.getVirtualNetworks();
     },
 
     async getAksVersions(): Promise<void> {
diff --git a/pkg/aks/components/__tests__/CruAks.test.ts b/pkg/aks/components/__tests__/CruAks.test.ts
index 2312359004..e676d30d5c 100644
--- a/pkg/aks/components/__tests__/CruAks.test.ts
+++ b/pkg/aks/components/__tests__/CruAks.test.ts
@@ -240,7 +240,7 @@ describe('aks provisioning form', () => {
   it('should display subnets grouped by network in the virtual network dropdown', async() => {
     const noneOption = { label: 'generic.none' };
     const config = {
-      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc'
+      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc', resourceLocation: 'eastus'
     };
     const wrapper = shallowMount(CruAks, {
       propsData: {
@@ -254,7 +254,6 @@ describe('aks provisioning form', () => {
     const networkOpts = virtualNetworkSelect.props().options;
 
     expect(virtualNetworkSelect.props().value).toStrictEqual(noneOption);
-
     expect(networkOpts).toStrictEqual([{ label: 'generic.none' }, {
       disabled: true, kind: 'group', label: 'network2'
     }, {
@@ -299,7 +298,7 @@ describe('aks provisioning form', () => {
 
   it('should prevent saving if a node pool has taints missing keys or values', async() => {
     const config = {
-      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc'
+      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc', resourceLocation: 'eastus'
     };
     const wrapper = shallowMount(CruAks, {
       propsData: {
@@ -343,7 +342,7 @@ describe('aks provisioning form', () => {
     }],
   ])('should set virtualNetwork, virtualNetworkResourceGroup, and subnet when a virtual network is selected', async(optionIndex, { virtualNetwork, virtualNetworkResourceGroup, subnet }) => {
     const config = {
-      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc'
+      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc', resourceLocation: 'eastus'
     };
     const wrapper = shallowMount(CruAks, {
       propsData: {
@@ -366,7 +365,7 @@ describe('aks provisioning form', () => {
 
   it('should set config.monitoring to \'true\' and show log anaytics workspace name and log analytics workspace group inputs when the monitoring checkbox is checked', async() => {
     const config = {
-      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc'
+      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc', resourceLocation: 'eastus'
     };
     const wrapper = shallowMount(CruAks, {
       propsData: {
@@ -397,7 +396,7 @@ describe('aks provisioning form', () => {
 
   it('should clear virtualNetwork, virtualNetworkResourceGroup, and subnet when the \'none\' virtual network option is selected', async() => {
     const config = {
-      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc'
+      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc', resourceLocation: 'eastus'
     };
     const wrapper = shallowMount(CruAks, {
       propsData: {
@@ -430,7 +429,7 @@ describe('aks provisioning form', () => {
       name: 'abc', _validation: {}, _isNewOrUnprovisioned: false, orchestratorVersion: originalVersion
     }];
     const config = {
-      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc', kubernetesVersion: originalVersion, nodePools
+      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc', kubernetesVersion: originalVersion, nodePools, resourceLocation: 'eastus'
     };
     const wrapper = shallowMount(CruAks, {
       propsData: {
@@ -451,7 +450,7 @@ describe('aks provisioning form', () => {
 
   it('should clear config.logAnalyticsWorkspaceName and config.logAnalyticsWorkspaceGroup when the monitoring checkbox is unchecked', async() => {
     const config = {
-      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc', monitoring: true, logAnalyticsWorkspaceGroup: 'abc', logAnalyticsWorkspaceName: 'def'
+      dnsPrefix: 'abc-123', resourceGroup: 'abc', clusterName: 'abc', monitoring: true, logAnalyticsWorkspaceGroup: 'abc', logAnalyticsWorkspaceName: 'def', resourceLocation: 'eastus'
     };
     const wrapper = shallowMount(CruAks, {
       propsData: {

From 1ede58416240f1349dcc6f479da6000e29353234 Mon Sep 17 00:00:00 2001
From: Yi-Ya Chen <yiya.chen@suse.com>
Date: Mon, 13 Jan 2025 15:27:05 +0800
Subject: [PATCH 26/57] refactor: show tag prompts if isSearchable

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
---
 shell/components/form/LabeledSelect.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/components/form/LabeledSelect.vue b/shell/components/form/LabeledSelect.vue
index dfba89156a..9135df72d3 100644
--- a/shell/components/form/LabeledSelect.vue
+++ b/shell/components/form/LabeledSelect.vue
@@ -147,7 +147,7 @@ export default {
 
     // update placeholder text to inform user they can add their own opts when none are found
     showTagPrompts() {
-      return !this.options.length && this.$attrs.taggable;
+      return !this.options.length && this.$attrs.taggable && this.isSearchable;
     }
   },
 

From fea429edb4c6779cdf539f2d4ff6a01ac00ff2d3 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 13 Jan 2025 10:26:40 +0000
Subject: [PATCH 27/57] Fix icon alignment in the growl component (#13074)

---
 shell/components/GrowlManager.vue | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/shell/components/GrowlManager.vue b/shell/components/GrowlManager.vue
index f992716cdd..0038c11789 100644
--- a/shell/components/GrowlManager.vue
+++ b/shell/components/GrowlManager.vue
@@ -106,7 +106,10 @@ export default {
             <div class="growl-text-title">
               {{ growl.title }}
             </div>
-            <p v-if="growl.message">
+            <p
+              v-if="growl.message"
+              :class="{ 'has-title': !!growl.title }"
+            >
               {{ growl.message }}
             </p>
           </div>
@@ -153,12 +156,16 @@ export default {
     word-break: break-all;
     box-shadow: 0 3px 5px 0px var(--shadow);
 
+    $growl-icon-size: 20px;
+
     .icon-container {
       align-self: center;
       flex-basis: 10%;
       padding: 10px 20px 10px 10px;
       i {
-        font-size: 24px;
+        font-size: $growl-icon-size;
+        width: $growl-icon-size;
+        height: $growl-icon-size;
       }
     }
 
@@ -183,11 +190,14 @@ export default {
         }
         .growl-text-title {
           font-size: 16px;
-          margin-bottom: 20px;
         }
 
         > P {
-          margin-top: 5px;
+          padding-top: 2px;
+
+          &.has-title {
+            margin-top: 5px;
+          }
         }
       }
     }

From 3ff358c401e32a651611943c5b3c7bc6169bfef9 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 13 Jan 2025 16:30:16 +0000
Subject: [PATCH 28/57] Show badge color for local cluster (#13077)

---
 shell/components/ClusterIconMenu.vue         | 2 +-
 shell/components/nav/TopLevelMenu.helper.ts  | 2 ++
 shell/models/management.cattle.io.cluster.js | 7 ++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/shell/components/ClusterIconMenu.vue b/shell/components/ClusterIconMenu.vue
index 661821dd8b..6bbe093972 100644
--- a/shell/components/ClusterIconMenu.vue
+++ b/shell/components/ClusterIconMenu.vue
@@ -25,7 +25,7 @@ export default {
     },
 
     customColor() {
-      return !this.cluster.removePreviewColor && this.cluster.badge?.iconText ? this.cluster.badge?.color : '';
+      return this.cluster.iconColor || '';
     },
   },
 
diff --git a/shell/components/nav/TopLevelMenu.helper.ts b/shell/components/nav/TopLevelMenu.helper.ts
index 072f2a47e3..7c80ffe172 100644
--- a/shell/components/nav/TopLevelMenu.helper.ts
+++ b/shell/components/nav/TopLevelMenu.helper.ts
@@ -13,6 +13,7 @@ interface TopLevelMenuCluster {
   ready: boolean
   providerNavLogo: string,
   badge: string,
+  iconColor: string,
   isLocal: boolean,
   pinned: boolean,
   description: string,
@@ -143,6 +144,7 @@ export abstract class BaseTopLevelMenuHelper {
       ready:           mgmtCluster.isReady, // && !provCluster?.hasError,
       providerNavLogo: mgmtCluster.providerMenuLogo,
       badge:           mgmtCluster.badge,
+      iconColor:       mgmtCluster.iconColor,
       isLocal:         mgmtCluster.isLocal,
       pinned:          mgmtCluster.pinned,
       description:     provCluster?.description || mgmtCluster.description,
diff --git a/shell/models/management.cattle.io.cluster.js b/shell/models/management.cattle.io.cluster.js
index 5c746e706e..f25c7f7651 100644
--- a/shell/models/management.cattle.io.cluster.js
+++ b/shell/models/management.cattle.io.cluster.js
@@ -296,6 +296,11 @@ export default class MgmtCluster extends SteveModel {
     return this.providerLogo;
   }
 
+  // Color to use as the underline for the icon in the app bar
+  get iconColor() {
+    return this.metadata?.annotations[CLUSTER_BADGE.COLOR];
+  }
+
   // Custom badge to show for the Cluster (if the appropriate annotations are set)
   get badge() {
     const icon = this.metadata?.annotations?.[CLUSTER_BADGE.ICON_TEXT];
@@ -305,7 +310,7 @@ export default class MgmtCluster extends SteveModel {
       return undefined;
     }
 
-    let color = this.metadata?.annotations[CLUSTER_BADGE.COLOR] || DEFAULT_BADGE_COLOR;
+    let color = this.iconColor || DEFAULT_BADGE_COLOR;
     const iconText = this.metadata?.annotations[CLUSTER_BADGE.ICON_TEXT] || '';
     let foregroundColor;
 

From 5ab53f370ed72f09115156f6371899fb81a4f412 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 13 Jan 2025 17:28:47 +0000
Subject: [PATCH 29/57] Improve feature flag restart terminology (#13024)

* Feature Flags: Make it clearer of impact for features that cause a restart

* Make column wider, improve and make the table header consistent with the modal prompt message

* Fix e2e test
---
 .../tests/pages/global-settings/feature-flags.spec.ts  |  2 +-
 shell/assets/translations/en-us.yaml                   |  4 +++-
 shell/config/product/settings.js                       | 10 +++++++++-
 shell/config/table-headers.js                          |  2 +-
 shell/list/management.cattle.io.feature.vue            | 10 ++++++----
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/cypress/e2e/tests/pages/global-settings/feature-flags.spec.ts b/cypress/e2e/tests/pages/global-settings/feature-flags.spec.ts
index 016f1c49e2..4e42709dda 100644
--- a/cypress/e2e/tests/pages/global-settings/feature-flags.spec.ts
+++ b/cypress/e2e/tests/pages/global-settings/feature-flags.spec.ts
@@ -219,7 +219,7 @@ describe('Feature Flags', { testIsolation: 'off' }, () => {
     it('validate feature flags table header content', () => {
       FeatureFlagsPagePo.navTo();
       // check table headers are visible
-      const expectedHeaders = ['State', 'Name', 'Description', 'Restart Required'];
+      const expectedHeaders = ['State', 'Name', 'Description', 'Restart Rancher'];
 
       featureFlagsPage.list().resourceTable().sortableTable().tableHeaderRow()
         .get('.table-header-container .content')
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 758c7a19d3..2319db7b81 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -5836,6 +5836,7 @@ tableHeaders:
   resourcesReady: Resources Ready
   restarts: Restarts
   restart: Restart Required
+  restartSystem: Restart { vendor }
   restore: Restore
   role: Role
   roles: Roles
@@ -7498,6 +7499,7 @@ advancedSettings:
 
 featureFlags:
   label: Feature Flags
+  title: "Are you sure?"
   warning: |-
     Feature flags allow {vendor} to gate certain features behind flags.
     Features that are off by default should be considered experimental functionality.
@@ -7505,7 +7507,7 @@ featureFlags:
     This will result in a short outage of the API and UI, but not affect running clusters or workloads.
   promptActivate: Please confirm that you want to activate the feature flag "{flag}"
   promptDeactivate: Please confirm that you want to deactivate the feature flag "{flag}"
-  restartRequired: "Note: Updating this feature flag requires a restart"
+  restartRequired: "Note: Updating this feature flag will restart {vendor}"
   restart:
     title: Waiting for Restart
     wait: This may take a few moments
diff --git a/shell/config/product/settings.js b/shell/config/product/settings.js
index a0473d3911..d25a0e197b 100644
--- a/shell/config/product/settings.js
+++ b/shell/config/product/settings.js
@@ -6,6 +6,7 @@ import {
   RESTART,
   NAME_UNLINKED,
 } from '@shell/config/table-headers';
+import { getVendor } from '@shell/config/private-label';
 
 export const NAME = 'settings';
 
@@ -142,11 +143,18 @@ export function init(store) {
     canYaml:     true,
   });
 
+  // Change the restart header to 'Restart <VENDOR>' so that it is clearer what is being restarted
+  const t = store.getters['i18n/t'];
+
   headers(MANAGEMENT.FEATURE, [
     STATE,
     NAME_UNLINKED,
     FEATURE_DESCRIPTION,
-    RESTART,
+    {
+      ...RESTART,
+      labelKey: undefined,
+      label:    t('tableHeaders.restartSystem', { vendor: getVendor() })
+    }
   ]);
 
   hideBulkActions(MANAGEMENT.FEATURE, true);
diff --git a/shell/config/table-headers.js b/shell/config/table-headers.js
index 05f3c723f9..2d95d0fecf 100644
--- a/shell/config/table-headers.js
+++ b/shell/config/table-headers.js
@@ -966,7 +966,7 @@ export const RESTART = {
   value:     'restartRequired',
   sort:      ['restartRequired', 'nameSort'],
   formatter: 'Checked',
-  width:     75,
+  width:     125,
   align:     'center'
 };
 
diff --git a/shell/list/management.cattle.io.feature.vue b/shell/list/management.cattle.io.feature.vue
index 3e5fe11ec4..a49d1a8758 100644
--- a/shell/list/management.cattle.io.feature.vue
+++ b/shell/list/management.cattle.io.feature.vue
@@ -9,6 +9,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import { MANAGEMENT } from '@shell/config/types';
 import { SETTING } from '@shell/config/settings';
 import ResourceFetch from '@shell/mixins/resource-fetch';
+import { getVendor } from '@shell/config/private-label';
 
 export default {
   components: {
@@ -63,6 +64,7 @@ export default {
       serverUrl:        '',
       noUrlSet:         false,
       showModal:        false,
+      vendor:           getVendor(),
     };
   },
 
@@ -214,7 +216,7 @@ export default {
       v-if="showModal"
       class="update-modal"
       name="toggleFlag"
-      :width="350"
+      :width="450"
       height="auto"
       styles="max-height: 100vh;"
       :click-to-close="!restart || !waiting"
@@ -227,7 +229,7 @@ export default {
       >
         <template #title>
           <h4 class="text-default-text">
-            Are you sure?
+            {{ t('featureFlags.title') }}
           </h4>
         </template>
         <template #body>
@@ -263,8 +265,8 @@ export default {
             </span>
             <Banner
               v-if="restart"
-              color="warning"
-              :label="t('featureFlags.restartRequired')"
+              color="error"
+              :label="t('featureFlags.restartRequired', vendor)"
             />
           </div>
           <div class="text-error mb-10">

From 096cb2f410c51871186f88b7c7f4084978a8cebd Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 13 Jan 2025 19:12:09 +0100
Subject: [PATCH 30/57] component Checkbox: add hasTooltip computed value

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 .../src/components/Form/Checkbox/Checkbox.vue      | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue b/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
index 9bf64f0ad1..492471f64d 100644
--- a/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
+++ b/pkg/rancher-components/src/components/Form/Checkbox/Checkbox.vue
@@ -135,7 +135,14 @@ export default defineComponent({
      */
     isChecked(): boolean {
       return this.isMulti(this.value) ? this.findTrueValues(this.value) : this.value === this.valueWhenTrue;
-    }
+    },
+
+    /**
+     * Determines if the Labeled Input should display a tooltip.
+     */
+    hasTooltip(): boolean {
+      return !!this.tooltip || !!this.tooltipKey;
+    },
   },
 
   methods: {
@@ -214,6 +221,9 @@ export default defineComponent({
   <div
     class="checkbox-outer-container"
     data-checkbox-ctrl
+    :class="{
+      'v-popper--has-tooltip': hasTooltip,
+    }"
   >
     <label
       class="checkbox-container"
@@ -241,7 +251,7 @@ export default defineComponent({
         role="checkbox"
       />
       <span
-        v-if="$slots.label || label || labelKey || tooltipKey || tooltip"
+        v-if="$slots.label || label || labelKey || hasTooltip"
         class="checkbox-label"
         :class="{ 'checkbox-primary': primary }"
       >

From ce752d5ea6bc876528f531b18fc89e87e7206de6 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 13 Jan 2025 19:12:51 +0100
Subject: [PATCH 31/57] Replace banners with tooltips in GitRepo edit page

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

diff --git a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
index f8da63e547..96bbee8b87 100644
--- a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
+++ b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
@@ -33,12 +33,21 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
     global: { mocks }
   });
 
-  it('should have self-healing checkbox and banner', () => {
+  it('should have self-healing checkbox and tooltip', () => {
     const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"]');
-    const correctDriftBanner = wrapper.find('[data-testid="GitRepo-correctDrift-banner"]');
+    const tooltip = wrapper.findAll('[data-testid="GitRepo-correctDrift-checkbox"] .v-popper--has-tooltip');
 
+    expect(tooltip).toHaveLength(1);
+    expect(correctDriftCheckbox.exists()).toBeTruthy();
+    expect(correctDriftCheckbox.attributes().value).toBeFalsy();
+  });
+
+  it('should have keep-resources checkbox and tooltip', () => {
+    const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-keepResources-checkbox"]');
+    const tooltip = wrapper.findAll('[data-testid="GitRepo-keepResources-checkbox"] .v-popper--has-tooltip');
+
+    expect(tooltip).toHaveLength(1);
     expect(correctDriftCheckbox.exists()).toBeTruthy();
-    expect(correctDriftBanner.exists()).toBeTruthy();
     expect(correctDriftCheckbox.attributes().value).toBeFalsy();
   });
 
diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index d911625714..3fce4b0726 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -646,35 +646,26 @@ export default {
       </template>
       <div class="spacer" />
       <h2 v-t="'fleet.gitRepo.resources.label'" />
-      <div>
+      <div class="resource-handling">
         <Checkbox
           v-model:value="value.spec.correctDrift.enabled"
+          :tooltip="t('fleet.gitRepo.resources.correctDriftBanner')"
           data-testid="GitRepo-correctDrift-checkbox"
           class="check"
           type="checkbox"
           label-key="fleet.gitRepo.resources.correctDrift"
           :mode="mode"
         />
-        <Banner
-          data-testid="GitRepo-correctDrift-banner"
-          color="info"
-        >
-          {{ t('fleet.gitRepo.resources.correctDriftBanner') }}
-        </Banner>
+        <Checkbox
+          v-model:value="value.spec.keepResources"
+          :tooltip="t('fleet.gitRepo.resources.keepResourcesBanner')"
+          data-testid="GitRepo-keepResources-checkbox"
+          class="check"
+          type="checkbox"
+          label-key="fleet.gitRepo.resources.keepResources"
+          :mode="mode"
+        />
       </div>
-
-      <Checkbox
-        v-model:value="value.spec.keepResources"
-        class="check"
-        type="checkbox"
-        label-key="fleet.gitRepo.resources.keepResources"
-        :mode="mode"
-      />
-      <Banner
-        color="info"
-      >
-        {{ t('fleet.gitRepo.resources.keepResourcesBanner') }}
-      </Banner>
       <div class="spacer" />
       <h2 v-t="'fleet.gitRepo.paths.label'" />
       <ArrayList
@@ -764,3 +755,11 @@ export default {
     </template>
   </CruResource>
 </template>
+
+<style lang="scss" scoped>
+  .resource-handling {
+    display: flex;
+    flex-direction: column;
+    gap: 5px
+  }
+</style>

From fdc25a9ed5d3975c7a0cfb9b57a171ceeb12391d Mon Sep 17 00:00:00 2001
From: Jordon Leach <jordonleach@gmail.com>
Date: Mon, 13 Jan 2025 13:18:08 -0500
Subject: [PATCH 32/57] Fix EXTENSION_TAG output typo (#13079)

---
 .github/workflows/test-extension-workflows-master.yml      | 4 ++--
 .github/workflows/test-extension-workflows-release-2.8.yml | 4 ++--
 .github/workflows/test-extension-workflows-release-2.9.yml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-extension-workflows-master.yml b/.github/workflows/test-extension-workflows-master.yml
index ef44059f04..6f8756083f 100644
--- a/.github/workflows/test-extension-workflows-master.yml
+++ b/.github/workflows/test-extension-workflows-master.yml
@@ -30,7 +30,7 @@ jobs:
       SHELL_TAG: ${{ steps.retrieve-data.outputs.SHELL_TAG }}
       CREATORS_TAG: ${{ steps.retrieve-data.outputs.CREATORS_TAG }}
       ECI_TAG: ${{ steps.retrieve-data.outputs.ECI_TAG }}
-      EXTENSIONS_TAG: ${{ steps.retrieve-data.outputs.EXTENSIONS_TAG }}
+      EXTENSION_TAG: ${{ steps.retrieve-data.outputs.EXTENSION_TAG }}
       CURR_JOB_ID: ${{ github.job }}
       tags-job-status: ${{ job.status }}
     steps:
@@ -53,7 +53,7 @@ jobs:
       pages: write
     with:
       target_branch: 'gh-pages'
-      tagged_release:  ${{ needs.retrieve-tags-master.outputs.EXTENSIONS_TAG }}
+      tagged_release:  ${{ needs.retrieve-tags-master.outputs.EXTENSION_TAG }}
       is_test:  'true'
       test_ext_repo: 'ui-plugin-examples'
       test_ext_branch:  'main'
diff --git a/.github/workflows/test-extension-workflows-release-2.8.yml b/.github/workflows/test-extension-workflows-release-2.8.yml
index 212d7027c9..eff00910e5 100644
--- a/.github/workflows/test-extension-workflows-release-2.8.yml
+++ b/.github/workflows/test-extension-workflows-release-2.8.yml
@@ -17,7 +17,7 @@ jobs:
       SHELL_TAG: ${{ steps.retrieve-data.outputs.SHELL_TAG }}
       CREATORS_TAG: ${{ steps.retrieve-data.outputs.CREATORS_TAG }}
       ECI_TAG: ${{ steps.retrieve-data.outputs.ECI_TAG }}
-      EXTENSIONS_TAG: ${{ steps.retrieve-data.outputs.EXTENSIONS_TAG }}
+      EXTENSION_TAG: ${{ steps.retrieve-data.outputs.EXTENSION_TAG }}
       CURR_JOB_ID: ${{ github.job }}
       tags-job-status: ${{ job.status }}
     steps:
@@ -40,7 +40,7 @@ jobs:
       pages: write
     with:
       target_branch: 'gh-pages'
-      tagged_release:  ${{ needs.retrieve-tags-release-2-dot-8.outputs.EXTENSIONS_TAG }}
+      tagged_release:  ${{ needs.retrieve-tags-release-2-dot-8.outputs.EXTENSION_TAG }}
       is_test:  'true'
       test_ext_repo: 'elemental-ui'
       test_ext_branch:  'release-2.8.x'
diff --git a/.github/workflows/test-extension-workflows-release-2.9.yml b/.github/workflows/test-extension-workflows-release-2.9.yml
index e7b5ebcb50..f6d742f4cf 100644
--- a/.github/workflows/test-extension-workflows-release-2.9.yml
+++ b/.github/workflows/test-extension-workflows-release-2.9.yml
@@ -17,7 +17,7 @@ jobs:
       SHELL_TAG: ${{ steps.retrieve-data.outputs.SHELL_TAG }}
       CREATORS_TAG: ${{ steps.retrieve-data.outputs.CREATORS_TAG }}
       ECI_TAG: ${{ steps.retrieve-data.outputs.ECI_TAG }}
-      EXTENSIONS_TAG: ${{ steps.retrieve-data.outputs.EXTENSIONS_TAG }}
+      EXTENSION_TAG: ${{ steps.retrieve-data.outputs.EXTENSION_TAG }}
       CURR_JOB_ID: ${{ github.job }}
       tags-job-status: ${{ job.status }}
     steps:
@@ -40,7 +40,7 @@ jobs:
       pages: write
     with:
       target_branch: 'gh-pages'
-      tagged_release:  ${{ needs.retrieve-tags-release-2-dot-9.outputs.EXTENSIONS_TAG }}
+      tagged_release:  ${{ needs.retrieve-tags-release-2-dot-9.outputs.EXTENSION_TAG }}
       is_test:  'true'
       test_ext_repo: 'elemental-ui'
       test_ext_branch:  'release-2.9.x'

From 1621fe5d3b8a3c31f22b7deba46ed576bb8fc78d Mon Sep 17 00:00:00 2001
From: Jordon Leach <jordonleach@gmail.com>
Date: Mon, 13 Jan 2025 13:20:01 -0500
Subject: [PATCH 33/57] Return the old path when `next` is missing from the url
 (#13078)

---
 docusaurus/docusaurus.config.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docusaurus/docusaurus.config.js b/docusaurus/docusaurus.config.js
index 696f8cb3a2..67eb2b7568 100644
--- a/docusaurus/docusaurus.config.js
+++ b/docusaurus/docusaurus.config.js
@@ -77,10 +77,13 @@ const config = {
       '@docusaurus/plugin-client-redirects',
       {
         createRedirects(existingPath) {
-          if (existingPath.includes('/extensions') && !existingPath.includes('/next') && !existingPath.includes('/v2')) {
-            return [
-              existingPath.replace('/extensions', '/extensions/next')
-            ];
+          // This function is invoked once per existing doc page, and we
+          // must return the “old” routes that we want to map to that doc’s path
+          if (existingPath.startsWith('/extensions/next')) {
+            // Generate the "old" route we want to redirect from
+            const oldPath = existingPath.replace('/extensions/next', '/extensions');
+
+            return [oldPath];
           }
 
           return undefined; // Return a falsy value: no redirect created

From 60f62107e704255d75fe2379fef9149d67fdd3b8 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Tue, 14 Jan 2025 12:25:23 -0700
Subject: [PATCH 34/57] Pin Rancher version to
 v2.11-2053ce644a31cd8053d1f58e2487154b0b8513b6-head for e2e tests

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 package.json             | 2 +-
 scripts/e2e-docker-start | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 09c399e082..603c6900cb 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "install:ci": "yarn install --frozen-lockfile",
     "dev": "bash -c 'source ./scripts/version && NODE_ENV=dev ./node_modules/.bin/vue-cli-service serve'",
     "mem-dev": "bash -c 'source ./scripts/version && NODE_ENV=dev node --max-old-space-size=8192 ./node_modules/.bin/vue-cli-service serve'",
-    "docker:local:start": "docker run -d --restart=unless-stopped -p 80:80 -p 443:443 -e CATTLE_BOOTSTRAP_PASSWORD=password -e CATTLE_PASSWORD_MIN_LENGTH=3 --name cypress --privileged rancher/rancher:head",
+    "docker:local:start": "docker run -d --restart=unless-stopped -p 80:80 -p 443:443 -e CATTLE_BOOTSTRAP_PASSWORD=password -e CATTLE_PASSWORD_MIN_LENGTH=3 --name cypress --privileged rancher/rancher:v2.11-2053ce644a31cd8053d1f58e2487154b0b8513b6-head",
     "docker:local:stop": "docker kill cypress || true && docker rm cypress || true",
     "build": "NODE_OPTIONS=--max_old_space_size=4096 ./node_modules/.bin/vue-cli-service build",
     "build:lib": "cd pkg/rancher-components && yarn build:lib",
diff --git a/scripts/e2e-docker-start b/scripts/e2e-docker-start
index cdd69be5ba..299b120830 100755
--- a/scripts/e2e-docker-start
+++ b/scripts/e2e-docker-start
@@ -7,7 +7,7 @@ DASHBOARD_DIST=${DIR}/dist
 EMBER_DIST=${DIR}/dist_ember
 
 # Image version
-RANCHER_IMG_VERSION=head
+RANCHER_IMG_VERSION=v2.11-2053ce644a31cd8053d1f58e2487154b0b8513b6-head
 
 # Docker volume args when mounting the locally-built UI into the container
 VOLUME_ARGS="-v ${DASHBOARD_DIST}:/usr/share/rancher/ui-dashboard/dashboard -v ${EMBER_DIST}:/usr/share/rancher/ui"

From 022d4268a2e48792ae120f9a1f78da795638e782 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Tue, 14 Jan 2025 08:59:12 -0700
Subject: [PATCH 35/57] Set dependabot interval to weekly

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 .github/dependabot.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b1aad7ed2e..a6f1887020 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,7 +5,7 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     open-pull-requests-limit: 5
     labels: ["component/dependencies"]
 
@@ -20,6 +20,6 @@ updates:
       - "/storybook"
       - "/pkg/*"
     schedule:
-      interval: "daily"
+      interval: "weekly"
     open-pull-requests-limit: 5
     labels: ["component/dependencies"]

From 52a56e7460401bda294dd36a8f549dbd8ec69993 Mon Sep 17 00:00:00 2001
From: Yonas Berhe <yberhe@Yonass-MacBook-Pro.local>
Date: Wed, 8 Jan 2025 11:00:48 -0800
Subject: [PATCH 36/57] automation: fleet cluster groups tests

---
 .../e2e/po/components/create-edit-view.po.ts  |   4 +
 .../fleet/fleet.cattle.io.clustergroup.po.ts  |  30 +--
 .../fleet/fleet.cattle.io.clustergroup.po.ts  |  18 +-
 .../tests/pages/fleet/cluster-groups.spec.ts  | 184 +++++++++++++-----
 .../e2e/tests/pages/fleet/dashboard.spec.ts   |   5 +-
 5 files changed, 171 insertions(+), 70 deletions(-)

diff --git a/cypress/e2e/po/components/create-edit-view.po.ts b/cypress/e2e/po/components/create-edit-view.po.ts
index b94c8091ac..000e880694 100644
--- a/cypress/e2e/po/components/create-edit-view.po.ts
+++ b/cypress/e2e/po/components/create-edit-view.po.ts
@@ -21,4 +21,8 @@ export default class CreateEditViewPo extends ComponentPo {
   saveButtonPo() :AsyncButtonPo {
     return new AsyncButtonPo(this.self().find('.cru-resource-footer .role-primary'));
   }
+
+  editAsYaml() {
+    return new AsyncButtonPo(this.self().find('[data-testid="form-yaml"]')).click();
+  }
 }
diff --git a/cypress/e2e/po/edit/fleet/fleet.cattle.io.clustergroup.po.ts b/cypress/e2e/po/edit/fleet/fleet.cattle.io.clustergroup.po.ts
index e792fdcb7f..6b5aa989f8 100644
--- a/cypress/e2e/po/edit/fleet/fleet.cattle.io.clustergroup.po.ts
+++ b/cypress/e2e/po/edit/fleet/fleet.cattle.io.clustergroup.po.ts
@@ -1,27 +1,35 @@
 import PagePo from '@/cypress/e2e/po/pages/page.po';
 import AsyncButtonPo from '@/cypress/e2e/po/components/async-button.po';
-import CodeMirrorPo from '@/cypress/e2e/po/components/code-mirror.po';
-
+import ResourceDetailPo from '@/cypress/e2e/po/edit/resource-detail.po';
+import NameNsDescription from '@/cypress/e2e/po/components/name-ns-description.po';
 export default class FleetClusterGroupsCreateEditPo extends PagePo {
-  private static createPath(clusterId: string, id?: string ) {
-    const root = `/c/${ clusterId }/explorer/storage.k8s.io.storageclass/create`;
+  private static createPath(clusterId: string, workspace?: string, id?: string ) {
+    const root = `/c/${ clusterId }/fleet/fleet.cattle.io.clustergroup`;
 
-    return id ? `${ root }/${ id }` : `${ root }/create`;
+    return id ? `${ root }/${ workspace }/${ id }` : `${ root }/create`;
   }
 
   static goTo(path: string): Cypress.Chainable<Cypress.AUTWindow> {
     throw new Error('invalid');
   }
 
-  constructor(clusterId = '_', id?: string) {
-    super(FleetClusterGroupsCreateEditPo.createPath(clusterId, id));
+  constructor(clusterId = '_', workspace?: string, id?: string) {
+    super(FleetClusterGroupsCreateEditPo.createPath(clusterId, workspace, id));
   }
 
-  editAsYaml() {
-    return new AsyncButtonPo('[data-testid="form-yaml"]', this.self());
+  title() {
+    return this.self().get('.title .primaryheader  h1');
   }
 
-  yamlEditor(): CodeMirrorPo {
-    return CodeMirrorPo.bySelector(this.self(), '[data-testid="yaml-editor-code-mirror"]');
+  nameNsDescription() {
+    return new NameNsDescription(this.self());
+  }
+
+  saveCreateForm(): ResourceDetailPo {
+    return new ResourceDetailPo(this.self());
+  }
+
+  saveButton() {
+    return new AsyncButtonPo('[data-testid="form-save"]', this.self());
   }
 }
diff --git a/cypress/e2e/po/pages/fleet/fleet.cattle.io.clustergroup.po.ts b/cypress/e2e/po/pages/fleet/fleet.cattle.io.clustergroup.po.ts
index adad51dd08..332bac73b5 100644
--- a/cypress/e2e/po/pages/fleet/fleet.cattle.io.clustergroup.po.ts
+++ b/cypress/e2e/po/pages/fleet/fleet.cattle.io.clustergroup.po.ts
@@ -5,14 +5,16 @@ import ResourceTablePo from '@/cypress/e2e/po/components/resource-table.po';
 import FleetClusterGroupsList from '@/cypress/e2e/po/lists/fleet/fleet.cattle.io.clustergroup';
 import FleetClusterGroupsCreateEditPo from '@/cypress/e2e/po/edit/fleet/fleet.cattle.io.clustergroup.po';
 export class FleetClusterGroupsListPagePo extends PagePo {
-  static url = `/c/_/fleet/fleet.cattle.io.clustergroup`
-
-  constructor() {
-    super(FleetClusterGroupsListPagePo.url);
+  private static createPath(clusterId: string) {
+    return `/c/${ clusterId }/fleet/fleet.cattle.io.clustergroup`;
   }
 
-  goTo() {
-    return cy.visit(FleetClusterGroupsListPagePo.url);
+  static goTo(clusterId: string): Cypress.Chainable<Cypress.AUTWindow> {
+    return super.goTo(FleetClusterGroupsListPagePo.createPath(clusterId));
+  }
+
+  constructor(private clusterId = '_') {
+    super(FleetClusterGroupsListPagePo.createPath(clusterId));
   }
 
   static navTo() {
@@ -44,7 +46,7 @@ export class FleetClusterGroupsListPagePo extends PagePo {
     return this.self().find('[data-testid="masthead-create"]').click();
   }
 
-  createFleetClusterGroupsForm(id? : string): FleetClusterGroupsCreateEditPo {
-    return new FleetClusterGroupsCreateEditPo(id);
+  createFleetClusterGroupsForm(workspace?: string, id? : string): FleetClusterGroupsCreateEditPo {
+    return new FleetClusterGroupsCreateEditPo(this.clusterId, workspace, id);
   }
 }
diff --git a/cypress/e2e/tests/pages/fleet/cluster-groups.spec.ts b/cypress/e2e/tests/pages/fleet/cluster-groups.spec.ts
index a6dcd9f381..6f185ee44c 100644
--- a/cypress/e2e/tests/pages/fleet/cluster-groups.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/cluster-groups.spec.ts
@@ -1,63 +1,147 @@
 import { FleetClusterGroupsListPagePo } from '@/cypress/e2e/po/pages/fleet/fleet.cattle.io.clustergroup.po';
 import FleetClusterGroupDetailsPo from '@/cypress/e2e/po/detail/fleet/fleet.cattle.io.clustergroup.po';
 import { HeaderPo } from '@/cypress/e2e/po/components/header.po';
+import PromptRemove from '@/cypress/e2e/po/prompts/promptRemove.po';
 
 describe('Cluster Groups', { testIsolation: 'off', tags: ['@fleet', '@adminUser'] }, () => {
   const fleetClusterGroups = new FleetClusterGroupsListPagePo();
   const headerPo = new HeaderPo();
+  const localWorkspace = 'fleet-local';
+  let clusterGroupName;
+  let removeClusterGroups = false;
+  const clusterGroupsToDelete = [];
 
-  describe('List', { tags: ['@vai', '@adminUser'] }, () => {
-    before(() => {
-      cy.login();
-    });
-
-    it('check table headers are available in list and details view', () => {
-      const groupName = 'default';
-      const workspace = 'fleet-local';
-
-      FleetClusterGroupsListPagePo.navTo();
-      fleetClusterGroups.waitForPage();
-      headerPo.selectWorkspace(workspace);
-      fleetClusterGroups.clusterGroupsList().rowWithName(groupName).checkVisible();
-
-      // check table headers
-      const expectedHeaders = ['State', 'Name', 'Clusters Ready', 'Resources', 'Age'];
-
-      fleetClusterGroups.clusterGroupsList().resourceTable().sortableTable().tableHeaderRow()
-        .within('.table-header-container .content')
-        .each((el, i) => {
-          expect(el.text().trim()).to.eq(expectedHeaders[i]);
-        });
-
-      // go to fleet cluster details
-      fleetClusterGroups.goToDetailsPage(groupName);
-
-      const fleetClusterGroupDetailsPage = new FleetClusterGroupDetailsPo(workspace, groupName);
-
-      fleetClusterGroupDetailsPage.waitForPage(null, 'clusters');
-
-      // check table headers
-      const expectedHeadersDetailsView = ['State', 'Name', 'Bundles Ready', 'Repos Ready', 'Resources', 'Last Seen', 'Age'];
-
-      fleetClusterGroupDetailsPage.clusterList().resourceTable().sortableTable()
-        .tableHeaderRow()
-        .within('.table-header-container .content')
-        .each((el, i) => {
-          expect(el.text().trim()).to.eq(expectedHeadersDetailsView[i]);
-        });
+  before(() => {
+    cy.login();
+    cy.createE2EResourceName('cluster-group').then((name) => {
+      clusterGroupName = name;
     });
   });
-  describe('Edit', { tags: ['@vai', '@adminUser'] }, () => {
-    before(() => {
-      cy.login();
-    });
 
-    it('can open "Edit as YAML"', () => {
-      FleetClusterGroupsListPagePo.navTo();
-      fleetClusterGroups.waitForPage();
-      fleetClusterGroups.clickCreate();
-      fleetClusterGroups.createFleetClusterGroupsForm().editAsYaml().click();
-      fleetClusterGroups.createFleetClusterGroupsForm().yamlEditor().checkExists();
-    });
+  it('can create cluster group', () => {
+    FleetClusterGroupsListPagePo.navTo();
+    fleetClusterGroups.waitForPage();
+    headerPo.selectWorkspace(localWorkspace);
+    fleetClusterGroups.clickCreate();
+    fleetClusterGroups.createFleetClusterGroupsForm().waitForPage();
+
+    fleetClusterGroups.createFleetClusterGroupsForm().nameNsDescription().name().set(clusterGroupName);
+    fleetClusterGroups.createFleetClusterGroupsForm().saveCreateForm().cruResource().saveOrCreate()
+      .click()
+      .then(() => {
+        removeClusterGroups = true;
+        clusterGroupsToDelete.push(`${ localWorkspace }/${ clusterGroupName }`);
+      });
+
+    fleetClusterGroups.waitForPage();
+    fleetClusterGroups.clusterGroupsList().details(clusterGroupName, 1).should('be.visible');
+  });
+
+  it('can edit a cluster group', () => {
+    FleetClusterGroupsListPagePo.navTo();
+    fleetClusterGroups.waitForPage();
+    headerPo.selectWorkspace(localWorkspace);
+    fleetClusterGroups.clusterGroupsList().actionMenu(clusterGroupName).getMenuItem('Edit Config').click();
+    fleetClusterGroups.createFleetClusterGroupsForm(localWorkspace, clusterGroupName).waitForPage('mode=edit');
+    fleetClusterGroups.createFleetClusterGroupsForm().nameNsDescription().description().set(`${ clusterGroupName }-fleet-desc`);
+    fleetClusterGroups.createFleetClusterGroupsForm().saveCreateForm().cruResource().saveAndWaitForRequests('PUT', `v1/fleet.cattle.io.clustergroups/${ localWorkspace }/${ clusterGroupName }`)
+      .then(({ response }) => {
+        expect(response?.statusCode).to.eq(200);
+        expect(response?.body.metadata).to.have.property('name', clusterGroupName);
+        expect(response?.body.metadata.annotations).to.have.property('field.cattle.io/description', `${ clusterGroupName }-fleet-desc`);
+      });
+    fleetClusterGroups.waitForPage();
+  });
+
+  it('can clone a cluster group', () => {
+    FleetClusterGroupsListPagePo.navTo();
+    fleetClusterGroups.waitForPage();
+    headerPo.selectWorkspace(localWorkspace);
+    fleetClusterGroups.clusterGroupsList().actionMenu(clusterGroupName).getMenuItem('Clone').click();
+    fleetClusterGroups.createFleetClusterGroupsForm(localWorkspace, clusterGroupName).waitForPage('mode=clone');
+    fleetClusterGroups.createFleetClusterGroupsForm().nameNsDescription().name().set(`clone-${ clusterGroupName }`);
+    fleetClusterGroups.createFleetClusterGroupsForm().nameNsDescription().description().set(`${ clusterGroupName }-fleet-desc`);
+    fleetClusterGroups.createFleetClusterGroupsForm().saveCreateForm().cruResource().saveAndWaitForRequests('POST', 'v1/fleet.cattle.io.clustergroups')
+      .then(({ response }) => {
+        expect(response?.statusCode).to.eq(201);
+        removeClusterGroups = true;
+        clusterGroupsToDelete.push(`${ localWorkspace }/clone-${ clusterGroupName }`);
+        expect(response?.body.metadata).to.have.property('name', `clone-${ clusterGroupName }`);
+        expect(response?.body.metadata.annotations).to.have.property('field.cattle.io/description', `${ clusterGroupName }-fleet-desc`);
+      });
+    fleetClusterGroups.waitForPage();
+    fleetClusterGroups.clusterGroupsList().details(`clone-${ clusterGroupName }`, 1).should('be.visible');
+  });
+
+  it('can delete cluster group', () => {
+    FleetClusterGroupsListPagePo.navTo();
+    fleetClusterGroups.waitForPage();
+    headerPo.selectWorkspace(localWorkspace);
+    fleetClusterGroups.clusterGroupsList().actionMenu(clusterGroupName).getMenuItem('Delete').click();
+    fleetClusterGroups.clusterGroupsList().resourceTable().sortableTable().rowNames('.col-link-detail')
+      .then((rows: any) => {
+        const promptRemove = new PromptRemove();
+
+        cy.intercept('DELETE', `v1/fleet.cattle.io.clustergroups/${ localWorkspace }/clone-${ clusterGroupName }`).as('deleteClusterGroup');
+
+        promptRemove.remove();
+        cy.wait('@deleteClusterGroup');
+        fleetClusterGroups.waitForPage();
+        fleetClusterGroups.clusterGroupsList().resourceTable().sortableTable().checkRowCount(false, rows.length - 1);
+        fleetClusterGroups.clusterGroupsList().resourceTable().sortableTable().rowNames('.col-link-detail')
+          .should('not.contain', `clone-${ clusterGroupName }`);
+      });
+  });
+
+  // testing https://github.com/rancher/dashboard/issues/11687
+  it('can open "Edit as YAML"', () => {
+    FleetClusterGroupsListPagePo.navTo();
+    fleetClusterGroups.waitForPage();
+    fleetClusterGroups.clickCreate();
+    fleetClusterGroups.createFleetClusterGroupsForm().saveCreateForm().createEditView().editAsYaml();
+    fleetClusterGroups.createFleetClusterGroupsForm().saveCreateForm().resourceYaml().codeMirror()
+      .checkExists();
+  });
+
+  it('check table headers are available in list and details view', { tags: ['@vai', '@adminUser'] }, () => {
+    const groupName = 'default';
+
+    FleetClusterGroupsListPagePo.navTo();
+    fleetClusterGroups.waitForPage();
+    headerPo.selectWorkspace(localWorkspace);
+    fleetClusterGroups.clusterGroupsList().rowWithName(groupName).checkVisible();
+
+    // check table headers
+    const expectedHeaders = ['State', 'Name', 'Clusters Ready', 'Resources', 'Age'];
+
+    fleetClusterGroups.clusterGroupsList().resourceTable().sortableTable().tableHeaderRow()
+      .within('.table-header-container .content')
+      .each((el, i) => {
+        expect(el.text().trim()).to.eq(expectedHeaders[i]);
+      });
+
+    // go to fleet cluster details
+    fleetClusterGroups.goToDetailsPage(groupName);
+
+    const fleetClusterGroupDetailsPage = new FleetClusterGroupDetailsPo(localWorkspace, groupName);
+
+    fleetClusterGroupDetailsPage.waitForPage(null, 'clusters');
+
+    // check table headers
+    const expectedHeadersDetailsView = ['State', 'Name', 'Bundles Ready', 'Repos Ready', 'Resources', 'Last Seen', 'Age'];
+
+    fleetClusterGroupDetailsPage.clusterList().resourceTable().sortableTable()
+      .tableHeaderRow()
+      .within('.table-header-container .content')
+      .each((el, i) => {
+        expect(el.text().trim()).to.eq(expectedHeadersDetailsView[i]);
+      });
+  });
+
+  after(() => {
+    if (removeClusterGroups) {
+      // delete gitrepo
+      clusterGroupsToDelete.forEach((r) => cy.deleteRancherResource('v1', 'fleet.cattle.io.clustergroups', r, false));
+    }
   });
 });
diff --git a/cypress/e2e/tests/pages/fleet/dashboard.spec.ts b/cypress/e2e/tests/pages/fleet/dashboard.spec.ts
index 32125926db..5cd98f6040 100644
--- a/cypress/e2e/tests/pages/fleet/dashboard.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/dashboard.spec.ts
@@ -3,7 +3,7 @@ import FleetGitRepoDetailsPo from '@/cypress/e2e/po/detail/fleet/fleet.cattle.io
 import { GitRepoCreatePo } from '@/cypress/e2e/po/pages/fleet/gitrepo-create.po';
 import { GitRepoEditPo } from '@/cypress/e2e/po/edit/fleet/gitrepo-edit.po';
 import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
-import { LONG_TIMEOUT_OPT } from '@/cypress/support/utils/timeouts';
+import { LONG_TIMEOUT_OPT, MEDIUM_TIMEOUT_OPT } from '@/cypress/support/utils/timeouts';
 import { gitRepoTargetAllClustersRequest } from '@/cypress/e2e/blueprints/fleet/gitrepos';
 import { HeaderPo } from '@/cypress/e2e/po/components/header.po';
 import { MenuActions } from '@/cypress/support/types/menu-actions';
@@ -118,11 +118,14 @@ describe('Fleet Dashboard', { tags: ['@fleet', '@adminUser', '@jenkins'] }, () =
   it('can clone a git repo', () => {
     const gitRepoEditPage = new GitRepoEditPo(localWorkspace, repoName);
 
+    cy.intercept('GET', '/v1/secrets?exclude=metadata.managedFields').as('getSecrets');
+
     fleetDashboardPage.goTo();
     fleetDashboardPage.waitForPage();
     fleetDashboardPage.sortableTable().rowActionMenuOpen(repoName).getMenuItem('Clone').click();
 
     gitRepoEditPage.waitForPage('mode=clone');
+    cy.wait('@getSecrets', MEDIUM_TIMEOUT_OPT).its('response.statusCode').should('eq', 200);
     gitRepoEditPage.title().contains(`Git Repo: Clone from ${ repoName }`).should('be.visible');
     headerPo.selectWorkspace('fleet-default');
     gitRepoEditPage.nameNsDescription().name().set(`clone-${ repoName }`);

From 574248d1ce67bd5b8d3b6d95f716a979c22aaa9e Mon Sep 17 00:00:00 2001
From: Nancy <42977925+mantis-toboggan-md@users.noreply.github.com>
Date: Tue, 14 Jan 2025 13:18:34 -0800
Subject: [PATCH 37/57] validate that AKS node pool count is no more than 1000
 (#13039)

* validate that AKS node pool count is no more than 1000

* update validation message
---
 pkg/aks/l10n/en-us.yaml                   |  4 ++--
 pkg/aks/util/__tests__/validators.test.ts | 17 +++++++++++++++--
 pkg/aks/util/validators.ts                |  5 +++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkg/aks/l10n/en-us.yaml b/pkg/aks/l10n/en-us.yaml
index 4ee4dd73be..db79c58314 100644
--- a/pkg/aks/l10n/en-us.yaml
+++ b/pkg/aks/l10n/en-us.yaml
@@ -163,8 +163,8 @@ aks:
     availabilityZones: Availability zones are not available in the selected region.
     privateDnsZone: Private DNS Zone Resource ID must be in the format /subscriptions/SUBSCRIPTION_ID/resourceGroups/RESOURCEGROUP_NAME/providers/Microsoft.Network/privateDnsZones/PRIVATE_DNS_ZONE_NAME. The Private DNS Zone Resource Name must be in the format privatelink.REGION.azmk8s.io, SUBZONE.privatelink.REGION.azmk8s.io, private.REGION.azmk8s.io, or SUBZONE.private.REGION.azmk8s.io
     poolName: Node pool names must be 1-12 characters long, consist only of lowercase letters and numbers, and start with a letter.
-    poolCount: Node count must be at least one in System pools.
-    poolUserCount: Node count cannot be less than zero.
+    poolCount: Node count must be at least 1 and at most 1000 in System pools.
+    poolUserCount: Node count cannot be less than 0 or greater than 1000 in User pools.
     poolMinMax: The minimum number of nodes must be less than or equal to the maximum number of nodes, and the node count must be between or equal to the minimum and maximum.
     poolMin: The minimum number of nodes must be greater than 0 and at most 1000.
     poolMax: The maximum number of nodes must be greater than 0 and at most 1000.
diff --git a/pkg/aks/util/__tests__/validators.test.ts b/pkg/aks/util/__tests__/validators.test.ts
index fe0b8f6aa2..51a2bbe425 100644
--- a/pkg/aks/util/__tests__/validators.test.ts
+++ b/pkg/aks/util/__tests__/validators.test.ts
@@ -140,19 +140,24 @@ describe('fx: nodePoolNames', () => {
 
 describe('fx: nodePoolCount', () => {
   // AksNodePool unit tests check that the second arg is passed in as expected
-  it('validates that count is at least 1 when second arg is false', () => {
+  it('validates that count is at least 1 and at most 1000 when second arg is false', () => {
     const validator = validators.nodePoolCount(mockCtx);
 
     expect(validator(1, false)).toBeUndefined();
     expect(validator(0, false)).toStrictEqual(MOCK_TRANSLATION);
+    expect(validator(1000, false)).toBeUndefined();
+    expect(validator(1001, false)).toStrictEqual(MOCK_TRANSLATION);
   });
 
-  it('validates that count is at least 0 when second arg is true', () => {
+  it('validates that count is at least 0 and at most 1000 when second arg is true', () => {
     const validator = validators.nodePoolCount(mockCtx);
 
     expect(validator(1, true)).toBeUndefined();
     expect(validator(0, true)).toBeUndefined();
+    expect(validator(1000, true)).toBeUndefined();
+
     expect(validator(-1, true)).toStrictEqual(MOCK_TRANSLATION);
+    expect(validator(1001, true)).toStrictEqual(MOCK_TRANSLATION);
   });
 
   it('validates each node pool in the provided context when not passed a count value', () => {
@@ -170,6 +175,12 @@ describe('fx: nodePoolCount', () => {
         },
         {
           name: 'klm', _validation: {}, mode: 'User', count: -1
+        },
+        {
+          name: 'nop', _validation: {}, mode: 'User', count: 1001
+        },
+        {
+          name: 'qrs', _validation: {}, mode: 'System', count: 1001
         }
       ] as unknown as AKSNodePool[]
     };
@@ -180,5 +191,7 @@ describe('fx: nodePoolCount', () => {
     expect(ctx.nodePools[1]?._validation?._validCount).toStrictEqual(true);
     expect(ctx.nodePools[2]?._validation?._validCount).toStrictEqual(true);
     expect(ctx.nodePools[3]?._validation?._validCount).toStrictEqual(false);
+    expect(ctx.nodePools[4]?._validation?._validCount).toStrictEqual(false);
+    expect(ctx.nodePools[5]?._validation?._validCount).toStrictEqual(false);
   });
 });
diff --git a/pkg/aks/util/validators.ts b/pkg/aks/util/validators.ts
index 0c52340c27..484f75130c 100644
--- a/pkg/aks/util/validators.ts
+++ b/pkg/aks/util/validators.ts
@@ -181,6 +181,7 @@ export const nodePoolNamesUnique = (ctx: any) => {
 export const nodePoolCount = (ctx:any) => {
   return (count?: number, canBeZero = false) => {
     let min = 1;
+    const max = 1000;
     let errMsg = ctx.t('aks.errors.poolCount');
 
     if (canBeZero) {
@@ -188,7 +189,7 @@ export const nodePoolCount = (ctx:any) => {
       errMsg = ctx.t('aks.errors.poolUserCount');
     }
     if (count || count === 0) {
-      return count >= min ? undefined : errMsg;
+      return count >= min && count <= max ? undefined : errMsg;
     } else {
       let allValid = true;
 
@@ -201,7 +202,7 @@ export const nodePoolCount = (ctx:any) => {
           min = 1;
         }
 
-        if (count < min) {
+        if (count < min || count > max) {
           pool._validation['_validCount'] = false;
           allValid = false;
         } else {

From 0cd9bff4aace99131b556403faae2a925a1b567d Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Wed, 15 Jan 2025 10:54:47 +0000
Subject: [PATCH 38/57] Update copyright for SUSE (#13117)

---
 README.md                              | 2 +-
 shell/assets/translations/en-us.yaml   | 2 +-
 shell/assets/translations/zh-hans.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 20576a67cd..d490a5f284 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ We welcome external contributions - please refer to the internal documentation a
 
 License
 =======
-Copyright (c) 2014-2025 [Rancher Labs, Inc.](http://rancher.com)
+Copyright (c) 2014-2025 [SUSE](https://www.suse.com)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index 2319db7b81..bc4f0cf6a7 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -7780,7 +7780,7 @@ support:
       text: Run SUSE Rancher products with confidence, knowing that the developers who built them are available to quickly resolve issues.
     three:
       title: Troubleshooting
-      text: We focus on uncovering the root cause of any issue, whether it is related to Rancher Labs products, Kubernetes, Docker or your underlying infrastructure.
+      text: We focus on uncovering the root cause of any issue, whether it is related to SUSE products, Kubernetes, Docker or your underlying infrastructure.
     four:
       title: Innovate with Freedom
       text: Take advantage of our certified compatibility with a wide range of Kubernetes providers, operating systems, and open source software.
diff --git a/shell/assets/translations/zh-hans.yaml b/shell/assets/translations/zh-hans.yaml
index a9d117c01f..056d3438e7 100644
--- a/shell/assets/translations/zh-hans.yaml
+++ b/shell/assets/translations/zh-hans.yaml
@@ -7310,7 +7310,7 @@ support:
       text: 我们的开发人员会快速解决问题，因此你可以放心使用 SUSE Rancher 的产品。
     three:
       title: 故障排除
-      text: 无论你使用的 Rancher Labs 产品、Kubernetes、Docker 还是底层基础架构出现问题，我们都会努力找到问题的根本原因。
+      text: 无论你使用的 SUSE 产品、Kubernetes、Docker 还是底层基础架构出现问题，我们都会努力找到问题的根本原因。
     four:
       title: 自由创新
       text: 基于我们与众多 Kubernetes 供应商、操作系统和开源软件认证的兼容性，实现自主创新。

From 91f6dcff2427ff60364860ca7230566b82b48464 Mon Sep 17 00:00:00 2001
From: Cody Jackson <cody.jackson@suse.com>
Date: Fri, 3 Jan 2025 15:59:10 -0700
Subject: [PATCH 39/57] Adding deprecated messaging to the performance settings
 page

Fixes #12873
---
 shell/assets/translations/en-us.yaml          |  1 +
 .../pages/c/_cluster/settings/performance.vue | 45 ++++++++++++-------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index bc4f0cf6a7..057eef5c5c 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -7516,6 +7516,7 @@ 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.
   incrementalLoad:
     label: Incremental Loading
     setting: You can configure the threshold above which incremental loading will be used.
diff --git a/shell/pages/c/_cluster/settings/performance.vue b/shell/pages/c/_cluster/settings/performance.vue
index ab4f2e62fc..afa266f926 100644
--- a/shell/pages/c/_cluster/settings/performance.vue
+++ b/shell/pages/c/_cluster/settings/performance.vue
@@ -209,7 +209,9 @@ export default {
       <div class="ui-perf-setting">
         <!-- Server Side Pagination -->
         <div class="mt-40">
-          <h2>{{ t('performance.serverPagination.label') }}</h2>
+          <h2 id="ssp-setting">
+            {{ t('performance.serverPagination.label') }}
+          </h2>
           <p>{{ t('performance.serverPagination.description') }}</p>
           <Banner
             color="error"
@@ -288,6 +290,11 @@ export default {
         <!-- Incremental Loading -->
         <div class="mt-40">
           <h2>{{ t('performance.incrementalLoad.label') }}</h2>
+          <Banner
+            color="warning"
+          >
+            <span v-clean-html="t(`performance.deprecatedForSSP`, { setting: t('performance.incrementalLoad.label') }, true)" />
+          </Banner>
           <p>{{ t('performance.incrementalLoad.description') }}</p>
           <Checkbox
             :value="value.incrementalLoading.enabled"
@@ -315,11 +322,12 @@ export default {
         <!-- Enable manual refresh list views -->
         <div class="mt-40">
           <h2 v-t="'performance.manualRefresh.label'" />
-          <p>{{ t('performance.manualRefresh.description') }}</p>
           <Banner
-            color="error"
-            label-key="performance.experimental"
-          />
+            color="warning"
+          >
+            <span v-clean-html="t(`performance.deprecatedForSSP`, { setting: t('performance.manualRefresh.label') }, true)" />
+          </Banner>
+          <p>{{ t('performance.manualRefresh.description') }}</p>
           <Checkbox
             :value="value.manualRefresh.enabled"
             :mode="mode"
@@ -346,11 +354,12 @@ export default {
         <!-- Enable GC of resources from store -->
         <div class="mt-40">
           <h2 v-t="'performance.gc.label'" />
-          <p>{{ t('performance.gc.description') }}</p>
           <Banner
-            color="error"
-            label-key="performance.experimental"
-          />
+            color="warning"
+          >
+            <span v-clean-html="t(`performance.deprecatedForSSP`, { setting: t('performance.gc.label') }, true)" />
+          </Banner>
+          <p>{{ t('performance.gc.description') }}</p>
           <Checkbox
             v-model:value="value.garbageCollection.enabled"
             :mode="mode"
@@ -426,11 +435,12 @@ export default {
         <!-- Force NS filter -->
         <div class="mt-40">
           <h2>{{ t('performance.nsFiltering.label') }}</h2>
-          <p>{{ t('performance.nsFiltering.description') }}</p>
           <Banner
-            color="error"
-            label-key="performance.experimental"
-          />
+            color="warning"
+          >
+            <span v-clean-html="t(`performance.deprecatedForSSP`, { setting: t('performance.nsFiltering.label') }, true)" />
+          </Banner>
+          <p>{{ t('performance.nsFiltering.description') }}</p>
           <Checkbox
             :value="value.forceNsFilterV2.enabled"
             :mode="mode"
@@ -443,11 +453,12 @@ export default {
         <!-- Advanced Websocket Worker -->
         <div class="mt-40">
           <h2>{{ t('performance.advancedWorker.label') }}</h2>
-          <p>{{ t('performance.advancedWorker.description') }}</p>
           <Banner
-            color="error"
-            label-key="performance.experimental"
-          />
+            color="warning"
+          >
+            <span v-clean-html="t(`performance.deprecatedForSSP`, { setting: t('performance.advancedWorker.label') }, true)" />
+          </Banner>
+          <p>{{ t('performance.advancedWorker.description') }}</p>
           <Checkbox
             v-model:value="value.advancedWorker.enabled"
             :mode="mode"

From bda429cd25c114c3ce1e2d6c0271d248531c44a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:05:27 +0000
Subject: [PATCH 40/57] Bump actions/checkout from 2 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/add-issue-labels.yaml               | 2 +-
 .github/workflows/build-and-upload.yaml               | 4 ++--
 .github/workflows/build-test.yaml                     | 6 +++---
 .github/workflows/docusaurus.yaml                     | 2 +-
 .github/workflows/extensions-compatibility-tests.yaml | 2 +-
 .github/workflows/pr-gh-project.yaml                  | 2 +-
 .github/workflows/release-rancher-components.yml      | 2 +-
 .github/workflows/release-shell-pkg.yaml              | 4 ++--
 .github/workflows/valid-pr-description.yaml           | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/add-issue-labels.yaml b/.github/workflows/add-issue-labels.yaml
index 8db01a51cc..3f0370a7d4 100644
--- a/.github/workflows/add-issue-labels.yaml
+++ b/.github/workflows/add-issue-labels.yaml
@@ -9,7 +9,7 @@ jobs:
     permissions:
       issues: write
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:
diff --git a/.github/workflows/build-and-upload.yaml b/.github/workflows/build-and-upload.yaml
index 434ca3bef7..782d61bcfc 100644
--- a/.github/workflows/build-and-upload.yaml
+++ b/.github/workflows/build-and-upload.yaml
@@ -22,7 +22,7 @@ jobs:
     name: Build & Upload Hosted
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
@@ -69,7 +69,7 @@ jobs:
     name: Build & Upload Embedded
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
index b8ba454680..20b93e7417 100644
--- a/.github/workflows/build-test.yaml
+++ b/.github/workflows/build-test.yaml
@@ -9,7 +9,7 @@ jobs:
   unit-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
@@ -19,7 +19,7 @@ jobs:
   i18n:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
@@ -29,7 +29,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
diff --git a/.github/workflows/docusaurus.yaml b/.github/workflows/docusaurus.yaml
index 38056fe031..8992a5d71d 100644
--- a/.github/workflows/docusaurus.yaml
+++ b/.github/workflows/docusaurus.yaml
@@ -12,7 +12,7 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
diff --git a/.github/workflows/extensions-compatibility-tests.yaml b/.github/workflows/extensions-compatibility-tests.yaml
index e8a2e50ce9..19fbdbad0a 100644
--- a/.github/workflows/extensions-compatibility-tests.yaml
+++ b/.github/workflows/extensions-compatibility-tests.yaml
@@ -30,7 +30,7 @@ jobs:
         ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Setup env
diff --git a/.github/workflows/pr-gh-project.yaml b/.github/workflows/pr-gh-project.yaml
index dcb875c3da..1e140d2734 100644
--- a/.github/workflows/pr-gh-project.yaml
+++ b/.github/workflows/pr-gh-project.yaml
@@ -12,7 +12,7 @@ jobs:
       id-token: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Use Node.js
       uses: actions/setup-node@v4
       with:
diff --git a/.github/workflows/release-rancher-components.yml b/.github/workflows/release-rancher-components.yml
index 3d2061544d..4a56c15bdc 100644
--- a/.github/workflows/release-rancher-components.yml
+++ b/.github/workflows/release-rancher-components.yml
@@ -12,7 +12,7 @@ jobs:
       contents: read
       packages: write
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         persist-credentials: false
diff --git a/.github/workflows/release-shell-pkg.yaml b/.github/workflows/release-shell-pkg.yaml
index 1e41425078..3ab06bb95b 100644
--- a/.github/workflows/release-shell-pkg.yaml
+++ b/.github/workflows/release-shell-pkg.yaml
@@ -33,7 +33,7 @@ jobs:
     steps:
       - if: inputs.is_test == 'true' && inputs.test_branch != ''
         name: Checkout (test flow)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           ref: ${{ inputs.test_branch }}
@@ -41,7 +41,7 @@ jobs:
       
       - if: inputs.is_test != 'true'
         name: Checkout (normal flow)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           persist-credentials: false
diff --git a/.github/workflows/valid-pr-description.yaml b/.github/workflows/valid-pr-description.yaml
index 72e7ff85b7..c69cf30967 100644
--- a/.github/workflows/valid-pr-description.yaml
+++ b/.github/workflows/valid-pr-description.yaml
@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Validate checklist has been completed
         env:

From 55b5e780682bc37a53c744136a4d3e864d4faae2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:05:38 +0000
Subject: [PATCH 41/57] Bump actions/download-artifact from 3 to 4

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-extension-charts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-extension-charts.yml b/.github/workflows/build-extension-charts.yml
index 1e7720bb28..1486237cba 100644
--- a/.github/workflows/build-extension-charts.yml
+++ b/.github/workflows/build-extension-charts.yml
@@ -132,7 +132,7 @@ jobs:
           git config user.email 'github-actions[bot]@users.noreply.github.com'
 
       - name: Download build artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: charts
 

From 668f56871d8d03210049b65e2367ee4699ed2d4b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:07:24 +0000
Subject: [PATCH 42/57] Bump cross-env from 6.0.3 to 7.0.3 in /shell

Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.3 to 7.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.3)

---
updated-dependencies:
- dependency-name: cross-env
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

diff --git a/shell/package.json b/shell/package.json
index 39e370f36f..b5c8593edd 100644
--- a/shell/package.json
+++ b/shell/package.json
@@ -65,7 +65,7 @@
     "core-js": "3.25.3",
     "cron-validator": "1.3.1",
     "cronstrue": "2.50.0",
-    "cross-env": "6.0.3",
+    "cross-env": "7.0.3",
     "css-loader": "6.7.3",
     "csv-loader": "3.0.3",
     "custom-event-polyfill": "^1.0.7",
diff --git a/shell/yarn.lock b/shell/yarn.lock
index e010f3982c..8f4d92cd64 100644
--- a/shell/yarn.lock
+++ b/shell/yarn.lock
@@ -6025,12 +6025,12 @@ cronstrue@2.50.0:
   resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-2.50.0.tgz#eabba0f915f186765258b707b7a3950c663b5573"
   integrity sha512-ULYhWIonJzlScCCQrPUG5uMXzXxSixty4djud9SS37DoNxDdkeRocxzHuAo4ImRBUK+mAuU5X9TSwEDccnnuPg==
 
-cross-env@6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
-  integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
+cross-env@7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
   dependencies:
-    cross-spawn "^7.0.0"
+    cross-spawn "^7.0.1"
 
 cross-spawn@^6.0.0:
   version "6.0.5"
@@ -6043,10 +6043,10 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"

From 5acabe273f684f23c6349e20b235b18e13e1337b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:07:34 +0000
Subject: [PATCH 43/57] Bump jexl from 2.2.2 to 2.3.0 in /shell

Bumps [jexl](https://github.com/TomFrost/jexl) from 2.2.2 to 2.3.0.
- [Changelog](https://github.com/TomFrost/Jexl/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TomFrost/jexl/compare/v2.2.2...v2.3.0)

---
updated-dependencies:
- dependency-name: jexl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/shell/package.json b/shell/package.json
index 39e370f36f..dadd14305e 100644
--- a/shell/package.json
+++ b/shell/package.json
@@ -97,7 +97,7 @@
     "is-url": "1.2.4",
     "jest": "27.5.1",
     "jest-serializer-vue": "2.0.2",
-    "jexl": "2.2.2",
+    "jexl": "2.3.0",
     "jquery": "3.5.1",
     "js-cookie": "2.2.1",
     "js-yaml": "4.1.0",
diff --git a/shell/yarn.lock b/shell/yarn.lock
index e010f3982c..1cd9c63775 100644
--- a/shell/yarn.lock
+++ b/shell/yarn.lock
@@ -2452,10 +2452,10 @@
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@^7.12.13", "@babel/runtime@^7.8.4":
-  version "7.25.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.0.tgz#3af9a91c1b739c569d5d80cc917280919c544ecb"
-  integrity sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.8.4":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
+  integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -9505,10 +9505,12 @@ jest@27.5.1:
     import-local "^3.0.2"
     jest-cli "^27.5.1"
 
-jexl@2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/jexl/-/jexl-2.2.2.tgz#eb06cd84684a52b6408be94604c5529f416ccd2f"
-  integrity sha512-HYDGbiZtGLbaxp1b0S7Nqbtegu5zhxaUBzsrMIpoEJDNr1M8lSuowpO7ziXldc/+wGGvwkZYQSS8mW2cPpiGgA==
+jexl@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/jexl/-/jexl-2.3.0.tgz#73e0694d86ca917ac24fed753f201c1db59a46c5"
+  integrity sha512-ecqln4kTWNkMwbFvTukOMDq1jy1GcPzvshhMp/s4pxU86xdLDq7HbDRa87DfMfbSAOS8V6EwvCdfs0S+w/iycA==
+  dependencies:
+    "@babel/runtime" "^7.10.2"
 
 joi@^17.4.0:
   version "17.13.3"

From c9fc840ecc9d617909d7d17044f3c7c51d3ed6c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:08:51 +0000
Subject: [PATCH 44/57] Bump @popperjs/core from 2.4.4 to 2.11.8

Bumps [@popperjs/core](https://github.com/popperjs/popper-core) from 2.4.4 to 2.11.8.
- [Release notes](https://github.com/popperjs/popper-core/releases)
- [Commits](https://github.com/popperjs/popper-core/compare/v2.4.4...v2.11.8)

---
updated-dependencies:
- dependency-name: "@popperjs/core"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 603c6900cb..27dbf91833 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@aws-sdk/client-iam": "3.658.1",
     "@aws-sdk/client-kms": "3.8.1",
     "@novnc/novnc": "1.2.0",
-    "@popperjs/core": "2.4.4",
+    "@popperjs/core": "2.11.8",
     "@rancher/icons": "2.0.29",
     "ansi_up": "5.0.0",
     "axios": "0.21.4",
diff --git a/yarn.lock b/yarn.lock
index 9bba36ee0c..0b79fb4d1e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3014,10 +3014,10 @@
   resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz#f077fdc0b5d0078d30893396ff4827a13f99e817"
   integrity sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==
 
-"@popperjs/core@2.4.4":
-  version "2.4.4"
-  resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.4.4.tgz#11d5db19bd178936ec89cd84519c4de439574398"
-  integrity sha512-1oO6+dN5kdIA3sKPZhRGJTfGVP4SWV6KqlMOwry4J3HfyD68sl/3KmG7DeYUzvN+RbhXDnv/D8vNNB8168tAMg==
+"@popperjs/core@2.11.8":
+  version "2.11.8"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
+  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
 "@popperjs/core@npm:@sxzz/popperjs-es@^2.11.7":
   version "2.11.7"
@@ -7763,7 +7763,6 @@ eslint-plugin-jest@24.4.0:
 
 "eslint-plugin-local-rules@link:./eslint-plugin-local-rules":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-local-rules@link:eslint-plugin-local-rules":
   version "0.0.0"

From cc736d743f28114b25c43356bb5b8c27e4fa195a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:08:52 +0000
Subject: [PATCH 45/57] Bump cross-env from 6.0.3 to 7.0.3

Bumps [cross-env](https://github.com/kentcdodds/cross-env) from 6.0.3 to 7.0.3.
- [Release notes](https://github.com/kentcdodds/cross-env/releases)
- [Changelog](https://github.com/kentcdodds/cross-env/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kentcdodds/cross-env/compare/v6.0.3...v7.0.3)

---
updated-dependencies:
- dependency-name: cross-env
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

diff --git a/package.json b/package.json
index 603c6900cb..bc58012a08 100644
--- a/package.json
+++ b/package.json
@@ -77,7 +77,7 @@
     "cookie-universal": "2.2.2",
     "cron-validator": "1.2.0",
     "cronstrue": "1.95.0",
-    "cross-env": "6.0.3",
+    "cross-env": "7.0.3",
     "custom-event-polyfill": "1.0.7",
     "d3": "7.3.0",
     "d3-selection": "1.4.1",
diff --git a/yarn.lock b/yarn.lock
index 9bba36ee0c..e1e4d9a8a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6387,12 +6387,12 @@ cronstrue@2.50.0:
   resolved "https://registry.yarnpkg.com/cronstrue/-/cronstrue-2.50.0.tgz#eabba0f915f186765258b707b7a3950c663b5573"
   integrity sha512-ULYhWIonJzlScCCQrPUG5uMXzXxSixty4djud9SS37DoNxDdkeRocxzHuAo4ImRBUK+mAuU5X9TSwEDccnnuPg==
 
-cross-env@6.0.3:
-  version "6.0.3"
-  resolved "https://registry.npmjs.org/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941"
-  integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag==
+cross-env@7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
   dependencies:
-    cross-spawn "^7.0.0"
+    cross-spawn "^7.0.1"
 
 cross-spawn@^5.0.1:
   version "5.1.0"
@@ -6414,10 +6414,10 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -7763,7 +7763,6 @@ eslint-plugin-jest@24.4.0:
 
 "eslint-plugin-local-rules@link:./eslint-plugin-local-rules":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-local-rules@link:eslint-plugin-local-rules":
   version "0.0.0"

From 3e78764a601831ea0ab55b3a36d6d318181e3b3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:08:53 +0000
Subject: [PATCH 46/57] Bump jexl from 2.2.2 to 2.3.0

Bumps [jexl](https://github.com/TomFrost/jexl) from 2.2.2 to 2.3.0.
- [Changelog](https://github.com/TomFrost/Jexl/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TomFrost/jexl/compare/v2.2.2...v2.3.0)

---
updated-dependencies:
- dependency-name: jexl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/package.json b/package.json
index 603c6900cb..80bd5fea17 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "ip": "2.0.1",
     "ipaddr.js": "2.2.0",
     "is-url": "1.2.4",
-    "jexl": "2.2.2",
+    "jexl": "2.3.0",
     "jquery": "3.5.1",
     "js-cookie": "2.2.1",
     "js-yaml": "4.1.0",
diff --git a/yarn.lock b/yarn.lock
index 9bba36ee0c..98d1544eb3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2453,10 +2453,10 @@
   resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@^7.12.13", "@babel/runtime@^7.8.4":
-  version "7.25.6"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2"
-  integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==
+"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.13", "@babel/runtime@^7.8.4":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.26.0.tgz#8600c2f595f277c60815256418b85356a65173c1"
+  integrity sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
@@ -7763,7 +7763,6 @@ eslint-plugin-jest@24.4.0:
 
 "eslint-plugin-local-rules@link:./eslint-plugin-local-rules":
   version "0.0.0"
-  uid ""
 
 "eslint-plugin-local-rules@link:eslint-plugin-local-rules":
   version "0.0.0"
@@ -10279,10 +10278,12 @@ jest@27.5.1:
     import-local "^3.0.2"
     jest-cli "^27.5.1"
 
-jexl@2.2.2:
-  version "2.2.2"
-  resolved "https://registry.npmjs.org/jexl/-/jexl-2.2.2.tgz#eb06cd84684a52b6408be94604c5529f416ccd2f"
-  integrity sha512-HYDGbiZtGLbaxp1b0S7Nqbtegu5zhxaUBzsrMIpoEJDNr1M8lSuowpO7ziXldc/+wGGvwkZYQSS8mW2cPpiGgA==
+jexl@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/jexl/-/jexl-2.3.0.tgz#73e0694d86ca917ac24fed753f201c1db59a46c5"
+  integrity sha512-ecqln4kTWNkMwbFvTukOMDq1jy1GcPzvshhMp/s4pxU86xdLDq7HbDRa87DfMfbSAOS8V6EwvCdfs0S+w/iycA==
+  dependencies:
+    "@babel/runtime" "^7.10.2"
 
 joi@^17.4.0:
   version "17.13.3"

From 89c0e9fec2481ba6820ce4e8faec8caf14a84f67 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 23:18:02 +0000
Subject: [PATCH 47/57] Bump @popperjs/core from 2.4.4 to 2.11.8 in /shell

Bumps [@popperjs/core](https://github.com/popperjs/popper-core) from 2.4.4 to 2.11.8.
- [Release notes](https://github.com/popperjs/popper-core/releases)
- [Commits](https://github.com/popperjs/popper-core/compare/v2.4.4...v2.11.8)

---
updated-dependencies:
- dependency-name: "@popperjs/core"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

diff --git a/shell/package.json b/shell/package.json
index 39e370f36f..fc6ca80fb9 100644
--- a/shell/package.json
+++ b/shell/package.json
@@ -36,7 +36,7 @@
     "@babel/plugin-proposal-private-property-in-object": "7.14.5",
     "@babel/preset-typescript": "7.16.7",
     "@novnc/novnc": "1.2.0",
-    "@popperjs/core": "2.4.4",
+    "@popperjs/core": "2.11.8",
     "@rancher/icons": "2.0.29",
     "@types/is-url": "1.2.30",
     "@types/node": "20.10.8",
diff --git a/shell/yarn.lock b/shell/yarn.lock
index e010f3982c..9e9c5bfa96 100644
--- a/shell/yarn.lock
+++ b/shell/yarn.lock
@@ -2917,10 +2917,10 @@
   resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.25.tgz#f077fdc0b5d0078d30893396ff4827a13f99e817"
   integrity sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==
 
-"@popperjs/core@2.4.4":
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.4.4.tgz#11d5db19bd178936ec89cd84519c4de439574398"
-  integrity sha512-1oO6+dN5kdIA3sKPZhRGJTfGVP4SWV6KqlMOwry4J3HfyD68sl/3KmG7DeYUzvN+RbhXDnv/D8vNNB8168tAMg==
+"@popperjs/core@2.11.8":
+  version "2.11.8"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
+  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
 
 "@popperjs/core@npm:@sxzz/popperjs-es@^2.11.7":
   version "2.11.7"

From 7a4b3d1b57bed72c4edef7055564ee9845dfce89 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 16 Jan 2025 11:36:08 +0000
Subject: [PATCH 48/57] Fix gitrepo bundle list and bundle list when there's a
 gitrepo that does not target any clusters

---
 shell/components/fleet/FleetBundles.vue | 3 ++-
 shell/list/fleet.cattle.io.bundle.vue   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/shell/components/fleet/FleetBundles.vue b/shell/components/fleet/FleetBundles.vue
index 8a6088166c..c9004d1b7c 100644
--- a/shell/components/fleet/FleetBundles.vue
+++ b/shell/components/fleet/FleetBundles.vue
@@ -127,7 +127,8 @@ export default {
             class="text-warning"
           >
             {{ row.status.summary.ready }}/{{ row.status.summary.desiredReady }}</span>
-          <span v-else-if="row.status">{{ row.status.summary.desiredReady }}</span>
+          <span v-else-if="row.status && row.status.summary">{{ row.status.summary.desiredReady }}</span>
+          <span v-else>-</span>
         </template>
       </ResourceTable>
     </div>
diff --git a/shell/list/fleet.cattle.io.bundle.vue b/shell/list/fleet.cattle.io.bundle.vue
index 4b5aaed673..aa53c04420 100644
--- a/shell/list/fleet.cattle.io.bundle.vue
+++ b/shell/list/fleet.cattle.io.bundle.vue
@@ -115,11 +115,11 @@ export default {
     >
       <template #cell:deploymentsReady="{row}">
         <span
-          v-if="row.status && (row.status.summary.desiredReady !== row.status.summary.ready)"
+          v-if="row.status && row.status.summary && (row.status.summary.desiredReady !== row.status.summary.ready)"
           class="text-warning"
         >
           {{ row.status.summary.ready }}/{{ row.status.summary.desiredReady }}</span>
-        <span v-else-if="row.status">{{ row.status.summary.desiredReady }}</span>
+        <span v-else-if="row.status && row.status.summary">{{ row.status.summary.desiredReady }}</span>
         <span v-else>-</span>
       </template>
     </ResourceTable>

From 9d8b5fa6695f6ffad5a14c238d14588f0ab488e6 Mon Sep 17 00:00:00 2001
From: Richard Cox <ricox@suse.com>
Date: Thu, 16 Jan 2025 15:51:47 +0000
Subject: [PATCH 49/57] Disable sorry cypress

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

diff --git a/package.json b/package.json
index 87207ac7bd..894f079e70 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,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:sorry",
+    "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",
     "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 4b13823870081706ba2fdbff1536cfbf01c35270 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:05:25 +0000
Subject: [PATCH 50/57] Bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build-extension-charts.yml          | 2 +-
 .github/workflows/check-plugins.yaml                  | 2 +-
 .github/workflows/extensions-compatibility-tests.yaml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-extension-charts.yml b/.github/workflows/build-extension-charts.yml
index 1e7720bb28..b0a3a1bb7d 100644
--- a/.github/workflows/build-extension-charts.yml
+++ b/.github/workflows/build-extension-charts.yml
@@ -103,7 +103,7 @@ jobs:
 
       - name: Upload charts artifact
         if: github.ref_type == 'tag' || (github.ref == 'refs/heads/main' && github.event_name != 'pull_request') || inputs.is_test == 'true'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: charts
           path: tmp
diff --git a/.github/workflows/check-plugins.yaml b/.github/workflows/check-plugins.yaml
index a8fbb48be6..de3f416eff 100644
--- a/.github/workflows/check-plugins.yaml
+++ b/.github/workflows/check-plugins.yaml
@@ -26,7 +26,7 @@ jobs:
         shell: bash
 
       - name: Upload files
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test
diff --git a/.github/workflows/extensions-compatibility-tests.yaml b/.github/workflows/extensions-compatibility-tests.yaml
index 19fbdbad0a..5c8c15a40f 100644
--- a/.github/workflows/extensions-compatibility-tests.yaml
+++ b/.github/workflows/extensions-compatibility-tests.yaml
@@ -60,7 +60,7 @@ jobs:
       
       # Upload to sorry cypress in case of failure
       - name: Upload screenshots
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
           name: ${{github.run_number}}-${{github.run_attempt}}-extensions-compatibility-tests-screenshots-${{ matrix.role.tag }}+${{ matrix.features[0] }}

From 3457d9cff578f46b74a2ed26668f53eb9c6a30a2 Mon Sep 17 00:00:00 2001
From: Phillip Rak <rak.phillip@gmail.com>
Date: Thu, 16 Jan 2025 10:38:55 -0700
Subject: [PATCH 51/57] Merge cypress screenshots artifacts

Signed-off-by: Phillip Rak <rak.phillip@gmail.com>
---
 .github/workflows/extensions-compatibility-tests.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/extensions-compatibility-tests.yaml b/.github/workflows/extensions-compatibility-tests.yaml
index 5c8c15a40f..104a96303f 100644
--- a/.github/workflows/extensions-compatibility-tests.yaml
+++ b/.github/workflows/extensions-compatibility-tests.yaml
@@ -63,8 +63,14 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
-          name: ${{github.run_number}}-${{github.run_attempt}}-extensions-compatibility-tests-screenshots-${{ matrix.role.tag }}+${{ matrix.features[0] }}
+          name: ${{github.run_number}}-${{github.run_attempt}}-extensions-compatibility-tests-screenshots-${{ matrix.role.tag }}+${{ matrix.features[0] }}-${{ matrix.rancherEnv }}
           path: cypress/screenshots
+
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: ${{github.run_number}}-${{github.run_attempt}}-extensions-compatibility-tests-screenshots-${{ matrix.role.tag }}+${{ matrix.features[0] }}
+          pattern: ${{github.run_number}}-${{github.run_attempt}}-extensions-compatibility-tests-screenshots-*
     
       # Slack message with outcome - success
       - name: Slack message in workflow success
@@ -88,4 +94,4 @@ jobs:
           curl -X POST \
           -H "Content-type: application/json; charset=utf-8" \
           --data '{"name": "${{ matrix.rancherEnv[0] }} - image:${{ matrix.rancherEnv[1] }} - ${{ matrix.features[1] }}", "status": "Workflow failed! 🆘", "workflow_run": ${{ github.run_id }} }' \
-          $SLACK_URL
\ No newline at end of file
+          $SLACK_URL

From 7862722ab2fd3a0548582aac5f49001920926ec0 Mon Sep 17 00:00:00 2001
From: Yonas Berhe <yberhe@Yonass-MacBook-Pro.local>
Date: Wed, 15 Jan 2025 05:05:37 -0800
Subject: [PATCH 52/57] automation: fix flaky tests based on jenkins failures

---
 cypress/e2e/po/pages/extensions.po.ts           | 12 +++++++++---
 .../tests/pages/explorer/apps/charts.spec.ts    | 12 ++++++++++--
 .../pages/explorer/apps/repositories.spec.ts    |  2 +-
 .../tests/pages/extensions/extensions.spec.ts   | 17 ++++++++++++++++-
 .../tests/pages/extensions/kubewarden.spec.ts   | 15 +++++++++++++--
 5 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/cypress/e2e/po/pages/extensions.po.ts b/cypress/e2e/po/pages/extensions.po.ts
index 0390b02453..ec2706bbf9 100644
--- a/cypress/e2e/po/pages/extensions.po.ts
+++ b/cypress/e2e/po/pages/extensions.po.ts
@@ -7,7 +7,7 @@ import RepositoriesPagePo from '@/cypress/e2e/po/pages/chart-repositories.po';
 import BannersPo from '@/cypress/e2e/po/components/banners.po';
 import ChartRepositoriesCreateEditPo from '@/cypress/e2e/po/edit/chart-repositories.po';
 import AppClusterRepoEditPo from '@/cypress/e2e/po/edit/catalog.cattle.io.clusterrepo.po';
-import { LONG_TIMEOUT_OPT } from '@/cypress/support/utils/timeouts';
+import { LONG_TIMEOUT_OPT, MEDIUM_TIMEOUT_OPT } from '@/cypress/support/utils/timeouts';
 
 export default class ExtensionsPagePo extends PagePo {
   static url = '/c/local/uiplugins'
@@ -34,7 +34,7 @@ export default class ExtensionsPagePo extends PagePo {
     return this.title().should('contain', 'Extensions');
   }
 
-  loading() {
+  loading(options: any) {
     return this.self().get('.data-loading');
   }
 
@@ -50,12 +50,16 @@ export default class ExtensionsPagePo extends PagePo {
    * @returns {Cypress.Chainable}
    */
   addExtensionsRepository(repo: string, branch: string, name: string): Cypress.Chainable {
+    cy.intercept('GET', '/v1/catalog.cattle.io.clusterrepos?exclude=metadata.managedFields').as('getRepos');
+
     // we should be on the extensions page
-    this.waitForPage();
+    this.waitForPage(null, 'available');
+    this.loading(MEDIUM_TIMEOUT_OPT).should('not.exist');
 
     // go to app repos
     this.extensionMenuToggle();
     this.manageReposClick();
+    cy.wait('@getRepos').its('response.statusCode').should('eq', 200);
 
     // create a new clusterrepo
     const appRepoList = new RepositoriesPagePo('local', 'apps');
@@ -82,6 +86,8 @@ export default class ExtensionsPagePo extends PagePo {
 
     appRepoList.waitForPage();
     appRepoList.list().state(name).should('contain', 'Active');
+
+    return cy.wrap(appRepoList.list());
   }
 
   /**
diff --git a/cypress/e2e/tests/pages/explorer/apps/charts.spec.ts b/cypress/e2e/tests/pages/explorer/apps/charts.spec.ts
index d9cc8daf6e..20e89ef0ef 100644
--- a/cypress/e2e/tests/pages/explorer/apps/charts.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/apps/charts.spec.ts
@@ -6,6 +6,8 @@ const chartsPage = new ChartsPage();
 
 describe('Apps/Charts', { tags: ['@explorer', '@adminUser'] }, () => {
   beforeEach(() => {
+    cy.intercept('GET', '/v1/catalog.cattle.io.clusterrepos/**').as('fetchChartData');
+
     cy.login();
     chartsPage.goTo();
     chartsPage.waitForPage();
@@ -94,6 +96,9 @@ describe('Apps/Charts', { tags: ['@explorer', '@adminUser'] }, () => {
   it('should call fetch when route query changes with valid parameters', () => {
     const chartName = 'Logging';
 
+    cy.wait('@fetchChartData');
+    cy.get('@fetchChartData.all').should('have.length.at.least', 3);
+
     chartsPage.getChartByName(chartName)
       .should('exist')
       .scrollIntoView()
@@ -105,16 +110,19 @@ describe('Apps/Charts', { tags: ['@explorer', '@adminUser'] }, () => {
     chartPage.waitForPage();
 
     // Set up intercept for the network request triggered by $fetch
-    cy.intercept('GET', '**/v1/catalog.cattle.io.clusterrepos/**').as('fetchChartData');
+    cy.intercept('GET', '**/v1/catalog.cattle.io.clusterrepos/**').as('fetchChartDataAfterSelect');
 
     chartPage.selectVersion('103.1.1+up4.4.0');
 
-    cy.wait('@fetchChartData').its('response.statusCode').should('eq', 200);
+    cy.wait('@fetchChartDataAfterSelect').its('response.statusCode').should('eq', 200);
   });
 
   it('should not call fetch when navigating back to charts page', () => {
     const chartName = 'Logging';
 
+    cy.wait('@fetchChartData');
+    cy.get('@fetchChartData.all').should('have.length.at.least', 3);
+
     chartsPage.getChartByName(chartName)
       .should('exist')
       .scrollIntoView()
diff --git a/cypress/e2e/tests/pages/explorer/apps/repositories.spec.ts b/cypress/e2e/tests/pages/explorer/apps/repositories.spec.ts
index b8e7042396..54fcebbd33 100644
--- a/cypress/e2e/tests/pages/explorer/apps/repositories.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/apps/repositories.spec.ts
@@ -172,7 +172,7 @@ describe('Apps', () => {
         cy.intercept('GET', '/v1/catalog.cattle.io.clusterrepos/rancher-charts?*').as('rancherCharts1');
 
         // Nav to a summary page for a specific chart
-        ChartsPage.navTo(clusterId);
+        chartsPage.goTo();
         chartsPage.chartsFilterCategoriesSelect().toggle();
         chartsPage.chartsFilterCategoriesSelect().clickOptionWithLabel('All Categories');
         chartsPage.chartsFilterReposSelect().toggle();
diff --git a/cypress/e2e/tests/pages/extensions/extensions.spec.ts b/cypress/e2e/tests/pages/extensions/extensions.spec.ts
index 6b8c4e01a2..f208c05fc6 100644
--- a/cypress/e2e/tests/pages/extensions/extensions.spec.ts
+++ b/cypress/e2e/tests/pages/extensions/extensions.spec.ts
@@ -8,6 +8,7 @@ import { NamespaceFilterPo } from '@/cypress/e2e/po/components/namespace-filter.
 
 const namespaceFilter = new NamespaceFilterPo();
 const cluster = 'local';
+let removeExtensions = false;
 
 const DISABLED_CACHE_EXTENSION_NAME = 'large-extension';
 // const DISABLED_CACHE_EXTENSION_MENU_LABEL = 'Large-extension';
@@ -16,6 +17,7 @@ const UNAUTHENTICATED_EXTENSION_NAME = 'uk-locale';
 const EXTENSION_NAME = 'clock';
 const UI_PLUGINS_PARTNERS_REPO_URL = 'https://github.com/rancher/partner-extensions';
 const UI_PLUGINS_PARTNERS_REPO_NAME = 'partner-extensions';
+const GIT_REPO_NAME = 'rancher-plugin-examples';
 
 describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
   beforeEach(() => {
@@ -69,7 +71,9 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     extensionsPo.extensionTabInstalledClick(); // Avoid nav guard failures that probably auto move user to this tab
 
     // install the rancher plugin examples
-    extensionsPo.addExtensionsRepository('https://github.com/rancher/ui-plugin-examples', 'main', 'rancher-plugin-examples');
+    extensionsPo.addExtensionsRepository('https://github.com/rancher/ui-plugin-examples', 'main', GIT_REPO_NAME).then(() => {
+      removeExtensions = true;
+    });
   });
 
   it('has the correct title for Prime users and should display banner on main extensions screen EVEN IF setting is empty string', () => {
@@ -253,9 +257,11 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
   });
 
   it('Should install an extension', () => {
+    cy.intercept('POST', `/v1/catalog.cattle.io.clusterrepos/${ GIT_REPO_NAME }?action=install`).as('installExtension');
     const extensionsPo = new ExtensionsPagePo();
 
     extensionsPo.goTo();
+    extensionsPo.waitForPage();
 
     extensionsPo.extensionTabAvailableClick();
     extensionsPo.waitForPage(null, 'available');
@@ -267,6 +273,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     // select version and click install
     extensionsPo.installModalSelectVersionClick(2);
     extensionsPo.installModalInstallClick();
+    cy.wait('@installExtension').its('response.statusCode').should('eq', 201);
 
     // let's check the extension reload banner and reload the page
     extensionsPo.extensionReloadBanner().should('be.visible');
@@ -297,6 +304,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
   });
 
   it('Should update an extension version', () => {
+    cy.intercept('POST', `/v1/catalog.cattle.io.clusterrepos/${ GIT_REPO_NAME }?action=upgrade`).as('upgradeExtension');
     const extensionsPo = new ExtensionsPagePo();
 
     extensionsPo.goTo();
@@ -308,6 +316,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     // click on update button on card
     extensionsPo.extensionCardUpdateClick(EXTENSION_NAME);
     extensionsPo.installModalInstallClick();
+    cy.wait('@upgradeExtension').its('response.statusCode').should('eq', 201);
 
     // let's check the extension reload banner and reload the page
     extensionsPo.extensionReloadBanner().should('be.visible');
@@ -515,4 +524,10 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
     extensionsPo.extensionCardClick(DISABLED_CACHE_EXTENSION_NAME);
     extensionsPo.extensionDetailsTitle().should('contain', DISABLED_CACHE_EXTENSION_NAME);
   });
+
+  after(() => {
+    if ( removeExtensions ) {
+      cy.deleteRancherResource('v1', 'catalog.cattle.io.clusterrepos', GIT_REPO_NAME);
+    }
+  });
 });
diff --git a/cypress/e2e/tests/pages/extensions/kubewarden.spec.ts b/cypress/e2e/tests/pages/extensions/kubewarden.spec.ts
index 73eb234ce6..a39d9b7a14 100644
--- a/cypress/e2e/tests/pages/extensions/kubewarden.spec.ts
+++ b/cypress/e2e/tests/pages/extensions/kubewarden.spec.ts
@@ -6,8 +6,10 @@ import KubewardenExtensionPo from '@/cypress/e2e/po/pages/extensions/kubewarden.
 import { catchTargetPageException } from '@/cypress/support/utils/exception-utils';
 
 const extensionName = 'kubewarden';
+const gitRepoName = 'rancher-extensions';
+let removeExtensions = false;
 
-describe('Kubewarden Extension', { tags: ['@extensions-temp-excluded', '@adminUser'] }, () => {
+describe('Kubewarden Extension', { tags: ['@extensions', '@adminUser'] }, () => {
   before(() => {
     catchTargetPageException('Navigation cancelled');
     cy.login();
@@ -18,7 +20,9 @@ describe('Kubewarden Extension', { tags: ['@extensions-temp-excluded', '@adminUs
     extensionsPo.waitForPage();
 
     // install the ui-plugin-charts repo
-    extensionsPo.addExtensionsRepository('https://github.com/rancher/ui-plugin-charts', 'main', 'rancher-extensions');
+    extensionsPo.addExtensionsRepository('https://github.com/rancher/ui-plugin-charts', 'main', gitRepoName).then(() => {
+      removeExtensions = true;
+    });
   });
 
   beforeEach(() => {
@@ -32,6 +36,7 @@ describe('Kubewarden Extension', { tags: ['@extensions-temp-excluded', '@adminUs
     extensionsPo.waitForPage();
 
     extensionsPo.extensionTabAvailableClick();
+    extensionsPo.waitForPage(null, 'available');
 
     // click on install button on card
     extensionsPo.extensionCardInstallClick(extensionName);
@@ -110,4 +115,10 @@ describe('Kubewarden Extension', { tags: ['@extensions-temp-excluded', '@adminUs
     extensionsPo.extensionCardClick(extensionName);
     extensionsPo.extensionDetailsTitle().should('contain', extensionName);
   });
+
+  after(() => {
+    if ( removeExtensions ) {
+      cy.deleteRancherResource('v1', 'catalog.cattle.io.clusterrepos', gitRepoName);
+    }
+  });
 });

From beef20e10cc4eb3dff31f41be2a5ed354d272b47 Mon Sep 17 00:00:00 2001
From: Evgeniya Vashkevich <evgeniya.vashkevich@suse.com>
Date: Fri, 17 Jan 2025 15:04:43 -0800
Subject: [PATCH 53/57] Fixed LabeledSelect not emitting search explicitly
 (#13142)

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

diff --git a/shell/components/auth/SelectPrincipal.vue b/shell/components/auth/SelectPrincipal.vue
index 941404d28d..cffabaa1b1 100644
--- a/shell/components/auth/SelectPrincipal.vue
+++ b/shell/components/auth/SelectPrincipal.vue
@@ -127,7 +127,7 @@ export default {
       }
     },
 
-    onSearch(str, loading, vm) {
+    onSearch(str, loading) {
       str = (str || '').trim();
 
       this.searchStr = str;
diff --git a/shell/components/form/LabeledSelect.vue b/shell/components/form/LabeledSelect.vue
index 9135df72d3..a0594fe9c3 100644
--- a/shell/components/form/LabeledSelect.vue
+++ b/shell/components/form/LabeledSelect.vue
@@ -22,7 +22,7 @@ export default {
     LabeledSelectPagination
   ],
 
-  emits: ['on-open', 'on-close', 'selecting', 'deselecting', 'update:validation', 'update:value'],
+  emits: ['on-open', 'on-close', 'selecting', 'deselecting', 'search', 'update:validation', 'update:value'],
 
   props: {
     appendToBody: {
@@ -238,7 +238,7 @@ export default {
       return noDrop ? false : open && shouldOpen && !mutableLoading;
     },
 
-    onSearch(newSearchString) {
+    onSearch(newSearchString, loading) {
       if (this.canPaginate) {
         this.setPaginationFilter(newSearchString);
       } else {
@@ -246,6 +246,7 @@ export default {
           this.dropdownShouldOpen(this.$refs['select-input'], true);
         }
       }
+      this.$emit('search', newSearchString, loading);
     },
 
     getOptionKey(opt) {

From c0fd9603c6380dae23cbea6804b89e645a48f692 Mon Sep 17 00:00:00 2001
From: Yonas Berhe <yberhe@Yonass-MacBook-Pro.local>
Date: Tue, 14 Jan 2025 14:00:06 -0800
Subject: [PATCH 54/57] automation: add step to ensure aks is enabled

---
 .../pages/manager/cluster-manager.spec.ts     | 31 ++++++++++++++++++-
 .../support/commands/rancher-api-commands.ts  |  4 +--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts b/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
index e68b4adc71..1a678bb191 100644
--- a/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
+++ b/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
@@ -39,6 +39,7 @@ const clusterNamePartial = `${ runPrefix }-create`;
 const rke1CustomName = `${ clusterNamePartial }-rke1-custom`;
 const rke2CustomName = `${ clusterNamePartial }-rke2-custom`;
 const importGenericName = `${ clusterNamePartial }-import-generic`;
+let reenableAKS = false;
 
 const downloadsFolder = Cypress.config('downloadsFolder');
 
@@ -91,16 +92,35 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
   });
 
   it('deactivating a kontainer driver should hide its card from the cluster creation page', () => {
+    cy.intercept('GET', '/v3/kontainerdrivers').as('getKontainerDrivers');
+    cy.intercept('POST', 'v3/kontainerDrivers/azurekubernetesservice?action=deactivate').as('deactivateDriver');
+    cy.intercept('POST', 'v3/kontainerDrivers/azurekubernetesservice?action=activate').as('activateDriver');
+
     const driversPage = new KontainerDriversPagePo();
     const clusterCreatePage = new ClusterManagerCreatePagePo();
 
-    // deactivate the AKS driver
     KontainerDriversPagePo.navTo();
     driversPage.waitForPage();
+
+    // assert AKS kontainer driver is in Active state
+    cy.wait('@getKontainerDrivers').then(({ response }) => {
+      response.body.data.forEach((item: any) => {
+        if (item.id === 'azurekubernetesservice') {
+          const state = item['active'];
+
+          expect(state).to.eq(true);
+        }
+      });
+    });
+
+    // deactivate the AKS driver
     driversPage.list().actionMenu('Azure AKS').getMenuItem('Deactivate').click();
     const deactivateDialog = new DeactivateDriverDialogPo();
 
     deactivateDialog.deactivate();
+    cy.wait('@deactivateDriver').its('response.statusCode').should('eq', 200).then(() => {
+      reenableAKS = true;
+    });
 
     // verify that the AKS card is not shown
     clusterList.goTo();
@@ -112,6 +132,9 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
     KontainerDriversPagePo.navTo();
     driversPage.waitForPage();
     driversPage.list().actionMenu('Azure AKS').getMenuItem('Activate').click();
+    cy.wait('@activateDriver').its('response.statusCode').should('eq', 200).then(() => {
+      reenableAKS = false;
+    });
 
     // verify that the AKS card is back
     clusterList.goTo();
@@ -828,4 +851,10 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
       });
     });
   });
+
+  after(() => {
+    if (reenableAKS) {
+      cy.createRancherResource('v3', 'kontainerDrivers/azurekubernetesservice?action=activate', {});
+    }
+  });
 });
diff --git a/cypress/support/commands/rancher-api-commands.ts b/cypress/support/commands/rancher-api-commands.ts
index 7afc70efa1..601db0080c 100644
--- a/cypress/support/commands/rancher-api-commands.ts
+++ b/cypress/support/commands/rancher-api-commands.ts
@@ -497,8 +497,8 @@ Cypress.Commands.add('createRancherResource', (prefix, resourceType, body) => {
     body
   })
     .then((resp) => {
-      // Expect 201, Created HTTP status code
-      expect(resp.status).to.eq(201);
+      // Expect 200 or 201, Created HTTP status code
+      expect(resp.status).to.be.oneOf([200, 201]);
     });
 });
 

From 4a5d2bb0561d88677551ba9f175c368a1eed8498 Mon Sep 17 00:00:00 2001
From: Giuseppe Leo <giuseppe.leo@suse.com>
Date: Mon, 20 Jan 2025 11:49:33 +0100
Subject: [PATCH 55/57] Allow to skip Cypress dashboard E2E tests using a label
 or env var (#13146)

* Allow to switch Cypress command with cy2 on env var

* Remove coverage flag

* Restore Cypress dashboard

* Assign env var TEST_DISABLE_DASHBOARD_LABEL based on label presence

* Extend E2E script condition to TEST_DISABLE_DASHBOARD_LABEL

* Correct label term

* Remove unnecessary key and ID for Cypress command

* Correct PR label

* Add echo to display disable method; Add comments

* Add documentation

* Allow GH to set env var from the config
---
 .github/workflows/test.yaml                  |  2 ++
 docusaurus/docs/internal/testing/e2e-test.md |  8 ++++++++
 package.json                                 |  2 +-
 scripts/e2e                                  | 19 ++++++++++++++++++-
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 646866f407..3cb20fca92 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -22,6 +22,8 @@ env:
   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)
diff --git a/docusaurus/docs/internal/testing/e2e-test.md b/docusaurus/docs/internal/testing/e2e-test.md
index a265a01b81..77a76055eb 100644
--- a/docusaurus/docs/internal/testing/e2e-test.md
+++ b/docusaurus/docs/internal/testing/e2e-test.md
@@ -109,6 +109,14 @@ These values are provided when you create a new project within Cypress dashboard
 
 It's also possible to run a workflow in GitHub Actions E2E test using these values to record on personal dashboards.
 
+### Skip dashboard or tests
+
+CI gates can be disabled in the following way:
+
+- Use label `ci/skip-e2e` to skip the E2E tests in the PR
+- Use label `ci/skip-e2e-cypress-dashboard` to run the E2E tests without Sorry Cypress dashboard in the PR (it will enable `TEST_DISABLE_DASHBOARD_LABEL` env var)
+- Use GitHub settings and define env var `TEST_DISABLE_DASHBOARD` as `true` (which is string and not boolean) to disable the Cypress dashboard entirely in every CI run
+
 ## Local and CI/prod run
 
 It is possible to start the project and run all the tests at once with a single command. There's however a difference between `dev` and `production` run. The first will not require an official certificate and will build the project in `dist`, while the production will enable all the SSL configurations to run encrypted.
diff --git a/package.json b/package.json
index 894f079e70..87207ac7bd 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,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",
diff --git a/scripts/e2e b/scripts/e2e
index 96b53ea98d..b788487317 100755
--- a/scripts/e2e
+++ b/scripts/e2e
@@ -10,4 +10,21 @@ if [ $# -eq 1 ]; then
   SPEC_ARG="--spec ${1}"
 fi
 
-CYPRESS_coverage=true CYPRESS_API_URL='http://139.59.134.103:1234' cy2 run ${SPEC_ARG} --group "$GREP_TAGS" --browser chrome --record --key rancher-dashboard --parallel --ci-build-id "$ID"
\ No newline at end of file
+# Define the command to use (cy2 or cypress)
+# TEST_DISABLE_DASHBOARD: Disable Cypress dashboard using GH repository settings
+# TEST_DISABLE_DASHBOARD_LABEL: Disable Cypress dashboard using PR label `ci/skip-e2e-cypress-dashboard`
+echo "TEST_DISABLE_DASHBOARD: ${TEST_DISABLE_DASHBOARD}"
+echo "TEST_DISABLE_DASHBOARD_LABEL: ${TEST_DISABLE_DASHBOARD_LABEL}"
+if [ "${TEST_DISABLE_DASHBOARD}" = "true" ] || [ "${TEST_DISABLE_DASHBOARD_LABEL}" = "true" ]; then
+  echo "Running Cypress without dashboard"
+  CYPRESS_COMMAND="cypress run ${SPEC_ARG}"
+else
+  echo "Running Cypress with Sorry Cypress on dashboard"
+  CYPRESS_COMMAND="cy2 run ${SPEC_ARG} --ci-build-id \"$ID\" --record --key rancher-dashboard --parallel --group \"$GREP_TAGS\""
+fi
+
+# Construct the full command
+E2E_COMMAND="CYPRESS_API_URL='http://139.59.134.103:1234' ${CYPRESS_COMMAND} --browser chrome"
+
+# Execute the command
+eval $E2E_COMMAND

From ad7be5372df63a94f15681c6ffaa5185799d7c6d Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 20 Jan 2025 13:52:29 +0100
Subject: [PATCH 56/57] Remove class selector from fleet.cattle.io.test.ts

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

diff --git a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
index 96bbee8b87..a035d41d1c 100644
--- a/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
+++ b/shell/edit/__tests__/fleet.cattle.io.gitrepo.test.ts
@@ -35,18 +35,18 @@ describe('view: fleet.cattle.io.gitrepo should', () => {
 
   it('should have self-healing checkbox and tooltip', () => {
     const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"]');
-    const tooltip = wrapper.findAll('[data-testid="GitRepo-correctDrift-checkbox"] .v-popper--has-tooltip');
+    const tooltip = wrapper.find('[data-testid="GitRepo-correctDrift-checkbox"]');
 
-    expect(tooltip).toHaveLength(1);
+    expect(tooltip.element.classList).toContain('v-popper--has-tooltip');
     expect(correctDriftCheckbox.exists()).toBeTruthy();
     expect(correctDriftCheckbox.attributes().value).toBeFalsy();
   });
 
   it('should have keep-resources checkbox and tooltip', () => {
     const correctDriftCheckbox = wrapper.find('[data-testid="GitRepo-keepResources-checkbox"]');
-    const tooltip = wrapper.findAll('[data-testid="GitRepo-keepResources-checkbox"] .v-popper--has-tooltip');
+    const tooltip = wrapper.find('[data-testid="GitRepo-keepResources-checkbox"]');
 
-    expect(tooltip).toHaveLength(1);
+    expect(tooltip.element.classList).toContain('v-popper--has-tooltip');
     expect(correctDriftCheckbox.exists()).toBeTruthy();
     expect(correctDriftCheckbox.attributes().value).toBeFalsy();
   });

From 54e2cbdd413dcb277416ae463007a49f51261526 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nwmac@users.noreply.github.com>
Date: Mon, 20 Jan 2025 14:26:35 +0000
Subject: [PATCH 57/57] Fix state is not reset when feature flag API request
 fails (#13090)

---
 cypress/e2e/po/components/card.po.ts          |  4 ++
 .../pages/global-settings/feature-flags.po.ts | 11 ++++++
 .../global-settings/feature-flags.spec.ts     | 37 +++++++++++++++++++
 shell/list/management.cattle.io.feature.vue   |  7 +++-
 4 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/po/components/card.po.ts b/cypress/e2e/po/components/card.po.ts
index 050e545c9b..c456dfd6c3 100644
--- a/cypress/e2e/po/components/card.po.ts
+++ b/cypress/e2e/po/components/card.po.ts
@@ -14,6 +14,10 @@ export default class CardPo extends ComponentPo {
     return this.self().get('[data-testid="card-body-slot"]');
   }
 
+  getError(): CypressChainable {
+    return this.self().get('[data-testid="card-body-slot"] > .text-error');
+  }
+
   getActionButton(): CypressChainable {
     return this.self().get('[data-testid="card-actions-slot"]');
   }
diff --git a/cypress/e2e/po/pages/global-settings/feature-flags.po.ts b/cypress/e2e/po/pages/global-settings/feature-flags.po.ts
index 9ba6893bdd..d04893e475 100644
--- a/cypress/e2e/po/pages/global-settings/feature-flags.po.ts
+++ b/cypress/e2e/po/pages/global-settings/feature-flags.po.ts
@@ -54,6 +54,17 @@ export class FeatureFlagsPagePo extends RootClusterPage {
     return card.getBody().contains(label);
   }
 
+  /**
+   * Get card body error
+   * @param error
+   * @returns
+   */
+  cardActionError(error: string): CypressChainable {
+    const card = new CardPo();
+
+    return card.getError().contains(error);
+  }
+
   /**
    * Click action button
    * @param label Activate or Deactivate
diff --git a/cypress/e2e/tests/pages/global-settings/feature-flags.spec.ts b/cypress/e2e/tests/pages/global-settings/feature-flags.spec.ts
index 4e42709dda..6ff0f77d3a 100644
--- a/cypress/e2e/tests/pages/global-settings/feature-flags.spec.ts
+++ b/cypress/e2e/tests/pages/global-settings/feature-flags.spec.ts
@@ -191,6 +191,43 @@ describe('Feature Flags', { testIsolation: 'off' }, () => {
     sideNav.groups().contains('Legacy').should('not.exist');
   });
 
+  it('error when toggling a feature flag is handled correctly', { tags: ['@globalSettings', '@adminUser'] }, () => {
+    // Check Current State: should be disabled by default
+    FeatureFlagsPagePo.navTo();
+    featureFlagsPage.list().details('unsupported-storage-drivers', 0).should('include.text', 'Disabled');
+
+    // Intercept the request to change the feature flag and return an error - 403, permission denied
+    cy.intercept({
+      method:   'PUT',
+      pathname: '/v1/management.cattle.io.features/unsupported-storage-drivers',
+      times:    1,
+    }, {
+      statusCode: 403,
+      body:       {
+        type:    'error',
+        links:   {},
+        code:    'Forbidden',
+        message: 'User does not have permission'
+      }
+    }).as('updateFeatureFlag');
+
+    // Activate
+    featureFlagsPage.list().elementWithName('unsupported-storage-drivers').scrollIntoView().should('be.visible');
+    featureFlagsPage.list().clickRowActionMenuItem('unsupported-storage-drivers', 'Activate');
+    featureFlagsPage.cardActionButton('Activate').click();
+
+    cy.wait(`@updateFeatureFlag`).its('response.statusCode').should('eq', 403);
+
+    // Check Updated State: should be active
+    featureFlagsPage.list().details('unsupported-storage-drivers', 0).should('include.text', 'Disabled');
+
+    // Check error message is displayed
+    featureFlagsPage.cardActionError('User does not have permission');
+
+    // Press cancel
+    featureFlagsPage.cardActionButton('Cancel').click();
+  });
+
   it('standard user has only read access to Feature Flag page', { tags: ['@globalSettings', '@standardUser'] }, () => {
     // verify action menus are hidden for standard user
 
diff --git a/shell/list/management.cattle.io.feature.vue b/shell/list/management.cattle.io.feature.vue
index a49d1a8758..ab36928d78 100644
--- a/shell/list/management.cattle.io.feature.vue
+++ b/shell/list/management.cattle.io.feature.vue
@@ -95,6 +95,9 @@ export default {
   watch: {
     showPromptUpdate(show) {
       if (show) {
+        // Clear last error
+        this.error = null;
+
         this.showModal = true;
       } else {
         this.showModal = false;
@@ -140,7 +143,9 @@ export default {
         btnCB(true);
         this.close();
       } catch (err) {
-        this.error = err;
+        // An error occurred, so toggle back the value - the call failed, so the change was not made
+        this.update.spec.value = !this.update.enabled;
+        this.error = err.message || err;
         btnCB(false);
       }
     },