From 74ee030c213d5372b8df06007ad8a9b6bd2629c5 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 9 Apr 2024 14:37:57 +0100 Subject: [PATCH 1/5] Fix for missing columns in Table/Grid settings --- .../GridColumnConfiguration/GridColumnConfiguration.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte index 439bf5e261..19d61e1f2a 100644 --- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte +++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte @@ -34,7 +34,7 @@ $selectedScreen, datasource )?.table?.primaryDisplay - $: schema = getSchema(selectedScreen, datasource) + $: schema = getSchema($selectedScreen, datasource) $: columns = getColumns({ columns: value, schema, From 76488e1aa117276062cd5044d0f20df11d3e8445 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 9 Apr 2024 15:22:16 +0100 Subject: [PATCH 2/5] Allow heights down to 120px for Table --- packages/client/src/components/app/GridBlock.svelte | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index 085449a5b0..f6ef55f802 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -49,6 +49,7 @@ metadata: { dataSource: table }, }, ] + $: customHeight = $component?.styles?.normal?.height // Provide additional data context for live binding eval export const getAdditionalDataContext = () => { @@ -110,6 +111,7 @@
Date: Tue, 9 Apr 2024 15:28:46 +0100 Subject: [PATCH 3/5] Add rowexplorer to illegalChildren for the repeaterblock. --- packages/client/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index a056f59cc7..4ffe979c7d 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -6011,7 +6011,7 @@ "block": true, "name": "Repeater Block", "icon": "ViewList", - "illegalChildren": ["section"], + "illegalChildren": ["section", "rowexplorer"], "hasChildren": true, "size": { "width": 400, From 06db50147ed580d0e8625aed9dc852f9d25a3499 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 10 Apr 2024 09:20:54 +0100 Subject: [PATCH 4/5] PR Feedback --- packages/client/src/components/app/GridBlock.svelte | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index f6ef55f802..8be3893da0 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -111,7 +111,6 @@
Date: Wed, 10 Apr 2024 09:28:36 +0100 Subject: [PATCH 5/5] Lint --- packages/client/src/components/app/GridBlock.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index 8be3893da0..0ee2cf1487 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -49,7 +49,6 @@ metadata: { dataSource: table }, }, ] - $: customHeight = $component?.styles?.normal?.height // Provide additional data context for live binding eval export const getAdditionalDataContext = () => {