From 6231004fe45276b53c827a7c65a268b077d6fa2d Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Fri, 1 Dec 2023 15:37:10 -0800
Subject: [PATCH] updated field mappings service; abort detector creation when
 mapping fails (#752) (#820)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 141965087c68ae711b40d81a7f23d3165a992f9c)

Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
---
 .../CreateDetector/containers/CreateDetector.tsx | 16 +++++++++++++++-
 public/services/FieldMappingService.ts           |  4 ++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/public/pages/CreateDetector/containers/CreateDetector.tsx b/public/pages/CreateDetector/containers/CreateDetector.tsx
index be04440da..64abbe10e 100644
--- a/public/pages/CreateDetector/containers/CreateDetector.tsx
+++ b/public/pages/CreateDetector/containers/CreateDetector.tsx
@@ -32,6 +32,7 @@ import { NotificationsStart } from 'opensearch-dashboards/public';
 import { getPlugins } from '../../../utils/helpers';
 import { Detector } from '../../../../types';
 import { DataStore } from '../../../store/DataStore';
+import { errorNotificationToast } from '../../../utils/helpers';
 
 interface CreateDetectorProps extends RouteComponentProps {
   isEdit: boolean;
@@ -106,7 +107,7 @@ export default class CreateDetector extends Component<CreateDetectorProps, Creat
     this.setState({ fieldMappings });
   };
 
-  onCreateClick = () => {
+  onCreateClick = async () => {
     const { creatingDetector, detector, fieldMappings } = this.state;
     if (creatingDetector) {
       return;
@@ -120,6 +121,19 @@ export default class CreateDetector extends Component<CreateDetectorProps, Creat
       fieldMappings
     );
 
+    const fieldMappingRes = await fieldsMappingPromise;
+
+    if (!fieldMappingRes.ok) {
+      errorNotificationToast(
+        this.props.notifications,
+        'create',
+        'detector',
+        'Invalid field mappings.'
+      );
+      this.setState({ creatingDetector: false });
+      return;
+    }
+
     const createDetectorPromise = this.props.services.detectorsService.createDetector(detector);
 
     // set detector pending state, this will be used in detector details page
diff --git a/public/services/FieldMappingService.ts b/public/services/FieldMappingService.ts
index 18431fed1..24c455a52 100644
--- a/public/services/FieldMappingService.ts
+++ b/public/services/FieldMappingService.ts
@@ -43,6 +43,10 @@ export default class FieldMappingService {
       properties: {},
     };
     fieldMappings.forEach((mapping) => {
+      if (mapping.ruleFieldName === mapping.indexFieldName) {
+        return;
+      }
+
       alias_mappings.properties[mapping.ruleFieldName] = {
         type: 'alias',
         path: mapping.indexFieldName,