Merge branch '287757-update-graphql-to-separate-alerts' into 'master'

Move shared alert graphql resources to shared

See merge request gitlab-org/gitlab!50011

app/assets/javascripts/alert_management/components/alert_management_table.vue

@@ -23,7 +23,7 @@ import {
 } from '~/vue_shared/components/paginated_table_with_search_and_tabs/constants';
 import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
 import { convertToSnakeCase } from '~/lib/utils/text_utility';
-import getAlerts from '../graphql/queries/get_alerts.query.graphql';
+import getAlerts from '~/graphql_shared/queries/get_alerts.query.graphql';
 import getAlertsCountByStatus from '../graphql/queries/get_count_by_status.query.graphql';
 import {
   ALERTS_STATUS_TABS,

app/assets/javascripts/alert_management/components/alert_status.vue

@@ -3,7 +3,7 @@ import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import { s__ } from '~/locale';
 import Tracking from '~/tracking';
 import { trackAlertStatusUpdateOptions } from '../constants';
-import updateAlertStatusMutation from '../graphql/mutations/update_alert_status.mutation.graphql';
+import updateAlertStatusMutation from '~/graphql_shared/mutations/update_alert_status.mutation.graphql';
 
 export default {
   i18n: {

app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql

-#import "./list_item.fragment.graphql"
-#import "./alert_note.fragment.graphql"
+#import "~/graphql_shared/fragments/alert.fragment.graphql"
+#import "~/graphql_shared/fragments/alert_note.fragment.graphql"
 
 fragment AlertDetailItem on AlertManagementAlert {
   ...AlertListItem

app/assets/javascripts/alert_management/graphql/mutations/alert_set_assignees.mutation.graphql

-#import "../fragments/alert_note.fragment.graphql"
+#import "~/graphql_shared/fragments/alert_note.fragment.graphql"
 
 mutation alertSetAssignees($projectPath: ID!, $assigneeUsernames: [String!]!, $iid: String!) {
   alertSetAssignees(

app/assets/javascripts/alert_management/graphql/mutations/update_alert_status.mutation.graphql → app/assets/javascripts/graphql_shared/mutations/update_alert_status.mutation.graphql

-#import "../fragments/alert_note.fragment.graphql"
+#import "~/graphql_shared/fragments/alert_note.fragment.graphql"
 
 mutation updateAlertStatus($projectPath: ID!, $status: AlertManagementStatus!, $iid: String!) {
   updateAlertStatus(input: { iid: $iid, status: $status, projectPath: $projectPath }) {

app/assets/javascripts/alert_management/graphql/queries/get_alerts.query.graphql → app/assets/javascripts/graphql_shared/queries/get_alerts.query.graphql

-#import "../fragments/list_item.fragment.graphql"
+#import "~/graphql_shared/fragments/alert.fragment.graphql"
 
 query getAlerts(
   $projectPath: ID!

ee/app/assets/javascripts/threat_monitoring/components/alerts/alert_status.vue

 <script>
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
-// TODO once backend is settled, update by either abstracting this out to app/assets/javascripts/graphql_shared or create new, modified query in #287757
-import updateAlertStatusMutation from '~/alert_management/graphql/mutations/update_alert_status.mutation.graphql';
+import updateAlertStatusMutation from '~/graphql_shared/mutations/update_alert_status.mutation.graphql';
 import { MESSAGES, STATUSES } from './constants';
 
 export default {

ee/app/assets/javascripts/threat_monitoring/components/alerts/alerts_list.vue

@@ -12,8 +12,7 @@ import {
 import produce from 'immer';
 import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
 import { convertToSnakeCase } from '~/lib/utils/text_utility';
-// TODO once backend is settled, update by either abstracting this out to app/assets/javascripts/graphql_shared or create new, modified query in #287757
-import getAlerts from '~/alert_management/graphql/queries/get_alerts.query.graphql';
+import getAlerts from '~/graphql_shared/queries/get_alerts.query.graphql';
 import { DEFAULT_FILTERS, FIELDS, MESSAGES, PAGE_SIZE, STATUSES } from './constants';
 import AlertFilters from './alert_filters.vue';
 import AlertStatus from './alert_status.vue';

ee/spec/frontend/threat_monitoring/components/alerts/alert_status_spec.js

@@ -2,7 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import waitForPromises from 'helpers/wait_for_promises';
 import AlertStatus from 'ee/threat_monitoring/components/alerts/alert_status.vue';
-import updateAlertStatusMutation from '~/alert_management/graphql/mutations/update_alert_status.mutation.graphql';
+import updateAlertStatusMutation from '~/graphql_shared/mutations/update_alert_status.mutation.graphql';
 import { mockAlerts } from '../../mock_data';
 
 const mockAlert = mockAlerts[0];

spec/frontend/alert_management/components/alert_status_spec.js

@@ -3,7 +3,7 @@ import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
 import waitForPromises from 'helpers/wait_for_promises';
 import { trackAlertStatusUpdateOptions } from '~/alert_management/constants';
 import AlertManagementStatus from '~/alert_management/components/alert_status.vue';
-import updateAlertStatusMutation from '~/alert_management/graphql/mutations/update_alert_status.mutation.graphql';
+import updateAlertStatusMutation from '~/graphql_shared/mutations/update_alert_status.mutation.graphql';
 import Tracking from '~/tracking';
 import mockAlerts from '../mocks/alerts.json';
 

spec/frontend/alert_management/components/sidebar/alert_sidebar_status_spec.js

@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils';
 import { GlDropdown, GlDropdownItem, GlLoadingIcon } from '@gitlab/ui';
 import { trackAlertStatusUpdateOptions } from '~/alert_management/constants';
 import AlertSidebarStatus from '~/alert_management/components/sidebar/sidebar_status.vue';
-import updateAlertStatusMutation from '~/alert_management/graphql/mutations/update_alert_status.mutation.graphql';
+import updateAlertStatusMutation from '~/graphql_shared/mutations/update_alert_status.mutation.graphql';
 import Tracking from '~/tracking';
 import mockAlerts from '../../mocks/alerts.json';