From fb7a2fbbe6ba1304a1b821290fb43233ee8f6573 Mon Sep 17 00:00:00 2001
From: cmeng <cmenginnz@gmail.com>
Date: Fri, 22 Sep 2023 10:09:24 +1200
Subject: [PATCH] fix(stack): fix edit git stack validation EE-5855 (#10339)

---
 .../forms/git-form/git-form-auth-fieldset.controller.ts   | 2 +-
 .../stack-redeploy-git-form.controller.js                 | 8 ++++++++
 .../stack-redeploy-git-form/stack-redeploy-git-form.html  | 4 ++--
 app/react/portainer/gitops/AuthFieldset/AuthFieldset.tsx  | 3 ++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/portainer/components/forms/git-form/git-form-auth-fieldset.controller.ts b/app/portainer/components/forms/git-form/git-form-auth-fieldset.controller.ts
index 84fd23846..fe3e712aa 100644
--- a/app/portainer/components/forms/git-form/git-form-auth-fieldset.controller.ts
+++ b/app/portainer/components/forms/git-form/git-form-auth-fieldset.controller.ts
@@ -52,7 +52,7 @@ export default class GitFormAuthFieldsetController {
       ...newValues,
     };
     this.onChange?.(value);
-    await this.runGitValidation(value, false);
+    await this.runGitValidation(value, this.isAuthEdit);
   }
 
   async runGitValidation(value: GitAuthModel, isAuthEdit: boolean) {
diff --git a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js
index 2c2146224..22e2639e6 100644
--- a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js
+++ b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js
@@ -179,6 +179,14 @@ class StackRedeployGitFormController {
     });
   }
 
+  disablePullAndRedeployButton() {
+    return this.isSubmitButtonDisabled() || this.state.hasUnsavedChanges || !this.redeployGitForm.$valid;
+  }
+
+  disableSaveSettingsButton() {
+    return this.isSubmitButtonDisabled() || !this.state.hasUnsavedChanges || !this.redeployGitForm.$valid;
+  }
+
   isSubmitButtonDisabled() {
     return this.state.inProgress || this.state.redeployInProgress;
   }
diff --git a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html
index 61d4887fa..8f4b137af 100644
--- a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html
+++ b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html
@@ -76,7 +76,7 @@
   <button
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.submit()"
-    ng-disabled="$ctrl.isSubmitButtonDisabled() || $ctrl.state.hasUnsavedChanges || !$ctrl.redeployGitForm.$valid"
+    ng-disabled="$ctrl.disablePullAndRedeployButton()"
     style="margin-top: 7px; margin-left: 0"
     button-spinner="$ctrl.state.redeployInProgress"
     analytics-on
@@ -93,7 +93,7 @@
   <button
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.saveGitSettings()"
-    ng-disabled="$ctrl.isSubmitButtonDisabled() || !$ctrl.state.hasUnsavedChanges || !$ctrl.redeployGitForm.$valid"
+    ng-disabled="$ctrl.disableSaveSettingsButton()"
     style="margin-top: 7px; margin-left: 0"
     button-spinner="$ctrl.state.inProgress"
     analytics-on
diff --git a/app/react/portainer/gitops/AuthFieldset/AuthFieldset.tsx b/app/react/portainer/gitops/AuthFieldset/AuthFieldset.tsx
index d18b92583..64fb198d4 100644
--- a/app/react/portainer/gitops/AuthFieldset/AuthFieldset.tsx
+++ b/app/react/portainer/gitops/AuthFieldset/AuthFieldset.tsx
@@ -165,7 +165,8 @@ export function gitAuthValidation(
     NewCredentialName: string()
       .default('')
       .when(['RepositoryAuthentication', 'SaveCredential'], {
-        is: true,
+        is: (RepositoryAuthentication: boolean, SaveCredential: boolean) =>
+          RepositoryAuthentication && SaveCredential && !isAuthEdit,
         then: string()
           .required('Name is required')
           .test(