From 5d2fe2d81806a11dd0d7b859c827e1e7e83dcf02 Mon Sep 17 00:00:00 2001
From: Felix Han <felix.han@portainer.io>
Date: Wed, 8 Sep 2021 15:02:38 +1200
Subject: [PATCH] fixed save settings n redeploy button

---
 .../kubernetes-redeploy-app-git-form.controller.js          | 6 ++++++
 .../kubernetes-redeploy-app-git-form.html                   | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js
index 00b0346f3..9fd397d72 100644
--- a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js
+++ b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js
@@ -15,6 +15,7 @@ class KubernetesRedeployAppGitFormController {
       redeployInProgress: false,
       showConfig: false,
       isEdit: false,
+      hasUnsavedChanges: false,
     };
 
     this.formValues = {
@@ -44,6 +45,7 @@ class KubernetesRedeployAppGitFormController {
       ...this.formValues,
       ...values,
     };
+    this.state.hasUnsavedChanges = angular.toJson(this.savedFormValues) !== angular.toJson(this.formValues);
   }
 
   buildAnalyticsProperties() {
@@ -98,6 +100,8 @@ class KubernetesRedeployAppGitFormController {
       try {
         this.state.saveGitSettingsInProgress = true;
         await this.StackService.updateKubeStack({ EndpointId: this.stack.EndpointId, Id: this.stack.Id }, null, this.formValues);
+        this.savedFormValues = angular.copy(this.formValues);
+        this.state.hasUnsavedChanges = false;
         this.Notifications.success('Save stack settings successfully');
       } catch (err) {
         this.Notifications.error('Failure', err, 'Unable to save application settings');
@@ -135,6 +139,8 @@ class KubernetesRedeployAppGitFormController {
       this.formValues.RepositoryAuthentication = true;
       this.state.isEdit = true;
     }
+
+    this.savedFormValues = angular.copy(this.formValues);
   }
 }
 
diff --git a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
index 7fca0e4ef..f2fca4db1 100644
--- a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
+++ b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
@@ -37,9 +37,9 @@
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.pullAndRedeployApplication()"
     ng-if="!$ctrl.formValues.AutoUpdate.RepositoryAutomaticUpdates"
-    ng-disabled="$ctrl.isSubmitButtonDisabled() || !$ctrl.redeployGitForm.$valid"
+    ng-disabled="$ctrl.isSubmitButtonDisabled() || $ctrl.state.hasUnsavedChanges|| !$ctrl.redeployGitForm.$valid"
     style="margin-top: 7px; margin-left: 0;"
-    button-spinner="ctrl.state.redeployInProgress"
+    button-spinner="$ctrl.state.redeployInProgress"
     analytics-on
     analytics-category="kubernetes"
     analytics-event="kubernetes-application-edit-git-pull"
@@ -50,7 +50,7 @@
   <button
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.saveGitSettings()"
-    ng-disabled="$ctrl.isSubmitButtonDisabled() || !$ctrl.redeployGitForm.$valid"
+    ng-disabled="$ctrl.isSubmitButtonDisabled() || !$ctrl.state.hasUnsavedChanges|| !$ctrl.redeployGitForm.$valid"
     style="margin-top: 7px; margin-left: 0;"
     button-spinner="$ctrl.state.saveGitSettingsInProgress"
     analytics-on