From 286cbe3c723b4bcddf4fa5ba662e56251fdd75ba Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Tue, 12 Mar 2024 11:48:30 +0000
Subject: [PATCH 1/9] Fix Legacy / Project group - fixed scenario exposed by
 the project virtual type where call to allTypes ruled out all virt / spoofed
 types if basic mode has an inavalid entry (!groupForBasicType) - however also
 removed the project virtual type. the nav item comes from `Project` group
 specified in `basicTypes` call) - fixed a few things around the project group
   - add label for project group   - explicitely set project group root of app
 - fixed display of namespace icon for a menu item if there are no counts

---
 shell/assets/translations/en-us.yaml |  1 +
 shell/components/nav/Type.vue        | 13 ++++++++-----
 shell/config/product/legacy.js       | 13 ++-----------
 shell/store/type-map.js              |  2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/shell/assets/translations/en-us.yaml b/shell/assets/translations/en-us.yaml
index eeb2138382a..3df531e2f2f 100644
--- a/shell/assets/translations/en-us.yaml
+++ b/shell/assets/translations/en-us.yaml
@@ -168,6 +168,7 @@ nav:
     RBAC: RBAC
     Scheduling: Scheduling
     Storage: Storage
+    Project: Project
   ns:
     all: All Namespaces
     clusterLevel: Only Cluster Resources
diff --git a/shell/components/nav/Type.vue b/shell/components/nav/Type.vue
index 872bf72d2ec..5ee401bfc32 100644
--- a/shell/components/nav/Type.vue
+++ b/shell/components/nav/Type.vue
@@ -92,7 +92,7 @@ export default {
     },
 
     showCount() {
-      return this.count !== undefined;
+      return this.count !== undefined && this.count !== null;
     },
 
     namespaceIcon() {
@@ -170,7 +170,7 @@ export default {
         :class="{'no-icon': !type.icon}"
       />
       <span
-        v-if="showFavorite || showCount"
+        v-if="showFavorite || namespaceIcon || showCount"
         class="count"
       >
         <Favorite
@@ -179,9 +179,12 @@ export default {
         />
         <i
           v-if="namespaceIcon"
-          class="icon icon-namespace namespaced"
+          class="icon icon-namespace"
         />
-        {{ count }}
+        <span
+          v-if="showCount"
+          :class="{'namespaced': namespaceIcon}"
+        >{{ count }}</span>
       </span>
     </a>
   </n-link>
@@ -207,7 +210,7 @@ export default {
 
 <style lang="scss" scoped>
   .namespaced {
-    margin-right: 4px;
+    margin-left: 4px;
   }
 
   .child {
diff --git a/shell/config/product/legacy.js b/shell/config/product/legacy.js
index 90086f8b39d..8969e917c09 100644
--- a/shell/config/product/legacy.js
+++ b/shell/config/product/legacy.js
@@ -8,6 +8,7 @@ export function init(store) {
     product,
     basicType,
     virtualType,
+    setGroupDefaultType,
   } = DSL(store, NAME);
 
   product({
@@ -16,17 +17,6 @@ export function init(store) {
     showNamespaceFilter: true,
   });
 
-  virtualType({
-    ifHave:     IF_HAVE.PROJECT,
-    labelKey:   'legacy.project.label',
-    namespaced: true,
-    name:       'v1-project',
-    weight:     105,
-    route:      { name: 'c-cluster-project-apps' },
-    exact:      true,
-    overview:   false,
-  });
-
   virtualType({
     ifHave:     IF_HAVE.NO_PROJECT,
     labelKey:   'legacy.project.label',
@@ -68,4 +58,5 @@ export function init(store) {
     'project-config-maps',
     'project-secrets',
   ], 'Project');
+  setGroupDefaultType('project-config-maps', 'Project');
 }
diff --git a/shell/store/type-map.js b/shell/store/type-map.js
index ae1eadbd09f..890efcf576a 100644
--- a/shell/store/type-map.js
+++ b/shell/store/type-map.js
@@ -938,11 +938,11 @@ export const getters = {
         const virtualTypes = state.virtualTypes[product] || [];
         const spoofedTypes = state.spoofedTypes[product] || [];
         const allTypes = [...virtualTypes, ...spoofedTypes];
-        const virtSpoofedModes = [...nonUsedModes];
 
         for ( const type of allTypes ) {
           const item = clone(type);
           const id = item.name;
+          const virtSpoofedModes = [...nonUsedModes];
 
           // Is there a virtual/spoofed type override for schema type?
           // Currently used by harvester, this should be investigated and removed if possible

From 9f7dac230f09bf0bc22e40b776cbd9915123b4fc Mon Sep 17 00:00:00 2001
From: Richard <richard@localhost.localdomain>
Date: Fri, 22 Mar 2024 10:39:13 +0000
Subject: [PATCH 2/9] Add e2e test for legacy --> project --> apps

---
 .../lists/management.cattle.io.feature.po.ts  |  4 +-
 .../pages/global-settings/feature-flags.po.ts | 16 +++++++
 cypress/e2e/po/pages/page.po.ts               |  4 ++
 .../e2e/po/side-bars/product-side-nav.po.ts   |  4 +-
 .../pages/explorer/legacy/projects.spec.ts    | 47 +++++++++++++++++++
 .../pages/manager/cluster-manager.spec.ts     |  4 +-
 6 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts

diff --git a/cypress/e2e/po/lists/management.cattle.io.feature.po.ts b/cypress/e2e/po/lists/management.cattle.io.feature.po.ts
index d07ba4ca829..5dbd5482c30 100644
--- a/cypress/e2e/po/lists/management.cattle.io.feature.po.ts
+++ b/cypress/e2e/po/lists/management.cattle.io.feature.po.ts
@@ -18,11 +18,11 @@ export default class MgmtFeatureFlagListPo extends BaseResourceList {
   }
 
   clickRowActionMenuItem(name: string, itemLabel:string) {
-    return this.resourceTable().sortableTable().rowActionMenuOpen(name, 4).getMenuItem(itemLabel)
+    return this.resourceTable().sortableTable().rowActionMenuOpen(name).getMenuItem(itemLabel)
       .click();
   }
 
   getRowActionMenuItem(name: string, itemLabel:string) {
-    return this.resourceTable().sortableTable().rowActionMenuOpen(name, 4).getMenuItem(itemLabel);
+    return this.resourceTable().sortableTable().rowActionMenuOpen(name).getMenuItem(itemLabel);
   }
 }
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 870a6fac4f1..15114219462 100644
--- a/cypress/e2e/po/pages/global-settings/feature-flags.po.ts
+++ b/cypress/e2e/po/pages/global-settings/feature-flags.po.ts
@@ -4,6 +4,7 @@ import CardPo from '@/cypress/e2e/po/components/card.po';
 import { CypressChainable } from '@/cypress/e2e/po/po.types';
 import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
 import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
+import { Promise } from 'cypress/types/bluebird';
 
 export class FeatureFlagsPagePo extends RootClusterPage {
   static url = '/c/_/settings/management.cattle.io.feature';
@@ -67,4 +68,19 @@ export class FeatureFlagsPagePo extends RootClusterPage {
       expect(response?.body.spec).to.have.property('value', value);
     });
   }
+
+  getFeatureFlag(featureFlag: string): Cypress.Chainable<Object> {
+    return cy.getRancherResource('v1', 'management.cattle.io.features', featureFlag).then((r) => r.body);
+  }
+
+  setFeatureFlag(featureFlag: string, value: boolean) {
+    return this.getFeatureFlag(featureFlag).then((res) => {
+      const obj = {
+        ...res,
+        spec: { value }
+      };
+
+      cy.setRancherResource('v1', 'management.cattle.io.features', featureFlag, JSON.stringify(obj));
+    });
+  }
 }
diff --git a/cypress/e2e/po/pages/page.po.ts b/cypress/e2e/po/pages/page.po.ts
index 4c2a2535392..957f317052f 100644
--- a/cypress/e2e/po/pages/page.po.ts
+++ b/cypress/e2e/po/pages/page.po.ts
@@ -85,6 +85,10 @@ export default class PagePo extends ComponentPo {
     nav.navToSideMenuEntryByLabel(label);
   }
 
+  productNav(): ProductNavPo {
+    return new ProductNavPo();
+  }
+
   header() {
     return new HeaderPo();
   }
diff --git a/cypress/e2e/po/side-bars/product-side-nav.po.ts b/cypress/e2e/po/side-bars/product-side-nav.po.ts
index 22b37fb2920..b1e2a5f124b 100644
--- a/cypress/e2e/po/side-bars/product-side-nav.po.ts
+++ b/cypress/e2e/po/side-bars/product-side-nav.po.ts
@@ -44,9 +44,9 @@ export default class ProductNavPo extends ComponentPo {
   }
 
   /**
-   * Check existance of menu group by label
+   * Check existence of menu group by label
    */
-  navToSideMenuGroupByLabelExistance(label: string, assertion: string): Cypress.Chainable {
+  navToSideMenuGroupByLabelExistence(label: string, assertion: string): Cypress.Chainable {
     return this.self().should('exist').contains('.accordion.has-children', label).should(assertion);
   }
 }
diff --git a/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts b/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
new file mode 100644
index 00000000000..a3ccd751e5c
--- /dev/null
+++ b/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
@@ -0,0 +1,47 @@
+
+import { FeatureFlagsPagePo } from '@/cypress/e2e/po/pages/global-settings/feature-flags.po';
+import { ConfigMapPagePo } from '@/cypress/e2e/po/pages/explorer/config-map.po';
+import { NamespaceFilterPo } from '@/cypress/e2e/po/components/namespace-filter.po';
+
+const featureFlagsPage = new FeatureFlagsPagePo();
+let disableLegacyFlag = false;
+
+describe('Legacy: Projects', { tags: ['@explorer', '@adminUser', '@standardUser'] }, () => {
+  before(() => {
+    cy.login();
+
+    featureFlagsPage.getFeatureFlag('legacy').then((body: any) => {
+      if (!body.spec.value) {
+        return featureFlagsPage.setFeatureFlag('legacy', true).then(() => {
+          disableLegacyFlag = true;
+        });
+      }
+    });
+  });
+
+  it('Ensure legacy: projects is visible and defaults to embedded Apps page', () => {
+    const configMapPage = new ConfigMapPagePo('local');
+
+    configMapPage.goTo();
+
+    const namespacePicker = new NamespaceFilterPo();
+
+    namespacePicker.toggle();
+    namespacePicker.clickOptionByLabel('All Namespaces');
+    namespacePicker.clickOptionByLabel('Project: Default');
+    namespacePicker.closeDropdown();
+
+    configMapPage.navToSideMenuGroupByLabel('Legacy');
+    configMapPage.productNav().navToSideMenuGroupByLabelExistence('Project', 'exist');
+    configMapPage.navToSideMenuGroupByLabel('Project');
+    configMapPage.navToSideMenuEntryByLabel('Apps');
+
+    cy.iFrame().contains('.header h1', 'Apps');
+  });
+
+  after(() => {
+    if (disableLegacyFlag) {
+      featureFlagsPage.setFeatureFlag('legacy', false);
+    }
+  });
+});
diff --git a/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts b/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
index 5527039ec22..3b4ed38ab89 100644
--- a/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
+++ b/cypress/e2e/tests/pages/manager/cluster-manager.spec.ts
@@ -78,7 +78,7 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
     const sideNav = new ProductNavPo();
 
     // check that the nav group isn't visible anymore
-    sideNav.navToSideMenuGroupByLabelExistance('RKE1 Configuration', 'not.exist');
+    sideNav.navToSideMenuGroupByLabelExistence('RKE1 Configuration', 'not.exist');
   });
 
   describe('All providers', () => {
@@ -135,7 +135,7 @@ describe('Cluster Manager', { testIsolation: 'off', tags: ['@manager', '@adminUs
 
         const sideNav = new ProductNavPo();
 
-        sideNav.navToSideMenuGroupByLabelExistance('RKE1 Configuration', 'exist');
+        sideNav.navToSideMenuGroupByLabelExistence('RKE1 Configuration', 'exist');
         // EO test for https://github.com/rancher/dashboard/issues/9823
 
         createRKE2ClusterPage.rkeToggle().set('RKE2/K3s');

From a30e7e2fc3d8e75eb717de8f65de6def42eecb4b Mon Sep 17 00:00:00 2001
From: Richard <richard@localhost.localdomain>
Date: Fri, 22 Mar 2024 10:50:41 +0000
Subject: [PATCH 3/9] Fixes after rebase

---
 cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts b/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
index a3ccd751e5c..4f28e693bea 100644
--- a/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
@@ -19,7 +19,7 @@ describe('Legacy: Projects', { tags: ['@explorer', '@adminUser', '@standardUser'
     });
   });
 
-  it('Ensure legacy: projects is visible and defaults to embedded Apps page', () => {
+  it('Ensure legacy: projects is visible and can nav to child entry', () => {
     const configMapPage = new ConfigMapPagePo('local');
 
     configMapPage.goTo();
@@ -34,9 +34,9 @@ describe('Legacy: Projects', { tags: ['@explorer', '@adminUser', '@standardUser'
     configMapPage.navToSideMenuGroupByLabel('Legacy');
     configMapPage.productNav().navToSideMenuGroupByLabelExistence('Project', 'exist');
     configMapPage.navToSideMenuGroupByLabel('Project');
-    configMapPage.navToSideMenuEntryByLabel('Apps');
+    configMapPage.navToSideMenuEntryByLabel('Config Maps');
 
-    cy.iFrame().contains('.header h1', 'Apps');
+    cy.iFrame().contains('.header h1', 'Config Maps');
   });
 
   after(() => {

From ce1b3148aec5928770c18fcee07b7c84bec6d790 Mon Sep 17 00:00:00 2001
From: Richard <richard@localhost.localdomain>
Date: Fri, 22 Mar 2024 10:55:04 +0000
Subject: [PATCH 4/9] Fix lint

---
 cypress/e2e/po/pages/global-settings/feature-flags.po.ts | 1 -
 1 file changed, 1 deletion(-)

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 15114219462..a19046eb27e 100644
--- a/cypress/e2e/po/pages/global-settings/feature-flags.po.ts
+++ b/cypress/e2e/po/pages/global-settings/feature-flags.po.ts
@@ -4,7 +4,6 @@ import CardPo from '@/cypress/e2e/po/components/card.po';
 import { CypressChainable } from '@/cypress/e2e/po/po.types';
 import BurgerMenuPo from '@/cypress/e2e/po/side-bars/burger-side-menu.po';
 import ProductNavPo from '@/cypress/e2e/po/side-bars/product-side-nav.po';
-import { Promise } from 'cypress/types/bluebird';
 
 export class FeatureFlagsPagePo extends RootClusterPage {
   static url = '/c/_/settings/management.cattle.io.feature';

From c62c15dda3272c35607699fafa11d36d4c84efee Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 22 Mar 2024 13:08:28 +0000
Subject: [PATCH 5/9] Don't run e2e test as standard user, they cannot change
 feature flags

---
 cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts b/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
index 4f28e693bea..8bf860ecc8c 100644
--- a/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
@@ -6,7 +6,7 @@ import { NamespaceFilterPo } from '@/cypress/e2e/po/components/namespace-filter.
 const featureFlagsPage = new FeatureFlagsPagePo();
 let disableLegacyFlag = false;
 
-describe('Legacy: Projects', { tags: ['@explorer', '@adminUser', '@standardUser'] }, () => {
+describe('Legacy: Projects', { tags: ['@explorer', '@adminUser'] }, () => {
   before(() => {
     cy.login();
 

From f12a13afcbe95a45782a042556a8a9305c89d6e4 Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 22 Mar 2024 16:15:23 +0000
Subject: [PATCH 6/9] changes following review

---
 shell/components/nav/Type.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shell/components/nav/Type.vue b/shell/components/nav/Type.vue
index 5ee401bfc32..95f68be23ac 100644
--- a/shell/components/nav/Type.vue
+++ b/shell/components/nav/Type.vue
@@ -180,10 +180,10 @@ export default {
         <i
           v-if="namespaceIcon"
           class="icon icon-namespace"
+          :class="{'ns-and-icon': showCount}"
         />
         <span
           v-if="showCount"
-          :class="{'namespaced': namespaceIcon}"
         >{{ count }}</span>
       </span>
     </a>
@@ -209,8 +209,8 @@ export default {
 </template>
 
 <style lang="scss" scoped>
-  .namespaced {
-    margin-left: 4px;
+  .ns-and-icon {
+    margin-right: 4px;
   }
 
   .child {

From f7482bda8de8c98c41901ff2e04c87820e0259cc Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Fri, 22 Mar 2024 17:36:38 +0000
Subject: [PATCH 7/9] ensure `after` still has session to disable flag

---
 cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts b/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
index 8bf860ecc8c..0dfbadc8148 100644
--- a/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
@@ -6,7 +6,7 @@ import { NamespaceFilterPo } from '@/cypress/e2e/po/components/namespace-filter.
 const featureFlagsPage = new FeatureFlagsPagePo();
 let disableLegacyFlag = false;
 
-describe('Legacy: Projects', { tags: ['@explorer', '@adminUser'] }, () => {
+describe('Legacy: Projects', { tags: ['@explorer', '@adminUser'], testIsolation: 'off' }, () => {
   before(() => {
     cy.login();
 

From 3f9b289707470d017137d12aeb11fead83a06e2a Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 25 Mar 2024 17:23:00 +0000
Subject: [PATCH 8/9] Return ns picker back to default state - Originally had
 wanted to store existing, but it gets complicated if multiple projects are
 selected

---
 cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts b/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
index 0dfbadc8148..23ad43a6a56 100644
--- a/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
+++ b/cypress/e2e/tests/pages/explorer/legacy/projects.spec.ts
@@ -4,6 +4,8 @@ import { ConfigMapPagePo } from '@/cypress/e2e/po/pages/explorer/config-map.po';
 import { NamespaceFilterPo } from '@/cypress/e2e/po/components/namespace-filter.po';
 
 const featureFlagsPage = new FeatureFlagsPagePo();
+const namespacePicker = new NamespaceFilterPo();
+
 let disableLegacyFlag = false;
 
 describe('Legacy: Projects', { tags: ['@explorer', '@adminUser'], testIsolation: 'off' }, () => {
@@ -24,8 +26,6 @@ describe('Legacy: Projects', { tags: ['@explorer', '@adminUser'], testIsolation:
 
     configMapPage.goTo();
 
-    const namespacePicker = new NamespaceFilterPo();
-
     namespacePicker.toggle();
     namespacePicker.clickOptionByLabel('All Namespaces');
     namespacePicker.clickOptionByLabel('Project: Default');
@@ -43,5 +43,8 @@ describe('Legacy: Projects', { tags: ['@explorer', '@adminUser'], testIsolation:
     if (disableLegacyFlag) {
       featureFlagsPage.setFeatureFlag('legacy', false);
     }
+
+    namespacePicker.toggle();
+    namespacePicker.clickOptionByLabel('Only User Namespaces'); // This is the default
   });
 });

From 5129a7e2a33f340420288a1062cbdaae51c484cb Mon Sep 17 00:00:00 2001
From: Richard Cox <richard.cox@suse.com>
Date: Mon, 25 Mar 2024 12:40:32 +0000
Subject: [PATCH 9/9] All test fail monitoring-istio as the latest chart does
 not have matching crd chart - pin it for the moment to 03.0.2%2Bup45.31.1

---
 cypress/e2e/tests/pages/charts/monitoring-istio.spec.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/tests/pages/charts/monitoring-istio.spec.ts b/cypress/e2e/tests/pages/charts/monitoring-istio.spec.ts
index b985b9798b1..9c3eaf36f8c 100644
--- a/cypress/e2e/tests/pages/charts/monitoring-istio.spec.ts
+++ b/cypress/e2e/tests/pages/charts/monitoring-istio.spec.ts
@@ -15,7 +15,10 @@ describe('Charts', { tags: ['@charts', '@adminUser'] }, () => {
   const chartsPageUrl = '/c/local/apps/charts/chart?repo-type=cluster&repo=rancher-charts';
 
   describe('Monitoring', () => {
-    const chartsMonitoringPage = `${ chartsPageUrl }&chart=rancher-monitoring`;
+    // Ideally we should not specify this, older versions can disappear / have issues.
+    // However it seems the latest can also have issues (like no matching CRD chart)
+    const monitoringVersion = '103.0.2%2Bup45.31.1';
+    const chartsMonitoringPage = `${ chartsPageUrl }&chart=rancher-monitoring&version=${ monitoringVersion }`;
 
     const chartsPage: ChartsPage = new ChartsPage(chartsMonitoringPage);