feat(form-builder): form_field_configs relational table + non-validation key split + drop validation_rules JSON columns
This commit is contained in:
@@ -8,6 +8,7 @@ use App\Enums\FormBuilder\FormFieldType;
|
||||
use App\Models\FormBuilder\FormField;
|
||||
use App\Models\PersonTag;
|
||||
use App\Services\FormBuilder\FormFieldBindingService;
|
||||
use App\Services\FormBuilder\FormFieldConfigService;
|
||||
use App\Services\FormBuilder\FormFieldValidationRuleService;
|
||||
use App\Services\FormBuilder\FormLocaleResolver;
|
||||
use Illuminate\Http\Request;
|
||||
@@ -46,6 +47,9 @@ final class FormFieldResource extends JsonResource
|
||||
'validation_rules' => app(FormFieldValidationRuleService::class)->toJsonShape(
|
||||
$this->resource->validationRules,
|
||||
),
|
||||
'configs' => app(FormFieldConfigService::class)->toJsonShape(
|
||||
$this->resource->configs,
|
||||
),
|
||||
'is_required' => (bool) $this->is_required,
|
||||
'is_filterable' => (bool) $this->is_filterable,
|
||||
'is_portal_visible' => (bool) $this->is_portal_visible,
|
||||
@@ -112,7 +116,8 @@ final class FormFieldResource extends JsonResource
|
||||
return [];
|
||||
}
|
||||
|
||||
$categoryFilter = (array) (($this->validation_rules['tag_categories'] ?? null) ?: []);
|
||||
$configs = app(FormFieldConfigService::class)->toJsonShape($this->resource->configs);
|
||||
$categoryFilter = (array) ($configs['tag_categories']['categories'] ?? []);
|
||||
|
||||
$query = PersonTag::withoutGlobalScopes()
|
||||
->where('organisation_id', $organisationId)
|
||||
|
||||
Reference in New Issue
Block a user