Add latest changes from gitlab-org/gitlab@master

8 files changed, 5 insertions, 92 deletions

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 f287b425826..f49f0c52ce6 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 3083a85cbd9..d7c5aa26370 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/alert_note.fragment.graphql b/app/assets/javascripts/alert_management/graphql/fragments/alert_note.fragment.graphql
deleted file mode 100644
index 74b425717a0..00000000000
--- a/app/assets/javascripts/alert_management/graphql/fragments/alert_note.fragment.graphql
+++ /dev/null
@@ -1,17 +0,0 @@
-#import "~/graphql_shared/fragments/author.fragment.graphql"
-
-fragment AlertNote on Note {
-  id
-  author {
-    id
-    state
-    ...Author
-  }
-  body
-  bodyHtml
-  createdAt
-  discussion {
-    id
-  }
-  systemNoteIconName
-}
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 406dfe97ce0..9a9ae369519 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/fragments/list_item.fragment.graphql b/app/assets/javascripts/alert_management/graphql/fragments/list_item.fragment.graphql
deleted file mode 100644
index 62119177887..00000000000
--- a/app/assets/javascripts/alert_management/graphql/fragments/list_item.fragment.graphql
+++ /dev/null
@@ -1,17 +0,0 @@
-fragment AlertListItem on AlertManagementAlert {
-  iid
-  title
-  severity
-  status
-  startedAt
-  eventCount
-  issueIid
-  assignees {
-    nodes {
-      name
-      username
-      avatarUrl
-      webUrl
-    }
-  }
-}
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 5008bfa5e1b..63d952a4857 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/mutations/update_alert_status.mutation.graphql b/app/assets/javascripts/alert_management/graphql/mutations/update_alert_status.mutation.graphql
deleted file mode 100644
index ba1e607bc10..00000000000
--- a/app/assets/javascripts/alert_management/graphql/mutations/update_alert_status.mutation.graphql
+++ /dev/null
@@ -1,17 +0,0 @@
-#import "../fragments/alert_note.fragment.graphql"
-
-mutation updateAlertStatus($projectPath: ID!, $status: AlertManagementStatus!, $iid: String!) {
-  updateAlertStatus(input: { iid: $iid, status: $status, projectPath: $projectPath }) {
-    errors
-    alert {
-      iid
-      status
-      endedAt
-      notes {
-        nodes {
-          ...AlertNote
-        }
-      }
-    }
-  }
-}
diff --git a/app/assets/javascripts/alert_management/graphql/queries/get_alerts.query.graphql b/app/assets/javascripts/alert_management/graphql/queries/get_alerts.query.graphql
deleted file mode 100644
index bc7e51a2e90..00000000000
--- a/app/assets/javascripts/alert_management/graphql/queries/get_alerts.query.graphql
+++ /dev/null
@@ -1,36 +0,0 @@
-#import "../fragments/list_item.fragment.graphql"
-
-query getAlerts(
-  $projectPath: ID!
-  $statuses: [AlertManagementStatus!]
-  $sort: AlertManagementAlertSort
-  $firstPageSize: Int
-  $lastPageSize: Int
-  $prevPageCursor: String = ""
-  $nextPageCursor: String = ""
-  $searchTerm: String = ""
-  $assigneeUsername: String = ""
-) {
-  project(fullPath: $projectPath) {
-    alertManagementAlerts(
-      search: $searchTerm
-      assigneeUsername: $assigneeUsername
-      statuses: $statuses
-      sort: $sort
-      first: $firstPageSize
-      last: $lastPageSize
-      after: $nextPageCursor
-      before: $prevPageCursor
-    ) {
-      nodes {
-        ...AlertListItem
-      }
-      pageInfo {
-        hasNextPage
-        endCursor
-        hasPreviousPage
-        startCursor
-      }
-    }
-  }
-}