merge master in

formio · Oct 16, 2024 · 8183e37 · 8183e37
2 parents 3a26993 + cabaa43
commit 8183e37
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/process/validation/__tests__/Validator.test.ts b/src/process/validation/__tests__/Validator.test.ts
@@ -35,6 +35,6 @@ describe('Validator', function () {
         errors = [...errors, ...scope.errors.map((error) => error.errorKeyOrMessage)];
       }
     }
-    expect(errors).to.have.length(6);
+    expect(errors).to.have.length(7);
   });
 });
diff --git a/src/process/validation/rules/__tests__/validateTime.test.ts b/src/process/validation/rules/__tests__/validateTime.test.ts
@@ -11,6 +11,7 @@ const timeField: TimeComponent = {
   label: 'Time',
   input: true,
   dataFormat: 'HH:mm:ss',
+  format: 'HH:mm',
 };
 
 describe('validateTime', function () {

diff --git a/src/process/validation/rules/validateTime.ts b/src/process/validation/rules/validateTime.ts
@@ -21,16 +21,13 @@ export const shouldValidate = (context: ValidationContext) => {
 };
 
 export const validateTimeSync: RuleFnSync = (context: ValidationContext) => {
-  const { component, data, path, value, config } = context;
+  const { component, data, path, value } = context;
   if (!shouldValidate(context)) {
     return null;
   }
   try {
     if (!value || isComponentDataEmpty(component, data, path)) return null;
-    // Server side evaluations of validity should use the "dataFormat" vs the "format" which is used on the client.
-    const format = config?.server
-      ? (component as TimeComponent).dataFormat || 'HH:mm:ss'
-      : (component as TimeComponent).format || 'HH:mm';
+    const format = (component as TimeComponent).dataFormat || 'HH:mm:ss';
     const isValid = dayjs(String(value), format, true).isValid();
     return isValid ? null : new FieldError('time', context);
   } catch (ignoreErr) {