merge v0.23.0-rc changes

ui/src/components/collections/schema/SchemaFieldSelect.svelte

@@ -1,10 +1,9 @@
 <script>
-    import CommonHelper from "@/utils/CommonHelper";
     import tooltip from "@/actions/tooltip";
     import Field from "@/components/base/Field.svelte";
+    import MultipleValueInput from "@/components/base/MultipleValueInput.svelte";
     import ObjectSelect from "@/components/base/ObjectSelect.svelte";
     import SchemaField from "@/components/collections/schema/SchemaField.svelte";
-    import MultipleValueInput from "@/components/base/MultipleValueInput.svelte";
 
     export let field;
     export let key = "";
@@ -14,27 +13,25 @@
         { label: "Multiple", value: false },
     ];
 
-    let isSingle = field.options?.maxSelect <= 1;
+    let isSingle = field.maxSelect <= 1;
     let oldIsSingle = isSingle;
 
-    $: if (CommonHelper.isEmpty(field.options)) {
+    $: if (typeof field.maxSelect == "undefined") {
         loadDefaults();
     }
 
     $: if (oldIsSingle != isSingle) {
         oldIsSingle = isSingle;
         if (isSingle) {
-            field.options.maxSelect = 1;
+            field.maxSelect = 1;
         } else {
-            field.options.maxSelect = field.options?.values?.length || 2;
+            field.maxSelect = field.values?.length || 2;
         }
     }
 
     function loadDefaults() {
-        field.options = {
-            maxSelect: 1,
-            values: [],
-        };
+        field.maxSelect = 1;
+        field.values = [];
         isSingle = true;
         oldIsSingle = isSingle;
     }
@@ -47,7 +44,7 @@
         <Field
             class="form-field required {!interactive ? 'readonly' : ''}"
             inlineError
-            name="schema.{key}.options.values"
+            name="fields.{key}.values"
             let:uniqueId
         >
             <div use:tooltip={{ text: "Choices (comma separated)", position: "top-left", delay: 700 }}>
@@ -56,7 +53,7 @@
                     placeholder="Choices: eg. optionA, optionB"
                     required
                     readonly={!interactive}
-                    bind:value={field.options.values}
+                    bind:value={field.values}
                 />
             </div>
         </Field>
@@ -81,15 +78,16 @@
 
     <svelte:fragment slot="options">
         {#if !isSingle}
-            <Field class="form-field required" name="schema.{key}.options.maxSelect" let:uniqueId>
+            <Field class="form-field" name="fields.{key}.maxSelect" let:uniqueId>
                 <label for={uniqueId}>Max select</label>
                 <input
                     id={uniqueId}
                     type="number"
                     step="1"
                     min="2"
-                    required
-                    bind:value={field.options.maxSelect}
+                    max={field.values.length}
+                    placeholder="Default to single"
+                    bind:value={field.maxSelect}
                 />
             </Field>
         {/if}