Add latest changes from gitlab-org/gitlab@master

6 files changed, 9 insertions, 49 deletions

diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue
index f56dc05a5d2..bdf52da209e 100644
--- a/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue
+++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue
@@ -1,16 +1,16 @@
 <script>
+import createHttpIntegrationMutation from 'ee_else_ce/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql';
+import updateHttpIntegrationMutation from 'ee_else_ce/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql';
 import createFlash, { FLASH_TYPES } from '~/flash';
 import { fetchPolicies } from '~/lib/graphql';
 import { s__ } from '~/locale';
 import { typeSet } from '../constants';
-import createHttpIntegrationMutation from '../graphql/mutations/create_http_integration.mutation.graphql';
 import createPrometheusIntegrationMutation from '../graphql/mutations/create_prometheus_integration.mutation.graphql';
 import destroyHttpIntegrationMutation from '../graphql/mutations/destroy_http_integration.mutation.graphql';
 import resetHttpTokenMutation from '../graphql/mutations/reset_http_token.mutation.graphql';
 import resetPrometheusTokenMutation from '../graphql/mutations/reset_prometheus_token.mutation.graphql';
 import updateCurrentHttpIntegrationMutation from '../graphql/mutations/update_current_http_integration.mutation.graphql';
 import updateCurrentPrometheusIntegrationMutation from '../graphql/mutations/update_current_prometheus_integration.mutation.graphql';
-import updateHttpIntegrationMutation from '../graphql/mutations/update_http_integration.mutation.graphql';
 import updatePrometheusIntegrationMutation from '../graphql/mutations/update_prometheus_integration.mutation.graphql';
 import getCurrentIntegrationQuery from '../graphql/queries/get_current_integration.query.graphql';
 import getHttpIntegrationsQuery from '../graphql/queries/get_http_integrations.query.graphql';
diff --git a/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_item.fragment.graphql b/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_item.fragment.graphql
index 36446bbfe47..742228e2928 100644
--- a/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_item.fragment.graphql
+++ b/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_item.fragment.graphql
@@ -1,5 +1,5 @@
 #import "./integration_item.fragment.graphql"
-#import "./http_integration_payload_data.fragment.graphql"
+#import "ee_else_ce/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql"
 
 fragment HttpIntegrationItem on AlertManagementHttpIntegration {
   ...IntegrationItem
diff --git a/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql b/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql
index b7ea50ebc44..df6ad0b712d 100644
--- a/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql
+++ b/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql
@@ -1,14 +1,3 @@
 fragment HttpIntegrationPayloadData on AlertManagementHttpIntegration {
-  payloadExample
-  payloadAttributeMappings {
-    fieldName
-    path
-    type
-    label
-  }
-  payloadAlertFields {
-    path
-    type
-    label
-  }
+  id
 }
diff --git a/app/assets/javascripts/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql b/app/assets/javascripts/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql
index 0c7d7627b6a..babcdea935d 100644
--- a/app/assets/javascripts/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql
+++ b/app/assets/javascripts/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql
@@ -1,21 +1,7 @@
 #import "../fragments/http_integration_item.fragment.graphql"
 
-mutation createHttpIntegration(
-  $projectPath: ID!
-  $name: String!
-  $active: Boolean!
-  $payloadExample: JsonString
-  $payloadAttributeMappings: [AlertManagementPayloadAlertFieldInput!]
-) {
-  httpIntegrationCreate(
-    input: {
-      projectPath: $projectPath
-      name: $name
-      active: $active
-      payloadExample: $payloadExample
-      payloadAttributeMappings: $payloadAttributeMappings
-    }
-  ) {
+mutation createHttpIntegration($projectPath: ID!, $name: String!, $active: Boolean!) {
+  httpIntegrationCreate(input: { projectPath: $projectPath, name: $name, active: $active }) {
     errors
     integration {
       ...HttpIntegrationItem
diff --git a/app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql b/app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql
index 631937048c2..37df9ec25eb 100644
--- a/app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql
+++ b/app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql
@@ -1,21 +1,7 @@
 #import "../fragments/http_integration_item.fragment.graphql"
 
-mutation updateHttpIntegration(
-  $id: ID!
-  $name: String!
-  $active: Boolean!
-  $payloadExample: JsonString
-  $payloadAttributeMappings: [AlertManagementPayloadAlertFieldInput!]
-) {
-  httpIntegrationUpdate(
-    input: {
-      id: $id
-      name: $name
-      active: $active
-      payloadExample: $payloadExample
-      payloadAttributeMappings: $payloadAttributeMappings
-    }
-  ) {
+mutation updateHttpIntegration($id: ID!, $name: String!, $active: Boolean!) {
+  httpIntegrationUpdate(input: { id: $id, name: $name, active: $active }) {
     errors
     integration {
       ...HttpIntegrationItem
diff --git a/app/assets/javascripts/alerts_settings/graphql/queries/get_http_integrations.query.graphql b/app/assets/javascripts/alerts_settings/graphql/queries/get_http_integrations.query.graphql
index e50dd89347f..833a2d6c12f 100644
--- a/app/assets/javascripts/alerts_settings/graphql/queries/get_http_integrations.query.graphql
+++ b/app/assets/javascripts/alerts_settings/graphql/queries/get_http_integrations.query.graphql
@@ -1,11 +1,10 @@
-#import "../fragments/http_integration_payload_data.fragment.graphql"
+#import "ee_else_ce/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql"
 
 # TODO: this query need to accept http integration id to request a sepcific integration
 query getHttpIntegrations($projectPath: ID!) {
   project(fullPath: $projectPath) {
     alertManagementHttpIntegrations {
       nodes {
-        id
         ...HttpIntegrationPayloadData
       }
     }