fix merge request widget33999-mr-widget-does-not-load-in-9-3-rc5

5 files changed, 7 insertions, 18 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
index 9756b284cf5..97789bc4440 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js
@@ -22,7 +22,7 @@ export default {
   },
   computed: {
     shouldRenderRelatedLinks() {
-      return this.mr.relatedLinks && this.mr.isMerged;
+      return !!this.mr.relatedLinks;
     },
     shouldShowRemoveSourceBranch() {
       const { sourceBranchRemoved, isRemovingSourceBranch, canRemoveSourceBranch } = this.mr;
@@ -94,7 +94,7 @@ export default {
         </p>
         <mr-widget-related-links
           v-if="shouldRenderRelatedLinks"
-          :is-merged="mr.isMerged"
+          :is-merged="true"
           :related-links="mr.relatedLinks" />
       </section>
       <div
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
index df0112cf13b..d4a5f8d9fc9 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
@@ -48,13 +48,13 @@ export default {
       return stateMaps.stateToComponentMap[this.mr.state];
     },
     shouldRenderMergeHelp() {
-      return !this.mr.isMerged;
+      return stateMaps.statesToShowHelpWidget.indexOf(this.mr.state) > -1;
     },
     shouldRenderPipelines() {
       return Object.keys(this.mr.pipeline).length || this.mr.hasCI;
     },
     shouldRenderRelatedLinks() {
-      return !!this.mr.relatedLinks;
+      return !!this.mr.relatedLinks && (this.mr.state !== 'merged');
     },
     shouldRenderDeployments() {
       return this.mr.deployments.length;
@@ -243,7 +243,7 @@ export default {
         class="mr-info-list mr-links">
         <div class="legend"></div>
         <mr-widget-related-links
-          :is-merged="mr.isMerged"
+          :is-merged="false"
           :related-links="mr.relatedLinks" />
       </section>
       <mr-widget-merge-help v-if="shouldRenderMergeHelp" />
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
index 0a30239f4ff..fa03e794bf0 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
@@ -65,7 +65,6 @@ export default class MergeRequestStore {
     this.mergeActionsContentPath = data.commit_change_content_path;
     this.isRemovingSourceBranch = this.isRemovingSourceBranch || false;
     this.isOpen = data.state === 'opened' || data.state === 'reopened' || false;
-    this.isMerged = !this.isOpen && stateMaps.statesToShowHelpWidget.indexOf(data.state) === -1;
     this.hasMergeableDiscussionsState = data.mergeable_discussions_state === false;
     this.canRemoveSourceBranch = currentUser.can_remove_source_branch || false;
     this.canMerge = !!data.merge_path;
diff --git a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
index 425dff89439..4145d2ad096 100644
--- a/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+++ b/spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
@@ -49,11 +49,13 @@ describe('mrWidgetOptions', () => {
 
     describe('shouldRenderMergeHelp', () => {
       it('should return false after merging', () => {
+        fail('TODO');
         vm.mr.isMerged = true;
         expect(vm.shouldRenderMergeHelp).toBeFalsy();
       });
 
       it('should return true before merging', () => {
+        fail('TODO');
         vm.mr.isMerged = false;
         expect(vm.shouldRenderMergeHelp).toBeTruthy();
       });
diff --git a/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js b/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
index 71285866302..56dd0198ae2 100644
--- a/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
+++ b/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js
@@ -18,17 +18,5 @@ describe('MergeRequestStore', () => {
       store.setData({ ...mockData, work_in_progress: !mockData.work_in_progress });
       expect(store.hasSHAChanged).toBe(false);
     });
-
-    it('sets isMerged to true for merged state', () => {
-      store.setData({ ...mockData, state: 'merged' });
-
-      expect(store.isMerged).toBe(true);
-    });
-
-    it('sets isMerged to false for readyToMerge state', () => {
-      store.setData({ ...mockData, state: 'readyToMerge' });
-
-      expect(store.isMerged).toBe(false);
-    });
   });
 });