Merge branch 'tr-fix-foss-alert-setting-payload-integration-error' into 'master'

[RUN AS-IF-FOSS] Fix alert settings errors in FOSS

See merge request gitlab-org/gitlab!55016

app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue

 <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';

app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_item.fragment.graphql

 #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

app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql

 fragment HttpIntegrationPayloadData on AlertManagementHttpIntegration {
-  payloadExample
-  payloadAttributeMappings {
-    fieldName
-    path
-    type
-    label
-  }
-  payloadAlertFields {
-    path
-    type
-    label
-  }
+  id
 }

app/assets/javascripts/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql

 #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

app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql

 #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

app/assets/javascripts/alerts_settings/graphql/queries/get_http_integrations.query.graphql

-#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
       }
     }

ee/app/assets/javascripts/alerts_settings/graphql/fragments/http_integration_payload_data.fragment.graphql

+fragment HttpIntegrationPayloadData on AlertManagementHttpIntegration {
+  id
+  payloadExample
+  payloadAttributeMappings {
+    fieldName
+    path
+    type
+    label
+  }
+  payloadAlertFields {
+    path
+    type
+    label
+  }
+}

ee/app/assets/javascripts/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql

+#import "~/alerts_settings/graphql/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
+    }
+  ) {
+    errors
+    integration {
+      ...HttpIntegrationItem
+    }
+  }
+}

ee/app/assets/javascripts/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql

+#import "~/alerts_settings/graphql/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
+    }
+  ) {
+    errors
+    integration {
+      ...HttpIntegrationItem
+    }
+  }
+}

spec/features/projects/settings/operations_settings_spec.rb

@@ -89,7 +89,7 @@ RSpec.describe 'Projects > Settings > For a forked project', :js do
           )
         end
 
-        it 'successfully fills and submits the form', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/322666' do
+        it 'successfully fills and submits the form' do
           visit project_settings_operations_path(project)
 
           wait_for_requests
@@ -152,7 +152,7 @@ RSpec.describe 'Projects > Settings > For a forked project', :js do
     end
 
     context 'grafana integration settings form' do
-      it 'successfully fills and completes the form', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/322666' do
+      it 'successfully fills and completes the form' do
         visit project_settings_operations_path(project)
 
         wait_for_requests

spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js

@@ -2,6 +2,8 @@ import { GlLoadingIcon } from '@gitlab/ui';
 import { mount, createLocalVue } from '@vue/test-utils';
 import AxiosMockAdapter from 'axios-mock-adapter';
 import VueApollo from 'vue-apollo';
+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 createMockApollo from 'helpers/mock_apollo_helper';
 import { useMockIntersectionObserver } from 'helpers/mock_dom_observer';
 import waitForPromises from 'helpers/wait_for_promises';
@@ -9,14 +11,12 @@ import IntegrationsList from '~/alerts_settings/components/alerts_integrations_l
 import AlertsSettingsForm from '~/alerts_settings/components/alerts_settings_form.vue';
 import AlertsSettingsWrapper from '~/alerts_settings/components/alerts_settings_wrapper.vue';
 import { typeSet } from '~/alerts_settings/constants';
-import createHttpIntegrationMutation from '~/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql';
 import createPrometheusIntegrationMutation from '~/alerts_settings/graphql/mutations/create_prometheus_integration.mutation.graphql';
 import destroyHttpIntegrationMutation from '~/alerts_settings/graphql/mutations/destroy_http_integration.mutation.graphql';
 import resetHttpTokenMutation from '~/alerts_settings/graphql/mutations/reset_http_token.mutation.graphql';
 import resetPrometheusTokenMutation from '~/alerts_settings/graphql/mutations/reset_prometheus_token.mutation.graphql';
 import updateCurrentHttpIntegrationMutation from '~/alerts_settings/graphql/mutations/update_current_http_integration.mutation.graphql';
 import updateCurrentPrometheusIntegrationMutation from '~/alerts_settings/graphql/mutations/update_current_prometheus_integration.mutation.graphql';
-import updateHttpIntegrationMutation from '~/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql';
 import updatePrometheusIntegrationMutation from '~/alerts_settings/graphql/mutations/update_prometheus_integration.mutation.graphql';
 import getIntegrationsQuery from '~/alerts_settings/graphql/queries/get_integrations.query.graphql';
 import {