feat(admin): force lowercase slug when creating an org [EP-2755] (#234)

natgeosociety · Oct 16, 2020 · 92b0a4e · 92b0a4e
1 parent 4077f79
commit 92b0a4e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/earth-admin/src/pages-client/organizations/new.tsx b/packages/earth-admin/src/pages-client/organizations/new.tsx
@@ -27,7 +27,7 @@ import {
   Input,
   setupErrors,
   Spinner,
-  upperNumericDashesRule,
+  lowerNumericDashesRule,
   validEmailRule,
 } from '@marapp/earth-shared';
 
@@ -109,7 +109,7 @@ export function NewOrganization(props: IProps) {
               ref={register({
                 required: 'Slug name is required',
                 validate: {
-                  upperNumericDashesRule: upperNumericDashesRule(),
+                  lowerNumericDashesRule: lowerNumericDashesRule(),
                 },
               })}
             />

diff --git a/packages/earth-shared/src/validations.ts b/packages/earth-shared/src/validations.ts
@@ -62,6 +62,11 @@ const upperNumericDashes = (value: string): boolean => {
   return regex.test(value);
 };
 
+const lowerNumericDashes = (value: string): boolean => {
+  const regex = RegExp('^[a-z0-9](-?[a-z0-9])*$');
+  return regex.test(value);
+};
+
 const alphaNumericDashes = (value: string): boolean => {
   const regex = RegExp(/^[a-z0-9](-?[a-z0-9])*$/gi);
   return regex.test(value);
@@ -82,6 +87,10 @@ export const upperNumericDashesRule = (
   errorMessage: string = 'Only upercase alphanumeric characters and hyphens allowed.'
 ) => compose(maybeShowError(errorMessage), upperNumericDashes);
 
+export const lowerNumericDashesRule = (
+  errorMessage: string = 'Only lowercase alphanumeric characters and hyphens allowed.'
+) => compose(maybeShowError(errorMessage), lowerNumericDashes);
+
 export const alphaNumericDashesRule = (
   errorMessage: string = 'Only lowercase alphanumeric characters and hyphens allowed.'
 ) => compose(maybeShowError(errorMessage), alphaNumericDashes);