diff --git a/app/assets/javascripts/merge_requests/components/reviewers/reviewer_dropdown.vue b/app/assets/javascripts/merge_requests/components/reviewers/reviewer_dropdown.vue index 6bf2b0b298194bbe207c72c81f9d743d4f48b495..187ce37a2867d27ecf59185fdeb9cbf9bbf6c5c5 100644 --- a/app/assets/javascripts/merge_requests/components/reviewers/reviewer_dropdown.vue +++ b/app/assets/javascripts/merge_requests/components/reviewers/reviewer_dropdown.vue @@ -62,7 +62,8 @@ export default { required: false, default: () => [], }, - visibleReviewers: { + // Any user eligible to be a reviewer for this list (based on approval rule, etc.) + eligibleReviewers: { type: Array, required: false, default: () => [], @@ -103,10 +104,10 @@ export default { const items = []; const users = this.usersForList; - if (this.selectedReviewersToShow.length && !this.search) { + if (this.visibleReviewers.length && !this.search) { items.push({ text: __('Reviewers'), - options: this.selectedReviewersToShow.map((user) => this.mapUser(user)), + options: this.visibleReviewers.map((user) => this.mapUser(user)), }); } @@ -122,9 +123,10 @@ export default { return items; }, - selectedReviewersToShow() { + visibleReviewers() { + // Eligible users filtered to only show the previously selected users return this.selectedReviewers.filter((user) => - this.visibleReviewers.map((gqlUser) => gqlUser.id).includes(user.id), + this.eligibleReviewers.map((gqlUser) => gqlUser.id).includes(user.id), ); }, }, diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue index 6cb0e78c7ae682f83bd723952c7ca14e14e2a66c..6952b0b44615ac1ab961b9fc396501f198f930de 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue @@ -54,7 +54,7 @@ export default { class="gl-ml-auto" usage="simple" :selected-reviewers="reviewers" - :visible-reviewers="reviewers" + :eligible-reviewers="reviewers" /> diff --git a/ee/app/assets/javascripts/merge_requests/components/reviewers/approval_rules.vue b/ee/app/assets/javascripts/merge_requests/components/reviewers/approval_rules.vue index 555b790fa1f459924ceb46a61c55639f4b84b3bf..6bc9a97f09d11edb10263ae32232cef4b49fb922 100644 --- a/ee/app/assets/javascripts/merge_requests/components/reviewers/approval_rules.vue +++ b/ee/app/assets/javascripts/merge_requests/components/reviewers/approval_rules.vue @@ -75,7 +75,7 @@ export default { toggleApprovalSections() { this.showApprovalSections = !this.showApprovalSections; }, - visibleReviewersForRule(rule) { + reviewersEligibleForRule(rule) { let visible = rule.reviewers; if (rule.type.toLowerCase() === RULE_TYPE_ANY_APPROVER) { @@ -163,7 +163,7 @@ export default {