From 0e4a7ace08f6748b67ba2269a373be0a9b9bb9fe Mon Sep 17 00:00:00 2001
From: Dean <deanhannigan@gmail.com>
Date: Tue, 18 Oct 2022 16:24:36 +0100
Subject: [PATCH] Pushed default parsing up into the InnerForm component to
 ensure that invalid default values are removed entirely. Fixes for custom
 validation for array types

---
 .../bbui/src/Form/Core/Multiselect.svelte     | 19 +++-----------
 packages/bbui/src/Form/Core/Select.svelte     |  2 +-
 .../ValidationEditor/ValidationDrawer.svelte  |  3 +++
 .../src/components/app/forms/Field.svelte     |  9 +------
 .../src/components/app/forms/InnerForm.svelte | 26 ++++++++++++++++---
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte
index c76f5324c5..eb39e39042 100644
--- a/packages/bbui/src/Form/Core/Multiselect.svelte
+++ b/packages/bbui/src/Form/Core/Multiselect.svelte
@@ -15,25 +15,12 @@
   export let sort = false
   export let autoWidth = false
 
-  $: streamed = Array.isArray(value)
-    ? value.reduce((acc, entry) => {
-        if (typeof ele === "string" && entry.trim() === "") {
-          return acc
-        }
-        let processedOption = String(entry)
-        if (options.indexOf(processedOption) > -1) {
-          acc.push(processedOption)
-        }
-        return acc
-      }, [])
-    : []
-
   const dispatch = createEventDispatcher()
-  $: selectedLookupMap = getSelectedLookupMap(streamed)
+  $: selectedLookupMap = getSelectedLookupMap(value)
   $: optionLookupMap = getOptionLookupMap(options)
-  $: fieldText = getFieldText(streamed, optionLookupMap, placeholder)
+  $: fieldText = getFieldText(value, optionLookupMap, placeholder)
   $: isOptionSelected = optionValue => selectedLookupMap[optionValue] === true
-  $: toggleOption = makeToggleOption(selectedLookupMap, streamed)
+  $: toggleOption = makeToggleOption(selectedLookupMap, value)
 
   const getFieldText = (value, map, placeholder) => {
     if (Array.isArray(value) && value.length > 0) {
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index f549f58d0c..fbb7f80c13 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -36,7 +36,7 @@
 
   const getFieldText = (value, options, placeholder) => {
     // Always use placeholder if no value
-    if (value == null || value === "") {
+    if (value == null || value === "" || value.length == 0) {
       return placeholder || "Choose an option"
     }
 
diff --git a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
index 081e748caf..2624c28e7f 100644
--- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
@@ -305,6 +305,9 @@
                       getOptionLabel={x => x}
                       getOptionValue={x => x}
                       value={rule.value}
+                      on:change={e => {
+                        rule.value = e.detail
+                      }}
                     />
                   {:else if rule.type === "boolean"}
                     <Select
diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte
index 1203630de5..d6dddbbe39 100644
--- a/packages/client/src/components/app/forms/Field.svelte
+++ b/packages/client/src/components/app/forms/Field.svelte
@@ -27,19 +27,12 @@
   $: formField = formApi?.registerField(
     field,
     type,
-    parseDefaultValue(defaultValue),
+    defaultValue,
     disabled,
     validation,
     formStep
   )
 
-  const parseDefaultValue = defaultValue => {
-    if (Array.isArray(defaultValue) && type === "array") {
-      return defaultValue.map(val => String(val))
-    }
-    return defaultValue
-  }
-
   $: schemaType = fieldSchema?.type !== "formula" ? fieldSchema?.type : "string"
 
   // Focus label when editing
diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte
index 3b33ef1868..0c512bbe0f 100644
--- a/packages/client/src/components/app/forms/InnerForm.svelte
+++ b/packages/client/src/components/app/forms/InnerForm.svelte
@@ -128,6 +128,23 @@
     return fields.find(field => get(field).name === name)
   }
 
+  const getDefault = (defaultValue, schema, type) => {
+    // Remove any values not present in the field schema
+    // Convert any values supplied to string
+    if (Array.isArray(defaultValue) && type == "array") {
+      return defaultValue.reduce((acc, entry) => {
+        let processedOption = String(entry)
+        let schemaOptions = schema.constraints.inclusion
+        if (schemaOptions.indexOf(processedOption) > -1) {
+          acc.push(processedOption)
+        }
+        return acc
+      }, [])
+    } else {
+      return defaultValue
+    }
+  }
+
   const formApi = {
     registerField: (
       field,
@@ -143,6 +160,7 @@
 
       // Create validation function based on field schema
       const schemaConstraints = schema?.[field]?.constraints
+
       const validator = disableValidation
         ? null
         : createValidatorFromConstraints(
@@ -152,8 +170,10 @@
             table
           )
 
+      const parsedDefault = getDefault(defaultValue, schema?.[field], type)
+
       // If we've already registered this field then keep some existing state
-      let initialValue = Helpers.deepGet(initialValues, field) ?? defaultValue
+      let initialValue = Helpers.deepGet(initialValues, field) ?? parsedDefault
       let initialError = null
       let fieldId = `id-${Helpers.uuid()}`
       const existingField = getField(field)
@@ -186,11 +206,11 @@
           error: initialError,
           disabled:
             disabled || fieldDisabled || (isAutoColumn && !editAutoColumns),
-          defaultValue,
+          defaultValue: parsedDefault,
           validator,
           lastUpdate: Date.now(),
         },
-        fieldApi: makeFieldApi(field, defaultValue),
+        fieldApi: makeFieldApi(field, parsedDefault),
         fieldSchema: schema?.[field] ?? {},
       })