Merge branch...

Merge branch '281060-rename-graphql-mutations-queries-for-boards-to-follow-convention-and-consolidate-under' into 'master'

Rename the folder hosting graphql files to `graphql` for boards and add mutation suffix. [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!47474

app/assets/javascripts/boards/components/board_assignee_dropdown.vue

@@ -14,7 +14,7 @@ import IssuableAssignees from '~/sidebar/components/assignees/issuable_assignees
 import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue';
 import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dropdown.vue';
 import getIssueParticipants from '~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql';
-import searchUsers from '~/boards/queries/users_search.query.graphql';
+import searchUsers from '~/boards/graphql/users_search.query.graphql';
 
 export default {
   noSearchDelay: 0,

app/assets/javascripts/boards/components/boards_selector.vue

@@ -12,8 +12,8 @@ import {
 import httpStatusCodes from '~/lib/utils/http_status';
 
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import projectQuery from '../queries/project_boards.query.graphql';
-import groupQuery from '../queries/group_boards.query.graphql';
+import projectQuery from '../graphql/project_boards.query.graphql';
+import groupQuery from '../graphql/group_boards.query.graphql';
 
 import boardsStore from '../stores/boards_store';
 import BoardForm from './board_form.vue';

app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue

@@ -10,7 +10,7 @@ import {
 } from '@gitlab/ui';
 import { fetchPolicies } from '~/lib/graphql';
 import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue';
-import groupMilestones from '../../queries/group_milestones.query.graphql';
+import groupMilestones from '../../graphql/group_milestones.query.graphql';
 import createFlash from '~/flash';
 import { __, s__ } from '~/locale';
 

app/assets/javascripts/boards/queries/board_list_create.mutation.graphql → app/assets/javascripts/boards/graphql/board_list_create.mutation.graphql

-#import "ee_else_ce/boards/queries/board_list.fragment.graphql"
+#import "ee_else_ce/boards/graphql/board_list.fragment.graphql"
 
 mutation CreateBoardList(
   $boardId: BoardID!

app/assets/javascripts/boards/queries/board_lists.query.graphql → app/assets/javascripts/boards/graphql/board_lists.query.graphql

-#import "ee_else_ce/boards/queries/board_list.fragment.graphql"
+#import "ee_else_ce/boards/graphql/board_list.fragment.graphql"
 
 query ListIssues(
   $fullPath: ID!

app/assets/javascripts/boards/queries/group_boards.query.graphql → app/assets/javascripts/boards/graphql/group_boards.query.graphql

-#import "ee_else_ce/boards/queries/board.fragment.graphql"
+#import "ee_else_ce/boards/graphql/board.fragment.graphql"
 
 query group_boards($fullPath: ID!) {
   group(fullPath: $fullPath) {

app/assets/javascripts/boards/queries/issue_create.mutation.graphql → app/assets/javascripts/boards/graphql/issue_create.mutation.graphql

-#import "ee_else_ce/boards/queries/issue.fragment.graphql"
+#import "ee_else_ce/boards/graphql/issue.fragment.graphql"
 
 mutation CreateIssue($input: CreateIssueInput!) {
   createIssue(input: $input) {

app/assets/javascripts/boards/queries/issue_move_list.mutation.graphql → app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql

-#import "ee_else_ce/boards/queries/issue.fragment.graphql"
+#import "ee_else_ce/boards/graphql/issue.fragment.graphql"
 
 mutation IssueMoveList(
   $projectPath: ID!

app/assets/javascripts/boards/queries/lists_issues.query.graphql → app/assets/javascripts/boards/graphql/lists_issues.query.graphql

-#import "ee_else_ce/boards/queries/issue.fragment.graphql"
+#import "ee_else_ce/boards/graphql/issue.fragment.graphql"
 
 query ListIssues(
   $fullPath: ID!

app/assets/javascripts/boards/queries/project_boards.query.graphql → app/assets/javascripts/boards/graphql/project_boards.query.graphql

-#import "ee_else_ce/boards/queries/board.fragment.graphql"
+#import "ee_else_ce/boards/graphql/board.fragment.graphql"
 
 query project_boards($fullPath: ID!) {
   project(fullPath: $fullPath) {

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

 import { pick } from 'lodash';
 
-import boardListsQuery from 'ee_else_ce/boards/queries/board_lists.query.graphql';
+import boardListsQuery from 'ee_else_ce/boards/graphql/board_lists.query.graphql';
 import createGqClient, { fetchPolicies } from '~/lib/graphql';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { BoardType, ListType, inactiveId, DEFAULT_LABELS } from '~/boards/constants';
@@ -14,18 +14,18 @@ import {
 } from '../boards_util';
 import boardStore from '~/boards/stores/boards_store';
 
-import updateAssignees from '~/vue_shared/components/sidebar/queries/updateAssignees.mutation.graphql';
-import listsIssuesQuery from '../queries/lists_issues.query.graphql';
-import boardLabelsQuery from '../queries/board_labels.query.graphql';
-import createBoardListMutation from '../queries/board_list_create.mutation.graphql';
-import updateBoardListMutation from '../queries/board_list_update.mutation.graphql';
-import issueMoveListMutation from '../queries/issue_move_list.mutation.graphql';
-import destroyBoardListMutation from '../queries/board_list_destroy.mutation.graphql';
-import issueCreateMutation from '../queries/issue_create.mutation.graphql';
-import issueSetLabels from '../queries/issue_set_labels.mutation.graphql';
-import issueSetDueDate from '../queries/issue_set_due_date.mutation.graphql';
-import issueSetSubscriptionMutation from '../graphql/mutations/issue_set_subscription.mutation.graphql';
-import issueSetMilestone from '../queries/issue_set_milestone.mutation.graphql';
+import updateAssigneesMutation from '~/vue_shared/components/sidebar/queries/updateAssignees.mutation.graphql';
+import listsIssuesQuery from '../graphql/lists_issues.query.graphql';
+import boardLabelsQuery from '../graphql/board_labels.query.graphql';
+import createBoardListMutation from '../graphql/board_list_create.mutation.graphql';
+import updateBoardListMutation from '../graphql/board_list_update.mutation.graphql';
+import issueMoveListMutation from '../graphql/issue_move_list.mutation.graphql';
+import destroyBoardListMutation from '../graphql/board_list_destroy.mutation.graphql';
+import issueCreateMutation from '../graphql/issue_create.mutation.graphql';
+import issueSetLabelsMutation from '../graphql/issue_set_labels.mutation.graphql';
+import issueSetDueDateMutation from '../graphql/issue_set_due_date.mutation.graphql';
+import issueSetSubscriptionMutation from '../graphql/issue_set_subscription.mutation.graphql';
+import issueSetMilestoneMutation from '../graphql/issue_set_milestone.mutation.graphql';
 
 const notImplemented = () => {
   /* eslint-disable-next-line @gitlab/require-i18n-strings */
@@ -324,7 +324,7 @@ export default {
 
     return gqlClient
       .mutate({
-        mutation: updateAssignees,
+        mutation: updateAssigneesMutation,
         variables: {
           iid: getters.activeIssue.iid,
           projectPath: getters.activeIssue.referencePath.split('#')[0],
@@ -350,7 +350,7 @@ export default {
   setActiveIssueMilestone: async ({ commit, getters }, input) => {
     const { activeIssue } = getters;
     const { data } = await gqlClient.mutate({
-      mutation: issueSetMilestone,
+      mutation: issueSetMilestoneMutation,
       variables: {
         input: {
           iid: String(activeIssue.iid),
@@ -416,7 +416,7 @@ export default {
   setActiveIssueLabels: async ({ commit, getters }, input) => {
     const { activeIssue } = getters;
     const { data } = await gqlClient.mutate({
-      mutation: issueSetLabels,
+      mutation: issueSetLabelsMutation,
       variables: {
         input: {
           iid: String(activeIssue.iid),
@@ -441,7 +441,7 @@ export default {
   setActiveIssueDueDate: async ({ commit, getters }, input) => {
     const { activeIssue } = getters;
     const { data } = await gqlClient.mutate({
-      mutation: issueSetDueDate,
+      mutation: issueSetDueDateMutation,
       variables: {
         input: {
           iid: String(activeIssue.iid),

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

@@ -22,7 +22,7 @@ import ListLabel from '../models/label';
 import ListAssignee from '../models/assignee';
 import ListMilestone from '../models/milestone';
 
-import createBoardMutation from '../queries/board.mutation.graphql';
+import createBoardMutation from '../graphql/board.mutation.graphql';
 
 const PER_PAGE = 20;
 export const gqlClient = createDefaultClient();

app/assets/javascripts/sidebar/components/labels/sidebar_labels.vue

 <script>
 import $ from 'jquery';
 import { camelCase, difference, union } from 'lodash';
-import updateIssueLabelsMutation from '~/boards/queries/issue_set_labels.mutation.graphql';
+import updateIssueLabelsMutation from '~/boards/graphql/issue_set_labels.mutation.graphql';
 import createFlash from '~/flash';
 import { IssuableType } from '~/issue_show/constants';
 import { __ } from '~/locale';

ee/app/assets/javascripts/boards/queries/board_list.fragment.graphql → ee/app/assets/javascripts/boards/graphql/board_list.fragment.graphql

-#import "~/boards/queries/board_list_shared.fragment.graphql"
+#import "~/boards/graphql/board_list_shared.fragment.graphql"
 
 fragment BoardListFragment on BoardList {
   ...BoardListShared

ee/app/assets/javascripts/boards/queries/board_lists.query.graphql → ee/app/assets/javascripts/boards/graphql/board_lists.query.graphql

-#import "ee_else_ce/boards/queries/board_list.fragment.graphql"
+#import "ee_else_ce/boards/graphql/board_list.fragment.graphql"
 
 query ListIssues(
   $fullPath: ID!

ee/app/assets/javascripts/boards/queries/epics_swimlanes.query.graphql → ee/app/assets/javascripts/boards/graphql/epics_swimlanes.query.graphql

-#import "ee_else_ce/boards/queries/board_list.fragment.graphql"
+#import "ee_else_ce/boards/graphql/board_list.fragment.graphql"
 #import "./board_epic.fragment.graphql"
 
 query BoardEE(

ee/app/assets/javascripts/boards/queries/issue_move_list.mutation.graphql → ee/app/assets/javascripts/boards/graphql/issue_move_list.mutation.graphql

-#import "ee_else_ce/boards/queries/issue.fragment.graphql"
+#import "ee_else_ce/boards/graphql/issue.fragment.graphql"
 
 mutation IssueMoveList(
   $projectPath: ID!

ee/app/assets/javascripts/boards/queries/list_update_limit_metrics.mutation.graphql → ee/app/assets/javascripts/boards/graphql/list_update_limit_metrics.mutation.graphql

-#import "ee_else_ce/boards/queries/board_list.fragment.graphql"
+#import "ee_else_ce/boards/graphql/board_list.fragment.graphql"
 
 mutation boardListUpdateLimitMetrics($input: BoardListUpdateLimitMetricsInput!) {
   boardListUpdateLimitMetrics(input: $input) {

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

@@ -22,13 +22,13 @@ import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import eventHub from '~/boards/eventhub';
 
 import createGqClient, { fetchPolicies } from '~/lib/graphql';
-import epicsSwimlanesQuery from '../queries/epics_swimlanes.query.graphql';
-import issueSetEpic from '../queries/issue_set_epic.mutation.graphql';
-import issueSetWeight from '../queries/issue_set_weight.mutation.graphql';
-import listsIssuesQuery from '~/boards/queries/lists_issues.query.graphql';
-import issueMoveListMutation from '../queries/issue_move_list.mutation.graphql';
-import listUpdateLimitMetrics from '../queries/list_update_limit_metrics.mutation.graphql';
-import updateBoardEpicUserPreferencesMutation from '../queries/updateBoardEpicUserPreferences.mutation.graphql';
+import epicsSwimlanesQuery from '../graphql/epics_swimlanes.query.graphql';
+import issueSetEpicMutation from '../graphql/issue_set_epic.mutation.graphql';
+import issueSetWeightMutation from '../graphql/issue_set_weight.mutation.graphql';
+import listsIssuesQuery from '~/boards/graphql/lists_issues.query.graphql';
+import issueMoveListMutation from '../graphql/issue_move_list.mutation.graphql';
+import listUpdateLimitMetricsMutation from '../graphql/list_update_limit_metrics.mutation.graphql';
+import updateBoardEpicUserPreferencesMutation from '../graphql/updateBoardEpicUserPreferences.mutation.graphql';
 
 const notImplemented = () => {
   /* eslint-disable-next-line @gitlab/require-i18n-strings */
@@ -198,7 +198,7 @@ export default {
     if (getters.shouldUseGraphQL) {
       return gqlClient
         .mutate({
-          mutation: listUpdateLimitMetrics,
+          mutation: listUpdateLimitMetricsMutation,
           variables: {
             input: {
               listId,
@@ -339,7 +339,7 @@ export default {
 
   setActiveIssueEpic: async ({ getters }, input) => {
     const { data } = await gqlClient.mutate({
-      mutation: issueSetEpic,
+      mutation: issueSetEpicMutation,
       variables: {
         input: {
           iid: String(getters.activeIssue.iid),
@@ -358,7 +358,7 @@ export default {
 
   setActiveIssueWeight: async ({ commit, getters }, input) => {
     const { data } = await gqlClient.mutate({
-      mutation: issueSetWeight,
+      mutation: issueSetWeightMutation,
       variables: {
         input: {
           iid: String(getters.activeIssue.iid),

spec/frontend/boards/components/board_assignee_dropdown_spec.js

@@ -14,7 +14,7 @@ import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dro
 import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue';
 import store from '~/boards/stores';
 import getIssueParticipants from '~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql';
-import searchUsers from '~/boards/queries/users_search.query.graphql';
+import searchUsers from '~/boards/graphql/users_search.query.graphql';
 import { participants } from '../mock_data';
 
 const localVue = createLocalVue();

spec/frontend/boards/stores/actions_spec.js

@@ -14,8 +14,8 @@ import {
 import actions, { gqlClient } from '~/boards/stores/actions';
 import * as types from '~/boards/stores/mutation_types';
 import { inactiveId } from '~/boards/constants';
-import issueMoveListMutation from '~/boards/queries/issue_move_list.mutation.graphql';
-import destroyBoardListMutation from '~/boards/queries/board_list_destroy.mutation.graphql';
+import issueMoveListMutation from '~/boards/graphql/issue_move_list.mutation.graphql';
+import destroyBoardListMutation from '~/boards/graphql/board_list_destroy.mutation.graphql';
 import updateAssignees from '~/vue_shared/components/sidebar/queries/updateAssignees.mutation.graphql';
 import { fullBoardId, formatListIssues, formatBoardLists } from '~/boards/boards_util';
 

spec/frontend/sidebar/sidebar_labels_spec.js

@@ -3,7 +3,7 @@ import {
   mockLabels,
   mockRegularLabel,
 } from 'jest/vue_shared/components/sidebar/labels_select_vue/mock_data';
-import updateIssueLabelsMutation from '~/boards/queries/issue_set_labels.mutation.graphql';
+import updateIssueLabelsMutation from '~/boards/graphql/issue_set_labels.mutation.graphql';
 import { MutationOperationMode } from '~/graphql_shared/utils';
 import { IssuableType } from '~/issue_show/constants';
 import SidebarLabels from '~/sidebar/components/labels/sidebar_labels.vue';