← All changes | backend/src/Factory/Field/FieldFactory.php +43 -2 1.1.1 → 1.5.1 View file →

		@@ -8,8 +8,9 @@
8	8	use IvyForms\ValueObjects\Field\Field;
9	9	use IvyForms\ValueObjects\Field\FieldGeneralSettings;
10	10	use IvyForms\ValueObjects\Field\FieldOptions;
11	11	use IvyForms\ValueObjects\Field\FieldAdvancedSettings;
	12	+use IvyForms\ValueObjects\Field\FileUploadFieldAdvancedSettings;
12	13	use IvyForms\ValueObjects\Field\ConfirmationGeneralSettings;
13	14	use IvyForms\ValueObjects\Field\TimeFieldGeneralSettings;
14	15	use IvyForms\ValueObjects\Field\DateFieldGeneralSettings;
15	16
		@@ -72,8 +73,15 @@
72	73	$data['htmlContent'] = $settings['htmlContent'] ?? '';
73	74	$data['agreementText'] = $settings['agreementText'] ?? '';
74	75	$data['limitDateRange'] = $settings['limitDateRange'] ?? false;
75	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	+ }
76	84	// Grid layout: prioritize direct database columns over settings JSON
77	85	// This ensures backward compatibility while preferring the dedicated columns
78	86	$data['rowIndex'] = $data['rowIndex'] ?? ($settings['rowIndex'] ?? 0);
79	87	$data['columnIndex'] = $data['columnIndex'] ?? ($settings['columnIndex'] ?? 0);
		@@ -121,8 +129,9 @@
121	129	* @param mixed[] $settings The settings array (from database or empty for API).
122	130	* @return mixed[] The modified field data.
123	131	*/
124	132	$data = apply_filters('ivyforms/field/factory/extract_settings', $data, $settings);
	133	+
125	134	$generalSettings = new FieldGeneralSettings(
126	135	self::validateString($data['label'] ?? '', 255, 'label'),
127	136	self::validateBool($data['required'] ?? false),
128	137	self::validateString($data['placeholder'] ?? '', 255, 'placeholder'),
		@@ -179,9 +188,9 @@
179	188	self::validateString($data['agreementText'] ?? '', 1000, 'agreementText'),
180	189	self::validateBool($data['limitRange'] ?? false),
181	190	);
182	191	$advancedSettings = new FieldAdvancedSettings(
183		- self::validateString($data['defaultValue'] ?? '', 255, 'defaultValue'),
	192	+ self::resolveDefaultValue($data),
184	193	self::validateBool($data['limitMaxLength'] ?? false),
185	194	(int)($data['maxLength'] ?? 255),
186	195	self::validateString($data['labelPosition'] ?? '', 255, 'labelPosition'),
187	196	self::validateBool($data['noDuplicates'] ?? false),
		@@ -186,9 +195,16 @@
186	195	self::validateString($data['labelPosition'] ?? '', 255, 'labelPosition'),
187	196	self::validateBool($data['noDuplicates'] ?? false),
188	197	self::validateString($data['inputPrefix'] ?? '', 255, 'inputPrefix'),
189	198	self::validateString($data['inputSuffix'] ?? '', 255, 'inputSuffix'),
190		- 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	+ )
191	207	);
192	208	$fieldOptions = new FieldOptions($data['options'] ?? []);
193	209
194	210	$fieldObject = new Field(
		@@ -300,8 +316,33 @@
300	316	*/
301	317	private static function validateBool($value): bool
302	318	{
303	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');
304	345	}
305	346
306	347	/**
307	348	* Validate a string's length.