feat: support date profile fields

lib/Enum/FieldType.php

@@ -12,6 +12,7 @@
 enum FieldType: string {
 	case TEXT = 'text';
 	case NUMBER = 'number';
+	case DATE = 'date';
 	case SELECT = 'select';
 	case MULTISELECT = 'multiselect';
 
@@ -22,6 +23,7 @@ public static function values(): array {
 		return [
 			self::TEXT->value,
 			self::NUMBER->value,
+			self::DATE->value,
 			self::SELECT->value,
 			self::MULTISELECT->value,
 		];

lib/ResponseDefinitions.php

@@ -10,7 +10,7 @@
 namespace OCA\ProfileFields;
 
 /**
- * @psalm-type ProfileFieldsType = 'text'|'number'|'select'|'multiselect'
+ * @psalm-type ProfileFieldsType = 'text'|'number'|'date'|'select'|'multiselect'
  * @psalm-type ProfileFieldsVisibility = 'private'|'users'|'public'
  * @psalm-type ProfileFieldsEditPolicy = 'admins'|'users'
  * @psalm-type ProfileFieldsExposurePolicy = 'hidden'|'private'|'users'|'public'

lib/Service/DataImportService.php

@@ -69,7 +69,7 @@ public function import(array $payload, bool $dryRun = false): array {
 	 * @param list<array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number',
+	 *     type: 'text'|'number'|'date'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,
@@ -148,7 +148,7 @@ private function collectValueSummary(array $values, array &$summary): void {
 	 * @param list<array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number',
+	 *     type: 'text'|'number'|'date'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,
@@ -248,7 +248,7 @@ private function persistValues(array $values, array $definitionsByFieldKey, arra
 	 * @param array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number',
+	 *     type: 'text'|'number'|'date'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,

lib/Service/FieldDefinitionValidator.php

@@ -29,7 +29,7 @@ class FieldDefinitionValidator {
 	 * @return array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number'|'select'|'multiselect',
+	 *     type: 'text'|'number'|'date'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,

lib/Service/FieldValueService.php

@@ -106,6 +106,7 @@ public function normalizeValue(FieldDefinition $definition, array|string|int|flo
 		return match ($type) {
 			FieldType::TEXT => $this->normalizeTextValue($rawValue),
 			FieldType::NUMBER => $this->normalizeNumberValue($rawValue),
+			FieldType::DATE => $this->normalizeDateValue($rawValue),
 			FieldType::SELECT => $this->normalizeSelectValue($rawValue, $definition),
 			FieldType::MULTISELECT => $this->normalizeMultiSelectValue($rawValue, $definition),
 		};
@@ -298,6 +299,24 @@ private function normalizeNumberValue(array|string|int|float|bool $rawValue): ar
 		return ['value' => str_contains((string)$rawValue, '.') ? (float)$rawValue : (int)$rawValue];
 	}
 
+	/**
+	 * @param array<string, mixed>|scalar $rawValue
+	 * @return array{value: string}
+	 */
+	private function normalizeDateValue(array|string|int|float|bool $rawValue): array {
+		if (!is_string($rawValue)) {
+			throw new InvalidArgumentException($this->l10n->t('Date fields require a valid ISO-8601 date in YYYY-MM-DD format.'));
+		}
+
+		$value = trim($rawValue);
+		$date = \DateTimeImmutable::createFromFormat('!Y-m-d', $value);
+		if ($date === false || $date->format('Y-m-d') !== $value) {
+			throw new InvalidArgumentException($this->l10n->t('Date fields require a valid ISO-8601 date in YYYY-MM-DD format.'));
+		}
+
+		return ['value' => $value];
+	}
+
 	/**
 	 * @param array<string, mixed> $value
 	 */

lib/Service/ImportPayloadValidator.php

@@ -32,7 +32,7 @@ public function __construct(
 	 *     definitions: list<array{
 	 *         field_key: non-empty-string,
 	 *         label: non-empty-string,
-	 *         type: 'text'|'number',
+	 *         type: 'text'|'number'|'date'|'select'|'multiselect',
 	 *         edit_policy: 'admins'|'users',
 	 *         exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *         sort_order: int,
@@ -71,7 +71,7 @@ public function validate(array $payload): array {
 	 * @return array<non-empty-string, array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number',
+	 *     type: 'text'|'number'|'date'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,
@@ -119,7 +119,7 @@ private function validateDefinitions(array $definitions): array {
 	 * @param array<non-empty-string, array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number',
+	 *     type: 'text'|'number'|'date'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,
@@ -255,11 +255,12 @@ private function normalizeOptionalDate(array $payload, string $key, string $mess
 	 * @param array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number',
+	 *     type: 'text'|'number'|'date'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,
 	 *     active: bool,
+	 *     options?: list<string>|null,
 	 * } $definition
 	 */
 	private function isCompatibleDefinition(FieldDefinition $existingDefinition, array $definition): bool {

lib/Workflow/UserProfileFieldCheck.php

@@ -43,6 +43,16 @@ class UserProfileFieldCheck implements ICheck {
 		'greater',
 		'!less',
 	];
+	private const DATE_OPERATORS = [
+		self::OPERATOR_IS_SET,
+		self::OPERATOR_IS_NOT_SET,
+		'is',
+		'!is',
+		'less',
+		'!greater',
+		'greater',
+		'!less',
+	];
 	private const SELECT_OPERATORS = [
 		self::OPERATOR_IS_SET,
 		self::OPERATOR_IS_NOT_SET,
@@ -166,6 +176,7 @@ private function isOperatorSupported(FieldDefinition $definition, string $operat
 		$operators = match (FieldType::from($definition->getType())) {
 			FieldType::TEXT => self::TEXT_OPERATORS,
 			FieldType::NUMBER => self::NUMBER_OPERATORS,
+			FieldType::DATE => self::DATE_OPERATORS,
 			FieldType::SELECT => self::SELECT_OPERATORS,
 			FieldType::MULTISELECT => self::SELECT_OPERATORS,
 		};
@@ -242,6 +253,11 @@ private function evaluate(FieldDefinition $definition, string $operator, string|
 				$this->normalizeNumericComparisonOperand($expectedValue),
 				$this->normalizeNumericComparisonOperand($actualValue),
 			),
+			FieldType::DATE => $this->evaluateDateOperator(
+				$operator,
+				$this->normalizeDateComparisonOperand($expectedValue),
+				$this->normalizeDateComparisonOperand($actualValue),
+			),
 			FieldType::MULTISELECT => false,
 		};
 	}
@@ -281,6 +297,19 @@ private function normalizeNumericComparisonOperand(string|int|float|bool|null $v
 		return str_contains((string)$value, '.') ? (float)$value : (int)$value;
 	}
 
+	private function normalizeDateComparisonOperand(string|int|float|bool|null $value): int {
+		if (!is_string($value)) {
+			throw new InvalidArgumentException('date comparison value must be a valid YYYY-MM-DD string');
+		}
+
+		$date = \DateTimeImmutable::createFromFormat('!Y-m-d', $value);
+		if ($date === false || $date->format('Y-m-d') !== $value) {
+			throw new InvalidArgumentException('date comparison value must be a valid YYYY-MM-DD string');
+		}
+
+		return $date->getTimestamp();
+	}
+
 	private function evaluateTextOperator(string $operator, string $expectedValue, string $actualValue): bool {
 		return match ($operator) {
 			'is' => $actualValue === $expectedValue,
@@ -302,4 +331,16 @@ private function evaluateNumberOperator(string $operator, int|float $expectedVal
 			default => false,
 		};
 	}
+
+	private function evaluateDateOperator(string $operator, int $expectedValue, int $actualValue): bool {
+		return match ($operator) {
+			'is' => $actualValue === $expectedValue,
+			'!is' => $actualValue !== $expectedValue,
+			'less' => $actualValue < $expectedValue,
+			'!greater' => $actualValue <= $expectedValue,
+			'greater' => $actualValue > $expectedValue,
+			'!less' => $actualValue >= $expectedValue,
+			default => false,
+		};
+	}
 }

openapi-administration.json

@@ -198,6 +198,7 @@
                 "enum": [
                     "text",
                     "number",
+                    "date",
                     "select",
                     "multiselect"
                 ]

openapi-full.json

@@ -273,6 +273,7 @@
                 "enum": [
                     "text",
                     "number",
+                    "date",
                     "select",
                     "multiselect"
                 ]

openapi.json

@@ -144,6 +144,7 @@
                 "enum": [
                     "text",
                     "number",
+                    "date",
                     "select",
                     "multiselect"
                 ]

src/components/AdminUserFieldsDialog.vue

@@ -82,7 +82,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 							:error="fieldHasError(field)"
 							:helper-text="helperMessageForField(field)"
 							label-outside
-							type="text"
+							:type="componentInputTypeForField(field.definition.type)"
 							:inputmode="inputModeForField(field.definition.type)"
 							:placeholder="placeholderForField(field.definition.type)"
 							@update:model-value="clearFieldError(field.definition.id)"
@@ -196,22 +196,34 @@ export default defineComponent({
 		const descriptionForType = (type: FieldType): string => ({
 			text: t('profile_fields', 'Free text stored as a scalar value.'),
 			number: t('profile_fields', 'Only numeric values are accepted.'),
+			date: t('profile_fields', 'Use a valid date in YYYY-MM-DD format.'),
 			select: t('profile_fields', 'Choose one of the predefined options.'),
 			multiselect: t('profile_fields', 'Choose one or more predefined options.'),
 		} as Record<FieldType, string>)[type]
 
 		const placeholderForField = (type: FieldType): string => ({
 			text: t('profile_fields', 'Enter a value'),
 			number: t('profile_fields', 'Enter a number'),
+			date: t('profile_fields', 'Select a date'),
 			select: t('profile_fields', 'Select an option'),
 			multiselect: t('profile_fields', 'Select one or more options'),
 		} as Record<FieldType, string>)[type]
 
 		const plainNumberPattern = /^-?\d+(\.\d+)?$/
+		const isoDatePattern = /^\d{4}-\d{2}-\d{2}$/
 
 		const inputModeForField = (type: FieldType): string => ({
 			text: 'text',
 			number: 'decimal',
+			date: 'numeric',
+			select: 'text',
+			multiselect: 'text',
+		} as Record<FieldType, string>)[type]
+
+		const componentInputTypeForField = (type: FieldType): string => ({
+			text: 'text',
+			number: 'text',
+			date: 'date',
 			select: 'text',
 			multiselect: 'text',
 		} as Record<FieldType, string>)[type]
@@ -261,6 +273,14 @@ export default defineComponent({
 				return t('profile_fields', '{fieldLabel} must be a plain numeric value.', { fieldLabel: field.definition.label })
 			}
 
+			if (field.definition.type === 'date') {
+				const parsed = isoDatePattern.test(rawValue) ? new Date(`${rawValue}T00:00:00Z`) : null
+				const normalized = parsed instanceof Date && !Number.isNaN(parsed.getTime()) ? parsed.toISOString().slice(0, 10) : ''
+				if (normalized !== rawValue) {
+					return t('profile_fields', '{fieldLabel} must be a valid date in YYYY-MM-DD format.', { fieldLabel: field.definition.label })
+				}
+			}
+
 			if (field.definition.type === 'select') {
 				const options = field.definition.options ?? []
 				if (!options.includes(rawValue)) {
@@ -292,7 +312,7 @@ export default defineComponent({
 		const hasInvalidFields = computed(() => invalidFields.value.length > 0)
 
 		const helperTextForField = (field: AdminEditableField) => {
-			return field.definition.type === 'number'
+			return field.definition.type === 'number' || field.definition.type === 'date'
 				? descriptionForType(field.definition.type)
 				: ''
 		}
@@ -363,6 +383,7 @@ export default defineComponent({
 			return ({
 				'text fields expect a scalar value': t('profile_fields', '{fieldLabel} must be plain text.', { fieldLabel: field.definition.label }),
 				'number fields expect a numeric value': t('profile_fields', '{fieldLabel} must be a numeric value.', { fieldLabel: field.definition.label }),
+				'Date fields require a valid ISO-8601 date in YYYY-MM-DD format.': t('profile_fields', '{fieldLabel} must be a valid date in YYYY-MM-DD format.', { fieldLabel: field.definition.label }),
 				'current_visibility is not supported': t('profile_fields', 'The selected visibility is not supported.'),
 			}[message] ?? (message.includes('is not a valid option')
 				? t('profile_fields', '{fieldLabel}: invalid option selected.', { fieldLabel: field.definition.label })
@@ -417,6 +438,13 @@ export default defineComponent({
 				return { value: numericValue, visibility: userDraftVisibilities[field.definition.id] }
 			}
 
+			if (field.definition.type === 'date') {
+				return {
+					value: rawValue === '' ? null : rawValue,
+					visibility: userDraftVisibilities[field.definition.id],
+				}
+			}
+
 			if (field.definition.type === 'multiselect') {
 				const selectedValues = userDraftValues[field.definition.id]
 				if (!Array.isArray(selectedValues)) {
@@ -551,6 +579,7 @@ export default defineComponent({
 			helperTextForField,
 			isLoading,
 			isSavingAny,
+				componentInputTypeForField,
 			inputModeForField,
 			placeholderForField,
 			saveAllFields,