diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /app/assets/javascripts/notes/components/note_body.vue | |
parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'app/assets/javascripts/notes/components/note_body.vue')
-rw-r--r-- | app/assets/javascripts/notes/components/note_body.vue | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue index 93f71276120..1ce1696e332 100644 --- a/app/assets/javascripts/notes/components/note_body.vue +++ b/app/assets/javascripts/notes/components/note_body.vue @@ -51,7 +51,7 @@ export default { }, }, computed: { - ...mapGetters(['getDiscussion', 'suggestionsCount']), + ...mapGetters(['getDiscussion', 'suggestionsCount', 'getSuggestionsFilePaths']), ...mapGetters('diffs', ['suggestionCommitMessage']), discussion() { if (!this.note.isDraft) return {}; @@ -74,9 +74,10 @@ export default { // Please see this issue comment for why these // are hard-coded to 1: // https://gitlab.com/gitlab-org/gitlab/-/issues/291027#note_468308022 - const suggestionsCount = 1; - const filesCount = 1; - const filePaths = this.file ? [this.file.file_path] : []; + const suggestionsCount = this.batchSuggestionsInfo.length || 1; + const batchFilePaths = this.getSuggestionsFilePaths(); + const filePaths = batchFilePaths.length ? batchFilePaths : [this.file.file_path]; + const filesCount = filePaths.length; const suggestion = this.suggestionCommitMessage({ file_paths: filePaths.join(', '), suggestions_count: suggestionsCount, @@ -131,8 +132,8 @@ export default { message, }).then(callback); }, - applySuggestionBatch({ flashContainer }) { - return this.submitSuggestionBatch({ flashContainer }); + applySuggestionBatch({ message, flashContainer }) { + return this.submitSuggestionBatch({ message, flashContainer }); }, addSuggestionToBatch(suggestionId) { const { discussion_id: discussionId, id: noteId } = this.note; |