Merge branch 'nmezzopera-adjust-query-and-mutation-names' into 'master'

ContainerRegistry: adjust query and mutation names

See merge request gitlab-org/gitlab!49928

app/assets/javascripts/registry/explorer/graphql/queries/get_group_container_repositories.graphql → app/assets/javascripts/registry/explorer/graphql/queries/get_group_container_repositories.query.graphql

 #import "~/graphql_shared/fragments/pageInfo.fragment.graphql"
 #import "../fragments/container_repository.fragment.graphql"
 
-query getProjectContainerRepositories(
+query getGroupContainerRepositories(
   $fullPath: ID!
   $name: String
   $first: Int

app/assets/javascripts/registry/explorer/pages/details.vue

@@ -12,8 +12,8 @@ import TagsList from '../components/details_page/tags_list.vue';
 import TagsLoader from '../components/details_page/tags_loader.vue';
 import EmptyTagsState from '../components/details_page/empty_tags_state.vue';
 
-import getContainerRepositoryDetailsQuery from '../graphql/queries/get_container_repository_details.graphql';
-import deleteContainerRepositoryTagsMutation from '../graphql/mutations/delete_container_repository_tags.graphql';
+import getContainerRepositoryDetailsQuery from '../graphql/queries/get_container_repository_details.query.graphql';
+import deleteContainerRepositoryTagsMutation from '../graphql/mutations/delete_container_repository_tags.mutation.graphql';
 
 import {
   ALERT_SUCCESS_TAG,

app/assets/javascripts/registry/explorer/pages/list.vue

@@ -18,9 +18,9 @@ import RegistryHeader from '../components/list_page/registry_header.vue';
 import ImageList from '../components/list_page/image_list.vue';
 import CliCommands from '../components/list_page/cli_commands.vue';
 
-import getProjectContainerRepositories from '../graphql/queries/get_project_container_repositories.graphql';
-import getGroupContainerRepositories from '../graphql/queries/get_group_container_repositories.graphql';
-import deleteContainerRepository from '../graphql/mutations/delete_container_repository.graphql';
+import getProjectContainerRepositoriesQuery from '../graphql/queries/get_project_container_repositories.query.graphql';
+import getGroupContainerRepositoriesQuery from '../graphql/queries/get_group_container_repositories.query.graphql';
+import deleteContainerRepositoryMutation from '../graphql/mutations/delete_container_repository.mutation.graphql';
 
 import {
   DELETE_IMAGE_SUCCESS_MESSAGE,
@@ -111,8 +111,8 @@ export default {
     },
     graphQlQuery() {
       return this.config.isGroupPage
-        ? getGroupContainerRepositories
-        : getProjectContainerRepositories;
+        ? getGroupContainerRepositoriesQuery
+        : getProjectContainerRepositoriesQuery;
     },
     queryVariables() {
       return {
@@ -152,7 +152,7 @@ export default {
       this.mutationLoading = true;
       return this.$apollo
         .mutate({
-          mutation: deleteContainerRepository,
+          mutation: deleteContainerRepositoryMutation,
           variables: {
             id: this.itemToDelete.id,
           },

app/assets/javascripts/registry/settings/components/registry_settings_app.vue

 <script>
 import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui';
 import { isEqual, get, isEmpty } from 'lodash';
-import expirationPolicyQuery from '../graphql/queries/get_expiration_policy.graphql';
+import expirationPolicyQuery from '../graphql/queries/get_expiration_policy.query.graphql';
 import {
   FETCH_SETTINGS_ERROR_MESSAGE,
   UNAVAILABLE_FEATURE_TITLE,

app/assets/javascripts/registry/settings/components/settings_form.vue

@@ -20,7 +20,7 @@ import {
   EXPIRATION_POLICY_FOOTER_NOTE,
 } from '~/registry/settings/constants';
 import { formOptionsGenerator } from '~/registry/settings/utils';
-import updateContainerExpirationPolicyMutation from '~/registry/settings/graphql/mutations/update_container_expiration_policy.graphql';
+import updateContainerExpirationPolicyMutation from '~/registry/settings/graphql/mutations/update_container_expiration_policy.mutation.graphql';
 import { updateContainerExpirationPolicy } from '~/registry/settings/graphql/utils/cache_update';
 import ExpirationDropdown from './expiration_dropdown.vue';
 import ExpirationInput from './expiration_input.vue';

app/assets/javascripts/registry/settings/graphql/utils/cache_update.js

 import { produce } from 'immer';
-import expirationPolicyQuery from '../queries/get_expiration_policy.graphql';
+import expirationPolicyQuery from '../queries/get_expiration_policy.query.graphql';
 
 export const updateContainerExpirationPolicy = projectPath => (client, { data: updatedData }) => {
   const queryAndParams = {

spec/frontend/registry/explorer/pages/details_spec.js

@@ -12,8 +12,8 @@ import TagsLoader from '~/registry/explorer/components/details_page/tags_loader.
 import TagsList from '~/registry/explorer/components/details_page/tags_list.vue';
 import EmptyTagsState from '~/registry/explorer/components/details_page/empty_tags_state.vue';
 
-import getContainerRepositoryDetailsQuery from '~/registry/explorer/graphql/queries/get_container_repository_details.graphql';
-import deleteContainerRepositoryTagsMutation from '~/registry/explorer/graphql/mutations/delete_container_repository_tags.graphql';
+import getContainerRepositoryDetailsQuery from '~/registry/explorer/graphql/queries/get_container_repository_details.query.graphql';
+import deleteContainerRepositoryTagsMutation from '~/registry/explorer/graphql/mutations/delete_container_repository_tags.mutation.graphql';
 
 import {
   graphQLImageDetailsMock,

spec/frontend/registry/explorer/pages/list_spec.js

@@ -19,9 +19,9 @@ import {
   SEARCH_PLACEHOLDER_TEXT,
 } from '~/registry/explorer/constants';
 
-import getProjectContainerRepositories from '~/registry/explorer/graphql/queries/get_project_container_repositories.graphql';
-import getGroupContainerRepositories from '~/registry/explorer/graphql/queries/get_group_container_repositories.graphql';
-import deleteContainerRepository from '~/registry/explorer/graphql/mutations/delete_container_repository.graphql';
+import getProjectContainerRepositoriesQuery from '~/registry/explorer/graphql/queries/get_project_container_repositories.query.graphql';
+import getGroupContainerRepositoriesQuery from '~/registry/explorer/graphql/queries/get_group_container_repositories.query.graphql';
+import deleteContainerRepositoryMutation from '~/registry/explorer/graphql/mutations/delete_container_repository.mutation.graphql';
 
 import {
   graphQLImageListMock,
@@ -72,9 +72,9 @@ describe('List Page', () => {
     localVue.use(VueApollo);
 
     const requestHandlers = [
-      [getProjectContainerRepositories, resolver],
-      [getGroupContainerRepositories, groupResolver],
-      [deleteContainerRepository, mutationResolver],
+      [getProjectContainerRepositoriesQuery, resolver],
+      [getGroupContainerRepositoriesQuery, groupResolver],
+      [deleteContainerRepositoryMutation, mutationResolver],
     ];
 
     apolloProvider = createMockApollo(requestHandlers);

spec/frontend/registry/settings/components/registry_settings_app_spec.js

@@ -3,7 +3,7 @@ import VueApollo from 'vue-apollo';
 import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui';
 import createMockApollo from 'jest/helpers/mock_apollo_helper';
 import component from '~/registry/settings/components/registry_settings_app.vue';
-import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.graphql';
+import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.query.graphql';
 import SettingsForm from '~/registry/settings/components/settings_form.vue';
 import {
   FETCH_SETTINGS_ERROR_MESSAGE,

spec/frontend/registry/settings/components/settings_form_spec.js

@@ -4,8 +4,8 @@ import createMockApollo from 'jest/helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import Tracking from '~/tracking';
 import component from '~/registry/settings/components/settings_form.vue';
-import updateContainerExpirationPolicyMutation from '~/registry/settings/graphql/mutations/update_container_expiration_policy.graphql';
-import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.graphql';
+import updateContainerExpirationPolicyMutation from '~/registry/settings/graphql/mutations/update_container_expiration_policy.mutation.graphql';
+import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.query.graphql';
 import {
   UPDATE_SETTINGS_ERROR_MESSAGE,
   UPDATE_SETTINGS_SUCCESS_MESSAGE,

spec/frontend/registry/settings/graphql/cache_updated_spec.js

 import { updateContainerExpirationPolicy } from '~/registry/settings/graphql/utils/cache_update';
-import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.graphql';
+import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.query.graphql';
 
 describe('Registry settings cache update', () => {
   let client;