From 429d415cc9a6a453dd969b1e04c6688d1118da2d Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 21 May 2024 18:14:19 +0100 Subject: [PATCH] Quick fix to allow data UI to show relational fields. --- .../backend/DataTable/buttons/TableFilterButton.svelte | 8 ++------ packages/builder/src/helpers/searchFields.js | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte index decf77069f..9fab2e5533 100644 --- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte +++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte @@ -4,6 +4,7 @@ import FilterBuilder from "components/design/settings/controls/FilterEditor/FilterBuilder.svelte" import { getUserBindings } from "dataBinding" import { makePropSafe } from "@budibase/string-templates" + import { getFields } from "helpers/searchFields" export let schema export let filters @@ -15,12 +16,7 @@ let drawer $: tempValue = filters || [] - $: schemaFields = Object.entries(schema || {}).map( - ([fieldName, fieldSchema]) => ({ - name: fieldName, // Using the key as name if not defined in the schema, for example in some autogenerated columns - ...fieldSchema, - }) - ) + $: schemaFields = getFields(Object.values(schema || {}), { allowLinks: true }) $: text = getText(filters) $: selected = tempValue.filter(x => !x.onEmptyFilter)?.length > 0 diff --git a/packages/builder/src/helpers/searchFields.js b/packages/builder/src/helpers/searchFields.js index 73e4f1aaa2..4cbe394e04 100644 --- a/packages/builder/src/helpers/searchFields.js +++ b/packages/builder/src/helpers/searchFields.js @@ -4,6 +4,7 @@ import { get } from "svelte/store" export function getTableFields(linkField) { const table = get(tables).list.find(table => table._id === linkField.tableId) + // TODO: mdrury - add support for this with SQS at some point if (!table || !table.sql) { return [] }