From 9aac7ecbe334c3aca190ed1f906b0f5c2b40abca Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 13 Jan 2025 20:02:22 +0100
Subject: [PATCH 1/3] component CruResource: add stepsOptions prop

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

diff --git a/shell/components/CruResource.vue b/shell/components/CruResource.vue
index 911e12af5a3..2f125e24655 100644
--- a/shell/components/CruResource.vue
+++ b/shell/components/CruResource.vue
@@ -120,6 +120,11 @@ export default {
       default: () => []
     },
 
+    stepsOptions: {
+      type:    Object,
+      default: () => ({ editFirstStep: true })
+    },
+
     // The set of labels to display for the finish AsyncButton
     finishMode: {
       type:    String,
@@ -562,6 +567,7 @@ export default {
             ref="Wizard"
             :header-mode="mode"
             :steps="steps"
+            :edit-first-step="stepsOptions.editFirstStep"
             :errors="errors"
             :finish-mode="finishMode"
             class="wizard"

From 8f47b01dba627b9e2d2f92423184b9ffd3873646 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 13 Jan 2025 20:03:07 +0100
Subject: [PATCH 2/3] Fix Fleet - GitRepo first step

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

diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 3fce4b0726e..7ae51ba08d3 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -118,8 +118,8 @@ export default {
       label:          this.t('fleet.gitRepo.add.steps.repoInfo.label'),
       subtext:        this.t('fleet.gitRepo.add.steps.repoInfo.subtext'),
       descriptionKey: 'fleet.gitRepo.add.steps.repoInfo.description',
-      ready:          false,
-      weight:         30
+      ready:          true,
+      weight:         1
     };
 
     const stepTargetInfo = {
@@ -128,12 +128,10 @@ export default {
       label:          this.t('fleet.gitRepo.add.steps.targetInfo.label'),
       subtext:        this.t('fleet.gitRepo.add.steps.targetInfo.subtext'),
       descriptionKey: 'fleet.gitRepo.steps.add.targetInfo.description',
-      ready:          true,
-      weight:         30
+      ready:          false,
+      weight:         1
     };
 
-    const addRepositorySteps = [stepRepoInfo, stepTargetInfo].sort((a, b) => (b.weight || 0) - (a.weight || 0));
-
     return {
       allClusters:             [],
       allClusterGroups:        [],
@@ -155,7 +153,6 @@ export default {
       targetAdvanced,
       stepRepoInfo,
       stepTargetInfo,
-      addRepositorySteps,
       displayHelmRepoURLRegex: false,
       fvFormRuleSets:          [{ path: 'spec.repo', rules: ['required'] }]
     };
@@ -168,6 +165,13 @@ export default {
       return _SPECIFY;
     },
 
+    steps() {
+      return [
+        this.stepRepoInfo,
+        this.stepTargetInfo
+      ];
+    },
+
     isLocal() {
       return this.value.metadata.namespace === 'fleet-local';
     },
@@ -463,7 +467,7 @@ export default {
     },
 
     stepOneReady() {
-      this.addRepositorySteps[0]['ready'] = this.stepOneRequires;
+      this.stepRepoInfo['ready'] = this.stepOneRequires;
     },
 
     updateTls() {
@@ -507,8 +511,7 @@ export default {
     :subtypes="[]"
     :validation-passed="true"
     :errors="errors"
-    :steps="addRepositorySteps"
-    :edit-first-step="true"
+    :steps="steps"
     :finish-mode="'finish'"
     class="wizard"
     @cancel="done"

From 6da57b2a09d6d92ccd0d03684e1623eba582afd0 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Mon, 20 Jan 2025 17:46:03 +0100
Subject: [PATCH 3/3] Fix ready steps

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

diff --git a/shell/edit/fleet.cattle.io.gitrepo.vue b/shell/edit/fleet.cattle.io.gitrepo.vue
index 7ae51ba08d3..b111897f6ef 100644
--- a/shell/edit/fleet.cattle.io.gitrepo.vue
+++ b/shell/edit/fleet.cattle.io.gitrepo.vue
@@ -118,7 +118,7 @@ export default {
       label:          this.t('fleet.gitRepo.add.steps.repoInfo.label'),
       subtext:        this.t('fleet.gitRepo.add.steps.repoInfo.subtext'),
       descriptionKey: 'fleet.gitRepo.add.steps.repoInfo.description',
-      ready:          true,
+      ready:          false,
       weight:         1
     };
 
@@ -128,7 +128,7 @@ export default {
       label:          this.t('fleet.gitRepo.add.steps.targetInfo.label'),
       subtext:        this.t('fleet.gitRepo.add.steps.targetInfo.subtext'),
       descriptionKey: 'fleet.gitRepo.steps.add.targetInfo.description',
-      ready:          false,
+      ready:          true,
       weight:         1
     };