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 468811d831a3ec0214ceb025750bf7645791f45b..89bb3f96888203691029b322e486cd98b3e0df3f 100644 (file)
--- a/src/validators/valid-name.tsx
+++ b/src/validators/valid-name.tsx
@@ -2,13 +2,36 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
+export const disallowDotName = /^\.{1,2}$/;
+export const disallowSlash = /\//;
+export const disallowLeadingWhitespaces = /^\s+/;
+export const disallowTrailingWhitespaces = /\s+$/;
 
-const ERROR_MESSAGE = "Name cannot be '.' or '..' or contain '/' characters";
+export const validName = (value: string) => {
+    return [disallowDotName, disallowSlash].find(aRule => value.match(aRule) !== null)
+        ? "Name cannot be '.' or '..' or contain '/' characters"
+        : undefined;
+};
 
-export const invalidNamingRules = [/\//, /^\.{1,2}$/];
+export const validNameAllowSlash = (value: string) => {
+    return [disallowDotName].find(aRule => value.match(aRule) !== null)
+        ? "Name cannot be '.' or '..'"
+        : undefined;
+};
 
-export const validName = (value: string) => {
-    return invalidNamingRules.find(aRule => value.match(aRule) !== null)
-        ? ERROR_MESSAGE
+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