diff options
| -rw-r--r-- | app/assets/javascripts/notes/components/discussion_counter.vue | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 24 |
2 files changed, 23 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue index 6322bcfa363..a5d6377a0dd 100644 --- a/app/assets/javascripts/notes/components/discussion_counter.vue +++ b/app/assets/javascripts/notes/components/discussion_counter.vue @@ -85,6 +85,7 @@ class="btn-group" role="group"> <button + v-tooltip title="Jump to first unresolved discussion" data-container="body" class="btn btn-default discussion-next-btn"> diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index e3d760ed13f..f2dc3fa2db9 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -1,6 +1,7 @@ <script> import { mapActions, mapGetters } from 'vuex'; import resolveDiscussionsSvg from 'icons/_icon_mr_issue.svg'; + import nextDiscussionsSvg from 'icons/_next_discussion.svg'; import Flash from '../../flash'; import { SYSTEM_NOTE } from '../constants'; import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue'; @@ -45,6 +46,8 @@ computed: { ...mapGetters([ 'getNoteableData', + 'discussionCount', + 'resolvedDiscussionCount', ]), discussion() { return this.note.notes[0]; @@ -76,6 +79,9 @@ return null; }, + hasUnresolvedDiscussion() { + return this.discussionCount - this.resolvedDiscussionCount > 1; + }, }, methods: { ...mapActions([ @@ -146,6 +152,7 @@ }, created() { this.resolveDiscussionsSvg = resolveDiscussionsSvg; + this.nextDiscussionsSvg = nextDiscussionsSvg; }, mounted() { if (this.isReplying) { @@ -241,9 +248,10 @@ </button> </div> <div - v-if="note.resolvable && !note.resolved" - class="btn-group discussion-actions"> + class="btn-group discussion-actions" + role="group"> <div + v-if="note.resolvable && !discussionResolved" class="btn-group" role="group"> <a @@ -255,6 +263,18 @@ <span v-html="resolveDiscussionsSvg"></span> </a> </div> + <div + v-if="hasUnresolvedDiscussion" + class="btn-group" + role="group"> + <button + v-tooltip + class="btn btn-default discussion-next-btn" + title="Jump to next unresolved discussion" + data-container="body"> + <span v-html="nextDiscussionsSvg"></span> + </button> + </div> </div> </div> </template> |