Merge branch '339525-rename-graph-queries' into 'master'

Reorganize the runners graphql directory

See merge request gitlab-org/gitlab!81435

app/assets/javascripts/runner/admin_runner_edit/admin_runner_edit_app.vue

@@ -5,7 +5,7 @@ import { convertToGraphQLId } from '~/graphql_shared/utils';
 import RunnerHeader from '../components/runner_header.vue';
 import RunnerUpdateForm from '../components/runner_update_form.vue';
 import { I18N_FETCH_ERROR } from '../constants';
-import getRunnerQuery from '../graphql/get_runner.query.graphql';
+import runnerQuery from '../graphql/details/runner.query.graphql';
 import { captureException } from '../sentry_utils';
 
 export default {
@@ -27,7 +27,7 @@ export default {
   },
   apollo: {
     runner: {
-      query: getRunnerQuery,
+      query: runnerQuery,
       variables() {
         return {
           id: convertToGraphQLId(TYPE_CI_RUNNER, this.runnerId),

app/assets/javascripts/runner/admin_runner_show/admin_runner_show_app.vue

@@ -8,7 +8,7 @@ import RunnerPauseButton from '../components/runner_pause_button.vue';
 import RunnerHeader from '../components/runner_header.vue';
 import RunnerDetails from '../components/runner_details.vue';
 import { I18N_FETCH_ERROR } from '../constants';
-import getRunnerQuery from '../graphql/get_runner.query.graphql';
+import runnerQuery from '../graphql/details/runner.query.graphql';
 import { captureException } from '../sentry_utils';
 
 export default {
@@ -35,7 +35,7 @@ export default {
   },
   apollo: {
     runner: {
-      query: getRunnerQuery,
+      query: runnerQuery,
       variables() {
         return {
           id: convertToGraphQLId(TYPE_CI_RUNNER, this.runnerId),

app/assets/javascripts/runner/admin_runners/admin_runners_app.vue

@@ -26,8 +26,8 @@ import {
   STATUS_STALE,
   I18N_FETCH_ERROR,
 } from '../constants';
-import getRunnersQuery from '../graphql/get_runners.query.graphql';
-import getRunnersCountQuery from '../graphql/get_runners_count.query.graphql';
+import runnersAdminQuery from '../graphql/list/admin_runners.query.graphql';
+import runnersAdminCountQuery from '../graphql/list/admin_runners_count.query.graphql';
 import {
   fromUrlQueryToSearch,
   fromSearchToUrl,
@@ -36,7 +36,7 @@ import {
 import { captureException } from '../sentry_utils';
 
 const runnersCountSmartQuery = {
-  query: getRunnersCountQuery,
+  query: runnersAdminCountQuery,
   fetchPolicy: fetchPolicies.CACHE_AND_NETWORK,
   update(data) {
     return data?.runners?.count;
@@ -77,7 +77,7 @@ export default {
   },
   apollo: {
     runners: {
-      query: getRunnersQuery,
+      query: runnersAdminQuery,
       // Runners can be updated by users directly in this list.
       // A "cache and network" policy prevents outdated filtered
       // results.

app/assets/javascripts/runner/components/registration/registration_token_reset_dropdown_item.vue

@@ -4,7 +4,7 @@ import { createAlert } from '~/flash';
 import { TYPE_GROUP, TYPE_PROJECT } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { __, s__ } from '~/locale';
-import runnersRegistrationTokenResetMutation from '~/runner/graphql/runners_registration_token_reset.mutation.graphql';
+import runnersRegistrationTokenResetMutation from '~/runner/graphql/list/runners_registration_token_reset.mutation.graphql';
 import { captureException } from '~/runner/sentry_utils';
 import { INSTANCE_TYPE, GROUP_TYPE, PROJECT_TYPE } from '../../constants';
 

app/assets/javascripts/runner/components/runner_delete_button.vue

 <script>
 import { GlButton, GlModalDirective, GlTooltipDirective } from '@gitlab/ui';
-import runnerDeleteMutation from '~/runner/graphql/runner_delete.mutation.graphql';
+import runnerDeleteMutation from '~/runner/graphql/shared/runner_delete.mutation.graphql';
 import { createAlert } from '~/flash';
 import { s__, sprintf } from '~/locale';
 import { captureException } from '~/runner/sentry_utils';

app/assets/javascripts/runner/components/runner_jobs.vue

 <script>
 import { GlSkeletonLoading } from '@gitlab/ui';
 import { createAlert } from '~/flash';
-import getRunnerJobsQuery from '../graphql/get_runner_jobs.query.graphql';
+import runnerJobsQuery from '../graphql/details/runner_jobs.query.graphql';
 import { I18N_FETCH_ERROR, I18N_NO_JOBS_FOUND, RUNNER_DETAILS_JOBS_PAGE_SIZE } from '../constants';
 import { captureException } from '../sentry_utils';
 import { getPaginationVariables } from '../utils';
@@ -34,7 +34,7 @@ export default {
   },
   apollo: {
     jobs: {
-      query: getRunnerJobsQuery,
+      query: runnerJobsQuery,
       variables() {
         return this.variables;
       },

app/assets/javascripts/runner/components/runner_pause_button.vue

 <script>
 import { GlButton, GlTooltipDirective } from '@gitlab/ui';
-import runnerToggleActiveMutation from '~/runner/graphql/runner_toggle_active.mutation.graphql';
+import runnerToggleActiveMutation from '~/runner/graphql/shared/runner_toggle_active.mutation.graphql';
 import { createAlert } from '~/flash';
 import { captureException } from '~/runner/sentry_utils';
 import { I18N_PAUSE, I18N_RESUME } from '../constants';

app/assets/javascripts/runner/components/runner_projects.vue

@@ -2,7 +2,7 @@
 import { GlSkeletonLoading } from '@gitlab/ui';
 import { sprintf, formatNumber } from '~/locale';
 import { createAlert } from '~/flash';
-import getRunnerProjectsQuery from '../graphql/get_runner_projects.query.graphql';
+import runnerProjectsQuery from '../graphql/details/runner_projects.query.graphql';
 import {
   I18N_ASSIGNED_PROJECTS,
   I18N_NONE,
@@ -41,7 +41,7 @@ export default {
   },
   apollo: {
     projects: {
-      query: getRunnerProjectsQuery,
+      query: runnerProjectsQuery,
       variables() {
         return this.variables;
       },

app/assets/javascripts/runner/components/runner_update_form.vue

@@ -15,7 +15,7 @@ import { createAlert, VARIANT_SUCCESS } from '~/flash';
 import { __ } from '~/locale';
 import { captureException } from '~/runner/sentry_utils';
 import { ACCESS_LEVEL_NOT_PROTECTED, ACCESS_LEVEL_REF_PROTECTED, PROJECT_TYPE } from '../constants';
-import runnerUpdateMutation from '../graphql/runner_update.mutation.graphql';
+import runnerUpdateMutation from '../graphql/details/runner_update.mutation.graphql';
 
 export default {
   name: 'RunnerUpdateForm',

app/assets/javascripts/runner/graphql/get_runner.query.graphql → app/assets/javascripts/runner/graphql/details/runner.query.graphql

-#import "ee_else_ce/runner/graphql/runner_details.fragment.graphql"
+#import "ee_else_ce/runner/graphql/details/runner_details.fragment.graphql"
 
 query getRunner($id: CiRunnerID!) {
   # We have an id in deeply nested fragment
   # eslint-disable-next-line @graphql-eslint/require-id-when-available
   runner(id: $id) {
-    __typename
     ...RunnerDetails
   }
 }

app/assets/javascripts/runner/graphql/runner_details_shared.fragment.graphql → app/assets/javascripts/runner/graphql/details/runner_details_shared.fragment.graphql

 fragment RunnerDetailsShared on CiRunner {
+  __typename
   id
   runnerType
   active
@@ -22,7 +23,7 @@ fragment RunnerDetailsShared on CiRunner {
   groups {
     # Only a single group can be loaded here, while projects
     # are loaded separately using the query with pagination
-    # parameters `get_runner_projects.query.graphql`.
+    # parameters `runner_projects.query.graphql`.
     nodes {
       id
       avatarUrl

app/assets/javascripts/runner/graphql/runner_update.mutation.graphql → app/assets/javascripts/runner/graphql/details/runner_update.mutation.graphql

-#import "ee_else_ce/runner/graphql/runner_details.fragment.graphql"
+#import "ee_else_ce/runner/graphql/details/runner_details.fragment.graphql"
 
 # Mutation for updates from the runner form, loads
 # attributes shown in the runner details.

app/assets/javascripts/runner/graphql/get_runners.query.graphql → app/assets/javascripts/runner/graphql/list/admin_runners.query.graphql

-#import "~/runner/graphql/runner_node.fragment.graphql"
+#import "~/runner/graphql/list/list_item.fragment.graphql"
 #import "~/graphql_shared/fragments/pageInfo.fragment.graphql"
 
 query getRunners(
@@ -24,7 +24,7 @@ query getRunners(
     sort: $sort
   ) {
     nodes {
-      ...RunnerNode
+      ...ListItem
       adminUrl
       editAdminUrl
     }

app/assets/javascripts/runner/graphql/get_group_runners.query.graphql → app/assets/javascripts/runner/graphql/list/group_runners.query.graphql

-#import "~/runner/graphql/runner_node.fragment.graphql"
+#import "~/runner/graphql/list/list_item.fragment.graphql"
 #import "~/graphql_shared/fragments/pageInfo.fragment.graphql"
 
 query getGroupRunners(
@@ -29,8 +29,7 @@ query getGroupRunners(
         webUrl
         editUrl
         node {
-          __typename
-          ...RunnerNode
+          ...ListItem
         }
       }
       pageInfo {

app/assets/javascripts/runner/graphql/runner_node.fragment.graphql → app/assets/javascripts/runner/graphql/list/list_item.fragment.graphql

-fragment RunnerNode on CiRunner {
+fragment ListItem on CiRunner {
   __typename
   id
   description

app/assets/javascripts/runner/group_runners/group_runners_app.vue

@@ -24,8 +24,8 @@ import {
   STATUS_OFFLINE,
   STATUS_STALE,
 } from '../constants';
-import getGroupRunnersQuery from '../graphql/get_group_runners.query.graphql';
-import getGroupRunnersCountQuery from '../graphql/get_group_runners_count.query.graphql';
+import groupRunnersQuery from '../graphql/list/group_runners.query.graphql';
+import groupRunnersCountQuery from '../graphql/list/group_runners_count.query.graphql';
 import {
   fromUrlQueryToSearch,
   fromSearchToUrl,
@@ -34,7 +34,7 @@ import {
 import { captureException } from '../sentry_utils';
 
 const runnersCountSmartQuery = {
-  query: getGroupRunnersCountQuery,
+  query: groupRunnersCountQuery,
   fetchPolicy: fetchPolicies.CACHE_AND_NETWORK,
   update(data) {
     return data?.group?.runners?.count;
@@ -84,7 +84,7 @@ export default {
   },
   apollo: {
     runners: {
-      query: getGroupRunnersQuery,
+      query: groupRunnersQuery,
       // Runners can be updated by users directly in this list.
       // A "cache and network" policy prevents outdated filtered
       // results.

ee/app/assets/javascripts/runner/graphql/runner_details.fragment.graphql → ee/app/assets/javascripts/runner/graphql/details/runner_details.fragment.graphql

-#import "~/runner/graphql/runner_details_shared.fragment.graphql"
+#import "~/runner/graphql/details/runner_details_shared.fragment.graphql"
 
 fragment RunnerDetails on CiRunner {
   ...RunnerDetailsShared

ee/spec/frontend/runner/components/runner_update_form_spec.js

@@ -8,7 +8,7 @@ import waitForPromises from 'helpers/wait_for_promises';
 import { runnerData } from 'jest/runner/mock_data';
 import { createAlert, VARIANT_SUCCESS } from '~/flash';
 import RunnerUpdateForm from '~/runner/components/runner_update_form.vue';
-import runnerUpdateMutation from '~/runner/graphql/runner_update.mutation.graphql';
+import runnerUpdateMutation from '~/runner/graphql/details/runner_update.mutation.graphql';
 
 jest.mock('~/flash');
 

spec/frontend/fixtures/runner.rb

@@ -33,19 +33,19 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     end
 
     describe GraphQL::Query, type: :request do
-      get_runners_query_name = 'get_runners.query.graphql'
+      admin_runners_query = 'list/admin_runners.query.graphql'
 
       let_it_be(:query) do
-        get_graphql_query_as_string("#{query_path}#{get_runners_query_name}")
+        get_graphql_query_as_string("#{query_path}#{admin_runners_query}")
       end
 
-      it "#{fixtures_path}#{get_runners_query_name}.json" do
+      it "#{fixtures_path}#{admin_runners_query}.json" do
         post_graphql(query, current_user: admin, variables: {})
 
         expect_graphql_errors_to_be_empty
       end
 
-      it "#{fixtures_path}#{get_runners_query_name}.paginated.json" do
+      it "#{fixtures_path}#{admin_runners_query}.paginated.json" do
         post_graphql(query, current_user: admin, variables: { first: 2 })
 
         expect_graphql_errors_to_be_empty
@@ -53,13 +53,13 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     end
 
     describe GraphQL::Query, type: :request do
-      get_runners_count_query_name = 'get_runners_count.query.graphql'
+      admin_runners_count_query = 'list/admin_runners_count.query.graphql'
 
       let_it_be(:query) do
-        get_graphql_query_as_string("#{query_path}#{get_runners_count_query_name}")
+        get_graphql_query_as_string("#{query_path}#{admin_runners_count_query}")
       end
 
-      it "#{fixtures_path}#{get_runners_count_query_name}.json" do
+      it "#{fixtures_path}#{admin_runners_count_query}.json" do
         post_graphql(query, current_user: admin, variables: {})
 
         expect_graphql_errors_to_be_empty
@@ -67,13 +67,13 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     end
 
     describe GraphQL::Query, type: :request do
-      get_runner_query_name = 'get_runner.query.graphql'
+      runner_query = 'details/runner.query.graphql'
 
       let_it_be(:query) do
-        get_graphql_query_as_string("#{query_path}#{get_runner_query_name}")
+        get_graphql_query_as_string("#{query_path}#{runner_query}")
       end
 
-      it "#{fixtures_path}#{get_runner_query_name}.json" do
+      it "#{fixtures_path}#{runner_query}.json" do
         post_graphql(query, current_user: admin, variables: {
           id: instance_runner.to_global_id.to_s
         })
@@ -81,7 +81,7 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
         expect_graphql_errors_to_be_empty
       end
 
-      it "#{fixtures_path}#{get_runner_query_name}.with_group.json" do
+      it "#{fixtures_path}#{runner_query}.with_group.json" do
         post_graphql(query, current_user: admin, variables: {
           id: group_runner.to_global_id.to_s
         })
@@ -91,13 +91,13 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     end
 
     describe GraphQL::Query, type: :request do
-      get_runner_projects_query_name = 'get_runner_projects.query.graphql'
+      runner_projects_query = 'details/runner_projects.query.graphql'
 
       let_it_be(:query) do
-        get_graphql_query_as_string("#{query_path}#{get_runner_projects_query_name}")
+        get_graphql_query_as_string("#{query_path}#{runner_projects_query}")
       end
 
-      it "#{fixtures_path}#{get_runner_projects_query_name}.json" do
+      it "#{fixtures_path}#{runner_projects_query}.json" do
         post_graphql(query, current_user: admin, variables: {
           id: project_runner.to_global_id.to_s
         })
@@ -107,13 +107,13 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     end
 
     describe GraphQL::Query, type: :request do
-      get_runner_jobs_query_name = 'get_runner_jobs.query.graphql'
+      runner_jobs_query = 'details/runner_jobs.query.graphql'
 
       let_it_be(:query) do
-        get_graphql_query_as_string("#{query_path}#{get_runner_jobs_query_name}")
+        get_graphql_query_as_string("#{query_path}#{runner_jobs_query}")
       end
 
-      it "#{fixtures_path}#{get_runner_jobs_query_name}.json" do
+      it "#{fixtures_path}#{runner_jobs_query}.json" do
         post_graphql(query, current_user: admin, variables: {
           id: instance_runner.to_global_id.to_s
         })
@@ -131,13 +131,13 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     end
 
     describe GraphQL::Query, type: :request do
-      get_group_runners_query_name = 'get_group_runners.query.graphql'
+      group_runners_query = 'list/group_runners.query.graphql'
 
       let_it_be(:query) do
-        get_graphql_query_as_string("#{query_path}#{get_group_runners_query_name}")
+        get_graphql_query_as_string("#{query_path}#{group_runners_query}")
       end
 
-      it "#{fixtures_path}#{get_group_runners_query_name}.json" do
+      it "#{fixtures_path}#{group_runners_query}.json" do
         post_graphql(query, current_user: group_owner, variables: {
           groupFullPath: group.full_path
         })
@@ -145,7 +145,7 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
         expect_graphql_errors_to_be_empty
       end
 
-      it "#{fixtures_path}#{get_group_runners_query_name}.paginated.json" do
+      it "#{fixtures_path}#{group_runners_query}.paginated.json" do
         post_graphql(query, current_user: group_owner, variables: {
           groupFullPath: group.full_path,
           first: 1
@@ -156,13 +156,13 @@ RSpec.describe 'Runner (JavaScript fixtures)' do
     end
 
     describe GraphQL::Query, type: :request do
-      get_group_runners_count_query_name = 'get_group_runners_count.query.graphql'
+      group_runners_count_query = 'list/group_runners_count.query.graphql'
 
       let_it_be(:query) do
-        get_graphql_query_as_string("#{query_path}#{get_group_runners_count_query_name}")
+        get_graphql_query_as_string("#{query_path}#{group_runners_count_query}")
       end
 
-      it "#{fixtures_path}#{get_group_runners_count_query_name}.json" do
+      it "#{fixtures_path}#{group_runners_count_query}.json" do
         post_graphql(query, current_user: group_owner, variables: {
           groupFullPath: group.full_path
         })

spec/frontend/runner/admin_runner_edit/admin_runner_edit_app_spec.js

@@ -7,7 +7,7 @@ import { createAlert } from '~/flash';
 
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import RunnerHeader from '~/runner/components/runner_header.vue';
-import getRunnerQuery from '~/runner/graphql/get_runner.query.graphql';
+import runnerQuery from '~/runner/graphql/details/runner.query.graphql';
 import AdminRunnerEditApp from '~//runner/admin_runner_edit/admin_runner_edit_app.vue';
 import { captureException } from '~/runner/sentry_utils';
 
@@ -29,7 +29,7 @@ describe('AdminRunnerEditApp', () => {
 
   const createComponentWithApollo = ({ props = {}, mountFn = shallowMount } = {}) => {
     wrapper = mountFn(AdminRunnerEditApp, {
-      apolloProvider: createMockApollo([[getRunnerQuery, mockRunnerQuery]]),
+      apolloProvider: createMockApollo([[runnerQuery, mockRunnerQuery]]),
       propsData: {
         runnerId: mockRunnerId,
         ...props,

spec/frontend/runner/admin_runner_show/admin_runner_show_app_spec.js

@@ -9,7 +9,7 @@ import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import RunnerHeader from '~/runner/components/runner_header.vue';
 import RunnerPauseButton from '~/runner/components/runner_pause_button.vue';
 import RunnerEditButton from '~/runner/components/runner_edit_button.vue';
-import getRunnerQuery from '~/runner/graphql/get_runner.query.graphql';
+import runnerQuery from '~/runner/graphql/details/runner.query.graphql';
 import AdminRunnerShowApp from '~/runner/admin_runner_show/admin_runner_show_app.vue';
 import { captureException } from '~/runner/sentry_utils';
 
@@ -42,7 +42,7 @@ describe('AdminRunnerShowApp', () => {
 
   const createComponent = ({ props = {}, mountFn = shallowMount } = {}) => {
     wrapper = mountFn(AdminRunnerShowApp, {
-      apolloProvider: createMockApollo([[getRunnerQuery, mockRunnerQuery]]),
+      apolloProvider: createMockApollo([[runnerQuery, mockRunnerQuery]]),
       propsData: {
         runnerId: mockRunnerId,
         ...props,

spec/frontend/runner/admin_runners/admin_runners_app_spec.js

@@ -35,8 +35,8 @@ import {
   STATUS_ACTIVE,
   RUNNER_PAGE_SIZE,
 } from '~/runner/constants';
-import getRunnersQuery from '~/runner/graphql/get_runners.query.graphql';
-import getRunnersCountQuery from '~/runner/graphql/get_runners_count.query.graphql';
+import adminRunnersQuery from '~/runner/graphql/list/admin_runners.query.graphql';
+import adminRunnersCountQuery from '~/runner/graphql/list/admin_runners_count.query.graphql';
 import { captureException } from '~/runner/sentry_utils';
 import FilteredSearch from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
 
@@ -71,8 +71,8 @@ describe('AdminRunnersApp', () => {
 
   const createComponent = ({ props = {}, mountFn = shallowMountExtended } = {}) => {
     const handlers = [
-      [getRunnersQuery, mockRunnersQuery],
-      [getRunnersCountQuery, mockRunnersCountQuery],
+      [adminRunnersQuery, mockRunnersQuery],
+      [adminRunnersCountQuery, mockRunnersCountQuery],
     ];
 
     wrapper = mountFn(AdminRunnersApp, {

spec/frontend/runner/components/registration/registration_token_reset_dropdown_item_spec.js

@@ -8,7 +8,7 @@ import waitForPromises from 'helpers/wait_for_promises';
 import { createAlert } from '~/flash';
 import RegistrationTokenResetDropdownItem from '~/runner/components/registration/registration_token_reset_dropdown_item.vue';
 import { INSTANCE_TYPE, GROUP_TYPE, PROJECT_TYPE } from '~/runner/constants';
-import runnersRegistrationTokenResetMutation from '~/runner/graphql/runners_registration_token_reset.mutation.graphql';
+import runnersRegistrationTokenResetMutation from '~/runner/graphql/list/runners_registration_token_reset.mutation.graphql';
 import { captureException } from '~/runner/sentry_utils';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 

spec/frontend/runner/components/runner_delete_button_spec.js

@@ -4,7 +4,7 @@ import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import { shallowMountExtended, mountExtended } from 'helpers/vue_test_utils_helper';
-import runnerDeleteMutation from '~/runner/graphql/runner_delete.mutation.graphql';
+import runnerDeleteMutation from '~/runner/graphql/shared/runner_delete.mutation.graphql';
 import waitForPromises from 'helpers/wait_for_promises';
 import { captureException } from '~/runner/sentry_utils';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';

spec/frontend/runner/components/runner_jobs_spec.js

@@ -11,7 +11,7 @@ import RunnerPagination from '~/runner/components/runner_pagination.vue';
 import { captureException } from '~/runner/sentry_utils';
 import { I18N_NO_JOBS_FOUND, RUNNER_DETAILS_JOBS_PAGE_SIZE } from '~/runner/constants';
 
-import getRunnerJobsQuery from '~/runner/graphql/get_runner_jobs.query.graphql';
+import runnerJobsQuery from '~/runner/graphql/details/runner_jobs.query.graphql';
 
 import { runnerData, runnerJobsData } from '../mock_data';
 
@@ -34,7 +34,7 @@ describe('RunnerJobs', () => {
 
   const createComponent = ({ mountFn = shallowMountExtended } = {}) => {
     wrapper = mountFn(RunnerJobs, {
-      apolloProvider: createMockApollo([[getRunnerJobsQuery, mockRunnerJobsQuery]]),
+      apolloProvider: createMockApollo([[runnerJobsQuery, mockRunnerJobsQuery]]),
       propsData: {
         runner: mockRunner,
       },

spec/frontend/runner/components/runner_pause_button_spec.js

@@ -4,7 +4,7 @@ import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import { shallowMountExtended, mountExtended } from 'helpers/vue_test_utils_helper';
-import runnerToggleActiveMutation from '~/runner/graphql/runner_toggle_active.mutation.graphql';
+import runnerToggleActiveMutation from '~/runner/graphql/shared/runner_toggle_active.mutation.graphql';
 import waitForPromises from 'helpers/wait_for_promises';
 import { captureException } from '~/runner/sentry_utils';
 import { createAlert } from '~/flash';

spec/frontend/runner/components/runner_projects_spec.js

@@ -16,7 +16,7 @@ import RunnerAssignedItem from '~/runner/components/runner_assigned_item.vue';
 import RunnerPagination from '~/runner/components/runner_pagination.vue';
 import { captureException } from '~/runner/sentry_utils';
 
-import getRunnerProjectsQuery from '~/runner/graphql/get_runner_projects.query.graphql';
+import runnerProjectsQuery from '~/runner/graphql/details/runner_projects.query.graphql';
 
 import { runnerData, runnerProjectsData } from '../mock_data';
 
@@ -40,7 +40,7 @@ describe('RunnerProjects', () => {
 
   const createComponent = ({ mountFn = shallowMountExtended } = {}) => {
     wrapper = mountFn(RunnerProjects, {
-      apolloProvider: createMockApollo([[getRunnerProjectsQuery, mockRunnerProjectsQuery]]),
+      apolloProvider: createMockApollo([[runnerProjectsQuery, mockRunnerProjectsQuery]]),
       propsData: {
         runner: mockRunner,
       },

spec/frontend/runner/components/runner_update_form_spec.js

@@ -13,7 +13,7 @@ import {
   ACCESS_LEVEL_REF_PROTECTED,
   ACCESS_LEVEL_NOT_PROTECTED,
 } from '~/runner/constants';
-import runnerUpdateMutation from '~/runner/graphql/runner_update.mutation.graphql';
+import runnerUpdateMutation from '~/runner/graphql/details/runner_update.mutation.graphql';
 import { captureException } from '~/runner/sentry_utils';
 import { runnerData } from '../mock_data';
 

spec/frontend/runner/group_runners/group_runners_app_spec.js

@@ -32,8 +32,8 @@ import {
   RUNNER_PAGE_SIZE,
   I18N_EDIT,
 } from '~/runner/constants';
-import getGroupRunnersQuery from '~/runner/graphql/get_group_runners.query.graphql';
-import getGroupRunnersCountQuery from '~/runner/graphql/get_group_runners_count.query.graphql';
+import getGroupRunnersQuery from '~/runner/graphql/list/group_runners.query.graphql';
+import getGroupRunnersCountQuery from '~/runner/graphql/list/group_runners_count.query.graphql';
 import GroupRunnersApp from '~/runner/group_runners/group_runners_app.vue';
 import { captureException } from '~/runner/sentry_utils';
 import FilteredSearch from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';

spec/frontend/runner/mock_data.js

 // Fixtures generated by: spec/frontend/fixtures/runner.rb
 
-// Admin queries
-import runnersData from 'test_fixtures/graphql/runner/get_runners.query.graphql.json';
-import runnersCountData from 'test_fixtures/graphql/runner/get_runners_count.query.graphql.json';
-import runnersDataPaginated from 'test_fixtures/graphql/runner/get_runners.query.graphql.paginated.json';
-import runnerData from 'test_fixtures/graphql/runner/get_runner.query.graphql.json';
-import runnerWithGroupData from 'test_fixtures/graphql/runner/get_runner.query.graphql.with_group.json';
-import runnerProjectsData from 'test_fixtures/graphql/runner/get_runner_projects.query.graphql.json';
-import runnerJobsData from 'test_fixtures/graphql/runner/get_runner_jobs.query.graphql.json';
+// List queries
+import runnersData from 'test_fixtures/graphql/runner/list/admin_runners.query.graphql.json';
+import runnersDataPaginated from 'test_fixtures/graphql/runner/list/admin_runners.query.graphql.paginated.json';
+import runnersCountData from 'test_fixtures/graphql/runner/list/admin_runners_count.query.graphql.json';
+import groupRunnersData from 'test_fixtures/graphql/runner/list/group_runners.query.graphql.json';
+import groupRunnersDataPaginated from 'test_fixtures/graphql/runner/list/group_runners.query.graphql.paginated.json';
+import groupRunnersCountData from 'test_fixtures/graphql/runner/list/group_runners_count.query.graphql.json';
 
-// Group queries
-import groupRunnersData from 'test_fixtures/graphql/runner/get_group_runners.query.graphql.json';
-import groupRunnersCountData from 'test_fixtures/graphql/runner/get_group_runners_count.query.graphql.json';
-import groupRunnersDataPaginated from 'test_fixtures/graphql/runner/get_group_runners.query.graphql.paginated.json';
+// Details queries
+import runnerData from 'test_fixtures/graphql/runner/details/runner.query.graphql.json';
+import runnerWithGroupData from 'test_fixtures/graphql/runner/details/runner.query.graphql.with_group.json';
+import runnerProjectsData from 'test_fixtures/graphql/runner/details/runner_projects.query.graphql.json';
+import runnerJobsData from 'test_fixtures/graphql/runner/details/runner_jobs.query.graphql.json';
 
 export {
   runnersData,