fix(stack): EE-4213 Allow latest image to be pulled for stacks (#7653)

app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.controller.js

@@ -102,33 +102,35 @@ class StackRedeployGitFormController {
   }
 
   async submit() {
-    const tplCrop =
+    const isSwarmStack = this.stack.Type === 1;
-      '<div>Any changes to this stack or application made locally in Portainer will be overridden, which may cause service interruption. Do you wish to continue?</div>' +
+    const that = this;
-      '<div"><div style="position: absolute; right: 5px; top: 84px; z-index: 999">' +
+    this.ModalService.confirmStackUpdate(
-      '<be-feature-indicator feature="stackPullImageFeature"></be-feature-indicator></div></div>';
+      'Any changes to this stack or application made locally in Portainer will be overridden, which may cause service interruption. Do you wish to continue?',
-    const template = angular.element(tplCrop);
+      isSwarmStack,
-    const html = this.$compile(template)(this.$scope);
+      'btn-warning',
-    this.ModalService.confirmStackUpdate(html, true, false, 'btn-warning', async (result) => {
+      async function (result) {
-      if (!result) {
+        if (!result) {
-        return;
+          return;
+        }
+        try {
+          that.state.redeployInProgress = true;
+          await that.StackService.updateGit(
+            that.stack.Id,
+            that.stack.EndpointId,
+            that.FormHelper.removeInvalidEnvVars(that.formValues.Env),
+            that.formValues.Option.Prune,
+            that.formValues,
+            !!result[0]
+          );
+          that.Notifications.success('Success', 'Pulled and redeployed stack successfully');
+          that.$state.reload();
+        } catch (err) {
+          that.Notifications.error('Failure', err, 'Failed redeploying stack');
+        } finally {
+          that.state.redeployInProgress = false;
+        }
       }
-      try {
+    );
-        this.state.redeployInProgress = true;
-        await this.StackService.updateGit(
-          this.stack.Id,
-          this.stack.EndpointId,
-          this.FormHelper.removeInvalidEnvVars(this.formValues.Env),
-          this.formValues.Option.Prune,
-          this.formValues
-        );
-        this.Notifications.success('Success', 'Pulled and redeployed stack successfully');
-        this.$state.reload();
-      } catch (err) {
-        this.Notifications.error('Failure', err, 'Failed redeploying stack');
-      } finally {
-        this.state.redeployInProgress = false;
-      }
-    });
   }
 
   async saveGitSettings() {

app/portainer/services/api/stackService.js

@@ -266,8 +266,17 @@ angular.module('portainer.app').factory('StackService', [
       return deferred.promise;
     };
 
-    service.updateStack = function (stack, stackFile, env, prune) {
+    service.updateStack = function (stack, stackFile, env, prune, pullImage) {
-      return Stack.update({ endpointId: stack.EndpointId }, { id: stack.Id, StackFileContent: stackFile, Env: env, Prune: prune }).$promise;
+      return Stack.update(
+        { endpointId: stack.EndpointId },
+        {
+          id: stack.Id,
+          StackFileContent: stackFile,
+          Env: env,
+          Prune: prune,
+          PullImage: pullImage,
+        }
+      ).$promise;
     };
 
     service.updateKubeStack = function (stack, stackFile, gitConfig) {
@@ -436,7 +445,7 @@ angular.module('portainer.app').factory('StackService', [
       return Stack.stop({ id }).$promise;
     }
 
-    function updateGit(id, endpointId, env, prune, gitConfig) {
+    function updateGit(id, endpointId, env, prune, gitConfig, pullImage) {
       return Stack.updateGit(
         { endpointId, id },
         {
@@ -446,6 +455,7 @@ angular.module('portainer.app').factory('StackService', [
           RepositoryAuthentication: gitConfig.RepositoryAuthentication,
           RepositoryUsername: gitConfig.RepositoryUsername,
           RepositoryPassword: gitConfig.RepositoryPassword,
+          PullImage: pullImage,
         }
       ).$promise;
     }

app/portainer/services/modal.service/prompt.ts

@@ -162,45 +162,31 @@ export function confirmServiceForceUpdate(
 
 export function confirmStackUpdate(
   message: string,
-  defaultDisabled: boolean,
   defaultToggle: boolean,
-  confirmButtonClassName: string | undefined,
+  confirmButtonClass: string | undefined,
   callback: PromptCallback
 ) {
-  const sanitizedMessage =
+  const sanitizedMessage = sanitize(message);
-    typeof message === 'string' ? sanitize(message) : message;
+
   const box = prompt({
     title: buildTitle('Are you sure?'),
     inputType: 'checkbox',
     inputOptions: [
       {
-        text: 'Pull latest image version<i></i>',
+        text: 'Re-pull image and redeploy<i></i>',
         value: '1',
       },
     ],
     buttons: {
       confirm: {
         label: 'Update',
-        className: confirmButtonClassName || 'btn-primary',
+        className: 'btn-primary',
       },
     },
     callback,
   });
-  box.find('.bootbox-body').prepend(sanitizedMessage);
+
-  const checkbox = box.find('.bootbox-input-checkbox');
+  customizeCheckboxPrompt(box, sanitizedMessage, defaultToggle);
-  checkbox.prop('checked', defaultToggle);
-  checkbox.prop('disabled', defaultDisabled);
-  const checkboxDiv = box.find('.checkbox');
-  checkboxDiv.removeClass('checkbox');
-  checkboxDiv.prop(
-    'style',
-    'position: relative; display: block; margin-top: 10px; margin-bottom: 10px;'
-  );
-  const checkboxLabel = box.find('.form-check-label');
-  checkboxLabel.addClass('switch box-selector-item limited business mt-4');
-  checkboxLabel.prop('style', 'width: 100%');
-  const switchEle = checkboxLabel.find('i');
-  switchEle.prop('style', 'margin-left:20px');
 }
 
 function customizeCheckboxPrompt(

app/portainer/views/stacks/edit/stackController.js

@@ -244,13 +244,8 @@ angular.module('portainer.app').controller('StackController', [
 
     $scope.deployStack = function () {
       const stack = $scope.stack;
-      const tplCrop =
+      const isSwarmStack = stack.Type === 1;
-        '<div>Do you want to force an update of the stack?</div>' +
+      ModalService.confirmStackUpdate('Do you want to force an update of the stack?', isSwarmStack, null, function (result) {
-        '<div  style="position: absolute; right: 5px; top: 50px; z-index: 999"><be-feature-indicator feature="stackPullImageFeature"></be-feature-indicator></div>';
-      const template = angular.element(tplCrop);
-      const html = $compile(template)($scope);
-      // 'Do you want to force an update of the stack?'
-      ModalService.confirmStackUpdate(html, true, false, null, function (result) {
         if (!result) {
           return;
         }
@@ -267,7 +262,7 @@ angular.module('portainer.app').controller('StackController', [
         }
 
         $scope.state.actionInProgress = true;
-        StackService.updateStack(stack, stackFile, env, prune)
+        StackService.updateStack(stack, stackFile, env, prune, !!result[0])
           .then(function success() {
             Notifications.success('Success', 'Stack successfully deployed');
             $scope.state.isEditorDirty = false;