Merge branch 'master' into BUDI-7422/support-composite-keys
This commit is contained in:
commit
6b88622b50
7 changed files with 226 additions and 71 deletions
|
@ -15,6 +15,7 @@
|
||||||
Checkbox,
|
Checkbox,
|
||||||
DatePicker,
|
DatePicker,
|
||||||
DrawerContent,
|
DrawerContent,
|
||||||
|
Toggle,
|
||||||
} from "@budibase/bbui"
|
} from "@budibase/bbui"
|
||||||
import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
|
import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
|
||||||
import { automationStore, selectedAutomation, tables } from "stores/builder"
|
import { automationStore, selectedAutomation, tables } from "stores/builder"
|
||||||
|
@ -118,7 +119,6 @@
|
||||||
searchableSchema: true,
|
searchableSchema: true,
|
||||||
}).schema
|
}).schema
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (isTestModal) {
|
if (isTestModal) {
|
||||||
let newTestData = { schema }
|
let newTestData = { schema }
|
||||||
|
@ -385,6 +385,16 @@
|
||||||
return params
|
return params
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function toggleAttachmentBinding(e, key) {
|
||||||
|
onChange(
|
||||||
|
{
|
||||||
|
detail: "",
|
||||||
|
},
|
||||||
|
key
|
||||||
|
)
|
||||||
|
onChange({ detail: { useAttachmentBinding: e.detail } }, "meta")
|
||||||
|
}
|
||||||
|
|
||||||
onMount(async () => {
|
onMount(async () => {
|
||||||
try {
|
try {
|
||||||
await environment.loadVariables()
|
await environment.loadVariables()
|
||||||
|
@ -462,27 +472,64 @@
|
||||||
<div class="label-wrapper">
|
<div class="label-wrapper">
|
||||||
<Label>{label}</Label>
|
<Label>{label}</Label>
|
||||||
</div>
|
</div>
|
||||||
<div class="attachment-field-width">
|
<div class="toggle-container">
|
||||||
<KeyValueBuilder
|
<Toggle
|
||||||
on:change={e =>
|
value={inputData?.meta?.useAttachmentBinding}
|
||||||
onChange(
|
text={"Use bindings"}
|
||||||
{
|
size={"XS"}
|
||||||
detail: e.detail.map(({ name, value }) => ({
|
on:change={e => toggleAttachmentBinding(e, key)}
|
||||||
url: name,
|
|
||||||
filename: value,
|
|
||||||
})),
|
|
||||||
},
|
|
||||||
key
|
|
||||||
)}
|
|
||||||
object={handleAttachmentParams(inputData[key])}
|
|
||||||
allowJS
|
|
||||||
{bindings}
|
|
||||||
keyBindings
|
|
||||||
customButtonText={"Add attachment"}
|
|
||||||
keyPlaceholder={"URL"}
|
|
||||||
valuePlaceholder={"Filename"}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="attachment-field-width">
|
||||||
|
{#if !inputData?.meta?.useAttachmentBinding}
|
||||||
|
<KeyValueBuilder
|
||||||
|
on:change={e =>
|
||||||
|
onChange(
|
||||||
|
{
|
||||||
|
detail: e.detail.map(({ name, value }) => ({
|
||||||
|
url: name,
|
||||||
|
filename: value,
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
key
|
||||||
|
)}
|
||||||
|
object={handleAttachmentParams(inputData[key])}
|
||||||
|
allowJS
|
||||||
|
{bindings}
|
||||||
|
keyBindings
|
||||||
|
customButtonText={"Add attachment"}
|
||||||
|
keyPlaceholder={"URL"}
|
||||||
|
valuePlaceholder={"Filename"}
|
||||||
|
/>
|
||||||
|
{:else if isTestModal}
|
||||||
|
<ModalBindableInput
|
||||||
|
title={value.title || label}
|
||||||
|
value={inputData[key]}
|
||||||
|
panel={AutomationBindingPanel}
|
||||||
|
type={value.customType}
|
||||||
|
on:change={e => onChange(e, key)}
|
||||||
|
{bindings}
|
||||||
|
updateOnChange={false}
|
||||||
|
/>
|
||||||
|
{:else}
|
||||||
|
<div class="test">
|
||||||
|
<DrawerBindableInput
|
||||||
|
title={value.title ?? label}
|
||||||
|
panel={AutomationBindingPanel}
|
||||||
|
type={value.customType}
|
||||||
|
value={inputData[key]}
|
||||||
|
on:change={e => onChange(e, key)}
|
||||||
|
{bindings}
|
||||||
|
updateOnChange={false}
|
||||||
|
placeholder={value.customType === "queryLimit"
|
||||||
|
? queryLimit
|
||||||
|
: ""}
|
||||||
|
drawerLeft="260px"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if value.customType === "filters"}
|
{:else if value.customType === "filters"}
|
||||||
<ActionButton on:click={drawer.show}>Define filters</ActionButton>
|
<ActionButton on:click={drawer.show}>Define filters</ActionButton>
|
||||||
|
|
|
@ -10,12 +10,12 @@
|
||||||
import { TableNames } from "constants"
|
import { TableNames } from "constants"
|
||||||
|
|
||||||
const dispatch = createEventDispatcher()
|
const dispatch = createEventDispatcher()
|
||||||
|
|
||||||
export let value
|
export let value
|
||||||
export let meta
|
export let meta
|
||||||
export let bindings
|
export let bindings
|
||||||
export let isTestModal
|
export let isTestModal
|
||||||
export let isUpdateRow
|
export let isUpdateRow
|
||||||
|
|
||||||
$: parsedBindings = bindings.map(binding => {
|
$: parsedBindings = bindings.map(binding => {
|
||||||
let clone = Object.assign({}, binding)
|
let clone = Object.assign({}, binding)
|
||||||
clone.icon = "ShareAndroid"
|
clone.icon = "ShareAndroid"
|
||||||
|
@ -94,17 +94,22 @@
|
||||||
dispatch("change", newValue)
|
dispatch("change", newValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
const onChangeSetting = (e, field) => {
|
const onChangeSetting = (field, key, value) => {
|
||||||
let fields = {}
|
let newField = {}
|
||||||
fields[field] = {
|
newField[field] = {
|
||||||
clearRelationships: e.detail,
|
[key]: value,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let updatedFields = {
|
||||||
|
...meta?.fields,
|
||||||
|
...newField,
|
||||||
|
}
|
||||||
|
|
||||||
dispatch("change", {
|
dispatch("change", {
|
||||||
key: "meta",
|
key: "meta",
|
||||||
fields,
|
fields: updatedFields,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ensure any nullish tableId values get set to empty string so
|
// Ensure any nullish tableId values get set to empty string so
|
||||||
// that the select works
|
// that the select works
|
||||||
$: if (value?.tableId == null) value = { tableId: "" }
|
$: if (value?.tableId == null) value = { tableId: "" }
|
||||||
|
@ -157,6 +162,9 @@
|
||||||
bindings={parsedBindings}
|
bindings={parsedBindings}
|
||||||
{value}
|
{value}
|
||||||
{onChange}
|
{onChange}
|
||||||
|
useAttachmentBinding={meta?.fields?.[field]
|
||||||
|
?.useAttachmentBinding}
|
||||||
|
{onChangeSetting}
|
||||||
/>
|
/>
|
||||||
</DrawerBindableSlot>
|
</DrawerBindableSlot>
|
||||||
{/if}
|
{/if}
|
||||||
|
@ -167,7 +175,8 @@
|
||||||
value={meta.fields?.[field]?.clearRelationships}
|
value={meta.fields?.[field]?.clearRelationships}
|
||||||
text={"Clear relationships if empty?"}
|
text={"Clear relationships if empty?"}
|
||||||
size={"S"}
|
size={"S"}
|
||||||
on:change={e => onChangeSetting(e, field)}
|
on:change={e =>
|
||||||
|
onChangeSetting(field, "clearRelationships", e.detail)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
<script>
|
<script>
|
||||||
import { Select, DatePicker, Multiselect, TextArea } from "@budibase/bbui"
|
import {
|
||||||
|
Select,
|
||||||
|
DatePicker,
|
||||||
|
Multiselect,
|
||||||
|
TextArea,
|
||||||
|
Toggle,
|
||||||
|
} from "@budibase/bbui"
|
||||||
import { FieldType } from "@budibase/types"
|
import { FieldType } from "@budibase/types"
|
||||||
import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
|
import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
|
||||||
import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
|
import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
|
||||||
|
@ -14,6 +20,8 @@
|
||||||
export let value
|
export let value
|
||||||
export let bindings
|
export let bindings
|
||||||
export let isTestModal
|
export let isTestModal
|
||||||
|
export let useAttachmentBinding
|
||||||
|
export let onChangeSetting
|
||||||
|
|
||||||
$: parsedBindings = bindings.map(binding => {
|
$: parsedBindings = bindings.map(binding => {
|
||||||
let clone = Object.assign({}, binding)
|
let clone = Object.assign({}, binding)
|
||||||
|
@ -27,6 +35,8 @@
|
||||||
FieldType.SIGNATURE_SINGLE,
|
FieldType.SIGNATURE_SINGLE,
|
||||||
]
|
]
|
||||||
|
|
||||||
|
let previousBindingState = useAttachmentBinding
|
||||||
|
|
||||||
function schemaHasOptions(schema) {
|
function schemaHasOptions(schema) {
|
||||||
return !!schema.constraints?.inclusion?.length
|
return !!schema.constraints?.inclusion?.length
|
||||||
}
|
}
|
||||||
|
@ -34,13 +44,6 @@
|
||||||
function handleAttachmentParams(keyValueObj) {
|
function handleAttachmentParams(keyValueObj) {
|
||||||
let params = {}
|
let params = {}
|
||||||
|
|
||||||
if (
|
|
||||||
(schema.type === FieldType.ATTACHMENT_SINGLE ||
|
|
||||||
schema.type === FieldType.SIGNATURE_SINGLE) &&
|
|
||||||
Object.keys(keyValueObj).length === 0
|
|
||||||
) {
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
if (!Array.isArray(keyValueObj) && keyValueObj) {
|
if (!Array.isArray(keyValueObj) && keyValueObj) {
|
||||||
keyValueObj = [keyValueObj]
|
keyValueObj = [keyValueObj]
|
||||||
}
|
}
|
||||||
|
@ -52,6 +55,26 @@
|
||||||
}
|
}
|
||||||
return params
|
return params
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function handleToggleChange(toggleField, event) {
|
||||||
|
if (event.detail === true) {
|
||||||
|
value[toggleField] = []
|
||||||
|
} else {
|
||||||
|
value[toggleField] = ""
|
||||||
|
}
|
||||||
|
previousBindingState = event.detail
|
||||||
|
onChangeSetting(toggleField, "useAttachmentBinding", event.detail)
|
||||||
|
onChange({ detail: value[toggleField] }, toggleField)
|
||||||
|
}
|
||||||
|
|
||||||
|
$: if (useAttachmentBinding !== previousBindingState) {
|
||||||
|
if (useAttachmentBinding) {
|
||||||
|
value[field] = []
|
||||||
|
} else {
|
||||||
|
value[field] = ""
|
||||||
|
}
|
||||||
|
previousBindingState = useAttachmentBinding
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
{#if schemaHasOptions(schema) && schema.type !== "array"}
|
{#if schemaHasOptions(schema) && schema.type !== "array"}
|
||||||
|
@ -108,38 +131,65 @@
|
||||||
useLabel={false}
|
useLabel={false}
|
||||||
/>
|
/>
|
||||||
{:else if attachmentTypes.includes(schema.type)}
|
{:else if attachmentTypes.includes(schema.type)}
|
||||||
<div class="attachment-field-spacinng">
|
<div class="attachment-field-container">
|
||||||
<KeyValueBuilder
|
<div class="toggle-container">
|
||||||
on:change={e =>
|
<Toggle
|
||||||
onChange(
|
value={useAttachmentBinding}
|
||||||
{
|
text={"Use bindings"}
|
||||||
detail:
|
size={"XS"}
|
||||||
schema.type === FieldType.ATTACHMENT_SINGLE ||
|
on:change={e => handleToggleChange(field, e)}
|
||||||
schema.type === FieldType.SIGNATURE_SINGLE
|
/>
|
||||||
? e.detail.length > 0
|
</div>
|
||||||
? {
|
{#if !useAttachmentBinding}
|
||||||
url: e.detail[0].name,
|
<div class="attachment-field-spacing">
|
||||||
filename: e.detail[0].value,
|
<KeyValueBuilder
|
||||||
}
|
on:change={async e => {
|
||||||
: {}
|
onChange(
|
||||||
: e.detail.map(({ name, value }) => ({
|
{
|
||||||
url: name,
|
detail:
|
||||||
filename: value,
|
schema.type === FieldType.ATTACHMENT_SINGLE ||
|
||||||
})),
|
schema.type === FieldType.SIGNATURE_SINGLE
|
||||||
},
|
? e.detail.length > 0
|
||||||
field
|
? {
|
||||||
)}
|
url: e.detail[0].name,
|
||||||
object={handleAttachmentParams(value[field])}
|
filename: e.detail[0].value,
|
||||||
allowJS
|
}
|
||||||
{bindings}
|
: {}
|
||||||
keyBindings
|
: e.detail.map(({ name, value }) => ({
|
||||||
customButtonText={"Add attachment"}
|
url: name,
|
||||||
keyPlaceholder={"URL"}
|
filename: value,
|
||||||
valuePlaceholder={"Filename"}
|
})),
|
||||||
actionButtonDisabled={(schema.type === FieldType.ATTACHMENT_SINGLE ||
|
},
|
||||||
schema.type === FieldType.SIGNATURE) &&
|
field
|
||||||
Object.keys(value[field]).length >= 1}
|
)
|
||||||
/>
|
}}
|
||||||
|
object={handleAttachmentParams(value[field])}
|
||||||
|
allowJS
|
||||||
|
{bindings}
|
||||||
|
keyBindings
|
||||||
|
customButtonText={"Add attachment"}
|
||||||
|
keyPlaceholder={"URL"}
|
||||||
|
valuePlaceholder={"Filename"}
|
||||||
|
actionButtonDisabled={(schema.type === FieldType.ATTACHMENT_SINGLE ||
|
||||||
|
schema.type === FieldType.SIGNATURE) &&
|
||||||
|
Object.keys(value[field]).length >= 1}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="json-input-spacing">
|
||||||
|
<svelte:component
|
||||||
|
this={isTestModal ? ModalBindableInput : DrawerBindableInput}
|
||||||
|
panel={AutomationBindingPanel}
|
||||||
|
value={value[field]}
|
||||||
|
on:change={e => onChange(e, field)}
|
||||||
|
type="string"
|
||||||
|
bindings={parsedBindings}
|
||||||
|
allowJS={true}
|
||||||
|
updateOnChange={false}
|
||||||
|
title={schema.name}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
{:else if ["string", "number", "bigint", "barcodeqr", "array"].includes(schema.type)}
|
{:else if ["string", "number", "bigint", "barcodeqr", "array"].includes(schema.type)}
|
||||||
<svelte:component
|
<svelte:component
|
||||||
|
@ -156,7 +206,8 @@
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.attachment-field-spacinng {
|
.attachment-field-spacing,
|
||||||
|
.json-input-spacing {
|
||||||
margin-top: var(--spacing-s);
|
margin-top: var(--spacing-s);
|
||||||
margin-bottom: var(--spacing-l);
|
margin-bottom: var(--spacing-l);
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,6 +99,15 @@ export function getError(err: any) {
|
||||||
return typeof err !== "string" ? err.toString() : err
|
return typeof err !== "string" ? err.toString() : err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function guardAttachment(attachmentObject: any) {
|
||||||
|
if (!("url" in attachmentObject) || !("filename" in attachmentObject)) {
|
||||||
|
const providedKeys = Object.keys(attachmentObject).join(", ")
|
||||||
|
throw new Error(
|
||||||
|
`Attachments must have both "url" and "filename" keys. You have provided: ${providedKeys}`
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export async function sendAutomationAttachmentsToStorage(
|
export async function sendAutomationAttachmentsToStorage(
|
||||||
tableId: string,
|
tableId: string,
|
||||||
row: Row
|
row: Row
|
||||||
|
@ -116,9 +125,15 @@ export async function sendAutomationAttachmentsToStorage(
|
||||||
schema?.type === FieldType.ATTACHMENT_SINGLE ||
|
schema?.type === FieldType.ATTACHMENT_SINGLE ||
|
||||||
schema?.type === FieldType.SIGNATURE_SINGLE
|
schema?.type === FieldType.SIGNATURE_SINGLE
|
||||||
) {
|
) {
|
||||||
|
if (Array.isArray(value)) {
|
||||||
|
value.forEach(item => guardAttachment(item))
|
||||||
|
} else {
|
||||||
|
guardAttachment(value)
|
||||||
|
}
|
||||||
attachmentRows[prop] = value
|
attachmentRows[prop] = value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const [prop, attachments] of Object.entries(attachmentRows)) {
|
for (const [prop, attachments] of Object.entries(attachmentRows)) {
|
||||||
if (Array.isArray(attachments)) {
|
if (Array.isArray(attachments)) {
|
||||||
if (attachments.length) {
|
if (attachments.length) {
|
||||||
|
@ -133,7 +148,6 @@ export async function sendAutomationAttachmentsToStorage(
|
||||||
|
|
||||||
return row
|
return row
|
||||||
}
|
}
|
||||||
|
|
||||||
async function generateAttachmentRow(attachment: AutomationAttachment) {
|
async function generateAttachmentRow(attachment: AutomationAttachment) {
|
||||||
const prodAppId = context.getProdAppId()
|
const prodAppId = context.getProdAppId()
|
||||||
|
|
||||||
|
|
|
@ -90,7 +90,6 @@ export async function run({ inputs, appId, emitter }: AutomationStepInput) {
|
||||||
tableId: inputs.row.tableId,
|
tableId: inputs.row.tableId,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
try {
|
try {
|
||||||
inputs.row = await cleanUpRow(inputs.row.tableId, inputs.row)
|
inputs.row = await cleanUpRow(inputs.row.tableId, inputs.row)
|
||||||
inputs.row = await sendAutomationAttachmentsToStorage(
|
inputs.row = await sendAutomationAttachmentsToStorage(
|
||||||
|
|
|
@ -118,6 +118,14 @@ export async function run({ inputs }: AutomationStepInput) {
|
||||||
}
|
}
|
||||||
to = to || undefined
|
to = to || undefined
|
||||||
|
|
||||||
|
if (attachments) {
|
||||||
|
if (Array.isArray(attachments)) {
|
||||||
|
attachments.forEach(item => automationUtils.guardAttachment(item))
|
||||||
|
} else {
|
||||||
|
automationUtils.guardAttachment(attachments)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let response = await sendSmtpEmail({
|
let response = await sendSmtpEmail({
|
||||||
to,
|
to,
|
||||||
|
|
|
@ -128,4 +128,31 @@ describe("test the create row action", () => {
|
||||||
expect(objectData).toBeDefined()
|
expect(objectData).toBeDefined()
|
||||||
expect(objectData.ContentLength).toBeGreaterThan(0)
|
expect(objectData.ContentLength).toBeGreaterThan(0)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it("should check that attachment without the correct keys throws an error", async () => {
|
||||||
|
let attachmentTable = await config.createTable(
|
||||||
|
basicTableWithAttachmentField()
|
||||||
|
)
|
||||||
|
|
||||||
|
let attachmentRow: any = {
|
||||||
|
tableId: attachmentTable._id,
|
||||||
|
}
|
||||||
|
|
||||||
|
let filename = "test2.txt"
|
||||||
|
let presignedUrl = await uploadTestFile(filename)
|
||||||
|
let attachmentObject = {
|
||||||
|
wrongKey: presignedUrl,
|
||||||
|
anotherWrongKey: filename,
|
||||||
|
}
|
||||||
|
|
||||||
|
attachmentRow.single_file_attachment = attachmentObject
|
||||||
|
const res = await setup.runStep(setup.actions.CREATE_ROW.stepId, {
|
||||||
|
row: attachmentRow,
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(res.success).toEqual(false)
|
||||||
|
expect(res.response).toEqual(
|
||||||
|
'Error: Attachments must have both "url" and "filename" keys. You have provided: wrongKey, anotherWrongKey'
|
||||||
|
)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue