From af51a167a3e71a73592a43142cbf9a14ccc9266b Mon Sep 17 00:00:00 2001
From: melohagan <101575380+melohagan@users.noreply.github.com>
Date: Fri, 19 Jan 2024 11:32:13 +0000
Subject: [PATCH] Support custom validation rules for ejected block fields
 (#12799)

---
 .../components/app/blocks/CardsBlock.svelte   |  2 +-
 .../components/app/blocks/TableBlock.svelte   |  2 +-
 .../src/components/app/forms/Form.svelte      |  4 +--
 .../src/components/app/forms/InnerForm.svelte | 35 +++++++++----------
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/packages/client/src/components/app/blocks/CardsBlock.svelte b/packages/client/src/components/app/blocks/CardsBlock.svelte
index 3e48247f92..e0985a8979 100644
--- a/packages/client/src/components/app/blocks/CardsBlock.svelte
+++ b/packages/client/src/components/app/blocks/CardsBlock.svelte
@@ -88,7 +88,7 @@
     <BlockComponent
       type="form"
       bind:id={formId}
-      props={{ dataSource, disableValidation: true }}
+      props={{ dataSource, disableSchemaValidation: true }}
     >
       {#if title || enrichedSearchColumns?.length || showTitleButton}
         <BlockComponent
diff --git a/packages/client/src/components/app/blocks/TableBlock.svelte b/packages/client/src/components/app/blocks/TableBlock.svelte
index 04a7134ca0..0597f9947f 100644
--- a/packages/client/src/components/app/blocks/TableBlock.svelte
+++ b/packages/client/src/components/app/blocks/TableBlock.svelte
@@ -147,7 +147,7 @@
       bind:id={formId}
       props={{
         dataSource,
-        disableValidation: true,
+        disableSchemaValidation: true,
         editAutoColumns: true,
         size,
       }}
diff --git a/packages/client/src/components/app/forms/Form.svelte b/packages/client/src/components/app/forms/Form.svelte
index 94559ab7be..2cbf2ec877 100644
--- a/packages/client/src/components/app/forms/Form.svelte
+++ b/packages/client/src/components/app/forms/Form.svelte
@@ -14,7 +14,7 @@
 
   // Not exposed as a builder setting. Used internally to disable validation
   // for fields rendered in things like search blocks.
-  export let disableValidation = false
+  export let disableSchemaValidation = false
 
   // Not exposed as a builder setting. Used internally to allow searching on
   // auto columns.
@@ -103,7 +103,7 @@
       {schema}
       {table}
       {initialValues}
-      {disableValidation}
+      {disableSchemaValidation}
       {editAutoColumns}
       {currentStep}
     >
diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte
index 9d0db43bf4..55c9c938c3 100644
--- a/packages/client/src/components/app/forms/InnerForm.svelte
+++ b/packages/client/src/components/app/forms/InnerForm.svelte
@@ -11,7 +11,7 @@
   export let size
   export let schema
   export let table
-  export let disableValidation = false
+  export let disableSchemaValidation = false
   export let editAutoColumns = false
 
   // We export this store so that when we remount the inner form we can still
@@ -156,17 +156,16 @@
       if (!field) {
         return
       }
-
       // Create validation function based on field schema
-      const schemaConstraints = schema?.[field]?.constraints
-      const validator = disableValidation
+      const schemaConstraints = disableSchemaValidation
         ? null
-        : createValidatorFromConstraints(
-            schemaConstraints,
-            validationRules,
-            field,
-            table
-          )
+        : schema?.[field]?.constraints
+      const validator = createValidatorFromConstraints(
+        schemaConstraints,
+        validationRules,
+        field,
+        table
+      )
 
       // Sanitise the default value to ensure it doesn't contain invalid data
       defaultValue = sanitiseValue(defaultValue, schema?.[field], type)
@@ -332,15 +331,15 @@
       const { value, error } = fieldState
 
       // Create new validator
-      const schemaConstraints = schema?.[field]?.constraints
-      const validator = disableValidation
+      const schemaConstraints = disableSchemaValidation
         ? null
-        : createValidatorFromConstraints(
-            schemaConstraints,
-            validationRules,
-            field,
-            table
-          )
+        : schema?.[field]?.constraints
+      const validator = createValidatorFromConstraints(
+        schemaConstraints,
+        validationRules,
+        field,
+        table
+      )
 
       // Update validator
       fieldInfo.update(state => {