Add latest changes from gitlab-org/gitlab@master

6 files changed, 16 insertions, 16 deletions

diff --git a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue
index f6474efcc1f..5400f6657a5 100644
--- a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue
+++ b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue
@@ -64,9 +64,9 @@ export default {
   },
   computed: {
     mappingData() {
-      return this.gitlabFields.map(gitlabField => {
+      return this.gitlabFields.map((gitlabField) => {
         const mappingFields = this.payloadFields.filter(({ type }) =>
-          type.some(t => gitlabField.compatibleTypes.includes(t)),
+          type.some((t) => gitlabField.compatibleTypes.includes(t)),
         );
 
         const foundMapping = this.mapping.find(
@@ -88,26 +88,26 @@ export default {
   },
   methods: {
     setMapping(gitlabKey, mappingKey, valueKey) {
-      const fieldIndex = this.gitlabFields.findIndex(field => field.name === gitlabKey);
+      const fieldIndex = this.gitlabFields.findIndex((field) => field.name === gitlabKey);
       const updatedField = { ...this.gitlabFields[fieldIndex], ...{ [valueKey]: mappingKey } };
       Vue.set(this.gitlabFields, fieldIndex, updatedField);
     },
     setSearchTerm(search = '', searchFieldKey, gitlabKey) {
-      const fieldIndex = this.gitlabFields.findIndex(field => field.name === gitlabKey);
+      const fieldIndex = this.gitlabFields.findIndex((field) => field.name === gitlabKey);
       const updatedField = { ...this.gitlabFields[fieldIndex], ...{ [searchFieldKey]: search } };
       Vue.set(this.gitlabFields, fieldIndex, updatedField);
     },
     filterFields(searchTerm = '', fields) {
       const search = searchTerm.toLowerCase();
 
-      return fields.filter(field => field.label.toLowerCase().includes(search));
+      return fields.filter((field) => field.label.toLowerCase().includes(search));
     },
     isSelected(fieldValue, mapping) {
       return fieldValue === mapping;
     },
     selectedValue(name) {
       return (
-        this.payloadFields.find(item => item.name === name)?.label ||
+        this.payloadFields.find((item) => item.name === name)?.label ||
         this.$options.i18n.makeSelection
       );
     },
diff --git a/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue b/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue
index cf16750dbf8..6cfb4601192 100644
--- a/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue
+++ b/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue
@@ -97,8 +97,8 @@ export default {
     };
   },
   mounted() {
-    const callback = entries => {
-      const isVisible = entries.some(entry => entry.isIntersecting);
+    const callback = (entries) => {
+      const isVisible = entries.some((entry) => entry.isIntersecting);
 
       if (isVisible) {
         this.trackPageViews();
diff --git a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
index b2be563522a..c8742be9985 100644
--- a/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
+++ b/app/assets/javascripts/alerts_settings/components/alerts_settings_form.vue
@@ -197,7 +197,7 @@ export default {
       return options;
     },
     options() {
-      return integrationTypesNew.map(el => ({
+      return integrationTypesNew.map((el) => ({
         ...el,
         disabled: this.disabledIntegrations.includes(el.value),
       }));
@@ -390,10 +390,10 @@ export default {
       // TODO: replace with real BE mutation when ready;
       this.parsingPayload = true;
 
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         setTimeout(() => resolve(mockedCustomMapping), 1000);
       })
-        .then(res => {
+        .then((res) => {
           const mapping = { ...res };
           delete mapping.storedMapping;
           this.customMapping = res;
@@ -408,7 +408,7 @@ export default {
     },
     getIntegrationMapping() {
       // TODO: replace with real BE mutation when ready;
-      return Promise.resolve(mockedCustomMapping).then(res => {
+      return Promise.resolve(mockedCustomMapping).then((res) => {
         this.customMapping = res;
         this.integrationTestPayload.json = res?.samplePayload.body;
       });
diff --git a/app/assets/javascripts/alerts_settings/graphql.js b/app/assets/javascripts/alerts_settings/graphql.js
index 02c2def87fa..3dbfa69a8e9 100644
--- a/app/assets/javascripts/alerts_settings/graphql.js
+++ b/app/assets/javascripts/alerts_settings/graphql.js
@@ -14,7 +14,7 @@ const resolvers = {
       { cache },
     ) => {
       const sourceData = cache.readQuery({ query: getCurrentIntegrationQuery });
-      const data = produce(sourceData, draftData => {
+      const data = produce(sourceData, (draftData) => {
         if (id === null) {
           // eslint-disable-next-line no-param-reassign
           draftData.currentIntegration = null;
diff --git a/app/assets/javascripts/alerts_settings/index.js b/app/assets/javascripts/alerts_settings/index.js
index 41b19a675c5..73d132ce335 100644
--- a/app/assets/javascripts/alerts_settings/index.js
+++ b/app/assets/javascripts/alerts_settings/index.js
@@ -11,7 +11,7 @@ apolloProvider.clients.defaultClient.cache.writeData({
 });
 Vue.use(GlToast);
 
-export default el => {
+export default (el) => {
   if (!el) {
     return null;
   }
diff --git a/app/assets/javascripts/alerts_settings/utils/cache_updates.js b/app/assets/javascripts/alerts_settings/utils/cache_updates.js
index 18054b29fe9..758f3eb6dd4 100644
--- a/app/assets/javascripts/alerts_settings/utils/cache_updates.js
+++ b/app/assets/javascripts/alerts_settings/utils/cache_updates.js
@@ -14,7 +14,7 @@ const deleteIntegrationFromStore = (store, query, { httpIntegrationDestroy }, va
     variables,
   });
 
-  const data = produce(sourceData, draftData => {
+  const data = produce(sourceData, (draftData) => {
     // eslint-disable-next-line no-param-reassign
     draftData.project.alertManagementIntegrations.nodes = draftData.project.alertManagementIntegrations.nodes.filter(
       ({ id }) => id !== integration.id,
@@ -45,7 +45,7 @@ const addIntegrationToStore = (
     variables,
   });
 
-  const data = produce(sourceData, draftData => {
+  const data = produce(sourceData, (draftData) => {
     // eslint-disable-next-line no-param-reassign
     draftData.project.alertManagementIntegrations.nodes = [
       integration,