@conduction/nextcloud-vue 2.101.0 → 2.103.0

package/src/utils/visibleWhen.js

@@ -29,7 +29,9 @@
  *     on the current record's state (`{ field: "lifecycleState", op: "eq",
  *     value: "approved" }`).
  *
- * `op` is `eq | neq | gt | gte | lt | lte` (default `eq`); `value` is the
+ * `op` is `eq | neq | gt | gte | lt | lte | empty | notEmpty | in | anyOf`
+ * (default `eq`); `anyOf` matches a list value that shares an entry with the
+ * listed `value`. `value` is the
  * literal right-hand side. Evaluation is FAIL-SAFE: any fetch / shape error
  * resolves `false` (hidden) — a broken predicate never breaks a page.
  *
@@ -49,7 +51,7 @@ import { buildHeaders, buildQueryString, prefixUrl } from './headers.js'
 import { resolveFilterTokens, resolveFilterValue } from './resolveFilterTokens.js'
 
 /** Supported visibleWhen comparison operators. */
-export const VISIBLE_WHEN_OPS = ['eq', 'neq', 'gt', 'gte', 'lt', 'lte', 'empty', 'notEmpty', 'in']
+export const VISIBLE_WHEN_OPS = ['eq', 'neq', 'gt', 'gte', 'lt', 'lte', 'empty', 'notEmpty', 'in', 'anyOf']
 
 /**
  * Read a dot-path off an object (`'a.b.c'`); the object itself when no
@@ -66,6 +68,17 @@ export function readVisibleWhenPath(data, field) {
 	return String(field).split('.').reduce((obj, key) => (obj === null || obj === undefined ? obj : obj[key]), data)
 }
 
+/**
+ * Whether a value is a date string: not a number, and a moment `Date.parse`
+ * can read.
+ *
+ * @param {unknown} value The value.
+ * @return {boolean}
+ */
+function isDateLike(value) {
+	return typeof value === 'string' && value.trim() !== '' && !Number.isFinite(Number(value)) && Number.isFinite(Date.parse(value))
+}
+
 /**
  * Apply a visibleWhen comparison operator. Ordering operators coerce both
  * sides to Number; equality compares loosely-normalized primitives
@@ -99,12 +112,27 @@ export function compareVisibleWhen(actual, op, expected, ctx) {
 		const list = Array.isArray(right) ? right : [right]
 		return list.some((entry) => entry === actual || String(entry) === String(actual))
 	}
+	// `anyOf` holds when the value, or any entry of a list value, is one of
+	// the listed values: a record whose `dataCategories` holds "health" among
+	// others matches `anyOf ["health", "ethnicity"]` (DqSociaalDomein).
+	if (operator === 'anyOf') {
+		const list = Array.isArray(right) ? right : [right]
+		const values = Array.isArray(actual) ? actual : [actual]
+		return values.some((value) => value !== undefined && value !== null
+			&& list.some((entry) => entry === value || String(entry) === String(value)))
+	}
 	if (operator === 'eq' || operator === 'neq') {
 		const equal = actual === right || String(actual) === String(right)
 		return operator === 'eq' ? equal : !equal
 	}
-	const a = Number(actual)
-	const b = Number(right)
+	let a = Number(actual)
+	let b = Number(right)
+	// Two dates (`dueAt` against `@today`) compare as moments; a value that
+	// is a number on either side never reads as a date.
+	if ((!Number.isFinite(a) || !Number.isFinite(b)) && isDateLike(actual) && isDateLike(right)) {
+		a = Date.parse(actual)
+		b = Date.parse(right)
+	}
 	if (!Number.isFinite(a) || !Number.isFinite(b)) {
 		return false
 	}