Merge branch 'ntepluhina-merge-apollo-clients' into 'master'

Merge boards Apollo Client instances for boards [RUN AS-if-FOSS]

See merge request gitlab-org/gitlab!70375

app/assets/javascripts/boards/boards_util.js

@@ -146,7 +146,8 @@ export function getMoveData(state, params) {
 }
 
 export function moveItemListHelper(item, fromList, toList) {
-  const updatedItem = item;
+  const updatedItem = cloneDeep(item);
+
   if (
     toList.listType === ListType.label &&
     !updatedItem.labels.find((label) => label.id === toList.label.id)

app/assets/javascripts/boards/graphql.js

+import { IntrospectionFragmentMatcher, defaultDataIdFromObject } from 'apollo-cache-inmemory';
+import createDefaultClient from '~/lib/graphql';
+import introspectionQueryResultData from '~/sidebar/fragmentTypes.json';
+
+const fragmentMatcher = new IntrospectionFragmentMatcher({
+  introspectionQueryResultData,
+});
+
+export const gqlClient = createDefaultClient(
+  {},
+  {
+    cacheConfig: {
+      dataIdFromObject: (object) => {
+        // eslint-disable-next-line no-underscore-dangle
+        return object.__typename === 'BoardList' ? object.iid : defaultDataIdFromObject(object);
+      },
+
+      fragmentMatcher,
+    },
+    assumeImmutableResults: true,
+  },
+);

app/assets/javascripts/boards/graphql/issue.fragment.graphql

+#import "~/graphql_shared/fragments/milestone.fragment.graphql"
 #import "~/graphql_shared/fragments/user.fragment.graphql"
 
 fragment IssueNode on Issue {
@@ -15,6 +16,9 @@ fragment IssueNode on Issue {
   hidden
   webUrl
   relativePosition
+  milestone {
+    ...MilestoneFragment
+  }
   assignees {
     nodes {
       ...User

app/assets/javascripts/boards/index.js

-import { IntrospectionFragmentMatcher } from 'apollo-cache-inmemory';
 import PortalVue from 'portal-vue';
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
@@ -14,30 +13,17 @@ import FilteredSearchBoards from '~/boards/filtered_search_boards';
 import initBoardsFilteredSearch from '~/boards/mount_filtered_search_issue_boards';
 import store from '~/boards/stores';
 import toggleFocusMode from '~/boards/toggle_focus';
-import createDefaultClient from '~/lib/graphql';
 import { NavigationType, parseBoolean } from '~/lib/utils/common_utils';
-import introspectionQueryResultData from '~/sidebar/fragmentTypes.json';
 import { fullBoardId } from './boards_util';
 import boardConfigToggle from './config_toggle';
+import { gqlClient } from './graphql';
 import mountMultipleBoardsSwitcher from './mount_multiple_boards_switcher';
 
 Vue.use(VueApollo);
 Vue.use(PortalVue);
 
-const fragmentMatcher = new IntrospectionFragmentMatcher({
-  introspectionQueryResultData,
-});
-
 const apolloProvider = new VueApollo({
-  defaultClient: createDefaultClient(
-    {},
-    {
-      cacheConfig: {
-        fragmentMatcher,
-      },
-      assumeImmutableResults: true,
-    },
-  ),
+  defaultClient: gqlClient,
 });
 
 function mountBoardApp(el) {

app/assets/javascripts/boards/stores/actions.js

@@ -19,7 +19,6 @@ import {
 import createBoardListMutation from 'ee_else_ce/boards/graphql/board_list_create.mutation.graphql';
 import issueMoveListMutation from 'ee_else_ce/boards/graphql/issue_move_list.mutation.graphql';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import createGqClient, { fetchPolicies } from '~/lib/graphql';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { queryToObject } from '~/lib/utils/url_utility';
 import { s__ } from '~/locale';
@@ -35,6 +34,7 @@ import {
   FiltersInfo,
   filterVariables,
 } from '../boards_util';
+import { gqlClient } from '../graphql';
 import boardLabelsQuery from '../graphql/board_labels.query.graphql';
 import groupBoardIterationsQuery from '../graphql/group_board_iterations.query.graphql';
 import groupBoardMilestonesQuery from '../graphql/group_board_milestones.query.graphql';
@@ -47,13 +47,6 @@ import projectBoardMilestonesQuery from '../graphql/project_board_milestones.que
 
 import * as types from './mutation_types';
 
-export const gqlClient = createGqClient(
-  {},
-  {
-    fetchPolicy: fetchPolicies.NO_CACHE,
-  },
-);
-
 export default {
   setInitialBoardData: ({ commit }, data) => {
     commit(types.SET_INITIAL_BOARD_DATA, data);

app/assets/javascripts/graphql_shared/fragments/milestone.fragment.graphql

+fragment MilestoneFragment on Milestone {
+  expired
+  id
+  state
+  title
+}

ee/app/assets/javascripts/boards/graphql/issue.fragment.graphql

+#import "~/graphql_shared/fragments/milestone.fragment.graphql"
 #import "~/graphql_shared/fragments/user.fragment.graphql"
 
 fragment IssueNode on Issue {
@@ -25,6 +26,9 @@ fragment IssueNode on Issue {
       ...User
     }
   }
+  milestone {
+    ...MilestoneFragment
+  }
   labels {
     nodes {
       id

ee/app/assets/javascripts/boards/stores/actions.js

@@ -6,10 +6,11 @@ import {
   filterVariables,
 } from '~/boards/boards_util';
 import { BoardType } from '~/boards/constants';
+import { gqlClient } from '~/boards/graphql';
 import groupBoardMembersQuery from '~/boards/graphql/group_board_members.query.graphql';
 import listsIssuesQuery from '~/boards/graphql/lists_issues.query.graphql';
 import projectBoardMembersQuery from '~/boards/graphql/project_board_members.query.graphql';
-import actionsCE, { gqlClient } from '~/boards/stores/actions';
+import actionsCE from '~/boards/stores/actions';
 import * as typesCE from '~/boards/stores/mutation_types';
 import { historyPushState, convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { mergeUrlParams, removeParams, queryToObject } from '~/lib/utils/url_utility';

ee/spec/features/boards/swimlanes/epics_swimlanes_drag_drop_spec.rb

@@ -119,14 +119,16 @@ RSpec.describe 'epics swimlanes', :js do
     end
 
     it 'between lists and epics' do
-      wait_for_board_cards(1, 2)
-      wait_for_board_cards_in_second_epic(1, 1)
+      inspect_requests(inject_headers: { 'X-GITLAB-DISABLE-SQL-QUERY-LIMIT' => 'https://gitlab.com/gitlab-org/gitlab/-/issues/323426' }) do
+        wait_for_board_cards(1, 2)
+        wait_for_board_cards_in_second_epic(1, 1)
 
-      drag(list_from_index: 4, list_to_index: 2)
+        drag(list_from_index: 4, list_to_index: 2)
 
-      wait_for_board_cards(2, 0)
-      wait_for_board_cards(3, 2)
-      wait_for_board_cards_in_first_epic(2, 2)
+        wait_for_board_cards(2, 0)
+        wait_for_board_cards(3, 2)
+        wait_for_board_cards_in_first_epic(2, 2)
+      end
     end
   end
 

spec/frontend/boards/stores/actions_spec.js

@@ -21,9 +21,10 @@ import {
   getMoveData,
   updateListPosition,
 } from '~/boards/boards_util';
+import { gqlClient } from '~/boards/graphql';
 import destroyBoardListMutation from '~/boards/graphql/board_list_destroy.mutation.graphql';
 import issueCreateMutation from '~/boards/graphql/issue_create.mutation.graphql';
-import actions, { gqlClient } from '~/boards/stores/actions';
+import actions from '~/boards/stores/actions';
 import * as types from '~/boards/stores/mutation_types';
 import mutations from '~/boards/stores/mutations';