From 7e2050bf79180f99131e0c3b992681d6b20e4c4c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Thu, 26 Jun 2025 11:59:42 +0100
Subject: [PATCH] Fixes list count badge not being visible on all merge request
 lists

Fixes an issue where the badge with the merge requests count
is not visible on all lists on the merge request dashboard.
---
 .../components/app.vue                        | 10 ++---
 .../components/merge_requests_query.vue       | 12 +-----
 .../components/tab_title.vue                  | 38 +++++++++++--------
 .../components/merge_requests_query_spec.js   | 15 ++++++--
 4 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/app/assets/javascripts/merge_request_dashboard/components/app.vue b/app/assets/javascripts/merge_request_dashboard/components/app.vue
index aaa9c1a2c2c3ed..2d1e02a99d36ea 100644
--- a/app/assets/javascripts/merge_request_dashboard/components/app.vue
+++ b/app/assets/javascripts/merge_request_dashboard/components/app.vue
@@ -99,10 +99,11 @@ export default {
       this.$router.push({ path: key || '/' });
     },
     queriesForTab(tab) {
-      return tab.lists
-        .flat()
-        .filter((l) => !l.hideCount)
-        .map((list) => ({ query: list.query, variables: list.variables }));
+      return tab.lists.flat().map((list) => ({
+        hideCount: list.hideCount,
+        query: list.query,
+        variables: list.variables,
+      }));
     },
   },
   mergeRequestIllustration,
@@ -158,7 +159,6 @@ export default {
             :key="`list_${list.id}`"
             :query="list.query"
             :variables="list.variables"
-            :hide-count="list.hideCount"
             :is-visible="isVisible"
           >
             <template
diff --git a/app/assets/javascripts/merge_request_dashboard/components/merge_requests_query.vue b/app/assets/javascripts/merge_request_dashboard/components/merge_requests_query.vue
index ff99dd58a90377..cb54b62cfd5185 100644
--- a/app/assets/javascripts/merge_request_dashboard/components/merge_requests_query.vue
+++ b/app/assets/javascripts/merge_request_dashboard/components/merge_requests_query.vue
@@ -55,9 +55,6 @@ export default {
         return this.mergeRequestQueryVariables;
       },
       fetchPolicy: fetchPolicies.CACHE_ONLY,
-      skip() {
-        return this.hideCount;
-      },
     },
     draftsCount: {
       fetchPolicy: fetchPolicies.NO_CACHE,
@@ -86,11 +83,6 @@ export default {
       required: false,
       default: () => ({}),
     },
-    hideCount: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     isVisible: {
       type: Boolean,
       required: false,
@@ -154,9 +146,7 @@ export default {
         ),
       });
 
-      if (!this.hideCount) {
-        this.$apollo.queries.count.refetch();
-      }
+      this.$apollo.queries.count.refetch();
     },
     async loadMore() {
       this.loading = true;
diff --git a/app/assets/javascripts/merge_request_dashboard/components/tab_title.vue b/app/assets/javascripts/merge_request_dashboard/components/tab_title.vue
index 8526f0e7cda4cd..b827264a37ef0e 100644
--- a/app/assets/javascripts/merge_request_dashboard/components/tab_title.vue
+++ b/app/assets/javascripts/merge_request_dashboard/components/tab_title.vue
@@ -25,27 +25,33 @@ export default {
     this.fetchAllCounts();
   },
   methods: {
-    fetchAllCounts() {
-      this.queries.forEach(({ query, variables }, index) => {
-        const countVariables = { ...variables };
+    addSmartQuery({ index, query, variables, hideCount }) {
+      const countVariables = { ...variables };
 
-        if (countVariables.draft) {
-          delete countVariables.draft;
-        }
+      if (countVariables.draft) {
+        delete countVariables.draft;
+      }
 
-        this.$apollo.addSmartQuery(`${query}_${index}`, {
-          query: QUERIES[query].countQuery,
-          variables: countVariables,
-          manual: true,
-          context: { batchKey: `MergeRequestTabsCounts_${camelCase(this.title)}` },
-          result({ data }) {
-            if (data?.currentUser) {
+      this.$apollo.addSmartQuery(`${query}_${index}`, {
+        query: QUERIES[query].countQuery,
+        variables: countVariables,
+        manual: true,
+        context: {
+          batchKey: `MergeRequestTabsCounts_${camelCase(this.title)}_${hideCount ? 'NOT_ACTIVE' : 'ACTIVE'}`,
+        },
+        result({ data }) {
+          if (data?.currentUser) {
+            if (!hideCount) {
               this.count += data?.currentUser?.mergeRequests?.count ?? 0;
-
               this.loading = false;
             }
-          },
-        });
+          }
+        },
+      });
+    },
+    fetchAllCounts() {
+      this.queries.forEach(({ query, variables, hideCount }, index) => {
+        this.addSmartQuery({ index, query, variables, hideCount });
       });
     },
   },
diff --git a/spec/frontend/merge_request_dashboard/components/merge_requests_query_spec.js b/spec/frontend/merge_request_dashboard/components/merge_requests_query_spec.js
index 6ff41817193a62..22b76845a5b9fd 100644
--- a/spec/frontend/merge_request_dashboard/components/merge_requests_query_spec.js
+++ b/spec/frontend/merge_request_dashboard/components/merge_requests_query_spec.js
@@ -76,6 +76,12 @@ describe('Merge requests query component', () => {
       { typePolicies: { Query: { fields: { currentUser: { merge: false } } } } },
     );
 
+    apolloProvider.defaultClient.writeQuery({
+      query: assigneeCountQuery,
+      variables: { state: 'opened' },
+      data: { currentUser: { id: 1, mergeRequests: { count: 1 } } },
+    });
+
     slotSpy = jest.fn();
 
     shallowMountExtended(MergeRequestQuery, {
@@ -113,16 +119,19 @@ describe('Merge requests query component', () => {
     });
   });
 
-  it('does not call count query if hideCount is true', async () => {
+  it('renders default slot with the cached merge requests count', async () => {
     createComponent({
       query: 'assignedMergeRequests',
       variables: { state: 'opened' },
-      hideCount: true,
     });
 
     await waitForPromises();
 
-    expect(assigneeCountQueryMock).not.toHaveBeenCalled();
+    expect(slotSpy).toHaveBeenCalledWith(
+      expect.objectContaining({
+        count: 1,
+      }),
+    );
   });
 
   it.each([
-- 
GitLab