Merge branch 'sh-refresh-mr-widget-upon-cancel' into 'master'

Refresh widget after canceling "Merge When Pipeline Succeeds"

Closes #197487

See merge request gitlab-org/gitlab!26232

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue

@@ -53,6 +53,7 @@ export default {
         .then(res => res.data)
         .then(data => {
           eventHub.$emit('UpdateWidgetData', data);
+          eventHub.$emit('MRWidgetUpdateRequested');
         })
         .catch(() => {
           this.isCancellingAutoMerge = false;

app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js

@@ -123,6 +123,7 @@ export default class MergeRequestStore {
 
     const currentUser = data.current_user;
 
+    if (currentUser) {
       this.cherryPickInForkPath = currentUser.cherry_pick_in_fork_path;
       this.revertInForkPath = currentUser.revert_in_fork_path;
 
@@ -130,6 +131,7 @@ export default class MergeRequestStore {
       this.canCreateIssue = currentUser.can_create_issue || false;
       this.canCherryPickInCurrentMR = currentUser.can_cherry_pick_on_current_merge_request || false;
       this.canRevertInCurrentMR = currentUser.can_revert_on_current_merge_request || false;
+    }
 
     this.setState(data);
   }

changelogs/unreleased/sh-refresh-mr-widget-upon-cancel.yml

+---
+title: Refresh widget after canceling "Merge When Pipeline Succeeds"
+merge_request: 26232
+author:
+type: fixed

spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb

@@ -64,6 +64,10 @@ describe 'Merge request > User merges when pipeline succeeds', :js do
         before do
           click_button "Merge when pipeline succeeds"
           click_link "Cancel automatic merge"
+
+          wait_for_requests
+
+          expect(page).to have_content 'Merge when pipeline succeeds', wait: 0
         end
 
         it_behaves_like 'Merge when pipeline succeeds activator'