From e142d2cc8178e2303fd3b25ca7c7f4729ff4d87f Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 11 Mar 2025 17:08:16 +0000 Subject: [PATCH 1/7] Don't show row test data selector outside of test modal. --- .../SetupPanel/AutomationBlockSetup.svelte | 93 ++++++++++--------- 1 file changed, 50 insertions(+), 43 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 488dd89391..9a1eac57d5 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -387,6 +387,55 @@ ] } + const getTestDataSelector = () => { + if (!isTestModal) { + return [] + } + return [{ + type: CoreSelect, + title: "Row", + props: { + disabled: !table, + placeholder: "Select a row", + options: fetchedRows, + loading: fetchLoading, + value: selectedRow, + autocomplete: true, + filter: false, + getOptionLabel: row => row?.[primaryDisplay] || "", + compare: (a, b) => a?.[primaryDisplay] === b?.[primaryDisplay], + onChange: e => { + if (isTestModal) { + onChange({ + id: e.detail?._id, + revision: e.detail?._rev, + row: e.detail, + oldRow: e.detail, + meta: { + fields: inputData["meta"]?.fields || {}, + oldFields: e.detail?.meta?.fields || {}, + }, + }) + } + }, + }, + }, + { + type: InfoDisplay, + props: { + warning: true, + icon: "AlertCircleFilled", + body: `Be careful when testing this automation because your data may be modified or deleted.`, + }, + }, + { + type: Divider, + props: { + noMargin: true, + }, + }] + } + stepLayouts[block.stepId] = { row: { schema: schema["row"], @@ -413,49 +462,7 @@ disabled: isTestModal, }, }, - { - type: CoreSelect, - title: "Row", - props: { - disabled: !table, - placeholder: "Select a row", - options: fetchedRows, - loading: fetchLoading, - value: selectedRow, - autocomplete: true, - filter: false, - getOptionLabel: row => row?.[primaryDisplay] || "", - compare: (a, b) => a?.[primaryDisplay] === b?.[primaryDisplay], - onChange: e => { - if (isTestModal) { - onChange({ - id: e.detail?._id, - revision: e.detail?._rev, - row: e.detail, - oldRow: e.detail, - meta: { - fields: inputData["meta"]?.fields || {}, - oldFields: e.detail?.meta?.fields || {}, - }, - }) - } - }, - }, - }, - { - type: InfoDisplay, - props: { - warning: true, - icon: "AlertCircleFilled", - body: `Be careful when testing this automation because your data may be modified or deleted.`, - }, - }, - { - type: Divider, - props: { - noMargin: true, - }, - }, + ...getTestDataSelector(), ...getIdConfig(), ...getRevConfig(), ...getRowTypeConfig(), From b60bfe1d35dad27202ca65aac10651e0dc36a127 Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 11 Mar 2025 17:34:18 +0000 Subject: [PATCH 2/7] Fix formatting. --- .../SetupPanel/AutomationBlockSetup.svelte | 80 ++++++++++--------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 9a1eac57d5..bed3c00e35 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -391,49 +391,51 @@ if (!isTestModal) { return [] } - return [{ - type: CoreSelect, - title: "Row", - props: { - disabled: !table, - placeholder: "Select a row", - options: fetchedRows, - loading: fetchLoading, - value: selectedRow, - autocomplete: true, - filter: false, - getOptionLabel: row => row?.[primaryDisplay] || "", - compare: (a, b) => a?.[primaryDisplay] === b?.[primaryDisplay], - onChange: e => { - if (isTestModal) { - onChange({ - id: e.detail?._id, - revision: e.detail?._rev, - row: e.detail, - oldRow: e.detail, - meta: { - fields: inputData["meta"]?.fields || {}, - oldFields: e.detail?.meta?.fields || {}, - }, - }) - } + return [ + { + type: CoreSelect, + title: "Row", + props: { + disabled: !table, + placeholder: "Select a row", + options: fetchedRows, + loading: fetchLoading, + value: selectedRow, + autocomplete: true, + filter: false, + getOptionLabel: row => row?.[primaryDisplay] || "", + compare: (a, b) => a?.[primaryDisplay] === b?.[primaryDisplay], + onChange: e => { + if (isTestModal) { + onChange({ + id: e.detail?._id, + revision: e.detail?._rev, + row: e.detail, + oldRow: e.detail, + meta: { + fields: inputData["meta"]?.fields || {}, + oldFields: e.detail?.meta?.fields || {}, + }, + }) + } + }, }, }, - }, - { - type: InfoDisplay, - props: { - warning: true, - icon: "AlertCircleFilled", - body: `Be careful when testing this automation because your data may be modified or deleted.`, + { + type: InfoDisplay, + props: { + warning: true, + icon: "AlertCircleFilled", + body: `Be careful when testing this automation because your data may be modified or deleted.`, + }, }, - }, - { - type: Divider, - props: { - noMargin: true, + { + type: Divider, + props: { + noMargin: true, + }, }, - }] + ] } stepLayouts[block.stepId] = { From 664c508d1440d6d9202184733fc2a844f565402c Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 11 Mar 2025 17:36:17 +0000 Subject: [PATCH 3/7] respond to pr feedback --- .../SetupPanel/AutomationBlockSetup.svelte | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index bed3c00e35..eb8cdd27e3 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -220,7 +220,18 @@ const stepStore = writable({}) $: stepState = $stepStore?.[block.id] - $: customStepLayouts($memoBlock, schemaProperties, stepState, fetchedRows) + const updateSelectedRow = testData => { + selectedRow = testData?.row + } + $: updateSelectedRow(testData) + + $: customStepLayouts( + $memoBlock, + schemaProperties, + stepState, + fetchedRows, + selectedRow + ) const customStepLayouts = block => { if ( From 84a48a9606dcf8aaf8c3a3fe3464d28ee0bbeaf9 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 12 Mar 2025 12:56:09 +0000 Subject: [PATCH 4/7] Remove on:focus event attribute as it caused all icons in the builder get a blue border --- packages/bbui/src/Icon/Icon.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bbui/src/Icon/Icon.svelte b/packages/bbui/src/Icon/Icon.svelte index 46b3140be8..7fd1a2485f 100644 --- a/packages/bbui/src/Icon/Icon.svelte +++ b/packages/bbui/src/Icon/Icon.svelte @@ -25,12 +25,12 @@ noWrap={tooltipWrap} >
+ Date: Wed, 12 Mar 2025 13:05:32 +0000 Subject: [PATCH 5/7] Allow uploading of signatures through views (#15722) --- .../src/components/app/forms/SignatureField.svelte | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/client/src/components/app/forms/SignatureField.svelte b/packages/client/src/components/app/forms/SignatureField.svelte index a7a7dc3206..ed5c951176 100644 --- a/packages/client/src/components/app/forms/SignatureField.svelte +++ b/packages/client/src/components/app/forms/SignatureField.svelte @@ -31,10 +31,12 @@ let attachRequest = new FormData() attachRequest.append("file", signatureFile) - const resp = await API.uploadAttachment( - formContext?.dataSource?.tableId, - attachRequest - ) + let sourceId = formContext?.dataSource?.tableId + if (formContext?.dataSource?.type === "viewV2") { + sourceId = formContext.dataSource.id + } + + const resp = await API.uploadAttachment(sourceId, attachRequest) const [signatureAttachment] = resp updateValue = signatureAttachment } else { From ca271abc1dcaa9a3477fa56befe29a11d087f01f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 12 Mar 2025 13:10:38 +0000 Subject: [PATCH 6/7] Bump version to 3.5.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index a0de97dc7a..8a80d4d69d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "3.5.0", + "version": "3.5.1", "npmClient": "yarn", "concurrency": 20, "command": { From 87f0104fc3aeedaffc44e83add6ccf79c4cbb7eb Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 12 Mar 2025 13:40:56 +0000 Subject: [PATCH 7/7] Bump version to 3.5.2 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 8a80d4d69d..62b9583157 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "3.5.1", + "version": "3.5.2", "npmClient": "yarn", "concurrency": 20, "command": {