Merge branch 'ph/224141/hideBatchSuggestionsWithOnlyOneSuggestion' into 'master'

Hide apply batch suggestion button for single suggestions

Closes #224141

See merge request gitlab-org/gitlab!42681

app/assets/javascripts/notes/components/note_body.vue

@@ -45,7 +45,7 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(['getDiscussion']),
+    ...mapGetters(['getDiscussion', 'suggestionsCount']),
     discussion() {
       if (!this.note.isDraft) return {};
 
@@ -125,6 +125,7 @@ export default {
     <suggestions
       v-if="hasSuggestion && !isEditing"
       :suggestions="note.suggestions"
+      :suggestions-count="suggestionsCount"
       :batch-suggestions-info="batchSuggestionsInfo"
       :note-html="note.note_html"
       :line-type="lineType"

app/assets/javascripts/notes/stores/getters.js

@@ -231,3 +231,6 @@ export const getDiscussion = state => discussionId =>
   state.discussions.find(discussion => discussion.id === discussionId);
 
 export const commentsDisabled = state => state.commentsDisabled;
+
+export const suggestionsCount = (state, getters) =>
+  Object.values(getters.notesById).filter(n => n.suggestions.length).length;

app/assets/javascripts/vue_shared/components/markdown/suggestion_diff.vue

@@ -27,6 +27,11 @@ export default {
       type: String,
       required: true,
     },
+    suggestionsCount: {
+      type: Number,
+      required: false,
+      default: 0,
+    },
   },
   computed: {
     batchSuggestionsCount() {
@@ -62,6 +67,7 @@ export default {
   <div class="md-suggestion">
     <suggestion-diff-header
       class="qa-suggestion-diff-header js-suggestion-diff-header"
+      :suggestions-count="suggestionsCount"
       :can-apply="suggestion.appliable && suggestion.current_user.can_apply && !disabled"
       :is-applied="suggestion.applied"
       :is-batched="isBatched"

app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue

@@ -42,6 +42,11 @@ export default {
       required: false,
       default: null,
     },
+    suggestionsCount: {
+      type: Number,
+      required: false,
+      default: 0,
+    },
   },
   data() {
     return {
@@ -127,7 +132,7 @@ export default {
     </div>
     <div v-else class="d-flex align-items-center">
       <gl-button
-        v-if="canBeBatched && !isDisableButton"
+        v-if="suggestionsCount > 1 && canBeBatched && !isDisableButton"
         class="btn-inverted js-add-to-batch-btn btn-grouped"
         :disabled="isDisableButton"
         @click="addSuggestionToBatch"

app/assets/javascripts/vue_shared/components/markdown/suggestions.vue

@@ -38,6 +38,11 @@ export default {
       type: String,
       required: true,
     },
+    suggestionsCount: {
+      type: Number,
+      required: false,
+      default: 0,
+    },
   },
   data() {
     return {
@@ -77,12 +82,12 @@ export default {
       this.isRendered = true;
     },
     generateDiff(suggestionIndex) {
-      const { suggestions, disabled, batchSuggestionsInfo, helpPagePath } = this;
+      const { suggestions, disabled, batchSuggestionsInfo, helpPagePath, suggestionsCount } = this;
       const suggestion =
         suggestions && suggestions[suggestionIndex] ? suggestions[suggestionIndex] : {};
       const SuggestionDiffComponent = Vue.extend(SuggestionDiff);
       const suggestionDiff = new SuggestionDiffComponent({
-        propsData: { disabled, suggestion, batchSuggestionsInfo, helpPagePath },
+        propsData: { disabled, suggestion, batchSuggestionsInfo, helpPagePath, suggestionsCount },
       });
 
       suggestionDiff.$on('apply', ({ suggestionId, callback }) => {

changelogs/unreleased/ph-224141-hideBatchSuggestionsWithOnlyOneSuggestion.yml

+---
+title: Hides batch suggestions button if there is only 1 suggestion
+merge_request: 42681
+author:
+type: fixed

spec/features/merge_request/user_suggests_changes_on_diff_spec.rb

@@ -130,7 +130,9 @@ RSpec.describe 'User comments on a diff', :js do
             wait_for_requests
           end
         end
+      end
 
+      files.each_with_index do |file, index|
         page.within("[id='#{file[:hash]}']") do
           expect(page).not_to have_content('Applied')
 

spec/frontend/vue_shared/components/markdown/__snapshots__/suggestion_diff_spec.js.snap

@@ -10,6 +10,7 @@ exports[`Suggestion Diff component matches snapshot 1`] = `
     helppagepath="path_to_docs"
     isapplyingbatch="true"
     isbatched="true"
+    suggestionscount="0"
   />
    
   <table

spec/frontend/vue_shared/components/markdown/suggestion_diff_header_spec.js

@@ -57,7 +57,9 @@ describe('Suggestion Diff component', () => {
   });
 
   it('renders apply suggestion and add to batch buttons', () => {
-    createComponent();
+    createComponent({
+      suggestionsCount: 2,
+    });
 
     const applyBtn = findApplyButton();
     const addToBatchBtn = findAddToBatchButton();
@@ -104,7 +106,9 @@ describe('Suggestion Diff component', () => {
 
   describe('when add to batch is clicked', () => {
     it('emits addToBatch', () => {
-      createComponent();
+      createComponent({
+        suggestionsCount: 2,
+      });
 
       findAddToBatchButton().vm.$emit('click');