← All changes | backend/src/Factory/Field/FieldFactory.php +98 -4 1.1 → 1.5 View file →

		@@ -2,13 +2,15 @@
2	2
3	3	namespace IvyForms\Factory\Field;
4	4
5	5	use IvyForms\Common\Exceptions\ValidationException;
	6	+use IvyForms\Common\Helpers\NameFieldKeyHelper;
6	7	use IvyForms\Entity\Field\Field as FieldEntity;
7	8	use IvyForms\ValueObjects\Field\Field;
8	9	use IvyForms\ValueObjects\Field\FieldGeneralSettings;
9	10	use IvyForms\ValueObjects\Field\FieldOptions;
10	11	use IvyForms\ValueObjects\Field\FieldAdvancedSettings;
	12	+use IvyForms\ValueObjects\Field\FileUploadFieldAdvancedSettings;
11	13	use IvyForms\ValueObjects\Field\ConfirmationGeneralSettings;
12	14	use IvyForms\ValueObjects\Field\TimeFieldGeneralSettings;
13	15	use IvyForms\ValueObjects\Field\DateFieldGeneralSettings;
14	16
		@@ -27,9 +29,9 @@
27	29	* @throws ValidationException
28	30	*/
29	31	public static function create(array $data): FieldEntity
30	32	{
31		- $settings = isset($data['settings']) ? json_decode($data['settings'], true) : [];
	33	+ $settings = self::parseSettings($data['settings'] ?? null);
32	34
33	35	if (!empty($settings)) {
34	36	$data['hideLabel'] = $settings['hideLabel'] ?? false;
35	37	$data['readOnly'] = $settings['readOnly'] ?? false;
		@@ -71,8 +73,15 @@
71	73	$data['htmlContent'] = $settings['htmlContent'] ?? '';
72	74	$data['agreementText'] = $settings['agreementText'] ?? '';
73	75	$data['limitDateRange'] = $settings['limitDateRange'] ?? false;
74	76	$data['limitTimeRange'] = $settings['limitTimeRange'] ?? false;
	77	+ $data['maxFileSizeMb'] = isset($settings['maxFileSizeMb']) ? (int) $settings['maxFileSizeMb'] : 0;
	78	+ $data['saveUploadsTo'] = isset($settings['saveUploadsTo'])
	79	+ ? (string) $settings['saveUploadsTo']
	80	+ : 'ivyforms';
	81	+ if (!array_key_exists('allowedFileExtensions', $data) && isset($settings['allowedFileExtensions'])) {
	82	+ $data['allowedFileExtensions'] = $settings['allowedFileExtensions'];
	83	+ }
75	84	// Grid layout: prioritize direct database columns over settings JSON
76	85	// This ensures backward compatibility while preferring the dedicated columns
77	86	$data['rowIndex'] = $data['rowIndex'] ?? ($settings['rowIndex'] ?? 0);
78	87	$data['columnIndex'] = $data['columnIndex'] ?? ($settings['columnIndex'] ?? 0);
		@@ -82,10 +91,34 @@
82	91	: true;
83	92	if ($data['visible'] === null) {
84	93	$data['visible'] = true;
85	94	}
	95	+ if (isset($settings['nameFieldType'])) {
	96	+ $data['nameFieldType'] = (string)$settings['nameFieldType'];
	97	+ }
	98	+ if (array_key_exists('subFieldIndex', $settings)) {
	99	+ $data['subFieldIndex'] = is_numeric($settings['subFieldIndex'])
	100	+ ? (int)$settings['subFieldIndex']
	101	+ : null;
	102	+ }
86	103	}
87	104
	105	+ if (isset($data['nameFieldType'])) {
	106	+ $data['nameFieldType'] = (string)$data['nameFieldType'];
	107	+ }
	108	+ if (array_key_exists('subFieldIndex', $data)) {
	109	+ $data['subFieldIndex'] = is_numeric($data['subFieldIndex'])
	110	+ ? (int)$data['subFieldIndex']
	111	+ : null;
	112	+ }
	113	+
	114	+ if (empty($data['nameFieldType'])) {
	115	+ $inferredNameFieldType = NameFieldKeyHelper::inferNameFieldKeyFromLabel($data['label'] ?? '');
	116	+ if ($inferredNameFieldType !== null) {
	117	+ $data['nameFieldType'] = $inferredNameFieldType;
	118	+ }
	119	+ }
	120	+
88	121	/**
89	122	* Allows modification of the settings data before creating the Field entity.
90	123	* This filter runs for both:
91	124	* - Fields loaded from database (settings from JSON string)
		@@ -96,8 +129,9 @@
96	129	* @param mixed[] $settings The settings array (from database or empty for API).
97	130	* @return mixed[] The modified field data.
98	131	*/
99	132	$data = apply_filters('ivyforms/field/factory/extract_settings', $data, $settings);
	133	+
100	134	$generalSettings = new FieldGeneralSettings(
101	135	self::validateString($data['label'] ?? '', 255, 'label'),
102	136	self::validateBool($data['required'] ?? false),
103	137	self::validateString($data['placeholder'] ?? '', 255, 'placeholder'),
		@@ -154,9 +188,9 @@
154	188	self::validateString($data['agreementText'] ?? '', 1000, 'agreementText'),
155	189	self::validateBool($data['limitRange'] ?? false),
156	190	);
157	191	$advancedSettings = new FieldAdvancedSettings(
158		- self::validateString($data['defaultValue'] ?? '', 255, 'defaultValue'),
	192	+ self::resolveDefaultValue($data),
159	193	self::validateBool($data['limitMaxLength'] ?? false),
160	194	(int)($data['maxLength'] ?? 255),
161	195	self::validateString($data['labelPosition'] ?? '', 255, 'labelPosition'),
162	196	self::validateBool($data['noDuplicates'] ?? false),
		@@ -161,9 +195,16 @@
161	195	self::validateString($data['labelPosition'] ?? '', 255, 'labelPosition'),
162	196	self::validateBool($data['noDuplicates'] ?? false),
163	197	self::validateString($data['inputPrefix'] ?? '', 255, 'inputPrefix'),
164	198	self::validateString($data['inputSuffix'] ?? '', 255, 'inputSuffix'),
165		- self::validateString($data['ratingIcon'] ?? 'star', 50, 'ratingIcon')
	199	+ self::validateString($data['ratingIcon'] ?? 'star', 50, 'ratingIcon'),
	200	+ new FileUploadFieldAdvancedSettings(
	201	+ (int) ($data['maxFileSizeMb'] ?? 0),
	202	+ (string) ($data['saveUploadsTo'] ?? 'ivyforms'),
	203	+ is_array($data['allowedFileExtensions'] ?? null)
	204	+ ? $data['allowedFileExtensions']
	205	+ : []
	206	+ )
166	207	);
167	208	$fieldOptions = new FieldOptions($data['options'] ?? []);
168	209
169	210	$fieldObject = new Field(
		@@ -234,12 +275,40 @@
234	275	* @param FieldEntity $field The current field data.
235	276	* @param mixed[] $data The settings array from the database.
236	277	* @return mixed[] The modified field data.
237	278	*/
238		- return apply_filters('ivyforms/field/entity/set_properties', $field, $data);
	279	+ $field = apply_filters('ivyforms/field/entity/set_properties', $field, $data);
	280	+
	281	+ if (!empty($data['nameFieldType'])) {
	282	+ $field->setAdditionalProperty('nameFieldType', (string)$data['nameFieldType']);
	283	+ }
	284	+ if (array_key_exists('subFieldIndex', $data) && $data['subFieldIndex'] !== null) {
	285	+ $field->setAdditionalProperty('subFieldIndex', (int)$data['subFieldIndex']);
	286	+ }
	287	+
	288	+ return $field;
239	289	}
240	290
241	291	/**
	292	+ * @param mixed $rawSettings
	293	+ * @return array<string, mixed>
	294	+ */
	295	+ private static function parseSettings($rawSettings): array
	296	+ {
	297	+ if (is_array($rawSettings)) {
	298	+ return $rawSettings;
	299	+ }
	300	+
	301	+ if (!is_string($rawSettings) || $rawSettings === '') {
	302	+ return [];
	303	+ }
	304	+
	305	+ $decoded = json_decode($rawSettings, true);
	306	+
	307	+ return is_array($decoded) ? $decoded : [];
	308	+ }
	309	+
	310	+ /**
242	311	* Validate and convert a value to boolean.
243	312	*
244	313	* @param mixed $value The value to validate.
245	314	*
		@@ -247,8 +316,33 @@
247	316	*/
248	317	private static function validateBool($value): bool
249	318	{
250	319	return (bool)$value;
	320	+ }
	321	+
	322	+ /**
	323	+ * Resolve and validate field default value (Pro may override for rich_text, etc.).
	324	+ *
	325	+ * @param array<string, mixed> $data
	326	+ *
	327	+ * @return string
	328	+ *
	329	+ * @throws ValidationException
	330	+ */
	331	+ private static function resolveDefaultValue(array $data): string
	332	+ {
	333	+ $filtered = apply_filters(
	334	+ 'ivyforms/field/validate_default_value',
	335	+ null,
	336	+ $data['defaultValue'] ?? '',
	337	+ $data
	338	+ );
	339	+
	340	+ if (is_string($filtered)) {
	341	+ return $filtered;
	342	+ }
	343	+
	344	+ return self::validateString($data['defaultValue'] ?? '', 255, 'defaultValue');
251	345	}
252	346
253	347	/**
254	348	* Validate a string's length.