From 21cb1cc580a2044cedc9a4818b5da66d66874236 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 15:16:23 -0800
Subject: [PATCH] Wait for field mapping creation to succeed before detector
 creation API call (#317) (#327)

* create detector if mapping creation succeeds

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated creation api call sequence

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

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

Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
---
 .../containers/CreateDetector.tsx             | 36 ++++++++++---------
 public/utils/validation.ts                    |  2 +-
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/public/pages/CreateDetector/containers/CreateDetector.tsx b/public/pages/CreateDetector/containers/CreateDetector.tsx
index 146165ffd..f3e49d939 100644
--- a/public/pages/CreateDetector/containers/CreateDetector.tsx
+++ b/public/pages/CreateDetector/containers/CreateDetector.tsx
@@ -116,26 +116,28 @@ export default class CreateDetector extends Component<CreateDetectorProps, Creat
         errorNotificationToast(
           this.props.notifications,
           'create',
-          'field mappings',
-          createMappingsRes.error
-        );
-      }
-
-      const createDetectorRes = await this.props.services.detectorsService.createDetector(detector);
-      if (createDetectorRes.ok) {
-        successNotificationToast(
-          this.props.notifications,
-          'created',
-          `detector, "${detector.name}"`
+          'detector',
+          'Double check the field mappings and try again.'
         );
-        this.props.history.push(`${ROUTES.DETECTOR_DETAILS}/${createDetectorRes.response._id}`);
       } else {
-        errorNotificationToast(
-          this.props.notifications,
-          'create',
-          'detector',
-          createDetectorRes.error
+        const createDetectorRes = await this.props.services.detectorsService.createDetector(
+          detector
         );
+        if (createDetectorRes.ok) {
+          successNotificationToast(
+            this.props.notifications,
+            'created',
+            `detector, "${detector.name}"`
+          );
+          this.props.history.push(`${ROUTES.DETECTOR_DETAILS}/${createDetectorRes.response._id}`);
+        } else {
+          errorNotificationToast(
+            this.props.notifications,
+            'create',
+            'detector',
+            createDetectorRes.error
+          );
+        }
       }
     } catch (error: any) {
       errorNotificationToast(this.props.notifications, 'create', 'detector', error);
diff --git a/public/utils/validation.ts b/public/utils/validation.ts
index b314d6fc8..f795f1e28 100644
--- a/public/utils/validation.ts
+++ b/public/utils/validation.ts
@@ -12,7 +12,7 @@ export const NAME_REGEX = new RegExp(/^[a-zA-Z0-9 _-]{5,50}$/);
 
 // This regex pattern support MIN to MAX character limit, capital and lowercase letters,
 // numbers 0-9, hyphens, spaces, and underscores.
-export const AUTHOR_REGEX = new RegExp(/^[a-zA-Z0-9 _,-]{5,50}$/);
+export const AUTHOR_REGEX = new RegExp(/^[a-zA-Z0-9 _,-.]{5,50}$/);
 
 /**
  * Validates a string against NAME_REGEX.