Enhance form logic property resolver and validation UI

- Refactor `shouldBeRequired()` method in FormLogicPropertyResolver for clearer logic and better handling of conditional requirements
- Add comprehensive test cases for dynamic field requirement logic
- Update CustomFieldValidation component with improved UI and guidance for validation setup
- Improve error message and validation rule description in form validation interface
This commit is contained in:
Julien Nahum
2025-02-11 15:05:27 +01:00
parent f5b9b86c16
commit 853760484c
3 changed files with 142 additions and 31 deletions

View File

@@ -29,22 +29,28 @@ class FormLogicPropertyResolver
public function shouldBeRequired(): bool
{
if (! isset($this->property['required'])) {
return false;
}
// Default required to false if not set
$isRequired = $this->property['required'] ?? false;
if (! $this->logic) {
return $this->property['required'];
return $isRequired;
}
$conditionsMet = FormLogicConditionChecker::conditionsMet($this->logic['conditions'], $this->formData);
if ($conditionsMet && $this->property['required'] && count($this->logic['actions']) > 0 && (in_array('make-it-optional', $this->logic['actions']) || in_array('hide-block', $this->logic['actions']))) {
return false;
} elseif ($conditionsMet && ! $this->property['required'] && count($this->logic['actions']) > 0 && in_array('require-answer', $this->logic['actions'])) {
return true;
} else {
return $this->property['required'];
// If conditions are met and we have actions
if ($conditionsMet && !empty($this->logic['actions'])) {
// If field is required but should be made optional
if ($isRequired && (in_array('make-it-optional', $this->logic['actions']) || in_array('hide-block', $this->logic['actions']))) {
return false;
}
// If field is not required but should be required
if (!$isRequired && in_array('require-answer', $this->logic['actions'])) {
return true;
}
}
return $isRequired;
}
public function shouldBeHidden(): bool