diff --git a/app/assets/javascripts/alert_management/components/alert_management_table.vue b/app/assets/javascripts/alert_management/components/alert_management_table.vue index f287b4258267ac0d3c0d09e0c3d0dbe3cdb9a9bc..f49f0c52ce60da07531ca07c579d896b4266c1d5 100644 --- a/app/assets/javascripts/alert_management/components/alert_management_table.vue +++ b/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, diff --git a/app/assets/javascripts/alert_management/components/alert_status.vue b/app/assets/javascripts/alert_management/components/alert_status.vue index 3083a85cbd96a75514cfafabe3fc2485a9fa1a64..d7c5aa26370e3738d46af44457ef7364127f6f22 100644 --- a/app/assets/javascripts/alert_management/components/alert_status.vue +++ b/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: { diff --git a/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql b/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql index 406dfe97ce0f91edcdbe3302cf7697fc97c51a75..9a9ae369519586739ee3f1ce466fa37ac3e9eab0 100644 --- a/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql +++ b/app/assets/javascripts/alert_management/graphql/fragments/detail_item.fragment.graphql @@ -1,5 +1,5 @@ -#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 diff --git a/app/assets/javascripts/alert_management/graphql/mutations/alert_set_assignees.mutation.graphql b/app/assets/javascripts/alert_management/graphql/mutations/alert_set_assignees.mutation.graphql index 5008bfa5e1b21b41f200c377f1cd02a5dfce8fc4..63d952a485721ffed0be17fac5bdbfb8a921c75a 100644 --- a/app/assets/javascripts/alert_management/graphql/mutations/alert_set_assignees.mutation.graphql +++ b/app/assets/javascripts/alert_management/graphql/mutations/alert_set_assignees.mutation.graphql @@ -1,4 +1,4 @@ -#import "../fragments/alert_note.fragment.graphql" +#import "~/graphql_shared/fragments/alert_note.fragment.graphql" mutation alertSetAssignees($projectPath: ID!, $assigneeUsernames: [String!]!, $iid: String!) { alertSetAssignees( diff --git a/app/assets/javascripts/alert_management/graphql/fragments/list_item.fragment.graphql b/app/assets/javascripts/graphql_shared/fragments/alert.fragment.graphql similarity index 100% rename from app/assets/javascripts/alert_management/graphql/fragments/list_item.fragment.graphql rename to app/assets/javascripts/graphql_shared/fragments/alert.fragment.graphql diff --git a/app/assets/javascripts/alert_management/graphql/fragments/alert_note.fragment.graphql b/app/assets/javascripts/graphql_shared/fragments/alert_note.fragment.graphql similarity index 100% rename from app/assets/javascripts/alert_management/graphql/fragments/alert_note.fragment.graphql rename to app/assets/javascripts/graphql_shared/fragments/alert_note.fragment.graphql diff --git a/app/assets/javascripts/alert_management/graphql/mutations/update_alert_status.mutation.graphql b/app/assets/javascripts/graphql_shared/mutations/update_alert_status.mutation.graphql similarity index 83% rename from app/assets/javascripts/alert_management/graphql/mutations/update_alert_status.mutation.graphql rename to app/assets/javascripts/graphql_shared/mutations/update_alert_status.mutation.graphql index ba1e607bc109dd111c649eae6461778e13107293..42dc388c9d18c013bd7dfb130970d12b8f89dca7 100644 --- a/app/assets/javascripts/alert_management/graphql/mutations/update_alert_status.mutation.graphql +++ b/app/assets/javascripts/graphql_shared/mutations/update_alert_status.mutation.graphql @@ -1,4 +1,4 @@ -#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 }) { diff --git a/app/assets/javascripts/alert_management/graphql/queries/get_alerts.query.graphql b/app/assets/javascripts/graphql_shared/queries/get_alerts.query.graphql similarity index 92% rename from app/assets/javascripts/alert_management/graphql/queries/get_alerts.query.graphql rename to app/assets/javascripts/graphql_shared/queries/get_alerts.query.graphql index bc7e51a2e90941acfaa2e6cb9eb416317f035992..e94758ef60e2293906fec4657c836419018c8729 100644 --- a/app/assets/javascripts/alert_management/graphql/queries/get_alerts.query.graphql +++ b/app/assets/javascripts/graphql_shared/queries/get_alerts.query.graphql @@ -1,4 +1,4 @@ -#import "../fragments/list_item.fragment.graphql" +#import "~/graphql_shared/fragments/alert.fragment.graphql" query getAlerts( $projectPath: ID! diff --git a/ee/app/assets/javascripts/threat_monitoring/components/alerts/alert_status.vue b/ee/app/assets/javascripts/threat_monitoring/components/alerts/alert_status.vue index 7349fe21370a3da12ac57d2d7203a4349e412ea0..ebb525d33e05b69f4884f2b465d6e4f9a46e45c3 100644 --- a/ee/app/assets/javascripts/threat_monitoring/components/alerts/alert_status.vue +++ b/ee/app/assets/javascripts/threat_monitoring/components/alerts/alert_status.vue @@ -1,7 +1,6 @@ <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 { diff --git a/ee/app/assets/javascripts/threat_monitoring/components/alerts/alerts_list.vue b/ee/app/assets/javascripts/threat_monitoring/components/alerts/alerts_list.vue index 9172ad8b02e3161caee95ab0ffae2cbaadef272a..fa2d1407d39c5245b5db110d673f2053ff150826 100644 --- a/ee/app/assets/javascripts/threat_monitoring/components/alerts/alerts_list.vue +++ b/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'; diff --git a/ee/spec/frontend/threat_monitoring/components/alerts/alert_status_spec.js b/ee/spec/frontend/threat_monitoring/components/alerts/alert_status_spec.js index 62bf7ce880c42414e65a02763f8ccd8bfcb0a279..6d2d3b9ce3022c090bb33894238be554e7c27daf 100644 --- a/ee/spec/frontend/threat_monitoring/components/alerts/alert_status_spec.js +++ b/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]; diff --git a/spec/frontend/alert_management/components/alert_status_spec.js b/spec/frontend/alert_management/components/alert_status_spec.js index f5916b8b26570951f895f6524a72982c59b2635c..6f2ddb8602085983fa72334a7825ad2b0a33e7fb 100644 --- a/spec/frontend/alert_management/components/alert_status_spec.js +++ b/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'; diff --git a/spec/frontend/alert_management/components/sidebar/alert_sidebar_status_spec.js b/spec/frontend/alert_management/components/sidebar/alert_sidebar_status_spec.js index bef4a341985cd321002acd7694855b08ec12b296..0b60a36cf54e86a78370bd517469b4bfb9460bec 100644 --- a/spec/frontend/alert_management/components/sidebar/alert_sidebar_status_spec.js +++ b/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';