From 1b4a24fe83ae06645637029d14bcc335300e87de Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Tue, 10 Aug 2021 14:37:14 +0100
Subject: [PATCH] Add custom validation support to all fields except
 relationships

---
 .../src/forms/AttachmentField.svelte                  |  3 +++
 .../standard-components/src/forms/BooleanField.svelte |  2 ++
 .../src/forms/DateTimeField.svelte                    | 11 ++++++++++-
 packages/standard-components/src/forms/Field.svelte   |  8 +++++++-
 .../src/forms/LongFormField.svelte                    |  2 ++
 .../standard-components/src/forms/OptionsField.svelte |  2 ++
 .../src/forms/RelationshipField.svelte                |  2 ++
 .../standard-components/src/forms/StringField.svelte  |  2 ++
 8 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/packages/standard-components/src/forms/AttachmentField.svelte b/packages/standard-components/src/forms/AttachmentField.svelte
index 0b454f9800..f2c4a35030 100644
--- a/packages/standard-components/src/forms/AttachmentField.svelte
+++ b/packages/standard-components/src/forms/AttachmentField.svelte
@@ -6,6 +6,7 @@
   export let field
   export let label
   export let disabled = false
+  export let validation
 
   let fieldState
   let fieldApi
@@ -35,6 +36,7 @@
   {label}
   {field}
   {disabled}
+  {validation}
   type="attachment"
   bind:fieldState
   bind:fieldApi
@@ -44,6 +46,7 @@
     <CoreDropzone
       value={$fieldState.value}
       disabled={$fieldState.disabled}
+      error={$fieldState.error}
       on:change={e => {
         fieldApi.setValue(e.detail)
       }}
diff --git a/packages/standard-components/src/forms/BooleanField.svelte b/packages/standard-components/src/forms/BooleanField.svelte
index 17a3c563bc..4634dd1062 100644
--- a/packages/standard-components/src/forms/BooleanField.svelte
+++ b/packages/standard-components/src/forms/BooleanField.svelte
@@ -6,6 +6,7 @@
   export let label
   export let text
   export let disabled = false
+  export let validation
 
   let fieldState
   let fieldApi
@@ -15,6 +16,7 @@
   {label}
   {field}
   {disabled}
+  {validation}
   type="boolean"
   bind:fieldState
   bind:fieldApi
diff --git a/packages/standard-components/src/forms/DateTimeField.svelte b/packages/standard-components/src/forms/DateTimeField.svelte
index 9332cfa721..9a5babae33 100644
--- a/packages/standard-components/src/forms/DateTimeField.svelte
+++ b/packages/standard-components/src/forms/DateTimeField.svelte
@@ -7,12 +7,21 @@
   export let placeholder
   export let disabled = false
   export let enableTime = false
+  export let validation
 
   let fieldState
   let fieldApi
 </script>
 
-<Field {label} {field} {disabled} type="datetime" bind:fieldState bind:fieldApi>
+<Field
+  {label}
+  {field}
+  {disabled}
+  {validation}
+  type="datetime"
+  bind:fieldState
+  bind:fieldApi
+>
   {#if fieldState}
     <CoreDatePicker
       value={$fieldState.value}
diff --git a/packages/standard-components/src/forms/Field.svelte b/packages/standard-components/src/forms/Field.svelte
index fd632c32d7..61b2e41f09 100644
--- a/packages/standard-components/src/forms/Field.svelte
+++ b/packages/standard-components/src/forms/Field.svelte
@@ -11,6 +11,7 @@
   export let defaultValue
   export let type
   export let disabled = false
+  export let validation
 
   // Get contexts
   const formContext = getContext("form")
@@ -21,7 +22,12 @@
   // Register field with form
   const formApi = formContext?.formApi
   const labelPosition = fieldGroupContext?.labelPosition || "above"
-  const formField = formApi?.registerField(field, defaultValue, disabled)
+  const formField = formApi?.registerField(
+    field,
+    defaultValue,
+    disabled,
+    validation
+  )
 
   // Expose field properties to parent component
   fieldState = formField?.fieldState
diff --git a/packages/standard-components/src/forms/LongFormField.svelte b/packages/standard-components/src/forms/LongFormField.svelte
index 45ea6aa034..8c502cc584 100644
--- a/packages/standard-components/src/forms/LongFormField.svelte
+++ b/packages/standard-components/src/forms/LongFormField.svelte
@@ -6,6 +6,7 @@
   export let label
   export let placeholder
   export let disabled = false
+  export let validation
 
   let fieldState
   let fieldApi
@@ -15,6 +16,7 @@
   {label}
   {field}
   {disabled}
+  {validation}
   type="longform"
   bind:fieldState
   bind:fieldApi
diff --git a/packages/standard-components/src/forms/OptionsField.svelte b/packages/standard-components/src/forms/OptionsField.svelte
index 659326bb34..31c8ebae00 100644
--- a/packages/standard-components/src/forms/OptionsField.svelte
+++ b/packages/standard-components/src/forms/OptionsField.svelte
@@ -7,6 +7,7 @@
   export let placeholder
   export let disabled = false
   export let optionsType = "select"
+  export let validation
 
   let fieldState
   let fieldApi
@@ -17,6 +18,7 @@
   {field}
   {label}
   {disabled}
+  {validation}
   type="options"
   bind:fieldState
   bind:fieldApi
diff --git a/packages/standard-components/src/forms/RelationshipField.svelte b/packages/standard-components/src/forms/RelationshipField.svelte
index b695994e75..f7d6581c7a 100644
--- a/packages/standard-components/src/forms/RelationshipField.svelte
+++ b/packages/standard-components/src/forms/RelationshipField.svelte
@@ -9,6 +9,7 @@
   export let label
   export let placeholder
   export let disabled = false
+  export let validation
 
   let fieldState
   let fieldApi
@@ -64,6 +65,7 @@
   {label}
   {field}
   {disabled}
+  {validation}
   type="link"
   bind:fieldState
   bind:fieldApi
diff --git a/packages/standard-components/src/forms/StringField.svelte b/packages/standard-components/src/forms/StringField.svelte
index 30de8621e4..63d306253b 100644
--- a/packages/standard-components/src/forms/StringField.svelte
+++ b/packages/standard-components/src/forms/StringField.svelte
@@ -7,6 +7,7 @@
   export let placeholder
   export let type = "text"
   export let disabled = false
+  export let validation
 
   let fieldState
   let fieldApi
@@ -16,6 +17,7 @@
   {label}
   {field}
   {disabled}
+  {validation}
   type={type === "number" ? "number" : "string"}
   bind:fieldState
   bind:fieldApi