Merge branch 'ph/299907/rebaseToast' into 'master'

Added toast message to widget rebase action

See merge request gitlab-org/gitlab!90691

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

@@ -3,6 +3,7 @@ import { GlButton, GlSkeletonLoader } from '@gitlab/ui';
 import createFlash from '~/flash';
 import { __ } from '~/locale';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import toast from '~/vue_shared/plugins/global_toast';
 import simplePoll from '~/lib/utils/simple_poll';
 import eventHub from '../../event_hub';
 import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables';
@@ -120,13 +121,15 @@ export default {
         .poll()
         .then((res) => res.data)
         .then((res) => {
-          if (res.rebase_in_progress) {
+          if (res.rebase_in_progress || res.should_be_rebased) {
             continuePolling();
           } else {
             this.isMakingRequest = false;
 
             if (res.merge_error && res.merge_error.length) {
               this.rebasingError = res.merge_error;
+            } else {
+              toast(__('Rebase completed'));
             }
 
             eventHub.$emit('MRWidgetRebaseSuccess');

app/serializers/merge_request_basic_entity.rb

@@ -7,6 +7,7 @@ class MergeRequestBasicEntity < Grape::Entity
   expose :state
   expose :source_branch_exists?, as: :source_branch_exists
   expose :rebase_in_progress?, as: :rebase_in_progress
+  expose :should_be_rebased?, as: :should_be_rebased
   expose :milestone, using: API::Entities::Milestone
   expose :labels, using: LabelEntity
   expose :assignees, using: API::Entities::UserBasic

locale/gitlab.pot

@@ -31482,6 +31482,9 @@ msgstr ""
 msgid "Rebase"
 msgstr ""
+msgid "Rebase completed"
+msgstr ""
+
 msgid "Rebase in progress"
 msgstr ""

spec/fixtures/api/schemas/entities/merge_request_basic.json

@@ -7,6 +7,7 @@
     "source_branch_exists": { "type": "boolean" },
     "merge_error": { "type": ["string", "null"] },
     "rebase_in_progress": { "type": "boolean" },
+    "should_be_rebased": { "type": "boolean" },
     "allow_collaboration": { "type": "boolean"},
     "allow_maintainer_to_push": { "type": "boolean"},
     "assignees": {

spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js

@@ -2,6 +2,9 @@ import { shallowMount } from '@vue/test-utils';
 import { nextTick } from 'vue';
 import WidgetRebase from '~/vue_merge_request_widget/components/states/mr_widget_rebase.vue';
 import eventHub from '~/vue_merge_request_widget/event_hub';
+import toast from '~/vue_shared/plugins/global_toast';
+
+jest.mock('~/vue_shared/plugins/global_toast');
 
 let wrapper;
 
@@ -261,6 +264,7 @@ describe('Merge request widget rebase component', () => {
                   return Promise.resolve({
                     data: {
                       rebase_in_progress: false,
+                      should_be_rebased: false,
                       merge_error: null,
                     },
                   });
@@ -280,6 +284,7 @@ describe('Merge request widget rebase component', () => {
           await nextTick();
 
           expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetRebaseSuccess');
+          expect(toast).toHaveBeenCalledWith('Rebase completed');
         });
       });
     });