Merge branch 'ph/mrDashboardPaginationFix' into 'master'

Fixes pagination not always working in merge request dashboard

See merge request gitlab-org/gitlab!165315



Merged-by: Kushal Pandya <kushal@gitlab.com>
Approved-by: Kushal Pandya <kushal@gitlab.com>
Co-authored-by: Phil Hughes <me@iamphill.com>

app/assets/javascripts/merge_request_dashboard/components/collapsible_section.vue

@@ -75,7 +75,7 @@ export default {
             @click="toggleOpen"
           />
           {{ title }}
-          <gl-badge v-if="!loading" class="gl-ml-1" variant="neutral" size="sm">{{
+          <gl-badge v-if="!loading || count" class="gl-ml-1" variant="neutral" size="sm">{{
             count
           }}</gl-badge>
         </h5>

app/assets/javascripts/merge_request_dashboard/components/merge_requests_query.vue

@@ -18,7 +18,7 @@ export default {
         return QUERIES[this.query];
       },
       update(d) {
-        return d.currentUser?.[this.query] || {};
+        return d.currentUser?.mergeRequests || {};
       },
       variables() {
         return {

app/assets/javascripts/merge_request_dashboard/index.js

@@ -9,6 +9,16 @@ export function initMergeRequestDashboard(el) {
 
   const { lists, switch_dashboard_path: switchDashboardPath } = JSON.parse(el.dataset.initialData);
 
+  const keyArgs = [
+    'state',
+    'reviewState',
+    'reviewStates',
+    'reviewerWildcardId',
+    'mergedAfter',
+    'assignedReviewStates',
+    'reviewerReviewStates',
+  ];
+
   return new Vue({
     el,
     apolloProvider: new VueApollo({
@@ -18,19 +28,15 @@ export function initMergeRequestDashboard(el) {
           cacheConfig: {
             typePolicies: {
               CurrentUser: {
-                merge: true,
                 fields: {
+                  assignedMergeRequests: {
+                    keyArgs,
+                  },
                   reviewRequestedMergeRequests: {
-                    keyArgs: ['state', 'reviewState', 'reviewStates', 'mergedAfter'],
+                    keyArgs,
                   },
-                  assignedMergeRequests: {
-                    keyArgs: [
-                      'state',
-                      'reviewState',
-                      'reviewStates',
-                      'reviewerWildcardId',
-                      'mergedAfter',
-                    ],
+                  assigneeOrReviewerMergeRequests: {
+                    keyArgs,
                   },
                 },
               },
@@ -39,10 +45,8 @@ export function initMergeRequestDashboard(el) {
                   nodes: concatPagination(),
                 },
               },
-              UserMergeRequestInteraction: {
-                merge(a) {
-                  return a;
-                },
+              MergeRequestReviewer: {
+                keyFields: false,
               },
             },
           },

app/assets/javascripts/merge_request_dashboard/queries/assignee.query.graphql

@@ -12,7 +12,7 @@ query requestingReview(
 ) {
   currentUser {
     id
-    assignedMergeRequests(
+    mergeRequests: assignedMergeRequests(
       state: $state
       reviewState: $reviewState
       reviewStates: $reviewStates

app/assets/javascripts/merge_request_dashboard/queries/assignee_or_reviewer.query.graphql

@@ -11,7 +11,7 @@ query assigneeOrReviewer(
 ) {
   currentUser {
     id
-    assigneeOrReviewerMergeRequests(
+    mergeRequests: assigneeOrReviewerMergeRequests(
       state: $state
       assignedReviewStates: $assignedReviewStates
       reviewerReviewStates: $reviewerReviewStates

app/assets/javascripts/merge_request_dashboard/queries/reviewer.query.graphql

@@ -11,7 +11,7 @@ query reviewRequests(
 ) {
   currentUser {
     id
-    reviewRequestedMergeRequests(
+    mergeRequests: reviewRequestedMergeRequests(
       state: $state
       reviewState: $reviewState
       reviewStates: $reviewStates

spec/frontend/merge_request_dashboard/components/app_spec.js

@@ -26,7 +26,7 @@ describe('Merge requests app component', () => {
       data: {
         currentUser: {
           id: 1,
-          assignedMergeRequests: {
+          mergeRequests: {
             count: 1,
             pageInfo: {
               hasNextPage: true,

spec/frontend/merge_request_dashboard/components/merge_requests_query_spec.js

@@ -22,7 +22,7 @@ describe('Merge requests query component', () => {
       data: {
         currentUser: {
           id: 1,
-          reviewRequestedMergeRequests: {
+          mergeRequests: {
             count: 0,
             pageInfo: {
               __typename: 'PageInfo',
@@ -40,7 +40,7 @@ describe('Merge requests query component', () => {
       data: {
         currentUser: {
           id: 1,
-          assignedMergeRequests: {
+          mergeRequests: {
             count: 0,
             pageInfo: {
               hasNextPage: false,