fix(validators): add new regex

isomerpages · Mar 20, 2024 · 13e0a71 · 13e0a71
1 parent 4f4be46
commit 13e0a71
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/routing/RouteSelector.jsx b/src/routing/RouteSelector.jsx
@@ -35,7 +35,7 @@ import { Workspace } from "layouts/Workspace"
 import { ProtectedRouteWithProps } from "routing/ProtectedRouteWithProps"
 import RedirectIfLoggedInRoute from "routing/RedirectIfLoggedInRoute"
 
-import { specialCharactersRegexTest } from "utils"
+import { ALLOWED_CHARACTERS_REGEX } from "utils"
 
 import {
   ApprovedReviewRedirect,
@@ -80,11 +80,11 @@ export const RouteSelector = () => {
               const decodedName = decodeURIComponent(encodedName)
               return (
                 value === "terms-of-use.md" ||
-                !specialCharactersRegexTest.test(decodedName)
+                ALLOWED_CHARACTERS_REGEX.test(decodedName)
               )
             },
             subCollectionName: (value) => {
-              return !specialCharactersRegexTest.test(decodeURIComponent(value))
+              return ALLOWED_CHARACTERS_REGEX.test(decodeURIComponent(value))
             },
           }}
         />
@@ -96,7 +96,7 @@ export const RouteSelector = () => {
           ]}
           validate={{
             subCollectionName: (value) => {
-              return !specialCharactersRegexTest.test(decodeURIComponent(value))
+              return ALLOWED_CHARACTERS_REGEX.test(decodeURIComponent(value))
             },
           }}
         >
@@ -120,8 +120,8 @@ export const RouteSelector = () => {
               // NOTE: This value is prepended with either `files|images`
               // and nested directories are separated by `/` as well.
               const decodedValues = decodeURIComponent(value).split("/")
-              return decodedValues.every(
-                (val) => !specialCharactersRegexTest.test(val)
+              return decodedValues.every((val) =>
+                ALLOWED_CHARACTERS_REGEX.test(val)
               )
             },
           }}

diff --git a/src/utils/validators.js b/src/utils/validators.js
@@ -63,6 +63,11 @@ export const fileNameExtensionRegexTest = /^[a-zA-z]{3,4}$/
 export const RESOURCE_CATEGORY_REGEX = "^([a-zA-Z0-9]*[- ]?)+$"
 export const slugifyLowerFalseRegexTest = /^([a-zA-Z0-9]+-)*[a-zA-Z0-9]+$/
 export const resourceCategoryRegexTest = RegExp(RESOURCE_CATEGORY_REGEX)
+// NOTE: This is a negation of the specialCharactersRegex
+// and also allows for `-`.
+// This is because of migration of pre-cms sites from github
+// over to cms allows for dashes in the file/folder name.
+export const ALLOWED_CHARACTERS_REGEX = /[^~%^*_+./\\`;~{}[\]"<>]/
 export const specialCharactersRegexTest = /[~%^*_+\-./\\`;~{}[\]"<>]/
 export const jekyllFirstCharacterRegexTest = /^[._#~]/
 export const mediaSpecialCharactersRegexTest = /[~%^?*+#./\\`;~{}[\]"<>]/