@ditojs/admin 2.34.3 → 2.34.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/admin",
-  "version": "2.34.3",
+  "version": "2.34.5",
   "type": "module",
   "description": "Dito.js Admin is a schema based admin interface for Dito.js Server, featuring auto-generated views and forms and built with Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/admin",
@@ -91,5 +91,5 @@
     "vite": "^5.4.8"
   },
   "types": "types",
-  "gitHead": "5a5381114ae8012a9111015e2279fbc9e322c73a"
+  "gitHead": "ff641d5efcf55eed5ce7ebdd0a63d4d59dcbd43e"
 }

package/src/mixins/DitoMixin.js

@@ -236,6 +236,8 @@ export default {
         store = this.setStore(key, reactive({}))
       }
       if (index != null) {
+        // temporary uid keys will change between persistence, so we need to
+        // assign the key to the index even when the store already existed.
         this.setStoreKeyByIndex(index, key)
       }
       return store
@@ -269,7 +271,7 @@ export default {
 
     getLabel(schema, name) {
       return schema
-        ? this.getSchemaValue('label', { type: String, schema }) ||
+        ? this.getSchemaValue('label', { schema, type: [String, Object] }) ||
           labelize(name || schema.name)
         : labelize(name) || ''
     },

package/src/mixins/OptionsMixin.js

@@ -17,27 +17,27 @@ import {
 export default {
   mixins: [DataMixin],
 
-  data() {
-    return {
-      hasOptions: false
-    }
-  },
-
   computed: {
     selectedValue: {
       get() {
-        const convertValue = value =>
-          this.relate
-            ? this.hasOption(value)
-              ? this.getValueForOption(value)
+        const convertValue = value => {
+          const val = this.relate
+            ? this.getValueForOption(value)
+            : value
+
+          return this.hasOptions
+            ? this.getOptionForValue(val)
+              ? val
               : null
             : value
+        }
+
         const value = isArray(this.value)
           ? this.value.map(convertValue).filter(value => value !== null)
           : convertValue(this.value)
+
         if (
-          // When relating and as soon as the options are available...
-          this.relate &&
+          // As soon as the options are available, and...
           this.hasOptions && (
             // ...if the value is forced to null because a disappeared option...
             value === null && this.value !== null ||
@@ -54,13 +54,14 @@ export default {
       },
 
       set(value) {
-        const convert = value =>
+        const convertValue = value =>
           this.relate
             ? this.getOptionForValue(value)
             : value
+
         this.value = isArray(value)
-          ? value.map(convert)
-          : convert(value)
+          ? value.map(convertValue)
+          : convertValue(value)
       }
     },
 
@@ -73,9 +74,6 @@ export default {
       if (!isArray(data)) {
         throw new Error(`Invalid options data, should be array: ${data}`)
       }
-      // TODO: Fix side-effects
-      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-      this.hasOptions = data.length > 0
       return this.processOptions(data)
     },
 
@@ -85,6 +83,10 @@ export default {
       return this.options
     },
 
+    hasOptions() {
+      return this.activeOptions.length > 0
+    },
+
     relate: getSchemaAccessor('relate', {
       // TODO: Convert to `relateBy: 'id'`
       type: Boolean,
@@ -216,10 +218,6 @@ export default {
       return options
     },
 
-    hasOption(option) {
-      return !!this.getOptionForValue(this.getValueForOption(option))
-    },
-
     getOptionForValue(value) {
       const findOption = (options, value, groupBy) => {
         // Search for the option object with the given value and return the
@@ -244,7 +242,7 @@ export default {
     getValueForOption(option) {
       const { optionValue } = this
       return isString(optionValue)
-        ? option?.[optionValue]
+        ? option?.[optionValue] ?? null
         : isFunction(optionValue)
           ? optionValue(new DitoContext(this, { option }))
           : option