diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /app/assets/javascripts/commons | |
parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/commons')
-rw-r--r-- | app/assets/javascripts/commons/nav/user_merge_requests.js | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/app/assets/javascripts/commons/nav/user_merge_requests.js b/app/assets/javascripts/commons/nav/user_merge_requests.js index 84ab728274f..784e9cb2faa 100644 --- a/app/assets/javascripts/commons/nav/user_merge_requests.js +++ b/app/assets/javascripts/commons/nav/user_merge_requests.js @@ -23,7 +23,18 @@ function updateReviewerMergeRequestCounts(newCount) { function updateMergeRequestCounts(newCount) { const mergeRequestsCountEl = document.querySelector('.js-merge-requests-count'); mergeRequestsCountEl.textContent = newCount.toLocaleString(); - mergeRequestsCountEl.classList.toggle('hidden', Number(newCount) === 0); + mergeRequestsCountEl.classList.toggle('gl-display-none', Number(newCount) === 0); +} + +function updateAttentionRequestsCount(count) { + const attentionCountEl = document.querySelector('.js-attention-count'); + attentionCountEl.textContent = count.toLocaleString(); + + if (Number(count) === 0) { + attentionCountEl.classList.replace('badge-warning', 'badge-neutral'); + } else { + attentionCountEl.classList.replace('badge-neutral', 'badge-warning'); + } } /** @@ -32,14 +43,22 @@ function updateMergeRequestCounts(newCount) { export function refreshUserMergeRequestCounts() { return getUserCounts() .then(({ data }) => { + const attentionRequestsEnabled = window.gon?.features?.mrAttentionRequests; const assignedMergeRequests = data.assigned_merge_requests; const reviewerMergeRequests = data.review_requested_merge_requests; - const fullCount = assignedMergeRequests + reviewerMergeRequests; + const attentionRequests = data.attention_requests; + const fullCount = attentionRequestsEnabled + ? attentionRequests + : assignedMergeRequests + reviewerMergeRequests; updateUserMergeRequestCounts(assignedMergeRequests); updateReviewerMergeRequestCounts(reviewerMergeRequests); updateMergeRequestCounts(fullCount); broadcastCount(fullCount); + + if (attentionRequestsEnabled) { + updateAttentionRequestsCount(attentionRequests); + } }) .catch((ex) => { console.error(ex); // eslint-disable-line no-console |