Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / src / validators / valid-name.tsx

diff --git a/src/validators/valid-name.tsx b/src/validators/valid-name.tsx
index da96712398e278f6a45de0cd57a6395a7691ad7b..89bb3f96888203691029b322e486cd98b3e0df3f 100644 (file)
--- a/src/validators/valid-name.tsx
+++ b/src/validators/valid-name.tsx
@@ -4,12 +4,12 @@
 
 export const disallowDotName = /^\.{1,2}$/;
 export const disallowSlash = /\//;
-
-const ERROR_MESSAGE = "Name cannot be '.' or '..' or contain '/' characters";
+export const disallowLeadingWhitespaces = /^\s+/;
+export const disallowTrailingWhitespaces = /\s+$/;
 
 export const validName = (value: string) => {
     return [disallowDotName, disallowSlash].find(aRule => value.match(aRule) !== null)
-        ? ERROR_MESSAGE
+        ? "Name cannot be '.' or '..' or contain '/' characters"
         : undefined;
 };
 
@@ -18,3 +18,20 @@ export const validNameAllowSlash = (value: string) => {
         ? "Name cannot be '.' or '..'"
         : undefined;
 };
+
+export const validFileName = (value: string) => {
+    return [
+        disallowLeadingWhitespaces,
+        disallowTrailingWhitespaces
+    ].find(aRule => value.match(aRule) !== null)
+        ? `Leading/trailing whitespaces not allowed on '${value}'`
+        : undefined;
+};
+
+export const validFilePath = (filePath: string) => {
+    const errors = filePath.split('/').map(pathPart => {
+        if (pathPart === "") { return "Empty dir name not allowed"; }
+        return validNameAllowSlash(pathPart) || validFileName(pathPart);
+    });
+    return errors.filter(e => e !== undefined)[0];
+};
\ No newline at end of file