diff --git a/packages/builder/src/components/backend/DataTable/formula.js b/packages/builder/src/components/backend/DataTable/formula.js index c0fdb96a07..8dcda83c27 100644 --- a/packages/builder/src/components/backend/DataTable/formula.js +++ b/packages/builder/src/components/backend/DataTable/formula.js @@ -2,6 +2,7 @@ import { FieldType } from "@budibase/types" import { FIELDS } from "@/constants/backend" import { tables } from "@/stores/builder" import { get as svelteGet } from "svelte/store" +import { makeReadableKeyPropSafe } from "@/dataBinding" // currently supported level of relationship depth (server side) const MAX_DEPTH = 1 @@ -62,11 +63,9 @@ export function getBindings({ const label = path == null ? column : `${path}.0.${column}` const binding = path == null ? `[${column}]` : `[${path}].0.[${column}]` - - let readableBinding = label - if (readableBinding.includes(" ")) { - readableBinding = `[${readableBinding}]` - } + const readableBinding = (path == null ? [column] : [path, "0", column]) + .map(makeReadableKeyPropSafe) + .join(".") // only supply a description for relationship paths const description = diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js index 1b4c69be71..c6171c72a4 100644 --- a/packages/builder/src/dataBinding.js +++ b/packages/builder/src/dataBinding.js @@ -373,7 +373,7 @@ const getContextBindings = (asset, componentId) => { .flat() } -const makeReadableKeyPropSafe = key => { +export const makeReadableKeyPropSafe = key => { if (!key.includes(" ")) { return key }