From 48e0901d1c9b9d6d4939bec0e1c466ab9f8f001f Mon Sep 17 00:00:00 2001
From: Cody Jackson <cody.jackson@suse.com>
Date: Wed, 12 Jun 2024 11:54:34 -0700
Subject: [PATCH] Fixing the Add Repository button on the fleet cluster detail
 page

rancher/dashboard#11198
---
 .../po/detail/fleet/tabs/git-repos-tab.po.ts  |  4 ++++
 .../tests/pages/fleet/fleet-clusters.spec.ts  |  9 +++++++
 shell/components/fleet/FleetIntro.vue         | 24 +++++++------------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/cypress/e2e/po/detail/fleet/tabs/git-repos-tab.po.ts b/cypress/e2e/po/detail/fleet/tabs/git-repos-tab.po.ts
index 28cf07cde7d..cd80e49cb42 100644
--- a/cypress/e2e/po/detail/fleet/tabs/git-repos-tab.po.ts
+++ b/cypress/e2e/po/detail/fleet/tabs/git-repos-tab.po.ts
@@ -9,4 +9,8 @@ export default class GitReposTab extends ComponentPo {
   list() {
     return new BaseResourceList('#repos [data-testid="sortable-table-list-container"]');
   }
+
+  addRepostoryButton() {
+    return this.self().get('.btn').contains('Add Repository');
+  }
 }
diff --git a/cypress/e2e/tests/pages/fleet/fleet-clusters.spec.ts b/cypress/e2e/tests/pages/fleet/fleet-clusters.spec.ts
index 1a81b8c8ac2..a3783195e3e 100644
--- a/cypress/e2e/tests/pages/fleet/fleet-clusters.spec.ts
+++ b/cypress/e2e/tests/pages/fleet/fleet-clusters.spec.ts
@@ -157,6 +157,15 @@ describe('Fleet Clusters', { tags: ['@fleet', '@adminUser'] }, () => {
       });
     });
 
+    it('Git Repos Tab Add Repository button takes you to the correct page', function() {
+      const fleetClusterDetailsPage = new FleetClusterDetailsPo(namespace, this.rke2Ec2ClusterName);
+
+      fleetClusterDetailsPage.waitForPage(null, 'repos');
+      fleetClusterDetailsPage.gitReposTab().addRepostoryButton().click();
+
+      cy.url().should('include', `${ Cypress.config().baseUrl }/c/_/fleet/fleet.cattle.io.gitrepo/create`);
+    });
+
     it('adding git repo should add bundles on downstream cluster (deployments added)', function() {
       const deploymentsList = new WorkloadsDeploymentsListPagePo(this.clusterId);
 
diff --git a/shell/components/fleet/FleetIntro.vue b/shell/components/fleet/FleetIntro.vue
index 6c0c458c239..a8a8857e99e 100644
--- a/shell/components/fleet/FleetIntro.vue
+++ b/shell/components/fleet/FleetIntro.vue
@@ -1,31 +1,25 @@
 <script>
-import { AS, _YAML } from '@shell/config/query-params';
 import { FLEET } from '@shell/config/types';
+import { NAME } from '@shell/config/product/fleet';
 
 export default {
 
   name: 'FleetIntro',
 
   data() {
-    const params = { ...this.$route.params };
-
-    const formRoute = { name: `${ this.$route.name }-create`, params };
-
-    const hasEditComponent = this.$store.getters['type-map/hasCustomEdit'](this.resource);
-
-    const yamlRoute = {
-      name:  `${ this.$route.name }-create`,
-      params,
-      query: { [AS]: _YAML },
+    const gitRepoRoute = {
+      name:   'c-cluster-product-resource-create',
+      params: {
+        product:  NAME,
+        resource: FLEET.GIT_REPO
+      },
     };
 
     const gitRepoSchema = this.$store.getters['management/schemaFor'](FLEET.GIT_REPO);
     const canCreateRepos = gitRepoSchema && gitRepoSchema.resourceMethods.includes('PUT');
 
     return {
-      formRoute,
-      yamlRoute,
-      hasEditComponent,
+      gitRepoRoute,
       canCreateRepos
     };
   },
@@ -42,7 +36,7 @@ export default {
       class="actions"
     >
       <router-link
-        :to="formRoute"
+        :to="gitRepoRoute"
         class="btn role-secondary"
       >
         {{ t('fleet.gitRepo.repo.addRepo') }}