From c911cedcc807d18a05e2d67adc3d3a8d4ba31b63 Mon Sep 17 00:00:00 2001
From: fhanportainer <79428273+fhanportainer@users.noreply.github.com>
Date: Mon, 16 Aug 2021 15:37:28 +1200
Subject: [PATCH] feat(stack): enable save button when password exists (#5429)

---
 .../git-form-auth-fieldset/git-form-auth-fieldset.html    | 2 +-
 .../forms/git-form/git-form-auth-fieldset/index.js        | 1 +
 .../stack-redeploy-git-form.controller.js                 | 2 ++
 .../stack-redeploy-git-form/stack-redeploy-git-form.html  | 8 +++++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/portainer/components/forms/git-form/git-form-auth-fieldset/git-form-auth-fieldset.html b/app/portainer/components/forms/git-form/git-form-auth-fieldset/git-form-auth-fieldset.html
index 58151ef93..7f820783c 100644
--- a/app/portainer/components/forms/git-form/git-form-auth-fieldset/git-form-auth-fieldset.html
+++ b/app/portainer/components/forms/git-form/git-form-auth-fieldset/git-form-auth-fieldset.html
@@ -34,7 +34,7 @@
         name="repository_password"
         placeholder="personal access token"
         ng-change="$ctrl.onChangePassword($ctrl.model.RepositoryPassword)"
-        required
+        ng-required="!$ctrl.isEdit"
       />
     </div>
   </div>
diff --git a/app/portainer/components/forms/git-form/git-form-auth-fieldset/index.js b/app/portainer/components/forms/git-form/git-form-auth-fieldset/index.js
index 5c2373387..3000869c3 100644
--- a/app/portainer/components/forms/git-form/git-form-auth-fieldset/index.js
+++ b/app/portainer/components/forms/git-form/git-form-auth-fieldset/index.js
@@ -6,5 +6,6 @@ export const gitFormAuthFieldset = {
   bindings: {
     model: '<',
     onChange: '<',
+    isEdit: '<',
   },
 };
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 abbc58d56..f4179817d 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
@@ -14,6 +14,7 @@ class StackRedeployGitFormController {
       inProgress: false,
       redeployInProgress: false,
       showConfig: false,
+      isEdit: false,
     };
 
     this.formValues = {
@@ -122,6 +123,7 @@ class StackRedeployGitFormController {
     if (this.stack.GitConfig && this.stack.GitConfig.Authentication) {
       this.formValues.RepositoryUsername = this.stack.GitConfig.Authentication.Username;
       this.formValues.RepositoryAuthentication = true;
+      this.state.isEdit = true;
     }
   }
 }
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 4350452f0..340400573 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
@@ -30,7 +30,13 @@
     </div>
   </div>
   <git-form-ref-field ng-if="$ctrl.state.showConfig" value="$ctrl.formValues.RefName" on-change="($ctrl.onChangeRef)"></git-form-ref-field>
-  <git-form-auth-fieldset ng-if="$ctrl.state.showConfig" model="$ctrl.formValues" on-change="($ctrl.onChange)" show-auth-explanation="true"></git-form-auth-fieldset>
+  <git-form-auth-fieldset
+    ng-if="$ctrl.state.showConfig"
+    is-edit="$ctrl.state.isEdit"
+    model="$ctrl.formValues"
+    on-change="($ctrl.onChange)"
+    show-auth-explanation="true"
+  ></git-form-auth-fieldset>
   <environment-variables-panel
     ng-model="$ctrl.formValues.Env"
     explanation="These values will be used as substitutions in the stack file"