feat: enhance enum suggestion control with array normalization and model value binding

- Added a new function to normalize array control data, ensuring consistent handling of various data types.
- Updated the model value binding in the enum-and-suggestion component to use the computed model value from the control.
- Improved the onChange logic to handle both array and non-array inputs effectively, enhancing the overall functionality of the enum suggestion control.

Author: tacxou

apps/api/src/migrations/jobs/1781081453-department-number.ts

@@ -0,0 +1,42 @@
+import { Logger } from '@nestjs/common';
+import { InjectConnection } from '@nestjs/mongoose';
+import { Connection } from 'mongoose';
+
+export default class DepartmentNumber1781081453 {
+  private readonly logger = new Logger(DepartmentNumber1781081453.name);
+
+  public constructor(@InjectConnection() private mongo: Connection) {}
+
+  public async up(): Promise<void> {
+    this.logger.log('DepartmentNumber1781081453 up started');
+
+    await this._migrateDepartmentNumberToArray();
+  }
+
+  private async _migrateDepartmentNumberToArray(): Promise<void> {
+    const identities = await this.mongo.collection('identities').find();
+
+    for await (const identity of identities) {
+      const departmentNumber = identity.inetOrgPerson?.departmentNumber;
+
+      if (typeof departmentNumber === 'string') {
+        this.logger.log(`Migrating departmentNumber for identity ${identity._id}`);
+        await this.mongo
+          .collection('identities')
+          .updateOne({ _id: identity._id }, { $set: { 'inetOrgPerson.departmentNumber': [departmentNumber] } });
+      } else if (Array.isArray(departmentNumber)) {
+        if (typeof departmentNumber[0] === 'number') {
+          this.logger.log(`Migrating departmentNumber for identity ${identity._id}`);
+          await this.mongo
+            .collection('identities')
+            .updateOne(
+              { _id: identity._id },
+              { $set: { 'inetOrgPerson.departmentNumber': departmentNumber.map(String) } },
+            );
+        }
+      }
+    }
+
+    this.logger.log('Migration terminée avec succès');
+  }
+}

apps/web/src/jsonforms/composables/controls/useEnumSuggestionControl.ts

@@ -1,4 +1,4 @@
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { first, get, isArray, isEmpty, isNumber, isObject, isString } from 'radash'
 import { useNuxtApp } from '#imports'
 import { determineClearValue, useQuasarControl } from '../../utils'
@@ -30,6 +30,22 @@ export const createEnumAdaptTarget = (clearValue: unknown) => {
   return (value: unknown) => (isBlankValue(value) ? clearValue : value)
 }
 
+export const normalizeArrayControlData = (data: unknown): unknown[] | null => {
+  if (data === null || data === undefined) {
+    return null
+  }
+
+  if (Array.isArray(data)) {
+    return data
+  }
+
+  if (typeof data === 'string' && data.trim().length === 0) {
+    return []
+  }
+
+  return [data]
+}
+
 export const isArraySchemaControl = (control: JsonFormsEnumControl['control']['value']) => {
   const schemaType = control.schema?.type
 
@@ -93,6 +109,40 @@ export const useEnumSuggestionControl = ({
 
   const isArrayControl = computed(() => isArraySchemaControl(control.control.value))
 
+  const modelValue = computed(() => {
+    const data = control.control.value.data
+
+    if (!isArrayControl.value) {
+      return data ?? null
+    }
+
+    return normalizeArrayControlData(data) ?? null
+  })
+
+  watch(
+    () => control.control.value.data,
+    (data) => {
+      if (!isArrayControl.value) {
+        return
+      }
+
+      if (data !== null && data !== undefined && !Array.isArray(data)) {
+        control.onChange(adaptTarget(normalizeArrayControlData(data) ?? []))
+      }
+    },
+    { immediate: true },
+  )
+
+  const onChange = (value: unknown) => {
+    if (isArrayControl.value) {
+      const normalized = Array.isArray(value) ? value : normalizeArrayControlData(value) ?? []
+      control.onChange(adaptTarget(normalized))
+      return
+    }
+
+    control.onChange(adaptTarget(value))
+  }
+
   const optionValueKey = computed(() =>
     resolveOptionKey(control.appliedOptions.value?.optionValue, 'value'),
   )
@@ -209,24 +259,24 @@ export const useEnumSuggestionControl = ({
 
   const createValue = (newValue: unknown, done: () => void) => {
     if (isArrayControl.value) {
-      const currentValue = Array.isArray(control.control.value.data)
-        ? control.control.value.data
-        : []
+      const currentValue = normalizeArrayControlData(control.control.value.data) ?? []
 
       if (newValue != null && !currentValue.includes(newValue)) {
         const updatedValue = [...currentValue, newValue]
-        control.onChange(adaptTarget(updatedValue))
+        onChange(updatedValue)
       }
     } else {
-      control.onChange(adaptTarget(newValue))
+      onChange(newValue)
     }
     done()
   }
 
   return {
     ...control,
     adaptTarget,
+    onChange,
     createValue,
+    modelValue,
     isArrayControl,
     optionValueKey,
     optionLabelKey,

apps/web/src/jsonforms/controls/enum-and-suggestion.vue

@@ -12,7 +12,7 @@
       @blur="isFocused = false"
       @new-value="createValue"
       :id="control.id"
-      :model-value="control.data || null"
+      :model-value="modelValue"
       :label="computedLabel"
       :class="styles.control.input"
       clear-icon="mdi-close"