Fix regular expressions

mxcube · Sep 28, 2023 · 9d05de2 · 9d05de2
1 parent 1cd099b
commit 9d05de2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ui/src/components/Tasks/validate.js b/ui/src/components/Tasks/validate.js
@@ -24,15 +24,15 @@ const validate = (values, props) => {
   // here we update the resolution limits based on the energy the typed in the form,
   // the limits come from a table sent by the client
 
-  const validFname = /^[\w#[\]{}-\-]+$/u.test(props.filename);
+  const validFname = /^[-_#{}[\]\w]+$/u.test(props.filename);
 
   const emptyField = 'field is empty';
 
   if (!validFname) {
     errors.prefix = INVALID_CHAR_MSG;
   }
 
-  if (props.subdir && !/^[\w/{}-\-]+$/u.test(props.subdir)) {
+  if (props.subdir && !/^[-{}\/\w]+$/u.test(props.subdir)) {
     errors.subdir = INVALID_CHAR_MSG;
   }
 
@@ -42,7 +42,7 @@ const validate = (values, props) => {
 
   if (
     props.experimentName !== undefined &&
-    !/^[\w/{}-\-]+$/u.test(props.experimentName)
+    !/^[-{}\/\w]+$/u.test(props.experimentName)
   ) {
     errors.experimentName = INVALID_CHAR_MSG;
   }