Merge branch 'cngo-extract-graphql-types-to-constants' into 'master'

Extract GraphQL string literal types to constants

See merge request gitlab-org/gitlab!65065

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

 <script>
 import { GlIcon, GlLink, GlPopover, GlLoadingIcon } from '@gitlab/ui';
 import { blockingIssuablesQueries, issuableTypes } from '~/boards/constants';
-import { IssueType } from '~/graphql_shared/constants';
+import { TYPE_ISSUE } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { truncate } from '~/lib/utils/text_utility';
 import { __, n__, s__, sprintf } from '~/locale';
@@ -13,7 +13,7 @@ export default {
     },
   },
   graphQLIdType: {
-    [issuableTypes.issue]: IssueType,
+    [issuableTypes.issue]: TYPE_ISSUE,
   },
   referenceFormatter: {
     [issuableTypes.issue]: (r) => r.split('/')[1],

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

@@ -2,6 +2,7 @@
 import { GlModal, GlAlert } from '@gitlab/ui';
 import { mapGetters, mapActions, mapState } from 'vuex';
 import ListLabel from '~/boards/models/label';
+import { TYPE_ITERATION, TYPE_MILESTONE, TYPE_USER } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { getParameterByName } from '~/lib/utils/common_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
@@ -188,21 +189,19 @@ export default {
           };
     },
     issueBoardScopeMutationVariables() {
-      /* eslint-disable @gitlab/require-i18n-strings */
       return {
         weight: this.board.weight,
         assigneeId: this.board.assignee?.id
-          ? convertToGraphQLId('User', this.board.assignee.id)
+          ? convertToGraphQLId(TYPE_USER, this.board.assignee.id)
           : null,
         milestoneId:
           this.board.milestone?.id || this.board.milestone?.id === 0
-            ? convertToGraphQLId('Milestone', this.board.milestone.id)
+            ? convertToGraphQLId(TYPE_MILESTONE, this.board.milestone.id)
             : null,
         iterationId: this.board.iteration_id
-          ? convertToGraphQLId('Iteration', this.board.iteration_id)
+          ? convertToGraphQLId(TYPE_ITERATION, this.board.iteration_id)
           : null,
       };
-      /* eslint-enable @gitlab/require-i18n-strings */
     },
     boardScopeMutationVariables() {
       return {

app/assets/javascripts/graphql_shared/constants.js

-/* eslint-disable @gitlab/require-i18n-strings */
-export const IssueType = 'Issue';
+export const TYPE_CI_RUNNER = 'Ci::Runner';
+export const TYPE_GROUP = 'Group';
+export const TYPE_ISSUE = 'Issue';
+export const TYPE_ITERATION = 'Iteration';
+export const TYPE_ITERATIONS_CADENCE = 'Iterations::Cadence';
+export const TYPE_MERGE_REQUEST = 'MergeRequest';
+export const TYPE_MILESTONE = 'Milestone';
+export const TYPE_SCANNER_PROFILE = 'DastScannerProfile';
+export const TYPE_SITE_PROFILE = 'DastSiteProfile';
+export const TYPE_USER = 'User';
+export const TYPE_VULNERABILITY = 'Vulnerability';

app/assets/javascripts/graphql_shared/utils.js

@@ -17,11 +17,6 @@ export const MutationOperationMode = {
   Replace: 'REPLACE',
 };
 
-/**
- * Possible GraphQL entity types.
- */
-export const TYPE_GROUP = 'Group';
-
 /**
  * Ids generated by GraphQL endpoints are usually in the format
  * gid://gitlab/Groups/123. This method takes a type and an id

app/assets/javascripts/issues_list/components/issues_list_app.vue

@@ -11,6 +11,7 @@ import {
 import fuzzaldrinPlus from 'fuzzaldrin-plus';
 import getIssuesQuery from 'ee_else_ce/issues_list/queries/get_issues.query.graphql';
 import createFlash from '~/flash';
+import { TYPE_USER } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import CsvImportExportButtons from '~/issuable/components/csv_import_export_buttons.vue';
 import IssuableByEmail from '~/issuable/components/issuable_by_email.vue';
@@ -268,7 +269,7 @@ export default {
 
       if (gon.current_user_id) {
         preloadedAuthors.push({
-          id: convertToGraphQLId('User', gon.current_user_id), // eslint-disable-line @gitlab/require-i18n-strings
+          id: convertToGraphQLId(TYPE_USER, gon.current_user_id),
           name: gon.current_user_fullname,
           username: gon.current_username,
           avatar_url: gon.current_user_avatar_url,

app/assets/javascripts/runner/constants.js

@@ -4,8 +4,6 @@ export const RUNNER_PAGE_SIZE = 20;
 
 export const I18N_DETAILS_TITLE = s__('Runners|Runner #%{runner_id}');
 
-export const RUNNER_ENTITY_TYPE = 'Ci::Runner';
-
 export const RUNNER_TAG_BADGE_VARIANT = 'info';
 export const RUNNER_TAG_BG_CLASS = 'gl-bg-blue-100';
 

app/assets/javascripts/runner/runner_details/runner_details_app.vue

 <script>
+import { TYPE_CI_RUNNER } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import RunnerTypeAlert from '../components/runner_type_alert.vue';
 import RunnerTypeBadge from '../components/runner_type_badge.vue';
 import RunnerUpdateForm from '../components/runner_update_form.vue';
-import { I18N_DETAILS_TITLE, RUNNER_ENTITY_TYPE } from '../constants';
+import { I18N_DETAILS_TITLE } from '../constants';
 import getRunnerQuery from '../graphql/get_runner.query.graphql';
 
 export default {
@@ -31,7 +32,7 @@ export default {
       query: getRunnerQuery,
       variables() {
         return {
-          id: convertToGraphQLId(RUNNER_ENTITY_TYPE, this.runnerId),
+          id: convertToGraphQLId(TYPE_CI_RUNNER, this.runnerId),
         };
       },
     },

app/assets/javascripts/sidebar/components/time_tracking/report.vue

 <script>
 import { GlLoadingIcon, GlTable } from '@gitlab/ui';
 import createFlash from '~/flash';
+import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { formatDate, parseSeconds, stringifyTime } from '~/lib/utils/datetime_utility';
 import { __ } from '~/locale';
@@ -52,8 +53,7 @@ export default {
       return this.issuableType === 'issue';
     },
     getGraphQLEntityType() {
-      // eslint-disable-next-line @gitlab/require-i18n-strings
-      return this.isIssue() ? 'Issue' : 'MergeRequest';
+      return this.isIssue() ? TYPE_ISSUE : TYPE_MERGE_REQUEST;
     },
     extractTimelogs(data) {
       const timelogs = data?.issuable?.timelogs?.nodes || [];

app/assets/javascripts/sidebar/services/sidebar_service.js

 import sidebarDetailsIssueQuery from 'ee_else_ce/sidebar/queries/sidebarDetails.query.graphql';
+import { TYPE_USER } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import createGqClient, { fetchPolicies } from '~/lib/graphql';
 import axios from '~/lib/utils/axios_utils';
@@ -88,7 +89,7 @@ export default class SidebarService {
     return gqClient.mutate({
       mutation: reviewerRereviewMutation,
       variables: {
-        userId: convertToGraphQLId('User', `${userId}`), // eslint-disable-line @gitlab/require-i18n-strings
+        userId: convertToGraphQLId(TYPE_USER, `${userId}`),
         projectPath: this.fullPath,
         iid: this.iid.toString(),
       },

ee/app/assets/javascripts/analytics/devops_report/devops_adoption/components/devops_adoption_add_dropdown.vue

@@ -7,7 +7,8 @@ import {
   GlTooltipDirective,
 } from '@gitlab/ui';
 import * as Sentry from '@sentry/browser';
-import { convertToGraphQLId, TYPE_GROUP } from '~/graphql_shared/utils';
+import { TYPE_GROUP } from '~/graphql_shared/constants';
+import { convertToGraphQLId } from '~/graphql_shared/utils';
 import {
   DEBOUNCE_DELAY,
   DEVOPS_ADOPTION_GROUP_DROPDOWN_TEXT,

ee/app/assets/javascripts/analytics/devops_report/devops_adoption/index.js

 import Vue from 'vue';
-import { convertToGraphQLId, TYPE_GROUP } from '~/graphql_shared/utils';
+import { TYPE_GROUP } from '~/graphql_shared/constants';
+import { convertToGraphQLId } from '~/graphql_shared/utils';
 import DevopsAdoptionApp from './components/devops_adoption_app.vue';
 import { createApolloProvider } from './graphql';
 

ee/app/assets/javascripts/iterations/components/iteration_cadence_form.vue

@@ -10,6 +10,7 @@ import {
   GlFormSelect,
   GlFormTextarea,
 } from '@gitlab/ui';
+import { TYPE_ITERATIONS_CADENCE } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { s__, __ } from '~/locale';
 import createCadence from '../queries/cadence_create.mutation.graphql';
@@ -130,7 +131,7 @@ export default {
     },
     variables() {
       const id = this.isEdit
-        ? convertToGraphQLId('Iterations::Cadence', this.cadenceId)
+        ? convertToGraphQLId(TYPE_ITERATIONS_CADENCE, this.cadenceId)
         : undefined;
       const groupPath = this.isEdit ? undefined : this.groupPath;
 

ee/app/assets/javascripts/iterations/components/iteration_report.vue

@@ -10,6 +10,7 @@ import {
   GlLoadingIcon,
 } from '@gitlab/ui';
 import BurnCharts from 'ee/burndown_chart/components/burn_charts.vue';
+import { TYPE_ITERATION } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { formatDate } from '~/lib/utils/datetime_utility';
 import { __ } from '~/locale';
@@ -39,15 +40,13 @@ export default {
   apollo: {
     iteration: {
       query,
-      /* eslint-disable @gitlab/require-i18n-strings */
       variables() {
         return {
           fullPath: this.fullPath,
-          id: convertToGraphQLId('Iteration', this.iterationId),
+          id: convertToGraphQLId(TYPE_ITERATION, this.iterationId),
           isGroup: this.namespaceType === Namespace.Group,
         };
       },
-      /* eslint-enable @gitlab/require-i18n-strings */
       update(data) {
         return data[this.namespaceType]?.iterations?.nodes[0] || {};
       },

ee/app/assets/javascripts/iterations/components/iteration_report_without_vue_router.vue

@@ -10,6 +10,7 @@ import {
   GlLoadingIcon,
 } from '@gitlab/ui';
 import BurnCharts from 'ee/burndown_chart/components/burn_charts.vue';
+import { TYPE_ITERATION } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { formatDate } from '~/lib/utils/datetime_utility';
 import { __ } from '~/locale';
@@ -46,15 +47,13 @@ export default {
   apollo: {
     iteration: {
       query,
-      /* eslint-disable @gitlab/require-i18n-strings */
       variables() {
         return {
           fullPath: this.fullPath,
-          id: convertToGraphQLId('Iteration', this.iterationId),
+          id: convertToGraphQLId(TYPE_ITERATION, this.iterationId),
           isGroup: this.namespaceType === Namespace.Group,
         };
       },
-      /* eslint-enable @gitlab/require-i18n-strings */
       update(data) {
         return data[this.namespaceType]?.iterations?.nodes[0] || {};
       },

ee/app/assets/javascripts/on_demand_scans/components/on_demand_scans_form.vue

@@ -17,6 +17,7 @@ import * as Sentry from '@sentry/browser';
 import { SCAN_TYPE } from 'ee/security_configuration/dast_scanner_profiles/constants';
 import { DAST_SITE_VALIDATION_STATUS } from 'ee/security_configuration/dast_site_validation/constants';
 import { initFormField } from 'ee/security_configuration/utils';
+import { TYPE_SCANNER_PROFILE, TYPE_SITE_PROFILE } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { serializeFormObject } from '~/lib/utils/forms';
 import { redirectTo, queryToObject } from '~/lib/utils/url_utility';
@@ -34,8 +35,6 @@ import {
   ERROR_MESSAGES,
   SCANNER_PROFILES_QUERY,
   SITE_PROFILES_QUERY,
-  TYPE_SITE_PROFILE,
-  TYPE_SCANNER_PROFILE,
 } from '../settings';
 import ScannerProfileSelector from './profile_selector/scanner_profile_selector.vue';
 import SiteProfileSelector from './profile_selector/site_profile_selector.vue';

ee/app/assets/javascripts/on_demand_scans/settings.js

@@ -27,6 +27,3 @@ export const SITE_PROFILES_QUERY = {
   fetchQuery: dastSiteProfilesQuery,
   fetchError: ERROR_FETCH_SITE_PROFILES,
 };
-
-export const TYPE_SITE_PROFILE = 'DastSiteProfile';
-export const TYPE_SCANNER_PROFILE = 'DastScannerProfile';

ee/app/assets/javascripts/vue_shared/security_reports/components/create_jira_issue.vue

 <script>
 import { GlButton } from '@gitlab/ui';
 import vulnerabilityExternalIssueLinkCreate from 'ee/vue_shared/security_reports/graphql/vulnerabilityExternalIssueLinkCreate.mutation.graphql';
+import { TYPE_VULNERABILITY } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import { s__ } from '~/locale';
 
@@ -33,18 +34,17 @@ export default {
     async createJiraIssue() {
       this.isLoading = true;
       try {
-        /* eslint-disable @gitlab/require-i18n-strings */
         const { data } = await this.$apollo.mutate({
           mutation: vulnerabilityExternalIssueLinkCreate,
           variables: {
             input: {
               externalTracker: 'JIRA',
               linkType: 'CREATED',
-              id: convertToGraphQLId('Vulnerability', this.vulnerabilityId),
+              id: convertToGraphQLId(TYPE_VULNERABILITY, this.vulnerabilityId),
             },
           },
         });
-        /* eslint-enable @gitlab/require-i18n-strings */
+
         const { errors } = data.vulnerabilityExternalIssueLinkCreate;
 
         if (errors.length > 0) {