From 6b5938aef6aa4021a12d2270627a736d0a6910a4 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 22 Mar 2024 15:26:05 +0000 Subject: [PATCH 01/27] Merging --- packages/backend-core/src/environment.ts | 2 +- packages/bbui/src/Form/Core/Signature.svelte | 140 +++++++++++++++++ packages/bbui/src/Form/Core/index.js | 1 + .../DataTable/modals/CreateEditColumn.svelte | 1 + .../design/settings/componentSettings.js | 1 + .../controls/FieldConfiguration/utils.js | 1 + .../builder/src/constants/backend/index.js | 10 ++ .../new/_components/componentStructure.json | 1 + .../builder/src/templates/commonComponents.js | 1 + packages/client/manifest.json | 49 ++++++ .../app/blocks/FormBlockComponent.svelte | 1 + .../src/components/app/forms/Signature.svelte | 8 + .../app/forms/SignatureField.svelte | 6 + .../client/src/components/app/forms/index.js | 1 + .../grid/cells/SignatureCell.svelte | 143 ++++++++++++++++++ .../src/components/grid/lib/renderers.js | 2 + .../src/components/grid/lib/utils.js | 2 +- .../server/src/utilities/rowProcessor/map.ts | 8 + packages/shared-core/src/table.ts | 2 + packages/types/src/documents/app/row.ts | 1 + 20 files changed, 379 insertions(+), 2 deletions(-) create mode 100644 packages/bbui/src/Form/Core/Signature.svelte create mode 100644 packages/client/src/components/app/forms/Signature.svelte create mode 100644 packages/client/src/components/app/forms/SignatureField.svelte create mode 100644 packages/frontend-core/src/components/grid/cells/SignatureCell.svelte diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts index 2da2a77d67..2f45c4a881 100644 --- a/packages/backend-core/src/environment.ts +++ b/packages/backend-core/src/environment.ts @@ -104,7 +104,7 @@ const environment = { JS_BCRYPT: process.env.JS_BCRYPT, JWT_SECRET: process.env.JWT_SECRET, JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK, - ENCRYPTION_KEY: process.env.ENCRYPTION_KEY, + ENCRYPTION_KEY: "wgeBLcM6sXQTmaH0UtjpO+hCQhCBDn/c7GQHlnqgPCc=", API_ENCRYPTION_KEY: getAPIEncryptionKey(), COUCH_DB_URL: process.env.COUCH_DB_URL || "http://localhost:4005", COUCH_DB_SQL_URL: process.env.COUCH_DB_SQL_URL || "http://localhost:4984", diff --git a/packages/bbui/src/Form/Core/Signature.svelte b/packages/bbui/src/Form/Core/Signature.svelte new file mode 100644 index 0000000000..74a022881c --- /dev/null +++ b/packages/bbui/src/Form/Core/Signature.svelte @@ -0,0 +1,140 @@ + + + +
+
{JSON.stringify(debugData, null, 2)}
+ { + touching = true + canvasMouseDown(e) + }} + on:touchend={e => { + touching = false + touchmove = false + stopTracking(e) + }} + on:touchmove={e => { + touchmove = true + handleDraw(e) + }} + on:touchleave={e => { + touching = false + touchmove = false + stopTracking(e) + }} + class:touching={touching && debug} + class:touchmove={touchmove && debug} + /> +
+ + diff --git a/packages/bbui/src/Form/Core/index.js b/packages/bbui/src/Form/Core/index.js index b0edf52748..806f15f1bf 100644 --- a/packages/bbui/src/Form/Core/index.js +++ b/packages/bbui/src/Form/Core/index.js @@ -14,3 +14,4 @@ export { default as CoreStepper } from "./Stepper.svelte" export { default as CoreRichTextField } from "./RichTextField.svelte" export { default as CoreSlider } from "./Slider.svelte" export { default as CoreFile } from "./File.svelte" +export { default as CoreSignature } from "./Signature.svelte" diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index f6a4f29a06..796c805232 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -385,6 +385,7 @@ return [ FIELDS.STRING, FIELDS.BARCODEQR, + FIELDS.SIGNATURE, FIELDS.LONGFORM, FIELDS.OPTIONS, FIELDS.ARRAY, diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js index f2d1520878..f6ff78b666 100644 --- a/packages/builder/src/components/design/settings/componentSettings.js +++ b/packages/builder/src/components/design/settings/componentSettings.js @@ -72,6 +72,7 @@ const componentMap = { "field/array": FormFieldSelect, "field/json": FormFieldSelect, "field/barcodeqr": FormFieldSelect, + "field/signature": FormFieldSelect, "field/bb_reference": FormFieldSelect, // Some validation types are the same as others, so not all types are // explicitly listed here. e.g. options uses string validation diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/utils.js b/packages/builder/src/components/design/settings/controls/FieldConfiguration/utils.js index c929263db1..420d542028 100644 --- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/utils.js +++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/utils.js @@ -43,5 +43,6 @@ export const FieldTypeToComponentMap = { link: "relationshipfield", json: "jsonfield", barcodeqr: "codescanner", + signature: "signaturefield", bb_reference: "bbreferencefield", } diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js index f1e3e1e2c2..edf49262d0 100644 --- a/packages/builder/src/constants/backend/index.js +++ b/packages/builder/src/constants/backend/index.js @@ -114,6 +114,16 @@ export const FIELDS = { presence: false, }, }, + // USE the single approach like Adrias update + SIGNATURE: { + name: "Signature", + type: FieldType.SIGNATURE, + icon: "AnnotatePen", + constraints: { + type: "array", + presence: false, + }, + }, LINK: { name: "Relationship", type: FieldType.LINK, diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json index 96e8faf93c..7621aa763d 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json @@ -72,6 +72,7 @@ "multifieldselect", "s3upload", "codescanner", + "signaturefield", "bbreferencefield" ] }, diff --git a/packages/builder/src/templates/commonComponents.js b/packages/builder/src/templates/commonComponents.js index 1a953224a7..63a0c93f66 100644 --- a/packages/builder/src/templates/commonComponents.js +++ b/packages/builder/src/templates/commonComponents.js @@ -13,6 +13,7 @@ const fieldTypeToComponentMap = { attachment: "attachmentfield", link: "relationshipfield", json: "jsonfield", + signature: "signaturefield", barcodeqr: "codescanner", } diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 531e2c968a..3dd308a27b 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -4112,6 +4112,55 @@ } ] }, + "signaturefield": { + "name": "Signature", + "icon": "AnnotatePen", + "styles": ["size"], + "size": { + "width": 400, + "height": 50 + }, + "settings": [ + { + "type": "field/signature", + "label": "Field", + "key": "field", + "required": true + }, + { + "type": "text", + "label": "Label", + "key": "label" + }, + { + "type": "text", + "label": "Help text", + "key": "helpText" + }, + { + "type": "boolean", + "label": "Disabled", + "key": "disabled", + "defaultValue": false + }, + { + "type": "event", + "label": "On change", + "key": "onChange", + "context": [ + { + "label": "Field Value", + "key": "value" + } + ] + }, + { + "type": "validation/string", + "label": "Validation", + "key": "validation" + } + ] + }, "embeddedmap": { "name": "Embedded Map", "icon": "Location", diff --git a/packages/client/src/components/app/blocks/FormBlockComponent.svelte b/packages/client/src/components/app/blocks/FormBlockComponent.svelte index ea1c3b0a37..dff49fb43e 100644 --- a/packages/client/src/components/app/blocks/FormBlockComponent.svelte +++ b/packages/client/src/components/app/blocks/FormBlockComponent.svelte @@ -19,6 +19,7 @@ link: "relationshipfield", json: "jsonfield", barcodeqr: "codescanner", + signature: "signaturefield", bb_reference: "bbreferencefield", } diff --git a/packages/client/src/components/app/forms/Signature.svelte b/packages/client/src/components/app/forms/Signature.svelte new file mode 100644 index 0000000000..9f43fe181b --- /dev/null +++ b/packages/client/src/components/app/forms/Signature.svelte @@ -0,0 +1,8 @@ + + +
+ Sig Wrap + +
diff --git a/packages/client/src/components/app/forms/SignatureField.svelte b/packages/client/src/components/app/forms/SignatureField.svelte new file mode 100644 index 0000000000..6f9203bfbb --- /dev/null +++ b/packages/client/src/components/app/forms/SignatureField.svelte @@ -0,0 +1,6 @@ + + +
SignatureField
+ diff --git a/packages/client/src/components/app/forms/index.js b/packages/client/src/components/app/forms/index.js index 5804d3a79d..69acd3a627 100644 --- a/packages/client/src/components/app/forms/index.js +++ b/packages/client/src/components/app/forms/index.js @@ -15,4 +15,5 @@ export { default as formstep } from "./FormStep.svelte" export { default as jsonfield } from "./JSONField.svelte" export { default as s3upload } from "./S3Upload.svelte" export { default as codescanner } from "./CodeScannerField.svelte" +export { default as signaturefield } from "./SignatureField.svelte" export { default as bbreferencefield } from "./BBReferenceField.svelte" diff --git a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte new file mode 100644 index 0000000000..ff133d7946 --- /dev/null +++ b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte @@ -0,0 +1,143 @@ + + + + +
+ signature cell: open {isOpen} +
+ +{#if isOpen} +
+ +
+ { + console.log("cell change") + }} + /> +
+
+{/if} + + diff --git a/packages/frontend-core/src/components/grid/lib/renderers.js b/packages/frontend-core/src/components/grid/lib/renderers.js index f5d4cfe297..3c10e47b44 100644 --- a/packages/frontend-core/src/components/grid/lib/renderers.js +++ b/packages/frontend-core/src/components/grid/lib/renderers.js @@ -10,12 +10,14 @@ import FormulaCell from "../cells/FormulaCell.svelte" import JSONCell from "../cells/JSONCell.svelte" import AttachmentCell from "../cells/AttachmentCell.svelte" import BBReferenceCell from "../cells/BBReferenceCell.svelte" +import SignatureCell from "../cells/SignatureCell.svelte" const TypeComponentMap = { text: TextCell, options: OptionsCell, datetime: DateCell, barcodeqr: TextCell, + signature: SignatureCell, longform: LongFormCell, array: MultiSelectCell, number: NumberCell, diff --git a/packages/frontend-core/src/components/grid/lib/utils.js b/packages/frontend-core/src/components/grid/lib/utils.js index 80bc3d9d67..5a87ae1ed1 100644 --- a/packages/frontend-core/src/components/grid/lib/utils.js +++ b/packages/frontend-core/src/components/grid/lib/utils.js @@ -10,6 +10,7 @@ const TypeIconMap = { options: "Dropdown", datetime: "Date", barcodeqr: "Camera", + signature: "AnnotatePen", longform: "TextAlignLeft", array: "Dropdown", number: "123", @@ -30,7 +31,6 @@ export const getColumnIcon = column => { return "MagicWand" } const { type, subtype } = column.schema - const result = typeof TypeIconMap[type] === "object" && subtype ? TypeIconMap[type][subtype] diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts index 60fe5a001b..54198fd900 100644 --- a/packages/server/src/utilities/rowProcessor/map.ts +++ b/packages/server/src/utilities/rowProcessor/map.ts @@ -113,6 +113,14 @@ export const TYPE_TRANSFORM_MAP: any = { [undefined]: undefined, parse: parseArrayString, }, + //Review this + [FieldType.SIGNATURE]: { + //@ts-ignore + [null]: [], + //@ts-ignore + [undefined]: undefined, + parse: parseArrayString, + }, [FieldType.BOOLEAN]: { "": null, //@ts-ignore diff --git a/packages/shared-core/src/table.ts b/packages/shared-core/src/table.ts index 5eab2fc340..c17ff36174 100644 --- a/packages/shared-core/src/table.ts +++ b/packages/shared-core/src/table.ts @@ -15,6 +15,7 @@ const allowDisplayColumnByType: Record = { [FieldType.BOOLEAN]: false, [FieldType.ARRAY]: false, [FieldType.ATTACHMENT]: false, + [FieldType.SIGNATURE]: false, [FieldType.LINK]: false, [FieldType.JSON]: false, [FieldType.BB_REFERENCE]: false, @@ -35,6 +36,7 @@ const allowSortColumnByType: Record = { [FieldType.FORMULA]: false, [FieldType.ATTACHMENT]: false, + [FieldType.SIGNATURE]: false, [FieldType.ARRAY]: false, [FieldType.LINK]: false, [FieldType.BB_REFERENCE]: false, diff --git a/packages/types/src/documents/app/row.ts b/packages/types/src/documents/app/row.ts index b37412398d..5f99787faf 100644 --- a/packages/types/src/documents/app/row.ts +++ b/packages/types/src/documents/app/row.ts @@ -15,6 +15,7 @@ export enum FieldType { JSON = "json", INTERNAL = "internal", BARCODEQR = "barcodeqr", + SIGNATURE = "signature", BIGINT = "bigint", BB_REFERENCE = "bb_reference", } From 1e5506b8c3a35f29ef08ce15af9324242bc948be Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 5 Apr 2024 12:50:09 +0100 Subject: [PATCH 02/27] Full support for signature field type and some feedback changes --- packages/bbui/src/Form/Core/Signature.svelte | 313 +++++++++++++----- packages/bbui/src/Modal/Modal.svelte | 1 + packages/bbui/src/Modal/ModalContent.svelte | 23 +- .../backend/DataTable/TableDataTable.svelte | 5 + .../components/backend/DataTable/formula.js | 1 + .../design/settings/componentSettings.js | 1 + .../ValidationEditor/ValidationDrawer.svelte | 1 + .../builder/src/constants/backend/index.js | 1 - packages/client/manifest.json | 2 +- .../client/src/components/Component.svelte | 3 + .../src/components/app/GridBlock.svelte | 2 + .../src/components/app/forms/Signature.svelte | 8 - .../app/forms/SignatureField.svelte | 140 +++++++- .../src/components/app/forms/validation.js | 4 +- .../src/components/SignatureModal.svelte | 48 +++ .../grid/cells/SignatureCell.svelte | 146 +++++--- .../src/components/grid/layout/Grid.svelte | 2 + .../frontend-core/src/components/index.js | 1 + packages/server/src/sdk/app/rows/utils.ts | 6 +- .../src/utilities/rowProcessor/attachments.ts | 11 +- .../src/utilities/rowProcessor/index.ts | 12 +- 21 files changed, 572 insertions(+), 159 deletions(-) delete mode 100644 packages/client/src/components/app/forms/Signature.svelte create mode 100644 packages/frontend-core/src/components/SignatureModal.svelte diff --git a/packages/bbui/src/Form/Core/Signature.svelte b/packages/bbui/src/Form/Core/Signature.svelte index 74a022881c..de73c803ad 100644 --- a/packages/bbui/src/Form/Core/Signature.svelte +++ b/packages/bbui/src/Form/Core/Signature.svelte @@ -1,65 +1,80 @@ - -
-
{JSON.stringify(debugData, null, 2)}
- { - touching = true - canvasMouseDown(e) - }} - on:touchend={e => { - touching = false - touchmove = false - stopTracking(e) - }} - on:touchmove={e => { - touchmove = true - handleDraw(e) - }} - on:touchleave={e => { - touching = false - touchmove = false - stopTracking(e) - }} - class:touching={touching && debug} - class:touchmove={touchmove && debug} - /> +
+ {#if !disabled} +
+ {#if updated && saveIcon} + + { + dispatch("change", toDataUrl()) + }} + /> + + {/if} + {#if signature?.url && !updated} + + { + if (editable) { + clearCanvas() + } + dispatch("clear") + }} + /> + + {/if} +
+ {/if} + {#if !editable && signature?.url} + + {#if !urlFailed} + { + urlFailed = true + }} + /> + {:else} + Could not load signature + {/if} + {:else} +
+ + {#if editable} +
+
+ +
+
+
+ {/if} +
+ {/if}
diff --git a/packages/bbui/src/Modal/Modal.svelte b/packages/bbui/src/Modal/Modal.svelte index be9c338892..4656be69d1 100644 --- a/packages/bbui/src/Modal/Modal.svelte +++ b/packages/bbui/src/Modal/Modal.svelte @@ -173,6 +173,7 @@ } .spectrum-Modal { + border: 2px solid var(--spectrum-global-color-gray-200); overflow: visible; max-height: none; margin: 40px 0; diff --git a/packages/bbui/src/Modal/ModalContent.svelte b/packages/bbui/src/Modal/ModalContent.svelte index 189ef70c2b..ecad889031 100644 --- a/packages/bbui/src/Modal/ModalContent.svelte +++ b/packages/bbui/src/Modal/ModalContent.svelte @@ -27,6 +27,7 @@ export let secondaryButtonText = undefined export let secondaryAction = undefined export let secondaryButtonWarning = false + export let enableGrid = true const { hide, cancel } = getContext(Context.Modal) let loading = false @@ -63,12 +64,13 @@ class:spectrum-Dialog--medium={size === "M"} class:spectrum-Dialog--large={size === "L"} class:spectrum-Dialog--extraLarge={size === "XL"} + class:no-grid={!enableGrid} style="position: relative;" role="dialog" tabindex="-1" aria-modal="true" > -
+
{#if title || $$slots.header}

import { datasources, tables, integrations, appStore } from "stores/builder" + import { themeStore } from "stores/portal" import EditRolesButton from "./buttons/EditRolesButton.svelte" import { TableNames } from "constants" import { Grid } from "@budibase/frontend-core" @@ -37,6 +38,9 @@ }) $: relationshipsEnabled = relationshipSupport(tableDatasource) + $: currentTheme = $themeStore?.theme + $: isDark = !currentTheme.includes("light") + const relationshipSupport = datasource => { const integration = $integrations[datasource?.source] return !isInternal && integration?.relationships !== false @@ -55,6 +59,7 @@
{ diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index 46a507387d..e2b34806d4 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -35,6 +35,7 @@ let grid + $: isDark = $component.isDark $: columnWhitelist = parsedColumns ?.filter(col => col.active) ?.map(col => col.field) @@ -114,6 +115,7 @@ - import SignatureField from "./SignatureField.svelte" - - -
- Sig Wrap - -
diff --git a/packages/client/src/components/app/forms/SignatureField.svelte b/packages/client/src/components/app/forms/SignatureField.svelte index 6f9203bfbb..3115fd58b3 100644 --- a/packages/client/src/components/app/forms/SignatureField.svelte +++ b/packages/client/src/components/app/forms/SignatureField.svelte @@ -1,6 +1,140 @@ -
SignatureField
- + + + + {#if fieldState} + {#if (Array.isArray(fieldState?.value) && !fieldState?.value?.length) || !fieldState?.value} + { + modal.show() + }} + > + Add signature + + {:else} +
+ +
+ {/if} + {/if} + + + diff --git a/packages/client/src/components/app/forms/validation.js b/packages/client/src/components/app/forms/validation.js index 3b3a5d6e1d..07b317537d 100644 --- a/packages/client/src/components/app/forms/validation.js +++ b/packages/client/src/components/app/forms/validation.js @@ -191,8 +191,8 @@ const parseType = (value, type) => { return value === true } - // Parse attachments, treating no elements as null - if (type === FieldTypes.ATTACHMENT) { + // Parse attachments/signatures, treating no elements as null + if (type === FieldTypes.ATTACHMENT || type === FieldTypes.SIGNATURE) { if (!Array.isArray(value) || !value.length) { return null } diff --git a/packages/frontend-core/src/components/SignatureModal.svelte b/packages/frontend-core/src/components/SignatureModal.svelte new file mode 100644 index 0000000000..e610320305 --- /dev/null +++ b/packages/frontend-core/src/components/SignatureModal.svelte @@ -0,0 +1,48 @@ + + + + { + onConfirm(canvas) + }} + > +
+ {title} +
+
+ +
+ + + + diff --git a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte index ff133d7946..f355b5074d 100644 --- a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte @@ -1,7 +1,9 @@ -
+
{#if !disabled}
{#if updated && saveIcon} diff --git a/packages/bbui/src/Modal/ModalContent.svelte b/packages/bbui/src/Modal/ModalContent.svelte index ecad889031..61ceaeb00a 100644 --- a/packages/bbui/src/Modal/ModalContent.svelte +++ b/packages/bbui/src/Modal/ModalContent.svelte @@ -27,7 +27,7 @@ export let secondaryButtonText = undefined export let secondaryAction = undefined export let secondaryButtonWarning = false - export let enableGrid = true + export let custom = false const { hide, cancel } = getContext(Context.Modal) let loading = false @@ -64,13 +64,13 @@ class:spectrum-Dialog--medium={size === "M"} class:spectrum-Dialog--large={size === "L"} class:spectrum-Dialog--extraLarge={size === "XL"} - class:no-grid={!enableGrid} + class:no-grid={custom} style="position: relative;" role="dialog" tabindex="-1" aria-modal="true" > -
+
{#if title || $$slots.header}

{ const integration = $integrations[datasource?.source] @@ -59,7 +59,7 @@
{ diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index e2b34806d4..20677ef49a 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -35,7 +35,8 @@ let grid - $: isDark = $component.isDark + $: currentTheme = $context?.device?.theme + $: darkMode = !currentTheme?.includes("light") $: columnWhitelist = parsedColumns ?.filter(col => col.active) ?.map(col => col.field) @@ -115,7 +116,7 @@ @@ -113,7 +113,7 @@ {:else}
{} export let value export let title - export let isDark + export let darkMode export const show = () => { modal.show() @@ -19,7 +19,7 @@ showConfirmButton showCancelButton={false} showCloseIcon={false} - enableGrid={false} + custom showDivider={false} onConfirm={() => { onConfirm(canvas) @@ -29,7 +29,7 @@ {title}
- +
diff --git a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte index bfa1e0c952..325d9cc631 100644 --- a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte @@ -31,7 +31,7 @@ } const onKeyDown = () => { - return isOpen + return false } const open = () => { @@ -81,7 +81,7 @@
@@ -95,7 +95,7 @@ onConfirm={saveSignature} title={schema?.name} {value} - isDark={$props.isDark} + darkMode={$props.darkMode} bind:this={modal} /> @@ -104,7 +104,7 @@ {#if signature?.key}
Date: Mon, 8 Apr 2024 09:39:39 +0100 Subject: [PATCH 06/27] Swap canvas drawing to use atrament --- packages/bbui/src/Form/Core/Signature.svelte | 105 ++++--------------- packages/client/package.json | 1 + 2 files changed, 24 insertions(+), 82 deletions(-) diff --git a/packages/bbui/src/Form/Core/Signature.svelte b/packages/bbui/src/Form/Core/Signature.svelte index ab2c2bc186..b59436016f 100644 --- a/packages/bbui/src/Form/Core/Signature.svelte +++ b/packages/bbui/src/Form/Core/Signature.svelte @@ -1,5 +1,6 @@ @@ -163,7 +117,7 @@ /> {/if} - {#if signature?.url && !updated} + {#if signatureFile?.url && !updated} {/if} - {#if !editable && signature?.url} + {#if !editable && signatureFile?.url} {#if !urlFailed} { urlFailed = true }} @@ -196,20 +150,7 @@ {/if} {:else}
- + {#if editable}
@@ -254,7 +195,7 @@ max-width: 100%; } .signature.light img, - .signature.light #canvas { + .signature.light #signature-canvas { -webkit-filter: invert(100%); filter: invert(100%); } diff --git a/packages/client/package.json b/packages/client/package.json index 00f89a6445..b751a6617c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -36,6 +36,7 @@ "dayjs": "^1.10.8", "downloadjs": "1.4.7", "html5-qrcode": "^2.2.1", + "atrament": "^4.1.0", "leaflet": "^1.7.1", "sanitize-html": "^2.7.0", "screenfull": "^6.0.1", From 9b276aa3c18dc3dada2e39af5de76811a5e502d2 Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 8 Apr 2024 12:18:05 +0100 Subject: [PATCH 07/27] Add in signature field testing support. Some signature fixes --- .../server/src/api/routes/tests/row.spec.ts | 66 +++++++++++++++---- .../server/src/sdk/app/rows/attachments.ts | 5 +- .../server/src/sdk/tests/attachments.spec.ts | 50 ++++++++++---- .../src/utilities/rowProcessor/attachments.ts | 5 +- 4 files changed, 98 insertions(+), 28 deletions(-) diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts index f9e05c5bd8..f7a1c3aa6f 100644 --- a/packages/server/src/api/routes/tests/row.spec.ts +++ b/packages/server/src/api/routes/tests/row.spec.ts @@ -237,6 +237,11 @@ describe.each([ name: "attachment", constraints: { type: "array", presence: false }, } + const signature: FieldSchema = { + type: FieldType.SIGNATURE, + name: "signature", + constraints: { type: "array", presence: false }, + } const bool: FieldSchema = { type: FieldType.BOOLEAN, name: "boolean", @@ -301,6 +306,10 @@ describe.each([ attachmentUndefined: attachment, attachmentEmpty: attachment, attachmentEmptyArrayStr: attachment, + signatureNull: signature, + signatureUndefined: signature, + signatureEmpty: signature, + signatureEmptyArrayStr: signature, arrayFieldEmptyArrayStr: arrayField, arrayFieldArrayStrKnown: arrayField, arrayFieldNull: arrayField, @@ -340,6 +349,10 @@ describe.each([ attachmentUndefined: undefined, attachmentEmpty: "", attachmentEmptyArrayStr: "[]", + signatureNull: null, + signatureUndefined: undefined, + signatureEmpty: "", + signatureEmptyArrayStr: "[]", arrayFieldEmptyArrayStr: "[]", arrayFieldUndefined: undefined, arrayFieldNull: null, @@ -372,6 +385,10 @@ describe.each([ expect(row.attachmentUndefined).toBe(undefined) expect(row.attachmentEmpty).toEqual([]) expect(row.attachmentEmptyArrayStr).toEqual([]) + expect(row.signatureNull).toEqual([]) + expect(row.signatureUndefined).toBe(undefined) + expect(row.signatureEmpty).toEqual([]) + expect(row.signatureEmptyArrayStr).toEqual([]) expect(row.arrayFieldEmptyArrayStr).toEqual([]) expect(row.arrayFieldNull).toEqual([]) expect(row.arrayFieldUndefined).toEqual(undefined) @@ -783,24 +800,21 @@ describe.each([ }) isInternal && - describe("attachments", () => { - it("should allow enriching attachment rows", async () => { + describe("attachments and signatures", () => { + const coreAttachmentEnrichment = async ( + schema: any, + field: string, + attachmentId: string + ) => { const table = await config.api.table.save( defaultTable({ - schema: { - attachment: { - type: FieldType.ATTACHMENT, - name: "attachment", - constraints: { type: "array", presence: false }, - }, - }, + schema, }) ) - const attachmentId = `${uuid.v4()}.csv` const row = await config.api.row.save(table._id!, { name: "test", description: "test", - attachment: [ + [field]: [ { key: `${config.getAppId()}/attachments/${attachmentId}`, }, @@ -810,11 +824,39 @@ describe.each([ await config.withEnv({ SELF_HOSTED: "true" }, async () => { return context.doInAppContext(config.getAppId(), async () => { const enriched = await outputProcessing(table, [row]) - expect((enriched as Row[])[0].attachment[0].url).toBe( + expect((enriched as Row[])[0]?.[field][0].url).toBe( `/files/signed/prod-budi-app-assets/${config.getProdAppId()}/attachments/${attachmentId}` ) }) }) + } + + it("should allow enriching attachment rows", async () => { + coreAttachmentEnrichment( + { + attachment: { + type: FieldType.ATTACHMENT, + name: "attachment", + constraints: { type: "array", presence: false }, + }, + }, + "attachment", + `${uuid.v4()}.csv` + ) + }) + + it("should allow enriching signature rows", async () => { + coreAttachmentEnrichment( + { + signature: { + type: FieldType.SIGNATURE, + name: "signature", + constraints: { type: "array", presence: false }, + }, + }, + "signature", + `${uuid.v4()}.png` + ) }) }) diff --git a/packages/server/src/sdk/app/rows/attachments.ts b/packages/server/src/sdk/app/rows/attachments.ts index 2ab9e83c47..44d2764798 100644 --- a/packages/server/src/sdk/app/rows/attachments.ts +++ b/packages/server/src/sdk/app/rows/attachments.ts @@ -30,7 +30,10 @@ export async function getRowsWithAttachments(appId: string, table: Table) { const db = dbCore.getDB(appId) const attachmentCols: string[] = [] for (let [key, column] of Object.entries(table.schema)) { - if (column.type === FieldType.ATTACHMENT) { + if ( + column.type === FieldType.ATTACHMENT || + column.type === FieldType.SIGNATURE + ) { attachmentCols.push(key) } } diff --git a/packages/server/src/sdk/tests/attachments.spec.ts b/packages/server/src/sdk/tests/attachments.spec.ts index c1736e6f8e..feaacce9a2 100644 --- a/packages/server/src/sdk/tests/attachments.spec.ts +++ b/packages/server/src/sdk/tests/attachments.spec.ts @@ -23,27 +23,18 @@ describe("should be able to re-write attachment URLs", () => { await config.init() }) - it("should update URLs on a number of rows over the limit", async () => { + const coreBehaviour = async (tblSchema: any, field: string) => { const table = await config.api.table.save({ name: "photos", type: "table", sourceId: INTERNAL_TABLE_SOURCE_ID, sourceType: TableSourceType.INTERNAL, - schema: { - photo: { - type: FieldType.ATTACHMENT, - name: "photo", - }, - otherCol: { - type: FieldType.STRING, - name: "otherCol", - }, - }, + schema: tblSchema, }) for (let i = 0; i < FIND_LIMIT * 4; i++) { await config.api.row.save(table._id!, { - photo: [attachment], + [field]: [attachment], otherCol: "string", }) } @@ -56,8 +47,39 @@ describe("should be able to re-write attachment URLs", () => { ) for (const row of rows) { expect(row.otherCol).toBe("string") - expect(row.photo[0].url).toBe("") - expect(row.photo[0].key).toBe(`${db.name}/attachments/a.png`) + expect(row[field][0].url).toBe("") + expect(row[field][0].key).toBe(`${db.name}/attachments/a.png`) } + } + + it("Attachment field, should update URLs on a number of rows over the limit", async () => { + await coreBehaviour( + { + photo: { + type: FieldType.ATTACHMENT, + name: "photo", + }, + otherCol: { + type: FieldType.STRING, + name: "otherCol", + }, + }, + "photo" + ) + }) + it("Signature field, should update URLs on a number of rows over the limit", async () => { + await coreBehaviour( + { + signature: { + type: FieldType.SIGNATURE, + name: "signature", + }, + otherCol: { + type: FieldType.STRING, + name: "otherCol", + }, + }, + "signature" + ) }) }) diff --git a/packages/server/src/utilities/rowProcessor/attachments.ts b/packages/server/src/utilities/rowProcessor/attachments.ts index 2b1c53cd4b..5690a32655 100644 --- a/packages/server/src/utilities/rowProcessor/attachments.ts +++ b/packages/server/src/utilities/rowProcessor/attachments.ts @@ -95,7 +95,10 @@ export class AttachmentCleanup { return AttachmentCleanup.coreCleanup(() => { let files: string[] = [] for (let [key, schema] of Object.entries(table.schema)) { - if (schema.type !== FieldType.ATTACHMENT) { + if ( + schema.type !== FieldType.ATTACHMENT && + schema.type !== FieldType.SIGNATURE + ) { continue } const oldKeys = From 8e62aa8945651a378f7e15ad38707d21883e6796 Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 8 Apr 2024 16:51:43 +0100 Subject: [PATCH 08/27] Fixes for existing attachment tests and some coverage for signatures --- .../rowProcessor/tests/attachments.spec.ts | 216 ++++++++++++++++-- 1 file changed, 196 insertions(+), 20 deletions(-) diff --git a/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts b/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts index cefea7e504..0fae5822c9 100644 --- a/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts +++ b/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts @@ -1,22 +1,30 @@ import { AttachmentCleanup } from "../attachments" import { FieldType, Table, Row, TableSourceType } from "@budibase/types" import { DEFAULT_BB_DATASOURCE_ID } from "../../../constants" -import { objectStore } from "@budibase/backend-core" +import { objectStore, db, context } from "@budibase/backend-core" +import * as uuid from "uuid" const BUCKET = "prod-budi-app-assets" const FILE_NAME = "file/thing.jpg" +const DEV_APPID = "abc_dev_123" +const PROD_APPID = "abc_123" jest.mock("@budibase/backend-core", () => { const actual = jest.requireActual("@budibase/backend-core") return { ...actual, + context: { + ...actual.context, + getAppId: jest.fn(), + }, objectStore: { deleteFiles: jest.fn(), ObjectStoreBuckets: actual.objectStore.ObjectStoreBuckets, }, db: { - isProdAppID: () => jest.fn(() => false), - dbExists: () => jest.fn(() => false), + isProdAppID: jest.fn(), + getProdAppID: jest.fn(), + dbExists: jest.fn(), }, } }) @@ -37,11 +45,28 @@ function table(): Table { type: FieldType.ATTACHMENT, constraints: {}, }, + signature: { + name: "signature", + type: FieldType.SIGNATURE, + constraints: {}, + }, }, } } -function row(fileKey: string = FILE_NAME): Row { +function rowSignature(fieldName: string = "signature") { + return { + [fieldName]: [ + { + size: 1, + extension: "png", + key: `${uuid.v4()}.png`, + }, + ], + } +} + +function rowAttachment(fileKey: string = FILE_NAME): Row { return { attach: [ { @@ -53,56 +78,154 @@ function row(fileKey: string = FILE_NAME): Row { } } -describe("attachment cleanup", () => { +describe("attachment/signature cleanup", () => { beforeEach(() => { mockedDeleteFiles.mockClear() + jest.resetAllMocks() + + jest.spyOn(context, "getAppId").mockReturnValue(DEV_APPID) + jest.spyOn(db, "isProdAppID").mockReturnValue(false) + jest.spyOn(db, "getProdAppID").mockReturnValue(PROD_APPID) + jest.spyOn(db, "dbExists").mockReturnValue(Promise.resolve(false)) + }) + + // Ignore calls to prune attachments when app is in production. + it("should not attempt to delete attachments/signatures if a published app exists", async () => { + jest.spyOn(db, "dbExists").mockReturnValue(Promise.resolve(true)) + const targetRow = { + ...rowAttachment(), + ...rowSignature(), + } + const originalTable = table() + delete originalTable.schema["attach"] + await AttachmentCleanup.tableUpdate(originalTable, [targetRow], { + oldTable: table(), + }) + expect(mockedDeleteFiles).not.toHaveBeenCalled() }) it("should be able to cleanup a table update", async () => { const originalTable = table() delete originalTable.schema["attach"] - await AttachmentCleanup.tableUpdate(originalTable, [row()], { + await AttachmentCleanup.tableUpdate(originalTable, [rowAttachment()], { oldTable: table(), }) expect(mockedDeleteFiles).toHaveBeenCalledWith(BUCKET, [FILE_NAME]) }) it("should be able to cleanup a table deletion", async () => { - await AttachmentCleanup.tableDelete(table(), [row()]) - expect(mockedDeleteFiles).toHaveBeenCalledWith(BUCKET, [FILE_NAME]) + const targetRow = { + ...rowAttachment(), + ...rowSignature(), + } + await AttachmentCleanup.tableDelete(table(), [targetRow]) + expect(mockedDeleteFiles).toHaveBeenCalledWith(BUCKET, [ + FILE_NAME, + targetRow.signature[0].key, + ]) }) - it("should handle table column renaming", async () => { + it("should handle table attachment column renaming", async () => { + const targetRow = { + ...rowAttachment(), + ...rowSignature(), + } const updatedTable = table() updatedTable.schema.attach2 = updatedTable.schema.attach delete updatedTable.schema.attach - await AttachmentCleanup.tableUpdate(updatedTable, [row()], { + await AttachmentCleanup.tableUpdate(updatedTable, [targetRow], { oldTable: table(), rename: { old: "attach", updated: "attach2" }, }) expect(mockedDeleteFiles).not.toHaveBeenCalled() }) - it("shouldn't cleanup if no table changes", async () => { - await AttachmentCleanup.tableUpdate(table(), [row()], { oldTable: table() }) + it("should handle table signature column renaming", async () => { + const targetRow = { + ...rowAttachment(), + ...rowSignature(), + } + const updatedTable = table() + updatedTable.schema.signaturex = updatedTable.schema.signature + delete updatedTable.schema.signature + await AttachmentCleanup.tableUpdate(updatedTable, [targetRow], { + oldTable: table(), + rename: { old: "signature", updated: "signaturex" }, + }) expect(mockedDeleteFiles).not.toHaveBeenCalled() }) - it("should handle row updates", async () => { - const updatedRow = row() + it("shouldn't cleanup if no table changes", async () => { + const targetRow = { + ...rowAttachment(), + ...rowSignature(), + } + await AttachmentCleanup.tableUpdate(table(), [targetRow], { + oldTable: table(), + }) + expect(mockedDeleteFiles).not.toHaveBeenCalled() + }) + + it("should handle row updates, remove attachment", async () => { + const targetRow = { + ...rowAttachment(), + ...rowSignature(), + } + const updatedRow = targetRow delete updatedRow.attach await AttachmentCleanup.rowUpdate(table(), { row: updatedRow, - oldRow: row(), + oldRow: rowAttachment(), }) expect(mockedDeleteFiles).toHaveBeenCalledWith(BUCKET, [FILE_NAME]) }) - it("should handle row deletion", async () => { - await AttachmentCleanup.rowDelete(table(), [row()]) + it("should handle row updates, remove signature", async () => { + const targetRow = { + ...rowAttachment(), + ...rowSignature(), + } + const updatedRow = { ...targetRow } + delete updatedRow.signature + await AttachmentCleanup.rowUpdate(table(), { + row: updatedRow, + oldRow: targetRow, + }) + expect(mockedDeleteFiles).toHaveBeenCalledWith(BUCKET, [ + targetRow.signature[0].key, + ]) + }) + + it("should handle row deletion, prune attachment", async () => { + const targetRow = { + ...rowAttachment(), + } + await AttachmentCleanup.rowDelete(table(), [targetRow]) expect(mockedDeleteFiles).toHaveBeenCalledWith(BUCKET, [FILE_NAME]) }) + it("should handle row deletion, prune signature", async () => { + const targetRow = { + ...rowSignature(), + } + await AttachmentCleanup.rowDelete(table(), [targetRow]) + expect(mockedDeleteFiles).toHaveBeenCalledWith(BUCKET, [ + targetRow.signature[0].key, + ]) + }) + + it("should handle row deletion, prune attachment AND signature", async () => { + const targetRow = { + ...rowAttachment(), + ...rowSignature(), + } + await AttachmentCleanup.rowDelete(table(), [targetRow]) + expect(mockedDeleteFiles).toHaveBeenCalledWith(BUCKET, [ + FILE_NAME, + targetRow.signature[0].key, + ]) + }) + it("should handle row deletion and not throw when attachments are undefined", async () => { await AttachmentCleanup.rowDelete(table(), [ { @@ -111,8 +234,28 @@ describe("attachment cleanup", () => { ]) }) - it("shouldn't cleanup attachments if row not updated", async () => { - await AttachmentCleanup.rowUpdate(table(), { row: row(), oldRow: row() }) + it("should handle row deletion and not throw when signatures are undefined", async () => { + await AttachmentCleanup.rowDelete(table(), [ + { + signature: undefined, + }, + ]) + }) + + it("shouldn't cleanup attachments if row isn't updated", async () => { + await AttachmentCleanup.rowUpdate(table(), { + row: rowAttachment(), + oldRow: rowAttachment(), + }) + expect(mockedDeleteFiles).not.toHaveBeenCalled() + }) + + it("shouldn't cleanup signature if row isn't updated", async () => { + const targetRow = rowSignature() + await AttachmentCleanup.rowUpdate(table(), { + row: targetRow, + oldRow: targetRow, + }) expect(mockedDeleteFiles).not.toHaveBeenCalled() }) @@ -121,7 +264,7 @@ describe("attachment cleanup", () => { delete originalTable.schema["attach"] await AttachmentCleanup.tableUpdate( originalTable, - [row("file 1"), { attach: undefined }, row("file 2")], + [rowAttachment("file 1"), { attach: undefined }, rowAttachment("file 2")], { oldTable: table(), } @@ -130,6 +273,26 @@ describe("attachment cleanup", () => { expect(mockedDeleteFiles).toHaveBeenCalledWith(BUCKET, ["file 1", "file 2"]) }) + it("should be able to cleanup a column and not throw when signatures are undefined", async () => { + const originalTable = table() + delete originalTable.schema["signature"] + + const sig1 = rowSignature() + const sig2 = rowSignature() + await AttachmentCleanup.tableUpdate( + originalTable, + [sig1, { signature: undefined }, sig2], + { + oldTable: table(), + } + ) + expect(mockedDeleteFiles).toHaveBeenCalledTimes(1) + expect(mockedDeleteFiles).toHaveBeenCalledWith(BUCKET, [ + sig1.signature[0].key, + sig2.signature[0].key, + ]) + }) + it("should be able to cleanup a column and not throw when ALL attachments are undefined", async () => { const originalTable = table() delete originalTable.schema["attach"] @@ -142,4 +305,17 @@ describe("attachment cleanup", () => { ) expect(mockedDeleteFiles).not.toHaveBeenCalled() }) + + it("should be able to cleanup a column and not throw when ALL signatures are undefined", async () => { + const originalTable = table() + delete originalTable.schema["signature"] + await AttachmentCleanup.tableUpdate( + originalTable, + [{}, { signature: undefined }], + { + oldTable: table(), + } + ) + expect(mockedDeleteFiles).not.toHaveBeenCalled() + }) }) From e1c69429c8f23318d8e3d3ecf76b9968f8ef3d5f Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 10 Apr 2024 09:32:47 +0100 Subject: [PATCH 09/27] Added signature type to sqs type map --- packages/server/src/sdk/app/tables/internal/sqs.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/server/src/sdk/app/tables/internal/sqs.ts b/packages/server/src/sdk/app/tables/internal/sqs.ts index da947c62c2..8c9b5096b9 100644 --- a/packages/server/src/sdk/app/tables/internal/sqs.ts +++ b/packages/server/src/sdk/app/tables/internal/sqs.ts @@ -28,6 +28,7 @@ const FieldTypeMap: Record = { [FieldType.INTERNAL]: SQLiteType.BLOB, [FieldType.BARCODEQR]: SQLiteType.BLOB, [FieldType.ATTACHMENT]: SQLiteType.BLOB, + [FieldType.SIGNATURE]: SQLiteType.BLOB, [FieldType.ARRAY]: SQLiteType.BLOB, [FieldType.LINK]: SQLiteType.BLOB, [FieldType.BIGINT]: SQLiteType.REAL, From 20c4bee20acb928225c7aa02edaa1c57c296ec66 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 11 Apr 2024 17:37:12 +0100 Subject: [PATCH 10/27] Fix for missing attachment validation --- .../design/settings/componentSettings.js | 1 + .../ValidationEditor/ValidationDrawer.svelte | 1 + packages/client/manifest.json | 2 +- .../src/components/app/forms/validation.js | 21 +++++++++++++------ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js index 927c2d9175..7ccc7a6463 100644 --- a/packages/builder/src/components/design/settings/componentSettings.js +++ b/packages/builder/src/components/design/settings/componentSettings.js @@ -86,6 +86,7 @@ const componentMap = { "validation/boolean": ValidationEditor, "validation/datetime": ValidationEditor, "validation/attachment": ValidationEditor, + "validation/attachment_single": ValidationEditor, "validation/signature": ValidationEditor, "validation/link": ValidationEditor, "validation/bb_reference": ValidationEditor, diff --git a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte index 29ce0bd064..eb1f7988fc 100644 --- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte @@ -108,6 +108,7 @@ Constraints.MaxFileSize, Constraints.MaxUploadSize, ], + ["attachment_single"]: [Constraints.Required, Constraints.MaxUploadSize], ["signature"]: [Constraints.Required], ["link"]: [ Constraints.Required, diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 0637004e36..9084a25753 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -4427,7 +4427,7 @@ "defaultValue": false }, { - "type": "validation/attachment", + "type": "validation/attachment_single", "label": "Validation", "key": "validation" }, diff --git a/packages/client/src/components/app/forms/validation.js b/packages/client/src/components/app/forms/validation.js index 903e1a47e7..5dfeb09f46 100644 --- a/packages/client/src/components/app/forms/validation.js +++ b/packages/client/src/components/app/forms/validation.js @@ -199,6 +199,14 @@ const parseType = (value, type) => { return value } + // Parse attachment single, treating no key as null + if (type === FieldTypes.ATTACHMENT_SINGLE) { + if (!value?.key) { + return null + } + return value + } + // Parse links, treating no elements as null if (type === FieldTypes.LINK) { if (!Array.isArray(value) || !value.length) { @@ -245,10 +253,8 @@ const maxLengthHandler = (value, rule) => { // Evaluates a max file size (MB) constraint const maxFileSizeHandler = (value, rule) => { const limit = parseType(rule.value, "number") - return ( - value == null || - !value.some(attachment => attachment.size / 1000000 > limit) - ) + const check = attachment => attachment.size / 1000000 > limit + return value == null || !(value?.key ? check(value) : value.some(check)) } // Evaluates a max total upload size (MB) constraint @@ -256,8 +262,11 @@ const maxUploadSizeHandler = (value, rule) => { const limit = parseType(rule.value, "number") return ( value == null || - value.reduce((acc, currentItem) => acc + currentItem.size, 0) / 1000000 <= - limit + (value?.key + ? value.size / 1000000 <= limit + : value.reduce((acc, currentItem) => acc + currentItem.size, 0) / + 1000000 <= + limit) ) } From eed8deca3542992dcda94d317d9120c776cf02e4 Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 15 Apr 2024 18:18:15 +0100 Subject: [PATCH 11/27] Fix to ensure signature action button is disabled in the builder and preview, if configured --- .../client/src/components/app/forms/SignatureField.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/app/forms/SignatureField.svelte b/packages/client/src/components/app/forms/SignatureField.svelte index 3a12fc3525..3041b93ca7 100644 --- a/packages/client/src/components/app/forms/SignatureField.svelte +++ b/packages/client/src/components/app/forms/SignatureField.svelte @@ -104,8 +104,11 @@ {#if (Array.isArray(fieldState?.value) && !fieldState?.value?.length) || !fieldState?.value} { - modal.show() + if (!$builderStore.inBuilder) { + modal.show() + } }} > Add signature From a0ccc09be9ef123eb80f292f6a2f1c3d92d9904d Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 18 Apr 2024 10:53:55 +0100 Subject: [PATCH 12/27] Bug fixes for default flag and modal title --- .../client/src/components/app/forms/SignatureField.svelte | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/client/src/components/app/forms/SignatureField.svelte b/packages/client/src/components/app/forms/SignatureField.svelte index 3041b93ca7..38e73402b8 100644 --- a/packages/client/src/components/app/forms/SignatureField.svelte +++ b/packages/client/src/components/app/forms/SignatureField.svelte @@ -80,7 +80,7 @@ { if (!$builderStore.inBuilder) { modal.show() @@ -117,7 +117,7 @@
Date: Thu, 18 Apr 2024 11:21:37 +0100 Subject: [PATCH 13/27] Removed attachment delete behaviour as it has been removed from the frontend entirely --- .../src/components/app/forms/SignatureField.svelte | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/packages/client/src/components/app/forms/SignatureField.svelte b/packages/client/src/components/app/forms/SignatureField.svelte index 38e73402b8..72d4ebe94f 100644 --- a/packages/client/src/components/app/forms/SignatureField.svelte +++ b/packages/client/src/components/app/forms/SignatureField.svelte @@ -54,24 +54,10 @@ } const deleteSignature = async () => { - const deleteRequest = fieldState?.value.map(item => item.key) - const changed = fieldApi.setValue([]) if (onChange && changed) { onChange({ value: [] }) } - - try { - await API.deleteAttachments({ - keys: deleteRequest, - tableId: formContext?.dataSource?.tableId, - }) - } catch (error) { - notificationStore.actions.error( - `There was a problem deleting your signature` - ) - console.error(error) - } } $: currentTheme = $context?.device?.theme From 605345bfd10cbb2a309d6eb47246e4024470c2ae Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 18 Apr 2024 11:43:10 +0100 Subject: [PATCH 14/27] Removed delete attachment behaviour from SignatureCell as the API behaviour has been removed. --- .../src/components/grid/cells/SignatureCell.svelte | 6 ------ 1 file changed, 6 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte index 325d9cc631..9ef1765f2b 100644 --- a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte @@ -44,12 +44,6 @@ const deleteSignature = async () => { onChange([]) - const deleteRequest = value.map(item => item.key) - try { - await API.deleteBuilderAttachments(deleteRequest) - } catch (error) { - $notifications.error(error.message || "Failed to delete signature") - } } const saveSignature = async sigCanvas => { From 7de06e7b7524ac03b359f16d6c7c917a593300d5 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 18 Apr 2024 15:08:21 +0100 Subject: [PATCH 15/27] Add support to data table modal UI for attachment single and signature types --- .../backend/DataTable/RowFieldControl.svelte | 97 ++++++++++++++++++- .../src/components/common/Dropzone.svelte | 1 + 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte index 1ec32cb3fd..c3bae3e079 100644 --- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte +++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte @@ -1,4 +1,5 @@ + { + const signatureFile = sigCanvas.toFile() + + let attachRequest = new FormData() + attachRequest.append("file", signatureFile) + + try { + const uploadReq = await API.uploadBuilderAttachment(attachRequest) + value = uploadReq + } catch (error) { + $notifications.error(error.message || "Failed to save signature") + value = [] + } + }} + title={meta.name} + {value} + bind:this={signatureModal} +/> + {#if type === "options" && meta.constraints.inclusion.length !== 0} {/if} + + diff --git a/packages/builder/src/components/common/Dropzone.svelte b/packages/builder/src/components/common/Dropzone.svelte index a864e1d028..cac7da9bf1 100644 --- a/packages/builder/src/components/common/Dropzone.svelte +++ b/packages/builder/src/components/common/Dropzone.svelte @@ -35,4 +35,5 @@ {...$$restProps} {processFiles} {handleFileTooLarge} + on:change /> From cfe854b9fc45917af42f68a0a8918f3d7e847a26 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 8 May 2024 10:07:49 +0100 Subject: [PATCH 16/27] Added darkMode back into the gridblock --- packages/client/src/components/app/GridBlock.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index b072b5d6a6..8236d77c25 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -131,6 +131,7 @@ {API} {stripeRows} {quiet} + {darkMode} {initialFilter} {initialSortColumn} {initialSortOrder} From 877d23aefffd8f4f5fb729a1b5db9aff048c9880 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 8 May 2024 10:19:05 +0100 Subject: [PATCH 17/27] Add Signature type to external integration utils --- packages/server/src/integrations/utils/utils.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/server/src/integrations/utils/utils.ts b/packages/server/src/integrations/utils/utils.ts index aac3f5f74a..6b99ec1bed 100644 --- a/packages/server/src/integrations/utils/utils.ts +++ b/packages/server/src/integrations/utils/utils.ts @@ -376,6 +376,7 @@ function copyExistingPropsOver( case FieldType.ARRAY: case FieldType.ATTACHMENTS: case FieldType.ATTACHMENT_SINGLE: + case FieldType.SIGNATURE: case FieldType.JSON: case FieldType.BB_REFERENCE: shouldKeepSchema = keepIfType(FieldType.JSON, FieldType.STRING) From 6b409166ee3fb0bac799ff7313c53c3f3240841d Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 10 May 2024 15:08:15 +0100 Subject: [PATCH 18/27] Updated expected error message in tests --- packages/server/src/automations/tests/executeQuery.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/automations/tests/executeQuery.spec.ts b/packages/server/src/automations/tests/executeQuery.spec.ts index 996e44af79..5a0688276d 100644 --- a/packages/server/src/automations/tests/executeQuery.spec.ts +++ b/packages/server/src/automations/tests/executeQuery.spec.ts @@ -88,7 +88,7 @@ describe.each( let res = await setup.runStep(setup.actions.EXECUTE_QUERY.stepId, { query: { queryId: "wrong_id" }, }) - expect(res.response).toEqual("Error: missing") + expect(res.response).toEqual("Error: CouchDB error: missing") expect(res.success).toEqual(false) }) }) From 0589a6a730a5db8a57b0230e34758e97b098affc Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 13 May 2024 16:19:02 +0100 Subject: [PATCH 19/27] Refactored signature from previous array implementation to the new single approach. Added support for automations --- packages/bbui/src/Form/Core/Signature.svelte | 3 +-- .../SetupPanel/AutomationBlockSetup.svelte | 3 ++- .../automation/SetupPanel/RowSelector.svelte | 15 +++++++------- .../SetupPanel/RowSelectorTypes.svelte | 16 ++++++++++----- .../backend/DataTable/RowFieldControl.svelte | 9 +++++---- .../ExistingTableDataImport.svelte | 4 ++++ .../common/bindings/DrawerBindableSlot.svelte | 10 +++++++++- .../builder/src/constants/backend/index.js | 1 - .../app/forms/SignatureField.svelte | 10 +++++----- .../src/components/app/forms/validation.js | 8 ++++---- .../grid/cells/SignatureCell.svelte | 19 +++++++----------- .../server/src/api/routes/tests/row.spec.ts | 14 ++++--------- .../server/src/automations/automationUtils.ts | 3 ++- .../server/src/sdk/app/backups/imports.ts | 6 +++--- packages/server/src/sdk/app/rows/utils.ts | 6 ++---- .../server/src/sdk/tests/attachments.spec.ts | 6 +++--- .../src/utilities/rowProcessor/attachments.ts | 2 +- .../src/utilities/rowProcessor/index.ts | 20 +++++++++---------- .../server/src/utilities/rowProcessor/map.ts | 8 -------- packages/server/src/utilities/schema.ts | 3 ++- 20 files changed, 82 insertions(+), 84 deletions(-) diff --git a/packages/bbui/src/Form/Core/Signature.svelte b/packages/bbui/src/Form/Core/Signature.svelte index b59436016f..3fb411534e 100644 --- a/packages/bbui/src/Form/Core/Signature.svelte +++ b/packages/bbui/src/Form/Core/Signature.svelte @@ -66,8 +66,7 @@ let urlFailed $: if (value) { - const [attachment] = value || [] - signatureFile = attachment + signatureFile = value } $: if (signatureFile?.url) { diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 0cf0f6c740..3bcbed5dcf 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -358,6 +358,7 @@ value.customType !== "cron" && value.customType !== "triggerSchema" && value.customType !== "automationFields" && + value.type !== "signature" && value.type !== "attachment" && value.type !== "attachment_single" ) @@ -449,7 +450,7 @@ value={inputData[key]} options={Object.keys(table?.schema || {})} /> - {:else if value.type === "attachment"} + {:else if value.type === "attachment" || value.type === "signature"}
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte index ab020aad08..fd7f5de459 100644 --- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte +++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte @@ -24,6 +24,11 @@ let table let schemaFields + let attachmentTypes = [ + FieldType.ATTACHMENTS, + FieldType.ATTACHMENT_SINGLE, + FieldType.SIGNATURE, + ] $: { table = $tables.list.find(table => table._id === value?.tableId) @@ -120,15 +125,9 @@ {#if schemaFields.length} {#each schemaFields as [field, schema]} {#if !schema.autocolumn} -
+
-
+
{#if isTestModal} onChange(e, field)} useLabel={false} /> -{:else if schema.type === FieldType.ATTACHMENTS || schema.type === FieldType.ATTACHMENT_SINGLE} +{:else if schema.type === FieldType.ATTACHMENTS || schema.type === FieldType.ATTACHMENT_SINGLE || schema.type === FieldType.SIGNATURE}
onChange( { detail: - schema.type === FieldType.ATTACHMENT_SINGLE + schema.type === FieldType.ATTACHMENT_SINGLE || + schema.type === FieldType.SIGNATURE ? e.detail.length > 0 - ? { url: e.detail[0].name, filename: e.detail[0].value } + ? { + url: e.detail[0].name, + filename: e.detail[0].value, + } : {} : e.detail.map(({ name, value }) => ({ url: name, @@ -125,7 +130,8 @@ customButtonText={"Add attachment"} keyPlaceholder={"URL"} valuePlaceholder={"Filename"} - actionButtonDisabled={schema.type === FieldType.ATTACHMENT_SINGLE && + actionButtonDisabled={(schema.type === FieldType.ATTACHMENT_SINGLE || + schema.type === FieldType.SIGNATURE) && Object.keys(value[field]).length >= 1} />
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte index c3bae3e079..7ba2fc5bcd 100644 --- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte +++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte @@ -62,7 +62,8 @@ try { const uploadReq = await API.uploadBuilderAttachment(attachRequest) - value = uploadReq + const [signatureAttachment] = uploadReq + value = signatureAttachment } catch (error) { $notifications.error(error.message || "Failed to save signature") value = [] @@ -114,14 +115,14 @@ {:else if type === "signature"}
-
- {#if value?.length} +
+ {#if value} { - value = [] + value = null }} /> {:else} diff --git a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte index b7fa243c07..b2ef25d7f3 100644 --- a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte +++ b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte @@ -54,6 +54,10 @@ label: "Attachment", value: FieldType.ATTACHMENT_SINGLE, }, + { + label: "Signature", + value: FieldType.SIGNATURE, + }, { label: "Attachment list", value: FieldType.ATTACHMENTS, diff --git a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte index fb448cca8d..4a0664363c 100644 --- a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte +++ b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte @@ -28,6 +28,12 @@ let bindingDrawer let currentVal = value + let attachmentTypes = [ + FieldType.ATTACHMENT_SINGLE, + FieldType.ATTACHMENTS, + FieldType.SIGNATURE, + ] + $: readableValue = runtimeToReadableBinding(bindings, value) $: tempValue = readableValue $: isJS = isJSBinding(value) @@ -105,6 +111,7 @@ boolean: isValidBoolean, attachment: false, attachment_single: false, + signature: false, } const isValid = value => { @@ -126,6 +133,7 @@ "bigint", "barcodeqr", "attachment", + "signature", "attachment_single", ].includes(type) ) { @@ -169,7 +177,7 @@ {updateOnChange} /> {/if} - {#if !disabled && type !== "formula" && !disabled && type !== FieldType.ATTACHMENTS && !disabled && type !== FieldType.ATTACHMENT_SINGLE} + {#if !disabled && type !== "formula" && !disabled && !attachmentTypes.includes(type)}
{ diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js index 5283c2a101..b3a1cc6099 100644 --- a/packages/builder/src/constants/backend/index.js +++ b/packages/builder/src/constants/backend/index.js @@ -132,7 +132,6 @@ export const FIELDS = { type: FieldType.SIGNATURE, icon: "AnnotatePen", constraints: { - type: "array", presence: false, }, }, diff --git a/packages/client/src/components/app/forms/SignatureField.svelte b/packages/client/src/components/app/forms/SignatureField.svelte index 72d4ebe94f..39cda69cb8 100644 --- a/packages/client/src/components/app/forms/SignatureField.svelte +++ b/packages/client/src/components/app/forms/SignatureField.svelte @@ -35,10 +35,10 @@ data: attachRequest, tableId: formContext?.dataSource?.tableId, }) - - updateValue = resp + const [signatureAttachment] = resp + updateValue = signatureAttachment } else { - updateValue = [] + updateValue = null } const changed = fieldApi.setValue(updateValue) @@ -54,9 +54,9 @@ } const deleteSignature = async () => { - const changed = fieldApi.setValue([]) + const changed = fieldApi.setValue(null) if (onChange && changed) { - onChange({ value: [] }) + onChange({ value: null }) } } diff --git a/packages/client/src/components/app/forms/validation.js b/packages/client/src/components/app/forms/validation.js index 22f02c7544..57471e68d3 100644 --- a/packages/client/src/components/app/forms/validation.js +++ b/packages/client/src/components/app/forms/validation.js @@ -192,16 +192,16 @@ const parseType = (value, type) => { return value === true } - // Parse attachments/signatures, treating no elements as null - if (type === FieldTypes.ATTACHMENTS || type === FieldTypes.SIGNATURE) { + // Parse attachments, treating no elements as null + if (type === FieldTypes.ATTACHMENTS) { if (!Array.isArray(value) || !value.length) { return null } return value } - // Parse attachment single, treating no key as null - if (type === FieldTypes.ATTACHMENT_SINGLE) { + // Parse attachment/signature single, treating no key as null + if (type === FieldTypes.ATTACHMENT_SINGLE || type === FieldTypes.SIGNATURE) { if (!value?.key) { return null } diff --git a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte index 9ef1765f2b..eb14c8bfc6 100644 --- a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte @@ -15,14 +15,8 @@ const { API, notifications, props } = getContext("grid") let isOpen = false - let signature let modal - $: if (value) { - const [attachment] = value - signature = attachment - } - $: editable = focused && !readonly $: { if (!focused) { @@ -43,7 +37,7 @@ } const deleteSignature = async () => { - onChange([]) + onChange(null) } const saveSignature = async sigCanvas => { @@ -54,7 +48,8 @@ try { const uploadReq = await API.uploadBuilderAttachment(attachRequest) - onChange(uploadReq) + const [signatureAttachment] = uploadReq + onChange(signatureAttachment) } catch (error) { $notifications.error(error.message || "Failed to save signature") return [] @@ -79,9 +74,9 @@ class:editable on:click={editable ? open : null} > - {#if signature?.url} + {#if value?.url} - + {/if}
@@ -94,8 +89,8 @@ /> {#if isOpen} -
- {#if signature?.key} +
+ {#if value?.key}
rewriteAttachmentUrl(prodAppId, attachment) ) } else if ( - columnType === FieldType.ATTACHMENT_SINGLE && + (columnType === FieldType.ATTACHMENT_SINGLE || + columnType === FieldType.SIGNATURE) && row[column] ) { row[column] = rewriteAttachmentUrl(prodAppId, row[column]) diff --git a/packages/server/src/sdk/app/rows/utils.ts b/packages/server/src/sdk/app/rows/utils.ts index dc9821aba3..a9df4f89cd 100644 --- a/packages/server/src/sdk/app/rows/utils.ts +++ b/packages/server/src/sdk/app/rows/utils.ts @@ -181,15 +181,13 @@ export async function validate({ errors[fieldName] = [`${fieldName} is required`] } } else if ( - (type === FieldType.ATTACHMENTS || - type === FieldType.JSON || - type === FieldType.SIGNATURE) && + (type === FieldType.ATTACHMENTS || type === FieldType.JSON) && typeof row[fieldName] === "string" ) { // this should only happen if there is an error try { const json = JSON.parse(row[fieldName]) - if (type === FieldType.ATTACHMENTS || type === FieldType.SIGNATURE) { + if (type === FieldType.ATTACHMENTS) { if (Array.isArray(json)) { row[fieldName] = json } else { diff --git a/packages/server/src/sdk/tests/attachments.spec.ts b/packages/server/src/sdk/tests/attachments.spec.ts index 823e1a575d..d8673b02e6 100644 --- a/packages/server/src/sdk/tests/attachments.spec.ts +++ b/packages/server/src/sdk/tests/attachments.spec.ts @@ -94,14 +94,14 @@ describe("should be able to re-write attachment URLs", () => { }, }, { - signature: [{ ...attachment }], + signature: { ...attachment }, otherCol: "string", } ) for (const row of rows) { expect(row.otherCol).toBe("string") - expect(row.signature[0].url).toBe("") - expect(row.signature[0].key).toBe(`${db.name}/attachments/a.png`) + expect(row.signature.url).toBe("") + expect(row.signature.key).toBe(`${db.name}/attachments/a.png`) } }) }) diff --git a/packages/server/src/utilities/rowProcessor/attachments.ts b/packages/server/src/utilities/rowProcessor/attachments.ts index 762ab6cb07..1d788e5a62 100644 --- a/packages/server/src/utilities/rowProcessor/attachments.ts +++ b/packages/server/src/utilities/rowProcessor/attachments.ts @@ -35,7 +35,7 @@ export class AttachmentCleanup { return [] } - if (type === FieldType.ATTACHMENTS || type === FieldType.SIGNATURE) { + if (type === FieldType.ATTACHMENTS) { return rowData.map((attachment: any) => attachment.key) } return [rowData.key] diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts index ae5ae7992c..11f5e033e6 100644 --- a/packages/server/src/utilities/rowProcessor/index.ts +++ b/packages/server/src/utilities/rowProcessor/index.ts @@ -148,17 +148,17 @@ export async function inputProcessing( } // remove any attachment urls, they are generated on read - if ( - field.type === FieldType.ATTACHMENTS || - field.type === FieldType.SIGNATURE - ) { + if (field.type === FieldType.ATTACHMENTS) { const attachments = clonedRow[key] if (attachments?.length) { attachments.forEach((attachment: RowAttachment) => { delete attachment.url }) } - } else if (field.type === FieldType.ATTACHMENT_SINGLE) { + } else if ( + field.type === FieldType.ATTACHMENT_SINGLE || + field.type === FieldType.SIGNATURE + ) { const attachment = clonedRow[key] if (attachment?.url) { delete clonedRow[key].url @@ -224,10 +224,7 @@ export async function outputProcessing( // process complex types: attachements, bb references... for (let [property, column] of Object.entries(table.schema)) { - if ( - column.type === FieldType.ATTACHMENTS || - column.type === FieldType.SIGNATURE - ) { + if (column.type === FieldType.ATTACHMENTS) { for (let row of enriched) { if (row[property] == null || !Array.isArray(row[property])) { continue @@ -238,7 +235,10 @@ export async function outputProcessing( } }) } - } else if (column.type === FieldType.ATTACHMENT_SINGLE) { + } else if ( + column.type === FieldType.ATTACHMENT_SINGLE || + column.type === FieldType.SIGNATURE + ) { for (let row of enriched) { if (!row[property] || Object.keys(row[property]).length === 0) { continue diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts index 956efc9a4f..2e0ac9efe1 100644 --- a/packages/server/src/utilities/rowProcessor/map.ts +++ b/packages/server/src/utilities/rowProcessor/map.ts @@ -113,14 +113,6 @@ export const TYPE_TRANSFORM_MAP: any = { [undefined]: undefined, parse: parseArrayString, }, - //Review this - [FieldType.SIGNATURE]: { - //@ts-ignore - [null]: [], - //@ts-ignore - [undefined]: undefined, - parse: parseArrayString, - }, [FieldType.BOOLEAN]: { "": null, //@ts-ignore diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts index 40bde42a5d..2bdc5653af 100644 --- a/packages/server/src/utilities/schema.ts +++ b/packages/server/src/utilities/schema.ts @@ -149,7 +149,8 @@ export function parse(rows: Rows, schema: TableSchema): Rows { } } else if ( (columnType === FieldType.ATTACHMENTS || - columnType === FieldType.ATTACHMENT_SINGLE) && + columnType === FieldType.ATTACHMENT_SINGLE || + columnType === FieldType.SIGNATURE) && typeof columnData === "string" ) { parsedRow[columnName] = parseCsvExport(columnData) From 03a484e9df587beb724591cb4ff9cd32d423eb0c Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 13 May 2024 16:34:09 +0100 Subject: [PATCH 20/27] Build fixes --- packages/server/src/integrations/base/sqlTable.ts | 1 + packages/server/src/integrations/googlesheets.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/server/src/integrations/base/sqlTable.ts b/packages/server/src/integrations/base/sqlTable.ts index a82a9fcea8..7d5ff632b7 100644 --- a/packages/server/src/integrations/base/sqlTable.ts +++ b/packages/server/src/integrations/base/sqlTable.ts @@ -125,6 +125,7 @@ function generateSchema( break case FieldType.ATTACHMENTS: case FieldType.ATTACHMENT_SINGLE: + case FieldType.SIGNATURE: case FieldType.AUTO: case FieldType.JSON: case FieldType.INTERNAL: diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index da98ac4875..ca9ca7f465 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -72,6 +72,7 @@ const isTypeAllowed: Record = { [FieldType.JSON]: false, [FieldType.INTERNAL]: false, [FieldType.BIGINT]: false, + [FieldType.SIGNATURE]: false, } const ALLOWED_TYPES = Object.entries(isTypeAllowed) From a64aec0173e4338f6635faf1dc3f90e8ca519341 Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 13 May 2024 16:39:30 +0100 Subject: [PATCH 21/27] Test fix --- .../utilities/rowProcessor/tests/attachments.spec.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts b/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts index 7d4217c244..a8baba2625 100644 --- a/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts +++ b/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts @@ -75,13 +75,11 @@ const rowGenerators: [ "signature", function rowWithSignature(): Row { return { - signature: [ - { - size: 1, - extension: "png", - key: `${uuid.v4()}.png`, - }, - ], + signature: { + size: 1, + extension: "png", + key: `${uuid.v4()}.png`, + }, } }, ], From 6b1e6c61feb03cc383ad7ce8d2de0c2190249fbc Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 15 May 2024 17:20:50 +0100 Subject: [PATCH 22/27] Updating signature grid cell to use GridPopover --- .../grid/cells/SignatureCell.svelte | 78 +++++++++---------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte index eb14c8bfc6..3176f77f9f 100644 --- a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte @@ -2,6 +2,7 @@ import { onMount, getContext } from "svelte" import { SignatureModal } from "@budibase/frontend-core/src/components" import { CoreSignature, ActionButton } from "@budibase/bbui" + import GridPopover from "../overlays/GridPopover.svelte" export let schema export let value @@ -16,6 +17,7 @@ let isOpen = false let modal + let anchor $: editable = focused && !readonly $: { @@ -72,6 +74,7 @@ class="signature-cell" class:light={!$props?.darkMode} class:editable + bind:this={anchor} on:click={editable ? open : null} > {#if value?.url} @@ -89,35 +92,46 @@ /> {#if isOpen} -
- {#if value?.key} -
- -
- {:else} -
- { - modal.show() - }} - > - Add signature - -
- {/if} -
+ +
+ {#if value?.key} +
+ +
+ {:else} +
+ { + modal.show() + }} + > + Add signature + +
+ {/if} +
+ {/if} From 2a95bc8457afa2c1fe030fb4ff5b28f7410c6bdb Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 16 May 2024 10:54:06 +0100 Subject: [PATCH 23/27] Ensure canvas size is restricted. devicePixelRatio was used to scale the canvas for devices with higher DPI screens only affecting macs --- packages/bbui/src/Form/Core/Signature.svelte | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/bbui/src/Form/Core/Signature.svelte b/packages/bbui/src/Form/Core/Signature.svelte index 3fb411534e..7ffc28f5d7 100644 --- a/packages/bbui/src/Form/Core/Signature.svelte +++ b/packages/bbui/src/Form/Core/Signature.svelte @@ -149,7 +149,11 @@ {/if} {:else}
- + {#if editable}
@@ -193,6 +197,10 @@ .signature img { max-width: 100%; } + #signature-canvas { + max-width: var(--max-sig-width); + max-height: var(--max-sig-height); + } .signature.light img, .signature.light #signature-canvas { -webkit-filter: invert(100%); From cf18417288fe54d6612bbbe1e8b813a73f38732a Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 16 May 2024 16:40:35 +0100 Subject: [PATCH 24/27] Added workaround for atrament doubleclick issue. Disabled edit button until the canvas is actually changed. Upgraded atrament to the latest --- packages/bbui/src/Form/Core/Signature.svelte | 35 +++++++++++++++++++ packages/client/package.json | 4 +-- .../src/components/SignatureModal.svelte | 13 ++++++- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/packages/bbui/src/Form/Core/Signature.svelte b/packages/bbui/src/Form/Core/Signature.svelte index 7ffc28f5d7..729d3ac5e2 100644 --- a/packages/bbui/src/Form/Core/Signature.svelte +++ b/packages/bbui/src/Form/Core/Signature.svelte @@ -5,6 +5,8 @@ const dispatch = createEventDispatcher() + let last + export let value export let disabled = false export let editable = true @@ -73,16 +75,44 @@ updated = false } + $: if (last) { + dispatch("update") + } + onMount(() => { if (!editable) { return } + const getPos = e => { + var rect = canvasRef.getBoundingClientRect() + const canvasX = e.offsetX || e.targetTouches?.[0].pageX - rect.left + const canvasY = e.offsetY || e.targetTouches?.[0].pageY - rect.top + + return { x: canvasX, y: canvasY } + } + + const checkUp = e => { + last = getPos(e) + } + + canvasRef.addEventListener("pointerdown", e => { + const current = getPos(e) + //If the cursor didn't move at all, block the default pointerdown + if (last?.x === current?.x && last?.y === current?.y) { + e.preventDefault() + e.stopImmediatePropagation() + } + }) + + document.addEventListener("pointerup", checkUp) + signature = new Atrament(canvasRef, { width, height, color: "white", }) + signature.weight = 4 signature.smoothing = 2 @@ -96,6 +126,11 @@ canvasWidth = wrapWidth canvasContext = canvasRef.getContext("2d") + + return () => { + signature.destroy() + document.removeEventListener("pointerup", checkUp) + } }) diff --git a/packages/client/package.json b/packages/client/package.json index 1b933605a2..a7db1ee7ef 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -29,13 +29,13 @@ "dayjs": "^1.10.8", "downloadjs": "1.4.7", "html5-qrcode": "^2.2.1", - "atrament": "^4.1.0", "leaflet": "^1.7.1", "sanitize-html": "^2.7.0", "screenfull": "^6.0.1", "shortid": "^2.2.15", "svelte-apexcharts": "^1.0.2", - "svelte-spa-router": "^4.0.1" + "svelte-spa-router": "^4.0.1", + "atrament": "^4.3.0" }, "devDependencies": { "@rollup/plugin-alias": "^5.1.0", diff --git a/packages/frontend-core/src/components/SignatureModal.svelte b/packages/frontend-core/src/components/SignatureModal.svelte index 7d1a2db1d3..8132c5bced 100644 --- a/packages/frontend-core/src/components/SignatureModal.svelte +++ b/packages/frontend-core/src/components/SignatureModal.svelte @@ -7,11 +7,13 @@ export let darkMode export const show = () => { + edited = false modal.show() } let modal let canvas + let edited = false @@ -20,6 +22,7 @@ showCancelButton={false} showCloseIcon={false} custom + disabled={!edited} showDivider={false} onConfirm={() => { onConfirm(canvas) @@ -29,7 +32,15 @@ {title}
- + { + edited = true + }} + />
From 37dd75823f581ec9c02b558811c2299fc0afe0d4 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 17 May 2024 17:04:15 +0100 Subject: [PATCH 25/27] PR feedback, signature to signature single --- .../SetupPanel/AutomationBlockSetup.svelte | 4 ++-- .../automation/SetupPanel/RowSelector.svelte | 2 +- .../automation/SetupPanel/RowSelectorTypes.svelte | 12 +++++++++--- .../backend/DataTable/RowFieldControl.svelte | 2 +- .../src/components/backend/DataTable/formula.js | 2 +- .../backend/DataTable/modals/CreateEditColumn.svelte | 2 +- .../TableNavigator/ExistingTableDataImport.svelte | 2 +- .../common/bindings/DrawerBindableSlot.svelte | 6 +++--- .../components/design/settings/componentSettings.js | 4 ++-- .../settings/controls/FieldConfiguration/utils.js | 2 +- .../ValidationEditor/ValidationDrawer.svelte | 2 +- packages/builder/src/constants/backend/index.js | 4 ++-- .../new/_components/componentStructure.json | 2 +- packages/client/manifest.json | 6 +++--- .../components/app/blocks/FormBlockComponent.svelte | 2 +- .../src/components/app/forms/SignatureField.svelte | 2 +- packages/client/src/components/app/forms/index.js | 2 +- .../client/src/components/app/forms/validation.js | 5 ++++- .../src/components/grid/cells/SignatureCell.svelte | 1 - .../src/components/grid/lib/renderers.js | 2 +- packages/frontend-core/src/constants.js | 2 +- packages/server/src/api/routes/tests/row.spec.ts | 4 ++-- packages/server/src/automations/automationUtils.ts | 2 +- packages/server/src/integrations/base/sqlTable.ts | 2 +- packages/server/src/integrations/googlesheets.ts | 2 +- packages/server/src/integrations/utils/utils.ts | 2 +- packages/server/src/sdk/app/backups/imports.ts | 2 +- packages/server/src/sdk/app/rows/attachments.ts | 2 +- packages/server/src/sdk/app/tables/internal/sqs.ts | 2 +- packages/server/src/sdk/tests/attachments.spec.ts | 2 +- .../server/src/utilities/rowProcessor/attachments.ts | 8 ++++---- packages/server/src/utilities/rowProcessor/index.ts | 4 ++-- .../utilities/rowProcessor/tests/attachments.spec.ts | 10 +++++++--- packages/server/src/utilities/schema.ts | 2 +- packages/shared-core/src/table.ts | 5 ++--- packages/types/src/documents/app/row.ts | 2 +- 36 files changed, 65 insertions(+), 54 deletions(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 690a37b311..85ae1924d0 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -364,7 +364,7 @@ value.customType !== "cron" && value.customType !== "triggerSchema" && value.customType !== "automationFields" && - value.type !== "signature" && + value.type !== "signature_single" && value.type !== "attachment" && value.type !== "attachment_single" ) @@ -457,7 +457,7 @@ value={inputData[key]} options={Object.keys(table?.schema || {})} /> - {:else if value.type === "attachment" || value.type === "signature"} + {:else if value.type === "attachment" || value.type === "signature_single"}
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte index fd7f5de459..b5a54138ca 100644 --- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte +++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte @@ -27,7 +27,7 @@ let attachmentTypes = [ FieldType.ATTACHMENTS, FieldType.ATTACHMENT_SINGLE, - FieldType.SIGNATURE, + FieldType.SIGNATURE_SINGLE, ] $: { diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte index 9b2f07b6aa..087d0b94fc 100644 --- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte +++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte @@ -21,6 +21,12 @@ return clone }) + let attachmentTypes = [ + FieldType.ATTACHMENTS, + FieldType.ATTACHMENT_SINGLE, + FieldType.SIGNATURE_SINGLE, + ] + function schemaHasOptions(schema) { return !!schema.constraints?.inclusion?.length } @@ -30,7 +36,7 @@ if ( (schema.type === FieldType.ATTACHMENT_SINGLE || - schema.type === FieldType.SIGNATURE) && + schema.type === FieldType.SIGNATURE_SINGLE) && Object.keys(keyValueObj).length === 0 ) { return [] @@ -101,7 +107,7 @@ on:change={e => onChange(e, field)} useLabel={false} /> -{:else if schema.type === FieldType.ATTACHMENTS || schema.type === FieldType.ATTACHMENT_SINGLE || schema.type === FieldType.SIGNATURE} +{:else if attachmentTypes.includes(schema.type)}
@@ -109,7 +115,7 @@ { detail: schema.type === FieldType.ATTACHMENT_SINGLE || - schema.type === FieldType.SIGNATURE + schema.type === FieldType.SIGNATURE_SINGLE ? e.detail.length > 0 ? { url: e.detail[0].name, diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte index 3f880710e2..1a6bb86113 100644 --- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte +++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte @@ -111,7 +111,7 @@ }} maximum={1} /> -{:else if type === "signature"} +{:else if type === "signature_single"}
diff --git a/packages/builder/src/components/backend/DataTable/formula.js b/packages/builder/src/components/backend/DataTable/formula.js index ef35d258a4..a179a7c6e1 100644 --- a/packages/builder/src/components/backend/DataTable/formula.js +++ b/packages/builder/src/components/backend/DataTable/formula.js @@ -9,7 +9,7 @@ const MAX_DEPTH = 1 const TYPES_TO_SKIP = [ FieldType.FORMULA, FieldType.LONGFORM, - FieldType.SIGNATURE, + FieldType.SIGNATURE_SINGLE, FieldType.ATTACHMENTS, //https://github.com/Budibase/budibase/issues/3030 FieldType.INTERNAL, diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte index 68cc03a99b..e88c28a9d9 100644 --- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte @@ -412,7 +412,7 @@ FIELDS.FORMULA, FIELDS.JSON, FIELDS.BARCODEQR, - FIELDS.SIGNATURE, + FIELDS.SIGNATURE_SINGLE, FIELDS.BIGINT, FIELDS.AUTO, ] diff --git a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte index 01dabaebae..de56fa8ce5 100644 --- a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte +++ b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte @@ -56,7 +56,7 @@ }, { label: "Signature", - value: FieldType.SIGNATURE, + value: FieldType.SIGNATURE_SINGLE, }, { label: "Attachment list", diff --git a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte index 4a0664363c..3a787a70cb 100644 --- a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte +++ b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte @@ -31,7 +31,7 @@ let attachmentTypes = [ FieldType.ATTACHMENT_SINGLE, FieldType.ATTACHMENTS, - FieldType.SIGNATURE, + FieldType.SIGNATURE_SINGLE, ] $: readableValue = runtimeToReadableBinding(bindings, value) @@ -111,7 +111,7 @@ boolean: isValidBoolean, attachment: false, attachment_single: false, - signature: false, + signature_single: false, } const isValid = value => { @@ -133,7 +133,7 @@ "bigint", "barcodeqr", "attachment", - "signature", + "signature_single", "attachment_single", ].includes(type) ) { diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js index 7ccc7a6463..e174a2e6f7 100644 --- a/packages/builder/src/components/design/settings/componentSettings.js +++ b/packages/builder/src/components/design/settings/componentSettings.js @@ -76,7 +76,7 @@ const componentMap = { "field/array": FormFieldSelect, "field/json": FormFieldSelect, "field/barcodeqr": FormFieldSelect, - "field/signature": FormFieldSelect, + "field/signature_single": FormFieldSelect, "field/bb_reference": FormFieldSelect, // Some validation types are the same as others, so not all types are // explicitly listed here. e.g. options uses string validation @@ -87,7 +87,7 @@ const componentMap = { "validation/datetime": ValidationEditor, "validation/attachment": ValidationEditor, "validation/attachment_single": ValidationEditor, - "validation/signature": ValidationEditor, + "validation/signature_single": ValidationEditor, "validation/link": ValidationEditor, "validation/bb_reference": ValidationEditor, } diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/utils.js b/packages/builder/src/components/design/settings/controls/FieldConfiguration/utils.js index 6c85b40f2b..26aa5930a4 100644 --- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/utils.js +++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/utils.js @@ -41,7 +41,7 @@ export const FieldTypeToComponentMap = { [FieldType.BOOLEAN]: "booleanfield", [FieldType.LONGFORM]: "longformfield", [FieldType.DATETIME]: "datetimefield", - [FieldType.SIGNATURE]: "signaturefield", + [FieldType.SIGNATURE_SINGLE]: "signaturesinglefield", [FieldType.ATTACHMENTS]: "attachmentfield", [FieldType.ATTACHMENT_SINGLE]: "attachmentsinglefield", [FieldType.LINK]: "relationshipfield", diff --git a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte index eb1f7988fc..f70c0910e0 100644 --- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte @@ -109,7 +109,7 @@ Constraints.MaxUploadSize, ], ["attachment_single"]: [Constraints.Required, Constraints.MaxUploadSize], - ["signature"]: [Constraints.Required], + ["signature_single"]: [Constraints.Required], ["link"]: [ Constraints.Required, Constraints.Contains, diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js index 6c4781aca1..78e90d6298 100644 --- a/packages/builder/src/constants/backend/index.js +++ b/packages/builder/src/constants/backend/index.js @@ -127,9 +127,9 @@ export const FIELDS = { presence: false, }, }, - SIGNATURE: { + SIGNATURE_SINGLE: { name: "Signature", - type: FieldType.SIGNATURE, + type: FieldType.SIGNATURE_SINGLE, icon: "AnnotatePen", constraints: { presence: false, diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json index 6a5664204c..ba6f403d81 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/componentStructure.json @@ -71,7 +71,7 @@ "multifieldselect", "s3upload", "codescanner", - "signaturefield", + "signaturesinglefield", "bbreferencesinglefield", "bbreferencefield" ] diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 392028aa33..9fb0783985 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -4107,7 +4107,7 @@ } ] }, - "signaturefield": { + "signaturesinglefield": { "name": "Signature", "icon": "AnnotatePen", "styles": ["size"], @@ -4117,7 +4117,7 @@ }, "settings": [ { - "type": "field/signature", + "type": "field/signature_single", "label": "Field", "key": "field", "required": true @@ -4150,7 +4150,7 @@ ] }, { - "type": "validation/signature", + "type": "validation/signature_single", "label": "Validation", "key": "validation" } diff --git a/packages/client/src/components/app/blocks/FormBlockComponent.svelte b/packages/client/src/components/app/blocks/FormBlockComponent.svelte index 3cbf9680f5..396dfcf808 100644 --- a/packages/client/src/components/app/blocks/FormBlockComponent.svelte +++ b/packages/client/src/components/app/blocks/FormBlockComponent.svelte @@ -15,7 +15,7 @@ [FieldType.BOOLEAN]: "booleanfield", [FieldType.LONGFORM]: "longformfield", [FieldType.DATETIME]: "datetimefield", - [FieldType.SIGNATURE]: "signaturefield", + [FieldType.SIGNATURE_SINGLE]: "signaturesinglefield", [FieldType.ATTACHMENTS]: "attachmentfield", [FieldType.ATTACHMENT_SINGLE]: "attachmentsinglefield", [FieldType.LINK]: "relationshipfield", diff --git a/packages/client/src/components/app/forms/SignatureField.svelte b/packages/client/src/components/app/forms/SignatureField.svelte index 39cda69cb8..bdae148368 100644 --- a/packages/client/src/components/app/forms/SignatureField.svelte +++ b/packages/client/src/components/app/forms/SignatureField.svelte @@ -80,7 +80,7 @@ {validation} {span} {helpText} - type="signature" + type="signature_single" bind:fieldState bind:fieldApi bind:fieldSchema diff --git a/packages/client/src/components/app/forms/index.js b/packages/client/src/components/app/forms/index.js index 4285034043..391b5fa19f 100644 --- a/packages/client/src/components/app/forms/index.js +++ b/packages/client/src/components/app/forms/index.js @@ -16,6 +16,6 @@ export { default as formstep } from "./FormStep.svelte" export { default as jsonfield } from "./JSONField.svelte" export { default as s3upload } from "./S3Upload.svelte" export { default as codescanner } from "./CodeScannerField.svelte" -export { default as signaturefield } from "./SignatureField.svelte" +export { default as signaturesinglefield } from "./SignatureField.svelte" export { default as bbreferencefield } from "./BBReferenceField.svelte" export { default as bbreferencesinglefield } from "./BBReferenceSingleField.svelte" diff --git a/packages/client/src/components/app/forms/validation.js b/packages/client/src/components/app/forms/validation.js index 57471e68d3..46a5330cf3 100644 --- a/packages/client/src/components/app/forms/validation.js +++ b/packages/client/src/components/app/forms/validation.js @@ -201,7 +201,10 @@ const parseType = (value, type) => { } // Parse attachment/signature single, treating no key as null - if (type === FieldTypes.ATTACHMENT_SINGLE || type === FieldTypes.SIGNATURE) { + if ( + type === FieldTypes.ATTACHMENT_SINGLE || + type === FieldTypes.SIGNATURE_SINGLE + ) { if (!value?.key) { return null } diff --git a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte index 3176f77f9f..06933d56bb 100644 --- a/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/SignatureCell.svelte @@ -11,7 +11,6 @@ export let readonly = false export let api export let invertX = false - export let invertY = false const { API, notifications, props } = getContext("grid") diff --git a/packages/frontend-core/src/components/grid/lib/renderers.js b/packages/frontend-core/src/components/grid/lib/renderers.js index d0a529c56f..2e22ee1871 100644 --- a/packages/frontend-core/src/components/grid/lib/renderers.js +++ b/packages/frontend-core/src/components/grid/lib/renderers.js @@ -21,7 +21,7 @@ const TypeComponentMap = { [FieldType.OPTIONS]: OptionsCell, [FieldType.DATETIME]: DateCell, [FieldType.BARCODEQR]: TextCell, - [FieldType.SIGNATURE]: SignatureCell, + [FieldType.SIGNATURE_SINGLE]: SignatureCell, [FieldType.LONGFORM]: LongFormCell, [FieldType.ARRAY]: MultiSelectCell, [FieldType.NUMBER]: NumberCell, diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index 20a8e12926..9178628360 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -121,7 +121,7 @@ export const TypeIconMap = { [FieldType.OPTIONS]: "Dropdown", [FieldType.DATETIME]: "Calendar", [FieldType.BARCODEQR]: "Camera", - [FieldType.SIGNATURE]: "AnnotatePen", + [FieldType.SIGNATURE_SINGLE]: "AnnotatePen", [FieldType.LONGFORM]: "TextAlignLeft", [FieldType.ARRAY]: "Duplicate", [FieldType.NUMBER]: "123", diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts index feb6ff696a..934a838e6a 100644 --- a/packages/server/src/api/routes/tests/row.spec.ts +++ b/packages/server/src/api/routes/tests/row.spec.ts @@ -310,7 +310,7 @@ describe.each([ constraints: { type: "array", presence: false }, } const signature: FieldSchema = { - type: FieldType.SIGNATURE, + type: FieldType.SIGNATURE_SINGLE, name: "signature", constraints: { presence: false }, } @@ -982,7 +982,7 @@ describe.each([ await coreAttachmentEnrichment( { signature: { - type: FieldType.SIGNATURE, + type: FieldType.SIGNATURE_SINGLE, name: "signature", constraints: { presence: false }, }, diff --git a/packages/server/src/automations/automationUtils.ts b/packages/server/src/automations/automationUtils.ts index ecc38d779a..de6e1b3d88 100644 --- a/packages/server/src/automations/automationUtils.ts +++ b/packages/server/src/automations/automationUtils.ts @@ -114,7 +114,7 @@ export async function sendAutomationAttachmentsToStorage( if ( schema?.type === FieldType.ATTACHMENTS || schema?.type === FieldType.ATTACHMENT_SINGLE || - schema?.type === FieldType.SIGNATURE + schema?.type === FieldType.SIGNATURE_SINGLE ) { attachmentRows[prop] = value } diff --git a/packages/server/src/integrations/base/sqlTable.ts b/packages/server/src/integrations/base/sqlTable.ts index 7d5ff632b7..5e6ce75bbe 100644 --- a/packages/server/src/integrations/base/sqlTable.ts +++ b/packages/server/src/integrations/base/sqlTable.ts @@ -125,7 +125,7 @@ function generateSchema( break case FieldType.ATTACHMENTS: case FieldType.ATTACHMENT_SINGLE: - case FieldType.SIGNATURE: + case FieldType.SIGNATURE_SINGLE: case FieldType.AUTO: case FieldType.JSON: case FieldType.INTERNAL: diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 1a70b8a199..2da0c2c201 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -72,7 +72,7 @@ const isTypeAllowed: Record = { [FieldType.JSON]: false, [FieldType.INTERNAL]: false, [FieldType.BIGINT]: false, - [FieldType.SIGNATURE]: false, + [FieldType.SIGNATURE_SINGLE]: false, } const ALLOWED_TYPES = Object.entries(isTypeAllowed) diff --git a/packages/server/src/integrations/utils/utils.ts b/packages/server/src/integrations/utils/utils.ts index aaa35e0c0f..a15cb246ef 100644 --- a/packages/server/src/integrations/utils/utils.ts +++ b/packages/server/src/integrations/utils/utils.ts @@ -381,7 +381,7 @@ function copyExistingPropsOver( case FieldType.ARRAY: case FieldType.ATTACHMENTS: case FieldType.ATTACHMENT_SINGLE: - case FieldType.SIGNATURE: + case FieldType.SIGNATURE_SINGLE: case FieldType.JSON: case FieldType.BB_REFERENCE: case FieldType.BB_REFERENCE_SINGLE: diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts index 10bc581854..a16bfb418d 100644 --- a/packages/server/src/sdk/app/backups/imports.ts +++ b/packages/server/src/sdk/app/backups/imports.ts @@ -69,7 +69,7 @@ export async function updateAttachmentColumns(prodAppId: string, db: Database) { ) } else if ( (columnType === FieldType.ATTACHMENT_SINGLE || - columnType === FieldType.SIGNATURE) && + columnType === FieldType.SIGNATURE_SINGLE) && row[column] ) { row[column] = rewriteAttachmentUrl(prodAppId, row[column]) diff --git a/packages/server/src/sdk/app/rows/attachments.ts b/packages/server/src/sdk/app/rows/attachments.ts index de265b0127..0bcfcbe4b4 100644 --- a/packages/server/src/sdk/app/rows/attachments.ts +++ b/packages/server/src/sdk/app/rows/attachments.ts @@ -33,7 +33,7 @@ export async function getRowsWithAttachments(appId: string, table: Table) { if ( column.type === FieldType.ATTACHMENTS || column.type === FieldType.ATTACHMENT_SINGLE || - column.type === FieldType.SIGNATURE + column.type === FieldType.SIGNATURE_SINGLE ) { attachmentCols.push(key) } diff --git a/packages/server/src/sdk/app/tables/internal/sqs.ts b/packages/server/src/sdk/app/tables/internal/sqs.ts index dd514cc161..2b91c5cfa7 100644 --- a/packages/server/src/sdk/app/tables/internal/sqs.ts +++ b/packages/server/src/sdk/app/tables/internal/sqs.ts @@ -42,7 +42,7 @@ const FieldTypeMap: Record = { [FieldType.BARCODEQR]: SQLiteType.BLOB, [FieldType.ATTACHMENTS]: SQLiteType.BLOB, [FieldType.ATTACHMENT_SINGLE]: SQLiteType.BLOB, - [FieldType.SIGNATURE]: SQLiteType.BLOB, + [FieldType.SIGNATURE_SINGLE]: SQLiteType.BLOB, [FieldType.ARRAY]: SQLiteType.BLOB, [FieldType.LINK]: SQLiteType.BLOB, [FieldType.BIGINT]: SQLiteType.TEXT, diff --git a/packages/server/src/sdk/tests/attachments.spec.ts b/packages/server/src/sdk/tests/attachments.spec.ts index d8673b02e6..12c808d3a5 100644 --- a/packages/server/src/sdk/tests/attachments.spec.ts +++ b/packages/server/src/sdk/tests/attachments.spec.ts @@ -85,7 +85,7 @@ describe("should be able to re-write attachment URLs", () => { const { rows, db } = await coreBehaviour( { signature: { - type: FieldType.SIGNATURE, + type: FieldType.SIGNATURE_SINGLE, name: "signature", }, otherCol: { diff --git a/packages/server/src/utilities/rowProcessor/attachments.ts b/packages/server/src/utilities/rowProcessor/attachments.ts index 6d73a60bbb..4b0cc38cb1 100644 --- a/packages/server/src/utilities/rowProcessor/attachments.ts +++ b/packages/server/src/utilities/rowProcessor/attachments.ts @@ -32,7 +32,7 @@ export class AttachmentCleanup { if ( type !== FieldType.ATTACHMENTS && type !== FieldType.ATTACHMENT_SINGLE && - type !== FieldType.SIGNATURE + type !== FieldType.SIGNATURE_SINGLE ) { return [] } @@ -64,7 +64,7 @@ export class AttachmentCleanup { if ( schema.type !== FieldType.ATTACHMENTS && schema.type !== FieldType.ATTACHMENT_SINGLE && - schema.type !== FieldType.SIGNATURE + schema.type !== FieldType.SIGNATURE_SINGLE ) { continue } @@ -103,7 +103,7 @@ export class AttachmentCleanup { if ( schema.type !== FieldType.ATTACHMENTS && schema.type !== FieldType.ATTACHMENT_SINGLE && - schema.type !== FieldType.SIGNATURE + schema.type !== FieldType.SIGNATURE_SINGLE ) { continue } @@ -125,7 +125,7 @@ export class AttachmentCleanup { if ( schema.type !== FieldType.ATTACHMENTS && schema.type !== FieldType.ATTACHMENT_SINGLE && - schema.type !== FieldType.SIGNATURE + schema.type !== FieldType.SIGNATURE_SINGLE ) { continue } diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts index 863d2e1814..73176af6d8 100644 --- a/packages/server/src/utilities/rowProcessor/index.ts +++ b/packages/server/src/utilities/rowProcessor/index.ts @@ -160,7 +160,7 @@ export async function inputProcessing( } } else if ( field.type === FieldType.ATTACHMENT_SINGLE || - field.type === FieldType.SIGNATURE + field.type === FieldType.SIGNATURE_SINGLE ) { const attachment = clonedRow[key] if (attachment?.url) { @@ -234,7 +234,7 @@ export async function outputProcessing( if ( column.type === FieldType.ATTACHMENTS || column.type === FieldType.ATTACHMENT_SINGLE || - column.type === FieldType.SIGNATURE + column.type === FieldType.SIGNATURE_SINGLE ) { for (let row of enriched) { if (row[property] == null) { diff --git a/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts b/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts index a8baba2625..a39fc23152 100644 --- a/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts +++ b/packages/server/src/utilities/rowProcessor/tests/attachments.spec.ts @@ -35,7 +35,11 @@ const mockedDeleteFiles = objectStore.deleteFiles as jest.MockedFunction< const rowGenerators: [ string, - FieldType.ATTACHMENT_SINGLE | FieldType.ATTACHMENTS | FieldType.SIGNATURE, + ( + | FieldType.ATTACHMENT_SINGLE + | FieldType.ATTACHMENTS + | FieldType.SIGNATURE_SINGLE + ), string, (fileKey?: string) => Row ][] = [ @@ -71,7 +75,7 @@ const rowGenerators: [ ], [ "row with a single signature column", - FieldType.SIGNATURE, + FieldType.SIGNATURE_SINGLE, "signature", function rowWithSignature(): Row { return { @@ -102,7 +106,7 @@ describe.each(rowGenerators)( }, signature: { name: "signature", - type: FieldType.SIGNATURE, + type: FieldType.SIGNATURE_SINGLE, constraints: {}, }, }, diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts index b7f88f6d40..c3230d238c 100644 --- a/packages/server/src/utilities/schema.ts +++ b/packages/server/src/utilities/schema.ts @@ -152,7 +152,7 @@ export function parse(rows: Rows, schema: TableSchema): Rows { } else if ( (columnType === FieldType.ATTACHMENTS || columnType === FieldType.ATTACHMENT_SINGLE || - columnType === FieldType.SIGNATURE) && + columnType === FieldType.SIGNATURE_SINGLE) && typeof columnData === "string" ) { parsedRow[columnName] = parseCsvExport(columnData) diff --git a/packages/shared-core/src/table.ts b/packages/shared-core/src/table.ts index 56f7341910..7706b78037 100644 --- a/packages/shared-core/src/table.ts +++ b/packages/shared-core/src/table.ts @@ -15,7 +15,7 @@ const allowDisplayColumnByType: Record = { [FieldType.ARRAY]: false, [FieldType.ATTACHMENTS]: false, [FieldType.ATTACHMENT_SINGLE]: false, - [FieldType.SIGNATURE]: false, + [FieldType.SIGNATURE_SINGLE]: false, [FieldType.LINK]: false, [FieldType.JSON]: false, [FieldType.BB_REFERENCE]: false, @@ -34,11 +34,10 @@ const allowSortColumnByType: Record = { [FieldType.BIGINT]: true, [FieldType.BOOLEAN]: true, [FieldType.JSON]: true, - [FieldType.FORMULA]: false, [FieldType.ATTACHMENTS]: false, [FieldType.ATTACHMENT_SINGLE]: false, - [FieldType.SIGNATURE]: false, + [FieldType.SIGNATURE_SINGLE]: false, [FieldType.ARRAY]: false, [FieldType.LINK]: false, [FieldType.BB_REFERENCE]: false, diff --git a/packages/types/src/documents/app/row.ts b/packages/types/src/documents/app/row.ts index 27a2f6587b..27d7df09fd 100644 --- a/packages/types/src/documents/app/row.ts +++ b/packages/types/src/documents/app/row.ts @@ -97,7 +97,7 @@ export enum FieldType { * a JSON type, called Signature within Budibase. This type functions much the same as ATTACHMENTS but restricted * only to signatures. */ - SIGNATURE = "signature", + SIGNATURE_SINGLE = "signature_single", /** * a string type, this allows representing very large integers, but they are held/managed within Budibase as * strings. When stored in external databases Budibase will attempt to use a real big integer type and depend From 3019e54b92482021fce55245f3dd853bca03d8e8 Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 20 May 2024 11:25:48 +0100 Subject: [PATCH 26/27] Fix for date based binding tests --- packages/server/src/api/routes/tests/search.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/server/src/api/routes/tests/search.spec.ts b/packages/server/src/api/routes/tests/search.spec.ts index 87d0aa72c7..6b359b1964 100644 --- a/packages/server/src/api/routes/tests/search.spec.ts +++ b/packages/server/src/api/routes/tests/search.spec.ts @@ -19,9 +19,10 @@ import { } from "@budibase/types" import _ from "lodash" import tk from "timekeeper" +import { mocks } from "@budibase/backend-core/tests" import { encodeJSBinding } from "@budibase/string-templates" -const serverTime = new Date("2024-05-06T00:00:00.000Z") +const serverTime = mocks.date.MOCK_DATE tk.freeze(serverTime) describe.each([ @@ -407,8 +408,7 @@ describe.each([ }) it("should parse the encoded js binding. Return rows with appointments 2 weeks in the past", async () => { - const jsBinding = - "const currentTime = new Date()\ncurrentTime.setDate(currentTime.getDate()-14);\nreturn currentTime.toISOString();" + const jsBinding = `const currentTime = new Date(${Date.now()})\ncurrentTime.setDate(currentTime.getDate()-14);\nreturn currentTime.toISOString();` const encodedBinding = encodeJSBinding(jsBinding) await expectQuery({ From f906bd3dd595fafe797f97a76a2df158e13cea1c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 20 May 2024 11:53:19 +0100 Subject: [PATCH 27/27] Remove leftover usages of inversion params which are no longer needed --- .../grid/cells/AttachmentCell.svelte | 9 +--- .../src/components/grid/cells/DataCell.svelte | 4 -- .../src/components/grid/cells/DateCell.svelte | 3 +- .../components/grid/cells/LongFormCell.svelte | 3 +- .../components/grid/cells/OptionsCell.svelte | 3 +- .../grid/cells/RelationshipCell.svelte | 3 +- .../grid/cells/SignatureCell.svelte | 9 +--- .../components/grid/layout/GridBody.svelte | 7 +-- .../src/components/grid/layout/GridRow.svelte | 6 +-- .../src/components/grid/layout/NewRow.svelte | 15 +----- .../src/components/grid/stores/viewport.js | 47 +------------------ 11 files changed, 10 insertions(+), 99 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte b/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte index ea452c86a8..f485593c46 100644 --- a/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte @@ -8,7 +8,6 @@ export let onChange export let readonly = false export let api - export let invertX = false export let schema export let maximum @@ -92,13 +91,7 @@
{#if isOpen} - +
{#if isOpen} - + {#if isOpen} - +