Merge pull request #13669 from Budibase/budi-8123/fix-binding-panel

Fix binding panel

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 },
         }
       }
     })

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