Wait for field mapping creation to succeed before detector creation A…

…PI call (opensearch-project#317) (opensearch-project#327) * create detector if mapping creation succeeds Signed-off-by: Amardeepsingh Siglani <[email protected]> * updated creation api call sequence Signed-off-by: Amardeepsingh Siglani <[email protected]> Signed-off-by: Amardeepsingh Siglani <[email protected]> (cherry picked from commit 7507594) Co-authored-by: Amardeepsingh Siglani <[email protected]> Signed-off-by: AWSHurneyt <[email protected]>
AWSHurneyt · Feb 22, 2023 · 21cb1cc · 21cb1cc
1 parent 06ecea5
commit 21cb1cc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git 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
@@ -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.