From e6f90d5a7dfe57caad5ed7c04099ac7aed4a27fc Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 10 May 2024 16:51:16 +0200
Subject: [PATCH 1/2] Fix binding

---
 packages/builder/src/dataBinding.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index 47a0aa8fb1..af229ce7e4 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -492,7 +492,7 @@ const generateComponentContextBindings = (asset, componentContext) => {
         icon: bindingCategory.icon,
         display: {
           name: `${fieldSchema.name || key}`,
-          type: fieldSchema.type,
+          type: fieldSchema.display?.type || fieldSchema.type,
         },
       })
     })
@@ -1030,12 +1030,13 @@ export const getSchemaForDatasource = (asset, datasource, options) => {
         fixedSchema[fieldName] = {
           type: fieldSchema,
           name: fieldName,
+          display: { type: fieldSchema },
         }
       } else {
         fixedSchema[fieldName] = {
           ...fieldSchema,
-          type: field?.name || fieldSchema.name,
           name: fieldName,
+          display: { type: field?.name || fieldSchema.type },
         }
       }
     })

From cffa5cc67aa9053534d6132b79aa33b3c585eed2 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 10 May 2024 18:19:05 +0200
Subject: [PATCH 2/2] filtering config

---
 packages/frontend-core/src/components/FilterBuilder.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend-core/src/components/FilterBuilder.svelte b/packages/frontend-core/src/components/FilterBuilder.svelte
index 5ba5f6d5f8..fb7aa98405 100644
--- a/packages/frontend-core/src/components/FilterBuilder.svelte
+++ b/packages/frontend-core/src/components/FilterBuilder.svelte
@@ -125,6 +125,7 @@
     filter.type = fieldSchema?.type
     filter.subtype = fieldSchema?.subtype
     filter.formulaType = fieldSchema?.formulaType
+    filter.constraints = fieldSchema?.constraints
 
     // Update external type based on field
     filter.externalType = getSchema(filter)?.externalType