fix: update validation command

fancy-crud · Jul 26, 2024 · 4204078 · 4204078
1 parent 1fb66b3
commit 4204078
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/packages/core/src/forms/axioma/commands/validate-form.ts b/packages/core/src/forms/axioma/commands/validate-form.ts
@@ -2,7 +2,7 @@ import type { BaseCommand, BaseHandler } from '@fancy-crud/bus'
 import type { BaseObjectWithNormalizedFields, NormalizedField, RuleConfig } from '@packages/core/forms/axioma'
 import { meta } from '@fancy-crud/bus'
 
-type MinimumNormalizedField = Pick<NormalizedField, 'rules' | 'errors' | 'modelValue' | 'modelKey'>
+type MinimumNormalizedField = Pick<NormalizedField, 'rules' | 'errors' | 'modelValue' | 'modelKey' | 'hidden' | 'exclude'>
 
 export class ValidateFormCommand implements BaseCommand {
   public readonly meta = meta(IValidateFormHandler)

diff --git a/packages/core/src/forms/capabilities/validate-form.ts b/packages/core/src/forms/capabilities/validate-form.ts
@@ -9,11 +9,10 @@ export class ValidateFormHandler implements IValidateFormHandler {
 
   execute({ fields, options }: ValidateFormCommand): boolean {
     const isValid = Object.values(fields).every((field) => {
-      const command = new ValidateFieldRulesCommand(field, options)
-
       if (field.hidden || field.exclude)
         return true
 
+      const command = new ValidateFieldRulesCommand(field, options)
       const result = this.validateFieldRules.execute(command)
       return result === true
     })