Merge pull request #51 from glific/feature/update-validations

Update validations for router components
glific · Sep 2, 2021 · 66f7beb · 66f7beb
2 parents 4900490 + 1bee533
commit 66f7beb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/src/components/flow/routers/expression/ExpressionRouterForm.tsx b/src/components/flow/routers/expression/ExpressionRouterForm.tsx
@@ -9,7 +9,7 @@ import { createResultNameInput } from 'components/flow/routers/widgets';
 import TextInputElement from 'components/form/textinput/TextInputElement';
 import TypeList from 'components/nodeeditor/TypeList';
 import { FormState, StringEntry } from 'store/nodeEditor';
-import { Alphanumeric, Required, StartIsNonNumeric, validate } from 'store/validators';
+import { LowerCaseAlphaNumeric, Required, StartIsNonNumeric, validate } from 'store/validators';
 import i18n from 'config/i18n';
 
 // TODO: Remove use of Function
@@ -45,7 +45,7 @@ export default class ExpressionRouterForm extends React.Component<
 
   private handleUpdateResultName(value: string): void {
     const resultName = validate(i18n.t('forms.result_name', 'Result Name'), value, [
-      Alphanumeric,
+      LowerCaseAlphaNumeric,
       StartIsNonNumeric
     ]);
     this.setState({

diff --git a/src/components/flow/routers/response/ResponseRouterForm.tsx b/src/components/flow/routers/response/ResponseRouterForm.tsx
@@ -9,7 +9,7 @@ import { createResultNameInput } from 'components/flow/routers/widgets';
 import TimeoutControl from 'components/form/timeout/TimeoutControl';
 import TypeList from 'components/nodeeditor/TypeList';
 import { FormState, StringEntry } from 'store/nodeEditor';
-import { Alphanumeric, StartIsNonNumeric, validate } from 'store/validators';
+import { LowerCaseAlphaNumeric, StartIsNonNumeric, validate } from 'store/validators';
 import { WAIT_LABEL } from 'components/flow/routers/constants';
 import i18n from 'config/i18n';
 
@@ -47,7 +47,7 @@ export default class ResponseRouterForm extends React.Component<
 
   private handleUpdateResultName(value: string): void {
     const resultName = validate(i18n.t('forms.result_name', 'Result Name'), value, [
-      Alphanumeric,
+      LowerCaseAlphaNumeric,
       StartIsNonNumeric
     ]);
     this.setState({

diff --git a/src/components/flow/routers/result/ResultRouterForm.tsx b/src/components/flow/routers/result/ResultRouterForm.tsx
@@ -10,7 +10,12 @@ import TypeList from 'components/nodeeditor/TypeList';
 import * as React from 'react';
 import { Asset } from 'store/flowContext';
 import { FormEntry, FormState, mergeForm, StringEntry } from 'store/nodeEditor';
-import { Alphanumeric, shouldRequireIf, StartIsNonNumeric, validate } from 'store/validators';
+import {
+  LowerCaseAlphaNumeric,
+  shouldRequireIf,
+  StartIsNonNumeric,
+  validate
+} from 'store/validators';
 
 import {
   DELIMITER_OPTIONS,
@@ -61,7 +66,7 @@ export default class ResultRouterForm extends React.Component<
 
   private handleUpdateResultName(value: string): void {
     const resultName = validate(i18n.t('forms.result_name', 'Result Name'), value, [
-      Alphanumeric,
+      LowerCaseAlphaNumeric,
       StartIsNonNumeric
     ]);
     this.setState({

diff --git a/src/components/flow/routers/webhook/WebhookRouterForm.tsx b/src/components/flow/routers/webhook/WebhookRouterForm.tsx
@@ -19,7 +19,7 @@ import TypeList from 'components/nodeeditor/TypeList';
 import * as React from 'react';
 import { FormEntry, FormState, mergeForm, StringEntry, ValidationFailure } from 'store/nodeEditor';
 import {
-  Alphanumeric,
+  LowerCaseAlphaNumeric,
   Required,
   shouldRequireIf,
   StartIsNonNumeric,
@@ -167,7 +167,7 @@ export default class WebhookRouterForm extends React.Component<
   private handleUpdateResultName(value: string): void {
     const resultName = validate(i18n.t('forms.result_name', 'Result Name'), value, [
       Required,
-      Alphanumeric,
+      LowerCaseAlphaNumeric,
       StartIsNonNumeric
     ]);
     this.setState({

diff --git a/src/store/validators.ts b/src/store/validators.ts
@@ -286,3 +286,7 @@ export const ValidURL = fromRegex(REGEX_URL, 'is not a valid URL');
 export const Numeric = fromRegex(/^([-+]?((\.\d+)|(\d+)(\.\d+)?)$)/, 'must be a number');
 export const Alphanumeric = fromRegex(/^[a-z\d\-_\s]+$/i, 'can only have letters and numbers');
 export const NumOrExp = fromRegex(/^@.*$|^([-+]?((\.\d+)|(\d+)(\.\d+)?)$)/, 'must be a number');
+export const LowerCaseAlphaNumeric = fromRegex(
+  /^[a-z0-9_]+$/,
+  'must be a lowercase alphanumeric character with no spaces'
+);