Fix Fleet - GitRepo first step

Signed-off-by: Francesco Torchia <[email protected]>
rancher · Jan 13, 2025 · bdca9a8 · bdca9a8
1 parent 8644a25
commit bdca9a8
Showing 1 changed file with 13 additions and 10 deletions.
diff --git 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"