From 1ed32f0ce4a983574b04cb0476343ec31409985e Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 8 Aug 2022 13:51:02 +0100 Subject: [PATCH 001/179] charset encoding --- packages/server/src/utilities/fileSystem/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js index f4aebd11a8..e421d19275 100644 --- a/packages/server/src/utilities/fileSystem/index.js +++ b/packages/server/src/utilities/fileSystem/index.js @@ -106,8 +106,10 @@ exports.loadHandlebarsFile = path => { */ exports.apiFileReturn = contents => { const path = join(budibaseTempDir(), uuid()) - fs.writeFileSync(path, contents) - return fs.createReadStream(path) + fs.writeFileSync(path, "\ufeff" + contents) + let readerStream = fs.createReadStream(path) + readerStream.setEncoding("binary") + return readerStream } exports.defineFilter = excludeRows => { From 9a4eebcc3753e56866a84d315dec7006688d432e Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Mon, 8 Aug 2022 13:54:11 +0100 Subject: [PATCH 002/179] changing readstream let to const --- packages/server/src/utilities/fileSystem/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js index e421d19275..8e93d33ed9 100644 --- a/packages/server/src/utilities/fileSystem/index.js +++ b/packages/server/src/utilities/fileSystem/index.js @@ -107,7 +107,7 @@ exports.loadHandlebarsFile = path => { exports.apiFileReturn = contents => { const path = join(budibaseTempDir(), uuid()) fs.writeFileSync(path, "\ufeff" + contents) - let readerStream = fs.createReadStream(path) + const readerStream = fs.createReadStream(path) readerStream.setEncoding("binary") return readerStream } From 09360cea55e8821dea39716b6513cf615ec51955 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Oct 2022 08:08:35 +0100 Subject: [PATCH 003/179] Add initial version of side panel component --- .../new/_components/componentStructure.json | 3 +- packages/client/manifest.json | 8 + .../client/src/components/app/Layout.svelte | 210 +++++++++++------- .../src/components/app/SidePanel.svelte | 57 +++++ packages/client/src/components/app/index.js | 2 +- .../components/preview/IndicatorSet.svelte | 9 +- packages/client/src/sdk.js | 2 + packages/client/src/stores/index.js | 1 + packages/client/src/stores/sidePanel.js | 37 +++ packages/client/src/utils/styleable.js | 2 + 10 files changed, 241 insertions(+), 90 deletions(-) create mode 100644 packages/client/src/components/app/SidePanel.svelte create mode 100644 packages/client/src/stores/sidePanel.js diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json index 381ceeac20..acc1fb2a63 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/componentStructure.json @@ -16,7 +16,8 @@ "children": [ "container", "section", - "grid" + "grid", + "sidepanel" ] }, { diff --git a/packages/client/manifest.json b/packages/client/manifest.json index d8a868b6f8..35d334d3fe 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5225,5 +5225,13 @@ "suffix": "repeater" } ] + }, + "sidepanel": { + "name": "Side Panel", + "icon": "AdDisplay", + "hasChildren": true, + "illegalChildren": ["section"], + "showEmptyState": false, + "static": true } } \ No newline at end of file diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index a317da1f0f..d1e55df5b5 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -16,6 +16,7 @@ builderStore, currentRole, environmentStore, + sidePanelStore, } = sdk const component = getContext("component") const context = getContext("context") @@ -150,113 +151,130 @@ class:desktop={!mobile} class:mobile={!!mobile} > - {#if typeClass !== "none"} -
+
+ {#if typeClass !== "none"}
-
-
+
+
+
+ {#if validLinks?.length} +
+ (mobileOpen = !mobileOpen)} + /> +
+ {/if} + +
+ +
+
+
(mobileOpen = false)} + /> {#if validLinks?.length} -
- (mobileOpen = !mobileOpen)} - /> +
+ {#each validLinks as { text, url }} + {#if isInternal(url)} + + {text} + + {:else} + + {text} + + {/if} + {/each} +
+ (mobileOpen = false)} + /> +
{/if} - -
- -
-
(mobileOpen = false)} - /> - {#if validLinks?.length} -
- {#each validLinks as { text, url }} - {#if isInternal(url)} - - {text} - - {:else} - - {text} - - {/if} - {/each} -
- (mobileOpen = false)} - /> -
-
- {/if}
+ {/if} + + {#if !$builderStore.inBuilder && licensing.logoEnabled() && $environmentStore.cloud} + + {/if} + +
+
+ +
- {/if} - - {#if !$builderStore.inBuilder && licensing.logoEnabled() && $environmentStore.cloud} - - {/if} - -
-
- +
+
+
+
diff --git a/packages/client/src/components/app/index.js b/packages/client/src/components/app/index.js index b64e074115..70074790ac 100644 --- a/packages/client/src/components/app/index.js +++ b/packages/client/src/components/app/index.js @@ -35,10 +35,10 @@ export { default as tag } from "./Tag.svelte" export { default as markdownviewer } from "./MarkdownViewer.svelte" export { default as embeddedmap } from "./embedded-map/EmbeddedMap.svelte" export { default as grid } from "./Grid.svelte" +export { default as sidepanel } from "./SidePanel.svelte" export * from "./charts" export * from "./forms" export * from "./table" - export * from "./blocks" export * from "./dynamic-filter" diff --git a/packages/client/src/components/preview/IndicatorSet.svelte b/packages/client/src/components/preview/IndicatorSet.svelte index 51a60ce981..ff0c7d71d6 100644 --- a/packages/client/src/components/preview/IndicatorSet.svelte +++ b/packages/client/src/components/preview/IndicatorSet.svelte @@ -43,7 +43,8 @@ if (callbackCount >= observers.length) { return } - nextIndicators[idx].visible = entries[0].isIntersecting + nextIndicators[idx].visible = + nextIndicators[idx].isSidePanel || entries[0].isIntersecting if (++callbackCount === observers.length) { indicators = nextIndicators updating = false @@ -91,8 +92,9 @@ // Extract valid children // Sanity limit of 100 active indicators - const children = Array.from(parents) - .map(parent => parent?.children?.[0]) + const children = Array.from( + document.getElementsByClassName(`${componentId}-dom`) + ) .filter(x => x != null) .slice(0, 100) @@ -121,6 +123,7 @@ width: elBounds.width + 4, height: elBounds.height + 4, visible: false, + isSidePanel: child.classList.contains("side-panel"), }) }) } diff --git a/packages/client/src/sdk.js b/packages/client/src/sdk.js index 1afeea0055..e19627dd0b 100644 --- a/packages/client/src/sdk.js +++ b/packages/client/src/sdk.js @@ -10,6 +10,7 @@ import { componentStore, currentRole, environmentStore, + sidePanelStore, } from "stores" import { styleable } from "utils/styleable" import { linkable } from "utils/linkable" @@ -30,6 +31,7 @@ export default { uploadStore, componentStore, environmentStore, + sidePanelStore, currentRole, styleable, linkable, diff --git a/packages/client/src/stores/index.js b/packages/client/src/stores/index.js index 173f3ad4fe..7548d31817 100644 --- a/packages/client/src/stores/index.js +++ b/packages/client/src/stores/index.js @@ -24,6 +24,7 @@ export { dndIsNewComponent, dndIsDragging, } from "./dnd" +export { sidePanelStore } from "./sidePanel.js" // Context stores are layered and duplicated, so it is not a singleton export { createContextStore } from "./context" diff --git a/packages/client/src/stores/sidePanel.js b/packages/client/src/stores/sidePanel.js new file mode 100644 index 0000000000..327fcfae82 --- /dev/null +++ b/packages/client/src/stores/sidePanel.js @@ -0,0 +1,37 @@ +import { writable, derived } from "svelte/store" + +export const createSidePanelStore = () => { + const initialState = { + contentId: null, + } + const store = writable(initialState) + const derivedStore = derived(store, $store => { + return { + ...$store, + open: $store.contentId != null, + } + }) + + const open = id => { + store.update(state => { + state.contentId = id + return state + }) + } + const close = () => { + store.update(state => { + state.contentId = null + return state + }) + } + + return { + subscribe: derivedStore.subscribe, + actions: { + open, + close, + }, + } +} + +export const sidePanelStore = createSidePanelStore() diff --git a/packages/client/src/utils/styleable.js b/packages/client/src/utils/styleable.js index 9ad17ceff0..4a6f1c0d7c 100644 --- a/packages/client/src/utils/styleable.js +++ b/packages/client/src/utils/styleable.js @@ -25,6 +25,8 @@ export const styleable = (node, styles = {}) => { // Creates event listeners and applies initial styles const setupStyles = (newStyles = {}) => { + node.classList.add(`${newStyles.id}-dom`) + let baseStyles = {} if (newStyles.empty) { baseStyles.border = "2px dashed var(--spectrum-global-color-gray-400)" From 1b6c31ea4e9102ba6a2bea478ffd02fec5e846ac Mon Sep 17 00:00:00 2001 From: FlaminWrap Date: Sat, 5 Nov 2022 00:05:15 +0000 Subject: [PATCH 004/179] Commit for enhancement #7138 *Added automation steps *Added steps for testing panel *Changed a testing panel error message as it didn't seem accurate --- .../AutomationBuilder/FlowChart/FlowChart.svelte | 2 +- .../automation/AutomationBuilder/FlowChart/FlowItem.svelte | 3 ++- .../AutomationBuilder/FlowChart/FlowItemHeader.svelte | 7 ++++++- .../AutomationBuilder/FlowChart/TestDataModal.svelte | 2 +- .../automation/AutomationBuilder/TestDisplay.svelte | 1 + 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte index 05cae46cfc..4b01616b54 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte @@ -84,7 +84,7 @@ out:fly|local={{ x: 500, duration: 500 }} > {#if block.stepId !== ActionStepID.LOOP} - + {/if}
{/each} diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte index dd8fa7df46..2d0a86d95c 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte @@ -22,6 +22,7 @@ export let block export let testDataModal + export let idx let selected let webhookModal let actionModal @@ -208,7 +209,7 @@ {/if} {/if} - + {#if !blockComplete}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte index 4e2185c792..2f8dbce67e 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte @@ -9,6 +9,7 @@ export let showParameters = {} export let testResult export let isTrigger + export let idx $: { if (!testResult) { @@ -71,12 +72,16 @@ {/if}
+ {#if idx === 0} + Trigger + {:else} + Step {idx} + {/if} {#if isTrigger} When this happens: {:else} Do this: {/if} - {block?.name?.toUpperCase() || ""}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte index 9bbca16802..3beb6cd79b 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte @@ -57,7 +57,7 @@ ) $automationStore.showTestPanel = true } catch (error) { - notifications.error("Error testing notification") + notifications.error("Error testing automation") } } diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte index 3f01dbeebd..bd46c70df5 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte @@ -52,6 +52,7 @@ bind:showParameters {block} isTrigger={idx === 0} + {idx} testResult={filteredResults?.[idx]} /> {#if showParameters && showParameters[block.id]} From 1cb89388a1ed41c6d7b627df991dadb9b37361aa Mon Sep 17 00:00:00 2001 From: FlaminWrap Date: Sat, 5 Nov 2022 00:20:38 +0000 Subject: [PATCH 005/179] Afterthought Remembered that idx === 0 is the same as isTrigger --- .../AutomationBuilder/FlowChart/FlowItemHeader.svelte | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte index 2f8dbce67e..bc40b7bf85 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte @@ -72,14 +72,11 @@ {/if}
- {#if idx === 0} - Trigger - {:else} - Step {idx} - {/if} {#if isTrigger} + Trigger When this happens: {:else} + Step {idx} Do this: {/if} {block?.name?.toUpperCase() || ""} From d4826ab806620a13b44857742736cc1c7c1b42da Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 10 Nov 2022 14:34:23 +0000 Subject: [PATCH 006/179] Update side panel styles and ensure side panel properly reveals itself in the builder --- packages/client/src/components/Component.svelte | 1 + packages/client/src/components/app/Layout.svelte | 10 ++++++---- .../client/src/components/app/SidePanel.svelte | 14 +++++++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte index b98548fc9c..8a72fb042a 100644 --- a/packages/client/src/components/Component.svelte +++ b/packages/client/src/components/Component.svelte @@ -188,6 +188,7 @@ }, empty: emptyState, selected, + inSelectedPath, name, editing, type: instance._component, diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index d1e55df5b5..eb6e922a1f 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -336,16 +336,18 @@ } #side-panel-container { - flex: 0 0 360px; - background: var(--background); - box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.1); + flex: 0 0 400px; + max-width: calc(100vw - 40px); + background: var(--spectrum-global-color-gray-50); transition: margin-right 130ms ease-out; z-index: 3; padding: var(--spacing-xl); - margin-right: -370px; + margin-right: -410px; display: flex; flex-direction: column; gap: var(--spacing-xl); + overflow-y: auto; + border-left: 1px solid var(--spectrum-global-color-gray-300); } #side-panel-container.open { margin-right: 0; diff --git a/packages/client/src/components/app/SidePanel.svelte b/packages/client/src/components/app/SidePanel.svelte index 2e03ca6d3d..655b3d5d3b 100644 --- a/packages/client/src/components/app/SidePanel.svelte +++ b/packages/client/src/components/app/SidePanel.svelte @@ -2,9 +2,11 @@ import { getContext } from "svelte" const component = getContext("component") - const { styleable, sidePanelStore } = getContext("sdk") + const { styleable, sidePanelStore, builderStore } = getContext("sdk") - $: open = $sidePanelStore.contentId === $component.id + $: appOpen = $sidePanelStore.contentId === $component.id + $: builderOpen = $component.inSelectedPath + $: open = $builderStore.inBuilder ? builderOpen : appOpen const showInSidePanel = (el, visible) => { const target = document.getElementById("side-panel-container") @@ -13,9 +15,11 @@ } const update = visible => { if (visible) { + sidePanelStore.actions.open($component.id) target.appendChild(el) el.hidden = false } else { + sidePanelStore.actions.close() destroy() el.hidden = true } @@ -40,9 +44,9 @@
- +
From 30aa85af0b3e7d46f19539c0e749267099009424 Mon Sep 17 00:00:00 2001 From: FlaminWrap Date: Sun, 13 Nov 2022 17:08:23 +0000 Subject: [PATCH 007/179] Commit for enhancement #7604 Added a checkbox to allow the user to disable the default notifications to the following button actions: * Save row * Duplicate row * Trigger automation * Execute query * Delete row Also adjusted buttonActions.js to reflect the behaviour of that checkbox being ticked. --- .../actions/DeleteRow.svelte | 2 ++ .../actions/DuplicateRow.svelte | 2 ++ .../actions/ExecuteQuery.svelte | 3 +- .../ButtonActionEditor/actions/SaveRow.svelte | 2 ++ .../actions/TriggerAutomation.svelte | 2 ++ packages/client/src/utils/buttonActions.js | 31 +++++++++++++------ 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte index 0ca5bfaa76..00e3698524 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte @@ -27,6 +27,8 @@ />
-
- - -
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateSidePanel.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte similarity index 60% rename from packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateSidePanel.svelte rename to packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte index 1e8a5d6a9e..eb0c7b4db6 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateSidePanel.svelte +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte @@ -1,22 +1,10 @@
- - - {/if} + + Date: Fri, 25 Nov 2022 11:00:35 +0000 Subject: [PATCH 061/179] Update Price type def --- packages/types/src/sdk/licensing/plan.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/types/src/sdk/licensing/plan.ts b/packages/types/src/sdk/licensing/plan.ts index b370397534..f46432b109 100644 --- a/packages/types/src/sdk/licensing/plan.ts +++ b/packages/types/src/sdk/licensing/plan.ts @@ -23,4 +23,5 @@ export interface Price { duration: PriceDuration priceId: string dayPasses: number + isPerUser: boolean } From d49a1c90c0f3108061d9257acc5f8b96b40fe503 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 25 Nov 2022 12:08:34 +0000 Subject: [PATCH 062/179] Refactor clickoutside util to use a single event listener rather than many, and add support for ignoring certain classes --- packages/bbui/src/Actions/click_outside.js | 60 +++++++++++++++++----- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js index 2be29f7b79..8995df14f3 100644 --- a/packages/bbui/src/Actions/click_outside.js +++ b/packages/bbui/src/Actions/click_outside.js @@ -1,18 +1,54 @@ -export default function clickOutside(element, callbackFunction) { - function onClick(event) { - if (!element.contains(event.target)) { - callbackFunction?.(event) +const ignoredClasses = [".flatpickr-calendar"] +let clickHandlers = [] + +/** + * Handle a body click event + */ +const handleClick = event => { + // Ignore click if needed + for (let className of ignoredClasses) { + if (event.target.closest(className)) { + console.log("ignore") + return } } - document.body.addEventListener("click", onClick, true) + // Process handlers + clickHandlers.forEach(handler => { + if (!handler.element.contains(event.target)) { + handler.callback?.(event) + } + }) +} +document.documentElement.addEventListener("click", handleClick, true) - return { - update(newCallbackFunction) { - callbackFunction = newCallbackFunction - }, - destroy() { - document.body.removeEventListener("click", onClick, true) - }, +/** + * Adds or updates a click handler + */ +const updateHandler = (id, element, callback) => { + let existingHandler = clickHandlers.find(x => x.id === id) + if (!existingHandler) { + clickHandlers.push({ id, element, callback }) + } else { + existingHandler.callback = callback + } +} + +/** + * Removes a click handler + */ +const removeHandler = id => { + clickHandlers = clickHandlers.filter(x => x.id !== id) +} + +/** + * Svelte action to apply a click outside handler for a certain element + */ +export default (element, callback) => { + const id = Math.random() + updateHandler(id, element, callback) + return { + update: newCallback => updateHandler(id, element, newCallback), + destroy: () => removeHandler(id), } } From 472c7bbd74b8878c80ab86dd1ccf1fbe75903e5d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 25 Nov 2022 12:13:48 +0000 Subject: [PATCH 063/179] Ignore modals from consideration in clickOutside util --- packages/bbui/src/Actions/click_outside.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js index 8995df14f3..711c180962 100644 --- a/packages/bbui/src/Actions/click_outside.js +++ b/packages/bbui/src/Actions/click_outside.js @@ -1,4 +1,4 @@ -const ignoredClasses = [".flatpickr-calendar"] +const ignoredClasses = [".flatpickr-calendar", ".modal-container"] let clickHandlers = [] /** From fa21a913019cd9c5ca41d257736bc86fdf08ce20 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 25 Nov 2022 12:14:05 +0000 Subject: [PATCH 064/179] Ensure datepicker underlay does not exceed parent element size --- packages/bbui/src/Form/Core/DatePicker.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte index 5510d2d25b..395c03e2ec 100644 --- a/packages/bbui/src/Form/Core/DatePicker.svelte +++ b/packages/bbui/src/Form/Core/DatePicker.svelte @@ -260,6 +260,7 @@ width: 100vw; height: 100vh; z-index: 999; + max-height: 100%; } :global(.flatpickr-calendar) { font-family: "Source Sans Pro", sans-serif; From 5854b523e7d9c2cfea52a2b77bf6eab7b224230a Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 25 Nov 2022 12:14:25 +0000 Subject: [PATCH 065/179] Hide horizontal overflow in side panels --- packages/client/src/components/app/Layout.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte index 5c124e80ac..6582384569 100644 --- a/packages/client/src/components/app/Layout.svelte +++ b/packages/client/src/components/app/Layout.svelte @@ -356,6 +356,7 @@ flex-direction: column; gap: 30px; overflow-y: auto; + overflow-x: hidden; transition: transform 130ms ease-out; position: absolute; width: 400px; From b806c6bfba535d2f3fe6914d5766d7d9593a8664 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 25 Nov 2022 12:55:56 +0000 Subject: [PATCH 066/179] v2.1.35 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 77a1353c24..b9d2e71cb0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.34", + "version": "2.1.35", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 0dfeb53992..d0aad973e2 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.34", + "version": "2.1.35", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.34", + "@budibase/types": "^2.1.35", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 946dc64caa..9489106f60 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.34", + "version": "2.1.35", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.34", + "@budibase/string-templates": "^2.1.35", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index d1c40ca448..3623236c81 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.34", + "version": "2.1.35", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.34", - "@budibase/client": "^2.1.34", - "@budibase/frontend-core": "^2.1.34", - "@budibase/string-templates": "^2.1.34", + "@budibase/bbui": "^2.1.35", + "@budibase/client": "^2.1.35", + "@budibase/frontend-core": "^2.1.35", + "@budibase/string-templates": "^2.1.35", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 2bec6fa1b9..485bc498a5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.34", + "version": "2.1.35", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.34", - "@budibase/string-templates": "^2.1.34", - "@budibase/types": "^2.1.34", + "@budibase/backend-core": "^2.1.35", + "@budibase/string-templates": "^2.1.35", + "@budibase/types": "^2.1.35", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index f2533c9381..cd0cb5abb6 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.34", + "version": "2.1.35", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.34", - "@budibase/frontend-core": "^2.1.34", - "@budibase/string-templates": "^2.1.34", + "@budibase/bbui": "^2.1.35", + "@budibase/frontend-core": "^2.1.35", + "@budibase/string-templates": "^2.1.35", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 0c1256c30d..941d171222 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.34", + "version": "2.1.35", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.34", + "@budibase/bbui": "^2.1.35", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 276b5fbb20..7ef65bef08 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.34", + "version": "2.1.35", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index fc92c3c14e..e1f1b09d88 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.34", + "version": "2.1.35", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.34", - "@budibase/client": "^2.1.34", + "@budibase/backend-core": "^2.1.35", + "@budibase/client": "^2.1.35", "@budibase/pro": "2.1.34", - "@budibase/string-templates": "^2.1.34", - "@budibase/types": "^2.1.34", + "@budibase/string-templates": "^2.1.35", + "@budibase/types": "^2.1.35", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 4168e246af..c458c97fe6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.34", + "version": "2.1.35", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index b8dfcb8efa..1b193de5e6 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.34", + "version": "2.1.35", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index c584126c7d..2a8e1e0115 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.34", + "version": "2.1.35", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.34", + "@budibase/backend-core": "^2.1.35", "@budibase/pro": "2.1.34", - "@budibase/string-templates": "^2.1.34", - "@budibase/types": "^2.1.34", + "@budibase/string-templates": "^2.1.35", + "@budibase/types": "^2.1.35", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 42f596c7281ef38605024f9b309b1163290ed8bc Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Fri, 25 Nov 2022 12:52:50 +0000 Subject: [PATCH 067/179] Environment variable type coercion fix --- packages/worker/src/environment.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index c9eabdfdb4..cfe284cb0a 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -67,7 +67,8 @@ const env = { ENCRYPTED_TEST_PUBLIC_API_KEY: process.env.ENCRYPTED_TEST_PUBLIC_API_KEY, _set(key: any, value: any) { process.env[key] = value - module.exports[key] = value + // @ts-ignore + env[key] = value }, isDev, isTest, @@ -82,7 +83,7 @@ if (!env.APPS_URL) { } // clean up any environment variable edge cases -for (let [key, value] of Object.entries(module.exports)) { +for (let [key, value] of Object.entries(env)) { // handle the edge case of "0" to disable an environment variable if (value === "0") { // @ts-ignore From eddf5d13746a430e76adf925e0c007239bc9465a Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 25 Nov 2022 12:59:26 +0000 Subject: [PATCH 068/179] Update pro version to 2.1.35 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index e1f1b09d88..cc8191eb42 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.35", "@budibase/client": "^2.1.35", - "@budibase/pro": "2.1.34", + "@budibase/pro": "2.1.35", "@budibase/string-templates": "^2.1.35", "@budibase/types": "^2.1.35", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 7be35eeb3e..5bced3cca5 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.34": - version "2.1.34" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.34.tgz#9a2b80408c43ab5e315bd32dd19566de7aa02a30" - integrity sha512-Wx2fFKCX3SM13nPuU1suT3zQaHIQgoaJti2olSeU2Avk5HH9KPex3XeLXpEPiy9RBZsW04MkOX/w9/R9+NqSuA== +"@budibase/backend-core@2.1.35": + version "2.1.35" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.35.tgz#0aa203096c2d4538c232fc2684a6fd674db14273" + integrity sha512-9kfBrSAFRt5l3MS1exVXXfB4q6g69A8C3ziNGo7Omn9gRM/yGMGpRB6Q4lMA9LUMlX9Obvfheg02cMfR4WA0jA== dependencies: - "@budibase/types" "^2.1.34" + "@budibase/types" "^2.1.35" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.34": - version "2.1.34" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.34.tgz#104300ab205994da65dd7105d689b39accfd536f" - integrity sha512-7L6kRjy49LnsrTmv6KC8aJ9P5D19kyoaYDUc5tKFI3fpmOU2mPHkLU4fSfPC2u5xBXQV5nrcZ0yBUiqY4gq07g== +"@budibase/pro@2.1.35": + version "2.1.35" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.35.tgz#4ee90873de6c54b41c6dfbc5b4f20d725417fc77" + integrity sha512-AqBfCOlT5bZ4ZX+BjDe9zY9amjp9chSprE5Nhfkc0aYismFjXAJJu6U1hM3qR8QOJfs3pUUSs2ch/OvBuKUvuQ== dependencies: - "@budibase/backend-core" "2.1.34" - "@budibase/types" "2.1.34" + "@budibase/backend-core" "2.1.35" + "@budibase/types" "2.1.35" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.34", "@budibase/types@^2.1.34": - version "2.1.34" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.34.tgz#5793cd65e70e0279ce2553770cf5f868e7a2a6a7" - integrity sha512-rDKyDewvoMgCybQ7v6LOKUWKDhsYt8ac0JNdroDB7KMmlBC8+7oBi9mhw23hjZ7uREwCZ4rKp24HZW2HSvXiVA== +"@budibase/types@2.1.35", "@budibase/types@^2.1.35": + version "2.1.35" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.35.tgz#da8e75adc90583f7127e13b87eb96b495072f88c" + integrity sha512-09rftfFjGgh244MEro46V/We4EmBeKSRO99mFKcsQO6G9lu8gP5K6wY2caW5IbkM2zGTi5+kYsL8f8QMrhV6uw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 2a8e1e0115..3fb4b11ff2 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.35", - "@budibase/pro": "2.1.34", + "@budibase/pro": "2.1.35", "@budibase/string-templates": "^2.1.35", "@budibase/types": "^2.1.35", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index dc48bfd7d1..3795de6077 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.34": - version "2.1.34" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.34.tgz#9a2b80408c43ab5e315bd32dd19566de7aa02a30" - integrity sha512-Wx2fFKCX3SM13nPuU1suT3zQaHIQgoaJti2olSeU2Avk5HH9KPex3XeLXpEPiy9RBZsW04MkOX/w9/R9+NqSuA== +"@budibase/backend-core@2.1.35": + version "2.1.35" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.35.tgz#0aa203096c2d4538c232fc2684a6fd674db14273" + integrity sha512-9kfBrSAFRt5l3MS1exVXXfB4q6g69A8C3ziNGo7Omn9gRM/yGMGpRB6Q4lMA9LUMlX9Obvfheg02cMfR4WA0jA== dependencies: - "@budibase/types" "^2.1.34" + "@budibase/types" "^2.1.35" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.34": - version "2.1.34" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.34.tgz#104300ab205994da65dd7105d689b39accfd536f" - integrity sha512-7L6kRjy49LnsrTmv6KC8aJ9P5D19kyoaYDUc5tKFI3fpmOU2mPHkLU4fSfPC2u5xBXQV5nrcZ0yBUiqY4gq07g== +"@budibase/pro@2.1.35": + version "2.1.35" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.35.tgz#4ee90873de6c54b41c6dfbc5b4f20d725417fc77" + integrity sha512-AqBfCOlT5bZ4ZX+BjDe9zY9amjp9chSprE5Nhfkc0aYismFjXAJJu6U1hM3qR8QOJfs3pUUSs2ch/OvBuKUvuQ== dependencies: - "@budibase/backend-core" "2.1.34" - "@budibase/types" "2.1.34" + "@budibase/backend-core" "2.1.35" + "@budibase/types" "2.1.35" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.34", "@budibase/types@^2.1.34": - version "2.1.34" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.34.tgz#5793cd65e70e0279ce2553770cf5f868e7a2a6a7" - integrity sha512-rDKyDewvoMgCybQ7v6LOKUWKDhsYt8ac0JNdroDB7KMmlBC8+7oBi9mhw23hjZ7uREwCZ4rKp24HZW2HSvXiVA== +"@budibase/types@2.1.35", "@budibase/types@^2.1.35": + version "2.1.35" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.35.tgz#da8e75adc90583f7127e13b87eb96b495072f88c" + integrity sha512-09rftfFjGgh244MEro46V/We4EmBeKSRO99mFKcsQO6G9lu8gP5K6wY2caW5IbkM2zGTi5+kYsL8f8QMrhV6uw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From bab61698cbdd9cb16016a8710b7c536c55b0dca6 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 25 Nov 2022 13:34:25 +0000 Subject: [PATCH 069/179] Clear a create form block when submitted --- .../components/app/blocks/form/InnerFormBlock.svelte | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte b/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte index 79a40ba346..da5345e6ad 100644 --- a/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte +++ b/packages/client/src/components/app/blocks/form/InnerFormBlock.svelte @@ -46,6 +46,17 @@ { "##eventHandlerType": "Close Side Panel", }, + // Clear a create form once submitted + ...(actionType !== "Create" + ? [] + : [ + { + "##eventHandlerType": "Clear Form", + parameters: { + componentId: formId, + }, + }, + ]), { "##eventHandlerType": "Navigate To", parameters: { From 518c3abdc17568bab2387c9d483b31c601de8d6f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 25 Nov 2022 13:54:49 +0000 Subject: [PATCH 070/179] Remove console log --- packages/bbui/src/Actions/click_outside.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js index 711c180962..3a08484635 100644 --- a/packages/bbui/src/Actions/click_outside.js +++ b/packages/bbui/src/Actions/click_outside.js @@ -8,7 +8,6 @@ const handleClick = event => { // Ignore click if needed for (let className of ignoredClasses) { if (event.target.closest(className)) { - console.log("ignore") return } } From 4f5806fba31235ef57799f914af9711a0708ab02 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 25 Nov 2022 14:11:38 +0000 Subject: [PATCH 071/179] v2.1.36 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index b9d2e71cb0..0b650e7dab 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.35", + "version": "2.1.36", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index d0aad973e2..75d546bf92 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.35", + "version": "2.1.36", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.35", + "@budibase/types": "^2.1.36", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 9489106f60..8523ae3475 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.35", + "version": "2.1.36", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.35", + "@budibase/string-templates": "^2.1.36", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3623236c81..ad407a9cea 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.35", + "version": "2.1.36", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.35", - "@budibase/client": "^2.1.35", - "@budibase/frontend-core": "^2.1.35", - "@budibase/string-templates": "^2.1.35", + "@budibase/bbui": "^2.1.36", + "@budibase/client": "^2.1.36", + "@budibase/frontend-core": "^2.1.36", + "@budibase/string-templates": "^2.1.36", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 485bc498a5..c30f448f7e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.35", + "version": "2.1.36", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.35", - "@budibase/string-templates": "^2.1.35", - "@budibase/types": "^2.1.35", + "@budibase/backend-core": "^2.1.36", + "@budibase/string-templates": "^2.1.36", + "@budibase/types": "^2.1.36", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index cd0cb5abb6..32796a1015 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.35", + "version": "2.1.36", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.35", - "@budibase/frontend-core": "^2.1.35", - "@budibase/string-templates": "^2.1.35", + "@budibase/bbui": "^2.1.36", + "@budibase/frontend-core": "^2.1.36", + "@budibase/string-templates": "^2.1.36", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 941d171222..7f7a7cfbe0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.35", + "version": "2.1.36", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.35", + "@budibase/bbui": "^2.1.36", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7ef65bef08..50aa251772 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.35", + "version": "2.1.36", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index cc8191eb42..e3b42fa993 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.35", + "version": "2.1.36", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.35", - "@budibase/client": "^2.1.35", + "@budibase/backend-core": "^2.1.36", + "@budibase/client": "^2.1.36", "@budibase/pro": "2.1.35", - "@budibase/string-templates": "^2.1.35", - "@budibase/types": "^2.1.35", + "@budibase/string-templates": "^2.1.36", + "@budibase/types": "^2.1.36", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c458c97fe6..ac6a21a4fe 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.35", + "version": "2.1.36", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 1b193de5e6..26ca49f322 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.35", + "version": "2.1.36", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 3fb4b11ff2..74b7a4ce9d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.35", + "version": "2.1.36", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.35", + "@budibase/backend-core": "^2.1.36", "@budibase/pro": "2.1.35", - "@budibase/string-templates": "^2.1.35", - "@budibase/types": "^2.1.35", + "@budibase/string-templates": "^2.1.36", + "@budibase/types": "^2.1.36", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From e5bad5c599595699d42a72d24977fb0e26093f36 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Fri, 25 Nov 2022 14:14:57 +0000 Subject: [PATCH 072/179] Update pro version to 2.1.36 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index e3b42fa993..24b9f6c75c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.36", "@budibase/client": "^2.1.36", - "@budibase/pro": "2.1.35", + "@budibase/pro": "2.1.36", "@budibase/string-templates": "^2.1.36", "@budibase/types": "^2.1.36", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5bced3cca5..5025592e36 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.35": - version "2.1.35" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.35.tgz#0aa203096c2d4538c232fc2684a6fd674db14273" - integrity sha512-9kfBrSAFRt5l3MS1exVXXfB4q6g69A8C3ziNGo7Omn9gRM/yGMGpRB6Q4lMA9LUMlX9Obvfheg02cMfR4WA0jA== +"@budibase/backend-core@2.1.36": + version "2.1.36" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.36.tgz#85cb614287bf87e9d4650b49e61afaccce32dcc6" + integrity sha512-TXh9eQHwPFCI1m205nWdnEmMSez6rBoS0Ygs+YkUERxGEcFCAcF1WQ/i8jN03hvgHNcA3ZDvuVQq1UuzzmylSg== dependencies: - "@budibase/types" "^2.1.35" + "@budibase/types" "^2.1.36" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.35": - version "2.1.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.35.tgz#4ee90873de6c54b41c6dfbc5b4f20d725417fc77" - integrity sha512-AqBfCOlT5bZ4ZX+BjDe9zY9amjp9chSprE5Nhfkc0aYismFjXAJJu6U1hM3qR8QOJfs3pUUSs2ch/OvBuKUvuQ== +"@budibase/pro@2.1.36": + version "2.1.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.36.tgz#38e40f6b72eb9d6ea7b780e2951f67803757c553" + integrity sha512-kRXj8inF8QXGj5s7Ndfit/6LX+rpDfXX0HsTlceUHDlMROIEzNXGrv6bljZRjNzztqsdT3oV9GZ67NyLzOOSyQ== dependencies: - "@budibase/backend-core" "2.1.35" - "@budibase/types" "2.1.35" + "@budibase/backend-core" "2.1.36" + "@budibase/types" "2.1.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.35", "@budibase/types@^2.1.35": - version "2.1.35" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.35.tgz#da8e75adc90583f7127e13b87eb96b495072f88c" - integrity sha512-09rftfFjGgh244MEro46V/We4EmBeKSRO99mFKcsQO6G9lu8gP5K6wY2caW5IbkM2zGTi5+kYsL8f8QMrhV6uw== +"@budibase/types@2.1.36", "@budibase/types@^2.1.36": + version "2.1.36" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.36.tgz#12275dcb043dc17be6ac0b9479f5c177110fb2a1" + integrity sha512-KxDpMcFW3nJCTPT4DkXmttURqMxHIT0ShOL4PopXxZvY6zxq/mkJxbq/FvAdS6VGXhNBAJEtQRokRafpqC3wNg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 74b7a4ce9d..2b1fd745c3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.36", - "@budibase/pro": "2.1.35", + "@budibase/pro": "2.1.36", "@budibase/string-templates": "^2.1.36", "@budibase/types": "^2.1.36", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 3795de6077..f51304f9bd 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.35": - version "2.1.35" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.35.tgz#0aa203096c2d4538c232fc2684a6fd674db14273" - integrity sha512-9kfBrSAFRt5l3MS1exVXXfB4q6g69A8C3ziNGo7Omn9gRM/yGMGpRB6Q4lMA9LUMlX9Obvfheg02cMfR4WA0jA== +"@budibase/backend-core@2.1.36": + version "2.1.36" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.36.tgz#85cb614287bf87e9d4650b49e61afaccce32dcc6" + integrity sha512-TXh9eQHwPFCI1m205nWdnEmMSez6rBoS0Ygs+YkUERxGEcFCAcF1WQ/i8jN03hvgHNcA3ZDvuVQq1UuzzmylSg== dependencies: - "@budibase/types" "^2.1.35" + "@budibase/types" "^2.1.36" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.35": - version "2.1.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.35.tgz#4ee90873de6c54b41c6dfbc5b4f20d725417fc77" - integrity sha512-AqBfCOlT5bZ4ZX+BjDe9zY9amjp9chSprE5Nhfkc0aYismFjXAJJu6U1hM3qR8QOJfs3pUUSs2ch/OvBuKUvuQ== +"@budibase/pro@2.1.36": + version "2.1.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.36.tgz#38e40f6b72eb9d6ea7b780e2951f67803757c553" + integrity sha512-kRXj8inF8QXGj5s7Ndfit/6LX+rpDfXX0HsTlceUHDlMROIEzNXGrv6bljZRjNzztqsdT3oV9GZ67NyLzOOSyQ== dependencies: - "@budibase/backend-core" "2.1.35" - "@budibase/types" "2.1.35" + "@budibase/backend-core" "2.1.36" + "@budibase/types" "2.1.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.35", "@budibase/types@^2.1.35": - version "2.1.35" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.35.tgz#da8e75adc90583f7127e13b87eb96b495072f88c" - integrity sha512-09rftfFjGgh244MEro46V/We4EmBeKSRO99mFKcsQO6G9lu8gP5K6wY2caW5IbkM2zGTi5+kYsL8f8QMrhV6uw== +"@budibase/types@2.1.36", "@budibase/types@^2.1.36": + version "2.1.36" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.36.tgz#12275dcb043dc17be6ac0b9479f5c177110fb2a1" + integrity sha512-KxDpMcFW3nJCTPT4DkXmttURqMxHIT0ShOL4PopXxZvY6zxq/mkJxbq/FvAdS6VGXhNBAJEtQRokRafpqC3wNg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 0c73662f321483553b019f8c43e75728b1750430 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 25 Nov 2022 15:01:46 +0000 Subject: [PATCH 073/179] Some server typescript re-writes, only automations left and some controllers. --- .../src/api/controllers/plugin/utils.ts | 8 +- .../src/api/controllers/static/index.ts | 8 +- packages/server/src/constants/index.js | 206 ------------------ packages/server/src/constants/index.ts | 204 +++++++++++++++++ .../src/constants/{layouts.js => layouts.ts} | 12 +- packages/server/src/constants/screens.js | 46 ---- packages/server/src/constants/screens.ts | 48 ++++ ...bb_default.js => datasource_bb_default.ts} | 101 ++++----- .../{employeeImport.js => employeeImport.ts} | 2 +- .../{expensesImport.js => expensesImport.ts} | 2 +- ...{inventoryImport.js => inventoryImport.ts} | 2 +- .../{jobsImport.js => jobsImport.ts} | 2 +- .../db/{dynamoClient.js => dynamoClient.ts} | 58 +++-- .../db/{inMemoryView.js => inMemoryView.ts} | 20 +- packages/server/src/db/index.js | 16 -- packages/server/src/db/index.ts | 16 ++ packages/server/src/db/{newid.js => newid.ts} | 2 +- .../views/{staticViews.js => staticViews.ts} | 27 ++- ...omationEmitter.js => AutomationEmitter.ts} | 19 +- .../events/{index.js => BudibaseEmitter.ts} | 15 +- packages/server/src/events/index.ts | 5 + packages/server/src/events/utils.js | 38 ---- packages/server/src/events/utils.ts | 78 +++++++ .../{centralPath.js => centralPath.ts} | 6 +- .../utilities/{csvParser.js => csvParser.ts} | 62 ++++-- .../{clientLibrary.js => clientLibrary.ts} | 18 +- .../fileSystem/{index.js => index.ts} | 116 +++++----- .../fileSystem/{processor.js => processor.ts} | 8 +- .../src/utilities/{plugins.js => plugins.ts} | 9 +- .../src/utilities/queue/inMemoryQueue.js | 122 ----------- .../utilities/rowProcessor/{map.js => map.ts} | 3 +- .../{scriptRunner.js => scriptRunner.ts} | 12 +- .../{statusCodes.js => statusCodes.ts} | 2 +- ...{usageQuoteReset.js => usageQuoteReset.ts} | 2 +- packages/types/src/documents/app/index.ts | 1 + packages/types/src/documents/app/links.ts | 13 ++ packages/types/src/documents/app/table.ts | 21 +- packages/types/src/documents/app/view.ts | 3 + 38 files changed, 667 insertions(+), 666 deletions(-) delete mode 100644 packages/server/src/constants/index.js create mode 100644 packages/server/src/constants/index.ts rename packages/server/src/constants/{layouts.js => layouts.ts} (95%) delete mode 100644 packages/server/src/constants/screens.js create mode 100644 packages/server/src/constants/screens.ts rename packages/server/src/db/defaultData/{datasource_bb_default.js => datasource_bb_default.ts} (85%) rename packages/server/src/db/defaultData/{employeeImport.js => employeeImport.ts} (99%) rename packages/server/src/db/defaultData/{expensesImport.js => expensesImport.ts} (99%) rename packages/server/src/db/defaultData/{inventoryImport.js => inventoryImport.ts} (98%) rename packages/server/src/db/defaultData/{jobsImport.js => jobsImport.ts} (99%) rename packages/server/src/db/{dynamoClient.js => dynamoClient.ts} (73%) rename packages/server/src/db/{inMemoryView.js => inMemoryView.ts} (68%) delete mode 100644 packages/server/src/db/index.js create mode 100644 packages/server/src/db/index.ts rename packages/server/src/db/{newid.js => newid.ts} (68%) rename packages/server/src/db/views/{staticViews.js => staticViews.ts} (84%) rename packages/server/src/events/{AutomationEmitter.js => AutomationEmitter.ts} (73%) rename packages/server/src/events/{index.js => BudibaseEmitter.ts} (65%) create mode 100644 packages/server/src/events/index.ts delete mode 100644 packages/server/src/events/utils.js create mode 100644 packages/server/src/events/utils.ts rename packages/server/src/utilities/{centralPath.js => centralPath.ts} (83%) rename packages/server/src/utilities/{csvParser.js => csvParser.ts} (70%) rename packages/server/src/utilities/fileSystem/{clientLibrary.js => clientLibrary.ts} (91%) rename packages/server/src/utilities/fileSystem/{index.js => index.ts} (78%) rename packages/server/src/utilities/fileSystem/{processor.js => processor.ts} (69%) rename packages/server/src/utilities/{plugins.js => plugins.ts} (69%) delete mode 100644 packages/server/src/utilities/queue/inMemoryQueue.js rename packages/server/src/utilities/rowProcessor/{map.js => map.ts} (96%) rename packages/server/src/utilities/{scriptRunner.js => scriptRunner.ts} (70%) rename packages/server/src/utilities/{statusCodes.js => statusCodes.ts} (82%) rename packages/server/src/utilities/usageQuota/{usageQuoteReset.js => usageQuoteReset.ts} (81%) create mode 100644 packages/types/src/documents/app/links.ts diff --git a/packages/server/src/api/controllers/plugin/utils.ts b/packages/server/src/api/controllers/plugin/utils.ts index 0e92fbb987..ff696b1aa1 100644 --- a/packages/server/src/api/controllers/plugin/utils.ts +++ b/packages/server/src/api/controllers/plugin/utils.ts @@ -1,7 +1,5 @@ -import { - createTempFolder, - downloadTarballDirect, -} from "../../../utilities/fileSystem" +import { createTempFolder } from "../../../utilities/fileSystem" +import { objectStore } from "@budibase/backend-core" export async function downloadUnzipTarball( url: string, @@ -10,7 +8,7 @@ export async function downloadUnzipTarball( ) { try { const path = createTempFolder(name) - await downloadTarballDirect(url, path, headers) + await objectStore.downloadTarballDirect(url, path, headers) return path } catch (e: any) { diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts index 68c01557bc..32f5e33325 100644 --- a/packages/server/src/api/controllers/static/index.ts +++ b/packages/server/src/api/controllers/static/index.ts @@ -14,7 +14,6 @@ const { } = require("../../../utilities/fileSystem") const env = require("../../../environment") const { clientLibraryPath } = require("../../../utilities") -const { upload, deleteFiles } = require("../../../utilities/fileSystem") const { attachmentsRelativeURL } = require("../../../utilities") const { DocumentType } = require("../../../db/utils") const { context, objectStore, utils } = require("@budibase/backend-core") @@ -22,7 +21,7 @@ const AWS = require("aws-sdk") const fs = require("fs") async function prepareUpload({ s3Key, bucket, metadata, file }: any) { - const response = await upload({ + const response = await objectStore.upload({ bucket, metadata, filename: s3Key, @@ -95,7 +94,10 @@ export const uploadFile = async function (ctx: any) { } export const deleteObjects = async function (ctx: any) { - ctx.body = await deleteFiles(ObjectStoreBuckets.APPS, ctx.request.body.keys) + ctx.body = await objectStore.deleteFiles( + ObjectStoreBuckets.APPS, + ctx.request.body.keys + ) } export const serveApp = async function (ctx: any) { diff --git a/packages/server/src/constants/index.js b/packages/server/src/constants/index.js deleted file mode 100644 index 5f68cc26ed..0000000000 --- a/packages/server/src/constants/index.js +++ /dev/null @@ -1,206 +0,0 @@ -const { objectStore, roles, constants } = require("@budibase/backend-core") - -const FilterTypes = { - STRING: "string", - FUZZY: "fuzzy", - RANGE: "range", - EQUAL: "equal", - NOT_EQUAL: "notEqual", - EMPTY: "empty", - NOT_EMPTY: "notEmpty", - CONTAINS: "contains", - NOT_CONTAINS: "notContains", - ONE_OF: "oneOf", -} - -exports.FilterTypes = FilterTypes -exports.NoEmptyFilterStrings = [ - FilterTypes.STRING, - FilterTypes.FUZZY, - FilterTypes.EQUAL, - FilterTypes.NOT_EQUAL, - FilterTypes.CONTAINS, - FilterTypes.NOT_CONTAINS, -] - -exports.FieldTypes = { - STRING: "string", - BARCODEQR: "barcodeqr", - LONGFORM: "longform", - OPTIONS: "options", - NUMBER: "number", - BOOLEAN: "boolean", - ARRAY: "array", - DATETIME: "datetime", - ATTACHMENT: "attachment", - LINK: "link", - FORMULA: "formula", - AUTO: "auto", - JSON: "json", - INTERNAL: "internal", -} - -exports.CanSwitchTypes = [ - [exports.FieldTypes.JSON, exports.FieldTypes.ARRAY], - [ - exports.FieldTypes.STRING, - exports.FieldTypes.OPTIONS, - exports.FieldTypes.LONGFORM, - exports.FieldTypes.BARCODEQR, - ], - [exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER], -] - -exports.SwitchableTypes = exports.CanSwitchTypes.reduce((prev, current) => - prev ? prev.concat(current) : current -) - -exports.RelationshipTypes = { - ONE_TO_MANY: "one-to-many", - MANY_TO_ONE: "many-to-one", - MANY_TO_MANY: "many-to-many", -} - -exports.FormulaTypes = { - STATIC: "static", - DYNAMIC: "dynamic", -} - -exports.AuthTypes = { - APP: "app", - BUILDER: "builder", - EXTERNAL: "external", -} - -exports.DataSourceOperation = { - CREATE: "CREATE", - READ: "READ", - UPDATE: "UPDATE", - DELETE: "DELETE", - BULK_CREATE: "BULK_CREATE", - CREATE_TABLE: "CREATE_TABLE", - UPDATE_TABLE: "UPDATE_TABLE", - DELETE_TABLE: "DELETE_TABLE", -} - -exports.DatasourceAuthTypes = { - GOOGLE: "google", -} - -exports.SortDirection = { - ASCENDING: "ASCENDING", - DESCENDING: "DESCENDING", -} - -exports.USERS_TABLE_SCHEMA = { - _id: "ta_users", - type: "table", - views: {}, - name: "Users", - // TODO: ADMIN PANEL - when implemented this doesn't need to be carried out - schema: { - email: { - type: exports.FieldTypes.STRING, - constraints: { - type: exports.FieldTypes.STRING, - email: true, - length: { - maximum: "", - }, - presence: true, - }, - fieldName: "email", - name: "email", - }, - firstName: { - name: "firstName", - fieldName: "firstName", - type: exports.FieldTypes.STRING, - constraints: { - type: exports.FieldTypes.STRING, - presence: false, - }, - }, - lastName: { - name: "lastName", - fieldName: "lastName", - type: exports.FieldTypes.STRING, - constraints: { - type: exports.FieldTypes.STRING, - presence: false, - }, - }, - roleId: { - fieldName: "roleId", - name: "roleId", - type: exports.FieldTypes.OPTIONS, - constraints: { - type: exports.FieldTypes.STRING, - presence: false, - inclusion: Object.values(roles.BUILTIN_ROLE_IDS), - }, - }, - status: { - fieldName: "status", - name: "status", - type: exports.FieldTypes.OPTIONS, - constraints: { - type: exports.FieldTypes.STRING, - presence: false, - inclusion: Object.values(constants.UserStatus), - }, - }, - }, - primaryDisplay: "email", -} - -exports.AutoFieldSubTypes = { - CREATED_BY: "createdBy", - CREATED_AT: "createdAt", - UPDATED_BY: "updatedBy", - UPDATED_AT: "updatedAt", - AUTO_ID: "autoID", -} - -exports.AutoFieldDefaultNames = { - CREATED_BY: "Created By", - CREATED_AT: "Created At", - UPDATED_BY: "Updated By", - UPDATED_AT: "Updated At", - AUTO_ID: "Auto ID", -} - -exports.OBJ_STORE_DIRECTORY = "/prod-budi-app-assets" -exports.BaseQueryVerbs = { - CREATE: "create", - READ: "read", - UPDATE: "update", - DELETE: "delete", -} - -exports.MetadataTypes = { - AUTOMATION_TEST_INPUT: "automationTestInput", - AUTOMATION_TEST_HISTORY: "automationTestHistory", -} - -exports.InvalidColumns = { - ID: "_id", - REV: "_rev", - TABLE_ID: "tableId", -} - -exports.BuildSchemaErrors = { - NO_KEY: "no_key", - INVALID_COLUMN: "invalid_column", -} - -exports.AutomationErrors = { - INCORRECT_TYPE: "INCORRECT_TYPE", - MAX_ITERATIONS: "MAX_ITERATIONS_REACHED", - FAILURE_CONDITION: "FAILURE_CONDITION_MET", -} - -// pass through the list from the auth/core lib -exports.ObjectStoreBuckets = objectStore.ObjectStoreBuckets - -exports.MAX_AUTOMATION_RECURRING_ERRORS = 5 diff --git a/packages/server/src/constants/index.ts b/packages/server/src/constants/index.ts new file mode 100644 index 0000000000..eb4c6211c6 --- /dev/null +++ b/packages/server/src/constants/index.ts @@ -0,0 +1,204 @@ +import { objectStore, roles, constants } from "@budibase/backend-core" + +export enum FilterTypes { + STRING = "string", + FUZZY = "fuzzy", + RANGE = "range", + EQUAL = "equal", + NOT_EQUAL = "notEqual", + EMPTY = "empty", + NOT_EMPTY = "notEmpty", + CONTAINS = "contains", + NOT_CONTAINS = "notContains", + ONE_OF = "oneOf", +} + +export const NoEmptyFilterStrings = [ + FilterTypes.STRING, + FilterTypes.FUZZY, + FilterTypes.EQUAL, + FilterTypes.NOT_EQUAL, + FilterTypes.CONTAINS, + FilterTypes.NOT_CONTAINS, +] + +export enum FieldTypes { + STRING = "string", + BARCODEQR = "barcodeqr", + LONGFORM = "longform", + OPTIONS = "options", + NUMBER = "number", + BOOLEAN = "boolean", + ARRAY = "array", + DATETIME = "datetime", + ATTACHMENT = "attachment", + LINK = "link", + FORMULA = "formula", + AUTO = "auto", + JSON = "json", + INTERNAL = "internal", +} + +export const CanSwitchTypes = [ + [exports.FieldTypes.JSON, exports.FieldTypes.ARRAY], + [ + exports.FieldTypes.STRING, + exports.FieldTypes.OPTIONS, + exports.FieldTypes.LONGFORM, + exports.FieldTypes.BARCODEQR, + ], + [exports.FieldTypes.BOOLEAN, exports.FieldTypes.NUMBER], +] + +export const SwitchableTypes = CanSwitchTypes.reduce((prev, current) => + prev ? prev.concat(current) : current +) + +export enum RelationshipTypes { + ONE_TO_MANY = "one-to-many", + MANY_TO_ONE = "many-to-one", + MANY_TO_MANY = "many-to-many", +} + +export enum FormulaTypes { + STATIC = "static", + DYNAMIC = "dynamic", +} + +export enum AuthTypes { + APP = "app", + BUILDER = "builder", + EXTERNAL = "external", +} + +export enum DataSourceOperation { + CREATE = "CREATE", + READ = "READ", + UPDATE = "UPDATE", + DELETE = "DELETE", + BULK_CREATE = "BULK_CREATE", + CREATE_TABLE = "CREATE_TABLE", + UPDATE_TABLE = "UPDATE_TABLE", + DELETE_TABLE = "DELETE_TABLE", +} + +export enum DatasourceAuthTypes { + GOOGLE = "google", +} + +export enum SortDirection { + ASCENDING = "ASCENDING", + DESCENDING = "DESCENDING", +} + +export const USERS_TABLE_SCHEMA = { + _id: "ta_users", + type: "table", + views: {}, + name: "Users", + // TODO: ADMIN PANEL - when implemented this doesn't need to be carried out + schema: { + email: { + type: exports.FieldTypes.STRING, + constraints: { + type: exports.FieldTypes.STRING, + email: true, + length: { + maximum: "", + }, + presence: true, + }, + fieldName: "email", + name: "email", + }, + firstName: { + name: "firstName", + fieldName: "firstName", + type: exports.FieldTypes.STRING, + constraints: { + type: exports.FieldTypes.STRING, + presence: false, + }, + }, + lastName: { + name: "lastName", + fieldName: "lastName", + type: exports.FieldTypes.STRING, + constraints: { + type: exports.FieldTypes.STRING, + presence: false, + }, + }, + roleId: { + fieldName: "roleId", + name: "roleId", + type: exports.FieldTypes.OPTIONS, + constraints: { + type: exports.FieldTypes.STRING, + presence: false, + inclusion: Object.values(roles.BUILTIN_ROLE_IDS), + }, + }, + status: { + fieldName: "status", + name: "status", + type: exports.FieldTypes.OPTIONS, + constraints: { + type: exports.FieldTypes.STRING, + presence: false, + inclusion: Object.values(constants.UserStatus), + }, + }, + }, + primaryDisplay: "email", +} + +export enum AutoFieldSubTypes { + CREATED_BY = "createdBy", + CREATED_AT = "createdAt", + UPDATED_BY = "updatedBy", + UPDATED_AT = "updatedAt", + AUTO_ID = "autoID", +} + +export enum AutoFieldDefaultNames { + CREATED_BY = "Created By", + CREATED_AT = "Created At", + UPDATED_BY = "Updated By", + UPDATED_AT = "Updated At", + AUTO_ID = "Auto ID", +} + +export const OBJ_STORE_DIRECTORY = "/prod-budi-app-assets" +export enum BaseQueryVerbs { + CREATE = "create", + READ = "read", + UPDATE = "update", + DELETE = "delete", +} + +export enum MetadataTypes { + AUTOMATION_TEST_INPUT = "automationTestInput", + AUTOMATION_TEST_HISTORY = "automationTestHistory", +} + +export enum InvalidColumns { + ID = "_id", + REV = "_rev", + TABLE_ID = "tableId", +} + +export enum BuildSchemaErrors { + NO_KEY = "no_key", + INVALID_COLUMN = "invalid_column", +} + +export enum AutomationErrors { + INCORRECT_TYPE = "INCORRECT_TYPE", + MAX_ITERATIONS = "MAX_ITERATIONS_REACHED", + FAILURE_CONDITION = "FAILURE_CONDITION_MET", +} + +// pass through the list from the auth/core lib +export const ObjectStoreBuckets = objectStore.ObjectStoreBuckets +export const MAX_AUTOMATION_RECURRING_ERRORS = 5 diff --git a/packages/server/src/constants/layouts.js b/packages/server/src/constants/layouts.ts similarity index 95% rename from packages/server/src/constants/layouts.js rename to packages/server/src/constants/layouts.ts index 2402a1f7db..835a5d2e15 100644 --- a/packages/server/src/constants/layouts.js +++ b/packages/server/src/constants/layouts.ts @@ -1,9 +1,9 @@ -const BASE_LAYOUT_PROP_IDS = { +export const BASE_LAYOUT_PROP_IDS = { PRIVATE: "layout_private_master", PUBLIC: "layout_public_master", } -const EMPTY_LAYOUT = { +export const EMPTY_LAYOUT = { componentLibraries: ["@budibase/standard-components"], title: "{{ name }}", favicon: "./_shared/favicon.png", @@ -48,7 +48,7 @@ const EMPTY_LAYOUT = { }, } -const BASE_LAYOUTS = [ +export const BASE_LAYOUTS = [ { _id: BASE_LAYOUT_PROP_IDS.PRIVATE, componentLibraries: ["@budibase/standard-components"], @@ -145,9 +145,3 @@ const BASE_LAYOUTS = [ }, }, ] - -module.exports = { - BASE_LAYOUTS, - BASE_LAYOUT_PROP_IDS, - EMPTY_LAYOUT, -} diff --git a/packages/server/src/constants/screens.js b/packages/server/src/constants/screens.js deleted file mode 100644 index dc21c0d9bd..0000000000 --- a/packages/server/src/constants/screens.js +++ /dev/null @@ -1,46 +0,0 @@ -const { roles } = require("@budibase/backend-core") -const { BASE_LAYOUT_PROP_IDS } = require("./layouts") - -exports.createHomeScreen = () => ({ - description: "", - url: "", - layoutId: BASE_LAYOUT_PROP_IDS.PRIVATE, - props: { - _id: "d834fea2-1b3e-4320-ab34-f9009f5ecc59", - _component: "@budibase/standard-components/container", - _styles: { - normal: {}, - hover: {}, - active: {}, - selected: {}, - }, - _transition: "fade", - _children: [ - { - _id: "ef60083f-4a02-4df3-80f3-a0d3d16847e7", - _component: "@budibase/standard-components/heading", - _styles: { - hover: {}, - active: {}, - selected: {}, - }, - text: "Welcome to your Budibase App 👋", - size: "M", - align: "left", - _instanceName: "Heading", - _children: [], - }, - ], - _instanceName: "Home", - direction: "column", - hAlign: "stretch", - vAlign: "top", - size: "grow", - gap: "M", - }, - routing: { - route: "/", - roleId: roles.BUILTIN_ROLE_IDS.BASIC, - }, - name: "home-screen", -}) diff --git a/packages/server/src/constants/screens.ts b/packages/server/src/constants/screens.ts new file mode 100644 index 0000000000..23e36a65b8 --- /dev/null +++ b/packages/server/src/constants/screens.ts @@ -0,0 +1,48 @@ +import { roles } from "@budibase/backend-core" +import { BASE_LAYOUT_PROP_IDS } from "./layouts" + +export function createHomeScreen() { + return { + description: "", + url: "", + layoutId: BASE_LAYOUT_PROP_IDS.PRIVATE, + props: { + _id: "d834fea2-1b3e-4320-ab34-f9009f5ecc59", + _component: "@budibase/standard-components/container", + _styles: { + normal: {}, + hover: {}, + active: {}, + selected: {}, + }, + _transition: "fade", + _children: [ + { + _id: "ef60083f-4a02-4df3-80f3-a0d3d16847e7", + _component: "@budibase/standard-components/heading", + _styles: { + hover: {}, + active: {}, + selected: {}, + }, + text: "Welcome to your Budibase App 👋", + size: "M", + align: "left", + _instanceName: "Heading", + _children: [], + }, + ], + _instanceName: "Home", + direction: "column", + hAlign: "stretch", + vAlign: "top", + size: "grow", + gap: "M", + }, + routing: { + route: "/", + roleId: roles.BUILTIN_ROLE_IDS.BASIC, + }, + name: "home-screen", + } +} diff --git a/packages/server/src/db/defaultData/datasource_bb_default.js b/packages/server/src/db/defaultData/datasource_bb_default.ts similarity index 85% rename from packages/server/src/db/defaultData/datasource_bb_default.js rename to packages/server/src/db/defaultData/datasource_bb_default.ts index f12ee2c97d..a9fb214cb2 100644 --- a/packages/server/src/db/defaultData/datasource_bb_default.js +++ b/packages/server/src/db/defaultData/datasource_bb_default.ts @@ -1,31 +1,32 @@ -const { +import { FieldTypes, AutoFieldSubTypes, RelationshipTypes, -} = require("../../constants/index") -const { importToRows } = require("../../api/controllers/table/utils") -const { cloneDeep } = require("lodash/fp") -const LinkDocument = require("../linkedRows/LinkDocument") -const { inventoryImport } = require("./inventoryImport") -const { employeeImport } = require("./employeeImport") -const { jobsImport } = require("./jobsImport") -const { expensesImport } = require("./expensesImport") -const { db: dbCore } = require("@budibase/backend-core") +} from "../../constants" +import { importToRows } from "../../api/controllers/table/utils" +import { cloneDeep } from "lodash/fp" +import LinkDocument from "../linkedRows/LinkDocument" +import { inventoryImport } from "./inventoryImport" +import { employeeImport } from "./employeeImport" +import { jobsImport } from "./jobsImport" +import { expensesImport } from "./expensesImport" +import { db as dbCore } from "@budibase/backend-core" +import { Table, Row } from "@budibase/types" -exports.DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs" -exports.DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory" -exports.DEFAULT_EXPENSES_TABLE_ID = "ta_bb_expenses" -exports.DEFAULT_EMPLOYEE_TABLE_ID = "ta_bb_employee" -exports.DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default" -exports.DEFAULT_BB_DATASOURCE = { - _id: this.DEFAULT_BB_DATASOURCE_ID, +export const DEFAULT_JOBS_TABLE_ID = "ta_bb_jobs" +export const DEFAULT_INVENTORY_TABLE_ID = "ta_bb_inventory" +export const DEFAULT_EXPENSES_TABLE_ID = "ta_bb_expenses" +export const DEFAULT_EMPLOYEE_TABLE_ID = "ta_bb_employee" +export const DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default" +export const DEFAULT_BB_DATASOURCE = { + _id: DEFAULT_BB_DATASOURCE_ID, type: dbCore.BUDIBASE_DATASOURCE_TYPE, name: "Sample Data", source: "BUDIBASE", config: {}, } -const syncLastIds = (table, rowCount) => { +function syncLastIds(table: Table, rowCount: number) { Object.keys(table.schema).forEach(key => { const entry = table.schema[key] if (entry.autocolumn && entry.subtype == "autoID") { @@ -34,7 +35,7 @@ const syncLastIds = (table, rowCount) => { }) } -const tableImport = (table, data) => { +function tableImport(table: Table, data: Row) { const cloneTable = cloneDeep(table) const rowDocs = importToRows(data, cloneTable) syncLastIds(cloneTable, rowDocs.length) @@ -77,11 +78,11 @@ const AUTO_COLUMNS = { }, } -exports.DEFAULT_INVENTORY_TABLE_SCHEMA = { - _id: this.DEFAULT_INVENTORY_TABLE_ID, +export const DEFAULT_INVENTORY_TABLE_SCHEMA: Table = { + _id: DEFAULT_INVENTORY_TABLE_ID, type: "internal", views: {}, - sourceId: exports.DEFAULT_BB_DATASOURCE_ID, + sourceId: DEFAULT_BB_DATASOURCE_ID, primaryDisplay: "Item Name", name: "Inventory", schema: { @@ -186,12 +187,12 @@ exports.DEFAULT_INVENTORY_TABLE_SCHEMA = { }, } -exports.DEFAULT_EMPLOYEE_TABLE_SCHEMA = { - _id: this.DEFAULT_EMPLOYEE_TABLE_ID, +export const DEFAULT_EMPLOYEE_TABLE_SCHEMA = { + _id: DEFAULT_EMPLOYEE_TABLE_ID, type: "internal", views: {}, name: "Employees", - sourceId: exports.DEFAULT_BB_DATASOURCE_ID, + sourceId: DEFAULT_BB_DATASOURCE_ID, primaryDisplay: "First Name", schema: { "First Name": { @@ -300,7 +301,7 @@ exports.DEFAULT_EMPLOYEE_TABLE_SCHEMA = { fieldName: "Assigned", name: "Jobs", relationshipType: RelationshipTypes.MANY_TO_MANY, - tableId: this.DEFAULT_JOBS_TABLE_ID, + tableId: DEFAULT_JOBS_TABLE_ID, }, "Start Date": { type: FieldTypes.DATETIME, @@ -334,11 +335,11 @@ exports.DEFAULT_EMPLOYEE_TABLE_SCHEMA = { }, } -exports.DEFAULT_JOBS_TABLE_SCHEMA = { - _id: this.DEFAULT_JOBS_TABLE_ID, +export const DEFAULT_JOBS_TABLE_SCHEMA: Table = { + _id: DEFAULT_JOBS_TABLE_ID, type: "internal", name: "Jobs", - sourceId: exports.DEFAULT_BB_DATASOURCE_ID, + sourceId: DEFAULT_BB_DATASOURCE_ID, primaryDisplay: "Job ID", schema: { "Job ID": { @@ -456,7 +457,7 @@ exports.DEFAULT_JOBS_TABLE_SCHEMA = { Assigned: { name: "Assigned", type: FieldTypes.LINK, - tableId: this.DEFAULT_EMPLOYEE_TABLE_ID, + tableId: DEFAULT_EMPLOYEE_TABLE_ID, fieldName: "Jobs", relationshipType: RelationshipTypes.MANY_TO_MANY, // sortable: true, @@ -491,12 +492,12 @@ exports.DEFAULT_JOBS_TABLE_SCHEMA = { }, } -exports.DEFAULT_EXPENSES_TABLE_SCHEMA = { - _id: this.DEFAULT_EXPENSES_TABLE_ID, +export const DEFAULT_EXPENSES_TABLE_SCHEMA: Table = { + _id: DEFAULT_EXPENSES_TABLE_ID, type: "internal", views: {}, name: "Expenses", - sourceId: exports.DEFAULT_BB_DATASOURCE_ID, + sourceId: DEFAULT_BB_DATASOURCE_ID, primaryDisplay: "Expense ID", schema: { "Expense ID": { @@ -601,38 +602,40 @@ exports.DEFAULT_EXPENSES_TABLE_SCHEMA = { }, } -exports.buildDefaultDocs = () => { +export function buildDefaultDocs() { const inventoryData = tableImport( - this.DEFAULT_INVENTORY_TABLE_SCHEMA, + DEFAULT_INVENTORY_TABLE_SCHEMA, inventoryImport ) const employeeData = tableImport( - this.DEFAULT_EMPLOYEE_TABLE_SCHEMA, + DEFAULT_EMPLOYEE_TABLE_SCHEMA, employeeImport ) - const jobData = tableImport(this.DEFAULT_JOBS_TABLE_SCHEMA, jobsImport) + const jobData = tableImport(DEFAULT_JOBS_TABLE_SCHEMA, jobsImport) const expensesData = tableImport( - this.DEFAULT_EXPENSES_TABLE_SCHEMA, + DEFAULT_EXPENSES_TABLE_SCHEMA, expensesImport ) // Build one link doc for each employee/job - const jobEmployeeLinks = employeeData.rows.map((employee, index) => { - return new LinkDocument( - employeeData.table._id, - "Jobs", - employeeData.rows[index]._id, - jobData.table._id, - "Assigned", - jobData.rows[index]._id - ) - }) + const jobEmployeeLinks = employeeData.rows.map( + (employee: any, index: any) => { + return new LinkDocument( + employeeData.table._id!, + "Jobs", + employeeData.rows[index]._id, + jobData.table._id!, + "Assigned", + jobData.rows[index]._id + ) + } + ) return [ - this.DEFAULT_BB_DATASOURCE, + DEFAULT_BB_DATASOURCE, inventoryData.table, employeeData.table, jobData.table, diff --git a/packages/server/src/db/defaultData/employeeImport.js b/packages/server/src/db/defaultData/employeeImport.ts similarity index 99% rename from packages/server/src/db/defaultData/employeeImport.js rename to packages/server/src/db/defaultData/employeeImport.ts index eae43e182a..d2bab601a0 100644 --- a/packages/server/src/db/defaultData/employeeImport.js +++ b/packages/server/src/db/defaultData/employeeImport.ts @@ -1,4 +1,4 @@ -exports.employeeImport = [ +export const employeeImport = [ { "First Name": "Julie", "Last Name": "Jimenez", diff --git a/packages/server/src/db/defaultData/expensesImport.js b/packages/server/src/db/defaultData/expensesImport.ts similarity index 99% rename from packages/server/src/db/defaultData/expensesImport.js rename to packages/server/src/db/defaultData/expensesImport.ts index 2afa147321..002be3e1f9 100644 --- a/packages/server/src/db/defaultData/expensesImport.js +++ b/packages/server/src/db/defaultData/expensesImport.ts @@ -1,4 +1,4 @@ -exports.expensesImport = [ +export const expensesImport = [ { "Date Paid": "2022-11-12T12:00:00.000", "Payment Due": "2022-11-01T12:00:00.000", diff --git a/packages/server/src/db/defaultData/inventoryImport.js b/packages/server/src/db/defaultData/inventoryImport.ts similarity index 98% rename from packages/server/src/db/defaultData/inventoryImport.js rename to packages/server/src/db/defaultData/inventoryImport.ts index 3d4cf98ee4..dae5a09feb 100644 --- a/packages/server/src/db/defaultData/inventoryImport.js +++ b/packages/server/src/db/defaultData/inventoryImport.ts @@ -1,4 +1,4 @@ -exports.inventoryImport = [ +export const inventoryImport = [ { Status: ["Available"], "Item Name": "Little Blue Van", diff --git a/packages/server/src/db/defaultData/jobsImport.js b/packages/server/src/db/defaultData/jobsImport.ts similarity index 99% rename from packages/server/src/db/defaultData/jobsImport.js rename to packages/server/src/db/defaultData/jobsImport.ts index 537cc2a006..ac530afb17 100644 --- a/packages/server/src/db/defaultData/jobsImport.js +++ b/packages/server/src/db/defaultData/jobsImport.ts @@ -1,4 +1,4 @@ -exports.jobsImport = [ +export const jobsImport = [ { "Works End": "2023-01-28T12:00:00.000", "Customer Email": "susie.peterson@example.com", diff --git a/packages/server/src/db/dynamoClient.js b/packages/server/src/db/dynamoClient.ts similarity index 73% rename from packages/server/src/db/dynamoClient.js rename to packages/server/src/db/dynamoClient.ts index 12e53ff1fd..cb045b7d6f 100644 --- a/packages/server/src/db/dynamoClient.js +++ b/packages/server/src/db/dynamoClient.ts @@ -1,8 +1,7 @@ -let { merge } = require("lodash") -let env = require("../environment") +import { merge } from "lodash" +import env from "../environment" -const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1" -exports.AWS_REGION = AWS_REGION +export const AWS_REGION = env.AWS_REGION ? env.AWS_REGION : "eu-west-1" const TableInfo = { API_KEYS: { @@ -16,10 +15,36 @@ const TableInfo = { }, } -let docClient = null +let docClient: any = null + +type GetOpts = { + primary: string + sort?: string + otherProps?: any +} + +type UpdateOpts = { + primary: string + sort?: string + expression?: string + condition?: string + names?: string[] + values?: any[] + exists?: boolean + otherProps?: any +} + +type PutOpts = { + item: any + otherProps?: any +} class Table { - constructor(tableInfo) { + _name: string + _primary: string + _sort?: string + + constructor(tableInfo: { name: string; primary: string; sort?: string }) { if (!tableInfo.name || !tableInfo.primary) { throw "Table info must specify a name and a primary key" } @@ -28,7 +53,7 @@ class Table { this._sort = tableInfo.sort } - async get({ primary, sort, otherProps }) { + async get({ primary, sort, otherProps }: GetOpts) { let params = { TableName: this._name, Key: { @@ -54,8 +79,8 @@ class Table { values, exists, otherProps, - }) { - let params = { + }: UpdateOpts) { + let params: any = { TableName: this._name, Key: { [this._primary]: primary, @@ -83,7 +108,7 @@ class Table { return docClient.update(params).promise() } - async put({ item, otherProps }) { + async put({ item, otherProps }: PutOpts) { if ( item[this._primary] == null || (this._sort && item[this._sort] == null) @@ -101,9 +126,9 @@ class Table { } } -exports.init = endpoint => { +export function init(endpoint: string) { let AWS = require("aws-sdk") - let docClientParams = { + let docClientParams: any = { correctClockSkew: true, region: AWS_REGION, } @@ -115,13 +140,8 @@ exports.init = endpoint => { docClient = new AWS.DynamoDB.DocumentClient(docClientParams) } -exports.apiKeyTable = new Table(TableInfo.API_KEYS) -exports.userTable = new Table(TableInfo.USERS) - -if (env.isProd()) { - exports.init(`https://dynamodb.${AWS_REGION}.amazonaws.com`) -} else { +if (!env.isProd()) { env._set("AWS_ACCESS_KEY_ID", "KEY_ID") env._set("AWS_SECRET_ACCESS_KEY", "SECRET_KEY") - exports.init("http://localhost:8333") + init("http://localhost:8333") } diff --git a/packages/server/src/db/inMemoryView.js b/packages/server/src/db/inMemoryView.ts similarity index 68% rename from packages/server/src/db/inMemoryView.js rename to packages/server/src/db/inMemoryView.ts index 278b906e24..c3659ef628 100644 --- a/packages/server/src/db/inMemoryView.js +++ b/packages/server/src/db/inMemoryView.ts @@ -1,11 +1,17 @@ -const newid = require("./newid") +import newid from "./newid" +import { Row, View, Document } from "@budibase/types" // bypass the main application db config // use in memory pouchdb directly -const { db: dbCore } = require("@budibase/backend-core") +import { db as dbCore } from "@budibase/backend-core" const Pouch = dbCore.getPouch({ inMemory: true }) -exports.runView = async (view, calculation, group, data) => { +export async function runView( + view: View, + calculation: boolean, + group: string, + data: Row[] +) { // use a different ID each time for the DB, make sure they // are always unique for each query, don't want overlap // which could cause 409s @@ -18,16 +24,16 @@ exports.runView = async (view, calculation, group, data) => { _rev: undefined, })) ) - let fn = (doc, emit) => emit(doc._id) - eval("fn = " + view.map.replace("function (doc)", "function (doc, emit)")) - const queryFns = { + let fn = (doc: Document, emit: any) => emit(doc._id) + eval("fn = " + view?.map?.replace("function (doc)", "function (doc, emit)")) + const queryFns: any = { meta: view.meta, map: fn, } if (view.reduce) { queryFns.reduce = view.reduce } - const response = await db.query(queryFns, { + const response: { rows: Row[] } = await db.query(queryFns, { include_docs: !calculation, group: !!group, }) diff --git a/packages/server/src/db/index.js b/packages/server/src/db/index.js deleted file mode 100644 index 381c295d18..0000000000 --- a/packages/server/src/db/index.js +++ /dev/null @@ -1,16 +0,0 @@ -const core = require("@budibase/backend-core") -const env = require("../environment") - -exports.init = () => { - const dbConfig = { - replication: true, - find: true, - } - - if (env.isTest() && !env.COUCH_DB_URL) { - dbConfig.inMemory = true - dbConfig.allDbs = true - } - - core.init({ db: dbConfig }) -} diff --git a/packages/server/src/db/index.ts b/packages/server/src/db/index.ts new file mode 100644 index 0000000000..60ea2f9987 --- /dev/null +++ b/packages/server/src/db/index.ts @@ -0,0 +1,16 @@ +import { init as coreInit } from "@budibase/backend-core" +import env = require("../environment") + +export function init() { + const dbConfig: any = { + replication: true, + find: true, + } + + if (env.isTest() && !env.COUCH_DB_URL) { + dbConfig.inMemory = true + dbConfig.allDbs = true + } + + coreInit({ db: dbConfig }) +} diff --git a/packages/server/src/db/newid.js b/packages/server/src/db/newid.ts similarity index 68% rename from packages/server/src/db/newid.js rename to packages/server/src/db/newid.ts index b4f5e51c07..14a8305e8d 100644 --- a/packages/server/src/db/newid.js +++ b/packages/server/src/db/newid.ts @@ -1,5 +1,5 @@ const { v4 } = require("uuid") -module.exports = function () { +export = function (): string { return v4().replace(/-/g, "") } diff --git a/packages/server/src/db/views/staticViews.js b/packages/server/src/db/views/staticViews.ts similarity index 84% rename from packages/server/src/db/views/staticViews.js rename to packages/server/src/db/views/staticViews.ts index 10ad8fd410..4bccfebeee 100644 --- a/packages/server/src/db/views/staticViews.js +++ b/packages/server/src/db/views/staticViews.ts @@ -1,5 +1,6 @@ -const { context } = require("@budibase/backend-core") -const { DocumentType, SEPARATOR, ViewName, SearchIndexes } = require("../utils") +import { context } from "@budibase/backend-core" +import { DocumentType, SEPARATOR, ViewName, SearchIndexes } from "../utils" +import { LinkDocument, Row } from "@budibase/types" const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR /************************************************** @@ -19,16 +20,17 @@ const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR * @returns {Promise} The view now exists, please note that the next view of this query will actually build it, * so it may be slow. */ -exports.createLinkView = async () => { +export async function createLinkView() { const db = context.getAppDB() const designDoc = await db.get("_design/database") const view = { - map: function (doc) { + map: function (doc: LinkDocument) { // everything in this must remain constant as its going to Pouch, no external variables if (doc.type === "link") { let doc1 = doc.doc1 let doc2 = doc.doc2 // eslint-disable-next-line no-undef + // @ts-ignore emit([doc1.tableId, doc1.rowId], { id: doc2.rowId, thisId: doc1.rowId, @@ -37,6 +39,7 @@ exports.createLinkView = async () => { // if linking to same table can't emit twice if (doc1.tableId !== doc2.tableId) { // eslint-disable-next-line no-undef + // @ts-ignore emit([doc2.tableId, doc2.rowId], { id: doc1.rowId, thisId: doc2.rowId, @@ -53,7 +56,7 @@ exports.createLinkView = async () => { await db.put(designDoc) } -exports.createRoutingView = async () => { +export async function createRoutingView() { const db = context.getAppDB() const designDoc = await db.get("_design/database") const view = { @@ -74,7 +77,7 @@ exports.createRoutingView = async () => { await db.put(designDoc) } -async function searchIndex(indexName, fnString) { +async function searchIndex(indexName: string, fnString: string) { const db = context.getAppDB() const designDoc = await db.get("_design/database") designDoc.indexes = { @@ -86,11 +89,11 @@ async function searchIndex(indexName, fnString) { await db.put(designDoc) } -exports.createAllSearchIndex = async () => { +export async function createAllSearchIndex() { await searchIndex( SearchIndexes.ROWS, - function (doc) { - function idx(input, prev) { + function (doc: Row) { + function idx(input: Row, prev?: string) { for (let key of Object.keys(input)) { let idxKey = prev != null ? `${prev}.${key}` : key idxKey = idxKey.replace(/ /g, "_") @@ -98,6 +101,7 @@ exports.createAllSearchIndex = async () => { for (let val of input[key]) { if (typeof val !== "object") { // eslint-disable-next-line no-undef + // @ts-ignore index(idxKey, val, { store: true }) } } @@ -106,17 +110,20 @@ exports.createAllSearchIndex = async () => { } if (typeof input[key] === "string") { // eslint-disable-next-line no-undef + // @ts-ignore index(idxKey, input[key].toLowerCase(), { store: true }) } else if (typeof input[key] !== "object") { // eslint-disable-next-line no-undef + // @ts-ignore index(idxKey, input[key], { store: true }) } else { idx(input[key], idxKey) } } } - if (doc._id.startsWith("ro_")) { + if (doc._id!.startsWith("ro_")) { // eslint-disable-next-line no-undef + // @ts-ignore index("default", doc._id) idx(doc) } diff --git a/packages/server/src/events/AutomationEmitter.js b/packages/server/src/events/AutomationEmitter.ts similarity index 73% rename from packages/server/src/events/AutomationEmitter.js rename to packages/server/src/events/AutomationEmitter.ts index 99345228ff..d5ebc041ff 100644 --- a/packages/server/src/events/AutomationEmitter.js +++ b/packages/server/src/events/AutomationEmitter.ts @@ -1,6 +1,7 @@ -const { rowEmission, tableEmission } = require("./utils") -const mainEmitter = require("./index") -const env = require("../environment") +import { rowEmission, tableEmission } from "./utils" +import mainEmitter from "./index" +import env from "../environment" +import { Table, Row } from "@budibase/types" // max number of automations that can chain on top of each other // TODO: in future make this configurable at the automation level @@ -13,14 +14,17 @@ const MAX_AUTOMATION_CHAIN = env.SELF_HOSTED ? 5 : 0 * from getting stuck endlessly chaining. */ class AutomationEmitter { - constructor(chainCount) { + chainCount: number + metadata: { automationChainCount: number } + + constructor(chainCount: number) { this.chainCount = chainCount this.metadata = { automationChainCount: chainCount, } } - emitRow(eventName, appId, row, table = null) { + emitRow(eventName: string, appId: string, row: Row, table?: Table) { // don't emit even if we've reached max automation chain if (this.chainCount >= MAX_AUTOMATION_CHAIN) { return @@ -35,11 +39,12 @@ class AutomationEmitter { }) } - emitTable(eventName, appId, table = null) { + emitTable(eventName: string, appId: string, table?: Table) { // don't emit even if we've reached max automation chain if (this.chainCount > MAX_AUTOMATION_CHAIN) { return } + tableEmission({ emitter: mainEmitter, eventName, @@ -50,4 +55,4 @@ class AutomationEmitter { } } -module.exports = AutomationEmitter +export = AutomationEmitter diff --git a/packages/server/src/events/index.js b/packages/server/src/events/BudibaseEmitter.ts similarity index 65% rename from packages/server/src/events/index.js rename to packages/server/src/events/BudibaseEmitter.ts index fe51b0780a..b31fa36df7 100644 --- a/packages/server/src/events/index.js +++ b/packages/server/src/events/BudibaseEmitter.ts @@ -1,5 +1,6 @@ -const EventEmitter = require("events").EventEmitter -const { rowEmission, tableEmission } = require("./utils") +import { EventEmitter } from "events" +import { rowEmission, tableEmission } from "./utils" +import { Table, Row } from "@budibase/types" /** * keeping event emitter in one central location as it might be used for things other than @@ -12,19 +13,17 @@ const { rowEmission, tableEmission } = require("./utils") * This is specifically quite important for template strings used in automations. */ class BudibaseEmitter extends EventEmitter { - emitRow(eventName, appId, row, table = null) { + emitRow(eventName: string, appId: string, row: Row, table?: Table) { rowEmission({ emitter: this, eventName, appId, row, table }) } - emitTable(eventName, appId, table = null) { + emitTable(eventName: string, appId: string, table?: Table) { tableEmission({ emitter: this, eventName, appId, table }) } - emitPort(portNumber) { + emitPort(portNumber: number) { this.emit("internal:port", portNumber) } } -const emitter = new BudibaseEmitter() - -module.exports = emitter +export = BudibaseEmitter diff --git a/packages/server/src/events/index.ts b/packages/server/src/events/index.ts new file mode 100644 index 0000000000..145d399f56 --- /dev/null +++ b/packages/server/src/events/index.ts @@ -0,0 +1,5 @@ +import BudibaseEmitter from "./BudibaseEmitter" + +const emitter = new BudibaseEmitter() + +export = emitter diff --git a/packages/server/src/events/utils.js b/packages/server/src/events/utils.js deleted file mode 100644 index 2d43139d27..0000000000 --- a/packages/server/src/events/utils.js +++ /dev/null @@ -1,38 +0,0 @@ -exports.rowEmission = ({ emitter, eventName, appId, row, table, metadata }) => { - let event = { - row, - appId, - tableId: row.tableId, - } - if (table) { - event.table = table - } - event.id = row._id - if (row._rev) { - event.revision = row._rev - } - if (metadata) { - event.metadata = metadata - } - emitter.emit(eventName, event) -} - -exports.tableEmission = ({ emitter, eventName, appId, table, metadata }) => { - const tableId = table._id - let event = { - table: { - ...table, - tableId: tableId, - }, - appId, - tableId: tableId, - } - event.id = tableId - if (table._rev) { - event.revision = table._rev - } - if (metadata) { - event.metadata = metadata - } - emitter.emit(eventName, event) -} diff --git a/packages/server/src/events/utils.ts b/packages/server/src/events/utils.ts new file mode 100644 index 0000000000..20efb453f2 --- /dev/null +++ b/packages/server/src/events/utils.ts @@ -0,0 +1,78 @@ +import { Table, Row } from "@budibase/types" +import BudibaseEmitter from "./BudibaseEmitter" + +type BBEventOpts = { + emitter: BudibaseEmitter + eventName: string + appId: string + table?: Table + row?: Row + metadata?: any +} + +interface BBEventTable extends Table { + tableId?: string +} + +type BBEvent = { + appId: string + tableId?: string + row?: Row + table?: BBEventTable + id?: string + revision?: string + metadata?: any +} + +export function rowEmission({ + emitter, + eventName, + appId, + row, + table, + metadata, +}: BBEventOpts) { + let event: BBEvent = { + row, + appId, + tableId: row?.tableId, + } + if (table) { + event.table = table + } + event.id = row?._id + if (row?._rev) { + event.revision = row._rev + } + if (metadata) { + event.metadata = metadata + } + emitter.emit(eventName, event) +} + +export function tableEmission({ + emitter, + eventName, + appId, + table, + metadata, +}: BBEventOpts) { + const tableId = table?._id + const inputTable: BBEventTable | undefined = table + if (inputTable) { + inputTable.tableId = tableId + } + let event: BBEvent = { + table: inputTable, + appId, + tableId: tableId, + } + event.id = tableId + if (table?._rev) { + event.revision = table._rev + } + if (metadata) { + event.metadata = metadata + } + emitter.emit(eventName, event) +} diff --git a/packages/server/src/utilities/centralPath.js b/packages/server/src/utilities/centralPath.ts similarity index 83% rename from packages/server/src/utilities/centralPath.js rename to packages/server/src/utilities/centralPath.ts index 4ce7bcfbb3..b9c0a8aedf 100644 --- a/packages/server/src/utilities/centralPath.js +++ b/packages/server/src/utilities/centralPath.ts @@ -1,4 +1,4 @@ -const path = require("path") +import path from "path" // this simply runs all of our path join and resolve functions through // a central location incase we need to add some protection to file paths @@ -8,7 +8,7 @@ const path = require("path") * @param args Any number of string arguments to add to a path * @returns {string} The final path ready to use */ -exports.join = function (...args) { +export function join(...args: any) { return path.join(...args) } @@ -17,6 +17,6 @@ exports.join = function (...args) { * @param args Any number of string arguments to add to a path * @returns {string} The final path ready to use */ -exports.resolve = function (...args) { +export function resolve(...args: any) { return path.resolve(...args) } diff --git a/packages/server/src/utilities/csvParser.js b/packages/server/src/utilities/csvParser.ts similarity index 70% rename from packages/server/src/utilities/csvParser.js rename to packages/server/src/utilities/csvParser.ts index 09449f6fc1..85e4b1e8e5 100644 --- a/packages/server/src/utilities/csvParser.js +++ b/packages/server/src/utilities/csvParser.ts @@ -1,18 +1,25 @@ -const csv = require("csvtojson") -const { FieldTypes } = require("../constants") +import { FieldSchema, Table } from "@budibase/types" +import csv from "csvtojson" +import { FieldTypes } from "../constants" + +type CsvParseOpts = { + schema?: { [key: string]: any } + existingTable: Table + csvString?: string +} const VALIDATORS = { [FieldTypes.STRING]: () => true, [FieldTypes.OPTIONS]: () => true, [FieldTypes.BARCODEQR]: () => true, - [FieldTypes.NUMBER]: attribute => { + [FieldTypes.NUMBER]: (attribute?: string) => { // allow not to be present if (!attribute) { return true } return !isNaN(Number(attribute)) }, - [FieldTypes.DATETIME]: attribute => { + [FieldTypes.DATETIME]: (attribute?: string) => { // allow not to be present if (!attribute) { return true @@ -22,13 +29,13 @@ const VALIDATORS = { } const PARSERS = { - [FieldTypes.NUMBER]: attribute => { + [FieldTypes.NUMBER]: (attribute?: string) => { if (!attribute) { return attribute } return Number(attribute) }, - [FieldTypes.DATETIME]: attribute => { + [FieldTypes.DATETIME]: (attribute?: string) => { if (!attribute) { return attribute } @@ -36,10 +43,10 @@ const PARSERS = { }, } -function parse(csvString, parsers) { +export function parse(csvString: string, parsers: any) { const result = csv().fromString(csvString) - const schema = {} + const schema: Record = {} return new Promise((resolve, reject) => { result.on("header", headers => { @@ -77,16 +84,22 @@ function parse(csvString, parsers) { }) } -function updateSchema({ schema, existingTable }) { +export function updateSchema({ + schema, + existingTable, +}: { + schema?: Record + existingTable: Table +}) { if (!schema) { return schema } - const finalSchema = {} - const schemaKeyMap = {} + const finalSchema: Record = {} + const schemaKeyMap: Record = {} Object.keys(schema).forEach(key => (schemaKeyMap[key.toLowerCase()] = key)) for (let [key, field] of Object.entries(existingTable.schema)) { const lcKey = key.toLowerCase() - const foundKey = schemaKeyMap[lcKey] + const foundKey: string = schemaKeyMap[lcKey] if (foundKey) { finalSchema[key] = schema[foundKey] finalSchema[key].type = field.type @@ -95,15 +108,22 @@ function updateSchema({ schema, existingTable }) { return finalSchema } -async function transform({ schema, csvString, existingTable }) { - const colParser = {} +export async function transform({ + schema, + csvString, + existingTable, +}: CsvParseOpts) { + if (!schema || !csvString) { + throw new Error("Unable to transform CSV without schema") + } + const colParser: any = {} // make sure the table has all the columns required for import if (existingTable) { schema = updateSchema({ schema, existingTable }) } - for (let [key, field] of Object.entries(schema)) { + for (let [key, field] of Object.entries(schema || {})) { // don't import data to auto columns if (!field.autocolumn) { colParser[key] = PARSERS[field.type] || field.type @@ -112,8 +132,10 @@ async function transform({ schema, csvString, existingTable }) { try { const data = await csv({ colParser }).fromString(csvString) - const schemaKeyMap = {} - Object.keys(schema).forEach(key => (schemaKeyMap[key.toLowerCase()] = key)) + const schemaKeyMap: any = {} + Object.keys(schema || {}).forEach( + key => (schemaKeyMap[key.toLowerCase()] = key) + ) for (let element of data) { if (!data) { continue @@ -137,9 +159,3 @@ async function transform({ schema, csvString, existingTable }) { throw err } } - -module.exports = { - parse, - transform, - updateSchema, -} diff --git a/packages/server/src/utilities/fileSystem/clientLibrary.js b/packages/server/src/utilities/fileSystem/clientLibrary.ts similarity index 91% rename from packages/server/src/utilities/fileSystem/clientLibrary.js rename to packages/server/src/utilities/fileSystem/clientLibrary.ts index 37faa4256f..9fb96ff9a5 100644 --- a/packages/server/src/utilities/fileSystem/clientLibrary.js +++ b/packages/server/src/utilities/fileSystem/clientLibrary.ts @@ -1,9 +1,9 @@ -const { join } = require("path") -const { ObjectStoreBuckets } = require("../../constants") -const fs = require("fs") -const { objectStore } = require("@budibase/backend-core") -const { resolve } = require("../centralPath") -const env = require("../../environment") +import { join } from "path" +import { ObjectStoreBuckets } from "../../constants" +import fs from "fs" +import { objectStore } from "@budibase/backend-core" +import { resolve } from "../centralPath" +import env from "../../environment" const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..") /** @@ -33,7 +33,7 @@ const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..") * @param appId The app ID to backup * @returns {Promise} */ -exports.backupClientLibrary = async appId => { +export async function backupClientLibrary(appId: string) { // Copy existing manifest to tmp let tmpManifestPath try { @@ -85,7 +85,7 @@ exports.backupClientLibrary = async appId => { * @param appId The app ID to update * @returns {Promise} */ -exports.updateClientLibrary = async appId => { +export async function updateClientLibrary(appId: string) { let manifest, client if (env.isDev()) { @@ -124,7 +124,7 @@ exports.updateClientLibrary = async appId => { * @param appId The app ID to revert * @returns {Promise} */ -exports.revertClientLibrary = async appId => { +export async function revertClientLibrary(appId: string) { // Copy backups manifest to tmp directory const tmpManifestPath = await objectStore.retrieveToTmp( ObjectStoreBuckets.APPS, diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.ts similarity index 78% rename from packages/server/src/utilities/fileSystem/index.js rename to packages/server/src/utilities/fileSystem/index.ts index 5b46565897..4af42488ef 100644 --- a/packages/server/src/utilities/fileSystem/index.js +++ b/packages/server/src/utilities/fileSystem/index.ts @@ -1,26 +1,17 @@ -const { budibaseTempDir } = require("../budibaseDir") -const fs = require("fs") -const { join } = require("path") +import { budibaseTempDir } from "../budibaseDir" +import fs from "fs" +import { join } from "path" +import { context, objectStore } from "@budibase/backend-core" +import { ObjectStoreBuckets } from "../../constants" +import { updateClientLibrary } from "./clientLibrary" +import { checkSlashesInUrl } from "../" +import env from "../../environment" +import fetch from "node-fetch" const uuid = require("uuid/v4") -const { context, objectStore } = require("@budibase/backend-core") -const { ObjectStoreBuckets } = require("../../constants") -const { updateClientLibrary } = require("./clientLibrary") -const { checkSlashesInUrl } = require("../") -const env = require("../../environment") const tar = require("tar") -const fetch = require("node-fetch") -const { - upload, - retrieve, - retrieveToTmp, - deleteFolder, - downloadTarball, - downloadTarballDirect, - deleteFiles, -} = objectStore -const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..") -const NODE_MODULES_PATH = join(TOP_LEVEL_PATH, "node_modules") +export const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..") +export const NODE_MODULES_PATH = join(TOP_LEVEL_PATH, "node_modules") const DATASOURCE_PATH = join(budibaseTempDir(), "datasource") /** @@ -34,14 +25,14 @@ const DATASOURCE_PATH = join(budibaseTempDir(), "datasource") /** * Upon first startup of instance there may not be everything we need in tmp directory, set it up. */ -exports.init = () => { +export function init() { const tempDir = budibaseTempDir() if (!fs.existsSync(tempDir)) { // some test cases fire this quickly enough that // synchronous cases can end up here at the same time try { fs.mkdirSync(tempDir) - } catch (err) { + } catch (err: any) { if (!err || err.code !== "EEXIST") { throw err } @@ -81,7 +72,7 @@ exports.checkDevelopmentEnvironment = () => { * @param {string} path The path to the handlebars file which is to be loaded. * @returns {string} The loaded handlebars file as a string - loaded as utf8. */ -exports.loadHandlebarsFile = path => { +export function loadHandlebarsFile(path: string) { return fs.readFileSync(path, "utf8") } @@ -91,13 +82,13 @@ exports.loadHandlebarsFile = path => { * @param {string} contents the contents of the file which is to be returned from the API. * @return {Object} the read stream which can be put into the koa context body. */ -exports.apiFileReturn = contents => { +export function apiFileReturn(contents: string) { const path = join(budibaseTempDir(), uuid()) fs.writeFileSync(path, contents) return fs.createReadStream(path) } -exports.streamFile = path => { +export function streamFile(path: string) { return fs.createReadStream(path) } @@ -106,7 +97,7 @@ exports.streamFile = path => { * @param {string} fileContents contents which will be written to a temp file. * @return {string} the path to the temp file. */ -exports.storeTempFile = fileContents => { +export function storeTempFile(fileContents: string) { const path = join(budibaseTempDir(), uuid()) fs.writeFileSync(path, fileContents) return path @@ -116,7 +107,7 @@ exports.storeTempFile = fileContents => { * Utility function for getting a file read stream - a simple in memory buffered read * stream doesn't work for pouchdb. */ -exports.stringToFileStream = contents => { +export function stringToFileStream(contents: string) { const path = exports.storeTempFile(contents) return fs.createReadStream(path) } @@ -125,7 +116,7 @@ exports.stringToFileStream = contents => { * Creates a temp file and returns it from the API. * @param {string} fileContents the contents to be returned in file. */ -exports.sendTempFile = fileContents => { +export function sendTempFile(fileContents: string) { const path = exports.storeTempFile(fileContents) return fs.createReadStream(path) } @@ -135,7 +126,7 @@ exports.sendTempFile = fileContents => { * @param {string} appId The ID of the app which is being created. * @return {Promise} once promise completes app resources should be ready in object store. */ -exports.createApp = async appId => { +export async function createApp(appId: string) { await updateClientLibrary(appId) } @@ -144,8 +135,8 @@ exports.createApp = async appId => { * @param {string} appId The ID of the app which is being deleted. * @return {Promise} once promise completes the app resources will be removed from object store. */ -exports.deleteApp = async appId => { - await deleteFolder(ObjectStoreBuckets.APPS, `${appId}/`) +export async function deleteApp(appId: string) { + await objectStore.deleteFolder(ObjectStoreBuckets.APPS, `${appId}/`) } /** @@ -154,17 +145,21 @@ exports.deleteApp = async appId => { * @param name * @return {Promise<*>} */ -exports.downloadTemplate = async (type, name) => { +export async function downloadTemplate(type: string, name: string) { const DEFAULT_TEMPLATES_BUCKET = "prod-budi-templates.s3-eu-west-1.amazonaws.com" const templateUrl = `https://${DEFAULT_TEMPLATES_BUCKET}/templates/${type}/${name}.tar.gz` - return downloadTarball(templateUrl, ObjectStoreBuckets.TEMPLATES, type) + return objectStore.downloadTarball( + templateUrl, + ObjectStoreBuckets.TEMPLATES, + type + ) } /** * Retrieves component libraries from object store (or tmp symlink if in local) */ -exports.getComponentLibraryManifest = async library => { +export async function getComponentLibraryManifest(library: string) { const appId = context.getAppId() const filename = "manifest.json" /* istanbul ignore next */ @@ -182,12 +177,16 @@ exports.getComponentLibraryManifest = async library => { return require(path) } + if (!appId) { + throw new Error("No app ID found - cannot get component libraries") + } + let resp let path try { // Try to load the manifest from the new file location path = join(appId, filename) - resp = await retrieve(ObjectStoreBuckets.APPS, path) + resp = await objectStore.retrieve(ObjectStoreBuckets.APPS, path) } catch (error) { console.error( `component-manifest-objectstore=failed appId=${appId} path=${path}`, @@ -195,7 +194,7 @@ exports.getComponentLibraryManifest = async library => { ) // Fallback to loading it from the old location for old apps path = join(appId, "node_modules", library, "package", filename) - resp = await retrieve(ObjectStoreBuckets.APPS, path) + resp = await objectStore.retrieve(ObjectStoreBuckets.APPS, path) } if (typeof resp !== "string") { resp = resp.toString("utf8") @@ -207,14 +206,17 @@ exports.getComponentLibraryManifest = async library => { * All file reads come through here just to make sure all of them make sense * allows a centralised location to check logic is all good. */ -exports.readFileSync = (filepath, options = "utf8") => { - return fs.readFileSync(filepath, options) +export function readFileSync( + filepath: string, + options: BufferEncoding = "utf8" +) { + return fs.readFileSync(filepath, { encoding: options }) } /** * Given a set of app IDs makes sure file system is cleared of any of their temp info. */ -exports.cleanup = appIds => { +export function cleanup(appIds: string[]) { for (let appId of appIds) { const path = join(budibaseTempDir(), appId) if (fs.existsSync(path)) { @@ -223,7 +225,7 @@ exports.cleanup = appIds => { } } -const createTempFolder = item => { +export function createTempFolder(item: string) { const path = join(budibaseTempDir(), item) try { // remove old tmp directories automatically - don't combine @@ -231,24 +233,22 @@ const createTempFolder = item => { fs.rmSync(path, { recursive: true, force: true }) } fs.mkdirSync(path) - } catch (err) { + } catch (err: any) { throw new Error(`Path cannot be created: ${err.message}`) } return path } -exports.createTempFolder = createTempFolder -const extractTarball = async (fromFilePath, toPath) => { +export async function extractTarball(fromFilePath: string, toPath: string) { await tar.extract({ file: fromFilePath, C: toPath, }) } -exports.extractTarball = extractTarball -const getPluginMetadata = async path => { - let metadata = {} +export async function getPluginMetadata(path: string) { + let metadata: { schema?: any; package?: any } = {} try { const pkg = fs.readFileSync(join(path, "package.json"), "utf8") const schema = fs.readFileSync(join(path, "schema.json"), "utf8") @@ -265,7 +265,7 @@ const getPluginMetadata = async path => { "package.json is missing one of 'name', 'version' or 'description'." ) } - } catch (err) { + } catch (err: any) { throw new Error( `Unable to process schema.json/package.json in plugin. ${err.message}` ) @@ -273,9 +273,12 @@ const getPluginMetadata = async path => { return { metadata, directory: path } } -exports.getPluginMetadata = getPluginMetadata -exports.getDatasourcePlugin = async (name, url, hash) => { +export async function getDatasourcePlugin( + name: string, + url: string, + hash: string +) { if (!fs.existsSync(DATASOURCE_PATH)) { fs.mkdirSync(DATASOURCE_PATH) } @@ -311,7 +314,7 @@ exports.getDatasourcePlugin = async (name, url, hash) => { /** * Find for a file recursively from start path applying filter, return first match */ -exports.findFileRec = (startPath, filter) => { +export function findFileRec(startPath: string, filter: any) { if (!fs.existsSync(startPath)) { return } @@ -332,21 +335,10 @@ exports.findFileRec = (startPath, filter) => { /** * Remove a folder which is not empty from the file system */ -exports.deleteFolderFileSystem = path => { +export function deleteFolderFileSystem(path: string) { if (!fs.existsSync(path)) { return } fs.rmSync(path, { recursive: true, force: true }) } - -/** - * Full function definition for below can be found in the utilities. - */ -exports.upload = upload -exports.retrieve = retrieve -exports.retrieveToTmp = retrieveToTmp -exports.deleteFiles = deleteFiles -exports.downloadTarballDirect = downloadTarballDirect -exports.TOP_LEVEL_PATH = TOP_LEVEL_PATH -exports.NODE_MODULES_PATH = NODE_MODULES_PATH diff --git a/packages/server/src/utilities/fileSystem/processor.js b/packages/server/src/utilities/fileSystem/processor.ts similarity index 69% rename from packages/server/src/utilities/fileSystem/processor.js rename to packages/server/src/utilities/fileSystem/processor.ts index 3778b50168..a32a7568f4 100644 --- a/packages/server/src/utilities/fileSystem/processor.js +++ b/packages/server/src/utilities/fileSystem/processor.ts @@ -1,21 +1,19 @@ -const jimp = require("jimp") +import jimp from "jimp" const FORMATS = { IMAGES: ["png", "jpg", "jpeg", "gif", "bmp", "tiff"], } -function processImage(file) { +function processImage(file: { path: string }) { // this will overwrite the temp file return jimp.read(file.path).then(img => { return img.resize(300, jimp.AUTO).write(file.path) }) } -async function process(file) { +export async function process(file: { extension: string; path: string }) { if (FORMATS.IMAGES.includes(file.extension.toLowerCase())) { await processImage(file) } return file } - -exports.process = process diff --git a/packages/server/src/utilities/plugins.js b/packages/server/src/utilities/plugins.ts similarity index 69% rename from packages/server/src/utilities/plugins.js rename to packages/server/src/utilities/plugins.ts index 139639e814..b3a9d50fff 100644 --- a/packages/server/src/utilities/plugins.js +++ b/packages/server/src/utilities/plugins.ts @@ -1,8 +1,9 @@ -const env = require("../environment") -const { plugins: ProPlugins } = require("@budibase/pro") -const { objectStore } = require("@budibase/backend-core") +import env from "../environment" +import { plugins as ProPlugins } from "@budibase/pro" +import { objectStore } from "@budibase/backend-core" +import { Plugin } from "@budibase/types" -exports.enrichPluginURLs = plugins => { +export function enrichPluginURLs(plugins: Plugin[]) { if (!plugins || !plugins.length) { return [] } diff --git a/packages/server/src/utilities/queue/inMemoryQueue.js b/packages/server/src/utilities/queue/inMemoryQueue.js deleted file mode 100644 index 79781f9283..0000000000 --- a/packages/server/src/utilities/queue/inMemoryQueue.js +++ /dev/null @@ -1,122 +0,0 @@ -let events = require("events") - -/** - * Bull works with a Job wrapper around all messages that contains a lot more information about - * the state of the message, this object constructor implements the same schema of Bull jobs - * for the sake of maintaining API consistency. - * @param {string} queue The name of the queue which the message will be carried on. - * @param {object} message The JSON message which will be passed back to the consumer. - * @returns {Object} A new job which can now be put onto the queue, this is mostly an - * internal structure so that an in memory queue can be easily swapped for a Bull queue. - */ -function newJob(queue, message) { - return { - timestamp: Date.now(), - queue: queue, - data: message, - } -} - -/** - * This is designed to replicate Bull (https://github.com/OptimalBits/bull) in memory as a sort of mock. - * It is relatively simple, using an event emitter internally to register when messages are available - * to the consumers - in can support many inputs and many consumers. - */ -class InMemoryQueue { - /** - * The constructor the queue, exactly the same as that of Bulls. - * @param {string} name The name of the queue which is being configured. - * @param {object|null} opts This is not used by the in memory queue as there is no real use - * case when in memory, but is the same API as Bull - */ - constructor(name, opts = null) { - this._name = name - this._opts = opts - this._messages = [] - this._emitter = new events.EventEmitter() - } - - /** - * Same callback API as Bull, each callback passed to this will consume messages as they are - * available. Please note this is a queue service, not a notification service, so each - * consumer will receive different messages. - * @param {function} func The callback function which will return a "Job", the same - * as the Bull API, within this job the property "data" contains the JSON message. Please - * note this is incredibly limited compared to Bull as in reality the Job would contain - * a lot more information about the queue and current status of Bull cluster. - */ - process(func) { - this._emitter.on("message", async () => { - if (this._messages.length <= 0) { - return - } - let msg = this._messages.shift() - let resp = func(msg) - if (resp.then != null) { - await resp - } - }) - } - - // simply puts a message to the queue and emits to the queue for processing - /** - * Simple function to replicate the add message functionality of Bull, putting - * a new message on the queue. This then emits an event which will be used to - * return the message to a consumer (if one is attached). - * @param {object} msg A message to be transported over the queue, this should be - * a JSON message as this is required by Bull. - */ - // eslint-disable-next-line no-unused-vars - add(msg, repeat) { - if (typeof msg !== "object") { - throw "Queue only supports carrying JSON." - } - this._messages.push(newJob(this._name, msg)) - this._emitter.emit("message") - } - - /** - * replicating the close function from bull, which waits for jobs to finish. - */ - async close() { - return [] - } - - /** - * This removes a cron which has been implemented, this is part of Bull API. - * @param {string} cronJobId The cron which is to be removed. - */ - removeRepeatableByKey(cronJobId) { - // TODO: implement for testing - console.log(cronJobId) - } - - /** - * Implemented for tests - */ - getRepeatableJobs() { - return [] - } - - // eslint-disable-next-line no-unused-vars - removeJobs(pattern) { - // no-op - } - - /** - * Implemented for tests - */ - async clean() { - return [] - } - - async getJob() { - return {} - } - - on() { - // do nothing - } -} - -module.exports = InMemoryQueue diff --git a/packages/server/src/utilities/rowProcessor/map.js b/packages/server/src/utilities/rowProcessor/map.ts similarity index 96% rename from packages/server/src/utilities/rowProcessor/map.js rename to packages/server/src/utilities/rowProcessor/map.ts index 4e05868bfc..5b57d2d33f 100644 --- a/packages/server/src/utilities/rowProcessor/map.js +++ b/packages/server/src/utilities/rowProcessor/map.ts @@ -1,4 +1,5 @@ -const { FieldTypes } = require("../../constants") +// @ts-nocheck +import { FieldTypes } from "../../constants" /** * A map of how we convert various properties in rows to each other based on the row type. diff --git a/packages/server/src/utilities/scriptRunner.js b/packages/server/src/utilities/scriptRunner.ts similarity index 70% rename from packages/server/src/utilities/scriptRunner.js rename to packages/server/src/utilities/scriptRunner.ts index f65e0e1b7b..c5ed5010d0 100644 --- a/packages/server/src/utilities/scriptRunner.js +++ b/packages/server/src/utilities/scriptRunner.ts @@ -1,9 +1,13 @@ -const fetch = require("node-fetch") -const { VM, VMScript } = require("vm2") +import fetch from "node-fetch" +import { VM, VMScript } from "vm2" const JS_TIMEOUT_MS = 1000 class ScriptRunner { - constructor(script, context) { + vm: VM + results: { out: string } + script: VMScript + + constructor(script: string, context: any) { const code = `let fn = () => {\n${script}\n}; results.out = fn();` this.vm = new VM({ timeout: JS_TIMEOUT_MS, @@ -21,4 +25,4 @@ class ScriptRunner { } } -module.exports = ScriptRunner +export = ScriptRunner diff --git a/packages/server/src/utilities/statusCodes.js b/packages/server/src/utilities/statusCodes.ts similarity index 82% rename from packages/server/src/utilities/statusCodes.js rename to packages/server/src/utilities/statusCodes.ts index f374ff504e..4c4469b375 100644 --- a/packages/server/src/utilities/statusCodes.js +++ b/packages/server/src/utilities/statusCodes.ts @@ -1,4 +1,4 @@ -module.exports = { +export = { OK: 200, UNAUTHORIZED: 401, FORBIDDEN: 403, diff --git a/packages/server/src/utilities/usageQuota/usageQuoteReset.js b/packages/server/src/utilities/usageQuota/usageQuoteReset.ts similarity index 81% rename from packages/server/src/utilities/usageQuota/usageQuoteReset.js rename to packages/server/src/utilities/usageQuota/usageQuoteReset.ts index ff5a1aa00e..579fa130d0 100644 --- a/packages/server/src/utilities/usageQuota/usageQuoteReset.js +++ b/packages/server/src/utilities/usageQuota/usageQuoteReset.ts @@ -7,7 +7,7 @@ function getNewQuotaReset() { return Date.now() + 2592000000 } -function resetQuotasIfRequired(quota) { +function resetQuotasIfRequired(quota: { quotaReset: number; usageQuota: any }) { // Check if the quota needs reset if (Date.now() >= quota.quotaReset) { quota.quotaReset = getNewQuotaReset() diff --git a/packages/types/src/documents/app/index.ts b/packages/types/src/documents/app/index.ts index 25c150f9da..8544617c30 100644 --- a/packages/types/src/documents/app/index.ts +++ b/packages/types/src/documents/app/index.ts @@ -12,3 +12,4 @@ export * from "./row" export * from "./user" export * from "./backup" export * from "./webhook" +export * from "./links" diff --git a/packages/types/src/documents/app/links.ts b/packages/types/src/documents/app/links.ts new file mode 100644 index 0000000000..b27d36e0c6 --- /dev/null +++ b/packages/types/src/documents/app/links.ts @@ -0,0 +1,13 @@ +export interface LinkDocument { + type: string + doc1: { + rowId: string + fieldName: string + tableId: string + } + doc2: { + rowId: string + fieldName: string + tableId: string + } +} diff --git a/packages/types/src/documents/app/table.ts b/packages/types/src/documents/app/table.ts index 6b9a46d59f..23d77c5ad5 100644 --- a/packages/types/src/documents/app/table.ts +++ b/packages/types/src/documents/app/table.ts @@ -8,10 +8,12 @@ export interface FieldSchema { externalType?: string fieldName?: string name: string + sortable?: boolean tableId?: string relationshipType?: string through?: string foreignKey?: string + icon?: string autocolumn?: boolean subtype?: string throughFrom?: string @@ -22,6 +24,7 @@ export interface FieldSchema { ignoreTimezones?: boolean timeOnly?: boolean lastID?: number + useRichText?: boolean | null meta?: { toTable: string toKey: string @@ -31,10 +34,22 @@ export interface FieldSchema { email?: boolean inclusion?: string[] length?: { - minimum?: string | number - maximum?: string | number + minimum?: string | number | null + maximum?: string | number | null + } + numericality?: { + greaterThanOrEqualTo: string | null + lessThanOrEqualTo: string | null + } + presence?: + | boolean + | { + allowEmpty?: boolean + } + datetime?: { + latest: string + earliest: string } - presence?: boolean } } diff --git a/packages/types/src/documents/app/view.ts b/packages/types/src/documents/app/view.ts index 04566ee100..b3dbe53129 100644 --- a/packages/types/src/documents/app/view.ts +++ b/packages/types/src/documents/app/view.ts @@ -5,6 +5,9 @@ export interface View { filters: ViewFilter[] schema: ViewSchema calculation?: ViewCalculation + map?: string + reduce?: any + meta?: Record } export type ViewSchema = ViewCountOrSumSchema | ViewStatisticsSchema From 17865a5ef4ce662654b7ecf5210a0b180e2db019 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 25 Nov 2022 18:54:57 +0000 Subject: [PATCH 074/179] Typescript conversion of linked row controller. --- .../{LinkController.js => LinkController.ts} | 105 +++++++++++------- .../server/src/db/linkedRows/LinkDocument.js | 47 -------- .../server/src/db/linkedRows/LinkDocument.ts | 60 ++++++++++ .../src/db/linkedRows/{index.js => index.ts} | 79 +++++++------ .../linkedRows/{linkUtils.js => linkUtils.ts} | 53 +++++---- packages/types/src/documents/app/links.ts | 10 +- 6 files changed, 207 insertions(+), 147 deletions(-) rename packages/server/src/db/linkedRows/{LinkController.js => LinkController.ts} (84%) delete mode 100644 packages/server/src/db/linkedRows/LinkDocument.js create mode 100644 packages/server/src/db/linkedRows/LinkDocument.ts rename packages/server/src/db/linkedRows/{index.js => index.ts} (80%) rename packages/server/src/db/linkedRows/{linkUtils.js => linkUtils.ts} (70%) diff --git a/packages/server/src/db/linkedRows/LinkController.js b/packages/server/src/db/linkedRows/LinkController.ts similarity index 84% rename from packages/server/src/db/linkedRows/LinkController.js rename to packages/server/src/db/linkedRows/LinkController.ts index df24b97e85..fc28137f58 100644 --- a/packages/server/src/db/linkedRows/LinkController.js +++ b/packages/server/src/db/linkedRows/LinkController.ts @@ -1,12 +1,32 @@ -const { IncludeDocs, getLinkDocuments } = require("./linkUtils") -const { InternalTables, getUserMetadataParams } = require("../utils") -const Sentry = require("@sentry/node") -const { FieldTypes, RelationshipTypes } = require("../../constants") -const { context } = require("@budibase/backend-core") -const LinkDocument = require("./LinkDocument") +import { IncludeDocs, getLinkDocuments } from "./linkUtils" +import { InternalTables, getUserMetadataParams } from "../utils" +import Sentry from "@sentry/node" +import { FieldTypes, RelationshipTypes } from "../../constants" +import { context } from "@budibase/backend-core" +import LinkDocument from "./LinkDocument" +import { + Database, + FieldSchema, + LinkDocumentValue, + Row, + Table, +} from "@budibase/types" + +type LinkControllerOpts = { + tableId: string + row?: Row + table?: Table + oldTable?: Table +} class LinkController { - constructor({ tableId, row, table, oldTable }) { + _db: Database + _tableId: string + _row?: Row + _table?: Table + _oldTable?: Table + + constructor({ tableId, row, table, oldTable }: LinkControllerOpts) { this._db = context.getAppDB() this._tableId = tableId this._row = row @@ -24,7 +44,7 @@ class LinkController { this._table = this._table == null ? await this._db.get(this._tableId) : this._table } - return this._table + return this._table! } /** @@ -34,7 +54,7 @@ class LinkController { * @returns {Promise} True if there are any linked fields, otherwise it will return * false. */ - async doesTableHaveLinkedFields(table = null) { + async doesTableHaveLinkedFields(table?: Table) { if (table == null) { table = await this.table() } @@ -50,7 +70,7 @@ class LinkController { /** * Utility function for main getLinkDocuments function - refer to it for functionality. */ - getRowLinkDocs(rowId) { + getRowLinkDocs(rowId: string) { return getLinkDocuments({ tableId: this._tableId, rowId, @@ -61,23 +81,23 @@ class LinkController { /** * Utility function for main getLinkDocuments function - refer to it for functionality. */ - getTableLinkDocs() { - return getLinkDocuments({ + async getTableLinkDocs() { + return (await getLinkDocuments({ tableId: this._tableId, includeDocs: IncludeDocs.INCLUDE, - }) + })) as LinkDocument[] } /** * Makes sure the passed in table schema contains valid relationship structures. */ - validateTable(table) { + validateTable(table: Table) { const usedAlready = [] for (let schema of Object.values(table.schema)) { if (schema.type !== FieldTypes.LINK) { continue } - const unique = schema.tableId + schema.fieldName + const unique = schema.tableId! + schema?.fieldName if (usedAlready.indexOf(unique) !== -1) { throw new Error( "Cannot re-use the linked column name for a linked table." @@ -90,7 +110,7 @@ class LinkController { /** * Returns whether the two link schemas are equal (in the important parts, not a pure equality check) */ - areLinkSchemasEqual(linkSchema1, linkSchema2) { + areLinkSchemasEqual(linkSchema1: FieldSchema, linkSchema2: FieldSchema) { const compareFields = [ "name", "type", @@ -100,6 +120,7 @@ class LinkController { "relationshipType", ] for (let field of compareFields) { + // @ts-ignore if (linkSchema1[field] !== linkSchema2[field]) { return false } @@ -111,7 +132,7 @@ class LinkController { * Given the link field of this table, and the link field of the linked table, this makes sure * the state of relationship type is accurate on both. */ - handleRelationshipType(linkerField, linkedField) { + handleRelationshipType(linkerField: FieldSchema, linkedField: FieldSchema) { if ( !linkerField.relationshipType || linkerField.relationshipType === RelationshipTypes.MANY_TO_MANY @@ -138,10 +159,10 @@ class LinkController { */ async rowSaved() { const table = await this.table() - const row = this._row + const row = this._row! const operations = [] // get link docs to compare against - const linkDocs = await this.getRowLinkDocs(row._id) + const linkDocs = (await this.getRowLinkDocs(row._id!)) as LinkDocument[] for (let fieldName of Object.keys(table.schema)) { // get the links this row wants to make const rowField = row[fieldName] @@ -161,30 +182,32 @@ class LinkController { // if 1:N, ensure that this ID is not already attached to another record const linkedTable = await this._db.get(field.tableId) - const linkedSchema = linkedTable.schema[field.fieldName] + const linkedSchema = linkedTable.schema[field.fieldName!] // We need to map the global users to metadata in each app for relationships if (field.tableId === InternalTables.USER_METADATA) { const users = await this._db.allDocs(getUserMetadataParams(null, {})) const metadataRequired = rowField.filter( - userId => !users.rows.some(user => user.id === userId) + (userId: string) => !users.rows.some(user => user.id === userId) ) // ensure non-existing user metadata is created in the app DB await this._db.bulkDocs( - metadataRequired.map(userId => ({ _id: userId })) + metadataRequired.map((userId: string) => ({ _id: userId })) ) } // iterate through the link IDs in the row field, see if any don't exist already for (let linkId of rowField) { - if (linkedSchema.relationshipType === RelationshipTypes.ONE_TO_MANY) { + if ( + linkedSchema?.relationshipType === RelationshipTypes.ONE_TO_MANY + ) { let links = ( - await getLinkDocuments({ + (await getLinkDocuments({ tableId: field.tableId, rowId: linkId, includeDocs: IncludeDocs.EXCLUDE, - }) + })) as LinkDocumentValue[] ).filter( link => link.id !== row._id && link.fieldName === linkedSchema.name @@ -209,11 +232,11 @@ class LinkController { } operations.push( new LinkDocument( - table._id, + table._id!, fieldName, - row._id, - field.tableId, - field.fieldName, + row._id!, + field.tableId!, + field.fieldName!, linkId ) ) @@ -246,9 +269,9 @@ class LinkController { * be accurate. This also returns the row that was deleted. */ async rowDeleted() { - const row = this._row + const row = this._row! // need to get the full link docs to be be able to delete it - const linkDocs = await this.getRowLinkDocs(row._id) + const linkDocs = await this.getRowLinkDocs(row._id!) if (linkDocs.length === 0) { return null } @@ -267,13 +290,13 @@ class LinkController { * @param {string} fieldName The field to be removed from the table. * @returns {Promise} The table has now been updated. */ - async removeFieldFromTable(fieldName) { + async removeFieldFromTable(fieldName: string) { let oldTable = this._oldTable - let field = oldTable.schema[fieldName] + let field = oldTable?.schema[fieldName] as FieldSchema const linkDocs = await this.getTableLinkDocs() let toDelete = linkDocs.filter(linkDoc => { let correctFieldName = - linkDoc.doc1.tableId === oldTable._id + linkDoc.doc1.tableId === oldTable?._id ? linkDoc.doc1.fieldName : linkDoc.doc2.fieldName return correctFieldName === fieldName @@ -288,7 +311,9 @@ class LinkController { ) // remove schema from other table let linkedTable = await this._db.get(field.tableId) - delete linkedTable.schema[field.fieldName] + if (field.fieldName) { + delete linkedTable.schema[field.fieldName] + } await this._db.put(linkedTable) } @@ -305,7 +330,7 @@ class LinkController { const schema = table.schema for (let fieldName of Object.keys(schema)) { const field = schema[fieldName] - if (field.type === FieldTypes.LINK) { + if (field.type === FieldTypes.LINK && field.fieldName) { // handle this in a separate try catch, want // the put to bubble up as an error, if can't update // table for some reason @@ -362,8 +387,8 @@ class LinkController { const oldTable = this._oldTable // first start by checking if any link columns have been deleted const newTable = await this.table() - for (let fieldName of Object.keys(oldTable.schema)) { - const field = oldTable.schema[fieldName] + for (let fieldName of Object.keys(oldTable?.schema || {})) { + const field = oldTable?.schema[fieldName] as FieldSchema // this field has been removed from the table schema if ( field.type === FieldTypes.LINK && @@ -389,7 +414,7 @@ class LinkController { for (let fieldName of Object.keys(schema)) { const field = schema[fieldName] try { - if (field.type === FieldTypes.LINK) { + if (field.type === FieldTypes.LINK && field.fieldName) { const linkedTable = await this._db.get(field.tableId) delete linkedTable.schema[field.fieldName] await this._db.put(linkedTable) @@ -416,4 +441,4 @@ class LinkController { } } -module.exports = LinkController +export = LinkController diff --git a/packages/server/src/db/linkedRows/LinkDocument.js b/packages/server/src/db/linkedRows/LinkDocument.js deleted file mode 100644 index 58aa630adc..0000000000 --- a/packages/server/src/db/linkedRows/LinkDocument.js +++ /dev/null @@ -1,47 +0,0 @@ -const { generateLinkID } = require("../utils") -const { FieldTypes } = require("../../constants") - -/** - * Creates a new link document structure which can be put to the database. It is important to - * note that while this talks about linker/linked the link is bi-directional and for all intent - * and purposes it does not matter from which direction the link was initiated. - * @param {string} tableId1 The ID of the first table (the linker). - * @param {string} tableId2 The ID of the second table (the linked). - * @param {string} fieldName1 The name of the field in the linker table. - * @param {string} fieldName2 The name of the field in the linked table. - * @param {string} rowId1 The ID of the row which is acting as the linker. - * @param {string} rowId2 The ID of the row which is acting as the linked. - * @constructor - */ -function LinkDocument( - tableId1, - fieldName1, - rowId1, - tableId2, - fieldName2, - rowId2 -) { - // build the ID out of unique references to this link document - this._id = generateLinkID( - tableId1, - tableId2, - rowId1, - rowId2, - fieldName1, - fieldName2 - ) - // required for referencing in view - this.type = FieldTypes.LINK - this.doc1 = { - tableId: tableId1, - fieldName: fieldName1, - rowId: rowId1, - } - this.doc2 = { - tableId: tableId2, - fieldName: fieldName2, - rowId: rowId2, - } -} - -module.exports = LinkDocument diff --git a/packages/server/src/db/linkedRows/LinkDocument.ts b/packages/server/src/db/linkedRows/LinkDocument.ts new file mode 100644 index 0000000000..d90f08e78c --- /dev/null +++ b/packages/server/src/db/linkedRows/LinkDocument.ts @@ -0,0 +1,60 @@ +import { generateLinkID } from "../utils" +import { FieldTypes } from "../../constants" +import { LinkDocument } from "@budibase/types" + +/** + * Creates a new link document structure which can be put to the database. It is important to + * note that while this talks about linker/linked the link is bi-directional and for all intent + * and purposes it does not matter from which direction the link was initiated. + * @param {string} tableId1 The ID of the first table (the linker). + * @param {string} tableId2 The ID of the second table (the linked). + * @param {string} fieldName1 The name of the field in the linker table. + * @param {string} fieldName2 The name of the field in the linked table. + * @param {string} rowId1 The ID of the row which is acting as the linker. + * @param {string} rowId2 The ID of the row which is acting as the linked. + * @constructor + */ +class LinkDocumentImpl implements LinkDocument { + _id: string + type: string + doc1: { + rowId: string + fieldName: string + tableId: string + } + doc2: { + rowId: string + fieldName: string + tableId: string + } + constructor( + tableId1: string, + fieldName1: string, + rowId1: string, + tableId2: string, + fieldName2: string, + rowId2: string + ) { + this._id = generateLinkID( + tableId1, + tableId2, + rowId1, + rowId2, + fieldName1, + fieldName2 + ) + this.type = FieldTypes.LINK + this.doc1 = { + tableId: tableId1, + fieldName: fieldName1, + rowId: rowId1, + } + this.doc2 = { + tableId: tableId2, + fieldName: fieldName2, + rowId: rowId2, + } + } +} + +export = LinkDocumentImpl diff --git a/packages/server/src/db/linkedRows/index.js b/packages/server/src/db/linkedRows/index.ts similarity index 80% rename from packages/server/src/db/linkedRows/index.js rename to packages/server/src/db/linkedRows/index.ts index 1ee98f6148..1559e644af 100644 --- a/packages/server/src/db/linkedRows/index.js +++ b/packages/server/src/db/linkedRows/index.ts @@ -1,5 +1,5 @@ -const LinkController = require("./LinkController") -const { +import LinkController from "./LinkController" +import { IncludeDocs, getLinkDocuments, createLinkView, @@ -7,21 +7,24 @@ const { getRelatedTableForField, getLinkedTableIDs, getLinkedTable, -} = require("./linkUtils") -const { flatten } = require("lodash") -const { FieldTypes } = require("../../constants") -const { getMultiIDParams, USER_METDATA_PREFIX } = require("../../db/utils") -const { partition } = require("lodash") -const { getGlobalUsersFromMetadata } = require("../../utilities/global") -const { processFormulas } = require("../../utilities/rowProcessor/utils") -const { context } = require("@budibase/backend-core") +} from "./linkUtils" +import { flatten } from "lodash" +import { FieldTypes } from "../../constants" +import { getMultiIDParams, USER_METDATA_PREFIX } from "../utils" +import { partition } from "lodash" +import { getGlobalUsersFromMetadata } from "../../utilities/global" +import { processFormulas } from "../../utilities/rowProcessor" +import { context } from "@budibase/backend-core" +import { Table, Row, LinkDocumentValue } from "@budibase/types" + +export { IncludeDocs, getLinkDocuments, createLinkView } from "./linkUtils" /** * This functionality makes sure that when rows with links are created, updated or deleted they are processed * correctly - making sure that no stale links are left around and that all links have been made successfully. */ -const EventType = { +export const EventType = { ROW_SAVE: "row:save", ROW_UPDATE: "row:update", ROW_DELETE: "row:delete", @@ -30,13 +33,7 @@ const EventType = { TABLE_DELETE: "table:delete", } -exports.EventType = EventType -// re-export search here for ease of use -exports.IncludeDocs = IncludeDocs -exports.getLinkDocuments = getLinkDocuments -exports.createLinkView = createLinkView - -function clearRelationshipFields(table, rows) { +function clearRelationshipFields(table: Table, rows: Row[]) { for (let [key, field] of Object.entries(table.schema)) { if (field.type === FieldTypes.LINK) { rows = rows.map(row => { @@ -48,18 +45,17 @@ function clearRelationshipFields(table, rows) { return rows } -async function getLinksForRows(rows) { +async function getLinksForRows(rows: Row[]) { const tableIds = [...new Set(rows.map(el => el.tableId))] // start by getting all the link values for performance reasons + const promises = tableIds.map(tableId => + getLinkDocuments({ + tableId: tableId, + includeDocs: IncludeDocs.EXCLUDE, + }) + ) const responses = flatten( - await Promise.all( - tableIds.map(tableId => - getLinkDocuments({ - tableId: tableId, - includeDocs: IncludeDocs.EXCLUDE, - }) - ) - ) + (await Promise.all(promises)) as LinkDocumentValue[][] ) // have to get unique as the previous table query can // return duplicates, could be querying for both tables in a relation @@ -72,7 +68,7 @@ async function getLinksForRows(rows) { ) } -async function getFullLinkedDocs(links) { +async function getFullLinkedDocs(links: LinkDocumentValue[]) { // create DBs const db = context.getAppDB() const linkedRowIds = links.map(link => link.id) @@ -103,12 +99,18 @@ async function getFullLinkedDocs(links) { * @returns {Promise} When the update is complete this will respond successfully. Returns the row for * row operations and the table for table operations. */ -exports.updateLinks = async function (args) { +export async function updateLinks(args: { + tableId: string + eventType: string + row?: Row + table?: Table + oldTable?: Table +}) { const { eventType, row, tableId, table, oldTable } = args const baseReturnObj = row == null ? table : row // make sure table ID is set if (tableId == null && table != null) { - args.tableId = table._id + args.tableId = table._id! } let linkController = new LinkController(args) try { @@ -146,7 +148,7 @@ exports.updateLinks = async function (args) { * @param {array} rows The rows which are to be enriched. * @return {Promise<*>} returns the rows with all of the enriched relationships on it. */ -exports.attachFullLinkedDocs = async (table, rows) => { +export async function attachFullLinkedDocs(table: Table, rows: Row[]) { const linkedTableIds = getLinkedTableIDs(table) if (linkedTableIds.length === 0) { return rows @@ -159,7 +161,7 @@ exports.attachFullLinkedDocs = async (table, rows) => { rows = clearRelationshipFields(table, rows) // now get the docs and combine into the rows let linked = await getFullLinkedDocs(links) - const linkedTables = [] + const linkedTables: Table[] = [] for (let row of rows) { for (let link of links.filter(link => link.thisId === row._id)) { if (row[link.fieldName] == null) { @@ -185,13 +187,16 @@ exports.attachFullLinkedDocs = async (table, rows) => { * @param {array} enriched The pre-enriched rows (full docs) which are to be squashed. * @returns {Promise} The rows after having their links squashed to only contain the ID and primary display. */ -exports.squashLinksToPrimaryDisplay = async (table, enriched) => { +export async function squashLinksToPrimaryDisplay( + table: Table, + enriched: Row[] +) { // will populate this as we find them const linkedTables = [table] for (let row of enriched) { // this only fetches the table if its not already in array - const rowTable = await getLinkedTable(row.tableId, linkedTables) - for (let [column, schema] of Object.entries(rowTable.schema)) { + const rowTable = await getLinkedTable(row.tableId!, linkedTables) + for (let [column, schema] of Object.entries(rowTable?.schema || {})) { if (schema.type !== FieldTypes.LINK || !Array.isArray(row[column])) { continue } @@ -199,8 +204,8 @@ exports.squashLinksToPrimaryDisplay = async (table, enriched) => { for (let link of row[column]) { const linkTblId = link.tableId || getRelatedTableForField(table, column) const linkedTable = await getLinkedTable(linkTblId, linkedTables) - const obj = { _id: link._id } - if (link[linkedTable.primaryDisplay]) { + const obj: any = { _id: link._id } + if (linkedTable?.primaryDisplay && link[linkedTable.primaryDisplay]) { obj.primaryDisplay = link[linkedTable.primaryDisplay] } newLinks.push(obj) diff --git a/packages/server/src/db/linkedRows/linkUtils.js b/packages/server/src/db/linkedRows/linkUtils.ts similarity index 70% rename from packages/server/src/db/linkedRows/linkUtils.js rename to packages/server/src/db/linkedRows/linkUtils.ts index 25a1b5fcf8..c7db7d522a 100644 --- a/packages/server/src/db/linkedRows/linkUtils.js +++ b/packages/server/src/db/linkedRows/linkUtils.ts @@ -1,20 +1,24 @@ -const Sentry = require("@sentry/node") -const { ViewName, getQueryIndex } = require("../utils") -const { FieldTypes } = require("../../constants") -const { createLinkView } = require("../views/staticViews") -const { context } = require("@budibase/backend-core") +import { ViewName, getQueryIndex } from "../utils" +import { FieldTypes } from "../../constants" +import { createLinkView } from "../views/staticViews" +import { context, logging } from "@budibase/backend-core" +import { + FieldSchema, + LinkDocument, + LinkDocumentValue, + Table, +} from "@budibase/types" +export { createLinkView } from "../views/staticViews" /** * Only needed so that boolean parameters are being used for includeDocs * @type {{EXCLUDE: boolean, INCLUDE: boolean}} */ -exports.IncludeDocs = { +export const IncludeDocs = { INCLUDE: true, EXCLUDE: false, } -exports.createLinkView = createLinkView - /** * Gets the linking documents, not the linked documents themselves. * @param {string} args.tableId The table which we are searching for linked rows against. @@ -28,10 +32,14 @@ exports.createLinkView = createLinkView * @returns {Promise} This will return an array of the linking documents that were found * (if any). */ -exports.getLinkDocuments = async function (args) { +export async function getLinkDocuments(args: { + tableId?: string + rowId?: string + includeDocs?: any +}): Promise { const { tableId, rowId, includeDocs } = args const db = context.getAppDB() - let params + let params: any if (rowId != null) { params = { key: [tableId, rowId] } } @@ -43,7 +51,7 @@ exports.getLinkDocuments = async function (args) { try { let linkRows = (await db.query(getQueryIndex(ViewName.LINK), params)).rows // filter to get unique entries - const foundIds = [] + const foundIds: string[] = [] linkRows = linkRows.filter(link => { // make sure anything unique is the correct key if ( @@ -60,35 +68,36 @@ exports.getLinkDocuments = async function (args) { }) if (includeDocs) { - return linkRows.map(row => row.doc) + return linkRows.map(row => row.doc) as LinkDocument[] } else { - return linkRows.map(row => row.value) + return linkRows.map(row => row.value) as LinkDocumentValue[] } - } catch (err) { + } catch (err: any) { // check if the view doesn't exist, it should for all new instances if (err != null && err.name === "not_found") { - await exports.createLinkView() - return exports.getLinkDocuments(arguments[0]) + await createLinkView() + return getLinkDocuments(arguments[0]) } else { /* istanbul ignore next */ - Sentry.captureException(err) + logging.logAlert("Failed to get link documents", err) + throw err } } } -exports.getUniqueByProp = (array, prop) => { +export function getUniqueByProp(array: any[], prop: string) { return array.filter((obj, pos, arr) => { return arr.map(mapObj => mapObj[prop]).indexOf(obj[prop]) === pos }) } -exports.getLinkedTableIDs = table => { +export function getLinkedTableIDs(table: Table) { return Object.values(table.schema) - .filter(column => column.type === FieldTypes.LINK) + .filter((column: FieldSchema) => column.type === FieldTypes.LINK) .map(column => column.tableId) } -exports.getLinkedTable = async (id, tables) => { +export async function getLinkedTable(id: string, tables: Table[]) { const db = context.getAppDB() let linkedTable = tables.find(table => table._id === id) if (linkedTable) { @@ -101,7 +110,7 @@ exports.getLinkedTable = async (id, tables) => { return linkedTable } -exports.getRelatedTableForField = (table, fieldName) => { +export function getRelatedTableForField(table: Table, fieldName: string) { // look to see if its on the table, straight in the schema const field = table.schema[fieldName] if (field != null) { diff --git a/packages/types/src/documents/app/links.ts b/packages/types/src/documents/app/links.ts index b27d36e0c6..d6b2adddf8 100644 --- a/packages/types/src/documents/app/links.ts +++ b/packages/types/src/documents/app/links.ts @@ -1,4 +1,6 @@ -export interface LinkDocument { +import { Document } from "../document" + +export interface LinkDocument extends Document { type: string doc1: { rowId: string @@ -11,3 +13,9 @@ export interface LinkDocument { tableId: string } } + +export interface LinkDocumentValue { + id: string + thisId: string + fieldName: string +} From 0a32126c5bb14aad833ad08ed0a89f2e34578fb5 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 25 Nov 2022 19:57:07 +0000 Subject: [PATCH 075/179] Automation overhaul to Typescript, plus type updates. --- packages/backend-core/src/environment.ts | 6 +- packages/backend-core/src/queue/queue.ts | 2 +- .../server/src/api/controllers/automation.ts | 4 +- .../automations/{actions.js => actions.ts} | 49 ++++++----- ...{automationUtils.js => automationUtils.ts} | 25 +++--- packages/server/src/automations/bullboard.js | 39 --------- packages/server/src/automations/bullboard.ts | 38 +++++++++ packages/server/src/automations/index.js | 29 ------- packages/server/src/automations/index.ts | 26 ++++++ .../automations/steps/{bash.js => bash.ts} | 21 +++-- .../server/src/automations/steps/createRow.ts | 11 ++- .../automations/steps/{delay.js => delay.ts} | 13 ++- .../server/src/automations/steps/deleteRow.ts | 11 ++- .../steps/{discord.js => discord.ts} | 15 ++-- .../{executeQuery.js => executeQuery.ts} | 19 +++-- .../{executeScript.js => executeScript.ts} | 24 ++++-- .../steps/{filter.js => filter.ts} | 21 +++-- .../steps/{integromat.js => integromat.ts} | 15 ++-- .../automations/steps/{loop.js => loop.ts} | 6 +- ...{outgoingWebhook.js => outgoingWebhook.ts} | 31 ++++--- .../steps/{queryRows.js => queryRows.ts} | 84 +++++++++++-------- .../{sendSmtpEmail.js => sendSmtpEmail.ts} | 15 ++-- .../steps/{serverLog.js => serverLog.ts} | 12 ++- .../automations/steps/{slack.js => slack.ts} | 15 ++-- .../steps/{updateRow.js => updateRow.ts} | 19 +++-- .../automations/steps/{utils.js => utils.ts} | 14 +++- .../steps/{zapier.js => zapier.ts} | 16 ++-- .../triggerInfo/{app.js => app.ts} | 6 +- .../triggerInfo/{cron.js => cron.ts} | 6 +- .../src/automations/triggerInfo/index.js | 15 ---- .../src/automations/triggerInfo/index.ts | 15 ++++ .../{rowDeleted.js => rowDeleted.ts} | 6 +- .../triggerInfo/{rowSaved.js => rowSaved.ts} | 6 +- .../{rowUpdated.js => rowUpdated.ts} | 6 +- .../triggerInfo/{webhook.js => webhook.ts} | 6 +- .../automations/{triggers.js => triggers.ts} | 51 ++++++----- .../src/{environment.js => environment.ts} | 15 ++-- .../server/src/utilities/workerRequests.ts | 2 +- .../types/src/documents/app/automation.ts | 20 ++++- packages/worker/src/environment.ts | 10 ++- 40 files changed, 442 insertions(+), 302 deletions(-) rename packages/server/src/automations/{actions.js => actions.ts} (58%) rename packages/server/src/automations/{automationUtils.js => automationUtils.ts} (86%) delete mode 100644 packages/server/src/automations/bullboard.js create mode 100644 packages/server/src/automations/bullboard.ts delete mode 100644 packages/server/src/automations/index.js create mode 100644 packages/server/src/automations/index.ts rename packages/server/src/automations/steps/{bash.js => bash.ts} (72%) rename packages/server/src/automations/steps/{delay.js => delay.ts} (69%) rename packages/server/src/automations/steps/{discord.js => discord.ts} (84%) rename packages/server/src/automations/steps/{executeQuery.js => executeQuery.ts} (78%) rename packages/server/src/automations/steps/{executeScript.js => executeScript.ts} (70%) rename packages/server/src/automations/steps/{filter.js => filter.ts} (86%) rename packages/server/src/automations/steps/{integromat.js => integromat.ts} (84%) rename packages/server/src/automations/steps/{loop.js => loop.ts} (87%) rename packages/server/src/automations/steps/{outgoingWebhook.js => outgoingWebhook.ts} (84%) rename packages/server/src/automations/steps/{queryRows.js => queryRows.ts} (61%) rename packages/server/src/automations/steps/{sendSmtpEmail.js => sendSmtpEmail.ts} (81%) rename packages/server/src/automations/steps/{serverLog.js => serverLog.ts} (80%) rename packages/server/src/automations/steps/{slack.js => slack.ts} (79%) rename packages/server/src/automations/steps/{updateRow.js => updateRow.ts} (82%) rename packages/server/src/automations/steps/{utils.js => utils.ts} (76%) rename packages/server/src/automations/steps/{zapier.js => zapier.ts} (83%) rename packages/server/src/automations/triggerInfo/{app.js => app.ts} (80%) rename packages/server/src/automations/triggerInfo/{cron.js => cron.ts} (78%) delete mode 100644 packages/server/src/automations/triggerInfo/index.js create mode 100644 packages/server/src/automations/triggerInfo/index.ts rename packages/server/src/automations/triggerInfo/{rowDeleted.js => rowDeleted.ts} (79%) rename packages/server/src/automations/triggerInfo/{rowSaved.js => rowSaved.ts} (83%) rename packages/server/src/automations/triggerInfo/{rowUpdated.js => rowUpdated.ts} (83%) rename packages/server/src/automations/triggerInfo/{webhook.js => webhook.ts} (82%) rename packages/server/src/automations/{triggers.js => triggers.ts} (77%) rename packages/server/src/{environment.js => environment.ts} (93%) diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts index 2443287d5a..5d010f1421 100644 --- a/packages/backend-core/src/environment.ts +++ b/packages/backend-core/src/environment.ts @@ -25,7 +25,7 @@ const DefaultBucketName = { PLUGINS: "plugins", } -const env = { +const environment = { isTest, isDev, JS_BCRYPT: process.env.JS_BCRYPT, @@ -80,7 +80,7 @@ const env = { } // clean up any environment variable edge cases -for (let [key, value] of Object.entries(env)) { +for (let [key, value] of Object.entries(environment)) { // handle the edge case of "0" to disable an environment variable if (value === "0") { // @ts-ignore @@ -88,4 +88,4 @@ for (let [key, value] of Object.entries(env)) { } } -export = env +export = environment diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts index b4eeeb31aa..b34d46e463 100644 --- a/packages/backend-core/src/queue/queue.ts +++ b/packages/backend-core/src/queue/queue.ts @@ -39,7 +39,7 @@ export function createQueue( return queue } -exports.shutdown = async () => { +export async function shutdown() { if (QUEUES.length) { clearInterval(cleanupInterval) for (let queue of QUEUES) { diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts index 185da80216..0e6624d125 100644 --- a/packages/server/src/api/controllers/automation.ts +++ b/packages/server/src/api/controllers/automation.ts @@ -1,5 +1,5 @@ -import actions from "../../automations/actions" -import triggers from "../../automations/triggers" +import * as actions from "../../automations/actions" +import * as triggers from "../../automations/triggers" import { getAutomationParams, generateAutomationID, diff --git a/packages/server/src/automations/actions.js b/packages/server/src/automations/actions.ts similarity index 58% rename from packages/server/src/automations/actions.js rename to packages/server/src/automations/actions.ts index e1ebff560a..7c1ef719f7 100644 --- a/packages/server/src/automations/actions.js +++ b/packages/server/src/automations/actions.ts @@ -1,22 +1,26 @@ -const sendSmtpEmail = require("./steps/sendSmtpEmail") -const createRow = require("./steps/createRow") -const updateRow = require("./steps/updateRow") -const deleteRow = require("./steps/deleteRow") -const executeScript = require("./steps/executeScript") -const executeQuery = require("./steps/executeQuery") -const outgoingWebhook = require("./steps/outgoingWebhook") -const serverLog = require("./steps/serverLog") -const discord = require("./steps/discord") -const slack = require("./steps/slack") -const zapier = require("./steps/zapier") -const integromat = require("./steps/integromat") -let filter = require("./steps/filter") -let delay = require("./steps/delay") -let queryRow = require("./steps/queryRows") -let loop = require("./steps/loop") -const env = require("../environment") +import * as sendSmtpEmail from "./steps/sendSmtpEmail" +import * as createRow from "./steps/createRow" +import * as updateRow from "./steps/updateRow" +import * as deleteRow from "./steps/deleteRow" +import * as executeScript from "./steps/executeScript" +import * as executeQuery from "./steps/executeQuery" +import * as outgoingWebhook from "./steps/outgoingWebhook" +import * as serverLog from "./steps/serverLog" +import * as discord from "./steps/discord" +import * as slack from "./steps/slack" +import * as zapier from "./steps/zapier" +import * as integromat from "./steps/integromat" +import * as filter from "./steps/filter" +import * as delay from "./steps/delay" +import * as queryRow from "./steps/queryRows" +import * as loop from "./steps/loop" +import env from "../environment" +import { AutomationStep, AutomationStepInput } from "@budibase/types" -const ACTION_IMPLS = { +const ACTION_IMPLS: Record< + string, + (opts: AutomationStepInput) => Promise +> = { SEND_EMAIL_SMTP: sendSmtpEmail.run, CREATE_ROW: createRow.run, UPDATE_ROW: updateRow.run, @@ -28,14 +32,13 @@ const ACTION_IMPLS = { DELAY: delay.run, FILTER: filter.run, QUERY_ROWS: queryRow.run, - LOOP: loop.run, // these used to be lowercase step IDs, maintain for backwards compat discord: discord.run, slack: slack.run, zapier: zapier.run, integromat: integromat.run, } -const ACTION_DEFINITIONS = { +export const ACTION_DEFINITIONS: Record = { SEND_EMAIL_SMTP: sendSmtpEmail.definition, CREATE_ROW: createRow.definition, UPDATE_ROW: updateRow.definition, @@ -60,15 +63,15 @@ const ACTION_DEFINITIONS = { // ran at all if (env.SELF_HOSTED) { const bash = require("./steps/bash") + // @ts-ignore ACTION_IMPLS["EXECUTE_BASH"] = bash.run + // @ts-ignore ACTION_DEFINITIONS["EXECUTE_BASH"] = bash.definition } /* istanbul ignore next */ -exports.getAction = async function (actionName) { +export async function getAction(actionName: string) { if (ACTION_IMPLS[actionName] != null) { return ACTION_IMPLS[actionName] } } - -exports.ACTION_DEFINITIONS = ACTION_DEFINITIONS diff --git a/packages/server/src/automations/automationUtils.js b/packages/server/src/automations/automationUtils.ts similarity index 86% rename from packages/server/src/automations/automationUtils.js rename to packages/server/src/automations/automationUtils.ts index 12f7566b6d..8a75de83dd 100644 --- a/packages/server/src/automations/automationUtils.js +++ b/packages/server/src/automations/automationUtils.ts @@ -1,9 +1,10 @@ -const { +import { decodeJSBinding, isJSBinding, encodeJSBinding, -} = require("@budibase/string-templates") -const sdk = require("../sdk") +} from "@budibase/string-templates" +import sdk from "../sdk" +import { Row } from "@budibase/types" /** * When values are input to the system generally they will be of type string as this is required for template strings. @@ -21,7 +22,7 @@ const sdk = require("../sdk") * @returns {object} The inputs object which has had all the various types supported by this function converted to their * primitive types. */ -exports.cleanInputValues = (inputs, schema) => { +export function cleanInputValues(inputs: Record, schema: any) { if (schema == null) { return inputs } @@ -62,12 +63,12 @@ exports.cleanInputValues = (inputs, schema) => { * @param {object} row The input row structure which requires clean-up after having been through template statements. * @returns {Promise} The cleaned up rows object, will should now have all the required primitive types. */ -exports.cleanUpRow = async (tableId, row) => { +export async function cleanUpRow(tableId: string, row: Row) { let table = await sdk.tables.getTable(tableId) - return exports.cleanInputValues(row, { properties: table.schema }) + return cleanInputValues(row, { properties: table.schema }) } -exports.getError = err => { +export function getError(err: any) { if (err == null) { return "No error provided." } @@ -80,13 +81,13 @@ exports.getError = err => { return typeof err !== "string" ? err.toString() : err } -exports.substituteLoopStep = (hbsString, substitute) => { +export function substituteLoopStep(hbsString: string, substitute: string) { let checkForJS = isJSBinding(hbsString) let substitutedHbsString = "" let open = checkForJS ? `$("` : "{{" let closed = checkForJS ? `")` : "}}" if (checkForJS) { - hbsString = decodeJSBinding(hbsString) + hbsString = decodeJSBinding(hbsString) as string } let pointer = 0, openPointer = 0, @@ -111,9 +112,9 @@ exports.substituteLoopStep = (hbsString, substitute) => { return substitutedHbsString } -exports.stringSplit = value => { - if (value == null) { - return [] +export function stringSplit(value: string | string[]) { + if (value == null || Array.isArray(value)) { + return value || [] } if (value.split("\n").length > 1) { value = value.split("\n") diff --git a/packages/server/src/automations/bullboard.js b/packages/server/src/automations/bullboard.js deleted file mode 100644 index dd4a6aa383..0000000000 --- a/packages/server/src/automations/bullboard.js +++ /dev/null @@ -1,39 +0,0 @@ -const { createBullBoard } = require("@bull-board/api") -const { BullAdapter } = require("@bull-board/api/bullAdapter") -const { KoaAdapter } = require("@bull-board/koa") -const { queue } = require("@budibase/backend-core") -const automation = require("../threads/automation") -const { backups } = require("@budibase/pro") - -let automationQueue = queue.createQueue( - queue.JobQueue.AUTOMATION, - automation.removeStalled -) - -const PATH_PREFIX = "/bulladmin" - -exports.init = async () => { - // Set up queues for bull board admin - const backupQueue = await backups.getBackupQueue() - const queues = [automationQueue] - if (backupQueue) { - queues.push(backupQueue) - } - const adapters = [] - const serverAdapter = new KoaAdapter() - for (let queue of queues) { - adapters.push(new BullAdapter(queue)) - } - createBullBoard({ - queues: adapters, - serverAdapter, - }) - serverAdapter.setBasePath(PATH_PREFIX) - return serverAdapter.registerPlugin() -} - -exports.shutdown = async () => { - await queue.shutdown() -} - -exports.automationQueue = automationQueue diff --git a/packages/server/src/automations/bullboard.ts b/packages/server/src/automations/bullboard.ts new file mode 100644 index 0000000000..df784eacff --- /dev/null +++ b/packages/server/src/automations/bullboard.ts @@ -0,0 +1,38 @@ +import { BullAdapter } from "@bull-board/api/bullAdapter" +import { KoaAdapter } from "@bull-board/koa" +import { queue } from "@budibase/backend-core" +import * as automation from "../threads/automation" +import { backups } from "@budibase/pro" +import { createBullBoard } from "@bull-board/api" +import BullQueue from "bull" + +export const automationQueue: BullQueue.Queue = queue.createQueue( + queue.JobQueue.AUTOMATION, + { removeStalledCb: automation.removeStalled } +) + +const PATH_PREFIX = "/bulladmin" + +export async function init() { + // Set up queues for bull board admin + const backupQueue = await backups.getBackupQueue() + const queues = [automationQueue] + if (backupQueue) { + queues.push(backupQueue) + } + const adapters = [] + const serverAdapter: any = new KoaAdapter() + for (let queue of queues) { + adapters.push(new BullAdapter(queue)) + } + createBullBoard({ + queues: adapters, + serverAdapter, + }) + serverAdapter.setBasePath(PATH_PREFIX) + return serverAdapter.registerPlugin() +} + +export async function shutdown() { + await queue.shutdown() +} diff --git a/packages/server/src/automations/index.js b/packages/server/src/automations/index.js deleted file mode 100644 index 521991dd2c..0000000000 --- a/packages/server/src/automations/index.js +++ /dev/null @@ -1,29 +0,0 @@ -const { processEvent } = require("./utils") -const { automationQueue, shutdown } = require("./bullboard") -const { TRIGGER_DEFINITIONS, rebootTrigger } = require("./triggers") -const { ACTION_DEFINITIONS } = require("./actions") - -/** - * This module is built purely to kick off the worker farm and manage the inputs/outputs - */ -exports.init = async function () { - // this promise will not complete - const promise = automationQueue.process(async job => { - await processEvent(job) - }) - // on init we need to trigger any reboot automations - await rebootTrigger() - return promise -} - -exports.getQueues = () => { - return [automationQueue] -} - -exports.shutdown = () => { - return shutdown() -} - -exports.automationQueue = automationQueue -exports.TRIGGER_DEFINITIONS = TRIGGER_DEFINITIONS -exports.ACTION_DEFINITIONS = ACTION_DEFINITIONS diff --git a/packages/server/src/automations/index.ts b/packages/server/src/automations/index.ts new file mode 100644 index 0000000000..e46500d33e --- /dev/null +++ b/packages/server/src/automations/index.ts @@ -0,0 +1,26 @@ +import { processEvent } from "./utils" +import { automationQueue } from "./bullboard" +import { rebootTrigger } from "./triggers" +import BullQueue from "bull" + +export { automationQueue } from "./bullboard" +export { shutdown } from "./bullboard" +export { TRIGGER_DEFINITIONS } from "./triggers" +export { ACTION_DEFINITIONS } from "./actions" + +/** + * This module is built purely to kick off the worker farm and manage the inputs/outputs + */ +export async function init() { + // this promise will not complete + const promise = automationQueue.process(async job => { + await processEvent(job) + }) + // on init we need to trigger any reboot automations + await rebootTrigger() + return promise +} + +export function getQueues(): BullQueue.Queue[] { + return [automationQueue] +} diff --git a/packages/server/src/automations/steps/bash.js b/packages/server/src/automations/steps/bash.ts similarity index 72% rename from packages/server/src/automations/steps/bash.js rename to packages/server/src/automations/steps/bash.ts index efa4295e35..5bdf482e70 100644 --- a/packages/server/src/automations/steps/bash.js +++ b/packages/server/src/automations/steps/bash.ts @@ -1,16 +1,21 @@ -const { execSync } = require("child_process") -const { processStringSync } = require("@budibase/string-templates") -const automationUtils = require("../automationUtils") -const environment = require("../../environment") +import { execSync } from "child_process" +import { processStringSync } from "@budibase/string-templates" +import automationUtils from "../automationUtils" +import environment from "../../environment" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -exports.definition = { +export const definition: AutomationStep = { name: "Bash Scripting", tagline: "Execute a bash command", icon: "JourneyEvent", description: "Run a bash script", type: "ACTION", internal: true, - stepId: "EXECUTE_BASH", + stepId: AutomationActionStepId.EXECUTE_BASH, inputs: {}, schema: { inputs: { @@ -39,7 +44,7 @@ exports.definition = { }, } -exports.run = async function ({ inputs, context }) { +export async function run({ inputs, context }: AutomationStepInput) { if (inputs.code == null) { return { stdout: "Budibase bash automation failed: Invalid inputs", @@ -55,7 +60,7 @@ exports.run = async function ({ inputs, context }) { stdout = execSync(command, { timeout: environment.QUERY_THREAD_TIMEOUT || 500, }).toString() - } catch (err) { + } catch (err: any) { stdout = err.message success = false } diff --git a/packages/server/src/automations/steps/createRow.ts b/packages/server/src/automations/steps/createRow.ts index 906a1529ea..a8a139e11c 100644 --- a/packages/server/src/automations/steps/createRow.ts +++ b/packages/server/src/automations/steps/createRow.ts @@ -1,15 +1,20 @@ import { save } from "../../api/controllers/row" import { cleanUpRow, getError } from "../automationUtils" import { buildCtx } from "./utils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -export const definition = { +export const definition: AutomationStep = { name: "Create Row", tagline: "Create a {{inputs.enriched.table.name}} row", icon: "TableRowAddBottom", description: "Add a row to your database", type: "ACTION", internal: true, - stepId: "CREATE_ROW", + stepId: AutomationActionStepId.CREATE_ROW, inputs: {}, schema: { inputs: { @@ -58,7 +63,7 @@ export const definition = { }, } -export async function run({ inputs, appId, emitter }: any) { +export async function run({ inputs, appId, emitter }: AutomationStepInput) { if (inputs.row == null || inputs.row.tableId == null) { return { success: false, diff --git a/packages/server/src/automations/steps/delay.js b/packages/server/src/automations/steps/delay.ts similarity index 69% rename from packages/server/src/automations/steps/delay.js rename to packages/server/src/automations/steps/delay.ts index ad59df54c5..17a07d5699 100644 --- a/packages/server/src/automations/steps/delay.js +++ b/packages/server/src/automations/steps/delay.ts @@ -1,11 +1,16 @@ -let { wait } = require("../../utilities") +import { wait } from "../../utilities" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -exports.definition = { +export const definition: AutomationStep = { name: "Delay", icon: "Clock", tagline: "Delay for {{inputs.time}} milliseconds", description: "Delay the automation until an amount of time has passed", - stepId: "DELAY", + stepId: AutomationActionStepId.DELAY, internal: true, inputs: {}, schema: { @@ -31,7 +36,7 @@ exports.definition = { type: "LOGIC", } -exports.run = async function delay({ inputs }) { +export async function run({ inputs }: AutomationStepInput) { await wait(inputs.time) return { success: true, diff --git a/packages/server/src/automations/steps/deleteRow.ts b/packages/server/src/automations/steps/deleteRow.ts index 0537d60de7..92978987b2 100644 --- a/packages/server/src/automations/steps/deleteRow.ts +++ b/packages/server/src/automations/steps/deleteRow.ts @@ -1,14 +1,19 @@ import { destroy } from "../../api/controllers/row" import { buildCtx } from "./utils" import { getError } from "../automationUtils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -export const definition = { +export const definition: AutomationStep = { description: "Delete a row from your database", icon: "TableRowRemoveCenter", name: "Delete Row", tagline: "Delete a {{inputs.enriched.table.name}} row", type: "ACTION", - stepId: "DELETE_ROW", + stepId: AutomationActionStepId.DELETE_ROW, internal: true, inputs: {}, schema: { @@ -47,7 +52,7 @@ export const definition = { }, } -export async function run({ inputs, appId, emitter }: any) { +export async function run({ inputs, appId, emitter }: AutomationStepInput) { if (inputs.id == null) { return { success: false, diff --git a/packages/server/src/automations/steps/discord.js b/packages/server/src/automations/steps/discord.ts similarity index 84% rename from packages/server/src/automations/steps/discord.js rename to packages/server/src/automations/steps/discord.ts index a0b732b11f..75899961a6 100644 --- a/packages/server/src/automations/steps/discord.js +++ b/packages/server/src/automations/steps/discord.ts @@ -1,15 +1,20 @@ -const fetch = require("node-fetch") -const { getFetchResponse } = require("./utils") +import fetch from "node-fetch" +import { getFetchResponse } from "./utils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" const DEFAULT_USERNAME = "Budibase Automate" const DEFAULT_AVATAR_URL = "https://i.imgur.com/a1cmTKM.png" -exports.definition = { +export const definition: AutomationStep = { name: "Discord Message", tagline: "Send a message to a Discord server", description: "Send a message to a Discord server", icon: "ri-discord-line", - stepId: "discord", + stepId: AutomationActionStepId.discord, type: "ACTION", internal: false, inputs: {}, @@ -54,7 +59,7 @@ exports.definition = { }, } -exports.run = async function ({ inputs }) { +export async function run({ inputs }: AutomationStepInput) { let { url, username, avatar_url, content } = inputs if (!username) { username = DEFAULT_USERNAME diff --git a/packages/server/src/automations/steps/executeQuery.js b/packages/server/src/automations/steps/executeQuery.ts similarity index 78% rename from packages/server/src/automations/steps/executeQuery.js rename to packages/server/src/automations/steps/executeQuery.ts index 93cc8e0fb8..d4408441dd 100644 --- a/packages/server/src/automations/steps/executeQuery.js +++ b/packages/server/src/automations/steps/executeQuery.ts @@ -1,14 +1,19 @@ -const queryController = require("../../api/controllers/query") -const { buildCtx } = require("./utils") -const automationUtils = require("../automationUtils") +import * as queryController from "../../api/controllers/query" +import { buildCtx } from "./utils" +import automationUtils from "../automationUtils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -exports.definition = { +export const definition: AutomationStep = { name: "External Data Connector", tagline: "Execute Data Connector", icon: "Data", description: "Execute a query in an external data connector", type: "ACTION", - stepId: "EXECUTE_QUERY", + stepId: AutomationActionStepId.EXECUTE_QUERY, internal: true, inputs: {}, schema: { @@ -50,7 +55,7 @@ exports.definition = { }, } -exports.run = async function ({ inputs, appId, emitter }) { +export async function run({ inputs, appId, emitter }: AutomationStepInput) { if (inputs.query == null) { return { success: false, @@ -62,7 +67,7 @@ exports.run = async function ({ inputs, appId, emitter }) { const { queryId, ...rest } = inputs.query - const ctx = buildCtx(appId, emitter, { + const ctx: any = buildCtx(appId, emitter, { body: { parameters: rest, }, diff --git a/packages/server/src/automations/steps/executeScript.js b/packages/server/src/automations/steps/executeScript.ts similarity index 70% rename from packages/server/src/automations/steps/executeScript.js rename to packages/server/src/automations/steps/executeScript.ts index 7a7296014b..05e4c9a196 100644 --- a/packages/server/src/automations/steps/executeScript.js +++ b/packages/server/src/automations/steps/executeScript.ts @@ -1,15 +1,20 @@ -const scriptController = require("../../api/controllers/script") -const { buildCtx } = require("./utils") -const automationUtils = require("../automationUtils") +import * as scriptController from "../../api/controllers/script" +import { buildCtx } from "./utils" +import automationUtils from "../automationUtils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -exports.definition = { +export const definition: AutomationStep = { name: "JS Scripting", tagline: "Execute JavaScript Code", icon: "Code", description: "Run a piece of JavaScript code in your automation", type: "ACTION", internal: true, - stepId: "EXECUTE_SCRIPT", + stepId: AutomationActionStepId.EXECUTE_SCRIPT, inputs: {}, schema: { inputs: { @@ -38,7 +43,12 @@ exports.definition = { }, } -exports.run = async function ({ inputs, appId, context, emitter }) { +export async function run({ + inputs, + appId, + context, + emitter, +}: AutomationStepInput) { if (inputs.code == null) { return { success: false, @@ -48,7 +58,7 @@ exports.run = async function ({ inputs, appId, context, emitter }) { } } - const ctx = buildCtx(appId, emitter, { + const ctx: any = buildCtx(appId, emitter, { body: { script: inputs.code, context, diff --git a/packages/server/src/automations/steps/filter.js b/packages/server/src/automations/steps/filter.ts similarity index 86% rename from packages/server/src/automations/steps/filter.js rename to packages/server/src/automations/steps/filter.ts index 566bb60f22..9eeaefd69d 100644 --- a/packages/server/src/automations/steps/filter.js +++ b/packages/server/src/automations/steps/filter.ts @@ -1,21 +1,24 @@ -const FilterConditions = { +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" + +export const FilterConditions = { EQUAL: "EQUAL", NOT_EQUAL: "NOT_EQUAL", GREATER_THAN: "GREATER_THAN", LESS_THAN: "LESS_THAN", } -const PrettyFilterConditions = { +export const PrettyFilterConditions = { [FilterConditions.EQUAL]: "Equals", [FilterConditions.NOT_EQUAL]: "Not equals", [FilterConditions.GREATER_THAN]: "Greater than", [FilterConditions.LESS_THAN]: "Less than", } -exports.FilterConditions = FilterConditions -exports.PrettyFilterConditions = PrettyFilterConditions - -exports.definition = { +export const definition: AutomationStep = { name: "Condition", tagline: "{{inputs.field}} {{inputs.condition}} {{inputs.value}}", icon: "Branch2", @@ -23,9 +26,9 @@ exports.definition = { "Conditionally halt automations which do not meet certain conditions", type: "LOGIC", internal: true, - stepId: "FILTER", + stepId: AutomationActionStepId.FILTER, inputs: { - condition: FilterConditions.EQUALS, + condition: FilterConditions.EQUAL, }, schema: { inputs: { @@ -63,7 +66,7 @@ exports.definition = { }, } -exports.run = async function filter({ inputs }) { +export async function run({ inputs }: AutomationStepInput) { try { let { field, condition, value } = inputs // coerce types so that we can use them diff --git a/packages/server/src/automations/steps/integromat.js b/packages/server/src/automations/steps/integromat.ts similarity index 84% rename from packages/server/src/automations/steps/integromat.js rename to packages/server/src/automations/steps/integromat.ts index e7ea03efca..9677d3e06a 100644 --- a/packages/server/src/automations/steps/integromat.js +++ b/packages/server/src/automations/steps/integromat.ts @@ -1,13 +1,18 @@ -const fetch = require("node-fetch") -const { getFetchResponse } = require("./utils") +import fetch from "node-fetch" +import { getFetchResponse } from "./utils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -exports.definition = { +export const definition: AutomationStep = { name: "Integromat Integration", tagline: "Trigger an Integromat scenario", description: "Performs a webhook call to Integromat and gets the response (if configured)", icon: "ri-shut-down-line", - stepId: "integromat", + stepId: AutomationActionStepId.integromat, type: "ACTION", internal: false, inputs: {}, @@ -61,7 +66,7 @@ exports.definition = { }, } -exports.run = async function ({ inputs }) { +export async function run({ inputs }: AutomationStepInput) { const { url, value1, value2, value3, value4, value5 } = inputs const response = await fetch(url, { diff --git a/packages/server/src/automations/steps/loop.js b/packages/server/src/automations/steps/loop.ts similarity index 87% rename from packages/server/src/automations/steps/loop.js rename to packages/server/src/automations/steps/loop.ts index c77def022a..552d6df6e7 100644 --- a/packages/server/src/automations/steps/loop.js +++ b/packages/server/src/automations/steps/loop.ts @@ -1,9 +1,11 @@ -exports.definition = { +import { AutomationActionStepId, AutomationStep } from "@budibase/types" + +export const definition: AutomationStep = { name: "Looping", icon: "Reuse", tagline: "Loop the block", description: "Loop", - stepId: "LOOP", + stepId: AutomationActionStepId.LOOP, internal: true, inputs: {}, schema: { diff --git a/packages/server/src/automations/steps/outgoingWebhook.js b/packages/server/src/automations/steps/outgoingWebhook.ts similarity index 84% rename from packages/server/src/automations/steps/outgoingWebhook.js rename to packages/server/src/automations/steps/outgoingWebhook.ts index 01d1e8d6be..42eb0342b0 100644 --- a/packages/server/src/automations/steps/outgoingWebhook.js +++ b/packages/server/src/automations/steps/outgoingWebhook.ts @@ -1,13 +1,18 @@ -const fetch = require("node-fetch") -const { getFetchResponse } = require("./utils") -const automationUtils = require("../automationUtils") +import fetch from "node-fetch" +import { getFetchResponse } from "./utils" +import automationUtils from "../automationUtils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -const RequestType = { - POST: "POST", - GET: "GET", - PUT: "PUT", - DELETE: "DELETE", - PATCH: "PATCH", +enum RequestType { + POST = "POST", + GET = "GET", + PUT = "PUT", + DELETE = "DELETE", + PATCH = "PATCH", } const BODY_REQUESTS = [RequestType.POST, RequestType.PUT, RequestType.PATCH] @@ -16,7 +21,7 @@ const BODY_REQUESTS = [RequestType.POST, RequestType.PUT, RequestType.PATCH] * NOTE: this functionality is deprecated - it no longer should be used. */ -exports.definition = { +export const definition: AutomationStep = { deprecated: true, name: "Outgoing webhook", tagline: "Send a {{inputs.requestMethod}} request", @@ -24,7 +29,7 @@ exports.definition = { description: "Send a request of specified method to a URL", type: "ACTION", internal: true, - stepId: "OUTGOING_WEBHOOK", + stepId: AutomationActionStepId.OUTGOING_WEBHOOK, inputs: { requestMethod: "POST", url: "http://", @@ -76,12 +81,12 @@ exports.definition = { }, } -exports.run = async function ({ inputs }) { +export async function run({ inputs }: AutomationStepInput) { let { requestMethod, url, requestBody, headers } = inputs if (!url.startsWith("http")) { url = `http://${url}` } - const request = { + const request: any = { method: requestMethod, } if (headers) { diff --git a/packages/server/src/automations/steps/queryRows.js b/packages/server/src/automations/steps/queryRows.ts similarity index 61% rename from packages/server/src/automations/steps/queryRows.js rename to packages/server/src/automations/steps/queryRows.ts index 23a7ce55fa..1c9d1f54e0 100644 --- a/packages/server/src/automations/steps/queryRows.js +++ b/packages/server/src/automations/steps/queryRows.ts @@ -1,36 +1,43 @@ -const rowController = require("../../api/controllers/row") -const tableController = require("../../api/controllers/table") -const { FieldTypes } = require("../../constants") -const { buildCtx } = require("./utils") -const automationUtils = require("../automationUtils") +import * as rowController from "../../api/controllers/row" +import * as tableController from "../../api/controllers/table" +import { FieldTypes } from "../../constants" +import { buildCtx } from "./utils" +import automationUtils from "../automationUtils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, + SearchFilters, + Table, +} from "@budibase/types" -const SortOrders = { - ASCENDING: "ascending", - DESCENDING: "descending", +enum SortOrder { + ASCENDING = "ascending", + DESCENDING = "descending", } -const SortOrdersPretty = { - [SortOrders.ASCENDING]: "Ascending", - [SortOrders.DESCENDING]: "Descending", +const SortOrderPretty = { + [SortOrder.ASCENDING]: "Ascending", + [SortOrder.DESCENDING]: "Descending", } -const EmptyFilterOptions = { - RETURN_ALL: "all", - RETURN_NONE: "none", +enum EmptyFilterOption { + RETURN_ALL = "all", + RETURN_NONE = "none", } -const EmptyFilterOptionsPretty = { - [EmptyFilterOptions.RETURN_ALL]: "Return all table rows", - [EmptyFilterOptions.RETURN_NONE]: "Return no rows", +const EmptyFilterOptionPretty = { + [EmptyFilterOption.RETURN_ALL]: "Return all table rows", + [EmptyFilterOption.RETURN_NONE]: "Return no rows", } -exports.definition = { +export const definition: AutomationStep = { description: "Query rows from the database", icon: "Search", name: "Query rows", tagline: "Query rows from {{inputs.enriched.table.name}} table", type: "ACTION", - stepId: "QUERY_ROWS", + stepId: AutomationActionStepId.QUERY_ROWS, internal: true, inputs: {}, schema: { @@ -54,8 +61,8 @@ exports.definition = { sortOrder: { type: "string", title: "Sort Order", - enum: Object.values(SortOrders), - pretty: Object.values(SortOrdersPretty), + enum: Object.values(SortOrder), + pretty: Object.values(SortOrderPretty), }, limit: { type: "number", @@ -63,8 +70,8 @@ exports.definition = { customType: "queryLimit", }, onEmptyFilter: { - pretty: Object.values(EmptyFilterOptionsPretty), - enum: Object.values(EmptyFilterOptions), + pretty: Object.values(EmptyFilterOptionPretty), + enum: Object.values(EmptyFilterOption), type: "string", title: "When Filter Empty", }, @@ -88,8 +95,8 @@ exports.definition = { }, } -async function getTable(appId, tableId) { - const ctx = buildCtx(appId, null, { +async function getTable(appId: string, tableId: string) { + const ctx: any = buildCtx(appId, null, { params: { tableId, }, @@ -98,20 +105,22 @@ async function getTable(appId, tableId) { return ctx.body } -function typeCoercion(filters, table) { +function typeCoercion(filters: SearchFilters, table: Table) { if (!filters || !table) { return filters } for (let key of Object.keys(filters)) { - if (typeof filters[key] === "object") { - for (let [property, value] of Object.entries(filters[key])) { + // @ts-ignore + const searchParam = filters[key] + if (typeof searchParam === "object") { + for (let [property, value] of Object.entries(searchParam)) { const column = table.schema[property] // convert string inputs if (!column || typeof value !== "string") { continue } if (column.type === FieldTypes.NUMBER) { - filters[key][property] = parseFloat(value) + searchParam[property] = parseFloat(value) } } } @@ -119,11 +128,14 @@ function typeCoercion(filters, table) { return filters } -const hasNullFilters = filters => - filters.length === 0 || - filters.some(filter => filter.value === null || filter.value === "") +function hasNullFilters(filters: any[]) { + return ( + filters.length === 0 || + filters.some(filter => filter.value === null || filter.value === "") + ) +} -exports.run = async function ({ inputs, appId }) { +export async function run({ inputs, appId }: AutomationStepInput) { const { tableId, filters, sortColumn, sortOrder, limit } = inputs if (!tableId) { return { @@ -140,7 +152,7 @@ exports.run = async function ({ inputs, appId }) { sortType = fieldType === FieldTypes.NUMBER ? FieldTypes.NUMBER : FieldTypes.STRING } - const ctx = buildCtx(appId, null, { + const ctx: any = buildCtx(appId, null, { params: { tableId, }, @@ -150,7 +162,7 @@ exports.run = async function ({ inputs, appId }) { sort: sortColumn, query: typeCoercion(filters || {}, table), // default to ascending, like data tab - sortOrder: sortOrder || SortOrders.ASCENDING, + sortOrder: sortOrder || SortOrder.ASCENDING, }, version: "1", }) @@ -158,7 +170,7 @@ exports.run = async function ({ inputs, appId }) { let rows if ( - inputs.onEmptyFilter === EmptyFilterOptions.RETURN_NONE && + inputs.onEmptyFilter === EmptyFilterOption.RETURN_NONE && inputs["filters-def"] && hasNullFilters(inputs["filters-def"]) ) { diff --git a/packages/server/src/automations/steps/sendSmtpEmail.js b/packages/server/src/automations/steps/sendSmtpEmail.ts similarity index 81% rename from packages/server/src/automations/steps/sendSmtpEmail.js rename to packages/server/src/automations/steps/sendSmtpEmail.ts index 423363701b..a2680a05cb 100644 --- a/packages/server/src/automations/steps/sendSmtpEmail.js +++ b/packages/server/src/automations/steps/sendSmtpEmail.ts @@ -1,14 +1,19 @@ -const { sendSmtpEmail } = require("../../utilities/workerRequests") -const automationUtils = require("../automationUtils") +import { sendSmtpEmail } from "../../utilities/workerRequests" +import automationUtils from "../automationUtils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -exports.definition = { +export const definition: AutomationStep = { description: "Send an email using SMTP", tagline: "Send SMTP email to {{inputs.to}}", icon: "Email", name: "Send Email (SMTP)", type: "ACTION", internal: true, - stepId: "SEND_EMAIL_SMTP", + stepId: AutomationActionStepId.SEND_EMAIL_SMTP, inputs: {}, schema: { inputs: { @@ -56,7 +61,7 @@ exports.definition = { }, } -exports.run = async function ({ inputs }) { +export async function run({ inputs }: AutomationStepInput) { let { to, from, subject, contents, cc, bcc } = inputs if (!contents) { contents = "

No content

" diff --git a/packages/server/src/automations/steps/serverLog.js b/packages/server/src/automations/steps/serverLog.ts similarity index 80% rename from packages/server/src/automations/steps/serverLog.js rename to packages/server/src/automations/steps/serverLog.ts index 19bbc36abf..04eba3e6d4 100644 --- a/packages/server/src/automations/steps/serverLog.js +++ b/packages/server/src/automations/steps/serverLog.ts @@ -1,17 +1,23 @@ +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" + /** * Note, there is some functionality in this that is not currently exposed as it * is complex and maybe better to be opinionated here. * GET/DELETE requests cannot handle body elements so they will not be sent if configured. */ -exports.definition = { +export const definition: AutomationStep = { name: "Backend log", tagline: "Console log a value in the backend", icon: "Monitoring", description: "Logs the given text to the server (using console.log)", type: "ACTION", internal: true, - stepId: "SERVER_LOG", + stepId: AutomationActionStepId.SERVER_LOG, inputs: { text: "", }, @@ -41,7 +47,7 @@ exports.definition = { }, } -exports.run = async function ({ inputs, appId }) { +export async function run({ inputs, appId }: AutomationStepInput) { const message = `App ${appId} - ${inputs.text}` console.log(message) return { diff --git a/packages/server/src/automations/steps/slack.js b/packages/server/src/automations/steps/slack.ts similarity index 79% rename from packages/server/src/automations/steps/slack.js rename to packages/server/src/automations/steps/slack.ts index ec6341a26f..ddd26c98e2 100644 --- a/packages/server/src/automations/steps/slack.js +++ b/packages/server/src/automations/steps/slack.ts @@ -1,12 +1,17 @@ -const fetch = require("node-fetch") -const { getFetchResponse } = require("./utils") +import fetch from "node-fetch" +import { getFetchResponse } from "./utils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -exports.definition = { +export const definition: AutomationStep = { name: "Slack Message", tagline: "Send a message to Slack", description: "Send a message to Slack", icon: "ri-slack-line", - stepId: "slack", + stepId: AutomationActionStepId.slack, type: "ACTION", internal: false, inputs: {}, @@ -43,7 +48,7 @@ exports.definition = { }, } -exports.run = async function ({ inputs }) { +export async function run({ inputs }: AutomationStepInput) { let { url, text } = inputs const response = await fetch(url, { method: "post", diff --git a/packages/server/src/automations/steps/updateRow.js b/packages/server/src/automations/steps/updateRow.ts similarity index 82% rename from packages/server/src/automations/steps/updateRow.js rename to packages/server/src/automations/steps/updateRow.ts index 5a2c158c5f..ed8e8a02ee 100644 --- a/packages/server/src/automations/steps/updateRow.js +++ b/packages/server/src/automations/steps/updateRow.ts @@ -1,15 +1,20 @@ -const rowController = require("../../api/controllers/row") -const automationUtils = require("../automationUtils") -const { buildCtx } = require("./utils") +import * as rowController from "../../api/controllers/row" +import automationUtils from "../automationUtils" +import { buildCtx } from "./utils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -exports.definition = { +export const definition: AutomationStep = { name: "Update Row", tagline: "Update a {{inputs.enriched.table.name}} row", icon: "Refresh", description: "Update a row in your database", type: "ACTION", internal: true, - stepId: "UPDATE_ROW", + stepId: AutomationActionStepId.UPDATE_ROW, inputs: {}, schema: { inputs: { @@ -55,7 +60,7 @@ exports.definition = { }, } -exports.run = async function ({ inputs, appId, emitter }) { +export async function run({ inputs, appId, emitter }: AutomationStepInput) { if (inputs.rowId == null || inputs.row == null) { return { success: false, @@ -74,7 +79,7 @@ exports.run = async function ({ inputs, appId, emitter }) { } // have to clean up the row, remove the table from it - const ctx = buildCtx(appId, emitter, { + const ctx: any = buildCtx(appId, emitter, { body: { ...inputs.row, _id: inputs.rowId, diff --git a/packages/server/src/automations/steps/utils.js b/packages/server/src/automations/steps/utils.ts similarity index 76% rename from packages/server/src/automations/steps/utils.js rename to packages/server/src/automations/steps/utils.ts index ed9a441499..02b0f4d34c 100644 --- a/packages/server/src/automations/steps/utils.js +++ b/packages/server/src/automations/steps/utils.ts @@ -1,4 +1,6 @@ -exports.getFetchResponse = async fetched => { +import { EventEmitter } from "events" + +export async function getFetchResponse(fetched: any) { let status = fetched.status, message const contentType = fetched.headers.get("content-type") @@ -18,12 +20,16 @@ exports.getFetchResponse = async fetched => { // throw added to them, so that controllers don't // throw a ctx.throw undefined when error occurs // opts can contain, body, params and version -exports.buildCtx = (appId, emitter, opts = {}) => { - const ctx = { +export async function buildCtx( + appId: string, + emitter?: EventEmitter | null, + opts: any = {} +) { + const ctx: any = { appId, user: { appId }, eventEmitter: emitter, - throw: (code, error) => { + throw: (code: string, error: any) => { throw error }, } diff --git a/packages/server/src/automations/steps/zapier.js b/packages/server/src/automations/steps/zapier.ts similarity index 83% rename from packages/server/src/automations/steps/zapier.js rename to packages/server/src/automations/steps/zapier.ts index bec90497cd..96bc90c4d0 100644 --- a/packages/server/src/automations/steps/zapier.js +++ b/packages/server/src/automations/steps/zapier.ts @@ -1,14 +1,20 @@ -const fetch = require("node-fetch") -const { getFetchResponse } = require("./utils") +import fetch from "node-fetch" +import { getFetchResponse } from "./utils" +import { + AutomationActionStepId, + AutomationStep, + AutomationStepInput, +} from "@budibase/types" -exports.definition = { +export const definition: AutomationStep = { name: "Zapier Webhook", - stepId: "zapier", + stepId: AutomationActionStepId.zapier, type: "ACTION", internal: false, description: "Trigger a Zapier Zap via webhooks", tagline: "Trigger a Zapier Zap", icon: "ri-flashlight-line", + inputs: {}, schema: { inputs: { properties: { @@ -54,7 +60,7 @@ exports.definition = { }, } -exports.run = async function ({ inputs }) { +export async function run({ inputs }: AutomationStepInput) { const { url, value1, value2, value3, value4, value5 } = inputs // send the platform to make sure zaps always work, even diff --git a/packages/server/src/automations/triggerInfo/app.js b/packages/server/src/automations/triggerInfo/app.ts similarity index 80% rename from packages/server/src/automations/triggerInfo/app.js rename to packages/server/src/automations/triggerInfo/app.ts index b1b07e9d5b..fe1413e88e 100644 --- a/packages/server/src/automations/triggerInfo/app.js +++ b/packages/server/src/automations/triggerInfo/app.ts @@ -1,10 +1,12 @@ -exports.definition = { +import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" + +export const definition: AutomationTrigger = { name: "App Action", event: "app:trigger", icon: "Apps", tagline: "Automation fired from the frontend", description: "Trigger an automation from an action inside your app", - stepId: "APP", + stepId: AutomationTriggerStepId.APP, inputs: {}, schema: { inputs: { diff --git a/packages/server/src/automations/triggerInfo/cron.js b/packages/server/src/automations/triggerInfo/cron.ts similarity index 78% rename from packages/server/src/automations/triggerInfo/cron.js rename to packages/server/src/automations/triggerInfo/cron.ts index 9547da69fa..fc40d33683 100644 --- a/packages/server/src/automations/triggerInfo/cron.js +++ b/packages/server/src/automations/triggerInfo/cron.ts @@ -1,10 +1,12 @@ -exports.definition = { +import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" + +export const definition: AutomationTrigger = { name: "Cron Trigger", event: "cron:trigger", icon: "Clock", tagline: "Cron Trigger ({{inputs.cron}})", description: "Triggers automation on a cron schedule.", - stepId: "CRON", + stepId: AutomationTriggerStepId.CRON, inputs: {}, schema: { inputs: { diff --git a/packages/server/src/automations/triggerInfo/index.js b/packages/server/src/automations/triggerInfo/index.js deleted file mode 100644 index 066993d324..0000000000 --- a/packages/server/src/automations/triggerInfo/index.js +++ /dev/null @@ -1,15 +0,0 @@ -const app = require("./app") -const cron = require("./cron") -const rowDeleted = require("./rowDeleted") -const rowSaved = require("./rowSaved") -const rowUpdated = require("./rowUpdated") -const webhook = require("./webhook") - -exports.definitions = { - ROW_SAVED: rowSaved.definition, - ROW_UPDATED: rowUpdated.definition, - ROW_DELETED: rowDeleted.definition, - WEBHOOK: webhook.definition, - APP: app.definition, - CRON: cron.definition, -} diff --git a/packages/server/src/automations/triggerInfo/index.ts b/packages/server/src/automations/triggerInfo/index.ts new file mode 100644 index 0000000000..50089c98e9 --- /dev/null +++ b/packages/server/src/automations/triggerInfo/index.ts @@ -0,0 +1,15 @@ +import app from "./app" +import cron from "./cron" +import rowDeleted from "./rowDeleted" +import rowSaved from "./rowSaved" +import rowUpdated from "./rowUpdated" +import webhook from "./webhook" + +export const definitions = { + ROW_SAVED: rowSaved.definition, + ROW_UPDATED: rowUpdated.definition, + ROW_DELETED: rowDeleted.definition, + WEBHOOK: webhook.definition, + APP: app.definition, + CRON: cron.definition, +} diff --git a/packages/server/src/automations/triggerInfo/rowDeleted.js b/packages/server/src/automations/triggerInfo/rowDeleted.ts similarity index 79% rename from packages/server/src/automations/triggerInfo/rowDeleted.js rename to packages/server/src/automations/triggerInfo/rowDeleted.ts index 7a7de13b11..ab238800ea 100644 --- a/packages/server/src/automations/triggerInfo/rowDeleted.js +++ b/packages/server/src/automations/triggerInfo/rowDeleted.ts @@ -1,10 +1,12 @@ -exports.definition = { +import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" + +export const definition: AutomationTrigger = { name: "Row Deleted", event: "row:delete", icon: "TableRowRemoveCenter", tagline: "Row is deleted from {{inputs.enriched.table.name}}", description: "Fired when a row is deleted from your database", - stepId: "ROW_DELETED", + stepId: AutomationTriggerStepId.ROW_DELETED, inputs: {}, schema: { inputs: { diff --git a/packages/server/src/automations/triggerInfo/rowSaved.js b/packages/server/src/automations/triggerInfo/rowSaved.ts similarity index 83% rename from packages/server/src/automations/triggerInfo/rowSaved.js rename to packages/server/src/automations/triggerInfo/rowSaved.ts index d763ca0a8a..55cf60c594 100644 --- a/packages/server/src/automations/triggerInfo/rowSaved.js +++ b/packages/server/src/automations/triggerInfo/rowSaved.ts @@ -1,10 +1,12 @@ -exports.definition = { +import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" + +export const definition: AutomationTrigger = { name: "Row Created", event: "row:save", icon: "TableRowAddBottom", tagline: "Row is added to {{inputs.enriched.table.name}}", description: "Fired when a row is added to your database", - stepId: "ROW_SAVED", + stepId: AutomationTriggerStepId.ROW_SAVED, inputs: {}, schema: { inputs: { diff --git a/packages/server/src/automations/triggerInfo/rowUpdated.js b/packages/server/src/automations/triggerInfo/rowUpdated.ts similarity index 83% rename from packages/server/src/automations/triggerInfo/rowUpdated.js rename to packages/server/src/automations/triggerInfo/rowUpdated.ts index 182c7c810e..6cc6d303c9 100644 --- a/packages/server/src/automations/triggerInfo/rowUpdated.js +++ b/packages/server/src/automations/triggerInfo/rowUpdated.ts @@ -1,10 +1,12 @@ -exports.definition = { +import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" + +export const definition: AutomationTrigger = { name: "Row Updated", event: "row:update", icon: "Refresh", tagline: "Row is updated in {{inputs.enriched.table.name}}", description: "Fired when a row is updated in your database", - stepId: "ROW_UPDATED", + stepId: AutomationTriggerStepId.ROW_UPDATED, inputs: {}, schema: { inputs: { diff --git a/packages/server/src/automations/triggerInfo/webhook.js b/packages/server/src/automations/triggerInfo/webhook.ts similarity index 82% rename from packages/server/src/automations/triggerInfo/webhook.js rename to packages/server/src/automations/triggerInfo/webhook.ts index 56e139311c..762b871193 100644 --- a/packages/server/src/automations/triggerInfo/webhook.js +++ b/packages/server/src/automations/triggerInfo/webhook.ts @@ -1,10 +1,12 @@ -exports.definition = { +import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" + +export const definition: AutomationTrigger = { name: "Webhook", event: "web:trigger", icon: "Send", tagline: "Webhook endpoint is hit", description: "Trigger an automation when a HTTP POST webhook is hit", - stepId: "WEBHOOK", + stepId: AutomationTriggerStepId.WEBHOOK, inputs: {}, schema: { inputs: { diff --git a/packages/server/src/automations/triggers.js b/packages/server/src/automations/triggers.ts similarity index 77% rename from packages/server/src/automations/triggers.js rename to packages/server/src/automations/triggers.ts index 4f865d4df8..f4b34bc9e8 100644 --- a/packages/server/src/automations/triggers.js +++ b/packages/server/src/automations/triggers.ts @@ -1,16 +1,17 @@ -const emitter = require("../events/index") -const { getAutomationParams } = require("../db/utils") -const { coerce } = require("../utilities/rowProcessor") -const { definitions } = require("./triggerInfo") -const { isDevAppID } = require("../db/utils") +import emitter from "../events/index" +import { getAutomationParams } from "../db/utils" +import { coerce } from "../utilities/rowProcessor" +import { definitions } from "./triggerInfo" +import { isDevAppID } from "../db/utils" // need this to call directly, so we can get a response -const { automationQueue } = require("./bullboard") -const { checkTestFlag } = require("../utilities/redis") -const utils = require("./utils") -const env = require("../environment") -const { context, db: dbCore } = require("@budibase/backend-core") +import { automationQueue } from "./bullboard" +import { checkTestFlag } from "../utilities/redis" +import * as utils from "./utils" +import env from "../environment" +import { context, db as dbCore } from "@budibase/backend-core" +import { Automation, Row } from "@budibase/types" -const TRIGGER_DEFINITIONS = definitions +export const TRIGGER_DEFINITIONS = definitions const JOB_OPTS = { removeOnComplete: true, removeOnFail: true, @@ -24,12 +25,15 @@ async function getAllAutomations() { return automations.rows.map(row => row.doc) } -async function queueRelevantRowAutomations(event, eventType) { +async function queueRelevantRowAutomations( + event: { appId: string; row: Row }, + eventType: string +) { if (event.appId == null) { throw `No appId specified for ${eventType} - check event emitters.` } - context.doInAppContext(event.appId, async () => { + await context.doInAppContext(event.appId, async () => { let automations = await getAllAutomations() // filter down to the correct event type @@ -85,20 +89,20 @@ emitter.on("row:delete", async function (event) { await queueRelevantRowAutomations(event, "row:delete") }) -exports.externalTrigger = async function ( - automation, - params, - { getResponses } = {} +export async function externalTrigger( + automation: Automation, + params: { fields: Record }, + { getResponses }: { getResponses?: boolean } = {} ) { if ( automation.definition != null && automation.definition.trigger != null && automation.definition.trigger.stepId === definitions.APP.stepId && automation.definition.trigger.stepId === "APP" && - !(await checkTestFlag(automation._id)) + !(await checkTestFlag(automation._id!)) ) { // values are likely to be submitted as strings, so we shall convert to correct type - const coercedFields = {} + const coercedFields: any = {} const fields = automation.definition.trigger.inputs.fields for (let key of Object.keys(fields || {})) { coercedFields[key] = coerce(params.fields[key], fields[key]) @@ -113,7 +117,7 @@ exports.externalTrigger = async function ( } } -exports.rebootTrigger = async () => { +export async function rebootTrigger() { // reboot cron option is only available on the main thread at // startup and only usable in self host and single tenant environments if (env.isInThread() || !env.SELF_HOSTED || env.MULTI_TENANCY) { @@ -121,7 +125,10 @@ exports.rebootTrigger = async () => { } // iterate through all production apps, find the reboot crons // and trigger events for them - const appIds = await dbCore.getAllApps({ dev: false, idsOnly: true }) + const appIds = (await dbCore.getAllApps({ + dev: false, + idsOnly: true, + })) as string[] for (let prodAppId of appIds) { await context.doInAppContext(prodAppId, async () => { let automations = await getAllAutomations() @@ -142,5 +149,3 @@ exports.rebootTrigger = async () => { }) } } - -exports.TRIGGER_DEFINITIONS = TRIGGER_DEFINITIONS diff --git a/packages/server/src/environment.js b/packages/server/src/environment.ts similarity index 93% rename from packages/server/src/environment.js rename to packages/server/src/environment.ts index 72baab9167..d3b884c12c 100644 --- a/packages/server/src/environment.js +++ b/packages/server/src/environment.ts @@ -1,4 +1,4 @@ -const { join } = require("path") +import { join } from "path" function isTest() { return isCypress() || isJest() @@ -28,7 +28,7 @@ if (!LOADED && isDev() && !isTest()) { LOADED = true } -function parseIntSafe(number) { +function parseIntSafe(number?: string) { if (number) { return parseInt(number) } @@ -36,7 +36,7 @@ function parseIntSafe(number) { let inThread = false -module.exports = { +const environment = { // important - prefer app port to generic port PORT: process.env.APP_PORT || process.env.PORT, JWT_SECRET: process.env.JWT_SECRET, @@ -86,7 +86,7 @@ module.exports = { SELF_HOSTED: process.env.SELF_HOSTED, // old CLIENT_ID: process.env.CLIENT_ID, - _set(key, value) { + _set(key: string, value: any) { process.env[key] = value module.exports[key] = value }, @@ -108,13 +108,16 @@ module.exports = { // threading can cause memory issues with node-ts in development if (isDev() && module.exports.DISABLE_THREADING == null) { - module.exports._set("DISABLE_THREADING", "1") + environment._set("DISABLE_THREADING", "1") } // clean up any environment variable edge cases for (let [key, value] of Object.entries(module.exports)) { // handle the edge case of "0" to disable an environment variable if (value === "0") { - module.exports[key] = 0 + // @ts-ignore + environment[key] = 0 } } + +export = environment diff --git a/packages/server/src/utilities/workerRequests.ts b/packages/server/src/utilities/workerRequests.ts index b5554bbe6f..d1fd467025 100644 --- a/packages/server/src/utilities/workerRequests.ts +++ b/packages/server/src/utilities/workerRequests.ts @@ -62,7 +62,7 @@ export async function sendSmtpEmail( contents: string, cc: string, bcc: string, - automation: Automation + automation: boolean ) { // tenant ID will be set in header const response = await fetch( diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts index d7450e4b0d..ba718aa8d5 100644 --- a/packages/types/src/documents/app/automation.ts +++ b/packages/types/src/documents/app/automation.ts @@ -1,4 +1,5 @@ import { Document } from "../document" +import { EventEmitter } from "events" export enum AutomationTriggerStepId { ROW_SAVED = "ROW_SAVED", @@ -14,6 +15,7 @@ export enum AutomationActionStepId { CREATE_ROW = "CREATE_ROW", UPDATE_ROW = "UPDATE_ROW", DELETE_ROW = "DELETE_ROW", + EXECUTE_BASH = "EXECUTE_BASH", OUTGOING_WEBHOOK = "OUTGOING_WEBHOOK", EXECUTE_SCRIPT = "EXECUTE_SCRIPT", EXECUTE_QUERY = "EXECUTE_QUERY", @@ -40,7 +42,14 @@ export interface Automation extends Document { } export interface AutomationStep { - id: string + id?: string + name: string + tagline: string + icon: string + description: string + type: string + internal?: boolean + deprecated?: boolean stepId: AutomationTriggerStepId | AutomationActionStepId inputs: { [key: string]: any @@ -52,10 +61,12 @@ export interface AutomationStep { outputs: { [key: string]: any } + required?: string[] } } export interface AutomationTrigger extends AutomationStep { + event?: string cronJobId?: string } @@ -91,3 +102,10 @@ export interface AutomationLogPage { hasNextPage: boolean nextPage?: string } + +export type AutomationStepInput = { + inputs: Record + context: Record + emitter: EventEmitter + appId: string +} diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index c9eabdfdb4..c67679395f 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -26,7 +26,7 @@ function parseIntSafe(number: any) { } } -const env = { +const environment = { // auth MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY, MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY, @@ -77,8 +77,10 @@ const env = { } // if some var haven't been set, define them -if (!env.APPS_URL) { - env.APPS_URL = isDev() ? "http://localhost:4001" : "http://app-service:4002" +if (!environment.APPS_URL) { + environment.APPS_URL = isDev() + ? "http://localhost:4001" + : "http://app-service:4002" } // clean up any environment variable edge cases @@ -90,4 +92,4 @@ for (let [key, value] of Object.entries(module.exports)) { } } -export = env +export = environment From ea66f7ac380b426236e3c5a2288c0c8f2ccbb686 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Sat, 26 Nov 2022 14:46:01 +0000 Subject: [PATCH 076/179] Disabling js interop in Typescript build of backend-core and worker, fixing build issues. --- packages/backend-core/src/cache/index.ts | 1 + packages/backend-core/src/context/identity.ts | 13 +- packages/backend-core/src/context/index.ts | 226 +----------------- .../backend-core/src/context/mainContext.ts | 222 +++++++++++++++++ .../src/events/publishers/automation.ts | 16 +- .../backend-core/src/middleware/auditLog.ts | 2 +- .../src/middleware/authenticated.ts | 9 +- packages/backend-core/src/middleware/csrf.ts | 8 +- .../src/middleware/joi-validator.ts | 13 +- .../src/middleware/passport/oidc.ts | 8 +- .../src/middleware/passport/utils.ts | 4 +- .../backend-core/src/middleware/tenancy.ts | 10 +- packages/backend-core/tsconfig.build.json | 1 - packages/types/src/documents/global/config.ts | 10 + packages/types/tsconfig.build.json | 1 - .../worker/src/api/controllers/global/auth.ts | 22 +- .../src/api/controllers/global/configs.ts | 2 +- packages/worker/src/environment.ts | 2 +- packages/worker/tsconfig.build.json | 1 - 19 files changed, 296 insertions(+), 275 deletions(-) create mode 100644 packages/backend-core/src/context/mainContext.ts diff --git a/packages/backend-core/src/cache/index.ts b/packages/backend-core/src/cache/index.ts index 1b057aabd1..58928c271a 100644 --- a/packages/backend-core/src/cache/index.ts +++ b/packages/backend-core/src/cache/index.ts @@ -2,3 +2,4 @@ export * as generic from "./generic" export * as user from "./user" export * as app from "./appMetadata" export * as writethrough from "./writethrough" +export * from "./generic" diff --git a/packages/backend-core/src/context/identity.ts b/packages/backend-core/src/context/identity.ts index 2ae0372a8d..648dd1b5fd 100644 --- a/packages/backend-core/src/context/identity.ts +++ b/packages/backend-core/src/context/identity.ts @@ -2,22 +2,21 @@ import { IdentityContext, IdentityType, User, - UserContext, isCloudAccount, Account, AccountUserContext, } from "@budibase/types" import * as context from "." -export const getIdentity = (): IdentityContext | undefined => { +export function getIdentity(): IdentityContext | undefined { return context.getIdentity() } -export const doInIdentityContext = (identity: IdentityContext, task: any) => { +export function doInIdentityContext(identity: IdentityContext, task: any) { return context.doInIdentityContext(identity, task) } -export const doInUserContext = (user: User, task: any) => { +export function doInUserContext(user: User, task: any) { const userContext: any = { ...user, _id: user._id as string, @@ -26,7 +25,7 @@ export const doInUserContext = (user: User, task: any) => { return doInIdentityContext(userContext, task) } -export const doInAccountContext = (account: Account, task: any) => { +export function doInAccountContext(account: Account, task: any) { const _id = getAccountUserId(account) const tenantId = account.tenantId const accountContext: AccountUserContext = { @@ -38,12 +37,12 @@ export const doInAccountContext = (account: Account, task: any) => { return doInIdentityContext(accountContext, task) } -export const getAccountUserId = (account: Account) => { +export function getAccountUserId(account: Account) { let userId: string if (isCloudAccount(account)) { userId = account.budibaseUserId } else { - // use account id as user id for self hosting + // use account id as user id for self-hosting userId = account.accountId } return userId diff --git a/packages/backend-core/src/context/index.ts b/packages/backend-core/src/context/index.ts index ce37d4f0b4..9c70363170 100644 --- a/packages/backend-core/src/context/index.ts +++ b/packages/backend-core/src/context/index.ts @@ -1,223 +1,3 @@ -import env from "../environment" -import { - SEPARATOR, - DocumentType, - getDevelopmentAppID, - getProdAppID, - baseGlobalDBName, - getDB, -} from "../db" -import Context from "./Context" -import { IdentityContext, Database } from "@budibase/types" -import { DEFAULT_TENANT_ID as _DEFAULT_TENANT_ID } from "../constants" -import { ContextMap } from "./constants" -export const DEFAULT_TENANT_ID = _DEFAULT_TENANT_ID - -// some test cases call functions directly, need to -// store an app ID to pretend there is a context -let TEST_APP_ID: string | null = null - -export function isMultiTenant() { - return env.MULTI_TENANCY -} - -export function isTenantIdSet() { - const context = Context.get() - return !!context?.tenantId -} - -export function isTenancyEnabled() { - return env.MULTI_TENANCY -} - -/** - * Given an app ID this will attempt to retrieve the tenant ID from it. - * @return {null|string} The tenant ID found within the app ID. - */ -export function getTenantIDFromAppID(appId: string) { - if (!appId) { - return undefined - } - if (!isMultiTenant()) { - return DEFAULT_TENANT_ID - } - const split = appId.split(SEPARATOR) - const hasDev = split[1] === DocumentType.DEV - if ((hasDev && split.length === 3) || (!hasDev && split.length === 2)) { - return undefined - } - if (hasDev) { - return split[2] - } else { - return split[1] - } -} - -function updateContext(updates: ContextMap) { - let context: ContextMap - try { - context = Context.get() - } catch (err) { - // no context, start empty - context = {} - } - context = { - ...context, - ...updates, - } - return context -} - -async function newContext(updates: ContextMap, task: any) { - // see if there already is a context setup - let context: ContextMap = updateContext(updates) - return Context.run(context, task) -} - -export async function doInContext(appId: string, task: any): Promise { - const tenantId = getTenantIDFromAppID(appId) - return newContext( - { - tenantId, - appId, - }, - task - ) -} - -export async function doInTenant( - tenantId: string | null, - task: any -): Promise { - // make sure default always selected in single tenancy - if (!env.MULTI_TENANCY) { - tenantId = tenantId || DEFAULT_TENANT_ID - } - - const updates = tenantId ? { tenantId } : {} - return newContext(updates, task) -} - -export async function doInAppContext(appId: string, task: any): Promise { - if (!appId) { - throw new Error("appId is required") - } - - const tenantId = getTenantIDFromAppID(appId) - const updates: ContextMap = { appId } - if (tenantId) { - updates.tenantId = tenantId - } - return newContext(updates, task) -} - -export async function doInIdentityContext( - identity: IdentityContext, - task: any -): Promise { - if (!identity) { - throw new Error("identity is required") - } - - const context: ContextMap = { - identity, - } - if (identity.tenantId) { - context.tenantId = identity.tenantId - } - return newContext(context, task) -} - -export function getIdentity(): IdentityContext | undefined { - try { - const context = Context.get() - return context?.identity - } catch (e) { - // do nothing - identity is not in context - } -} - -export function getTenantId(): string { - if (!isMultiTenant()) { - return DEFAULT_TENANT_ID - } - const context = Context.get() - const tenantId = context?.tenantId - if (!tenantId) { - throw new Error("Tenant id not found") - } - return tenantId -} - -export function getAppId(): string | undefined { - const context = Context.get() - const foundId = context?.appId - if (!foundId && env.isTest() && TEST_APP_ID) { - return TEST_APP_ID - } else { - return foundId - } -} - -export function updateTenantId(tenantId?: string) { - let context: ContextMap = updateContext({ - tenantId, - }) - Context.set(context) -} - -export function updateAppId(appId: string) { - let context: ContextMap = updateContext({ - appId, - }) - try { - Context.set(context) - } catch (err) { - if (env.isTest()) { - TEST_APP_ID = appId - } else { - throw err - } - } -} - -export function getGlobalDB(): Database { - const context = Context.get() - if (!context || (env.MULTI_TENANCY && !context.tenantId)) { - throw new Error("Global DB not found") - } - return getDB(baseGlobalDBName(context?.tenantId)) -} - -/** - * Gets the app database based on whatever the request - * contained, dev or prod. - */ -export function getAppDB(opts?: any): Database { - const appId = getAppId() - return getDB(appId, opts) -} - -/** - * This specifically gets the prod app ID, if the request - * contained a development app ID, this will get the prod one. - */ -export function getProdAppDB(opts?: any): Database { - const appId = getAppId() - if (!appId) { - throw new Error("Unable to retrieve prod DB - no app ID.") - } - return getDB(getProdAppID(appId), opts) -} - -/** - * This specifically gets the dev app ID, if the request - * contained a prod app ID, this will get the dev one. - */ -export function getDevAppDB(opts?: any): Database { - const appId = getAppId() - if (!appId) { - throw new Error("Unable to retrieve dev DB - no app ID.") - } - return getDB(getDevelopmentAppID(appId), opts) -} +export { DEFAULT_TENANT_ID } from "../constants" +export * as identity from "./identity" +export * from "./mainContext" diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts new file mode 100644 index 0000000000..9fe8a016a6 --- /dev/null +++ b/packages/backend-core/src/context/mainContext.ts @@ -0,0 +1,222 @@ +// some test cases call functions directly, need to +// store an app ID to pretend there is a context +import env from "../environment" +import Context from "./Context" +import { + baseGlobalDBName, + DocumentType, + getDB, + getDevelopmentAppID, + getProdAppID, + SEPARATOR, +} from "../db" +import { ContextMap } from "./constants" +import { Database, IdentityContext } from "@budibase/types" +import { DEFAULT_TENANT_ID } from "./index" + +let TEST_APP_ID: string | null = null + +export function isMultiTenant() { + return env.MULTI_TENANCY +} + +export function isTenantIdSet() { + const context = Context.get() + return !!context?.tenantId +} + +export function isTenancyEnabled() { + return env.MULTI_TENANCY +} + +/** + * Given an app ID this will attempt to retrieve the tenant ID from it. + * @return {null|string} The tenant ID found within the app ID. + */ +export function getTenantIDFromAppID(appId: string) { + if (!appId) { + return undefined + } + if (!isMultiTenant()) { + return DEFAULT_TENANT_ID + } + const split = appId.split(SEPARATOR) + const hasDev = split[1] === DocumentType.DEV + if ((hasDev && split.length === 3) || (!hasDev && split.length === 2)) { + return undefined + } + if (hasDev) { + return split[2] + } else { + return split[1] + } +} + +function updateContext(updates: ContextMap) { + let context: ContextMap + try { + context = Context.get() + } catch (err) { + // no context, start empty + context = {} + } + context = { + ...context, + ...updates, + } + return context +} + +async function newContext(updates: ContextMap, task: any) { + // see if there already is a context setup + let context: ContextMap = updateContext(updates) + return Context.run(context, task) +} + +export async function doInContext(appId: string, task: any): Promise { + const tenantId = getTenantIDFromAppID(appId) + return newContext( + { + tenantId, + appId, + }, + task + ) +} + +export async function doInTenant( + tenantId: string | null, + task: any +): Promise { + // make sure default always selected in single tenancy + if (!env.MULTI_TENANCY) { + tenantId = tenantId || DEFAULT_TENANT_ID + } + + const updates = tenantId ? { tenantId } : {} + return newContext(updates, task) +} + +export async function doInAppContext(appId: string, task: any): Promise { + if (!appId) { + throw new Error("appId is required") + } + + const tenantId = getTenantIDFromAppID(appId) + const updates: ContextMap = { appId } + if (tenantId) { + updates.tenantId = tenantId + } + return newContext(updates, task) +} + +export async function doInIdentityContext( + identity: IdentityContext, + task: any +): Promise { + if (!identity) { + throw new Error("identity is required") + } + + const context: ContextMap = { + identity, + } + if (identity.tenantId) { + context.tenantId = identity.tenantId + } + return newContext(context, task) +} + +export function getIdentity(): IdentityContext | undefined { + try { + const context = Context.get() + return context?.identity + } catch (e) { + // do nothing - identity is not in context + } +} + +export function getTenantId(): string { + if (!isMultiTenant()) { + return DEFAULT_TENANT_ID + } + const context = Context.get() + const tenantId = context?.tenantId + if (!tenantId) { + throw new Error("Tenant id not found") + } + return tenantId +} + +export function getAppId(): string | undefined { + const context = Context.get() + const foundId = context?.appId + if (!foundId && env.isTest() && TEST_APP_ID) { + return TEST_APP_ID + } else { + return foundId + } +} + +export function updateTenantId(tenantId?: string) { + let context: ContextMap = updateContext({ + tenantId, + }) + Context.set(context) +} + +export function updateAppId(appId: string) { + let context: ContextMap = updateContext({ + appId, + }) + try { + Context.set(context) + } catch (err) { + if (env.isTest()) { + TEST_APP_ID = appId + } else { + throw err + } + } +} + +export function getGlobalDB(): Database { + const context = Context.get() + if (!context || (env.MULTI_TENANCY && !context.tenantId)) { + throw new Error("Global DB not found") + } + return getDB(baseGlobalDBName(context?.tenantId)) +} + +/** + * Gets the app database based on whatever the request + * contained, dev or prod. + */ +export function getAppDB(opts?: any): Database { + const appId = getAppId() + return getDB(appId, opts) +} + +/** + * This specifically gets the prod app ID, if the request + * contained a development app ID, this will get the prod one. + */ +export function getProdAppDB(opts?: any): Database { + const appId = getAppId() + if (!appId) { + throw new Error("Unable to retrieve prod DB - no app ID.") + } + return getDB(getProdAppID(appId), opts) +} + +/** + * This specifically gets the dev app ID, if the request + * contained a prod app ID, this will get the dev one. + */ +export function getDevAppDB(opts?: any): Database { + const appId = getAppId() + if (!appId) { + throw new Error("Unable to retrieve dev DB - no app ID.") + } + return getDB(getDevelopmentAppID(appId), opts) +} diff --git a/packages/backend-core/src/events/publishers/automation.ts b/packages/backend-core/src/events/publishers/automation.ts index 95f9cb8db6..5f4ce5a120 100644 --- a/packages/backend-core/src/events/publishers/automation.ts +++ b/packages/backend-core/src/events/publishers/automation.ts @@ -19,7 +19,7 @@ export async function created( const properties: AutomationCreatedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id, + triggerId: automation.definition?.trigger?.id!, triggerType: automation.definition?.trigger?.stepId, } await publishEvent(Event.AUTOMATION_CREATED, properties, timestamp) @@ -29,7 +29,7 @@ export async function triggerUpdated(automation: Automation) { const properties: AutomationTriggerUpdatedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id, + triggerId: automation.definition?.trigger?.id!, triggerType: automation.definition?.trigger?.stepId, } await publishEvent(Event.AUTOMATION_TRIGGER_UPDATED, properties) @@ -39,7 +39,7 @@ export async function deleted(automation: Automation) { const properties: AutomationDeletedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id, + triggerId: automation.definition?.trigger?.id!, triggerType: automation.definition?.trigger?.stepId, } await publishEvent(Event.AUTOMATION_DELETED, properties) @@ -49,7 +49,7 @@ export async function tested(automation: Automation) { const properties: AutomationTestedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id, + triggerId: automation.definition?.trigger?.id!, triggerType: automation.definition?.trigger?.stepId, } await publishEvent(Event.AUTOMATION_TESTED, properties) @@ -70,9 +70,9 @@ export async function stepCreated( const properties: AutomationStepCreatedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id, + triggerId: automation.definition?.trigger?.id!, triggerType: automation.definition?.trigger?.stepId, - stepId: step.id, + stepId: step.id!, stepType: step.stepId, } await publishEvent(Event.AUTOMATION_STEP_CREATED, properties, timestamp) @@ -85,9 +85,9 @@ export async function stepDeleted( const properties: AutomationStepDeletedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id, + triggerId: automation.definition?.trigger?.id!, triggerType: automation.definition?.trigger?.stepId, - stepId: step.id, + stepId: step.id!, stepType: step.stepId, } await publishEvent(Event.AUTOMATION_STEP_DELETED, properties) diff --git a/packages/backend-core/src/middleware/auditLog.ts b/packages/backend-core/src/middleware/auditLog.ts index 4f4e395856..a2c30ade8a 100644 --- a/packages/backend-core/src/middleware/auditLog.ts +++ b/packages/backend-core/src/middleware/auditLog.ts @@ -1,6 +1,6 @@ import { BBContext } from "@budibase/types" -export = async (ctx: BBContext, next: any) => { +export = async (ctx: BBContext | any, next: any) => { // Placeholder for audit log middleware return next() } diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts index 9a582abde2..525cc9d766 100644 --- a/packages/backend-core/src/middleware/authenticated.ts +++ b/packages/backend-core/src/middleware/authenticated.ts @@ -8,6 +8,7 @@ import { getGlobalDB, doInTenant } from "../tenancy" import { decrypt } from "../security/encryption" import * as identity from "../context/identity" import env from "../environment" +import { BBContext, EndpointMatcher } from "@budibase/types" const ONE_MINUTE = env.SESSION_UPDATE_PERIOD ? parseInt(env.SESSION_UPDATE_PERIOD) @@ -65,14 +66,14 @@ async function checkApiKey(apiKey: string, populateUser?: Function) { * The tenancy modules should not be used here and it should be assumed that the tenancy context * has not yet been populated. */ -export = ( - noAuthPatterns = [], +export = function ( + noAuthPatterns: EndpointMatcher[] = [], opts: { publicAllowed: boolean; populateUser?: Function } = { publicAllowed: false, } -) => { +) { const noAuthOptions = noAuthPatterns ? buildMatcherRegex(noAuthPatterns) : [] - return async (ctx: any, next: any) => { + return async (ctx: BBContext | any, next: any) => { let publicEndpoint = false const version = ctx.request.headers[Header.API_VER] // the path is not authenticated diff --git a/packages/backend-core/src/middleware/csrf.ts b/packages/backend-core/src/middleware/csrf.ts index d19dbd8aed..654ba47e07 100644 --- a/packages/backend-core/src/middleware/csrf.ts +++ b/packages/backend-core/src/middleware/csrf.ts @@ -1,6 +1,6 @@ import { Header } from "../constants" import { buildMatcherRegex, matches } from "./matchers" -import { BBContext } from "@budibase/types" +import { BBContext, EndpointMatcher } from "@budibase/types" /** * GET, HEAD and OPTIONS methods are considered safe operations @@ -32,9 +32,11 @@ const INCLUDED_CONTENT_TYPES = [ * https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#synchronizer-token-pattern * */ -export = (opts = { noCsrfPatterns: [] }) => { +export = function ( + opts: { noCsrfPatterns: EndpointMatcher[] } = { noCsrfPatterns: [] } +) { const noCsrfOptions = buildMatcherRegex(opts.noCsrfPatterns) - return async (ctx: BBContext, next: any) => { + return async (ctx: BBContext | any, next: any) => { // don't apply for excluded paths const found = matches(ctx, noCsrfOptions) if (found) { diff --git a/packages/backend-core/src/middleware/joi-validator.ts b/packages/backend-core/src/middleware/joi-validator.ts index d2b86fb4bc..fcc8316886 100644 --- a/packages/backend-core/src/middleware/joi-validator.ts +++ b/packages/backend-core/src/middleware/joi-validator.ts @@ -1,7 +1,10 @@ import Joi, { ObjectSchema } from "joi" import { BBContext } from "@budibase/types" -function validate(schema: Joi.ObjectSchema, property: string) { +function validate( + schema: Joi.ObjectSchema | Joi.ArraySchema, + property: string +) { // Return a Koa middleware function return (ctx: BBContext, next: any) => { if (!schema) { @@ -17,8 +20,8 @@ function validate(schema: Joi.ObjectSchema, property: string) { } // not all schemas have the append property e.g. array schemas - if (schema.append) { - schema = schema.append({ + if ((schema as Joi.ObjectSchema).append) { + schema = (schema as Joi.ObjectSchema).append({ createdAt: Joi.any().optional(), updatedAt: Joi.any().optional(), }) @@ -33,10 +36,10 @@ function validate(schema: Joi.ObjectSchema, property: string) { } } -export function body(schema: Joi.ObjectSchema) { +export function body(schema: Joi.ObjectSchema | Joi.ArraySchema) { return validate(schema, "body") } -export function params(schema: Joi.ObjectSchema) { +export function params(schema: Joi.ObjectSchema | Joi.ArraySchema) { return validate(schema, "params") } diff --git a/packages/backend-core/src/middleware/passport/oidc.ts b/packages/backend-core/src/middleware/passport/oidc.ts index 0131737a2c..27c3c647b7 100644 --- a/packages/backend-core/src/middleware/passport/oidc.ts +++ b/packages/backend-core/src/middleware/passport/oidc.ts @@ -8,6 +8,7 @@ import { Database, SSOProfile, ThirdPartyUser, + OIDCConfiguration, } from "@budibase/types" const OIDCStrategy = require("@techpass/passport-openidconnect").Strategy @@ -103,7 +104,10 @@ function validEmail(value: string) { * from couchDB rather than environment variables, using this factory is necessary for dynamically configuring passport. * @returns Dynamically configured Passport OIDC Strategy */ -export async function strategyFactory(config: Config, saveUserFn?: Function) { +export async function strategyFactory( + config: OIDCConfiguration, + saveUserFn?: Function +) { try { const verify = buildVerifyFn(saveUserFn) const strategy = new OIDCStrategy(config, verify) @@ -118,7 +122,7 @@ export async function strategyFactory(config: Config, saveUserFn?: Function) { export async function fetchStrategyConfig( enrichedConfig: OIDCInnerCfg, callbackUrl?: string -) { +): Promise { try { const { clientID, clientSecret, configUrl } = enrichedConfig diff --git a/packages/backend-core/src/middleware/passport/utils.ts b/packages/backend-core/src/middleware/passport/utils.ts index 79e1717d18..3d79aada28 100644 --- a/packages/backend-core/src/middleware/passport/utils.ts +++ b/packages/backend-core/src/middleware/passport/utils.ts @@ -20,8 +20,8 @@ export function authError(done: Function, message: string, err?: any) { export async function ssoCallbackUrl( db: Database, - config: { callbackURL?: string }, - type: ConfigType + config?: { callbackURL?: string }, + type?: ConfigType ) { // incase there is a callback URL from before if (config && config.callbackURL) { diff --git a/packages/backend-core/src/middleware/tenancy.ts b/packages/backend-core/src/middleware/tenancy.ts index 0aaacef139..78da2bb3e8 100644 --- a/packages/backend-core/src/middleware/tenancy.ts +++ b/packages/backend-core/src/middleware/tenancy.ts @@ -8,15 +8,15 @@ import { TenantResolutionStrategy, } from "@budibase/types" -const tenancy = ( +export = function ( allowQueryStringPatterns: EndpointMatcher[], noTenancyPatterns: EndpointMatcher[], - opts = { noTenancyRequired: false } -) => { + opts: { noTenancyRequired?: boolean } = { noTenancyRequired: false } +) { const allowQsOptions = buildMatcherRegex(allowQueryStringPatterns) const noTenancyOptions = buildMatcherRegex(noTenancyPatterns) - return async function (ctx: BBContext, next: any) { + return async function (ctx: BBContext | any, next: any) { const allowNoTenant = opts.noTenancyRequired || !!matches(ctx, noTenancyOptions) const tenantOpts: GetTenantIdOptions = { @@ -33,5 +33,3 @@ const tenancy = ( return doInTenant(tenantId, next) } } - -export = tenancy diff --git a/packages/backend-core/tsconfig.build.json b/packages/backend-core/tsconfig.build.json index f5b16eda1a..9682f3e32f 100644 --- a/packages/backend-core/tsconfig.build.json +++ b/packages/backend-core/tsconfig.build.json @@ -3,7 +3,6 @@ "target": "es6", "module": "commonjs", "lib": ["es2020"], - "allowJs": true, "strict": true, "noImplicitAny": true, "esModuleInterop": true, diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts index 5f050e0616..65a8b15589 100644 --- a/packages/types/src/documents/global/config.ts +++ b/packages/types/src/documents/global/config.ts @@ -31,6 +31,16 @@ export interface GoogleConfig extends Config { } } +export interface OIDCConfiguration { + issuer: string + authorizationURL: string + tokenURL: string + userInfoURL: string + clientID: string + clientSecret: string + callbackURL: string +} + export interface OIDCInnerCfg { configUrl: string clientID: string diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json index 9c92cdbd05..86f128c056 100644 --- a/packages/types/tsconfig.build.json +++ b/packages/types/tsconfig.build.json @@ -3,7 +3,6 @@ "target": "es6", "module": "commonjs", "lib": ["es2020"], - "allowJs": true, "strict": true, "noImplicitAny": true, "esModuleInterop": true, diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts index 0b34c9c3ef..b76200c1f7 100644 --- a/packages/worker/src/api/controllers/global/auth.ts +++ b/packages/worker/src/api/controllers/global/auth.ts @@ -1,26 +1,30 @@ -import { utils, constants, auth, db as dbCore } from "@budibase/backend-core" import { - events, - users as usersCore, + auth, + constants, context, + db as dbCore, + events, tenancy, + users as usersCore, + utils, } from "@budibase/backend-core" import { EmailTemplatePurpose } from "../../../constants" -import { sendEmail, isEmailConfigured } from "../../../utilities/email" +import { isEmailConfigured, sendEmail } from "../../../utilities/email" import { checkResetPasswordCode } from "../../../utilities/redis" import env from "../../../environment" import sdk from "../../../sdk" -import { User, Config, ConfigType } from "@budibase/types" +import { Config, ConfigType, User } from "@budibase/types" + const { setCookie, getCookie, clearCookie, hash, platformLogout } = utils const { Cookie, Header } = constants const { passport, ssoCallbackUrl, google, oidc } = auth -export async function googleCallbackUrl(config?: Config) { - return ssoCallbackUrl(tenancy.getGlobalDB(), config, "google") +export async function googleCallbackUrl(config?: { callbackURL?: string }) { + return ssoCallbackUrl(tenancy.getGlobalDB(), config, ConfigType.GOOGLE) } -export async function oidcCallbackUrl(config?: Config) { - return ssoCallbackUrl(tenancy.getGlobalDB(), config, "oidc") +export async function oidcCallbackUrl(config?: { callbackURL?: string }) { + return ssoCallbackUrl(tenancy.getGlobalDB(), config, ConfigType.OIDC) } async function authInternal(ctx: any, user: any, err = null, info = null) { diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index 236ab6bfa6..1c4e57f0e1 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -371,7 +371,7 @@ export async function destroy(ctx: BBContext) { const { id, rev } = ctx.params try { await db.remove(id, rev) - await cache.delete(cache.CacheKey.CHECKLIST) + await cache.destroy(cache.CacheKey.CHECKLIST) ctx.body = { message: "Config deleted successfully" } } catch (err: any) { ctx.throw(err.status, err) diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index 602f3b7cf3..84f8ba0a4d 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -85,7 +85,7 @@ if (!environment.APPS_URL) { } // clean up any environment variable edge cases -for (let [key, value] of Object.entries(env)) { +for (let [key, value] of Object.entries(environment)) { // handle the edge case of "0" to disable an environment variable if (value === "0") { // @ts-ignore diff --git a/packages/worker/tsconfig.build.json b/packages/worker/tsconfig.build.json index 8071b4ad00..7ba657367e 100644 --- a/packages/worker/tsconfig.build.json +++ b/packages/worker/tsconfig.build.json @@ -3,7 +3,6 @@ "target": "es6", "module": "commonjs", "lib": ["es2020"], - "allowJs": true, "strict": true, "noImplicitAny": true, "esModuleInterop": true, From 48680832080695a74438bee27cdbc83f92444fc4 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Sat, 26 Nov 2022 15:10:41 +0000 Subject: [PATCH 077/179] Fixes based on server build so far. --- .../src/events/publishers/automation.ts | 12 ++++++------ packages/server/src/api/controllers/integration.js | 14 -------------- packages/server/src/api/controllers/integration.ts | 13 +++++++++++++ packages/server/src/api/controllers/migrations.js | 13 ------------- packages/server/src/api/controllers/migrations.ts | 14 ++++++++++++++ .../src/api/controllers/row/ExternalRequest.ts | 8 ++++++-- .../src/api/controllers/row/staticFormula.ts | 4 ++-- .../server/src/api/controllers/table/external.ts | 2 +- packages/server/src/api/controllers/table/index.ts | 7 +++++-- packages/server/src/api/controllers/webhook.ts | 2 +- packages/server/src/api/index.ts | 4 ++-- packages/server/src/api/routes/integration.ts | 2 +- packages/server/src/app.ts | 2 +- packages/server/src/automations/actions.ts | 4 ++-- packages/server/src/automations/steps/bash.ts | 6 +++--- packages/server/src/automations/steps/createRow.ts | 4 ++-- packages/server/src/automations/steps/delay.ts | 4 ++-- packages/server/src/automations/steps/deleteRow.ts | 4 ++-- packages/server/src/automations/steps/discord.ts | 4 ++-- .../server/src/automations/steps/executeQuery.ts | 6 +++--- .../server/src/automations/steps/executeScript.ts | 6 +++--- packages/server/src/automations/steps/filter.ts | 4 ++-- .../server/src/automations/steps/integromat.ts | 4 ++-- packages/server/src/automations/steps/loop.ts | 4 ++-- .../src/automations/steps/outgoingWebhook.ts | 6 +++--- packages/server/src/automations/steps/queryRows.ts | 6 +++--- .../server/src/automations/steps/sendSmtpEmail.ts | 6 +++--- packages/server/src/automations/steps/serverLog.ts | 4 ++-- packages/server/src/automations/steps/slack.ts | 4 ++-- packages/server/src/automations/steps/updateRow.ts | 6 +++--- packages/server/src/automations/steps/zapier.ts | 4 ++-- packages/server/src/automations/triggerInfo/app.ts | 7 +++++-- .../server/src/automations/triggerInfo/cron.ts | 7 +++++-- .../server/src/automations/triggerInfo/index.ts | 12 ++++++------ .../src/automations/triggerInfo/rowDeleted.ts | 7 +++++-- .../server/src/automations/triggerInfo/rowSaved.ts | 7 +++++-- .../src/automations/triggerInfo/rowUpdated.ts | 7 +++++-- .../server/src/automations/triggerInfo/webhook.ts | 7 +++++-- .../server/src/db/linkedRows/LinkController.ts | 4 ++-- packages/server/src/db/linkedRows/index.ts | 2 +- packages/server/src/events/BudibaseEmitter.ts | 2 +- packages/server/src/integrations/googlesheets.ts | 1 + packages/server/src/integrations/utils.ts | 8 ++++++-- packages/server/src/startup.ts | 6 +++--- packages/server/src/threads/automation.ts | 6 +++--- packages/server/src/threads/utils.ts | 2 +- packages/server/src/utilities/csvParser.ts | 10 +++++----- .../server/src/utilities/rowProcessor/index.ts | 6 +++--- packages/server/src/utilities/rowProcessor/map.ts | 2 +- packages/types/src/documents/app/automation.ts | 13 ++++++++++--- 50 files changed, 168 insertions(+), 131 deletions(-) delete mode 100644 packages/server/src/api/controllers/integration.js create mode 100644 packages/server/src/api/controllers/integration.ts delete mode 100644 packages/server/src/api/controllers/migrations.js create mode 100644 packages/server/src/api/controllers/migrations.ts diff --git a/packages/backend-core/src/events/publishers/automation.ts b/packages/backend-core/src/events/publishers/automation.ts index 5f4ce5a120..8b2574b739 100644 --- a/packages/backend-core/src/events/publishers/automation.ts +++ b/packages/backend-core/src/events/publishers/automation.ts @@ -19,7 +19,7 @@ export async function created( const properties: AutomationCreatedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id!, + triggerId: automation.definition?.trigger?.id, triggerType: automation.definition?.trigger?.stepId, } await publishEvent(Event.AUTOMATION_CREATED, properties, timestamp) @@ -29,7 +29,7 @@ export async function triggerUpdated(automation: Automation) { const properties: AutomationTriggerUpdatedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id!, + triggerId: automation.definition?.trigger?.id, triggerType: automation.definition?.trigger?.stepId, } await publishEvent(Event.AUTOMATION_TRIGGER_UPDATED, properties) @@ -39,7 +39,7 @@ export async function deleted(automation: Automation) { const properties: AutomationDeletedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id!, + triggerId: automation.definition?.trigger?.id, triggerType: automation.definition?.trigger?.stepId, } await publishEvent(Event.AUTOMATION_DELETED, properties) @@ -49,7 +49,7 @@ export async function tested(automation: Automation) { const properties: AutomationTestedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id!, + triggerId: automation.definition?.trigger?.id, triggerType: automation.definition?.trigger?.stepId, } await publishEvent(Event.AUTOMATION_TESTED, properties) @@ -70,7 +70,7 @@ export async function stepCreated( const properties: AutomationStepCreatedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id!, + triggerId: automation.definition?.trigger?.id, triggerType: automation.definition?.trigger?.stepId, stepId: step.id!, stepType: step.stepId, @@ -85,7 +85,7 @@ export async function stepDeleted( const properties: AutomationStepDeletedEvent = { appId: automation.appId, automationId: automation._id as string, - triggerId: automation.definition?.trigger?.id!, + triggerId: automation.definition?.trigger?.id, triggerType: automation.definition?.trigger?.stepId, stepId: step.id!, stepType: step.stepId, diff --git a/packages/server/src/api/controllers/integration.js b/packages/server/src/api/controllers/integration.js deleted file mode 100644 index 2f11ec19ed..0000000000 --- a/packages/server/src/api/controllers/integration.js +++ /dev/null @@ -1,14 +0,0 @@ -const { getDefinitions } = require("../../integrations") - -exports.fetch = async function (ctx) { - ctx.status = 200 - const defs = await getDefinitions() - - ctx.body = defs -} - -exports.find = async function (ctx) { - const defs = await getDefinitions() - ctx.status = 200 - ctx.body = defs[ctx.params.type] -} diff --git a/packages/server/src/api/controllers/integration.ts b/packages/server/src/api/controllers/integration.ts new file mode 100644 index 0000000000..743d216da7 --- /dev/null +++ b/packages/server/src/api/controllers/integration.ts @@ -0,0 +1,13 @@ +import { getDefinitions } from "../../integrations" +import { BBContext } from "@budibase/types" + +export async function fetch(ctx: BBContext) { + ctx.status = 200 + ctx.body = await getDefinitions() +} + +export async function find(ctx: BBContext) { + const defs = await getDefinitions() + ctx.status = 200 + ctx.body = defs[ctx.params.type] +} diff --git a/packages/server/src/api/controllers/migrations.js b/packages/server/src/api/controllers/migrations.js deleted file mode 100644 index 6a890349c3..0000000000 --- a/packages/server/src/api/controllers/migrations.js +++ /dev/null @@ -1,13 +0,0 @@ -const { migrate, MIGRATIONS } = require("../../migrations") - -exports.migrate = async ctx => { - const options = ctx.request.body - // don't await as can take a while, just return - migrate(options) - ctx.status = 200 -} - -exports.fetchDefinitions = async ctx => { - ctx.body = MIGRATIONS - ctx.status = 200 -} diff --git a/packages/server/src/api/controllers/migrations.ts b/packages/server/src/api/controllers/migrations.ts new file mode 100644 index 0000000000..8f1bfa22db --- /dev/null +++ b/packages/server/src/api/controllers/migrations.ts @@ -0,0 +1,14 @@ +import { migrate as migrationImpl, MIGRATIONS } from "../../migrations" +import { BBContext } from "@budibase/types" + +export async function migrate(ctx: BBContext) { + const options = ctx.request.body + // don't await as can take a while, just return + migrationImpl(options) + ctx.status = 200 +} + +export async function fetchDefinitions(ctx: BBContext) { + ctx.body = MIGRATIONS + ctx.status = 200 +} diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts index 2ef7953437..bd012d61b5 100644 --- a/packages/server/src/api/controllers/row/ExternalRequest.ts +++ b/packages/server/src/api/controllers/row/ExternalRequest.ts @@ -209,12 +209,16 @@ module External { } class ExternalRequest { - private operation: Operation + private operation: DataSourceOperation private tableId: string private datasource: Datasource private tables: { [key: string]: Table } = {} - constructor(operation: Operation, tableId: string, datasource: Datasource) { + constructor( + operation: DataSourceOperation, + tableId: string, + datasource: Datasource + ) { this.operation = operation this.tableId = tableId this.datasource = datasource diff --git a/packages/server/src/api/controllers/row/staticFormula.ts b/packages/server/src/api/controllers/row/staticFormula.ts index ee09264af1..7d97d7e466 100644 --- a/packages/server/src/api/controllers/row/staticFormula.ts +++ b/packages/server/src/api/controllers/row/staticFormula.ts @@ -122,9 +122,9 @@ export async function finaliseRow( const db = context.getAppDB() row.type = "row" // process the row before return, to include relationships - let enrichedRow = await outputProcessing(table, cloneDeep(row), { + let enrichedRow = (await outputProcessing(table, cloneDeep(row), { squash: false, - }) + })) as Row // use enriched row to generate formulas for saving, specifically only use as context row = processFormulas(table, row, { dynamic: false, diff --git a/packages/server/src/api/controllers/table/external.ts b/packages/server/src/api/controllers/table/external.ts index 8fd227e633..b79ab45660 100644 --- a/packages/server/src/api/controllers/table/external.ts +++ b/packages/server/src/api/controllers/table/external.ts @@ -14,7 +14,7 @@ import { RelationshipTypes, } from "../../../constants" import { makeExternalQuery } from "../../../integrations/base/query" -import csvParser from "../../../utilities/csvParser" +import * as csvParser from "../../../utilities/csvParser" import { handleRequest } from "../row/external" import { events, context } from "@budibase/backend-core" import { diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts index 5d8ab5be3e..0df974adc4 100644 --- a/packages/server/src/api/controllers/table/index.ts +++ b/packages/server/src/api/controllers/table/index.ts @@ -1,6 +1,6 @@ import * as internal from "./internal" import * as external from "./external" -import csvParser from "../../../utilities/csvParser" +import * as csvParser from "../../../utilities/csvParser" import { isExternalTable, isSQL } from "../../../integrations/utils" import { getDatasourceParams } from "../../../db/utils" import { context, events } from "@budibase/backend-core" @@ -103,7 +103,10 @@ export async function validateCSVSchema(ctx: BBContext) { if (tableId) { existingTable = await sdk.tables.getTable(tableId) } - let result = await csvParser.parse(csvString, schema) + let result: Record | undefined = await csvParser.parse( + csvString, + schema + ) if (existingTable) { result = csvParser.updateSchema({ schema: result, existingTable }) } diff --git a/packages/server/src/api/controllers/webhook.ts b/packages/server/src/api/controllers/webhook.ts index 26bf16bd4c..f877110646 100644 --- a/packages/server/src/api/controllers/webhook.ts +++ b/packages/server/src/api/controllers/webhook.ts @@ -1,5 +1,5 @@ import { getWebhookParams } from "../../db/utils" -import triggers from "../../automations/triggers" +import * as triggers from "../../automations/triggers" import { db as dbCore, context } from "@budibase/backend-core" import { Webhook, diff --git a/packages/server/src/api/index.ts b/packages/server/src/api/index.ts index a77fc62b9b..3375161dd8 100644 --- a/packages/server/src/api/index.ts +++ b/packages/server/src/api/index.ts @@ -37,7 +37,7 @@ router // re-direct before any middlewares occur .redirect("/", "/builder") .use( - auth.buildAuthMiddleware(null, { + auth.buildAuthMiddleware([], { publicAllowed: true, }) ) @@ -45,7 +45,7 @@ router // the server can be public anywhere, so nowhere should throw errors // if the tenancy has not been set, it'll have to be discovered at application layer .use( - auth.buildTenancyMiddleware(null, null, { + auth.buildTenancyMiddleware([], [], { noTenancyRequired: true, }) ) diff --git a/packages/server/src/api/routes/integration.ts b/packages/server/src/api/routes/integration.ts index 835cc5a896..b21915a6d1 100644 --- a/packages/server/src/api/routes/integration.ts +++ b/packages/server/src/api/routes/integration.ts @@ -1,5 +1,5 @@ import Router from "@koa/router" -import controller from "../controllers/integration" +import * as controller from "../controllers/integration" import authorized from "../../middleware/authorized" import { permissions } from "@budibase/backend-core" diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts index 8a9c1d5b24..9010bf87f3 100644 --- a/packages/server/src/app.ts +++ b/packages/server/src/app.ts @@ -10,7 +10,7 @@ if (process.env.ELASTIC_APM_ENABLED) { } import { ExtendableContext } from "koa" -import db from "./db" +import * as db from "./db" db.init() const Koa = require("koa") const destroyable = require("server-destroy") diff --git a/packages/server/src/automations/actions.ts b/packages/server/src/automations/actions.ts index 7c1ef719f7..456399bc68 100644 --- a/packages/server/src/automations/actions.ts +++ b/packages/server/src/automations/actions.ts @@ -15,7 +15,7 @@ import * as delay from "./steps/delay" import * as queryRow from "./steps/queryRows" import * as loop from "./steps/loop" import env from "../environment" -import { AutomationStep, AutomationStepInput } from "@budibase/types" +import { AutomationStepSchema, AutomationStepInput } from "@budibase/types" const ACTION_IMPLS: Record< string, @@ -38,7 +38,7 @@ const ACTION_IMPLS: Record< zapier: zapier.run, integromat: integromat.run, } -export const ACTION_DEFINITIONS: Record = { +export const ACTION_DEFINITIONS: Record = { SEND_EMAIL_SMTP: sendSmtpEmail.definition, CREATE_ROW: createRow.definition, UPDATE_ROW: updateRow.definition, diff --git a/packages/server/src/automations/steps/bash.ts b/packages/server/src/automations/steps/bash.ts index 5bdf482e70..e6deb8c38f 100644 --- a/packages/server/src/automations/steps/bash.ts +++ b/packages/server/src/automations/steps/bash.ts @@ -1,14 +1,14 @@ import { execSync } from "child_process" import { processStringSync } from "@budibase/string-templates" -import automationUtils from "../automationUtils" +import * as automationUtils from "../automationUtils" import environment from "../../environment" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "Bash Scripting", tagline: "Execute a bash command", icon: "JourneyEvent", diff --git a/packages/server/src/automations/steps/createRow.ts b/packages/server/src/automations/steps/createRow.ts index a8a139e11c..d529127360 100644 --- a/packages/server/src/automations/steps/createRow.ts +++ b/packages/server/src/automations/steps/createRow.ts @@ -3,11 +3,11 @@ import { cleanUpRow, getError } from "../automationUtils" import { buildCtx } from "./utils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "Create Row", tagline: "Create a {{inputs.enriched.table.name}} row", icon: "TableRowAddBottom", diff --git a/packages/server/src/automations/steps/delay.ts b/packages/server/src/automations/steps/delay.ts index 17a07d5699..58ca383ac1 100644 --- a/packages/server/src/automations/steps/delay.ts +++ b/packages/server/src/automations/steps/delay.ts @@ -1,11 +1,11 @@ import { wait } from "../../utilities" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "Delay", icon: "Clock", tagline: "Delay for {{inputs.time}} milliseconds", diff --git a/packages/server/src/automations/steps/deleteRow.ts b/packages/server/src/automations/steps/deleteRow.ts index 92978987b2..540d95b94d 100644 --- a/packages/server/src/automations/steps/deleteRow.ts +++ b/packages/server/src/automations/steps/deleteRow.ts @@ -3,11 +3,11 @@ import { buildCtx } from "./utils" import { getError } from "../automationUtils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { description: "Delete a row from your database", icon: "TableRowRemoveCenter", name: "Delete Row", diff --git a/packages/server/src/automations/steps/discord.ts b/packages/server/src/automations/steps/discord.ts index 75899961a6..ae484fa42e 100644 --- a/packages/server/src/automations/steps/discord.ts +++ b/packages/server/src/automations/steps/discord.ts @@ -2,14 +2,14 @@ import fetch from "node-fetch" import { getFetchResponse } from "./utils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" const DEFAULT_USERNAME = "Budibase Automate" const DEFAULT_AVATAR_URL = "https://i.imgur.com/a1cmTKM.png" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "Discord Message", tagline: "Send a message to a Discord server", description: "Send a message to a Discord server", diff --git a/packages/server/src/automations/steps/executeQuery.ts b/packages/server/src/automations/steps/executeQuery.ts index d4408441dd..72fb69b96c 100644 --- a/packages/server/src/automations/steps/executeQuery.ts +++ b/packages/server/src/automations/steps/executeQuery.ts @@ -1,13 +1,13 @@ import * as queryController from "../../api/controllers/query" import { buildCtx } from "./utils" -import automationUtils from "../automationUtils" +import * as automationUtils from "../automationUtils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "External Data Connector", tagline: "Execute Data Connector", icon: "Data", diff --git a/packages/server/src/automations/steps/executeScript.ts b/packages/server/src/automations/steps/executeScript.ts index 05e4c9a196..84bdb0e2d5 100644 --- a/packages/server/src/automations/steps/executeScript.ts +++ b/packages/server/src/automations/steps/executeScript.ts @@ -1,13 +1,13 @@ import * as scriptController from "../../api/controllers/script" import { buildCtx } from "./utils" -import automationUtils from "../automationUtils" +import * as automationUtils from "../automationUtils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "JS Scripting", tagline: "Execute JavaScript Code", icon: "Code", diff --git a/packages/server/src/automations/steps/filter.ts b/packages/server/src/automations/steps/filter.ts index 9eeaefd69d..18914ddca6 100644 --- a/packages/server/src/automations/steps/filter.ts +++ b/packages/server/src/automations/steps/filter.ts @@ -1,6 +1,6 @@ import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" @@ -18,7 +18,7 @@ export const PrettyFilterConditions = { [FilterConditions.LESS_THAN]: "Less than", } -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "Condition", tagline: "{{inputs.field}} {{inputs.condition}} {{inputs.value}}", icon: "Branch2", diff --git a/packages/server/src/automations/steps/integromat.ts b/packages/server/src/automations/steps/integromat.ts index 9677d3e06a..dd897b5429 100644 --- a/packages/server/src/automations/steps/integromat.ts +++ b/packages/server/src/automations/steps/integromat.ts @@ -2,11 +2,11 @@ import fetch from "node-fetch" import { getFetchResponse } from "./utils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "Integromat Integration", tagline: "Trigger an Integromat scenario", description: diff --git a/packages/server/src/automations/steps/loop.ts b/packages/server/src/automations/steps/loop.ts index 552d6df6e7..72087ae357 100644 --- a/packages/server/src/automations/steps/loop.ts +++ b/packages/server/src/automations/steps/loop.ts @@ -1,6 +1,6 @@ -import { AutomationActionStepId, AutomationStep } from "@budibase/types" +import { AutomationActionStepId, AutomationStepSchema } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "Looping", icon: "Reuse", tagline: "Loop the block", diff --git a/packages/server/src/automations/steps/outgoingWebhook.ts b/packages/server/src/automations/steps/outgoingWebhook.ts index 42eb0342b0..ea1ffeb339 100644 --- a/packages/server/src/automations/steps/outgoingWebhook.ts +++ b/packages/server/src/automations/steps/outgoingWebhook.ts @@ -1,9 +1,9 @@ import fetch from "node-fetch" import { getFetchResponse } from "./utils" -import automationUtils from "../automationUtils" +import * as automationUtils from "../automationUtils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" @@ -21,7 +21,7 @@ const BODY_REQUESTS = [RequestType.POST, RequestType.PUT, RequestType.PATCH] * NOTE: this functionality is deprecated - it no longer should be used. */ -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { deprecated: true, name: "Outgoing webhook", tagline: "Send a {{inputs.requestMethod}} request", diff --git a/packages/server/src/automations/steps/queryRows.ts b/packages/server/src/automations/steps/queryRows.ts index 1c9d1f54e0..6de518e931 100644 --- a/packages/server/src/automations/steps/queryRows.ts +++ b/packages/server/src/automations/steps/queryRows.ts @@ -2,10 +2,10 @@ import * as rowController from "../../api/controllers/row" import * as tableController from "../../api/controllers/table" import { FieldTypes } from "../../constants" import { buildCtx } from "./utils" -import automationUtils from "../automationUtils" +import * as automationUtils from "../automationUtils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, SearchFilters, Table, @@ -31,7 +31,7 @@ const EmptyFilterOptionPretty = { [EmptyFilterOption.RETURN_NONE]: "Return no rows", } -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { description: "Query rows from the database", icon: "Search", name: "Query rows", diff --git a/packages/server/src/automations/steps/sendSmtpEmail.ts b/packages/server/src/automations/steps/sendSmtpEmail.ts index a2680a05cb..67516c803d 100644 --- a/packages/server/src/automations/steps/sendSmtpEmail.ts +++ b/packages/server/src/automations/steps/sendSmtpEmail.ts @@ -1,12 +1,12 @@ import { sendSmtpEmail } from "../../utilities/workerRequests" -import automationUtils from "../automationUtils" +import * as automationUtils from "../automationUtils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { description: "Send an email using SMTP", tagline: "Send SMTP email to {{inputs.to}}", icon: "Email", diff --git a/packages/server/src/automations/steps/serverLog.ts b/packages/server/src/automations/steps/serverLog.ts index 04eba3e6d4..bb2f49ede8 100644 --- a/packages/server/src/automations/steps/serverLog.ts +++ b/packages/server/src/automations/steps/serverLog.ts @@ -1,6 +1,6 @@ import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" @@ -10,7 +10,7 @@ import { * GET/DELETE requests cannot handle body elements so they will not be sent if configured. */ -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "Backend log", tagline: "Console log a value in the backend", icon: "Monitoring", diff --git a/packages/server/src/automations/steps/slack.ts b/packages/server/src/automations/steps/slack.ts index ddd26c98e2..47c66bebf3 100644 --- a/packages/server/src/automations/steps/slack.ts +++ b/packages/server/src/automations/steps/slack.ts @@ -2,11 +2,11 @@ import fetch from "node-fetch" import { getFetchResponse } from "./utils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "Slack Message", tagline: "Send a message to Slack", description: "Send a message to Slack", diff --git a/packages/server/src/automations/steps/updateRow.ts b/packages/server/src/automations/steps/updateRow.ts index ed8e8a02ee..953313986e 100644 --- a/packages/server/src/automations/steps/updateRow.ts +++ b/packages/server/src/automations/steps/updateRow.ts @@ -1,13 +1,13 @@ import * as rowController from "../../api/controllers/row" -import automationUtils from "../automationUtils" +import * as automationUtils from "../automationUtils" import { buildCtx } from "./utils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "Update Row", tagline: "Update a {{inputs.enriched.table.name}} row", icon: "Refresh", diff --git a/packages/server/src/automations/steps/zapier.ts b/packages/server/src/automations/steps/zapier.ts index 96bc90c4d0..1a48c1ec92 100644 --- a/packages/server/src/automations/steps/zapier.ts +++ b/packages/server/src/automations/steps/zapier.ts @@ -2,11 +2,11 @@ import fetch from "node-fetch" import { getFetchResponse } from "./utils" import { AutomationActionStepId, - AutomationStep, + AutomationStepSchema, AutomationStepInput, } from "@budibase/types" -export const definition: AutomationStep = { +export const definition: AutomationStepSchema = { name: "Zapier Webhook", stepId: AutomationActionStepId.zapier, type: "ACTION", diff --git a/packages/server/src/automations/triggerInfo/app.ts b/packages/server/src/automations/triggerInfo/app.ts index fe1413e88e..fca9acaef8 100644 --- a/packages/server/src/automations/triggerInfo/app.ts +++ b/packages/server/src/automations/triggerInfo/app.ts @@ -1,6 +1,9 @@ -import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" +import { + AutomationTriggerSchema, + AutomationTriggerStepId, +} from "@budibase/types" -export const definition: AutomationTrigger = { +export const definition: AutomationTriggerSchema = { name: "App Action", event: "app:trigger", icon: "Apps", diff --git a/packages/server/src/automations/triggerInfo/cron.ts b/packages/server/src/automations/triggerInfo/cron.ts index fc40d33683..91b41f7243 100644 --- a/packages/server/src/automations/triggerInfo/cron.ts +++ b/packages/server/src/automations/triggerInfo/cron.ts @@ -1,6 +1,9 @@ -import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" +import { + AutomationTriggerSchema, + AutomationTriggerStepId, +} from "@budibase/types" -export const definition: AutomationTrigger = { +export const definition: AutomationTriggerSchema = { name: "Cron Trigger", event: "cron:trigger", icon: "Clock", diff --git a/packages/server/src/automations/triggerInfo/index.ts b/packages/server/src/automations/triggerInfo/index.ts index 50089c98e9..b35d915ea8 100644 --- a/packages/server/src/automations/triggerInfo/index.ts +++ b/packages/server/src/automations/triggerInfo/index.ts @@ -1,9 +1,9 @@ -import app from "./app" -import cron from "./cron" -import rowDeleted from "./rowDeleted" -import rowSaved from "./rowSaved" -import rowUpdated from "./rowUpdated" -import webhook from "./webhook" +import * as app from "./app" +import * as cron from "./cron" +import * as rowDeleted from "./rowDeleted" +import * as rowSaved from "./rowSaved" +import * as rowUpdated from "./rowUpdated" +import * as webhook from "./webhook" export const definitions = { ROW_SAVED: rowSaved.definition, diff --git a/packages/server/src/automations/triggerInfo/rowDeleted.ts b/packages/server/src/automations/triggerInfo/rowDeleted.ts index ab238800ea..de4a1b0412 100644 --- a/packages/server/src/automations/triggerInfo/rowDeleted.ts +++ b/packages/server/src/automations/triggerInfo/rowDeleted.ts @@ -1,6 +1,9 @@ -import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" +import { + AutomationTriggerSchema, + AutomationTriggerStepId, +} from "@budibase/types" -export const definition: AutomationTrigger = { +export const definition: AutomationTriggerSchema = { name: "Row Deleted", event: "row:delete", icon: "TableRowRemoveCenter", diff --git a/packages/server/src/automations/triggerInfo/rowSaved.ts b/packages/server/src/automations/triggerInfo/rowSaved.ts index 55cf60c594..c1dde25eef 100644 --- a/packages/server/src/automations/triggerInfo/rowSaved.ts +++ b/packages/server/src/automations/triggerInfo/rowSaved.ts @@ -1,6 +1,9 @@ -import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" +import { + AutomationTriggerSchema, + AutomationTriggerStepId, +} from "@budibase/types" -export const definition: AutomationTrigger = { +export const definition: AutomationTriggerSchema = { name: "Row Created", event: "row:save", icon: "TableRowAddBottom", diff --git a/packages/server/src/automations/triggerInfo/rowUpdated.ts b/packages/server/src/automations/triggerInfo/rowUpdated.ts index 6cc6d303c9..1bc8811d54 100644 --- a/packages/server/src/automations/triggerInfo/rowUpdated.ts +++ b/packages/server/src/automations/triggerInfo/rowUpdated.ts @@ -1,6 +1,9 @@ -import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" +import { + AutomationTriggerSchema, + AutomationTriggerStepId, +} from "@budibase/types" -export const definition: AutomationTrigger = { +export const definition: AutomationTriggerSchema = { name: "Row Updated", event: "row:update", icon: "Refresh", diff --git a/packages/server/src/automations/triggerInfo/webhook.ts b/packages/server/src/automations/triggerInfo/webhook.ts index 762b871193..906967a02a 100644 --- a/packages/server/src/automations/triggerInfo/webhook.ts +++ b/packages/server/src/automations/triggerInfo/webhook.ts @@ -1,6 +1,9 @@ -import { AutomationTrigger, AutomationTriggerStepId } from "@budibase/types" +import { + AutomationTriggerSchema, + AutomationTriggerStepId, +} from "@budibase/types" -export const definition: AutomationTrigger = { +export const definition: AutomationTriggerSchema = { name: "Webhook", event: "web:trigger", icon: "Send", diff --git a/packages/server/src/db/linkedRows/LinkController.ts b/packages/server/src/db/linkedRows/LinkController.ts index fc28137f58..690abc1feb 100644 --- a/packages/server/src/db/linkedRows/LinkController.ts +++ b/packages/server/src/db/linkedRows/LinkController.ts @@ -13,7 +13,7 @@ import { } from "@budibase/types" type LinkControllerOpts = { - tableId: string + tableId?: string row?: Row table?: Table oldTable?: Table @@ -21,7 +21,7 @@ type LinkControllerOpts = { class LinkController { _db: Database - _tableId: string + _tableId?: string _row?: Row _table?: Table _oldTable?: Table diff --git a/packages/server/src/db/linkedRows/index.ts b/packages/server/src/db/linkedRows/index.ts index 1559e644af..a6ed7de161 100644 --- a/packages/server/src/db/linkedRows/index.ts +++ b/packages/server/src/db/linkedRows/index.ts @@ -100,7 +100,7 @@ async function getFullLinkedDocs(links: LinkDocumentValue[]) { * row operations and the table for table operations. */ export async function updateLinks(args: { - tableId: string + tableId?: string eventType: string row?: Row table?: Table diff --git a/packages/server/src/events/BudibaseEmitter.ts b/packages/server/src/events/BudibaseEmitter.ts index b31fa36df7..8eb7bffd96 100644 --- a/packages/server/src/events/BudibaseEmitter.ts +++ b/packages/server/src/events/BudibaseEmitter.ts @@ -21,7 +21,7 @@ class BudibaseEmitter extends EventEmitter { tableEmission({ emitter: this, eventName, appId, table }) } - emitPort(portNumber: number) { + emitPort(portNumber?: number | string) { this.emit("internal:port", portNumber) } } diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts index 3e17df4076..84c2deaa57 100644 --- a/packages/server/src/integrations/googlesheets.ts +++ b/packages/server/src/integrations/googlesheets.ts @@ -266,6 +266,7 @@ class GoogleSheetsIntegration implements DatasourcePlus { this.deleteTable(json?.table?.name), } + // @ts-ignore const internalQueryMethod = handlers[json.endpoint.operation] return await internalQueryMethod() diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts index 287783eec6..1861cc9662 100644 --- a/packages/server/src/integrations/utils.ts +++ b/packages/server/src/integrations/utils.ts @@ -230,7 +230,7 @@ function shouldCopySpecialColumn( const fetchedIsNumber = !fetchedColumn || fetchedColumn.type === FieldTypes.NUMBER return ( - specialTypes.indexOf(column.type) !== -1 || + specialTypes.indexOf(column.type as FieldTypes) !== -1 || (fetchedIsNumber && column.type === FieldTypes.BOOLEAN) ) } @@ -292,7 +292,11 @@ export function finaliseExternalTables( if (table.primary == null || table.primary.length === 0) { errors[name] = BuildSchemaErrors.NO_KEY continue - } else if (schemaFields.find(field => invalidColumns.includes(field))) { + } else if ( + schemaFields.find(field => + invalidColumns.includes(field as InvalidColumns) + ) + ) { errors[name] = BuildSchemaErrors.INVALID_COLUMN continue } diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts index 53fcf3ebef..50c1122cef 100644 --- a/packages/server/src/startup.ts +++ b/packages/server/src/startup.ts @@ -13,11 +13,11 @@ import { } from "@budibase/backend-core" import fs from "fs" import { watch } from "./watch" -import automations from "./automations" -import fileSystem from "./utilities/fileSystem" +import * as automations from "./automations" +import * as fileSystem from "./utilities/fileSystem" import eventEmitter from "./events" import * as migrations from "./migrations" -import bullboard from "./automations/bullboard" +import * as bullboard from "./automations/bullboard" import * as pro from "@budibase/pro" import * as api from "./api" import sdk from "./sdk" diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts index 5e2817ed06..8b343cdf8e 100644 --- a/packages/server/src/threads/automation.ts +++ b/packages/server/src/threads/automation.ts @@ -6,8 +6,8 @@ import { disableCronById, isErrorInOutput, } from "../automations/utils" -import { default as actions } from "../automations/actions" -import { default as automationUtils } from "../automations/automationUtils" +import * as actions from "../automations/actions" +import * as automationUtils from "../automations/automationUtils" import { default as AutomationEmitter } from "../events/AutomationEmitter" import { generateAutomationMetadataID, isProdAppID } from "../db/utils" import { definitions as triggerDefs } from "../automations/triggerInfo" @@ -335,7 +335,7 @@ class Orchestrator { )) { originalStepInput[key][innerKey][innerObject] = automationUtils.substituteLoopStep( - innerValue, + innerValue as string, `steps.${loopStepNumber}` ) } diff --git a/packages/server/src/threads/utils.ts b/packages/server/src/threads/utils.ts index 53120160a8..5caaeb83d7 100644 --- a/packages/server/src/threads/utils.ts +++ b/packages/server/src/threads/utils.ts @@ -1,6 +1,6 @@ import { QueryVariable } from "./definitions" import env from "../environment" -import db from "../db" +import * as db from "../db" import { redis, db as dbCore } from "@budibase/backend-core" const VARIABLE_TTL_SECONDS = 3600 diff --git a/packages/server/src/utilities/csvParser.ts b/packages/server/src/utilities/csvParser.ts index 85e4b1e8e5..0c138abc3e 100644 --- a/packages/server/src/utilities/csvParser.ts +++ b/packages/server/src/utilities/csvParser.ts @@ -8,7 +8,7 @@ type CsvParseOpts = { csvString?: string } -const VALIDATORS = { +const VALIDATORS: any = { [FieldTypes.STRING]: () => true, [FieldTypes.OPTIONS]: () => true, [FieldTypes.BARCODEQR]: () => true, @@ -28,7 +28,7 @@ const VALIDATORS = { }, } -const PARSERS = { +const PARSERS: any = { [FieldTypes.NUMBER]: (attribute?: string) => { if (!attribute) { return attribute @@ -43,7 +43,7 @@ const PARSERS = { }, } -export function parse(csvString: string, parsers: any) { +export function parse(csvString: string, parsers: any): Record { const result = csv().fromString(csvString) const schema: Record = {} @@ -89,7 +89,7 @@ export function updateSchema({ existingTable, }: { schema?: Record - existingTable: Table + existingTable?: Table }) { if (!schema) { return schema @@ -97,7 +97,7 @@ export function updateSchema({ const finalSchema: Record = {} const schemaKeyMap: Record = {} Object.keys(schema).forEach(key => (schemaKeyMap[key.toLowerCase()] = key)) - for (let [key, field] of Object.entries(existingTable.schema)) { + for (let [key, field] of Object.entries(existingTable?.schema || {})) { const lcKey = key.toLowerCase() const foundKey: string = schemaKeyMap[lcKey] if (foundKey) { diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts index 9807fc7d61..d1aa93b4fe 100644 --- a/packages/server/src/utilities/rowProcessor/index.ts +++ b/packages/server/src/utilities/rowProcessor/index.ts @@ -1,4 +1,4 @@ -import linkRows from "../../db/linkedRows" +import * as linkRows from "../../db/linkedRows" import { FieldTypes, AutoFieldSubTypes } from "../../constants" import { attachmentsRelativeURL } from "../index" import { processFormulas, fixAutoColumnSubType } from "./utils" @@ -189,10 +189,10 @@ export async function outputProcessing( wasArray = false } // attach any linked row information - let enriched = await linkRows.attachFullLinkedDocs(table, rows) + let enriched = await linkRows.attachFullLinkedDocs(table, rows as Row[]) // process formulas - enriched = processFormulas(table, enriched, { dynamic: true }) + enriched = processFormulas(table, enriched, { dynamic: true }) as Row[] // update the attachments URL depending on hosting for (let [property, column] of Object.entries(table.schema)) { diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts index 5b57d2d33f..8911d62133 100644 --- a/packages/server/src/utilities/rowProcessor/map.ts +++ b/packages/server/src/utilities/rowProcessor/map.ts @@ -4,7 +4,7 @@ import { FieldTypes } from "../../constants" /** * A map of how we convert various properties in rows to each other based on the row type. */ -exports.TYPE_TRANSFORM_MAP = { +export const TYPE_TRANSFORM_MAP: any = { [FieldTypes.LINK]: { "": [], [null]: [], diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts index ba718aa8d5..f267aa339f 100644 --- a/packages/types/src/documents/app/automation.ts +++ b/packages/types/src/documents/app/automation.ts @@ -41,8 +41,7 @@ export interface Automation extends Document { name: string } -export interface AutomationStep { - id?: string +export interface AutomationStepSchema { name: string tagline: string icon: string @@ -65,11 +64,19 @@ export interface AutomationStep { } } -export interface AutomationTrigger extends AutomationStep { +export interface AutomationStep extends AutomationStepSchema { + id: string +} + +export interface AutomationTriggerSchema extends AutomationStepSchema { event?: string cronJobId?: string } +export interface AutomationTrigger extends AutomationTriggerSchema { + id: string +} + export enum AutomationStatus { SUCCESS = "success", ERROR = "error", From 3aed49778f4f1c4b41b8be11bb69cc6a96d4bd1d Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Sat, 26 Nov 2022 15:42:53 +0000 Subject: [PATCH 078/179] One file left in the server, some fixes after converting the internal row controller. --- .../server/src/api/controllers/row/index.ts | 4 +- .../row/{internal.js => internal.ts} | 135 ++++++++++-------- .../src/api/controllers/row/staticFormula.ts | 2 +- .../server/src/api/controllers/row/utils.ts | 13 +- .../view/{viewBuilder.js => viewBuilder.ts} | 36 +++-- packages/server/src/db/inMemoryView.ts | 4 +- .../src/utilities/rowProcessor/index.ts | 8 +- packages/types/src/documents/app/view.ts | 2 +- packages/types/src/sdk/db.ts | 1 + 9 files changed, 119 insertions(+), 86 deletions(-) rename packages/server/src/api/controllers/row/{internal.js => internal.ts} (78%) rename packages/server/src/api/controllers/view/{viewBuilder.js => viewBuilder.ts} (85%) diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts index 09af24a9b1..b59f245098 100644 --- a/packages/server/src/api/controllers/row/index.ts +++ b/packages/server/src/api/controllers/row/index.ts @@ -1,6 +1,6 @@ import { quotas } from "@budibase/pro" -import internal from "./internal" -import external from "./external" +import * as internal from "./internal" +import * as external from "./external" import { isExternalTable } from "../../../integrations/utils" function pickApi(tableId: any) { diff --git a/packages/server/src/api/controllers/row/internal.js b/packages/server/src/api/controllers/row/internal.ts similarity index 78% rename from packages/server/src/api/controllers/row/internal.js rename to packages/server/src/api/controllers/row/internal.ts index 9b105fd3ae..98a89a5038 100644 --- a/packages/server/src/api/controllers/row/internal.js +++ b/packages/server/src/api/controllers/row/internal.ts @@ -1,34 +1,41 @@ -const linkRows = require("../../../db/linkedRows") -const { +import * as linkRows from "../../../db/linkedRows" +import { generateRowID, getRowParams, getTableIDFromRowID, DocumentType, InternalTables, -} = require("../../../db/utils") -const userController = require("../user") -const { +} from "../../../db/utils" +import * as userController from "../user" +import { inputProcessing, outputProcessing, cleanupAttachments, -} = require("../../../utilities/rowProcessor") -const { FieldTypes } = require("../../../constants") -const { validate, findRow } = require("./utils") -const { fullSearch, paginatedSearch } = require("./internalSearch") -const { getGlobalUsersFromMetadata } = require("../../../utilities/global") -const inMemoryViews = require("../../../db/inMemoryView") -const env = require("../../../environment") -const { +} from "../../../utilities/rowProcessor" +import { FieldTypes } from "../../../constants" +import { validate as rowValidate, findRow } from "./utils" +import { fullSearch, paginatedSearch } from "./internalSearch" +import { getGlobalUsersFromMetadata } from "../../../utilities/global" +import * as inMemoryViews from "../../../db/inMemoryView" +import env from "../../../environment" +import { migrateToInMemoryView, migrateToDesignView, getFromDesignDoc, getFromMemoryDoc, -} = require("../view/utils") -const { cloneDeep } = require("lodash/fp") -const { context, db: dbCore } = require("@budibase/backend-core") -const { finaliseRow, updateRelatedFormula } = require("./staticFormula") -const exporters = require("../view/exporters") -const { apiFileReturn } = require("../../../utilities/fileSystem") +} from "../view/utils" +import { cloneDeep } from "lodash/fp" +import { context, db as dbCore } from "@budibase/backend-core" +import { finaliseRow, updateRelatedFormula } from "./staticFormula" +import * as exporters from "../view/exporters" +import { apiFileReturn } from "../../../utilities/fileSystem" +import { + BBContext, + Database, + LinkDocumentValue, + Row, + Table, +} from "@budibase/types" const CALCULATION_TYPES = { SUM: "sum", @@ -36,7 +43,7 @@ const CALCULATION_TYPES = { STATS: "stats", } -async function getView(db, viewName) { +async function getView(db: Database, viewName: string) { let mainGetter = env.SELF_HOSTED ? getFromDesignDoc : getFromMemoryDoc let secondaryGetter = env.SELF_HOSTED ? getFromMemoryDoc : getFromDesignDoc let migration = env.SELF_HOSTED ? migrateToDesignView : migrateToInMemoryView @@ -44,7 +51,7 @@ async function getView(db, viewName) { migrate = false try { viewInfo = await mainGetter(db, viewName) - } catch (err) { + } catch (err: any) { // check if it can be retrieved from design doc (needs migrated) if (err.status !== 404) { viewInfo = null @@ -62,7 +69,7 @@ async function getView(db, viewName) { return viewInfo } -async function getRawTableData(ctx, db, tableId) { +async function getRawTableData(ctx: BBContext, db: Database, tableId: string) { let rows if (tableId === InternalTables.USER_METADATA) { await userController.fetchMetadata(ctx) @@ -75,10 +82,10 @@ async function getRawTableData(ctx, db, tableId) { ) rows = response.rows.map(row => row.doc) } - return rows + return rows as Row[] } -exports.patch = async ctx => { +export async function patch(ctx: BBContext) { const db = context.getAppDB() const inputs = ctx.request.body const tableId = inputs.tableId @@ -103,15 +110,15 @@ exports.patch = async ctx => { } let dbTable = await db.get(tableId) // need to build up full patch fields before coerce - let combinedRow = cloneDeep(oldRow) + let combinedRow: any = cloneDeep(oldRow) for (let key of Object.keys(inputs)) { if (!dbTable.schema[key]) continue combinedRow[key] = inputs[key] } // this returns the table and row incase they have been updated - let { table, row } = inputProcessing(ctx.user, dbTable, combinedRow) - const validateResult = await validate({ + let { table, row } = inputProcessing(ctx.user!, dbTable, combinedRow) + const validateResult = await rowValidate({ row, table, }) @@ -121,12 +128,12 @@ exports.patch = async ctx => { } // returned row is cleaned and prepared for writing to DB - row = await linkRows.updateLinks({ + row = (await linkRows.updateLinks({ eventType: linkRows.EventType.ROW_UPDATE, row, tableId: row.tableId, table, - }) + })) as Row // check if any attachments removed await cleanupAttachments(table, { oldRow, row }) @@ -143,7 +150,7 @@ exports.patch = async ctx => { }) } -exports.save = async function (ctx) { +export async function save(ctx: BBContext) { const db = context.getAppDB() let inputs = ctx.request.body inputs.tableId = ctx.params.tableId @@ -154,8 +161,8 @@ exports.save = async function (ctx) { // this returns the table and row incase they have been updated const dbTable = await db.get(inputs.tableId) - let { table, row } = inputProcessing(ctx.user, dbTable, inputs) - const validateResult = await validate({ + let { table, row } = inputProcessing(ctx.user!, dbTable, inputs) + const validateResult = await rowValidate({ row, table, }) @@ -165,12 +172,12 @@ exports.save = async function (ctx) { } // make sure link rows are up to date - row = await linkRows.updateLinks({ + row = (await linkRows.updateLinks({ eventType: linkRows.EventType.ROW_SAVE, row, tableId: row.tableId, table, - }) + })) as Row return finaliseRow(table, row, { oldTable: dbTable, @@ -178,7 +185,7 @@ exports.save = async function (ctx) { }) } -exports.fetchView = async ctx => { +export async function fetchView(ctx: BBContext) { const viewName = ctx.params.viewName // if this is a table view being looked for just transfer to that @@ -199,7 +206,12 @@ exports.fetchView = async ctx => { } else { const tableId = viewInfo.meta.tableId const data = await getRawTableData(ctx, db, tableId) - response = await inMemoryViews.runView(viewInfo, calculation, group, data) + response = await inMemoryViews.runView( + viewInfo, + calculation as string, + !!group, + data + ) } let rows @@ -240,7 +252,7 @@ exports.fetchView = async ctx => { return rows } -exports.fetch = async ctx => { +export async function fetch(ctx: BBContext) { const db = context.getAppDB() const tableId = ctx.params.tableId @@ -249,7 +261,7 @@ exports.fetch = async ctx => { return outputProcessing(table, rows) } -exports.find = async ctx => { +export async function find(ctx: BBContext) { const db = dbCore.getDB(ctx.appId) const table = await db.get(ctx.params.tableId) let row = await findRow(ctx, ctx.params.tableId, ctx.params.rowId) @@ -257,7 +269,7 @@ exports.find = async ctx => { return row } -exports.destroy = async function (ctx) { +export async function destroy(ctx: BBContext) { const db = context.getAppDB() const { _id } = ctx.request.body let row = await db.get(_id) @@ -293,7 +305,7 @@ exports.destroy = async function (ctx) { return { response, row } } -exports.bulkDestroy = async ctx => { +export async function bulkDestroy(ctx: BBContext) { const db = context.getAppDB() const tableId = ctx.params.tableId const table = await db.get(tableId) @@ -301,10 +313,12 @@ exports.bulkDestroy = async ctx => { // before carrying out any updates, make sure the rows are ready to be returned // they need to be the full rows (including previous relationships) for automations - rows = await outputProcessing(table, rows, { squash: false }) + const processedRows = (await outputProcessing(table, rows, { + squash: false, + })) as Row[] // remove the relationships first - let updates = rows.map(row => + let updates: Promise[] = processedRows.map(row => linkRows.updateLinks({ eventType: linkRows.EventType.ROW_DELETE, row, @@ -313,7 +327,7 @@ exports.bulkDestroy = async ctx => { ) if (tableId === InternalTables.USER_METADATA) { updates = updates.concat( - rows.map(row => { + processedRows.map(row => { ctx.params = { id: row._id, } @@ -321,16 +335,16 @@ exports.bulkDestroy = async ctx => { }) ) } else { - await db.bulkDocs(rows.map(row => ({ ...row, _deleted: true }))) + await db.bulkDocs(processedRows.map(row => ({ ...row, _deleted: true }))) } // remove any attachments that were on the rows from object storage - await cleanupAttachments(table, { rows }) - await updateRelatedFormula(table, rows) + await cleanupAttachments(table, { rows: processedRows }) + await updateRelatedFormula(table, processedRows) await Promise.all(updates) - return { response: { ok: true }, rows } + return { response: { ok: true }, rows: processedRows } } -exports.search = async ctx => { +export async function search(ctx: BBContext) { // Fetch the whole table when running in cypress, as search doesn't work if (!env.COUCH_DB_URL && env.isCypress()) { return { rows: await exports.fetch(ctx) } @@ -362,14 +376,14 @@ exports.search = async ctx => { return response } -exports.validate = async ctx => { - return validate({ +export async function validate(ctx: BBContext) { + return rowValidate({ tableId: ctx.params.tableId, row: ctx.request.body, }) } -exports.exportRows = async ctx => { +export async function exportRows(ctx: BBContext) { const db = context.getAppDB() const table = await db.get(ctx.params.tableId) const rowIds = ctx.request.body.rows @@ -382,8 +396,8 @@ exports.exportRows = async ctx => { }) ).rows.map(row => row.doc) - let result = await outputProcessing(table, response) - let rows = [] + let result = (await outputProcessing(table, response)) as Row[] + let rows: Row[] = [] // Filter data to only specified columns if required if (columns && columns.length) { @@ -398,6 +412,7 @@ exports.exportRows = async ctx => { } let headers = Object.keys(rows[0]) + // @ts-ignore const exporter = exporters[format] const filename = `export.${format}` @@ -406,7 +421,7 @@ exports.exportRows = async ctx => { return apiFileReturn(exporter(headers, rows)) } -exports.fetchEnrichedRow = async ctx => { +export async function fetchEnrichedRow(ctx: BBContext) { const db = context.getAppDB() const tableId = ctx.params.tableId const rowId = ctx.params.rowId @@ -416,10 +431,10 @@ exports.fetchEnrichedRow = async ctx => { findRow(ctx, tableId, rowId), ]) // get the link docs - const linkVals = await linkRows.getLinkDocuments({ + const linkVals = (await linkRows.getLinkDocuments({ tableId, rowId, - }) + })) as LinkDocumentValue[] // look up the actual rows based on the ids let response = ( await db.allDocs({ @@ -428,8 +443,8 @@ exports.fetchEnrichedRow = async ctx => { }) ).rows.map(row => row.doc) // group responses by table - let groups = {}, - tables = {} + let groups: any = {}, + tables: Record = {} for (let row of response) { if (!row.tableId) { row.tableId = getTableIDFromRowID(row._id) @@ -442,11 +457,11 @@ exports.fetchEnrichedRow = async ctx => { groups[linkedTableId].push(row) } } - let linkedRows = [] + let linkedRows: Row[] = [] for (let [tableId, rows] of Object.entries(groups)) { // need to include the IDs in these rows for any links they may have linkedRows = linkedRows.concat( - await outputProcessing(tables[tableId], rows) + await outputProcessing(tables[tableId], rows as Row[]) ) } diff --git a/packages/server/src/api/controllers/row/staticFormula.ts b/packages/server/src/api/controllers/row/staticFormula.ts index 7d97d7e466..6e43f5822f 100644 --- a/packages/server/src/api/controllers/row/staticFormula.ts +++ b/packages/server/src/api/controllers/row/staticFormula.ts @@ -16,7 +16,7 @@ const { cloneDeep } = require("lodash/fp") * updated. * NOTE: this will only for affect static formulas. */ -exports.updateRelatedFormula = async (table: Table, enrichedRows: Row[]) => { +export async function updateRelatedFormula(table: Table, enrichedRows: Row[]) { const db = context.getAppDB() // no formula to update, we're done if (!table.relatedFormula) { diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts index 3719c206e2..c003a16266 100644 --- a/packages/server/src/api/controllers/row/utils.ts +++ b/packages/server/src/api/controllers/row/utils.ts @@ -51,16 +51,19 @@ export async function validate({ }: { tableId?: string row: Row - table: Table + table?: Table }) { + let fetchedTable: Table if (!table) { const db = context.getAppDB() - table = await db.get(tableId) + fetchedTable = await db.get(tableId) + } else { + fetchedTable = table } const errors: any = {} - for (let fieldName of Object.keys(table.schema)) { - const constraints = cloneDeep(table.schema[fieldName].constraints) - const type = table.schema[fieldName].type + for (let fieldName of Object.keys(fetchedTable.schema)) { + const constraints = cloneDeep(fetchedTable.schema[fieldName].constraints) + const type = fetchedTable.schema[fieldName].type // formulas shouldn't validated, data will be deleted anyway if (type === FieldTypes.FORMULA) { continue diff --git a/packages/server/src/api/controllers/view/viewBuilder.js b/packages/server/src/api/controllers/view/viewBuilder.ts similarity index 85% rename from packages/server/src/api/controllers/view/viewBuilder.js rename to packages/server/src/api/controllers/view/viewBuilder.ts index 6596e0d9e7..3076e311b1 100644 --- a/packages/server/src/api/controllers/view/viewBuilder.js +++ b/packages/server/src/api/controllers/view/viewBuilder.ts @@ -1,4 +1,14 @@ -const TOKEN_MAP = { +import { ViewFilter } from "@budibase/types" + +type ViewTemplateOpts = { + field: string + tableId: string + groupBy: string + filters: ViewFilter[] + calculation: string +} + +const TOKEN_MAP: Record = { EQUALS: "===", NOT_EQUALS: "!==", LT: "<", @@ -10,13 +20,13 @@ const TOKEN_MAP = { OR: "||", } -const CONDITIONS = { +const CONDITIONS: Record = { EMPTY: "EMPTY", NOT_EMPTY: "NOT_EMPTY", CONTAINS: "CONTAINS", } -const isEmptyExpression = key => { +function isEmptyExpression(key: string) { return `( doc["${key}"] === undefined || doc["${key}"] === null || @@ -25,19 +35,19 @@ const isEmptyExpression = key => { )` } -const GROUP_PROPERTY = { +const GROUP_PROPERTY: Record = { group: { type: "string", }, } -const FIELD_PROPERTY = { +const FIELD_PROPERTY: Record = { field: { type: "string", }, } -const SCHEMA_MAP = { +const SCHEMA_MAP: Record = { sum: { field: "string", value: "number", @@ -74,7 +84,7 @@ const SCHEMA_MAP = { * @param {Array} filters - an array of filter objects * @returns {String} JS Expression */ -function parseFilterExpression(filters) { +function parseFilterExpression(filters: ViewFilter[]) { const expression = [] let first = true @@ -111,7 +121,7 @@ function parseFilterExpression(filters) { * @param {String?} field - field to use for calculations, if any * @param {String?} groupBy - field to group calculation results on, if any */ -function parseEmitExpression(field, groupBy) { +function parseEmitExpression(field: string, groupBy: string) { return `emit(doc["${groupBy || "_id"}"], doc["${field}"]);` } @@ -126,7 +136,13 @@ function parseEmitExpression(field, groupBy) { * filters: Array of filter objects containing predicates that are parsed into a JS expression * calculation: an optional calculation to be performed over the view data. */ -function viewTemplate({ field, tableId, groupBy, filters = [], calculation }) { +export = function ({ + field, + tableId, + groupBy, + filters = [], + calculation, +}: ViewTemplateOpts) { // first filter can't have a conjunction if (filters && filters.length > 0 && filters[0].conjunction) { delete filters[0].conjunction @@ -179,5 +195,3 @@ function viewTemplate({ field, tableId, groupBy, filters = [], calculation }) { ...reduction, } } - -module.exports = viewTemplate diff --git a/packages/server/src/db/inMemoryView.ts b/packages/server/src/db/inMemoryView.ts index c3659ef628..3c96aa26bd 100644 --- a/packages/server/src/db/inMemoryView.ts +++ b/packages/server/src/db/inMemoryView.ts @@ -8,8 +8,8 @@ const Pouch = dbCore.getPouch({ inMemory: true }) export async function runView( view: View, - calculation: boolean, - group: string, + calculation: string, + group: boolean, data: Row[] ) { // use a different ID each time for the DB, make sure they diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts index d1aa93b4fe..e519c261c5 100644 --- a/packages/server/src/utilities/rowProcessor/index.ts +++ b/packages/server/src/utilities/rowProcessor/index.ts @@ -6,7 +6,7 @@ import { ObjectStoreBuckets } from "../../constants" import { context, db as dbCore, objectStore } from "@budibase/backend-core" import { InternalTables } from "../../db/utils" import { TYPE_TRANSFORM_MAP } from "./map" -import { Row, User, Table } from "@budibase/types" +import { Row, Table, ContextUser } from "@budibase/types" const { cloneDeep } = require("lodash/fp") export * from "./utils" @@ -49,7 +49,7 @@ function getRemovedAttachmentKeys( * for automatic ID purposes. */ export function processAutoColumn( - user: User | null, + user: ContextUser | null, table: Table, row: Row, opts?: AutoColumnProcessingOpts @@ -132,10 +132,10 @@ export function coerce(row: any, type: any) { * @returns {object} the row which has been prepared to be written to the DB. */ export function inputProcessing( - user: User, + user: ContextUser, table: Table, row: Row, - opts: AutoColumnProcessingOpts + opts?: AutoColumnProcessingOpts ) { let clonedRow = cloneDeep(row) // need to copy the table so it can be differenced on way out diff --git a/packages/types/src/documents/app/view.ts b/packages/types/src/documents/app/view.ts index b3dbe53129..de0dfea7f5 100644 --- a/packages/types/src/documents/app/view.ts +++ b/packages/types/src/documents/app/view.ts @@ -33,7 +33,7 @@ export interface ViewStatisticsSchema { } export interface ViewFilter { - value: any + value?: any condition: string key: string conjunction?: string diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts index 200b25c501..84daed0f90 100644 --- a/packages/types/src/sdk/db.ts +++ b/packages/types/src/sdk/db.ts @@ -57,6 +57,7 @@ export type DatabaseQueryOpts = { descending?: boolean key?: string keys?: string[] + group?: boolean } export const isDocument = (doc: any): doc is Document => { From 93cb1c52de35363a865e6110e95954df7aa94a02 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Sat, 26 Nov 2022 16:24:37 +0000 Subject: [PATCH 079/179] Final typescript conversions for server. --- .../api/controllers/row/ExternalRequest.ts | 1324 ++++++++--------- .../row/{external.js => external.ts} | 137 +- .../src/api/controllers/row/internal.ts | 4 +- .../src/api/controllers/table/external.ts | 8 +- packages/server/tsconfig.build.json | 3 +- 5 files changed, 732 insertions(+), 744 deletions(-) rename packages/server/src/api/controllers/row/{external.js => external.ts} (63%) diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts index bd012d61b5..de4ce317ef 100644 --- a/packages/server/src/api/controllers/row/ExternalRequest.ts +++ b/packages/server/src/api/controllers/row/ExternalRequest.ts @@ -18,11 +18,7 @@ import { convertRowId, } from "../../../integrations/utils" import { getDatasourceAndQuery } from "./utils" -import { - DataSourceOperation, - FieldTypes, - RelationshipTypes, -} from "../../../constants" +import { FieldTypes, RelationshipTypes } from "../../../constants" import { breakExternalTableId, isSQL } from "../../../integrations/utils" import { processObjectSync } from "@budibase/string-templates" // @ts-ignore @@ -30,7 +26,7 @@ import { cloneDeep } from "lodash/fp" import { processFormulas, processDates } from "../../../utilities/rowProcessor" import { context } from "@budibase/backend-core" -interface ManyRelationship { +export interface ManyRelationship { tableId?: string id?: string isUpdate?: boolean @@ -38,712 +34,692 @@ interface ManyRelationship { [key: string]: any } -interface RunConfig { - id?: string +export interface RunConfig { + id?: any[] filters?: SearchFilters sort?: SortJson paginate?: PaginationJson + datasource?: Datasource row?: Row rows?: Row[] + tables?: Record } -module External { - function buildFilters( - id: string | undefined | string[], - filters: SearchFilters, - table: Table - ) { - const primary = table.primary - // if passed in array need to copy for shifting etc - let idCopy: undefined | string | any[] = cloneDeep(id) - if (filters) { - // need to map over the filters and make sure the _id field isn't present - for (let filter of Object.values(filters)) { - if (filter._id && primary) { - const parts = breakRowIdField(filter._id) - for (let field of primary) { - filter[field] = parts.shift() - } +function buildFilters( + id: string | undefined | string[], + filters: SearchFilters, + table: Table +) { + const primary = table.primary + // if passed in array need to copy for shifting etc + let idCopy: undefined | string | any[] = cloneDeep(id) + if (filters) { + // need to map over the filters and make sure the _id field isn't present + for (let filter of Object.values(filters)) { + if (filter._id && primary) { + const parts = breakRowIdField(filter._id) + for (let field of primary) { + filter[field] = parts.shift() } - // make sure this field doesn't exist on any filter - delete filter._id } - } - // there is no id, just use the user provided filters - if (!idCopy || !table) { - return filters - } - // if used as URL parameter it will have been joined - if (!Array.isArray(idCopy)) { - idCopy = breakRowIdField(idCopy) - } - const equal: any = {} - if (primary && idCopy) { - for (let field of primary) { - // work through the ID and get the parts - equal[field] = idCopy.shift() - } - } - return { - equal, + // make sure this field doesn't exist on any filter + delete filter._id } } - - /** - * This function checks the incoming parameters to make sure all the inputs are - * valid based on on the table schema. The main thing this is looking for is when a - * user has made use of the _id field of a row for a foreign key or a search parameter. - * In these cases the key will be sent up as [1], rather than 1. In these cases we will - * simplify it down to the requirements. This function is quite complex as we try to be - * relatively restrictive over what types of columns we will perform this action for. - */ - function cleanupConfig(config: RunConfig, table: Table): RunConfig { - const primaryOptions = [ - FieldTypes.STRING, - FieldTypes.LONGFORM, - FieldTypes.OPTIONS, - FieldTypes.NUMBER, - ] - // filter out fields which cannot be keys - const fieldNames = Object.entries(table.schema) - .filter(schema => primaryOptions.find(val => val === schema[1].type)) - .map(([fieldName]) => fieldName) - const iterateObject = (obj: { [key: string]: any }) => { - for (let [field, value] of Object.entries(obj)) { - if (fieldNames.find(name => name === field) && isRowId(value)) { - obj[field] = convertRowId(value) - } - } - } - // check the row and filters to make sure they aren't a key of some sort - if (config.filters) { - for (let [key, filter] of Object.entries(config.filters)) { - // oneOf is an array, don't iterate it - if ( - typeof filter !== "object" || - Object.keys(filter).length === 0 || - key === FilterType.ONE_OF - ) { - continue - } - iterateObject(filter) - } - } - if (config.row) { - iterateObject(config.row) - } - - return config + // there is no id, just use the user provided filters + if (!idCopy || !table) { + return filters } - - function generateIdForRow(row: Row | undefined, table: Table): string { - const primary = table.primary - if (!row || !primary) { - return "" - } - // build id array - let idParts = [] + // if used as URL parameter it will have been joined + if (!Array.isArray(idCopy)) { + idCopy = breakRowIdField(idCopy) + } + const equal: any = {} + if (primary && idCopy) { for (let field of primary) { - // need to handle table name + field or just field, depending on if relationships used - const fieldValue = row[`${table.name}.${field}`] || row[field] - if (fieldValue) { - idParts.push(fieldValue) + // work through the ID and get the parts + equal[field] = idCopy.shift() + } + } + return { + equal, + } +} + +/** + * This function checks the incoming parameters to make sure all the inputs are + * valid based on on the table schema. The main thing this is looking for is when a + * user has made use of the _id field of a row for a foreign key or a search parameter. + * In these cases the key will be sent up as [1], rather than 1. In these cases we will + * simplify it down to the requirements. This function is quite complex as we try to be + * relatively restrictive over what types of columns we will perform this action for. + */ +function cleanupConfig(config: RunConfig, table: Table): RunConfig { + const primaryOptions = [ + FieldTypes.STRING, + FieldTypes.LONGFORM, + FieldTypes.OPTIONS, + FieldTypes.NUMBER, + ] + // filter out fields which cannot be keys + const fieldNames = Object.entries(table.schema) + .filter(schema => primaryOptions.find(val => val === schema[1].type)) + .map(([fieldName]) => fieldName) + const iterateObject = (obj: { [key: string]: any }) => { + for (let [field, value] of Object.entries(obj)) { + if (fieldNames.find(name => name === field) && isRowId(value)) { + obj[field] = convertRowId(value) } } - if (idParts.length === 0) { - return "" - } - return generateRowIdField(idParts) } - - function getEndpoint(tableId: string | undefined, operation: string) { - if (!tableId) { - return {} - } - const { datasourceId, tableName } = breakExternalTableId(tableId) - return { - datasourceId, - entityId: tableName, - operation, - } - } - - function basicProcessing(row: Row, table: Table): Row { - const thisRow: Row = {} - // filter the row down to what is actually the row (not joined) - for (let fieldName of Object.keys(table.schema)) { - const pathValue = row[`${table.name}.${fieldName}`] - const value = pathValue != null ? pathValue : row[fieldName] - // all responses include "select col as table.col" so that overlaps are handled - if (value != null) { - thisRow[fieldName] = value - } - } - thisRow._id = generateIdForRow(row, table) - thisRow.tableId = table._id - thisRow._rev = "rev" - return processFormulas(table, thisRow) - } - - function fixArrayTypes(row: Row, table: Table) { - for (let [fieldName, schema] of Object.entries(table.schema)) { + // check the row and filters to make sure they aren't a key of some sort + if (config.filters) { + for (let [key, filter] of Object.entries(config.filters)) { + // oneOf is an array, don't iterate it if ( - schema.type === FieldTypes.ARRAY && - typeof row[fieldName] === "string" + typeof filter !== "object" || + Object.keys(filter).length === 0 || + key === FilterType.ONE_OF ) { - try { - row[fieldName] = JSON.parse(row[fieldName]) - } catch (err) { - // couldn't convert back to array, ignore - delete row[fieldName] + continue + } + iterateObject(filter) + } + } + if (config.row) { + iterateObject(config.row) + } + + return config +} + +function generateIdForRow(row: Row | undefined, table: Table): string { + const primary = table.primary + if (!row || !primary) { + return "" + } + // build id array + let idParts = [] + for (let field of primary) { + // need to handle table name + field or just field, depending on if relationships used + const fieldValue = row[`${table.name}.${field}`] || row[field] + if (fieldValue) { + idParts.push(fieldValue) + } + } + if (idParts.length === 0) { + return "" + } + return generateRowIdField(idParts) +} + +function getEndpoint(tableId: string | undefined, operation: string) { + if (!tableId) { + return {} + } + const { datasourceId, tableName } = breakExternalTableId(tableId) + return { + datasourceId, + entityId: tableName, + operation, + } +} + +function basicProcessing(row: Row, table: Table): Row { + const thisRow: Row = {} + // filter the row down to what is actually the row (not joined) + for (let fieldName of Object.keys(table.schema)) { + const pathValue = row[`${table.name}.${fieldName}`] + const value = pathValue != null ? pathValue : row[fieldName] + // all responses include "select col as table.col" so that overlaps are handled + if (value != null) { + thisRow[fieldName] = value + } + } + thisRow._id = generateIdForRow(row, table) + thisRow.tableId = table._id + thisRow._rev = "rev" + return processFormulas(table, thisRow) +} + +function fixArrayTypes(row: Row, table: Table) { + for (let [fieldName, schema] of Object.entries(table.schema)) { + if ( + schema.type === FieldTypes.ARRAY && + typeof row[fieldName] === "string" + ) { + try { + row[fieldName] = JSON.parse(row[fieldName]) + } catch (err) { + // couldn't convert back to array, ignore + delete row[fieldName] + } + } + } + return row +} + +function isOneSide(field: FieldSchema) { + return ( + field.relationshipType && field.relationshipType.split("-")[0] === "one" + ) +} + +export class ExternalRequest { + private operation: Operation + private tableId: string + private datasource?: Datasource + private tables: { [key: string]: Table } = {} + + constructor(operation: Operation, tableId: string, datasource?: Datasource) { + this.operation = operation + this.tableId = tableId + this.datasource = datasource + if (datasource && datasource.entities) { + this.tables = datasource.entities + } + } + + getTable(tableId: string | undefined): Table | undefined { + if (!tableId) { + throw "Table ID is unknown, cannot find table" + } + const { tableName } = breakExternalTableId(tableId) + if (tableName) { + return this.tables[tableName] + } + } + + inputProcessing(row: Row | undefined, table: Table) { + if (!row) { + return { row, manyRelationships: [] } + } + // we don't really support composite keys for relationships, this is why [0] is used + // @ts-ignore + const tablePrimary: string = table.primary[0] + let newRow: Row = {}, + manyRelationships: ManyRelationship[] = [] + for (let [key, field] of Object.entries(table.schema)) { + // if set already, or not set just skip it + if ( + row[key] == null || + newRow[key] || + field.autocolumn || + field.type === FieldTypes.FORMULA + ) { + continue + } + // if its an empty string then it means return the column to null (if possible) + if (row[key] === "") { + newRow[key] = null + continue + } + // parse floats/numbers + if (field.type === FieldTypes.NUMBER && !isNaN(parseFloat(row[key]))) { + newRow[key] = parseFloat(row[key]) + } + // if its not a link then just copy it over + if (field.type !== FieldTypes.LINK) { + newRow[key] = row[key] + continue + } + const { tableName: linkTableName } = breakExternalTableId(field?.tableId) + // table has to exist for many to many + if (!linkTableName || !this.tables[linkTableName]) { + continue + } + const linkTable = this.tables[linkTableName] + // @ts-ignore + const linkTablePrimary = linkTable.primary[0] + // one to many + if (isOneSide(field)) { + let id = row[key][0] + if (typeof row[key] === "string") { + id = decodeURIComponent(row[key]).match(/\[(.*?)\]/)?.[1] + } + newRow[field.foreignKey || linkTablePrimary] = breakRowIdField(id)[0] + } + // many to many + else if (field.through) { + // we're not inserting a doc, will be a bunch of update calls + const otherKey: string = field.throughFrom || linkTablePrimary + const thisKey: string = field.throughTo || tablePrimary + row[key].map((relationship: any) => { + manyRelationships.push({ + tableId: field.through || field.tableId, + isUpdate: false, + key: otherKey, + [otherKey]: breakRowIdField(relationship)[0], + // leave the ID for enrichment later + [thisKey]: `{{ literal ${tablePrimary} }}`, + }) + }) + } + // many to one + else { + const thisKey: string = "id" + // @ts-ignore + const otherKey: string = field.fieldName + row[key].map((relationship: any) => { + manyRelationships.push({ + tableId: field.tableId, + isUpdate: true, + key: otherKey, + [thisKey]: breakRowIdField(relationship)[0], + // leave the ID for enrichment later + [otherKey]: `{{ literal ${tablePrimary} }}`, + }) + }) + } + } + // we return the relationships that may need to be created in the through table + // we do this so that if the ID is generated by the DB it can be inserted + // after the fact + return { row: newRow, manyRelationships } + } + + squashRelationshipColumns( + table: Table, + row: Row, + relationships: RelationshipsJson[] + ): Row { + for (let relationship of relationships) { + const linkedTable = this.tables[relationship.tableName] + if (!linkedTable || !row[relationship.column]) { + continue + } + const display = linkedTable.primaryDisplay + for (let key of Object.keys(row[relationship.column])) { + const related: Row = row[relationship.column][key] + row[relationship.column][key] = { + primaryDisplay: display ? related[display] : undefined, + _id: related._id, } } } return row } - function isOneSide(field: FieldSchema) { - return ( - field.relationshipType && field.relationshipType.split("-")[0] === "one" - ) + /** + * This iterates through the returned rows and works out what elements of the rows + * actually match up to another row (based on primary keys) - this is pretty specific + * to SQL and the way that SQL relationships are returned based on joins. + * This is complicated, but the idea is that when a SQL query returns all the relations + * will be separate rows, with all of the data in each row. We have to decipher what comes + * from where (which tables) and how to convert that into budibase columns. + */ + updateRelationshipColumns( + table: Table, + row: Row, + rows: { [key: string]: Row }, + relationships: RelationshipsJson[] + ) { + const columns: { [key: string]: any } = {} + for (let relationship of relationships) { + const linkedTable = this.tables[relationship.tableName] + if (!linkedTable) { + continue + } + const fromColumn = `${table.name}.${relationship.from}` + const toColumn = `${linkedTable.name}.${relationship.to}` + // this is important when working with multiple relationships + // between the same tables, don't want to overlap/multiply the relations + if ( + !relationship.through && + row[fromColumn]?.toString() !== row[toColumn]?.toString() + ) { + continue + } + let linked = basicProcessing(row, linkedTable) + if (!linked._id) { + continue + } + columns[relationship.column] = linked + } + for (let [column, related] of Object.entries(columns)) { + if (!row._id) { + continue + } + const rowId: string = row._id + if (!Array.isArray(rows[rowId][column])) { + rows[rowId][column] = [] + } + // make sure relationship hasn't been found already + if ( + !rows[rowId][column].find( + (relation: Row) => relation._id === related._id + ) + ) { + rows[rowId][column].push(related) + } + } + return rows } - class ExternalRequest { - private operation: DataSourceOperation - private tableId: string - private datasource: Datasource - private tables: { [key: string]: Table } = {} - - constructor( - operation: DataSourceOperation, - tableId: string, - datasource: Datasource - ) { - this.operation = operation - this.tableId = tableId - this.datasource = datasource - if (datasource && datasource.entities) { - this.tables = datasource.entities - } + outputProcessing( + rows: Row[] = [], + table: Table, + relationships: RelationshipsJson[] + ) { + if (!rows || rows.length === 0 || rows[0].read === true) { + return [] } - - getTable(tableId: string | undefined): Table | undefined { - if (!tableId) { - throw "Table ID is unknown, cannot find table" - } - const { tableName } = breakExternalTableId(tableId) - if (tableName) { - return this.tables[tableName] - } - } - - inputProcessing(row: Row | undefined, table: Table) { - if (!row) { - return { row, manyRelationships: [] } - } - // we don't really support composite keys for relationships, this is why [0] is used - // @ts-ignore - const tablePrimary: string = table.primary[0] - let newRow: Row = {}, - manyRelationships: ManyRelationship[] = [] - for (let [key, field] of Object.entries(table.schema)) { - // if set already, or not set just skip it - if ( - row[key] == null || - newRow[key] || - field.autocolumn || - field.type === FieldTypes.FORMULA - ) { - continue - } - // if its an empty string then it means return the column to null (if possible) - if (row[key] === "") { - newRow[key] = null - continue - } - // parse floats/numbers - if (field.type === FieldTypes.NUMBER && !isNaN(parseFloat(row[key]))) { - newRow[key] = parseFloat(row[key]) - } - // if its not a link then just copy it over - if (field.type !== FieldTypes.LINK) { - newRow[key] = row[key] - continue - } - const { tableName: linkTableName } = breakExternalTableId( - field?.tableId - ) - // table has to exist for many to many - if (!linkTableName || !this.tables[linkTableName]) { - continue - } - const linkTable = this.tables[linkTableName] - // @ts-ignore - const linkTablePrimary = linkTable.primary[0] - // one to many - if (isOneSide(field)) { - let id = row[key][0] - if (typeof row[key] === "string") { - id = decodeURIComponent(row[key]).match(/\[(.*?)\]/)?.[1] - } - newRow[field.foreignKey || linkTablePrimary] = breakRowIdField(id)[0] - } - // many to many - else if (field.through) { - // we're not inserting a doc, will be a bunch of update calls - const otherKey: string = field.throughFrom || linkTablePrimary - const thisKey: string = field.throughTo || tablePrimary - row[key].map((relationship: any) => { - manyRelationships.push({ - tableId: field.through || field.tableId, - isUpdate: false, - key: otherKey, - [otherKey]: breakRowIdField(relationship)[0], - // leave the ID for enrichment later - [thisKey]: `{{ literal ${tablePrimary} }}`, - }) - }) - } - // many to one - else { - const thisKey: string = "id" - // @ts-ignore - const otherKey: string = field.fieldName - row[key].map((relationship: any) => { - manyRelationships.push({ - tableId: field.tableId, - isUpdate: true, - key: otherKey, - [thisKey]: breakRowIdField(relationship)[0], - // leave the ID for enrichment later - [otherKey]: `{{ literal ${tablePrimary} }}`, - }) - }) - } - } - // we return the relationships that may need to be created in the through table - // we do this so that if the ID is generated by the DB it can be inserted - // after the fact - return { row: newRow, manyRelationships } - } - - squashRelationshipColumns( - table: Table, - row: Row, - relationships: RelationshipsJson[] - ): Row { - for (let relationship of relationships) { - const linkedTable = this.tables[relationship.tableName] - if (!linkedTable || !row[relationship.column]) { - continue - } - const display = linkedTable.primaryDisplay - for (let key of Object.keys(row[relationship.column])) { - const related: Row = row[relationship.column][key] - row[relationship.column][key] = { - primaryDisplay: display ? related[display] : undefined, - _id: related._id, - } - } - } - return row - } - - /** - * This iterates through the returned rows and works out what elements of the rows - * actually match up to another row (based on primary keys) - this is pretty specific - * to SQL and the way that SQL relationships are returned based on joins. - * This is complicated, but the idea is that when a SQL query returns all the relations - * will be separate rows, with all of the data in each row. We have to decipher what comes - * from where (which tables) and how to convert that into budibase columns. - */ - updateRelationshipColumns( - table: Table, - row: Row, - rows: { [key: string]: Row }, - relationships: RelationshipsJson[] - ) { - const columns: { [key: string]: any } = {} - for (let relationship of relationships) { - const linkedTable = this.tables[relationship.tableName] - if (!linkedTable) { - continue - } - const fromColumn = `${table.name}.${relationship.from}` - const toColumn = `${linkedTable.name}.${relationship.to}` - // this is important when working with multiple relationships - // between the same tables, don't want to overlap/multiply the relations - if ( - !relationship.through && - row[fromColumn]?.toString() !== row[toColumn]?.toString() - ) { - continue - } - let linked = basicProcessing(row, linkedTable) - if (!linked._id) { - continue - } - columns[relationship.column] = linked - } - for (let [column, related] of Object.entries(columns)) { - if (!row._id) { - continue - } - const rowId: string = row._id - if (!Array.isArray(rows[rowId][column])) { - rows[rowId][column] = [] - } - // make sure relationship hasn't been found already - if ( - !rows[rowId][column].find( - (relation: Row) => relation._id === related._id - ) - ) { - rows[rowId][column].push(related) - } - } - return rows - } - - outputProcessing( - rows: Row[] = [], - table: Table, - relationships: RelationshipsJson[] - ) { - if (!rows || rows.length === 0 || rows[0].read === true) { - return [] - } - let finalRows: { [key: string]: Row } = {} - for (let row of rows) { - const rowId = generateIdForRow(row, table) - row._id = rowId - // this is a relationship of some sort - if (finalRows[rowId]) { - finalRows = this.updateRelationshipColumns( - table, - row, - finalRows, - relationships - ) - continue - } - const thisRow = fixArrayTypes(basicProcessing(row, table), table) - if (thisRow._id == null) { - throw "Unable to generate row ID for SQL rows" - } - finalRows[thisRow._id] = thisRow - // do this at end once its been added to the final rows + let finalRows: { [key: string]: Row } = {} + for (let row of rows) { + const rowId = generateIdForRow(row, table) + row._id = rowId + // this is a relationship of some sort + if (finalRows[rowId]) { finalRows = this.updateRelationshipColumns( table, row, finalRows, relationships ) + continue } - - // Process some additional data types - let finalRowArray = Object.values(finalRows) - finalRowArray = processDates(table, finalRowArray) - finalRowArray = processFormulas(table, finalRowArray) as Row[] - - return finalRowArray.map((row: Row) => - this.squashRelationshipColumns(table, row, relationships) + const thisRow = fixArrayTypes(basicProcessing(row, table), table) + if (thisRow._id == null) { + throw "Unable to generate row ID for SQL rows" + } + finalRows[thisRow._id] = thisRow + // do this at end once its been added to the final rows + finalRows = this.updateRelationshipColumns( + table, + row, + finalRows, + relationships ) } - /** - * Gets the list of relationship JSON structures based on the columns in the table, - * this will be used by the underlying library to build whatever relationship mechanism - * it has (e.g. SQL joins). - */ - buildRelationships(table: Table): RelationshipsJson[] { - const relationships = [] - for (let [fieldName, field] of Object.entries(table.schema)) { - if (field.type !== FieldTypes.LINK) { - continue - } - const { tableName: linkTableName } = breakExternalTableId(field.tableId) - // no table to link to, this is not a valid relationships - if (!linkTableName || !this.tables[linkTableName]) { - continue - } - const linkTable = this.tables[linkTableName] - if (!table.primary || !linkTable.primary) { - continue - } - const definition: any = { - // if no foreign key specified then use the name of the field in other table - from: field.foreignKey || table.primary[0], - to: field.fieldName, - tableName: linkTableName, - // need to specify where to put this back into - column: fieldName, - } - if (field.through) { - const { tableName: throughTableName } = breakExternalTableId( - field.through - ) - definition.through = throughTableName - // don't support composite keys for relationships - definition.from = field.throughTo || table.primary[0] - definition.to = field.throughFrom || linkTable.primary[0] - definition.fromPrimary = table.primary[0] - definition.toPrimary = linkTable.primary[0] - } - relationships.push(definition) - } - return relationships - } + // Process some additional data types + let finalRowArray = Object.values(finalRows) + finalRowArray = processDates(table, finalRowArray) + finalRowArray = processFormulas(table, finalRowArray) as Row[] - /** - * This is a cached lookup, of relationship records, this is mainly for creating/deleting junction - * information. - */ - async lookupRelations(tableId: string, row: Row) { - const related: { [key: string]: any } = {} - const { tableName } = breakExternalTableId(tableId) - if (!tableName) { - return related - } - const table = this.tables[tableName] - // @ts-ignore - const primaryKey = table.primary[0] - // make a new request to get the row with all its relationships - // we need this to work out if any relationships need removed - for (let field of Object.values(table.schema)) { - if ( - field.type !== FieldTypes.LINK || - !field.fieldName || - isOneSide(field) - ) { - continue - } - const isMany = field.relationshipType === RelationshipTypes.MANY_TO_MANY - const tableId = isMany ? field.through : field.tableId - const { tableName: relatedTableName } = breakExternalTableId(tableId) - // @ts-ignore - const linkPrimaryKey = this.tables[relatedTableName].primary[0] - const manyKey = field.throughTo || primaryKey - const lookupField = isMany ? primaryKey : field.foreignKey - const fieldName = isMany ? manyKey : field.fieldName - if (!lookupField || !row[lookupField]) { - continue - } - const response = await getDatasourceAndQuery({ - endpoint: getEndpoint(tableId, DataSourceOperation.READ), - filters: { - equal: { - [fieldName]: row[lookupField], - }, - }, - }) - // this is the response from knex if no rows found - const rows = !response[0].read ? response : [] - const storeTo = isMany ? field.throughFrom || linkPrimaryKey : fieldName - related[storeTo] = { rows, isMany, tableId } - } - return related - } - - /** - * Once a row has been written we may need to update a many field, e.g. updating foreign keys - * in a bunch of rows in another table, or inserting/deleting rows from a junction table (many to many). - * This is quite a complex process and is handled by this function, there are a few things going on here: - * 1. If updating foreign keys its relatively simple, just create a filter for the row that needs updated - * and write the various components. - * 2. If junction table, then we lookup what exists already, write what doesn't exist, work out what - * isn't supposed to exist anymore and delete those. This is better than the usual method of delete them - * all and then re-create, as theres no chance of losing data (e.g. delete succeed, but write fail). - */ - async handleManyRelationships( - mainTableId: string, - row: Row, - relationships: ManyRelationship[] - ) { - // if we're creating (in a through table) need to wipe the existing ones first - const promises = [] - const related = await this.lookupRelations(mainTableId, row) - for (let relationship of relationships) { - const { key, tableId, isUpdate, id, ...rest } = relationship - const body: { [key: string]: any } = processObjectSync(rest, row, {}) - const linkTable = this.getTable(tableId) - // @ts-ignore - const linkPrimary = linkTable?.primary[0] - if (!linkTable || !linkPrimary) { - return - } - const rows = related[key]?.rows || [] - const found = rows.find( - (row: { [key: string]: any }) => - row[linkPrimary] === relationship.id || - row[linkPrimary] === body?.[linkPrimary] - ) - const operation = isUpdate - ? DataSourceOperation.UPDATE - : DataSourceOperation.CREATE - if (!found) { - promises.push( - getDatasourceAndQuery({ - endpoint: getEndpoint(tableId, operation), - // if we're doing many relationships then we're writing, only one response - body, - filters: buildFilters(id, {}, linkTable), - }) - ) - } else { - // remove the relationship from cache so it isn't adjusted again - rows.splice(rows.indexOf(found), 1) - } - } - // finally cleanup anything that needs to be removed - for (let [colName, { isMany, rows, tableId }] of Object.entries( - related - )) { - const table: Table | undefined = this.getTable(tableId) - // if its not the foreign key skip it, nothing to do - if ( - !table || - (table.primary && table.primary.indexOf(colName) !== -1) - ) { - continue - } - for (let row of rows) { - const filters = buildFilters(generateIdForRow(row, table), {}, table) - // safety check, if there are no filters on deletion bad things happen - if (Object.keys(filters).length !== 0) { - const op = isMany - ? DataSourceOperation.DELETE - : DataSourceOperation.UPDATE - const body = isMany ? null : { [colName]: null } - promises.push( - getDatasourceAndQuery({ - endpoint: getEndpoint(tableId, op), - body, - filters, - }) - ) - } - } - } - await Promise.all(promises) - } - - /** - * This function is a bit crazy, but the exact purpose of it is to protect against the scenario in which - * you have column overlap in relationships, e.g. we join a few different tables and they all have the - * concept of an ID, but for some of them it will be null (if they say don't have a relationship). - * Creating the specific list of fields that we desire, and excluding the ones that are no use to us - * is more performant and has the added benefit of protecting against this scenario. - */ - buildFields( - table: Table, - includeRelations: IncludeRelationship = IncludeRelationship.INCLUDE - ) { - function extractRealFields(table: Table, existing: string[] = []) { - return Object.entries(table.schema) - .filter( - column => - column[1].type !== FieldTypes.LINK && - column[1].type !== FieldTypes.FORMULA && - !existing.find((field: string) => field === column[0]) - ) - .map(column => `${table.name}.${column[0]}`) - } - let fields = extractRealFields(table) - for (let field of Object.values(table.schema)) { - if (field.type !== FieldTypes.LINK || !includeRelations) { - continue - } - const { tableName: linkTableName } = breakExternalTableId(field.tableId) - if (linkTableName) { - const linkTable = this.tables[linkTableName] - if (linkTable) { - const linkedFields = extractRealFields(linkTable, fields) - fields = fields.concat(linkedFields) - } - } - } - return fields - } - - async run(config: RunConfig) { - const { operation, tableId } = this - let { datasourceId, tableName } = breakExternalTableId(tableId) - if (!tableName) { - throw "Unable to run without a table name" - } - if (!this.datasource) { - const db = context.getAppDB() - this.datasource = await db.get(datasourceId) - if (!this.datasource || !this.datasource.entities) { - throw "No tables found, fetch tables before query." - } - this.tables = this.datasource.entities - } - const table = this.tables[tableName] - let isSql = isSQL(this.datasource) - if (!table) { - throw `Unable to process query, table "${tableName}" not defined.` - } - // look for specific components of config which may not be considered acceptable - let { id, row, filters, sort, paginate, rows } = cleanupConfig( - config, - table - ) - filters = buildFilters(id, filters || {}, table) - const relationships = this.buildRelationships(table) - // clean up row on ingress using schema - const processed = this.inputProcessing(row, table) - row = processed.row - if ( - operation === DataSourceOperation.DELETE && - (filters == null || Object.keys(filters).length === 0) - ) { - throw "Deletion must be filtered" - } - let json = { - endpoint: { - datasourceId, - entityId: tableName, - operation, - }, - resource: { - // have to specify the fields to avoid column overlap (for SQL) - fields: isSql ? this.buildFields(table) : [], - }, - filters, - sort, - paginate, - relationships, - body: row || rows, - // pass an id filter into extra, purely for mysql/returning - extra: { - idFilter: buildFilters(id || generateIdForRow(row, table), {}, table), - }, - meta: { - table, - }, - } - // can't really use response right now - const response = await getDatasourceAndQuery(json) - // handle many to many relationships now if we know the ID (could be auto increment) - if ( - operation !== DataSourceOperation.READ && - processed.manyRelationships - ) { - await this.handleManyRelationships( - table._id || "", - response[0], - processed.manyRelationships - ) - } - const output = this.outputProcessing(response, table, relationships) - // if reading it'll just be an array of rows, return whole thing - return operation === DataSourceOperation.READ && Array.isArray(response) - ? output - : { row: output[0], table } - } + return finalRowArray.map((row: Row) => + this.squashRelationshipColumns(table, row, relationships) + ) } - module.exports = ExternalRequest + /** + * Gets the list of relationship JSON structures based on the columns in the table, + * this will be used by the underlying library to build whatever relationship mechanism + * it has (e.g. SQL joins). + */ + buildRelationships(table: Table): RelationshipsJson[] { + const relationships = [] + for (let [fieldName, field] of Object.entries(table.schema)) { + if (field.type !== FieldTypes.LINK) { + continue + } + const { tableName: linkTableName } = breakExternalTableId(field.tableId) + // no table to link to, this is not a valid relationships + if (!linkTableName || !this.tables[linkTableName]) { + continue + } + const linkTable = this.tables[linkTableName] + if (!table.primary || !linkTable.primary) { + continue + } + const definition: any = { + // if no foreign key specified then use the name of the field in other table + from: field.foreignKey || table.primary[0], + to: field.fieldName, + tableName: linkTableName, + // need to specify where to put this back into + column: fieldName, + } + if (field.through) { + const { tableName: throughTableName } = breakExternalTableId( + field.through + ) + definition.through = throughTableName + // don't support composite keys for relationships + definition.from = field.throughTo || table.primary[0] + definition.to = field.throughFrom || linkTable.primary[0] + definition.fromPrimary = table.primary[0] + definition.toPrimary = linkTable.primary[0] + } + relationships.push(definition) + } + return relationships + } + + /** + * This is a cached lookup, of relationship records, this is mainly for creating/deleting junction + * information. + */ + async lookupRelations(tableId: string, row: Row) { + const related: { [key: string]: any } = {} + const { tableName } = breakExternalTableId(tableId) + if (!tableName) { + return related + } + const table = this.tables[tableName] + // @ts-ignore + const primaryKey = table.primary[0] + // make a new request to get the row with all its relationships + // we need this to work out if any relationships need removed + for (let field of Object.values(table.schema)) { + if ( + field.type !== FieldTypes.LINK || + !field.fieldName || + isOneSide(field) + ) { + continue + } + const isMany = field.relationshipType === RelationshipTypes.MANY_TO_MANY + const tableId = isMany ? field.through : field.tableId + const { tableName: relatedTableName } = breakExternalTableId(tableId) + // @ts-ignore + const linkPrimaryKey = this.tables[relatedTableName].primary[0] + const manyKey = field.throughTo || primaryKey + const lookupField = isMany ? primaryKey : field.foreignKey + const fieldName = isMany ? manyKey : field.fieldName + if (!lookupField || !row[lookupField]) { + continue + } + const response = await getDatasourceAndQuery({ + endpoint: getEndpoint(tableId, Operation.READ), + filters: { + equal: { + [fieldName]: row[lookupField], + }, + }, + }) + // this is the response from knex if no rows found + const rows = !response[0].read ? response : [] + const storeTo = isMany ? field.throughFrom || linkPrimaryKey : fieldName + related[storeTo] = { rows, isMany, tableId } + } + return related + } + + /** + * Once a row has been written we may need to update a many field, e.g. updating foreign keys + * in a bunch of rows in another table, or inserting/deleting rows from a junction table (many to many). + * This is quite a complex process and is handled by this function, there are a few things going on here: + * 1. If updating foreign keys its relatively simple, just create a filter for the row that needs updated + * and write the various components. + * 2. If junction table, then we lookup what exists already, write what doesn't exist, work out what + * isn't supposed to exist anymore and delete those. This is better than the usual method of delete them + * all and then re-create, as theres no chance of losing data (e.g. delete succeed, but write fail). + */ + async handleManyRelationships( + mainTableId: string, + row: Row, + relationships: ManyRelationship[] + ) { + // if we're creating (in a through table) need to wipe the existing ones first + const promises = [] + const related = await this.lookupRelations(mainTableId, row) + for (let relationship of relationships) { + const { key, tableId, isUpdate, id, ...rest } = relationship + const body: { [key: string]: any } = processObjectSync(rest, row, {}) + const linkTable = this.getTable(tableId) + // @ts-ignore + const linkPrimary = linkTable?.primary[0] + if (!linkTable || !linkPrimary) { + return + } + const rows = related[key]?.rows || [] + const found = rows.find( + (row: { [key: string]: any }) => + row[linkPrimary] === relationship.id || + row[linkPrimary] === body?.[linkPrimary] + ) + const operation = isUpdate ? Operation.UPDATE : Operation.CREATE + if (!found) { + promises.push( + getDatasourceAndQuery({ + endpoint: getEndpoint(tableId, operation), + // if we're doing many relationships then we're writing, only one response + body, + filters: buildFilters(id, {}, linkTable), + }) + ) + } else { + // remove the relationship from cache so it isn't adjusted again + rows.splice(rows.indexOf(found), 1) + } + } + // finally cleanup anything that needs to be removed + for (let [colName, { isMany, rows, tableId }] of Object.entries(related)) { + const table: Table | undefined = this.getTable(tableId) + // if its not the foreign key skip it, nothing to do + if (!table || (table.primary && table.primary.indexOf(colName) !== -1)) { + continue + } + for (let row of rows) { + const filters = buildFilters(generateIdForRow(row, table), {}, table) + // safety check, if there are no filters on deletion bad things happen + if (Object.keys(filters).length !== 0) { + const op = isMany ? Operation.DELETE : Operation.UPDATE + const body = isMany ? null : { [colName]: null } + promises.push( + getDatasourceAndQuery({ + endpoint: getEndpoint(tableId, op), + body, + filters, + }) + ) + } + } + } + await Promise.all(promises) + } + + /** + * This function is a bit crazy, but the exact purpose of it is to protect against the scenario in which + * you have column overlap in relationships, e.g. we join a few different tables and they all have the + * concept of an ID, but for some of them it will be null (if they say don't have a relationship). + * Creating the specific list of fields that we desire, and excluding the ones that are no use to us + * is more performant and has the added benefit of protecting against this scenario. + */ + buildFields( + table: Table, + includeRelations: IncludeRelationship = IncludeRelationship.INCLUDE + ) { + function extractRealFields(table: Table, existing: string[] = []) { + return Object.entries(table.schema) + .filter( + column => + column[1].type !== FieldTypes.LINK && + column[1].type !== FieldTypes.FORMULA && + !existing.find((field: string) => field === column[0]) + ) + .map(column => `${table.name}.${column[0]}`) + } + let fields = extractRealFields(table) + for (let field of Object.values(table.schema)) { + if (field.type !== FieldTypes.LINK || !includeRelations) { + continue + } + const { tableName: linkTableName } = breakExternalTableId(field.tableId) + if (linkTableName) { + const linkTable = this.tables[linkTableName] + if (linkTable) { + const linkedFields = extractRealFields(linkTable, fields) + fields = fields.concat(linkedFields) + } + } + } + return fields + } + + async run(config: RunConfig) { + const { operation, tableId } = this + let { datasourceId, tableName } = breakExternalTableId(tableId) + if (!tableName) { + throw "Unable to run without a table name" + } + if (!this.datasource) { + const db = context.getAppDB() + this.datasource = await db.get(datasourceId) + if (!this.datasource || !this.datasource.entities) { + throw "No tables found, fetch tables before query." + } + this.tables = this.datasource.entities + } + const table = this.tables[tableName] + let isSql = isSQL(this.datasource) + if (!table) { + throw `Unable to process query, table "${tableName}" not defined.` + } + // look for specific components of config which may not be considered acceptable + let { id, row, filters, sort, paginate, rows } = cleanupConfig( + config, + table + ) + filters = buildFilters(id, filters || {}, table) + const relationships = this.buildRelationships(table) + // clean up row on ingress using schema + const processed = this.inputProcessing(row, table) + row = processed.row + if ( + operation === Operation.DELETE && + (filters == null || Object.keys(filters).length === 0) + ) { + throw "Deletion must be filtered" + } + let json = { + endpoint: { + datasourceId, + entityId: tableName, + operation, + }, + resource: { + // have to specify the fields to avoid column overlap (for SQL) + fields: isSql ? this.buildFields(table) : [], + }, + filters, + sort, + paginate, + relationships, + body: row || rows, + // pass an id filter into extra, purely for mysql/returning + extra: { + idFilter: buildFilters(id || generateIdForRow(row, table), {}, table), + }, + meta: { + table, + }, + } + // can't really use response right now + const response = await getDatasourceAndQuery(json) + // handle many to many relationships now if we know the ID (could be auto increment) + if (operation !== Operation.READ && processed.manyRelationships) { + await this.handleManyRelationships( + table._id || "", + response[0], + processed.manyRelationships + ) + } + const output = this.outputProcessing(response, table, relationships) + // if reading it'll just be an array of rows, return whole thing + return operation === Operation.READ && Array.isArray(response) + ? output + : { row: output[0], table } + } } diff --git a/packages/server/src/api/controllers/row/external.js b/packages/server/src/api/controllers/row/external.ts similarity index 63% rename from packages/server/src/api/controllers/row/external.js rename to packages/server/src/api/controllers/row/external.ts index e0c3a9ee4d..83564564b8 100644 --- a/packages/server/src/api/controllers/row/external.js +++ b/packages/server/src/api/controllers/row/external.ts @@ -1,104 +1,117 @@ -const { - DataSourceOperation, +import { SortDirection, FieldTypes, NoEmptyFilterStrings, -} = require("../../../constants") -const { +} from "../../../constants" +import { breakExternalTableId, breakRowIdField, -} = require("../../../integrations/utils") -const ExternalRequest = require("./ExternalRequest") -const { context } = require("@budibase/backend-core") -const exporters = require("../view/exporters") -const { apiFileReturn } = require("../../../utilities/fileSystem") +} from "../../../integrations/utils" +import { ExternalRequest, RunConfig } from "./ExternalRequest" +import { context } from "@budibase/backend-core" +import * as exporters from "../view/exporters" +import { apiFileReturn } from "../../../utilities/fileSystem" +import { + Operation, + BBContext, + Row, + PaginationJson, + Table, + Datasource, +} from "@budibase/types" -async function handleRequest(operation, tableId, opts = {}) { +export async function handleRequest( + operation: Operation, + tableId: string, + opts?: RunConfig +) { // make sure the filters are cleaned up, no empty strings for equals, fuzzy or string if (opts && opts.filters) { for (let filterField of NoEmptyFilterStrings) { if (!opts.filters[filterField]) { continue } + // @ts-ignore for (let [key, value] of Object.entries(opts.filters[filterField])) { if (!value || value === "") { + // @ts-ignore delete opts.filters[filterField][key] } } } } - return new ExternalRequest(operation, tableId, opts.datasource).run(opts) + return new ExternalRequest(operation, tableId, opts?.datasource).run( + opts || {} + ) } -exports.handleRequest = handleRequest - -exports.patch = async ctx => { +export async function patch(ctx: BBContext) { const inputs = ctx.request.body const tableId = ctx.params.tableId const id = inputs._id // don't save the ID to db delete inputs._id - return handleRequest(DataSourceOperation.UPDATE, tableId, { + return handleRequest(Operation.UPDATE, tableId, { id: breakRowIdField(id), row: inputs, }) } -exports.save = async ctx => { +export async function save(ctx: BBContext) { const inputs = ctx.request.body const tableId = ctx.params.tableId - return handleRequest(DataSourceOperation.CREATE, tableId, { + return handleRequest(Operation.CREATE, tableId, { row: inputs, }) } -exports.fetchView = async ctx => { +export async function fetchView(ctx: BBContext) { // there are no views in external datasources, shouldn't ever be called // for now just fetch const split = ctx.params.viewName.split("all_") ctx.params.tableId = split[1] ? split[1] : split[0] - return exports.fetch(ctx) + return fetch(ctx) } -exports.fetch = async ctx => { +export async function fetch(ctx: BBContext) { const tableId = ctx.params.tableId - return handleRequest(DataSourceOperation.READ, tableId) + return handleRequest(Operation.READ, tableId) } -exports.find = async ctx => { +export async function find(ctx: BBContext) { const id = ctx.params.rowId const tableId = ctx.params.tableId - const response = await handleRequest(DataSourceOperation.READ, tableId, { + const response = (await handleRequest(Operation.READ, tableId, { id: breakRowIdField(id), - }) + })) as Row[] return response ? response[0] : response } -exports.destroy = async ctx => { +export async function destroy(ctx: BBContext) { const tableId = ctx.params.tableId const id = ctx.request.body._id - const { row } = await handleRequest(DataSourceOperation.DELETE, tableId, { + const { row } = (await handleRequest(Operation.DELETE, tableId, { id: breakRowIdField(id), - }) + })) as { row: Row } return { response: { ok: true }, row } } -exports.bulkDestroy = async ctx => { +export async function bulkDestroy(ctx: BBContext) { const { rows } = ctx.request.body const tableId = ctx.params.tableId let promises = [] for (let row of rows) { promises.push( - handleRequest(DataSourceOperation.DELETE, tableId, { + handleRequest(Operation.DELETE, tableId, { id: breakRowIdField(row._id), }) ) } - const responses = await Promise.all(promises) + const responses = (await Promise.all(promises)) as { row: Row }[] return { response: { ok: true }, rows: responses.map(resp => resp.row) } } -exports.search = async ctx => { +export async function search(ctx: BBContext) { const tableId = ctx.params.tableId const { paginate, query, ...params } = ctx.request.body let { bookmark, limit } = params @@ -129,26 +142,26 @@ exports.search = async ctx => { } } try { - const rows = await handleRequest(DataSourceOperation.READ, tableId, { + const rows = (await handleRequest(Operation.READ, tableId, { filters: query, sort, - paginate: paginateObj, - }) + paginate: paginateObj as PaginationJson, + })) as Row[] let hasNextPage = false if (paginate && rows.length === limit) { - const nextRows = await handleRequest(DataSourceOperation.READ, tableId, { + const nextRows = (await handleRequest(Operation.READ, tableId, { filters: query, sort, paginate: { limit: 1, page: bookmark * limit + 1, }, - }) + })) as Row[] hasNextPage = nextRows.length > 0 } // need wrapper object for bookmarks etc when paginating return { rows, hasNextPage, bookmark: bookmark + 1 } - } catch (err) { + } catch (err: any) { if (err.message && err.message.includes("does not exist")) { throw new Error( `Table updated externally, please re-fetch - ${err.message}` @@ -159,12 +172,12 @@ exports.search = async ctx => { } } -exports.validate = async () => { +export async function validate(ctx: BBContext) { // can't validate external right now - maybe in future return { valid: true } } -exports.exportRows = async ctx => { +export async function exportRows(ctx: BBContext) { const { datasourceId } = breakExternalTableId(ctx.params.tableId) const db = context.getAppDB() const format = ctx.query.format @@ -176,13 +189,15 @@ exports.exportRows = async ctx => { ctx.request.body = { query: { oneOf: { - _id: ctx.request.body.rows.map(row => JSON.parse(decodeURI(row))[0]), + _id: ctx.request.body.rows.map( + (row: string) => JSON.parse(decodeURI(row))[0] + ), }, }, } - let result = await exports.search(ctx) - let rows = [] + let result = await search(ctx) + let rows: Row[] = [] // Filter data to only specified columns if required if (columns && columns.length) { @@ -197,6 +212,7 @@ exports.exportRows = async ctx => { } let headers = Object.keys(rows[0]) + // @ts-ignore const exporter = exporters[format] const filename = `export.${format}` @@ -205,21 +221,24 @@ exports.exportRows = async ctx => { return apiFileReturn(exporter(headers, rows)) } -exports.fetchEnrichedRow = async ctx => { +export async function fetchEnrichedRow(ctx: BBContext) { const id = ctx.params.rowId const tableId = ctx.params.tableId const { datasourceId, tableName } = breakExternalTableId(tableId) const db = context.getAppDB() - const datasource = await db.get(datasourceId) + const datasource: Datasource = await db.get(datasourceId) + if (!tableName) { + ctx.throw(400, "Unable to find table.") + } if (!datasource || !datasource.entities) { ctx.throw(400, "Datasource has not been configured for plus API.") } const tables = datasource.entities - const response = await handleRequest(DataSourceOperation.READ, tableId, { + const response = (await handleRequest(Operation.READ, tableId, { id, datasource, - }) - const table = tables[tableName] + })) as Row[] + const table: Table = tables[tableName] const row = response[0] // this seems like a lot of work, but basically we need to dig deeper for the enrich // for a single row, there is probably a better way to do this with some smart multi-layer joins @@ -233,21 +252,19 @@ exports.fetchEnrichedRow = async ctx => { } const links = row[fieldName] const linkedTableId = field.tableId - const linkedTable = tables[breakExternalTableId(linkedTableId).tableName] + const linkedTableName = breakExternalTableId(linkedTableId).tableName! + const linkedTable = tables[linkedTableName] // don't support composite keys right now - const linkedIds = links.map(link => breakRowIdField(link._id)[0]) - row[fieldName] = await handleRequest( - DataSourceOperation.READ, - linkedTableId, - { - tables, - filters: { - oneOf: { - [linkedTable.primary]: linkedIds, - }, + const linkedIds = links.map((link: Row) => breakRowIdField(link._id!)[0]) + const primaryLink = linkedTable.primary?.[0] as string + row[fieldName] = await handleRequest(Operation.READ, linkedTableId!, { + tables, + filters: { + oneOf: { + [primaryLink]: linkedIds, }, - } - ) + }, + }) } return row } diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts index 98a89a5038..ea3277cd59 100644 --- a/packages/server/src/api/controllers/row/internal.ts +++ b/packages/server/src/api/controllers/row/internal.ts @@ -191,7 +191,7 @@ export async function fetchView(ctx: BBContext) { // if this is a table view being looked for just transfer to that if (viewName.startsWith(DocumentType.TABLE)) { ctx.params.tableId = viewName - return exports.fetch(ctx) + return fetch(ctx) } const db = context.getAppDB() @@ -347,7 +347,7 @@ export async function bulkDestroy(ctx: BBContext) { export async function search(ctx: BBContext) { // Fetch the whole table when running in cypress, as search doesn't work if (!env.COUCH_DB_URL && env.isCypress()) { - return { rows: await exports.fetch(ctx) } + return { rows: await fetch(ctx) } } const { tableId } = ctx.params diff --git a/packages/server/src/api/controllers/table/external.ts b/packages/server/src/api/controllers/table/external.ts index b79ab45660..5257c4e39e 100644 --- a/packages/server/src/api/controllers/table/external.ts +++ b/packages/server/src/api/controllers/table/external.ts @@ -8,11 +8,7 @@ import { foreignKeyStructure, hasTypeChanged, } from "./utils" -import { - DataSourceOperation, - FieldTypes, - RelationshipTypes, -} from "../../../constants" +import { FieldTypes, RelationshipTypes } from "../../../constants" import { makeExternalQuery } from "../../../integrations/base/query" import * as csvParser from "../../../utilities/csvParser" import { handleRequest } from "../row/external" @@ -347,7 +343,7 @@ export async function bulkImport(ctx: BBContext) { ...dataImport, existingTable: table, }) - await handleRequest(DataSourceOperation.BULK_CREATE, table._id, { + await handleRequest(Operation.BULK_CREATE, table._id!, { rows, }) await events.rows.imported(table, "csv", rows.length) diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index 1ccdbfe0da..2212a5e100 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -3,7 +3,6 @@ "target": "es6", "module": "commonjs", "lib": ["es2020"], - "allowJs": true, "strict": true, "noImplicitAny": true, "esModuleInterop": true, @@ -23,4 +22,4 @@ "**/*.spec.ts", "**/*.spec.js" ] -} \ No newline at end of file +} From 6ac4669f0ac02b58a512e63bbd92fef8683b04ef Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Sat, 26 Nov 2022 21:26:19 +0000 Subject: [PATCH 080/179] Fixing some issues detected by testing. --- packages/backend-core/src/db/utils.ts | 2 +- packages/backend-core/src/newid.ts | 5 +++++ packages/backend-core/src/utils/hashing.ts | 6 +----- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 packages/backend-core/src/newid.ts diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts index 558dde1e3b..cfab451de4 100644 --- a/packages/backend-core/src/db/utils.ts +++ b/packages/backend-core/src/db/utils.ts @@ -1,4 +1,4 @@ -import { newid } from "../utils" +import { newid } from "../utils/hashing" import { DEFAULT_TENANT_ID, Config } from "../constants" import env from "../environment" import { diff --git a/packages/backend-core/src/newid.ts b/packages/backend-core/src/newid.ts new file mode 100644 index 0000000000..5676c23f48 --- /dev/null +++ b/packages/backend-core/src/newid.ts @@ -0,0 +1,5 @@ +import { v4 } from "uuid" + +export function newid() { + return v4().replace(/-/g, "") +} diff --git a/packages/backend-core/src/utils/hashing.ts b/packages/backend-core/src/utils/hashing.ts index d9277ee3e7..220ffea47f 100644 --- a/packages/backend-core/src/utils/hashing.ts +++ b/packages/backend-core/src/utils/hashing.ts @@ -1,6 +1,6 @@ import env from "../environment" +export * from "../newid" const bcrypt = env.JS_BCRYPT ? require("bcryptjs") : require("bcrypt") -import { v4 } from "uuid" const SALT_ROUNDS = env.SALT_ROUNDS || 10 @@ -12,7 +12,3 @@ export async function hash(data: string) { export async function compare(data: string, encrypted: string) { return bcrypt.compare(data, encrypted) } - -export function newid() { - return v4().replace(/-/g, "") -} From d90b9b030c08493110c2b8675646d51b144bf922 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Sun, 27 Nov 2022 13:49:45 +0000 Subject: [PATCH 081/179] v2.1.37 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 0b650e7dab..f97ceed3f1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.36", + "version": "2.1.37", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 75d546bf92..c055509b96 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.36", + "version": "2.1.37", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.36", + "@budibase/types": "^2.1.37", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 8523ae3475..7a18fa433f 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.36", + "version": "2.1.37", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.36", + "@budibase/string-templates": "^2.1.37", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index ad407a9cea..9100958613 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.36", + "version": "2.1.37", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.36", - "@budibase/client": "^2.1.36", - "@budibase/frontend-core": "^2.1.36", - "@budibase/string-templates": "^2.1.36", + "@budibase/bbui": "^2.1.37", + "@budibase/client": "^2.1.37", + "@budibase/frontend-core": "^2.1.37", + "@budibase/string-templates": "^2.1.37", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index c30f448f7e..c926a745e9 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.36", + "version": "2.1.37", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.36", - "@budibase/string-templates": "^2.1.36", - "@budibase/types": "^2.1.36", + "@budibase/backend-core": "^2.1.37", + "@budibase/string-templates": "^2.1.37", + "@budibase/types": "^2.1.37", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 32796a1015..694b0e3d66 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.36", + "version": "2.1.37", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.36", - "@budibase/frontend-core": "^2.1.36", - "@budibase/string-templates": "^2.1.36", + "@budibase/bbui": "^2.1.37", + "@budibase/frontend-core": "^2.1.37", + "@budibase/string-templates": "^2.1.37", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 7f7a7cfbe0..1859da883d 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.36", + "version": "2.1.37", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.36", + "@budibase/bbui": "^2.1.37", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 50aa251772..8f827e91ef 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.36", + "version": "2.1.37", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 24b9f6c75c..3f169e3fdf 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.36", + "version": "2.1.37", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.36", - "@budibase/client": "^2.1.36", + "@budibase/backend-core": "^2.1.37", + "@budibase/client": "^2.1.37", "@budibase/pro": "2.1.36", - "@budibase/string-templates": "^2.1.36", - "@budibase/types": "^2.1.36", + "@budibase/string-templates": "^2.1.37", + "@budibase/types": "^2.1.37", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ac6a21a4fe..2ac8ee0989 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.36", + "version": "2.1.37", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 26ca49f322..e784ac6275 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.36", + "version": "2.1.37", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 2b1fd745c3..f5e23a7921 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.36", + "version": "2.1.37", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.36", + "@budibase/backend-core": "^2.1.37", "@budibase/pro": "2.1.36", - "@budibase/string-templates": "^2.1.36", - "@budibase/types": "^2.1.36", + "@budibase/string-templates": "^2.1.37", + "@budibase/types": "^2.1.37", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 2697b01fea0237f9a649cd67917c4cfdd96ed8b3 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Sun, 27 Nov 2022 13:53:06 +0000 Subject: [PATCH 082/179] Update pro version to 2.1.37 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 3f169e3fdf..60a00cc9c8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.37", "@budibase/client": "^2.1.37", - "@budibase/pro": "2.1.36", + "@budibase/pro": "2.1.37", "@budibase/string-templates": "^2.1.37", "@budibase/types": "^2.1.37", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5025592e36..ea51dde035 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.36": - version "2.1.36" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.36.tgz#85cb614287bf87e9d4650b49e61afaccce32dcc6" - integrity sha512-TXh9eQHwPFCI1m205nWdnEmMSez6rBoS0Ygs+YkUERxGEcFCAcF1WQ/i8jN03hvgHNcA3ZDvuVQq1UuzzmylSg== +"@budibase/backend-core@2.1.37": + version "2.1.37" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.37.tgz#365f79a5a99dc33b976c099063a8b00fb02a3745" + integrity sha512-UIL/JJDsaHEX0F6r56qYfEmPpCEl60FG0EUmomtoY91XZadpEfEgyvU+UaH8bfDUyzuy1uzW6E8+bALwLBE7qg== dependencies: - "@budibase/types" "^2.1.36" + "@budibase/types" "^2.1.37" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.36": - version "2.1.36" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.36.tgz#38e40f6b72eb9d6ea7b780e2951f67803757c553" - integrity sha512-kRXj8inF8QXGj5s7Ndfit/6LX+rpDfXX0HsTlceUHDlMROIEzNXGrv6bljZRjNzztqsdT3oV9GZ67NyLzOOSyQ== +"@budibase/pro@2.1.37": + version "2.1.37" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.37.tgz#9fedfd0e25fd99b05a0610e61e7752e1e837b920" + integrity sha512-TZIloXh5cjFxPGjunZwSe6GERn7stT0CMzf0fADy/N2IgW0AyvxUoWRqZbTqiwc2X0ybcr+Pxd4A61m6BCnrYw== dependencies: - "@budibase/backend-core" "2.1.36" - "@budibase/types" "2.1.36" + "@budibase/backend-core" "2.1.37" + "@budibase/types" "2.1.37" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.36", "@budibase/types@^2.1.36": - version "2.1.36" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.36.tgz#12275dcb043dc17be6ac0b9479f5c177110fb2a1" - integrity sha512-KxDpMcFW3nJCTPT4DkXmttURqMxHIT0ShOL4PopXxZvY6zxq/mkJxbq/FvAdS6VGXhNBAJEtQRokRafpqC3wNg== +"@budibase/types@2.1.37", "@budibase/types@^2.1.37": + version "2.1.37" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.37.tgz#ea3823f868313a41678df39f2e2f54e60c8f356b" + integrity sha512-uoLO6VXpm8x2B6JZXH1SQP1ihxqJS/tpBBNNcb/bxihdw9ikwVf/LE6T1cVCCaJejTA5yE+6CrzACtgS9lYJEw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index f5e23a7921..775c8eb032 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.37", - "@budibase/pro": "2.1.36", + "@budibase/pro": "2.1.37", "@budibase/string-templates": "^2.1.37", "@budibase/types": "^2.1.37", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index f51304f9bd..7556bdab4f 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.36": - version "2.1.36" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.36.tgz#85cb614287bf87e9d4650b49e61afaccce32dcc6" - integrity sha512-TXh9eQHwPFCI1m205nWdnEmMSez6rBoS0Ygs+YkUERxGEcFCAcF1WQ/i8jN03hvgHNcA3ZDvuVQq1UuzzmylSg== +"@budibase/backend-core@2.1.37": + version "2.1.37" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.37.tgz#365f79a5a99dc33b976c099063a8b00fb02a3745" + integrity sha512-UIL/JJDsaHEX0F6r56qYfEmPpCEl60FG0EUmomtoY91XZadpEfEgyvU+UaH8bfDUyzuy1uzW6E8+bALwLBE7qg== dependencies: - "@budibase/types" "^2.1.36" + "@budibase/types" "^2.1.37" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.36": - version "2.1.36" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.36.tgz#38e40f6b72eb9d6ea7b780e2951f67803757c553" - integrity sha512-kRXj8inF8QXGj5s7Ndfit/6LX+rpDfXX0HsTlceUHDlMROIEzNXGrv6bljZRjNzztqsdT3oV9GZ67NyLzOOSyQ== +"@budibase/pro@2.1.37": + version "2.1.37" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.37.tgz#9fedfd0e25fd99b05a0610e61e7752e1e837b920" + integrity sha512-TZIloXh5cjFxPGjunZwSe6GERn7stT0CMzf0fADy/N2IgW0AyvxUoWRqZbTqiwc2X0ybcr+Pxd4A61m6BCnrYw== dependencies: - "@budibase/backend-core" "2.1.36" - "@budibase/types" "2.1.36" + "@budibase/backend-core" "2.1.37" + "@budibase/types" "2.1.37" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.36", "@budibase/types@^2.1.36": - version "2.1.36" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.36.tgz#12275dcb043dc17be6ac0b9479f5c177110fb2a1" - integrity sha512-KxDpMcFW3nJCTPT4DkXmttURqMxHIT0ShOL4PopXxZvY6zxq/mkJxbq/FvAdS6VGXhNBAJEtQRokRafpqC3wNg== +"@budibase/types@2.1.37", "@budibase/types@^2.1.37": + version "2.1.37" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.37.tgz#ea3823f868313a41678df39f2e2f54e60c8f356b" + integrity sha512-uoLO6VXpm8x2B6JZXH1SQP1ihxqJS/tpBBNNcb/bxihdw9ikwVf/LE6T1cVCCaJejTA5yE+6CrzACtgS9lYJEw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From a42e1119b4fefee1259e694f3f1ee834763adea7 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Sun, 27 Nov 2022 22:00:34 +0000 Subject: [PATCH 083/179] bump posthog-js version --- packages/builder/package.json | 2 +- packages/builder/yarn.lock | 1018 ++++++++++++++++++++++++++++++++- 2 files changed, 1003 insertions(+), 17 deletions(-) diff --git a/packages/builder/package.json b/packages/builder/package.json index 9100958613..fce5e7d92e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -82,7 +82,7 @@ "dayjs": "^1.11.2", "downloadjs": "1.4.7", "lodash": "4.17.21", - "posthog-js": "1.4.5", + "posthog-js": "^1.36.0", "remixicon": "2.5.0", "shortid": "2.2.15", "svelte-dnd-action": "^0.9.8", diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index 6551981a9e..2c5409a128 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@adobe/spectrum-css-workflow-icons@^1.2.1": + version "1.5.4" + resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.5.4.tgz#0e09ff519c36139176c3ba3ce617a995c9032f67" + integrity sha512-sZ19YOLGw5xTZzCEkVXPjf53lXVzo063KmDTJjpSjy/XLVsF+RaX0b436SfSM4hsIUZ7n27+UsbOvzFaFjcYXw== + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" @@ -915,6 +920,136 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/bbui@^2.1.37": + version "2.1.37" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.1.37.tgz#7706e99a9ea1a0e7f6bbac2301a68fb444b48725" + integrity sha512-8MhA4xACWCfqt09k690EdzcVLG/8z+DbfnPRwGU/p9fQKIieqTWS0/MKI1s7AUzKDxqbogAzwQpmwhEjYzARdQ== + dependencies: + "@adobe/spectrum-css-workflow-icons" "^1.2.1" + "@budibase/string-templates" "^2.1.37" + "@spectrum-css/actionbutton" "^1.0.1" + "@spectrum-css/actiongroup" "^1.0.1" + "@spectrum-css/avatar" "^3.0.2" + "@spectrum-css/button" "^3.0.1" + "@spectrum-css/buttongroup" "^3.0.2" + "@spectrum-css/checkbox" "^3.0.2" + "@spectrum-css/dialog" "^3.0.1" + "@spectrum-css/divider" "^1.0.3" + "@spectrum-css/dropzone" "^3.0.2" + "@spectrum-css/fieldgroup" "^3.0.2" + "@spectrum-css/fieldlabel" "^3.0.1" + "@spectrum-css/icon" "^3.0.1" + "@spectrum-css/illustratedmessage" "^3.0.2" + "@spectrum-css/inlinealert" "^2.0.1" + "@spectrum-css/inputgroup" "^3.0.2" + "@spectrum-css/label" "^2.0.10" + "@spectrum-css/link" "^3.1.1" + "@spectrum-css/menu" "^3.0.1" + "@spectrum-css/modal" "^3.0.1" + "@spectrum-css/pagination" "^3.0.3" + "@spectrum-css/picker" "^1.0.1" + "@spectrum-css/popover" "^3.0.1" + "@spectrum-css/progressbar" "^1.0.2" + "@spectrum-css/progresscircle" "^1.0.2" + "@spectrum-css/radio" "^3.0.2" + "@spectrum-css/search" "^3.0.2" + "@spectrum-css/sidenav" "^3.0.2" + "@spectrum-css/slider" "3.0.1" + "@spectrum-css/statuslight" "^3.0.2" + "@spectrum-css/stepper" "^3.0.3" + "@spectrum-css/switch" "^1.0.2" + "@spectrum-css/table" "^3.0.1" + "@spectrum-css/tabs" "^3.2.12" + "@spectrum-css/tags" "^3.0.2" + "@spectrum-css/textfield" "^3.0.1" + "@spectrum-css/toast" "^3.0.1" + "@spectrum-css/tooltip" "^3.0.3" + "@spectrum-css/treeview" "^3.0.2" + "@spectrum-css/typography" "^3.0.1" + "@spectrum-css/underlay" "^2.0.9" + "@spectrum-css/vars" "^3.0.1" + dayjs "^1.10.4" + easymde "^2.16.1" + svelte-flatpickr "^3.2.3" + svelte-portal "^1.0.0" + +"@budibase/client@^2.1.37": + version "2.1.37" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.1.37.tgz#35484f8f47ab4aa46f41edd5a46188506a8b88b8" + integrity sha512-Y9kUlS0LHwrallbDbtx04U9rLBixql6UE0XvY7Gqp6MAZUVg39OjArQaoe4AqX1sjDqAKNBqBb3XLhG+BfvaBw== + dependencies: + "@budibase/bbui" "^2.1.37" + "@budibase/frontend-core" "^2.1.37" + "@budibase/string-templates" "^2.1.37" + "@spectrum-css/button" "^3.0.3" + "@spectrum-css/card" "^3.0.3" + "@spectrum-css/divider" "^1.0.3" + "@spectrum-css/link" "^3.1.3" + "@spectrum-css/page" "^3.0.1" + "@spectrum-css/tag" "^3.1.4" + "@spectrum-css/typography" "^3.0.2" + "@spectrum-css/vars" "^3.0.1" + apexcharts "^3.22.1" + dayjs "^1.10.5" + downloadjs "1.4.7" + html5-qrcode "^2.2.1" + leaflet "^1.7.1" + regexparam "^1.3.0" + sanitize-html "^2.7.0" + screenfull "^6.0.1" + shortid "^2.2.15" + socket.io-client "^4.5.1" + svelte "^3.49.0" + svelte-apexcharts "^1.0.2" + svelte-flatpickr "^3.1.0" + svelte-spa-router "^3.0.5" + +"@budibase/frontend-core@^2.1.37": + version "2.1.37" + resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.1.37.tgz#8796c61cbd3ee6a314301cea000144a49032feb4" + integrity sha512-NEa5BLIT8wDeTH1C5wv7+iP64WhfKQxMy+BlsTPo5zcU73Dpv5hSCXVXtxm5JjWjUS+JjzI9SQWMXVYvVAehrg== + dependencies: + "@budibase/bbui" "^2.1.37" + lodash "^4.17.21" + svelte "^3.46.2" + +"@budibase/handlebars-helpers@^0.11.8": + version "0.11.8" + resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" + integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ== + dependencies: + array-sort "^1.0.0" + define-property "^2.0.2" + extend-shallow "^3.0.2" + for-in "^1.0.2" + get-object "^0.2.0" + get-value "^3.0.1" + handlebars "^4.7.7" + handlebars-utils "^1.0.6" + has-value "^2.0.2" + helper-md "^0.2.2" + html-tag "^2.0.0" + is-even "^1.0.0" + is-glob "^4.0.1" + kind-of "^6.0.3" + micromatch "^3.1.5" + relative "^3.0.2" + striptags "^3.1.1" + to-gfm-code-block "^0.1.1" + year "^0.2.1" + +"@budibase/string-templates@^2.1.37": + version "2.1.37" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.1.37.tgz#5fcefb776283baaf5095c0317e15a8d0ada54d0a" + integrity sha512-ROU5ASgRpkpOT2CNQ2Uy5FtCUJ9ikgcAuI1ec5FdW2EtRkMIJLO4OlcdW4sbx0814BR1fAIOBZ8UB/M8MeTlEg== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.4" + "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1299,6 +1434,11 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.19.1.tgz#8762f668d3fc2416fbde31d15d13009544caeb54" integrity sha512-M5MhTLnjqYFwxMwcFPBpBgYQqI9hCvtVuj/A+NvcBHpe7VWOXdn/Sys+zD6C76DWGFYQdw3OWCsZimP24dL8mA== +"@sentry/types@^7.2.0": + version "7.21.1" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.21.1.tgz#408a7b95a66ddc30c4359979594e03bee8f9fbdc" + integrity sha512-3/IKnd52Ol21amQvI+kz+WB76s8/LR5YvFJzMgIoI2S8d82smIr253zGijRXxHPEif8kMLX4Yt+36VzrLxg6+A== + "@sentry/utils@5.19.1": version "5.19.1" resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.19.1.tgz#e1134db40e4bb9732251e515721cec7ee94d4d9c" @@ -1338,6 +1478,113 @@ dependencies: "@sinonjs/commons" "^1.7.0" +"@socket.io/component-emitter@~3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" + integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== + +"@spectrum-css/actionbutton@^1.0.1": + version "1.1.14" + resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.1.14.tgz#4e12eb7f482fb5944c3d97547591964baebeb1d4" + integrity sha512-ViBjdWi23J6vIR4t8JTRQ6jY/+KgpZgCALj3otgy495zMNG7jPeN7sKoy6i6JZJcdIRJA4MjOTVvcDOGkYWUZg== + +"@spectrum-css/actiongroup@^1.0.1": + version "1.0.26" + resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.26.tgz#181ee059f28b1342389a128c39d20d2e10566aae" + integrity sha512-T1IK9a2Gxix9givm+chGvFtZh5oGBZQc/S2UA9F76JZKu45eCkLkvUH6F670XOrBhDGkVfzvN21QnFymSY43ow== + +"@spectrum-css/avatar@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95" + integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ== + +"@spectrum-css/button@^3.0.1", "@spectrum-css/button@^3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" + integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== + +"@spectrum-css/buttongroup@^3.0.2": + version "3.0.10" + resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.10.tgz#897ea04b3ffea389fc7fe5bf67a6d1f3454b774d" + integrity sha512-U7D24vgHYhlqOyaLJZ5LPskDAuD7cGZktmWvXtvLqG6RFyTr7JHn5oPRuo6mLzaggIHqCdJylOjZ4FHqT4LpTQ== + +"@spectrum-css/card@^3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b" + integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg== + +"@spectrum-css/checkbox@^3.0.2": + version "3.1.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.1.3.tgz#584cdea28a4e7e203314bfeccf69d6d1ab3799af" + integrity sha512-c1l8jQCj/CniHNNvZR/wr/PM8C/EuwhFyWXwzfr2npkgnWqdbcooIa0QfDRYtVy9U5/N8MM2IDLiZ8kPf7LKqQ== + +"@spectrum-css/dialog@^3.0.1": + version "3.0.12" + resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.12.tgz#fc97e002ca768a3d99dd10cb6a135c2b06052004" + integrity sha512-50rbFa+9eUKT+3uYBX7CkmI7SbQ0Z3CAFwjyjai+itYZ8kf/FcHVFwcLjgrry9scUnKhexMs94kkr0gfQpPe8Q== + +"@spectrum-css/divider@^1.0.3": + version "1.0.27" + resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.27.tgz#435bf738a65b4eb15c899edf5c536bea22f2d679" + integrity sha512-hWKPHOEo9lkOGN5zecpVVwVxE3x0SJHQJKDNx1g0xs/P/AthAboK+L1c9Rq29czNfcQ2kUjumi4igzQzcqABMQ== + dependencies: + "@spectrum-css/vars" "^8.0.0" + +"@spectrum-css/dropzone@^3.0.2": + version "3.0.26" + resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.26.tgz#d9da999f40643581518e2f56dcac5eb46e5269b2" + integrity sha512-YUHIqjJ3vqlF4wsyCC7VEHaV4KsbT35FnmyGvykJg5kcbXHHkVa2ioyRrknx4jwqhWWEX8e/SeKxS6k3jd4aFg== + +"@spectrum-css/fieldgroup@^3.0.2": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.1.4.tgz#aede57bda56c41310d262774a8805eefc89ddf74" + integrity sha512-ynqkD1OWicCEW7hgYQWzJUrUih+guJHjDtPbTKYhCbnxPqi6aifKmLstBehCgs4iG4+YfGDdZTppW64A3o5foQ== + +"@spectrum-css/fieldlabel@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.3.tgz#f73c04d20734d4718ffb620dc46458904685b449" + integrity sha512-nEvIkEXCD5n4fW67Unq6Iu7VXoauEd/JGpfTY02VsC5p4FJLnwKfPDbJUuUsqClAxqw7nAsmXVKtn4zQFf5yPQ== + +"@spectrum-css/icon@^3.0.1": + version "3.0.24" + resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.24.tgz#a09a4720b1a54abc1dc22378187f8ba16f0f6404" + integrity sha512-P/HTD9Wgh1o+l0VQtk3XNn9v7dJVprpOSix1MiUKMktKDpIN9013KEOcR2z84/12Bs5atGCs/mvkSHgjKTdNAA== + +"@spectrum-css/illustratedmessage@^3.0.2": + version "3.0.17" + resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.17.tgz#49cb2549fda97a6812156bfba6ccdd3a18bebd11" + integrity sha512-kpDqeq1U+rEjG1XuiXkbGvS71vn6mpFF/hiwCgFJWudVOfypDPQ4KLfYw1ditFSUzMCm5H6U/RqAShAJn8oMWA== + +"@spectrum-css/inlinealert@^2.0.1": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.6.tgz#4c5e923a1f56a96cc1adb30ef1f06ae04f2c6376" + integrity sha512-OpvvoWP02wWyCnF4IgG8SOPkXymovkC9cGtgMS1FdDubnG3tJZB/JeKTsRR9C9Vt3WBaOmISRdSKlZ4lC9CFzA== + +"@spectrum-css/inputgroup@^3.0.2": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.8.tgz#fc23afc8a73c24d17249c9d2337e8b42085b298b" + integrity sha512-cmQWzFp0GU+4IMc8SSeVFdmQDlRUdPelXaQdKUR9mZuO2iYettg37s0lfBCeJyYkUNTagz0zP8O7A0iXfmeE6g== + +"@spectrum-css/label@^2.0.10": + version "2.0.10" + resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001" + integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ== + +"@spectrum-css/link@^3.1.1", "@spectrum-css/link@^3.1.3": + version "3.1.23" + resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.23.tgz#9d9ff64c41366edbfdb19d04a5deec88bf2ea8fd" + integrity sha512-CAJQGnGTrTtR4tF1L94ou9Y+c4vnx9d5rWhb3AMzKb2Focqz02xSkTyaCCH7OM/3CwD8TCLOMANon8LcRpGAjA== + +"@spectrum-css/menu@^3.0.1": + version "3.0.21" + resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.21.tgz#d1f7e6e69d30b5e1edd7ed2c86ea4e08dfd670ab" + integrity sha512-G5AIUO26O6IAc6HUGZu4AZgyw0QRyLfSbcKlFGu4oJHzP36cQc1S1uCh8Xp4g5d+n6mU62LxNDLSMpVbwnA00A== + +"@spectrum-css/modal@^3.0.1": + version "3.0.24" + resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.24.tgz#e321bda4f0676379ff1e78b556ef6f306b3ded65" + integrity sha512-kld3B0PkFNSmcv9vvw6w3E8wwB5fq7S3mIrO3bSb39SmWwG3YIv9/tZPWy+OXUj8CihqsE2y+7fCMECJT3G4Cw== + "@spectrum-css/page@^3.0.1": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.8.tgz#001efa9e4c10095df9b2b37cf7d7d6eb60140190" @@ -1345,6 +1592,116 @@ dependencies: "@spectrum-css/vars" "^4.3.0" +"@spectrum-css/pagination@^3.0.3": + version "3.0.11" + resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.11.tgz#68d9f34fe8eb36bf922e41b11f49eac62ac2fc41" + integrity sha512-wjZr7NAcqHK6fxNIGKTYEVtAOJugJTbcz4d8K7DZuUDgBVwLJJHJBi4uJ4KrIRYliMWOvqWTZzCJLmmTfx4cyw== + +"@spectrum-css/picker@^1.0.1": + version "1.2.13" + resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.2.13.tgz#4a253bda84338187e47cc8b90e7e069e535369ce" + integrity sha512-07Ke3Qb/mwK3is3MZ+APcjuEYRdY1aEgI8GtnLijO8OC98ChrneAJAiLEZuj6NseCIrFEKsrLfqJF+kunxpeAA== + +"@spectrum-css/popover@^3.0.1": + version "3.0.11" + resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.11.tgz#a7450c01bcf1609264b4a9df58821368b9e224d1" + integrity sha512-bzyNQJVw6Mn1EBelTaRlXCdd0ZfykNX9O6SHx3a+jXPYu8VBrRpHm0gsfWzPAz1etd1vj1CxwG/teQt4qvyZ/Q== + +"@spectrum-css/progressbar@^1.0.2": + version "1.0.33" + resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.33.tgz#0fbf815355e3b352ab0965a0d1ff9424c145204e" + integrity sha512-DLNkEd9XsyxSYRyLsV2cy9clByDoHy+GpKGOu7q6STtYYl7Y2hjBvNk9DNaLc78PBCXDf4MJ/j59vl5VmfRctA== + +"@spectrum-css/progresscircle@^1.0.2": + version "1.0.23" + resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.23.tgz#b8872716d2f54bf4bb20d571527f8ee4b04f5c10" + integrity sha512-J6IYhospCebEZ/+82vxBAckl5XATuNPQ5n0QSUFnRxql824x4B/mFhLt/PPLJtPBxEty6OA3GQ4evxAYutqEqQ== + +"@spectrum-css/radio@^3.0.2": + version "3.0.24" + resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.24.tgz#7a08476edf42be2007b75f7765c18c26eb3a9880" + integrity sha512-C/saSKXb3dNCWprsP4iXkFFEmRrxwsdm2Al04myZ6pxOJ4tr1WjHAAtorwUgaUiyR87OnL1mGX2aWrFEN1mvtQ== + +"@spectrum-css/search@^3.0.2": + version "3.1.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.1.2.tgz#8d43f35f884f7c190e7694c8d26a3f2cfed01ef0" + integrity sha512-8cMK1QB07dbReZ/ECyTyoT2dELZ7hK1b3jEDiWSeLBbXcKirR1OI24sZEnewQY/XWFd/62Z1YdNaaA8S6UuXWQ== + +"@spectrum-css/sidenav@^3.0.2": + version "3.0.25" + resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.25.tgz#b9c0c7056269340d876ff28a155ac722aed72aad" + integrity sha512-aEV07fBQebI1MqXSpJ+RQxz1zsRZa0KTfr7iYUxhTjEFc05kbG4F5eIMflySq+w370xBSwCv/SMYB4Ncm+AcgQ== + +"@spectrum-css/slider@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49" + integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q== + +"@spectrum-css/statuslight@^3.0.2": + version "3.0.8" + resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.8.tgz#3b0ea80712573679870a85d469850230e794a0f7" + integrity sha512-zMTHs8lk+I7fLdi9waEEbsCmJ1FxeHcjQ0yltWxuRmGk2vl4MQdQIuHIMI63iblqEaiwnJRjXJoKnWlNvndTJQ== + +"@spectrum-css/stepper@^3.0.3": + version "3.0.28" + resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.28.tgz#f46d6000f67abb46e4903bbf5712050f656dd3c0" + integrity sha512-gBegbFeWzUZouBsxVXkwKPefLsFjKAqt6aBAIDScQiaSgM0tYqENJoABVuodqBMIqUr/DmllNCbca/Ihqwmhjw== + +"@spectrum-css/switch@^1.0.2": + version "1.0.23" + resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.23.tgz#c523c2f528ca16feca57f01b0e703e14f38c0919" + integrity sha512-6ym5p672xPCzfIBn8vtCtswGZ77cXb9BZEMSqwqu9O2MCi1QRPk3ot82SRXqjT2i5yeDgQR2dyBWrjzOh97mJg== + +"@spectrum-css/table@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.3.tgz#7f7f19905ef3275cbf907ce3a5818e63c30b2caf" + integrity sha512-nxwzVjLPsXoY/v4sdxOVYLcC+cEbGgJyLcLclT5LT9MGSbngFeUMJzzVR4EvehzuN4dH7hrATG7Mbuq29Mf0Hg== + +"@spectrum-css/tabs@^3.2.12": + version "3.2.21" + resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.21.tgz#a8888b83d6b74ba05a00cacdb27a1e8bf4639071" + integrity sha512-25WGV1Sih7dW69/RvB1Ts6xVDJDhVEyYZzIGAll0PDST1GjBMHuGblqN/fZpDy/r/rop3GoHIsumtIMvOBdJKw== + +"@spectrum-css/tag@^3.1.4": + version "3.3.15" + resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278" + integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q== + +"@spectrum-css/tags@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac" + integrity sha512-SL8vPxVDfWcY5VdIuyl0TImEXcOU1I7yCyXkk7MudMwfnYs81FaIyY32hFV9OHj0Tz/36UzRzc7AVMSuRQ53pw== + +"@spectrum-css/textfield@^3.0.1": + version "3.2.6" + resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.2.6.tgz#ad55cc6dd64f006fc659150298d3df463118fa24" + integrity sha512-yNTlrteDJcjKJRL7HV7vF2fZ9SLEDaRcLR6Zf2iwe0fdzzY0SXo9LGf0zoVRe47eW3UFrGC1cMyX27y2MMH1ag== + +"@spectrum-css/toast@^3.0.1": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.3.tgz#97c1527384707600832ecda35643ed304615250f" + integrity sha512-CjLeaMs+cjUXojCCRtbj0YkD2BoZW16kjj2o5omkEpUTjA34IJ8xJ1a+CCtDILWekhXvN0MBN4sbumcnwcnx8w== + +"@spectrum-css/tooltip@^3.0.3": + version "3.1.20" + resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.1.20.tgz#c3b6cf274be3ed552f86534f1fede7169827dc83" + integrity sha512-37knTGAjj4GE22M3MQrLa4PyecEc07xOZIle9igfRohXUwHv6ZIyoqy2/cQfmBkeGP6iGEzy8oKJp4nbBKZGsQ== + +"@spectrum-css/treeview@^3.0.2": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.3.tgz#aeda5175158b9f8d7529cb2b394428eb2a428046" + integrity sha512-D5gGzZC/KtRArdx86Mesc9+99W9nTbUOeyYGqoJoAfJSOttoT6Tk5CrDvlCmAqjKf5rajemAkGri1ChqvUIwkw== + +"@spectrum-css/typography@^3.0.1", "@spectrum-css/typography@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" + integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== + +"@spectrum-css/underlay@^2.0.9": + version "2.0.32" + resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.32.tgz#6d3d5ae495d341755beeeccf5469483474f0f777" + integrity sha512-6rV9hHi20wCUig19tyByTkbX3ak3E1qEHOu+Gk0vRcEXRWy1yGoQ4+VTGBp5FRKfbvGfJ9Gu6hqZ6rGTwAVYPQ== + "@spectrum-css/vars@^3.0.1": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999" @@ -1355,6 +1712,11 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-4.3.0.tgz#03ddf67d3aa8a9a4cb0edbbd259465c9ced7e70d" integrity sha512-ZQ2XAhgu4G9yBeXQNDAz07Z8oZNnMt5o9vzf/mpBA7Teb/JI+8qXp2wt8D245SzmtNlFkG/bzRYvQc0scgZeCQ== +"@spectrum-css/vars@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-8.0.0.tgz#b88a3b1165b63de50ab01f20ccafb42115d67443" + integrity sha512-cClQgNyH1VdNu6zdiZ5M7kbQDZS4/wPAclk5IPO5+nMhSzqTesUL/zfiaPB95MTCKFyVJrFpOeJ37HmUifWJ3A== + "@sveltejs/vite-plugin-svelte@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.1.tgz#7f468f03c933fcdfc60d4773671c73f33b9ef4d6" @@ -1466,6 +1828,18 @@ dependencies: "@babel/types" "^7.3.0" +"@types/codemirror@^5.60.4": + version "5.60.5" + resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.5.tgz#5b989a3b4bbe657458cf372c92b6bfda6061a2b7" + integrity sha512-TiECZmm8St5YxjFUp64LK0c8WU5bxMDt9YaAek1UqUb9swrSCoJhh92fWu1p3mTEqlHjhB5sY7OFBhWroJXZVg== + dependencies: + "@types/tern" "*" + +"@types/estree@*": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" + integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== + "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" @@ -1520,6 +1894,11 @@ jest-diff "^27.0.0" pretty-format "^27.0.0" +"@types/marked@^4.0.7": + version "4.0.7" + resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.7.tgz#400a76809fd08c2bbd9e25f3be06ea38c8e0a1d3" + integrity sha512-eEAhnz21CwvKVW+YvRvcTuFKNU9CV1qH+opcgVK3pIMI6YZzDm6gc8o2vHjldFk6MGKt5pueSB7IOpvpx5Qekw== + "@types/minimatch@*": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -1565,6 +1944,13 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== +"@types/tern@*": + version "0.23.4" + resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" + integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg== + dependencies: + "@types/estree" "*" + "@types/testing-library__jest-dom@^5.9.1": version "5.14.1" resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz#014162a5cee6571819d48e999980694e2f657c3c" @@ -1616,7 +2002,7 @@ acorn-walk@^7.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.1.1: +acorn-walk@^8.1.1, acorn-walk@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -1636,6 +2022,11 @@ acorn@^8.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== +acorn@^8.7.0: + version "8.8.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" + integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== + agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -1703,6 +2094,18 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" +apexcharts@^3.19.2, apexcharts@^3.22.1: + version "3.36.3" + resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.36.3.tgz#debd58ded07163d51e00aeb15827d594e0cc8129" + integrity sha512-8/FXEs0ohXMff07Gv28XjhPwEJphIUdq2/wii/pcvi54Tw6z1mjrV8ydN8rlWi/ve8BAPBefJkLmRWv7UOBsLw== + dependencies: + svg.draggable.js "^2.2.2" + svg.easing.js "^2.0.0" + svg.filter.js "^2.0.2" + svg.pathmorphing.js "^0.1.3" + svg.resize.js "^1.4.3" + svg.select.js "^3.0.1" + arch@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" @@ -1713,7 +2116,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.7: +argparse@^1.0.10, argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -1743,6 +2146,15 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= +array-sort@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" + integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== + dependencies: + default-compare "^1.0.0" + get-value "^2.0.6" + kind-of "^5.0.2" + array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -1795,6 +2207,13 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== +autolinker@~0.28.0: + version "0.28.1" + resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" + integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ== + dependencies: + gulp-header "^1.7.1" + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -2200,11 +2619,23 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= +codemirror-spell-checker@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e" + integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ== + dependencies: + typo-js "*" + codemirror@^5.59.0: version "5.63.3" resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.63.3.tgz#97042a242027fe0c87c09b36bc01931d37b76527" integrity sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw== +codemirror@^5.63.1: + version "5.65.10" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.10.tgz#4276a93b8534ce91f14b733ba9a1ac949666eac9" + integrity sha512-IXAG5wlhbgcTJ6rZZcmi4+sjWIbJqIGfeg3tNa3yX84Jb3T4huS5qzQAo/cUisc1l3bI47WZodpyf7cYcocDKg== + collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -2289,6 +2720,13 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= +concat-with-sourcemaps@*: + version "1.1.0" + resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" + integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== + dependencies: + source-map "^0.6.1" + configent@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/configent/-/configent-2.2.0.tgz#2de230fc43f22c47cfd99016aa6962d6f9546994" @@ -2326,6 +2764,11 @@ core-util-is@1.0.2: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== + create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" @@ -2472,6 +2915,11 @@ dayjs@^1.10.4: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== +dayjs@^1.10.5: + version "1.11.6" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.6.tgz#2e79a226314ec3ec904e3ee1dd5a4f5e5b1c7afb" + integrity sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ== + dayjs@^1.11.2: version "1.11.2" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5" @@ -2498,7 +2946,7 @@ debug@^3.1.0: dependencies: ms "^2.1.1" -debug@^4.3.4: +debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -2530,6 +2978,13 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== +default-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" + integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== + dependencies: + kind-of "^5.0.2" + define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -2601,6 +3056,20 @@ dom-accessibility-api@^0.5.6: resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz#caa6d08f60388d0bb4539dd75fe458a9a1d0014c" integrity sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g== +dom-serializer@^1.0.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" + integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.2.0" + entities "^2.0.0" + +domelementtype@^2.0.1, domelementtype@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== + domexception@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" @@ -2608,6 +3077,22 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" +domhandler@^4.0.0, domhandler@^4.2.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" + integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== + dependencies: + domelementtype "^2.2.0" + +domutils@^2.5.2: + version "2.8.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.2.0" + domhandler "^4.2.0" + dotenv@^8.2.0: version "8.6.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" @@ -2623,6 +3108,17 @@ duplexer@~0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== +easymde@^2.16.1: + version "2.18.0" + resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b" + integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA== + dependencies: + "@types/codemirror" "^5.60.4" + "@types/marked" "^4.0.7" + codemirror "^5.63.1" + codemirror-spell-checker "1.1.2" + marked "^4.1.0" + ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -2653,6 +3149,22 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" +engine.io-client@~6.2.3: + version "6.2.3" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458" + integrity sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.1" + engine.io-parser "~5.0.3" + ws "~8.2.3" + xmlhttprequest-ssl "~2.0.0" + +engine.io-parser@~5.0.3: + version "5.0.4" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" + integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg== + enquirer@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" @@ -2660,6 +3172,16 @@ enquirer@^2.3.6: dependencies: ansi-colors "^4.1.1" +ent@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" + integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== + +entities@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" + integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== + error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -2814,6 +3336,11 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" @@ -3061,6 +3588,11 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" +fflate@^0.4.1: + version "0.4.8" + resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae" + integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA== + figures@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -3093,6 +3625,11 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +flatpickr@^4.5.2: + version "4.6.13" + resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94" + integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw== + fn-name@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-3.0.0.tgz#0596707f635929634d791f452309ab41558e3c5c" @@ -3143,6 +3680,11 @@ from@~0: resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= +fs-exists-sync@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" + integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== + fs-extra@^10.0.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" @@ -3219,6 +3761,14 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" +get-object@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" + integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ== + dependencies: + is-number "^2.0.2" + isobject "^0.2.0" + get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -3248,6 +3798,13 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= +get-value@^3.0.0, get-value@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" + integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== + dependencies: + isobject "^3.0.1" + getos@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5" @@ -3334,6 +3891,35 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= +gulp-header@^1.7.1: + version "1.8.12" + resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" + integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== + dependencies: + concat-with-sourcemaps "*" + lodash.template "^4.4.0" + through2 "^2.0.0" + +handlebars-utils@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" + integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== + dependencies: + kind-of "^6.0.0" + typeof-article "^0.1.1" + +handlebars@^4.7.6, handlebars@^4.7.7: + version "4.7.7" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" + integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== + dependencies: + minimist "^1.2.5" + neo-async "^2.6.0" + source-map "^0.6.1" + wordwrap "^1.0.0" + optionalDependencies: + uglify-js "^3.1.4" + harmony-reflect@^1.4.6: version "1.6.2" resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" @@ -3372,6 +3958,14 @@ has-value@^1.0.0: has-values "^1.0.0" isobject "^3.0.0" +has-value@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" + integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== + dependencies: + get-value "^3.0.0" + has-values "^2.0.1" + has-values@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" @@ -3385,6 +3979,13 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" +has-values@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" + integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== + dependencies: + kind-of "^6.0.2" + has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -3392,6 +3993,16 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +helper-md@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" + integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q== + dependencies: + ent "^2.2.0" + extend-shallow "^2.0.1" + fs-exists-sync "^0.1.0" + remarkable "^1.6.2" + hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -3409,6 +4020,29 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== +html-tag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" + integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== + dependencies: + is-self-closing "^1.0.1" + kind-of "^6.0.0" + +html5-qrcode@^2.2.1: + version "2.3.3" + resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.3.tgz#e88fb2088e3475e22e2d938eb7e3df9b90d4ae52" + integrity sha512-3mA9N7wKM+nEFemBo1vCNgypJBFv2WvBXeacLx9b+Z8sueW1cUHq6p5fQ9aIBDK0DNBvtqhhW+79hdJPUHGwrA== + +htmlparser2@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.0.0" + domutils "^2.5.2" + entities "^2.0.0" + http-proxy-agent@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" @@ -3495,7 +4129,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.4: +inherits@2, inherits@^2.0.4, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -3594,6 +4228,13 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-even@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" + integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg== + dependencies: + is-odd "^0.1.2" + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -3636,6 +4277,13 @@ is-installed-globally@~0.4.0: global-dirs "^3.0.0" is-path-inside "^3.0.2" +is-number@^2.0.2: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg== + dependencies: + kind-of "^3.0.2" + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -3648,6 +4296,13 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== +is-odd@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" + integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw== + dependencies: + is-number "^3.0.0" + is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -3665,11 +4320,23 @@ is-plain-object@^3.0.0: resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b" integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g== +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== + is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== +is-self-closing@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" + integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== + dependencies: + self-closing-tags "^1.0.1" + is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -3702,7 +4369,7 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@1.0.0: +isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -3712,6 +4379,11 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= +isobject@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" + integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ== + isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -4294,10 +4966,10 @@ jsprim@^2.0.2: json-schema "0.4.0" verror "1.10.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= + integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== dependencies: is-buffer "^1.1.5" @@ -4308,12 +4980,12 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0: +kind-of@^5.0.0, kind-of@^5.0.2: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2: +kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -4333,6 +5005,11 @@ lazy-ass@1.6.0, lazy-ass@^1.6.0: resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM= +leaflet@^1.7.1: + version "1.9.3" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414" + integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ== + leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -4377,6 +5054,11 @@ lodash-es@^4.17.11: resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== +lodash._reinterpolate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== + lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -4407,7 +5089,22 @@ lodash.once@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= -lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.7.0: +lodash.template@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" + integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== + dependencies: + lodash._reinterpolate "^3.0.0" + lodash.templatesettings "^4.0.0" + +lodash.templatesettings@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" + integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== + dependencies: + lodash._reinterpolate "^3.0.0" + +lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -4506,6 +5203,11 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" +marked@^4.1.0: + version "4.2.3" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.3.tgz#bd76a5eb510ff1d8421bc6c3b2f0b93488c15bea" + integrity sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw== + merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -4521,7 +5223,7 @@ methods@^1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^3.1.4: +micromatch@^3.1.4, micromatch@^3.1.5: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -4692,6 +5394,11 @@ ncp@^2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= +neo-async@^2.6.0: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -4902,6 +5609,11 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" +parse-srcset@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" + integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q== + parse5@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -4993,6 +5705,15 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= +postcss@^8.3.11: + version "8.4.19" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc" + integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA== + dependencies: + nanoid "^3.3.4" + picocolors "^1.0.0" + source-map-js "^1.0.2" + postcss@^8.4.16: version "8.4.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" @@ -5002,10 +5723,14 @@ postcss@^8.4.16: picocolors "^1.0.0" source-map-js "^1.0.2" -posthog-js@1.4.5: - version "1.4.5" - resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.4.5.tgz#b16235afe47938bd71eaed4ede3790c8b910ed71" - integrity sha512-Rzc5/DpuX55BqwNEbZB0tLav1gEinnr5H+82cbLiMtXLADlxmCwZiEaVXcC3XOqW0x8bcAEehicx1TbpfBamzA== +posthog-js@^1.36.0: + version "1.36.0" + resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.36.0.tgz#cbefa031a1e7ee6ff25dae29b8aa77bd741adbba" + integrity sha512-LL9lbJxN46GbckRKSFZxX7fwNAvKUbi5nLFF0hMkmKY9o9zoz58oA0DJBZkqyEXK+15XzNoyLxF+wnxSPNwn3g== + dependencies: + "@sentry/types" "^7.2.0" + fflate "^0.4.1" + rrweb-snapshot "^1.1.14" prelude-ls@~1.1.2: version "1.1.2" @@ -5037,6 +5762,11 @@ pretty-format@^27.0.0, pretty-format@^27.3.1: ansi-styles "^5.0.0" react-is "^17.0.1" +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" @@ -5128,6 +5858,19 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" +readable-stream@~2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -5168,6 +5911,16 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" +regexparam@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa" + integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw== + +regexparam@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" + integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== + regexpu-core@^4.7.1: version "4.8.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" @@ -5192,6 +5945,21 @@ regjsparser@^0.7.0: dependencies: jsesc "~0.5.0" +relative@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" + integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA== + dependencies: + isobject "^2.0.0" + +remarkable@^1.6.2: + version "1.7.4" + resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" + integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== + dependencies: + argparse "^1.0.10" + autolinker "~0.28.0" + remixicon@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-2.5.0.tgz#b5e245894a1550aa23793f95daceadbf96ad1a41" @@ -5325,6 +6093,11 @@ rollup@^2.44.0: optionalDependencies: fsevents "~2.3.2" +rrweb-snapshot@^1.1.14: + version "1.1.14" + resolved "https://registry.yarnpkg.com/rrweb-snapshot/-/rrweb-snapshot-1.1.14.tgz#9d4d9be54a28a893373428ee4393ec7e5bd83fcc" + integrity sha512-eP5pirNjP5+GewQfcOQY4uBiDnpqxNRc65yKPW0eSoU1XamDfc4M8oqpXGMyUyvLyxFDB0q0+DChuxxiU2FXBQ== + rsvp@^4.8.4: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" @@ -5356,7 +6129,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.1.1: +safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -5388,6 +6161,18 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" +sanitize-html@^2.7.0: + version "2.7.3" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.7.3.tgz#166c868444ee4f9fd7352ac8c63fa86c343fc2bd" + integrity sha512-jMaHG29ak4miiJ8wgqA1849iInqORgNv7SLfSw9LtfOhEUQ1C0YHKH73R+hgyufBW9ZFeJrb057k9hjlfBCVlw== + dependencies: + deepmerge "^4.2.2" + escape-string-regexp "^4.0.0" + htmlparser2 "^6.0.0" + is-plain-object "^5.0.0" + parse-srcset "^1.0.2" + postcss "^8.3.11" + saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -5395,6 +6180,16 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" +screenfull@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238" + integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw== + +self-closing-tags@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" + integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== + "semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -5468,6 +6263,13 @@ shortid@2.2.15: dependencies: nanoid "^2.1.0" +shortid@^2.2.15: + version "2.2.16" + resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" + integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== + dependencies: + nanoid "^2.1.0" + signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.5" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" @@ -5531,6 +6333,24 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" +socket.io-client@^4.5.1: + version "4.5.4" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.4.tgz#d3cde8a06a6250041ba7390f08d2468ccebc5ac9" + integrity sha512-ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.2" + engine.io-client "~6.2.3" + socket.io-parser "~4.2.1" + +socket.io-parser@~4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" + integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.1" + source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" @@ -5700,6 +6520,13 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -5734,6 +6561,11 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" +striptags@^3.1.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" + integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -5768,11 +6600,25 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== +svelte-apexcharts@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/svelte-apexcharts/-/svelte-apexcharts-1.0.2.tgz#4e000f8b8f7c901c05658c845457dfc8314d54c1" + integrity sha512-6qlx4rE+XsonZ0FZudfwqOQ34Pq+3wpxgAD75zgEmGoYhYBJcwmikTuTf3o8ZBsZue9U/pAwhNy3ed1Bkq1gmA== + dependencies: + apexcharts "^3.19.2" + svelte-dnd-action@^0.9.8: version "0.9.12" resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.12.tgz#78cf33097986488c6d069eca517af473cd998730" integrity sha512-GlXIB3/56IMR5A0+qUx+FX7Q7n8uCAIeuYdgSBmn9iOlxWc+mgM8P1kNwAKCMSTdQ4IQETVQILNgWVY1KIFzsg== +svelte-flatpickr@^3.1.0, svelte-flatpickr@^3.2.3: + version "3.2.6" + resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.2.6.tgz#595a97b2f25a669e61fe743f90a10dce783bbd49" + integrity sha512-0ePUyE9OjInYFqQwRKOxnFSu4dQX9+/rzFMynq2fKYXx406ZUThzSx72gebtjr0DoAQbsH2///BBZa5qk4qZXg== + dependencies: + flatpickr "^4.5.2" + svelte-hmr@^0.14.12: version "0.14.12" resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.14.12.tgz#a127aec02f1896500b10148b2d4d21ddde39973f" @@ -5793,11 +6639,83 @@ svelte-portal@0.1.0: resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-0.1.0.tgz#cc2821cc84b05ed5814e0218dcdfcbebc53c1742" integrity sha512-kef+ksXVKun224mRxat+DdO4C+cGHla+fEcZfnBAvoZocwiaceOfhf5azHYOPXSSB1igWVFTEOF3CDENPnuWxg== +svelte-portal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" + integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== + +svelte-spa-router@^3.0.5: + version "3.3.0" + resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c" + integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ== + dependencies: + regexparam "2.0.1" + +svelte@^3.46.2, svelte@^3.49.0: + version "3.53.1" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.53.1.tgz#db9d7df7a8f570e8e22547444c149208b1914442" + integrity sha512-Q4/hHkktZogGhN5iqxqSi9sjEVoe/NbIxX4hXEHoasTxj+TxEQVAq66LnDMdAZxjmsodkoI5F3slqsS68U7FNw== + svelte@^3.48.0: version "3.49.0" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029" integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA== +svg.draggable.js@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" + integrity sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw== + dependencies: + svg.js "^2.0.1" + +svg.easing.js@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/svg.easing.js/-/svg.easing.js-2.0.0.tgz#8aa9946b0a8e27857a5c40a10eba4091e5691f12" + integrity sha512-//ctPdJMGy22YoYGV+3HEfHbm6/69LJUTAqI2/5qBvaNHZ9uUFVC82B0Pl299HzgH13rKrBgi4+XyXXyVWWthA== + dependencies: + svg.js ">=2.3.x" + +svg.filter.js@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/svg.filter.js/-/svg.filter.js-2.0.2.tgz#91008e151389dd9230779fcbe6e2c9a362d1c203" + integrity sha512-xkGBwU+dKBzqg5PtilaTb0EYPqPfJ9Q6saVldX+5vCRy31P6TlRCP3U9NxH3HEufkKkpNgdTLBJnmhDHeTqAkw== + dependencies: + svg.js "^2.2.5" + +svg.js@>=2.3.x, svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5: + version "2.7.1" + resolved "https://registry.yarnpkg.com/svg.js/-/svg.js-2.7.1.tgz#eb977ed4737001eab859949b4a398ee1bb79948d" + integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA== + +svg.pathmorphing.js@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz#c25718a1cc7c36e852ecabc380e758ac09bb2b65" + integrity sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww== + dependencies: + svg.js "^2.4.0" + +svg.resize.js@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/svg.resize.js/-/svg.resize.js-1.4.3.tgz#885abd248e0cd205b36b973c4b578b9a36f23332" + integrity sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw== + dependencies: + svg.js "^2.6.5" + svg.select.js "^2.1.2" + +svg.select.js@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-2.1.2.tgz#e41ce13b1acff43a7441f9f8be87a2319c87be73" + integrity sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ== + dependencies: + svg.js "^2.2.5" + +svg.select.js@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-3.0.1.tgz#a4198e359f3825739226415f82176a90ea5cc917" + integrity sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw== + dependencies: + svg.js "^2.6.5" + symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -5847,6 +6765,14 @@ throttleit@^1.0.0: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= +through2@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" + through@2, through@^2.3.8, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -5869,6 +6795,11 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= +to-gfm-code-block@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" + integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg== + to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" @@ -6023,11 +6954,28 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" +typeof-article@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" + integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw== + dependencies: + kind-of "^3.1.0" + typescript@^4.5.5: version "4.5.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== +typo-js@*: + version "1.2.2" + resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" + integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== + +uglify-js@^3.1.4: + version "3.17.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" + integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== + unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" @@ -6101,6 +7049,11 @@ utf-8-validate@^5.0.2: dependencies: node-gyp-build "^4.3.0" +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + uuid@8.3.1: version "8.3.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" @@ -6154,6 +7107,14 @@ vite@^3.0.8: optionalDependencies: fsevents "~2.3.2" +vm2@^3.9.4: + version "3.9.11" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe" + integrity sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" + w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -6254,6 +7215,11 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +wordwrap@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== + wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -6292,6 +7258,11 @@ ws@^7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== +ws@~8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" + integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== + xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" @@ -6302,6 +7273,16 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== +xmlhttprequest-ssl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" + integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== + +xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + y18n@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" @@ -6368,6 +7349,11 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" +year@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" + integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w== + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 98eceef539c21b0c72c73aa9ec313e38077dc08f Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 28 Nov 2022 09:36:09 +0000 Subject: [PATCH 084/179] v2.1.38 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index f97ceed3f1..e8452dfab7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.37", + "version": "2.1.38", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c055509b96..1e6349e474 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.37", + "version": "2.1.38", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.37", + "@budibase/types": "^2.1.38", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 7a18fa433f..6e5d9f81ff 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.37", + "version": "2.1.38", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.37", + "@budibase/string-templates": "^2.1.38", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index fce5e7d92e..94f2e4450d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.37", + "version": "2.1.38", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.37", - "@budibase/client": "^2.1.37", - "@budibase/frontend-core": "^2.1.37", - "@budibase/string-templates": "^2.1.37", + "@budibase/bbui": "^2.1.38", + "@budibase/client": "^2.1.38", + "@budibase/frontend-core": "^2.1.38", + "@budibase/string-templates": "^2.1.38", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index c926a745e9..a244f63665 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.37", + "version": "2.1.38", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.37", - "@budibase/string-templates": "^2.1.37", - "@budibase/types": "^2.1.37", + "@budibase/backend-core": "^2.1.38", + "@budibase/string-templates": "^2.1.38", + "@budibase/types": "^2.1.38", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 694b0e3d66..e522aed47e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.37", + "version": "2.1.38", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.37", - "@budibase/frontend-core": "^2.1.37", - "@budibase/string-templates": "^2.1.37", + "@budibase/bbui": "^2.1.38", + "@budibase/frontend-core": "^2.1.38", + "@budibase/string-templates": "^2.1.38", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 1859da883d..137895beea 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.37", + "version": "2.1.38", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.37", + "@budibase/bbui": "^2.1.38", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 8f827e91ef..37915e9e91 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.37", + "version": "2.1.38", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 60a00cc9c8..e81215673a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.37", + "version": "2.1.38", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.37", - "@budibase/client": "^2.1.37", + "@budibase/backend-core": "^2.1.38", + "@budibase/client": "^2.1.38", "@budibase/pro": "2.1.37", - "@budibase/string-templates": "^2.1.37", - "@budibase/types": "^2.1.37", + "@budibase/string-templates": "^2.1.38", + "@budibase/types": "^2.1.38", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 2ac8ee0989..05b0a450f7 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.37", + "version": "2.1.38", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index e784ac6275..19caf1a5fe 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.37", + "version": "2.1.38", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 775c8eb032..e560b0fd1b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.37", + "version": "2.1.38", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.37", + "@budibase/backend-core": "^2.1.38", "@budibase/pro": "2.1.37", - "@budibase/string-templates": "^2.1.37", - "@budibase/types": "^2.1.37", + "@budibase/string-templates": "^2.1.38", + "@budibase/types": "^2.1.38", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 728e40a427931fdb90f44ff9b92c6c668d0e23ed Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 28 Nov 2022 09:39:31 +0000 Subject: [PATCH 085/179] Update pro version to 2.1.38 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index e81215673a..c678031303 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.38", "@budibase/client": "^2.1.38", - "@budibase/pro": "2.1.37", + "@budibase/pro": "2.1.38", "@budibase/string-templates": "^2.1.38", "@budibase/types": "^2.1.38", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index ea51dde035..2694fe9196 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.37": - version "2.1.37" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.37.tgz#365f79a5a99dc33b976c099063a8b00fb02a3745" - integrity sha512-UIL/JJDsaHEX0F6r56qYfEmPpCEl60FG0EUmomtoY91XZadpEfEgyvU+UaH8bfDUyzuy1uzW6E8+bALwLBE7qg== +"@budibase/backend-core@2.1.38": + version "2.1.38" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.38.tgz#d5ce8be979311bc194fdba98049af3ae609c4222" + integrity sha512-HabobTWZ1jHy2OeZqitx66J+N3pEuMqL+n1rk23hVX4uo7RCtZjr8MkfD39hoN/NdH+kDf2Hz+QR8suw+a/VXw== dependencies: - "@budibase/types" "^2.1.37" + "@budibase/types" "^2.1.38" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.37": - version "2.1.37" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.37.tgz#9fedfd0e25fd99b05a0610e61e7752e1e837b920" - integrity sha512-TZIloXh5cjFxPGjunZwSe6GERn7stT0CMzf0fADy/N2IgW0AyvxUoWRqZbTqiwc2X0ybcr+Pxd4A61m6BCnrYw== +"@budibase/pro@2.1.38": + version "2.1.38" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.38.tgz#eb6f105d4cb59ac69d542f26d663b8ae612c0636" + integrity sha512-wGOJ6AcCwPwz8GiGkZoaScNlinPBL4QvU1IgbpwPjxZENW0Uo3P7Nt/EUfktKvJdYmOGTT6p/MIBsPDcIe5j9Q== dependencies: - "@budibase/backend-core" "2.1.37" - "@budibase/types" "2.1.37" + "@budibase/backend-core" "2.1.38" + "@budibase/types" "2.1.38" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.37", "@budibase/types@^2.1.37": - version "2.1.37" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.37.tgz#ea3823f868313a41678df39f2e2f54e60c8f356b" - integrity sha512-uoLO6VXpm8x2B6JZXH1SQP1ihxqJS/tpBBNNcb/bxihdw9ikwVf/LE6T1cVCCaJejTA5yE+6CrzACtgS9lYJEw== +"@budibase/types@2.1.38", "@budibase/types@^2.1.38": + version "2.1.38" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.38.tgz#a0cde59a001420a3e98fc2136548911a3b2470ea" + integrity sha512-xiPMrTcYbDzcvNkZ0QOz21mXQECTTxSKAqa1s4s+zKeZ6g+r22WaZDw/H8Uyz4fbkUahFaiRwilMVkP10SWhkg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index e560b0fd1b..321da75482 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.38", - "@budibase/pro": "2.1.37", + "@budibase/pro": "2.1.38", "@budibase/string-templates": "^2.1.38", "@budibase/types": "^2.1.38", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 7556bdab4f..3c6a05e007 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.37": - version "2.1.37" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.37.tgz#365f79a5a99dc33b976c099063a8b00fb02a3745" - integrity sha512-UIL/JJDsaHEX0F6r56qYfEmPpCEl60FG0EUmomtoY91XZadpEfEgyvU+UaH8bfDUyzuy1uzW6E8+bALwLBE7qg== +"@budibase/backend-core@2.1.38": + version "2.1.38" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.38.tgz#d5ce8be979311bc194fdba98049af3ae609c4222" + integrity sha512-HabobTWZ1jHy2OeZqitx66J+N3pEuMqL+n1rk23hVX4uo7RCtZjr8MkfD39hoN/NdH+kDf2Hz+QR8suw+a/VXw== dependencies: - "@budibase/types" "^2.1.37" + "@budibase/types" "^2.1.38" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.37": - version "2.1.37" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.37.tgz#9fedfd0e25fd99b05a0610e61e7752e1e837b920" - integrity sha512-TZIloXh5cjFxPGjunZwSe6GERn7stT0CMzf0fADy/N2IgW0AyvxUoWRqZbTqiwc2X0ybcr+Pxd4A61m6BCnrYw== +"@budibase/pro@2.1.38": + version "2.1.38" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.38.tgz#eb6f105d4cb59ac69d542f26d663b8ae612c0636" + integrity sha512-wGOJ6AcCwPwz8GiGkZoaScNlinPBL4QvU1IgbpwPjxZENW0Uo3P7Nt/EUfktKvJdYmOGTT6p/MIBsPDcIe5j9Q== dependencies: - "@budibase/backend-core" "2.1.37" - "@budibase/types" "2.1.37" + "@budibase/backend-core" "2.1.38" + "@budibase/types" "2.1.38" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.37", "@budibase/types@^2.1.37": - version "2.1.37" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.37.tgz#ea3823f868313a41678df39f2e2f54e60c8f356b" - integrity sha512-uoLO6VXpm8x2B6JZXH1SQP1ihxqJS/tpBBNNcb/bxihdw9ikwVf/LE6T1cVCCaJejTA5yE+6CrzACtgS9lYJEw== +"@budibase/types@2.1.38", "@budibase/types@^2.1.38": + version "2.1.38" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.38.tgz#a0cde59a001420a3e98fc2136548911a3b2470ea" + integrity sha512-xiPMrTcYbDzcvNkZ0QOz21mXQECTTxSKAqa1s4s+zKeZ6g+r22WaZDw/H8Uyz4fbkUahFaiRwilMVkP10SWhkg== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 38210cebe5bce05fe636897f18d4027c0c080535 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 28 Nov 2022 12:04:44 +0000 Subject: [PATCH 086/179] Don't parse number arrays as date --- packages/server/src/integrations/mysql.ts | 2 +- .../src/integrations/tests/mysql.spec.ts | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index 69dbb40480..65f8323fea 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -106,7 +106,7 @@ function bindingTypeCoerce(bindings: any[]) { } // if not a number, see if it is a date - important to do in this order as any // integer will be considered a valid date - else if (/^\d/.test(binding) && dayjs(binding).isValid()) { + else if (/^\d/.test(binding) && dayjs(binding).isValid() && !binding.includes(",")) { bindings[i] = dayjs(binding).toDate() } } diff --git a/packages/server/src/integrations/tests/mysql.spec.ts b/packages/server/src/integrations/tests/mysql.spec.ts index a70eb73857..6ad3b4e6e2 100644 --- a/packages/server/src/integrations/tests/mysql.spec.ts +++ b/packages/server/src/integrations/tests/mysql.spec.ts @@ -73,4 +73,49 @@ describe("MySQL Integration", () => { expect(response).toEqual([{ deleted: true }]) }) }) + + describe("binding type coerce", () => { + it("ignores non-string types ", async () => { + const sql = "select * from users;" + const date = new Date() + await config.integration.read({ + sql, + bindings: [11, date, ["a", "b", "c"], { id: 1}] + }) + expect(config.integration.client.query).toHaveBeenCalledWith(sql, [11, date, ["a", "b", "c"], { id: 1}]) + }) + + it("parses strings matching a number regex", async () => { + const sql = "select * from users;" + await config.integration.read({ + sql, + bindings: ["101", "3.14"] + }) + expect(config.integration.client.query).toHaveBeenCalledWith(sql, [101, 3.14]) + }) + + it("parses strings matching a valid date format", async () => { + const sql = "select * from users;" + await config.integration.read({ + sql, + bindings: ["2001-10-30", "2010-09-01T13:30:59.123Z", "2021-02-05 12:01 PM"] + }) + expect(config.integration.client.query).toHaveBeenCalledWith(sql, [ + new Date("2001-10-30T00:00:00.000Z"), + new Date("2010-09-01T13:30:59.123Z"), + new Date("2021-02-05T12:01:00.000Z") + ]) + }) + + it("does not parse string matching a valid array of numbers as date", async () => { + const sql = "select * from users;" + await config.integration.read({ + sql, + bindings: ["1,2,2017"] + }) + expect(config.integration.client.query).toHaveBeenCalledWith(sql, [ + "1,2,2017" + ]) + }) + }) }) From cde3c2e8ff6d04128e0d657d88675b91cdea4e97 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 28 Nov 2022 12:05:19 +0000 Subject: [PATCH 087/179] lint --- packages/server/src/integrations/mysql.ts | 6 +++- .../src/integrations/tests/mysql.spec.ts | 30 +++++++++++++------ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index 65f8323fea..acf8f4904a 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -106,7 +106,11 @@ function bindingTypeCoerce(bindings: any[]) { } // if not a number, see if it is a date - important to do in this order as any // integer will be considered a valid date - else if (/^\d/.test(binding) && dayjs(binding).isValid() && !binding.includes(",")) { + else if ( + /^\d/.test(binding) && + dayjs(binding).isValid() && + !binding.includes(",") + ) { bindings[i] = dayjs(binding).toDate() } } diff --git a/packages/server/src/integrations/tests/mysql.spec.ts b/packages/server/src/integrations/tests/mysql.spec.ts index 6ad3b4e6e2..c4a26beb60 100644 --- a/packages/server/src/integrations/tests/mysql.spec.ts +++ b/packages/server/src/integrations/tests/mysql.spec.ts @@ -80,30 +80,42 @@ describe("MySQL Integration", () => { const date = new Date() await config.integration.read({ sql, - bindings: [11, date, ["a", "b", "c"], { id: 1}] + bindings: [11, date, ["a", "b", "c"], { id: 1 }], }) - expect(config.integration.client.query).toHaveBeenCalledWith(sql, [11, date, ["a", "b", "c"], { id: 1}]) + expect(config.integration.client.query).toHaveBeenCalledWith(sql, [ + 11, + date, + ["a", "b", "c"], + { id: 1 }, + ]) }) it("parses strings matching a number regex", async () => { const sql = "select * from users;" await config.integration.read({ sql, - bindings: ["101", "3.14"] + bindings: ["101", "3.14"], }) - expect(config.integration.client.query).toHaveBeenCalledWith(sql, [101, 3.14]) + expect(config.integration.client.query).toHaveBeenCalledWith( + sql, + [101, 3.14] + ) }) it("parses strings matching a valid date format", async () => { const sql = "select * from users;" await config.integration.read({ sql, - bindings: ["2001-10-30", "2010-09-01T13:30:59.123Z", "2021-02-05 12:01 PM"] + bindings: [ + "2001-10-30", + "2010-09-01T13:30:59.123Z", + "2021-02-05 12:01 PM", + ], }) expect(config.integration.client.query).toHaveBeenCalledWith(sql, [ - new Date("2001-10-30T00:00:00.000Z"), + new Date("2001-10-30T00:00:00.000Z"), new Date("2010-09-01T13:30:59.123Z"), - new Date("2021-02-05T12:01:00.000Z") + new Date("2021-02-05T12:01:00.000Z"), ]) }) @@ -111,10 +123,10 @@ describe("MySQL Integration", () => { const sql = "select * from users;" await config.integration.read({ sql, - bindings: ["1,2,2017"] + bindings: ["1,2,2017"], }) expect(config.integration.client.query).toHaveBeenCalledWith(sql, [ - "1,2,2017" + "1,2,2017", ]) }) }) From 3c3c2325e710ae49793e17459f67b645c82ad8ed Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 28 Nov 2022 12:20:49 +0000 Subject: [PATCH 088/179] Add tests for table settings migration --- .../functions/tests/tableSettings.spec.ts | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 packages/server/src/migrations/functions/tests/tableSettings.spec.ts diff --git a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts new file mode 100644 index 0000000000..2d8cb3806d --- /dev/null +++ b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts @@ -0,0 +1,132 @@ +import { App, Screen, ScreenProps } from "@budibase/types" + +const { db: dbCore } = require("@budibase/backend-core") +const TestConfig = require("../../../tests/utilities/TestConfiguration") +const migration = require("../tableSettings") + +// Local type for allowing any child components inside screens +type MigratingScreenProps = ScreenProps & { _children: any[] } +type MigratingScreen = Screen & { props: MigratingScreenProps } + +describe("run", () => { + const config = new TestConfig(false) + let app: App + let screen: MigratingScreen + + beforeAll(async () => { + await config.init() + app = await config.createApp("testApp") + screen = await config.createScreen() + }) + + afterAll(config.end) + + it("migrates table block row on click settings", async () => { + // Add legacy table block as first child + screen.props._children[0] = { + _component: "@budibase/standard-components/tableblock", + _id: "foo", + linkRows: true, + linkURL: "/rows/:id", + linkPeek: true, + linkColumn: "name", + } + await config.createScreen(screen) + + // Run migration + screen = await dbCore.doWithDB(app.appId, async (db: any) => { + await migration.run(db) + return await db.get(screen._id) + }) + + // Verify new "onClick" setting + const onClick = screen.props._children[0].onClick + expect(onClick).toBeDefined() + expect(onClick.length).toBe(1) + expect(onClick[0]["##eventHandlerType"]).toBe("Navigate To") + expect(onClick[0].parameters.url).toBe( + `/rows/{{ [eventContext].[row].[name] }}` + ) + expect(onClick[0].parameters.peek).toBeTruthy() + }) + + it("migrates table row on click settings", async () => { + // Add legacy table block as first child + screen.props._children[0] = { + _component: "@budibase/standard-components/table", + _id: "foo", + linkRows: true, + linkURL: "/rows/:id", + linkPeek: true, + linkColumn: "name", + } + await config.createScreen(screen) + + // Run migration + screen = await dbCore.doWithDB(app.appId, async (db: any) => { + await migration.run(db) + return await db.get(screen._id) + }) + + // Verify new "onClick" setting + const onClick = screen.props._children[0].onClick + expect(onClick).toBeDefined() + expect(onClick.length).toBe(1) + expect(onClick[0]["##eventHandlerType"]).toBe("Navigate To") + expect(onClick[0].parameters.url).toBe( + `/rows/{{ [eventContext].[row].[name] }}` + ) + expect(onClick[0].parameters.peek).toBeTruthy() + }) + + it("migrates table block title button settings", async () => { + // Add legacy table block as first child + screen.props._children[0] = { + _component: "@budibase/standard-components/tableblock", + _id: "foo", + showTitleButton: true, + titleButtonURL: "/url", + titleButtonPeek: true, + } + await config.createScreen(screen) + + // Run migration + screen = await dbCore.doWithDB(app.appId, async (db: any) => { + await migration.run(db) + return await db.get(screen._id) + }) + + // Verify new "onClickTitleButton" setting + const onClick = screen.props._children[0].onClickTitleButton + expect(onClick).toBeDefined() + expect(onClick.length).toBe(1) + expect(onClick[0]["##eventHandlerType"]).toBe("Navigate To") + expect(onClick[0].parameters.url).toBe("/url") + expect(onClick[0].parameters.peek).toBeTruthy() + }) + + it("ignores components that have already been migrated", async () => { + // Add legacy table block as first child + screen.props._children[0] = { + _component: "@budibase/standard-components/tableblock", + _id: "foo", + linkRows: true, + linkURL: "/rows/:id", + linkPeek: true, + linkColumn: "name", + onClick: "foo", + } + const initialDefinition = JSON.stringify(screen.props._children[0]) + await config.createScreen(screen) + + // Run migration + screen = await dbCore.doWithDB(app.appId, async (db: any) => { + await migration.run(db) + return await db.get(screen._id) + }) + + // Verify new "onClick" setting + const newDefinition = JSON.stringify(screen.props._children[0]) + expect(initialDefinition).toEqual(newDefinition) + }) +}) From ce1b626f68e5f11425c7b9e9d1f7906b19547472 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 28 Nov 2022 13:24:39 +0000 Subject: [PATCH 089/179] Updates to fix build. --- .../server/src/migrations/tests/index.spec.ts | 2 +- .../src/tests/utilities/TestConfiguration.js | 4 +- .../server/src/tests/utilities/controllers.js | 16 ----- .../server/src/tests/utilities/controllers.ts | 14 ++++ .../tests/utilities/{index.js => index.ts} | 4 +- .../{structures.js => structures.ts} | 72 ++++++++++--------- packages/server/tsconfig.build.json | 1 + 7 files changed, 59 insertions(+), 54 deletions(-) delete mode 100644 packages/server/src/tests/utilities/controllers.js create mode 100644 packages/server/src/tests/utilities/controllers.ts rename packages/server/src/tests/utilities/{index.js => index.ts} (77%) rename packages/server/src/tests/utilities/{structures.js => structures.ts} (58%) diff --git a/packages/server/src/migrations/tests/index.spec.ts b/packages/server/src/migrations/tests/index.spec.ts index 8effaec52b..cf283cf518 100644 --- a/packages/server/src/migrations/tests/index.spec.ts +++ b/packages/server/src/migrations/tests/index.spec.ts @@ -6,7 +6,7 @@ import { context, } from "@budibase/backend-core" import TestConfig from "../../tests/utilities/TestConfiguration" -import structures from "../../tests/utilities/structures" +import * as structures from "../../tests/utilities/structures" import { MIGRATIONS } from "../" import * as helpers from "./helpers" diff --git a/packages/server/src/tests/utilities/TestConfiguration.js b/packages/server/src/tests/utilities/TestConfiguration.js index 76c79b838f..fd9635e9f1 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.js +++ b/packages/server/src/tests/utilities/TestConfiguration.js @@ -27,7 +27,7 @@ const controllers = require("./controllers") const supertest = require("supertest") const { cleanup } = require("../../utilities/fileSystem") const newid = require("../../db/newid") -const { DocumentType, generateUserMetadataID } = require("../../db/utils") +const { generateUserMetadataID } = require("../../db/utils") const { startup } = require("../../startup") const GLOBAL_USER_ID = "us_uuid1" @@ -360,7 +360,7 @@ class TestConfiguration { return context.doInAppContext(prodAppId, async () => { const db = context.getProdAppDB() - return await db.get(DocumentType.APP_METADATA) + return await db.get(dbCore.DocumentType.APP_METADATA) }) } diff --git a/packages/server/src/tests/utilities/controllers.js b/packages/server/src/tests/utilities/controllers.js deleted file mode 100644 index 8da6c97047..0000000000 --- a/packages/server/src/tests/utilities/controllers.js +++ /dev/null @@ -1,16 +0,0 @@ -module.exports = { - table: require("../../api/controllers/table"), - row: require("../../api/controllers/row"), - role: require("../../api/controllers/role"), - perms: require("../../api/controllers/permission"), - view: require("../../api/controllers/view"), - app: require("../../api/controllers/application"), - user: require("../../api/controllers/user"), - automation: require("../../api/controllers/automation"), - datasource: require("../../api/controllers/datasource"), - query: require("../../api/controllers/query"), - screen: require("../../api/controllers/screen"), - webhook: require("../../api/controllers/webhook"), - layout: require("../../api/controllers/layout"), - deploy: require("../../api/controllers/deploy"), -} diff --git a/packages/server/src/tests/utilities/controllers.ts b/packages/server/src/tests/utilities/controllers.ts new file mode 100644 index 0000000000..315b61551c --- /dev/null +++ b/packages/server/src/tests/utilities/controllers.ts @@ -0,0 +1,14 @@ +export * as table from "../../api/controllers/table" +export * as row from "../../api/controllers/row" +export * as role from "../../api/controllers/role" +export * as perms from "../../api/controllers/permission" +export * as view from "../../api/controllers/view" +export * as app from "../../api/controllers/application" +export * as user from "../../api/controllers/user" +export * as automation from "../../api/controllers/automation" +export * as datasource from "../../api/controllers/datasource" +export * as query from "../../api/controllers/query" +export * as screen from "../../api/controllers/screen" +export * as webhook from "../../api/controllers/webhook" +export * as layout from "../../api/controllers/layout" +export * as deploy from "../../api/controllers/deploy" diff --git a/packages/server/src/tests/utilities/index.js b/packages/server/src/tests/utilities/index.ts similarity index 77% rename from packages/server/src/tests/utilities/index.js rename to packages/server/src/tests/utilities/index.ts index aa8039ce2f..270e8b7b49 100644 --- a/packages/server/src/tests/utilities/index.js +++ b/packages/server/src/tests/utilities/index.ts @@ -1,5 +1,5 @@ -exports.makePartial = obj => { - const newObj = {} +export function makePartial(obj: any) { + const newObj: any = {} for (let key of Object.keys(obj)) { if (typeof obj[key] === "object") { newObj[key] = exports.makePartial(obj[key]) diff --git a/packages/server/src/tests/utilities/structures.js b/packages/server/src/tests/utilities/structures.ts similarity index 58% rename from packages/server/src/tests/utilities/structures.js rename to packages/server/src/tests/utilities/structures.ts index 610084b04e..a412be4931 100644 --- a/packages/server/src/tests/utilities/structures.js +++ b/packages/server/src/tests/utilities/structures.ts @@ -1,13 +1,13 @@ -const { roles, permissions } = require("@budibase/backend-core") -const { createHomeScreen } = require("../../constants/screens") -const { EMPTY_LAYOUT } = require("../../constants/layouts") -const { cloneDeep } = require("lodash/fp") +import { roles, permissions } from "@budibase/backend-core" +import { createHomeScreen } from "../../constants/screens" +import { EMPTY_LAYOUT } from "../../constants/layouts" +import { cloneDeep } from "lodash/fp" +import { TRIGGER_DEFINITIONS, ACTION_DEFINITIONS } from "../../automations" const { v4: uuidv4 } = require("uuid") -const { TRIGGER_DEFINITIONS, ACTION_DEFINITIONS } = require("../../automations") -exports.TENANT_ID = "default" +export const TENANT_ID = "default" -exports.basicTable = () => { +export function basicTable() { return { name: "TestTable", type: "table", @@ -29,16 +29,16 @@ exports.basicTable = () => { } } -exports.basicView = tableId => { +export function basicView(tableId: string) { return { tableId, name: "ViewTest", } } -exports.filterView = tableId => { +export function filterView(tableId: string) { return { - ...this.basicView(tableId), + ...basicView(tableId), filters: [ { value: 0, @@ -49,56 +49,58 @@ exports.filterView = tableId => { } } -exports.calculationView = tableId => { +export function calculationView(tableId: string) { return { - ...this.basicView(tableId), + ...basicView(tableId), field: "count", calculation: "sum", } } -exports.view = tableId => { +export function view(tableId: string) { return { - ...this.filterView(tableId), - ...this.calculationView(tableId), + ...filterView(tableId), + ...calculationView(tableId), } } -exports.automationStep = (actionDefinition = ACTION_DEFINITIONS.CREATE_ROW) => { +export function automationStep( + actionDefinition = ACTION_DEFINITIONS.CREATE_ROW +) { return { id: uuidv4(), ...actionDefinition, } } -exports.automationTrigger = ( +export function automationTrigger( triggerDefinition = TRIGGER_DEFINITIONS.ROW_SAVED -) => { +) { return { id: uuidv4(), ...triggerDefinition, } } -exports.newAutomation = ({ steps, trigger } = {}) => { - const automation = exports.basicAutomation() +export function newAutomation({ steps, trigger }: any = {}) { + const automation: any = basicAutomation() if (trigger) { automation.definition.trigger = trigger } else { - automation.definition.trigger = exports.automationTrigger() + automation.definition.trigger = automationTrigger() } if (steps) { automation.definition.steps = steps } else { - automation.definition.steps = [exports.automationStep()] + automation.definition.steps = [automationStep()] } return automation } -exports.basicAutomation = () => { +export function basicAutomation() { return { name: "My Automation", screenId: "kasdkfldsafkl", @@ -114,7 +116,7 @@ exports.basicAutomation = () => { } } -exports.basicRow = tableId => { +export function basicRow(tableId: string) { return { name: "Test Contact", description: "original description", @@ -122,15 +124,19 @@ exports.basicRow = tableId => { } } -exports.basicLinkedRow = (tableId, linkedRowId, linkField = "link") => { +export function basicLinkedRow( + tableId: string, + linkedRowId: string, + linkField: string = "link" +) { // this is based on the basic linked tables you get from the test configuration return { - ...exports.basicRow(tableId), + ...basicRow(tableId), [linkField]: [linkedRowId], } } -exports.basicRole = () => { +export function basicRole() { return { name: "NewRole", inherits: roles.BUILTIN_ROLE_IDS.BASIC, @@ -138,7 +144,7 @@ exports.basicRole = () => { } } -exports.basicDatasource = () => { +export function basicDatasource() { return { datasource: { type: "datasource", @@ -149,7 +155,7 @@ exports.basicDatasource = () => { } } -exports.basicQuery = datasourceId => { +export function basicQuery(datasourceId: string) { return { datasourceId: datasourceId, name: "New Query", @@ -160,7 +166,7 @@ exports.basicQuery = datasourceId => { } } -exports.basicUser = role => { +export function basicUser(role: string) { return { email: "bill@bill.com", password: "yeeooo", @@ -168,15 +174,15 @@ exports.basicUser = role => { } } -exports.basicScreen = () => { +export function basicScreen() { return createHomeScreen() } -exports.basicLayout = () => { +export function basicLayout() { return cloneDeep(EMPTY_LAYOUT) } -exports.basicWebhook = automationId => { +export function basicWebhook(automationId: string) { return { live: true, name: "webhook", diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index 2212a5e100..bbc0bfa0ee 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -1,6 +1,7 @@ { "compilerOptions": { "target": "es6", + "allowJs": true, "module": "commonjs", "lib": ["es2020"], "strict": true, From 8f4813b01a233b50ca0af82ea8a2d871fa1e1f33 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 28 Nov 2022 14:09:18 +0000 Subject: [PATCH 090/179] Fix for account portal. --- packages/backend-core/src/middleware/authenticated.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts index 525cc9d766..fcf07c50a5 100644 --- a/packages/backend-core/src/middleware/authenticated.ts +++ b/packages/backend-core/src/middleware/authenticated.ts @@ -68,7 +68,7 @@ async function checkApiKey(apiKey: string, populateUser?: Function) { */ export = function ( noAuthPatterns: EndpointMatcher[] = [], - opts: { publicAllowed: boolean; populateUser?: Function } = { + opts: { publicAllowed?: boolean; populateUser?: Function } = { publicAllowed: false, } ) { From cf6c77309cb3778fe7bbe11239203a3ad27ee696 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 28 Nov 2022 14:13:40 +0000 Subject: [PATCH 091/179] v2.1.39 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index e8452dfab7..196113a33a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.38", + "version": "2.1.39", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1e6349e474..6cea393288 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.38", + "version": "2.1.39", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.38", + "@budibase/types": "^2.1.39", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6e5d9f81ff..5d3aea92f8 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.38", + "version": "2.1.39", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.38", + "@budibase/string-templates": "^2.1.39", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 94f2e4450d..a2545545d7 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.38", + "version": "2.1.39", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.38", - "@budibase/client": "^2.1.38", - "@budibase/frontend-core": "^2.1.38", - "@budibase/string-templates": "^2.1.38", + "@budibase/bbui": "^2.1.39", + "@budibase/client": "^2.1.39", + "@budibase/frontend-core": "^2.1.39", + "@budibase/string-templates": "^2.1.39", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index a244f63665..644a77c34d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.38", + "version": "2.1.39", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.38", - "@budibase/string-templates": "^2.1.38", - "@budibase/types": "^2.1.38", + "@budibase/backend-core": "^2.1.39", + "@budibase/string-templates": "^2.1.39", + "@budibase/types": "^2.1.39", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index e522aed47e..2f31afd3eb 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.38", + "version": "2.1.39", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.38", - "@budibase/frontend-core": "^2.1.38", - "@budibase/string-templates": "^2.1.38", + "@budibase/bbui": "^2.1.39", + "@budibase/frontend-core": "^2.1.39", + "@budibase/string-templates": "^2.1.39", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 137895beea..240716848f 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.38", + "version": "2.1.39", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.38", + "@budibase/bbui": "^2.1.39", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 37915e9e91..c7708fcc51 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.38", + "version": "2.1.39", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index c678031303..f373bb3f14 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.38", + "version": "2.1.39", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.38", - "@budibase/client": "^2.1.38", + "@budibase/backend-core": "^2.1.39", + "@budibase/client": "^2.1.39", "@budibase/pro": "2.1.38", - "@budibase/string-templates": "^2.1.38", - "@budibase/types": "^2.1.38", + "@budibase/string-templates": "^2.1.39", + "@budibase/types": "^2.1.39", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 05b0a450f7..7203486769 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.38", + "version": "2.1.39", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 19caf1a5fe..383d7c5d05 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.38", + "version": "2.1.39", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 321da75482..9a6b5e34c8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.38", + "version": "2.1.39", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.38", + "@budibase/backend-core": "^2.1.39", "@budibase/pro": "2.1.38", - "@budibase/string-templates": "^2.1.38", - "@budibase/types": "^2.1.38", + "@budibase/string-templates": "^2.1.39", + "@budibase/types": "^2.1.39", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 6ffeddcf98d28ea27460511ba90c1c8451c97cb6 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Mon, 28 Nov 2022 14:17:27 +0000 Subject: [PATCH 092/179] Update pro version to 2.1.39 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f373bb3f14..f2123e7beb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.39", "@budibase/client": "^2.1.39", - "@budibase/pro": "2.1.38", + "@budibase/pro": "2.1.39", "@budibase/string-templates": "^2.1.39", "@budibase/types": "^2.1.39", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 2694fe9196..9a67ebf55f 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.38": - version "2.1.38" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.38.tgz#d5ce8be979311bc194fdba98049af3ae609c4222" - integrity sha512-HabobTWZ1jHy2OeZqitx66J+N3pEuMqL+n1rk23hVX4uo7RCtZjr8MkfD39hoN/NdH+kDf2Hz+QR8suw+a/VXw== +"@budibase/backend-core@2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.39.tgz#0ada64b114d2b61e6a4a782227348e1bfd33ebc6" + integrity sha512-OW1SOS0jWHoHBVMZo3A36F5urgphduOXWqegtHRL3o3cFmf38l8XI6TtKDWrfSkJat0FKrzjJs1vAnIh9cQeMA== dependencies: - "@budibase/types" "^2.1.38" + "@budibase/types" "^2.1.39" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.38": - version "2.1.38" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.38.tgz#eb6f105d4cb59ac69d542f26d663b8ae612c0636" - integrity sha512-wGOJ6AcCwPwz8GiGkZoaScNlinPBL4QvU1IgbpwPjxZENW0Uo3P7Nt/EUfktKvJdYmOGTT6p/MIBsPDcIe5j9Q== +"@budibase/pro@2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.39.tgz#31d59a9e3bde75f9b83cff8db1b8fcb75c16fafe" + integrity sha512-GQ5Z0U03C9RifZhPQX9dc61yLM9YkRZOjl7mHXIrcm6ytUA3I/DMuGcN83hwlxlPOem9utofDmXfCE288nLDZg== dependencies: - "@budibase/backend-core" "2.1.38" - "@budibase/types" "2.1.38" + "@budibase/backend-core" "2.1.39" + "@budibase/types" "2.1.39" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.38", "@budibase/types@^2.1.38": - version "2.1.38" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.38.tgz#a0cde59a001420a3e98fc2136548911a3b2470ea" - integrity sha512-xiPMrTcYbDzcvNkZ0QOz21mXQECTTxSKAqa1s4s+zKeZ6g+r22WaZDw/H8Uyz4fbkUahFaiRwilMVkP10SWhkg== +"@budibase/types@2.1.39", "@budibase/types@^2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.39.tgz#ffa88a87c18d565c02576c5b75cde29326a4263c" + integrity sha512-S5v3lQbUxyzGYWMo5P3V+e47O4CNyhih2uHr+YLvdMtaq8Pj7jNHrZU9pxEFF0ldZDAFC3Z5WZaUglNXfZyZCw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 9a6b5e34c8..7bb82c744f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.39", - "@budibase/pro": "2.1.38", + "@budibase/pro": "2.1.39", "@budibase/string-templates": "^2.1.39", "@budibase/types": "^2.1.39", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 3c6a05e007..4c6b66ad6b 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.38": - version "2.1.38" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.38.tgz#d5ce8be979311bc194fdba98049af3ae609c4222" - integrity sha512-HabobTWZ1jHy2OeZqitx66J+N3pEuMqL+n1rk23hVX4uo7RCtZjr8MkfD39hoN/NdH+kDf2Hz+QR8suw+a/VXw== +"@budibase/backend-core@2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.39.tgz#0ada64b114d2b61e6a4a782227348e1bfd33ebc6" + integrity sha512-OW1SOS0jWHoHBVMZo3A36F5urgphduOXWqegtHRL3o3cFmf38l8XI6TtKDWrfSkJat0FKrzjJs1vAnIh9cQeMA== dependencies: - "@budibase/types" "^2.1.38" + "@budibase/types" "^2.1.39" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.38": - version "2.1.38" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.38.tgz#eb6f105d4cb59ac69d542f26d663b8ae612c0636" - integrity sha512-wGOJ6AcCwPwz8GiGkZoaScNlinPBL4QvU1IgbpwPjxZENW0Uo3P7Nt/EUfktKvJdYmOGTT6p/MIBsPDcIe5j9Q== +"@budibase/pro@2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.39.tgz#31d59a9e3bde75f9b83cff8db1b8fcb75c16fafe" + integrity sha512-GQ5Z0U03C9RifZhPQX9dc61yLM9YkRZOjl7mHXIrcm6ytUA3I/DMuGcN83hwlxlPOem9utofDmXfCE288nLDZg== dependencies: - "@budibase/backend-core" "2.1.38" - "@budibase/types" "2.1.38" + "@budibase/backend-core" "2.1.39" + "@budibase/types" "2.1.39" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.38", "@budibase/types@^2.1.38": - version "2.1.38" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.38.tgz#a0cde59a001420a3e98fc2136548911a3b2470ea" - integrity sha512-xiPMrTcYbDzcvNkZ0QOz21mXQECTTxSKAqa1s4s+zKeZ6g+r22WaZDw/H8Uyz4fbkUahFaiRwilMVkP10SWhkg== +"@budibase/types@2.1.39", "@budibase/types@^2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.39.tgz#ffa88a87c18d565c02576c5b75cde29326a4263c" + integrity sha512-S5v3lQbUxyzGYWMo5P3V+e47O4CNyhih2uHr+YLvdMtaq8Pj7jNHrZU9pxEFF0ldZDAFC3Z5WZaUglNXfZyZCw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From 1567ab27d0504b41c3a376ca06db14901d1f98e2 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 28 Nov 2022 16:01:27 +0000 Subject: [PATCH 093/179] Allow developers to manage user access --- packages/worker/src/api/routes/global/users.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/worker/src/api/routes/global/users.js b/packages/worker/src/api/routes/global/users.js index 2d9b1d9ac9..c9acaaf068 100644 --- a/packages/worker/src/api/routes/global/users.js +++ b/packages/worker/src/api/routes/global/users.js @@ -1,7 +1,6 @@ const Router = require("@koa/router") const controller = require("../../controllers/global/users") const { joiValidator } = require("@budibase/backend-core/auth") -const { adminOnly } = require("@budibase/backend-core/auth") const Joi = require("joi") const cloudRestricted = require("../../../middleware/cloudRestricted") const { users } = require("../validation") @@ -51,31 +50,31 @@ function buildInviteAcceptValidation() { router .post( "/api/global/users", - adminOnly, + builderOrAdmin, users.buildUserSaveValidation(), controller.save ) .post( "/api/global/users/bulk", - adminOnly, + builderOrAdmin, users.buildUserBulkUserValidation(), controller.bulkUpdate ) .get("/api/global/users", builderOrAdmin, controller.fetch) .post("/api/global/users/search", builderOrAdmin, controller.search) - .delete("/api/global/users/:id", adminOnly, controller.destroy) + .delete("/api/global/users/:id", builderOrAdmin, controller.destroy) .get("/api/global/users/count/:appId", builderOrAdmin, controller.countByApp) .get("/api/global/roles/:appId") .post( "/api/global/users/invite", - adminOnly, + builderOrAdmin, buildInviteValidation(), controller.invite ) .post( "/api/global/users/multi/invite", - adminOnly, + builderOrAdmin, buildInviteMultipleValidation(), controller.inviteMultiple ) From e0645e0293232f2cdf76e68a1f7ce112e8cc7564 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Mon, 28 Nov 2022 16:02:49 +0000 Subject: [PATCH 094/179] Invite is adminOnly --- packages/worker/src/api/routes/global/users.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/worker/src/api/routes/global/users.js b/packages/worker/src/api/routes/global/users.js index c9acaaf068..99c2f52c6f 100644 --- a/packages/worker/src/api/routes/global/users.js +++ b/packages/worker/src/api/routes/global/users.js @@ -1,6 +1,7 @@ const Router = require("@koa/router") const controller = require("../../controllers/global/users") const { joiValidator } = require("@budibase/backend-core/auth") +const { adminOnly } = require("@budibase/backend-core/auth") const Joi = require("joi") const cloudRestricted = require("../../../middleware/cloudRestricted") const { users } = require("../validation") @@ -68,13 +69,13 @@ router .get("/api/global/roles/:appId") .post( "/api/global/users/invite", - builderOrAdmin, + adminOnly, buildInviteValidation(), controller.invite ) .post( "/api/global/users/multi/invite", - builderOrAdmin, + adminOnly, buildInviteMultipleValidation(), controller.inviteMultiple ) From c1e1ba51f33959cee9a0f635563e86a0ed3eae59 Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 28 Nov 2022 17:25:10 +0000 Subject: [PATCH 095/179] Disabled the ability to rename the Sample Data datasource. Updated the backend to ensure that renaming doesn't alter its structure and block deletion --- .../popovers/EditDatasourcePopover.svelte | 5 ++++- packages/builder/src/constants/backend/index.js | 1 + .../datasource_internal_bb_default/_layout.svelte | 3 ++- packages/server/src/api/controllers/datasource.ts | 9 +++++++-- .../server/src/db/defaultData/datasource_bb_default.js | 8 +++++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte index ae0023f682..165ed18ad8 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte @@ -5,6 +5,7 @@ import { ActionMenu, MenuItem, Icon } from "@budibase/bbui" import ConfirmDialog from "components/common/ConfirmDialog.svelte" import UpdateDatasourceModal from "components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte" + import { BUDIBASE_DATASOURCE_TYPE } from "constants/backend" export let datasource @@ -42,7 +43,9 @@
- Edit + {#if datasource.type !== BUDIBASE_DATASOURCE_TYPE} + Edit + {/if} Delete diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.js index f3898e1d9e..35e250d459 100644 --- a/packages/builder/src/constants/backend/index.js +++ b/packages/builder/src/constants/backend/index.js @@ -174,6 +174,7 @@ export const SWITCHABLE_TYPES = [ ] export const BUDIBASE_INTERNAL_DB_ID = "bb_internal" +export const DEFAULT_BB_DATASOURCE_ID = "datasource_internal_bb_default" export const BUDIBASE_DATASOURCE_TYPE = "budibase" export const DB_TYPE_INTERNAL = "internal" export const DB_TYPE_EXTERNAL = "external" diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/_layout.svelte index 249f23d8b6..168290ef02 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/_layout.svelte @@ -1,7 +1,8 @@ diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 511eb8ab74..cb1eb9ccaf 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -152,7 +152,12 @@ export async function update(ctx: BBContext) { let datasource = await db.get(datasourceId) const auth = datasource.config.auth await invalidateVariables(datasource, ctx.request.body) - datasource = { ...datasource, ...ctx.request.body } + + const dataSourceBody = !datasource.plus + ? { name: ctx.request.body?.name } + : ctx.request.body + + datasource = { ...datasource, ...dataSourceBody } if (auth && !ctx.request.body.auth) { // don't strip auth config from DB datasource.config.auth = auth @@ -163,7 +168,7 @@ export async function update(ctx: BBContext) { datasource._rev = response.rev // Drain connection pools when configuration is changed - if (datasource.source) { + if (datasource.source && datasource.plus) { const source = await getIntegration(datasource.source) if (source && source.pool) { await source.pool.end() diff --git a/packages/server/src/db/defaultData/datasource_bb_default.js b/packages/server/src/db/defaultData/datasource_bb_default.js index f12ee2c97d..0716b4bddf 100644 --- a/packages/server/src/db/defaultData/datasource_bb_default.js +++ b/packages/server/src/db/defaultData/datasource_bb_default.js @@ -631,8 +631,14 @@ exports.buildDefaultDocs = () => { ) }) + const dataSource = { + ...this.DEFAULT_BB_DATASOURCE, + updatedAt: new Date().toISOString(), + createdAt: new Date().toISOString(), + } + return [ - this.DEFAULT_BB_DATASOURCE, + dataSource, inventoryData.table, employeeData.table, jobData.table, From b5b74b9cadd0c80f1e136e63724895b868fa1691 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 28 Nov 2022 17:54:04 +0000 Subject: [PATCH 096/179] General work after running some tests in CI - general refactoring as well. --- packages/backend-core/src/{ => auth}/auth.ts | 71 +++++++++---------- packages/backend-core/src/auth/index.ts | 1 + .../src/{db/constants.ts => constants/db.ts} | 0 packages/backend-core/src/constants/index.ts | 2 + .../src/{constants.ts => constants/misc.ts} | 0 packages/backend-core/src/context/Context.ts | 11 ++- .../backend-core/src/context/constants.ts | 7 -- .../backend-core/src/context/mainContext.ts | 37 ++++++++-- packages/backend-core/src/db/Replication.ts | 4 +- packages/backend-core/src/db/conversions.ts | 2 +- packages/backend-core/src/db/index.ts | 6 +- packages/backend-core/src/db/tenancy.ts | 22 ------ .../backend-core/src/db/tests/utils.spec.js | 4 +- packages/backend-core/src/db/utils.ts | 22 +++--- packages/backend-core/src/db/views.ts | 9 ++- packages/backend-core/src/environment.ts | 3 +- packages/backend-core/src/events/analytics.ts | 4 +- .../backend-core/src/featureFlags/index.ts | 2 +- packages/backend-core/src/index.ts | 10 ++- .../src/migrations/tests/index.spec.js | 2 +- packages/backend-core/src/plugin/index.ts | 8 +-- packages/backend-core/src/tenancy/index.ts | 11 +-- packages/backend-core/src/tenancy/tenancy.ts | 10 +-- packages/backend-core/src/tests/utils.spec.js | 3 +- packages/backend-core/src/utils/utils.ts | 11 +-- packages/server/src/app.ts | 20 +++--- packages/server/src/environment.ts | 3 +- packages/worker/src/api/index.ts | 2 +- packages/worker/src/environment.ts | 2 +- packages/worker/src/index.ts | 2 +- .../worker/src/tests/TestConfiguration.ts | 2 +- packages/worker/src/tests/controllers.js | 7 -- packages/worker/src/tests/controllers.ts | 5 ++ .../structures/{configs.js => configs.ts} | 10 +-- packages/worker/src/tests/structures/index.ts | 2 +- 35 files changed, 145 insertions(+), 172 deletions(-) rename packages/backend-core/src/{ => auth}/auth.ts (79%) create mode 100644 packages/backend-core/src/auth/index.ts rename packages/backend-core/src/{db/constants.ts => constants/db.ts} (100%) create mode 100644 packages/backend-core/src/constants/index.ts rename packages/backend-core/src/{constants.ts => constants/misc.ts} (100%) delete mode 100644 packages/backend-core/src/context/constants.ts delete mode 100644 packages/backend-core/src/db/tenancy.ts delete mode 100644 packages/worker/src/tests/controllers.js create mode 100644 packages/worker/src/tests/controllers.ts rename packages/worker/src/tests/structures/{configs.js => configs.ts} (88%) diff --git a/packages/backend-core/src/auth.ts b/packages/backend-core/src/auth/auth.ts similarity index 79% rename from packages/backend-core/src/auth.ts rename to packages/backend-core/src/auth/auth.ts index 91a4b750ad..75e425bd0f 100644 --- a/packages/backend-core/src/auth.ts +++ b/packages/backend-core/src/auth/auth.ts @@ -1,16 +1,14 @@ -const passport = require("koa-passport") +const _passport = require("koa-passport") const LocalStrategy = require("passport-local").Strategy const JwtStrategy = require("passport-jwt").Strategy -import { getGlobalDB } from "./tenancy" +import { getGlobalDB } from "../tenancy" const refresh = require("passport-oauth2-refresh") -import { Config } from "./constants" -import { getScopedConfig } from "./db" +import { Config } from "../constants" +import { getScopedConfig } from "../db" import { - jwt, + jwt as jwtPassport, local, authenticated, - google, - oidc, auditLog, tenancy, authError, @@ -21,22 +19,41 @@ import { builderOnly, builderOrAdmin, joiValidator, -} from "./middleware" -import { invalidateUser } from "./cache/user" + oidc, + google, +} from "../middleware" +import { invalidateUser } from "../cache/user" import { User } from "@budibase/types" -import { logAlert } from "./logging" +import { logAlert } from "../logging" +export { + auditLog, + authError, + internalApi, + ssoCallbackUrl, + adminOnly, + builderOnly, + builderOrAdmin, + joiValidator, + google, + oidc, +} from "../middleware" +export const buildAuthMiddleware = authenticated +export const buildTenancyMiddleware = tenancy +export const buildCsrfMiddleware = csrf +export const passport = _passport +export const jwt = require("jsonwebtoken") // Strategies -passport.use(new LocalStrategy(local.options, local.authenticate)) -if (jwt.options.secretOrKey) { - passport.use(new JwtStrategy(jwt.options, jwt.authenticate)) +_passport.use(new LocalStrategy(local.options, local.authenticate)) +if (jwtPassport.options.secretOrKey) { + _passport.use(new JwtStrategy(jwtPassport.options, jwtPassport.authenticate)) } else { logAlert("No JWT Secret supplied, cannot configure JWT strategy") } -passport.serializeUser((user: User, done: any) => done(null, user)) +_passport.serializeUser((user: User, done: any) => done(null, user)) -passport.deserializeUser(async (user: User, done: any) => { +_passport.deserializeUser(async (user: User, done: any) => { const db = getGlobalDB() try { @@ -115,7 +132,7 @@ async function refreshGoogleAccessToken( }) } -async function refreshOAuthToken( +export async function refreshOAuthToken( refreshToken: string, configType: string, configId: string @@ -152,7 +169,7 @@ async function refreshOAuthToken( return refreshResponse } -async function updateUserOAuth(userId: string, oAuthConfig: any) { +export async function updateUserOAuth(userId: string, oAuthConfig: any) { const details = { accessToken: oAuthConfig.accessToken, refreshToken: oAuthConfig.refreshToken, @@ -179,23 +196,3 @@ async function updateUserOAuth(userId: string, oAuthConfig: any) { console.error("Could not update OAuth details for current user", e) } } - -export = { - buildAuthMiddleware: authenticated, - passport, - google, - oidc, - jwt: require("jsonwebtoken"), - buildTenancyMiddleware: tenancy, - auditLog, - authError, - buildCsrfMiddleware: csrf, - internalApi, - refreshOAuthToken, - updateUserOAuth, - ssoCallbackUrl, - adminOnly, - builderOnly, - builderOrAdmin, - joiValidator, -} diff --git a/packages/backend-core/src/auth/index.ts b/packages/backend-core/src/auth/index.ts new file mode 100644 index 0000000000..306751af96 --- /dev/null +++ b/packages/backend-core/src/auth/index.ts @@ -0,0 +1 @@ +export * from "./auth" diff --git a/packages/backend-core/src/db/constants.ts b/packages/backend-core/src/constants/db.ts similarity index 100% rename from packages/backend-core/src/db/constants.ts rename to packages/backend-core/src/constants/db.ts diff --git a/packages/backend-core/src/constants/index.ts b/packages/backend-core/src/constants/index.ts new file mode 100644 index 0000000000..62d5e08e63 --- /dev/null +++ b/packages/backend-core/src/constants/index.ts @@ -0,0 +1,2 @@ +export * from "./db" +export * from "./misc" diff --git a/packages/backend-core/src/constants.ts b/packages/backend-core/src/constants/misc.ts similarity index 100% rename from packages/backend-core/src/constants.ts rename to packages/backend-core/src/constants/misc.ts diff --git a/packages/backend-core/src/context/Context.ts b/packages/backend-core/src/context/Context.ts index 6ffb57e44e..f0ccdb97a8 100644 --- a/packages/backend-core/src/context/Context.ts +++ b/packages/backend-core/src/context/Context.ts @@ -1,18 +1,17 @@ import { AsyncLocalStorage } from "async_hooks" -import { ContextMap } from "./constants" export default class Context { - static storage = new AsyncLocalStorage() + static storage = new AsyncLocalStorage>() - static run(context: ContextMap, func: any) { + static run(context: Record, func: any) { return Context.storage.run(context, () => func()) } - static get(): ContextMap { - return Context.storage.getStore() as ContextMap + static get(): Record { + return Context.storage.getStore() as Record } - static set(context: ContextMap) { + static set(context: Record) { Context.storage.enterWith(context) } } diff --git a/packages/backend-core/src/context/constants.ts b/packages/backend-core/src/context/constants.ts deleted file mode 100644 index 64fdb45dec..0000000000 --- a/packages/backend-core/src/context/constants.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { IdentityContext } from "@budibase/types" - -export type ContextMap = { - tenantId?: string - appId?: string - identity?: IdentityContext -} diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts index 9fe8a016a6..d743d2f49b 100644 --- a/packages/backend-core/src/context/mainContext.ts +++ b/packages/backend-core/src/context/mainContext.ts @@ -2,20 +2,43 @@ // store an app ID to pretend there is a context import env from "../environment" import Context from "./Context" +import { getDevelopmentAppID, getProdAppID } from "../db/conversions" +import { getDB } from "../db/db" import { - baseGlobalDBName, DocumentType, - getDB, - getDevelopmentAppID, - getProdAppID, SEPARATOR, -} from "../db" -import { ContextMap } from "./constants" + StaticDatabases, + DEFAULT_TENANT_ID, +} from "../constants" import { Database, IdentityContext } from "@budibase/types" -import { DEFAULT_TENANT_ID } from "./index" + +export type ContextMap = { + tenantId?: string + appId?: string + identity?: IdentityContext +} let TEST_APP_ID: string | null = null +export function getGlobalDBName(tenantId?: string) { + // tenant ID can be set externally, for example user API where + // new tenants are being created, this may be the case + if (!tenantId) { + tenantId = getTenantId() + } + return baseGlobalDBName(tenantId) +} + +export function baseGlobalDBName(tenantId: string | undefined | null) { + let dbName + if (!tenantId || tenantId === DEFAULT_TENANT_ID) { + dbName = StaticDatabases.GLOBAL.name + } else { + dbName = `${tenantId}${SEPARATOR}${StaticDatabases.GLOBAL.name}` + } + return dbName +} + export function isMultiTenant() { return env.MULTI_TENANCY } diff --git a/packages/backend-core/src/db/Replication.ts b/packages/backend-core/src/db/Replication.ts index 12f6001a70..eb9d613a58 100644 --- a/packages/backend-core/src/db/Replication.ts +++ b/packages/backend-core/src/db/Replication.ts @@ -1,5 +1,5 @@ -import { getPouchDB, closePouchDB } from "./couch/pouchDB" -import { DocumentType } from "./constants" +import { getPouchDB, closePouchDB } from "./couch" +import { DocumentType } from "../constants" class Replication { source: any diff --git a/packages/backend-core/src/db/conversions.ts b/packages/backend-core/src/db/conversions.ts index 48eaf31844..381c5cb90f 100644 --- a/packages/backend-core/src/db/conversions.ts +++ b/packages/backend-core/src/db/conversions.ts @@ -1,4 +1,4 @@ -import { APP_DEV_PREFIX, APP_PREFIX } from "./constants" +import { APP_DEV_PREFIX, APP_PREFIX } from "../constants" import { App } from "@budibase/types" const NO_APP_ERROR = "No app provided" diff --git a/packages/backend-core/src/db/index.ts b/packages/backend-core/src/db/index.ts index 7269aa8f92..0d9f75fa18 100644 --- a/packages/backend-core/src/db/index.ts +++ b/packages/backend-core/src/db/index.ts @@ -2,6 +2,8 @@ export * from "./couch" export * from "./db" export * from "./utils" export * from "./views" -export * from "./constants" export * from "./conversions" -export * from "./tenancy" +export { default as Replication } from "./Replication" +// exports to support old export structure +export * from "../constants/db" +export { getGlobalDBName, baseGlobalDBName } from "../context" diff --git a/packages/backend-core/src/db/tenancy.ts b/packages/backend-core/src/db/tenancy.ts deleted file mode 100644 index d920f7cd41..0000000000 --- a/packages/backend-core/src/db/tenancy.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { DEFAULT_TENANT_ID } from "../constants" -import { StaticDatabases, SEPARATOR } from "./constants" -import { getTenantId } from "../context" - -export const getGlobalDBName = (tenantId?: string) => { - // tenant ID can be set externally, for example user API where - // new tenants are being created, this may be the case - if (!tenantId) { - tenantId = getTenantId() - } - return baseGlobalDBName(tenantId) -} - -export const baseGlobalDBName = (tenantId: string | undefined | null) => { - let dbName - if (!tenantId || tenantId === DEFAULT_TENANT_ID) { - dbName = StaticDatabases.GLOBAL.name - } else { - dbName = `${tenantId}${SEPARATOR}${StaticDatabases.GLOBAL.name}` - } - return dbName -} diff --git a/packages/backend-core/src/db/tests/utils.spec.js b/packages/backend-core/src/db/tests/utils.spec.js index 0d16e2dec2..f95889c1cc 100644 --- a/packages/backend-core/src/db/tests/utils.spec.js +++ b/packages/backend-core/src/db/tests/utils.spec.js @@ -1,10 +1,12 @@ require("../../../tests") const { - generateAppID, getDevelopmentAppID, getProdAppID, isDevAppID, isProdAppID, +} = require("../conversions") +const { + generateAppID, getPlatformUrl, getScopedConfig } = require("../utils") diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts index cfab451de4..590c3eeef8 100644 --- a/packages/backend-core/src/db/utils.ts +++ b/packages/backend-core/src/db/utils.ts @@ -1,26 +1,20 @@ -import { newid } from "../utils/hashing" -import { DEFAULT_TENANT_ID, Config } from "../constants" +import { newid } from "../newid" import env from "../environment" import { + DEFAULT_TENANT_ID, SEPARATOR, DocumentType, UNICODE_MAX, ViewName, InternalTable, -} from "./constants" -import { getTenantId, getGlobalDB } from "../context" -import { getGlobalDBName } from "./tenancy" + APP_PREFIX, +} from "../constants" +import { getTenantId, getGlobalDB, getGlobalDBName } from "../context" import { doWithDB, allDbs, directCouchAllDbs } from "./db" import { getAppMetadata } from "../cache/appMetadata" import { isDevApp, isDevAppID, getProdAppID } from "./conversions" -import { APP_PREFIX } from "./constants" import * as events from "../events" -import { App, Database } from "@budibase/types" - -export * from "./constants" -export * from "./conversions" -export { default as Replication } from "./Replication" -export * from "./tenancy" +import { App, Database, ConfigType } from "@budibase/types" /** * Generates a new app ID. @@ -494,7 +488,7 @@ export const getScopedFullConfig = async function ( )[0] // custom logic for settings doc - if (type === Config.SETTINGS) { + if (type === ConfigType.SETTINGS) { if (scopedConfig && scopedConfig.doc) { // overrides affected by environment variables scopedConfig.doc.config.platformUrl = await getPlatformUrl({ @@ -533,7 +527,7 @@ export const getPlatformUrl = async (opts = { tenantAware: true }) => { // get the doc directly instead of with getScopedConfig to prevent loop let settings try { - settings = await db.get(generateConfigID({ type: Config.SETTINGS })) + settings = await db.get(generateConfigID({ type: ConfigType.SETTINGS })) } catch (e: any) { if (e.status !== 404) { throw e diff --git a/packages/backend-core/src/db/views.ts b/packages/backend-core/src/db/views.ts index c563d55be3..4a87be0a68 100644 --- a/packages/backend-core/src/db/views.ts +++ b/packages/backend-core/src/db/views.ts @@ -1,6 +1,11 @@ -import { DocumentType, ViewName, DeprecatedViews, SEPARATOR } from "./utils" +import { + DocumentType, + ViewName, + DeprecatedViews, + SEPARATOR, + StaticDatabases, +} from "../constants" import { getGlobalDB } from "../context" -import { StaticDatabases } from "./constants" import { doWithDB } from "./" import { Database, DatabaseQueryOpts } from "@budibase/types" diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts index 5d010f1421..b35f3ecaa4 100644 --- a/packages/backend-core/src/environment.ts +++ b/packages/backend-core/src/environment.ts @@ -75,7 +75,8 @@ const environment = { process.env.DEPLOYMENT_ENVIRONMENT || "docker-compose", _set(key: any, value: any) { process.env[key] = value - module.exports[key] = value + // @ts-ignore + environment[key] = value }, } diff --git a/packages/backend-core/src/events/analytics.ts b/packages/backend-core/src/events/analytics.ts index 90cacc902b..f621a9c98b 100644 --- a/packages/backend-core/src/events/analytics.ts +++ b/packages/backend-core/src/events/analytics.ts @@ -1,8 +1,8 @@ import env from "../environment" -import tenancy from "../tenancy" +import * as tenancy from "../tenancy" import * as dbUtils from "../db/utils" import { Config } from "../constants" -import { withCache, TTL, CacheKey } from "../cache/generic" +import { withCache, TTL, CacheKey } from "../cache" export const enabled = async () => { // cloud - always use the environment variable diff --git a/packages/backend-core/src/featureFlags/index.ts b/packages/backend-core/src/featureFlags/index.ts index 0d59e5129e..71e226c976 100644 --- a/packages/backend-core/src/featureFlags/index.ts +++ b/packages/backend-core/src/featureFlags/index.ts @@ -1,5 +1,5 @@ import env from "../environment" -import tenancy from "../tenancy" +import * as tenancy from "../tenancy" /** * Read the TENANT_FEATURE_FLAGS env var and return an array of features flags for each tenant. diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts index ace9bc5034..a4d4ad0a80 100644 --- a/packages/backend-core/src/index.ts +++ b/packages/backend-core/src/index.ts @@ -8,17 +8,16 @@ import * as permissions from "./security/permissions" import * as accounts from "./cloud/accounts" import * as installation from "./installation" import env from "./environment" -import tenancy from "./tenancy" +import * as tenancy from "./tenancy" import * as featureFlags from "./featureFlags" import * as sessions from "./security/sessions" import * as deprovisioning from "./context/deprovision" -import auth from "./auth" +import * as auth from "./auth" import * as constants from "./constants" -import * as dbConstants from "./db/constants" import * as logging from "./logging" import * as pino from "./pino" import * as middleware from "./middleware" -import plugins from "./plugin" +import * as plugins from "./plugin" import * as encryption from "./security/encryption" import * as queue from "./queue" import * as db from "./db" @@ -35,7 +34,7 @@ const init = (opts: any = {}) => { const core = { init, db, - ...dbConstants, + ...constants, redis, locks: redis.redlock, objectStore, @@ -44,7 +43,6 @@ const core = { cache, auth, constants, - ...constants, migrations, env, accounts, diff --git a/packages/backend-core/src/migrations/tests/index.spec.js b/packages/backend-core/src/migrations/tests/index.spec.js index 8fbc244cd6..b7d2e14ea5 100644 --- a/packages/backend-core/src/migrations/tests/index.spec.js +++ b/packages/backend-core/src/migrations/tests/index.spec.js @@ -3,7 +3,7 @@ const { runMigrations, getMigrationsDoc } = require("../index") const { getDB } = require("../../db") const { StaticDatabases, -} = require("../../db/utils") +} = require("../../constants") let db diff --git a/packages/backend-core/src/plugin/index.ts b/packages/backend-core/src/plugin/index.ts index a6d1853007..3eeaeaa90c 100644 --- a/packages/backend-core/src/plugin/index.ts +++ b/packages/backend-core/src/plugin/index.ts @@ -1,7 +1 @@ -import * as utils from "./utils" - -const pkg = { - ...utils, -} - -export = pkg +export * from "./utils" diff --git a/packages/backend-core/src/tenancy/index.ts b/packages/backend-core/src/tenancy/index.ts index e0006abab2..1618a136dd 100644 --- a/packages/backend-core/src/tenancy/index.ts +++ b/packages/backend-core/src/tenancy/index.ts @@ -1,9 +1,2 @@ -import * as context from "../context" -import * as tenancy from "./tenancy" - -const pkg = { - ...context, - ...tenancy, -} - -export = pkg +export * from "../context" +export * from "./tenancy" diff --git a/packages/backend-core/src/tenancy/tenancy.ts b/packages/backend-core/src/tenancy/tenancy.ts index cc1088ab08..e0e0703433 100644 --- a/packages/backend-core/src/tenancy/tenancy.ts +++ b/packages/backend-core/src/tenancy/tenancy.ts @@ -1,10 +1,4 @@ -import { - doWithDB, - queryPlatformView, - StaticDatabases, - getGlobalDBName, - ViewName, -} from "../db" +import { doWithDB, queryPlatformView, getGlobalDBName } from "../db" import { DEFAULT_TENANT_ID, getTenantId, @@ -18,7 +12,7 @@ import { TenantResolutionStrategy, GetTenantIdOptions, } from "@budibase/types" -import { Header } from "../constants" +import { Header, StaticDatabases, ViewName } from "../constants" const TENANT_DOC = StaticDatabases.PLATFORM_INFO.docs.tenants const PLATFORM_INFO_DB = StaticDatabases.PLATFORM_INFO.name diff --git a/packages/backend-core/src/tests/utils.spec.js b/packages/backend-core/src/tests/utils.spec.js index 76fc7b4481..fb3828921d 100644 --- a/packages/backend-core/src/tests/utils.spec.js +++ b/packages/backend-core/src/tests/utils.spec.js @@ -1,7 +1,8 @@ const { structures } = require("../../tests") const utils = require("../utils") const events = require("../events") -const { doInTenant, DEFAULT_TENANT_ID }= require("../context") +const { DEFAULT_TENANT_ID } = require("../constants") +const { doInTenant } = require("../context") describe("utils", () => { describe("platformLogout", () => { diff --git a/packages/backend-core/src/utils/utils.ts b/packages/backend-core/src/utils/utils.ts index d830164414..3e9fbb177a 100644 --- a/packages/backend-core/src/utils/utils.ts +++ b/packages/backend-core/src/utils/utils.ts @@ -1,17 +1,11 @@ -import { - DocumentType, - SEPARATOR, - ViewName, - getAllApps, - queryGlobalView, -} from "../db" +import { getAllApps, queryGlobalView } from "../db" import { options } from "../middleware/passport/jwt" import { Header, Cookie, MAX_VALID_DATE } from "../constants" import env from "../environment" import * as userCache from "../cache/user" import { getSessionsForUser, invalidateSessions } from "../security/sessions" import * as events from "../events" -import tenancy from "../tenancy" +import * as tenancy from "../tenancy" import { App, BBContext, @@ -19,6 +13,7 @@ import { TenantResolutionStrategy, } from "@budibase/types" import { SetOption } from "cookies" +import { DocumentType, SEPARATOR, ViewName } from "../constants" const jwt = require("jsonwebtoken") const APP_PREFIX = DocumentType.APP + SEPARATOR diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts index 9010bf87f3..0fb78d7525 100644 --- a/packages/server/src/app.ts +++ b/packages/server/src/app.ts @@ -12,18 +12,18 @@ if (process.env.ELASTIC_APM_ENABLED) { import { ExtendableContext } from "koa" import * as db from "./db" db.init() -const Koa = require("koa") -const destroyable = require("server-destroy") -const koaBody = require("koa-body") -const http = require("http") -const api = require("./api") -const automations = require("./automations/index") -const Sentry = require("@sentry/node") -const { Thread } = require("./threads") +import Koa from "koa" +import koaBody from "koa-body" +import http from "http" +import * as api from "./api" +import * as automations from "./automations" +import { Thread } from "./threads" import * as redis from "./utilities/redis" import { events, logging } from "@budibase/backend-core" import { initialise as initialiseWebsockets } from "./websocket" import { startup } from "./startup" +const Sentry = require("@sentry/node") +const destroyable = require("server-destroy") const app = new Koa() @@ -34,6 +34,7 @@ app.use( formLimit: "10mb", jsonLimit: "10mb", textLimit: "10mb", + // @ts-ignore enableTypes: ["json", "form", "text"], parsedMethods: ["POST", "PUT", "PATCH", "DELETE"], }) @@ -76,12 +77,13 @@ server.on("close", async () => { } }) -module.exports = server.listen(env.PORT || 0, async () => { +export = server.listen(env.PORT || 0, async () => { await startup(app, server) }) const shutdown = () => { server.close() + // @ts-ignore server.destroy() } diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts index d3b884c12c..bf5330f9b6 100644 --- a/packages/server/src/environment.ts +++ b/packages/server/src/environment.ts @@ -88,7 +88,8 @@ const environment = { CLIENT_ID: process.env.CLIENT_ID, _set(key: string, value: any) { process.env[key] = value - module.exports[key] = value + // @ts-ignore + environment[key] = value }, isTest, isJest, diff --git a/packages/worker/src/api/index.ts b/packages/worker/src/api/index.ts index 073235c3ba..e37c6c2d94 100644 --- a/packages/worker/src/api/index.ts +++ b/packages/worker/src/api/index.ts @@ -163,4 +163,4 @@ for (let route of routes) { router.use(route.allowedMethods()) } -export = router +export default router diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index 84f8ba0a4d..f4c339ad6d 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -68,7 +68,7 @@ const environment = { _set(key: any, value: any) { process.env[key] = value // @ts-ignore - env[key] = value + environment[key] = value }, isDev, isTest, diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts index b1ebb72e20..b513b11279 100644 --- a/packages/worker/src/index.ts +++ b/packages/worker/src/index.ts @@ -19,7 +19,7 @@ db.init() import Koa from "koa" import koaBody from "koa-body" import http from "http" -import * as api from "./api" +import api from "./api" import * as redis from "./utilities/redis" import Sentry from "@sentry/node" const koaSession = require("koa-session") diff --git a/packages/worker/src/tests/TestConfiguration.ts b/packages/worker/src/tests/TestConfiguration.ts index 015ebb6258..871b7ec6a6 100644 --- a/packages/worker/src/tests/TestConfiguration.ts +++ b/packages/worker/src/tests/TestConfiguration.ts @@ -2,7 +2,7 @@ import "./mocks" import * as dbConfig from "../db" dbConfig.init() import env from "../environment" -import controllers from "./controllers" +import * as controllers from "./controllers" const supertest = require("supertest") import { Config } from "../constants" import { diff --git a/packages/worker/src/tests/controllers.js b/packages/worker/src/tests/controllers.js deleted file mode 100644 index 226355506f..0000000000 --- a/packages/worker/src/tests/controllers.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - email: require("../api/controllers/global/email"), - workspaces: require("../api/controllers/global/workspaces"), - config: require("../api/controllers/global/configs"), - templates: require("../api/controllers/global/templates"), - users: require("../api/controllers/global/users"), -} diff --git a/packages/worker/src/tests/controllers.ts b/packages/worker/src/tests/controllers.ts new file mode 100644 index 0000000000..bdcf11434b --- /dev/null +++ b/packages/worker/src/tests/controllers.ts @@ -0,0 +1,5 @@ +export * as email from "../api/controllers/global/email" +export * as workspaces from "../api/controllers/global/workspaces" +export * as config from "../api/controllers/global/configs" +export * as templates from "../api/controllers/global/templates" +export * as users from "../api/controllers/global/users" diff --git a/packages/worker/src/tests/structures/configs.js b/packages/worker/src/tests/structures/configs.ts similarity index 88% rename from packages/worker/src/tests/structures/configs.js rename to packages/worker/src/tests/structures/configs.ts index fbd82de0a7..a692e77987 100644 --- a/packages/worker/src/tests/structures/configs.js +++ b/packages/worker/src/tests/structures/configs.ts @@ -1,7 +1,7 @@ const { Config } = require("../../constants") const { utils } = require("@budibase/backend-core") -exports.oidc = conf => { +export function oidc(conf?: any) { return { type: Config.OIDC, config: { @@ -21,7 +21,7 @@ exports.oidc = conf => { } } -exports.google = conf => { +export function google(conf?: any) { return { type: Config.GOOGLE, config: { @@ -33,7 +33,7 @@ exports.google = conf => { } } -exports.smtp = conf => { +export function smtp(conf?: any) { return { type: Config.SMTP, config: { @@ -47,7 +47,7 @@ exports.smtp = conf => { } } -exports.smtpEthereal = () => { +export function smtpEthereal() { return { type: Config.SMTP, config: { @@ -63,7 +63,7 @@ exports.smtpEthereal = () => { } } -exports.settings = conf => { +export function settings(conf?: any) { return { type: Config.SETTINGS, config: { diff --git a/packages/worker/src/tests/structures/index.ts b/packages/worker/src/tests/structures/index.ts index 3a4c3324df..0ac32e77ee 100644 --- a/packages/worker/src/tests/structures/index.ts +++ b/packages/worker/src/tests/structures/index.ts @@ -1,5 +1,5 @@ import { structures } from "@budibase/backend-core/tests" -import configs from "./configs" +import * as configs from "./configs" import * as users from "./users" import * as groups from "./groups" import { v4 as uuid } from "uuid" From 482c130a2ee1b6f2fa4038044dc21dd622b833eb Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 28 Nov 2022 18:14:10 +0000 Subject: [PATCH 097/179] Some fixes after re-running server tests. --- packages/server/src/api/controllers/public/rows.ts | 2 +- packages/server/src/api/controllers/public/utils.ts | 4 ++-- packages/server/src/api/routes/public/index.ts | 9 +++------ packages/server/src/automations/steps/utils.ts | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/server/src/api/controllers/public/rows.ts b/packages/server/src/api/controllers/public/rows.ts index 67059ec2f5..df856f1fe0 100644 --- a/packages/server/src/api/controllers/public/rows.ts +++ b/packages/server/src/api/controllers/public/rows.ts @@ -1,6 +1,6 @@ import * as rowController from "../row" import { addRev } from "./utils" -import { Row } from "../../../definitions/common" +import { Row } from "@budibase/types" import { convertBookmark } from "../../../utilities" // makes sure that the user doesn't need to pass in the type, tableId or _id params for diff --git a/packages/server/src/api/controllers/public/utils.ts b/packages/server/src/api/controllers/public/utils.ts index 6909db9628..a51b6b5fff 100644 --- a/packages/server/src/api/controllers/public/utils.ts +++ b/packages/server/src/api/controllers/public/utils.ts @@ -1,4 +1,4 @@ -const { getAppDB } = require("@budibase/backend-core/context") +import { context } from "@budibase/backend-core" import { isExternalTable } from "../../../integrations/utils" import { APP_PREFIX, DocumentType } from "../../../db/utils" @@ -13,7 +13,7 @@ export async function addRev( if (body._id.startsWith(APP_PREFIX)) { id = DocumentType.APP_METADATA } - const db = getAppDB() + const db = context.getAppDB() const dbDoc = await db.get(id) body._rev = dbDoc._rev // update ID in case it is an app ID diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts index 198ba2d2b2..79e7731752 100644 --- a/packages/server/src/api/routes/public/index.ts +++ b/packages/server/src/api/routes/public/index.ts @@ -12,11 +12,8 @@ import env from "../../../environment" // below imports don't have declaration files const Router = require("@koa/router") const { RateLimit, Stores } = require("koa2-ratelimit") -const { - PermissionLevel, - PermissionType, -} = require("@budibase/backend-core/permissions") -const { getRedisOptions } = require("@budibase/backend-core/redis").utils +import { redis, permissions } from "@budibase/backend-core" +const { PermissionType, PermissionLevel } = permissions const PREFIX = "/api/public/v1" // allow a lot more requests when in test @@ -31,7 +28,7 @@ function getApiLimitPerSecond(): number { let rateLimitStore: any = null if (!env.isTest()) { - const REDIS_OPTS = getRedisOptions() + const REDIS_OPTS = redis.utils.getRedisOptions() let options if (REDIS_OPTS.redisProtocolUrl) { // fully qualified redis URL diff --git a/packages/server/src/automations/steps/utils.ts b/packages/server/src/automations/steps/utils.ts index 02b0f4d34c..8b99044303 100644 --- a/packages/server/src/automations/steps/utils.ts +++ b/packages/server/src/automations/steps/utils.ts @@ -20,7 +20,7 @@ export async function getFetchResponse(fetched: any) { // throw added to them, so that controllers don't // throw a ctx.throw undefined when error occurs // opts can contain, body, params and version -export async function buildCtx( +export function buildCtx( appId: string, emitter?: EventEmitter | null, opts: any = {} From ab914bcca2781a8aa138d648a2054cd2724dfc5e Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 28 Nov 2022 19:12:23 +0000 Subject: [PATCH 098/179] Final fixes after re-running all test suites. --- packages/backend-core/src/environment.ts | 2 +- .../src/api/routes/tests/deployment.spec.ts | 2 +- .../server/src/api/routes/tests/table.spec.js | 3 +- .../tests/utilities/{index.js => index.ts} | 24 ++-- .../tests/utilities/{index.js => index.ts} | 33 ++--- ...tConfiguration.js => TestConfiguration.ts} | 119 +++++++++++------- packages/server/tsconfig.build.json | 1 - .../types/src/documents/app/automation.ts | 1 + 8 files changed, 108 insertions(+), 77 deletions(-) rename packages/server/src/api/routes/tests/utilities/{index.js => index.ts} (73%) rename packages/server/src/automations/tests/utilities/{index.js => index.ts} (50%) rename packages/server/src/tests/utilities/{TestConfiguration.js => TestConfiguration.ts} (84%) diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts index b35f3ecaa4..51ab101b3c 100644 --- a/packages/backend-core/src/environment.ts +++ b/packages/backend-core/src/environment.ts @@ -85,7 +85,7 @@ for (let [key, value] of Object.entries(environment)) { // handle the edge case of "0" to disable an environment variable if (value === "0") { // @ts-ignore - env[key] = 0 + environment[key] = 0 } } diff --git a/packages/server/src/api/routes/tests/deployment.spec.ts b/packages/server/src/api/routes/tests/deployment.spec.ts index 0219e3f2b4..bd705f9f59 100644 --- a/packages/server/src/api/routes/tests/deployment.spec.ts +++ b/packages/server/src/api/routes/tests/deployment.spec.ts @@ -1,4 +1,4 @@ -import setup from "./utilities" +import * as setup from "./utilities" import { events } from "@budibase/backend-core" describe("/deployments", () => { diff --git a/packages/server/src/api/routes/tests/table.spec.js b/packages/server/src/api/routes/tests/table.spec.js index e42aaf07e4..4776878635 100644 --- a/packages/server/src/api/routes/tests/table.spec.js +++ b/packages/server/src/api/routes/tests/table.spec.js @@ -271,7 +271,7 @@ describe("/tables", () => { .expect(200) expect(res.body.message).toEqual(`Table ${testTable._id} deleted.`) expect(events.table.deleted).toBeCalledTimes(1) - expect(events.table.deleted).toBeCalledWith(testTable) + expect(events.table.deleted).toBeCalledWith({ ...testTable, tableId: testTable._id }) }) it("deletes linked references to the table after deletion", async () => { @@ -288,6 +288,7 @@ describe("/tables", () => { }, TestTable: { type: "link", + fieldName: "TestTable", tableId: testTable._id, constraints: { type: "array" diff --git a/packages/server/src/api/routes/tests/utilities/index.js b/packages/server/src/api/routes/tests/utilities/index.ts similarity index 73% rename from packages/server/src/api/routes/tests/utilities/index.js rename to packages/server/src/api/routes/tests/utilities/index.ts index b6dde0cb79..87a373a2c6 100644 --- a/packages/server/src/api/routes/tests/utilities/index.js +++ b/packages/server/src/api/routes/tests/utilities/index.ts @@ -1,6 +1,6 @@ -const TestConfig = require("../../../../tests/utilities/TestConfiguration") -const structures = require("../../../../tests/utilities/structures") -const env = require("../../../../environment") +import TestConfig from "../../../../tests/utilities/TestConfiguration" +import env from "../../../../environment" +export * as structures from "../../../../tests/utilities/structures" function user() { return { @@ -40,16 +40,18 @@ jest.mock("../../../../utilities/workerRequests", () => ({ removeAppFromUserRoles: jest.fn(), })) -exports.delay = ms => new Promise(resolve => setTimeout(resolve, ms)) +export function delay(ms: number) { + return new Promise(resolve => setTimeout(resolve, ms)) +} -let request, config +let request: any, config: any -exports.beforeAll = () => { +export function beforeAll() { config = new TestConfig() request = config.getRequest() } -exports.afterAll = () => { +export function afterAll() { if (config) { config.end() } @@ -59,21 +61,21 @@ exports.afterAll = () => { config = null } -exports.getRequest = () => { +export function getRequest() { if (!request) { exports.beforeAll() } return request } -exports.getConfig = () => { +export function getConfig() { if (!config) { exports.beforeAll() } return config } -exports.switchToSelfHosted = async func => { +export async function switchToSelfHosted(func: any) { // self hosted stops any attempts to Dynamo env._set("NODE_ENV", "production") env._set("SELF_HOSTED", true) @@ -90,5 +92,3 @@ exports.switchToSelfHosted = async func => { throw error } } - -exports.structures = structures diff --git a/packages/server/src/automations/tests/utilities/index.js b/packages/server/src/automations/tests/utilities/index.ts similarity index 50% rename from packages/server/src/automations/tests/utilities/index.js rename to packages/server/src/automations/tests/utilities/index.ts index 1e705182dc..a18e931bab 100644 --- a/packages/server/src/automations/tests/utilities/index.js +++ b/packages/server/src/automations/tests/utilities/index.ts @@ -1,23 +1,23 @@ -const TestConfig = require("../../../tests/utilities/TestConfiguration") -const { context } = require("@budibase/backend-core") -const actions = require("../../actions") -const emitter = require("../../../events/index") -const env = require("../../../environment") +import TestConfig from "../../../tests/utilities/TestConfiguration" +import { context } from "@budibase/backend-core" +import { ACTION_DEFINITIONS, getAction } from "../../actions" +import emitter from "../../../events/index" +import env from "../../../environment" -let config +let config: any -exports.getConfig = () => { +export function getConfig() { if (!config) { config = new TestConfig(false) } return config } -exports.afterAll = () => { +export function afterAll() { config.end() } -exports.runInProd = async fn => { +export async function runInProd(fn: any) { env._set("NODE_ENV", "production") let error try { @@ -31,15 +31,19 @@ exports.runInProd = async fn => { } } -exports.runStep = async function runStep(stepId, inputs) { +export async function runStep(stepId: string, inputs: any) { async function run() { - let step = await actions.getAction(stepId) + let step = await getAction(stepId) expect(step).toBeDefined() + if (!step) { + throw new Error("No step found") + } return step({ + context: {}, inputs, appId: config ? config.getAppId() : null, // don't really need an API key, mocked out usage quota, not being tested here - apiKey: exports.apiKey, + apiKey, emitter, }) } @@ -52,6 +56,5 @@ exports.runStep = async function runStep(stepId, inputs) { } } -exports.apiKey = "test" - -exports.actions = actions.ACTION_DEFINITIONS +export const apiKey = "test" +export const actions = ACTION_DEFINITIONS diff --git a/packages/server/src/tests/utilities/TestConfiguration.js b/packages/server/src/tests/utilities/TestConfiguration.ts similarity index 84% rename from packages/server/src/tests/utilities/TestConfiguration.js rename to packages/server/src/tests/utilities/TestConfiguration.ts index fd9635e9f1..bbd940150f 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.js +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -1,6 +1,7 @@ -require("../../db").init() -const env = require("../../environment") -const { +import { init as dbInit } from "../../db" +dbInit() +import env from "../../environment" +import { basicTable, basicRow, basicRole, @@ -11,24 +12,24 @@ const { basicLayout, basicWebhook, TENANT_ID, -} = require("./structures") -const { +} from "./structures" +import { constants, tenancy, sessions, cache, context, - db: dbCore, + db as dbCore, encryption, auth, roles, -} = require("@budibase/backend-core") -const controllers = require("./controllers") +} from "@budibase/backend-core" +import * as controllers from "./controllers" +import { cleanup } from "../../utilities/fileSystem" +import newid from "../../db/newid" +import { generateUserMetadataID } from "../../db/utils" +import { startup } from "../../startup" const supertest = require("supertest") -const { cleanup } = require("../../utilities/fileSystem") -const newid = require("../../db/newid") -const { generateUserMetadataID } = require("../../db/utils") -const { startup } = require("../../startup") const GLOBAL_USER_ID = "us_uuid1" const EMAIL = "babs@babs.com" @@ -37,10 +38,26 @@ const LASTNAME = "Barbington" const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306" class TestConfiguration { + server: any + request: any + started: boolean + appId: string | null + allApps: any[] + app: any + prodApp: any + prodAppId: any + user: any + globalUserId: any + userMetadataId: any + table: any + linkedTable: any + automation: any + datasource: any + constructor(openServer = true) { if (openServer) { // use a random port because it doesn't matter - env.PORT = 0 + env.PORT = "0" this.server = require("../../app") // we need the request for logging in, involves cookies, hard to fake this.request = supertest(this.server) @@ -81,7 +98,7 @@ class TestConfiguration { } } - async doInContext(appId, task) { + async doInContext(appId: string | null, task: any) { if (!appId) { appId = this.appId } @@ -125,9 +142,9 @@ class TestConfiguration { // UTILS - async _req(body, params, controlFunc) { + async _req(body: any, params: any, controlFunc: any) { // create a fake request ctx - const request = {} + const request: any = {} const appId = this.appId request.appId = appId // fake cookies, we don't need them @@ -156,8 +173,8 @@ class TestConfiguration { admin = false, email = EMAIL, roles, - } = {}) { - return tenancy.doWithGlobalDB(TENANT_ID, async db => { + }: any = {}) { + return tenancy.doWithGlobalDB(TENANT_ID, async (db: any) => { let existing try { existing = await db.get(id) @@ -221,7 +238,7 @@ class TestConfiguration { } } - async login({ roleId, userId, builder, prodApp = false } = {}) { + async login({ roleId, userId, builder, prodApp = false }: any = {}) { const appId = prodApp ? this.prodAppId : this.appId return context.doInAppContext(appId, async () => { userId = !userId ? `us_uuid1` : userId @@ -278,7 +295,7 @@ class TestConfiguration { } const authToken = auth.jwt.sign(authObj, env.JWT_SECRET) const appToken = auth.jwt.sign(app, env.JWT_SECRET) - const headers = { + const headers: any = { Accept: "application/json", Cookie: [ `${constants.Cookie.Auth}=${authToken}`, @@ -296,7 +313,7 @@ class TestConfiguration { publicHeaders({ prodApp = true } = {}) { const appId = prodApp ? this.prodAppId : this.appId - const headers = { + const headers: any = { Accept: "application/json", } if (appId) { @@ -317,7 +334,7 @@ class TestConfiguration { // API async generateApiKey(userId = GLOBAL_USER_ID) { - return tenancy.doWithGlobalDB(TENANT_ID, async db => { + return tenancy.doWithGlobalDB(TENANT_ID, async (db: any) => { const id = dbCore.generateDevInfoID(userId) let devInfo try { @@ -335,13 +352,15 @@ class TestConfiguration { // APP - async createApp(appName) { + async createApp(appName: string) { // create dev app // clear any old app this.appId = null + // @ts-ignore await context.updateAppId(null) this.app = await this._req({ name: appName }, null, controllers.app.create) this.appId = this.app.appId + // @ts-ignore await context.updateAppId(this.appId) // create production app @@ -355,6 +374,7 @@ class TestConfiguration { async deploy() { await this._req(null, null, controllers.deploy.deployApp) + // @ts-ignore const prodAppId = this.getAppId().replace("_dev", "") this.prodAppId = prodAppId @@ -366,29 +386,29 @@ class TestConfiguration { // TABLE - async updateTable(config = null) { + async updateTable(config?: any) { config = config || basicTable() this.table = await this._req(config, null, controllers.table.save) return this.table } - async createTable(config = null) { + async createTable(config?: any) { if (config != null && config._id) { delete config._id } return this.updateTable(config) } - async getTable(tableId = null) { + async getTable(tableId?: string) { tableId = tableId || this.table._id return this._req(null, { tableId }, controllers.table.find) } - async createLinkedTable(relationshipType = null, links = ["link"]) { + async createLinkedTable(relationshipType?: string, links: any = ["link"]) { if (!this.table) { throw "Must have created a table first." } - const tableConfig = basicTable() + const tableConfig: any = basicTable() tableConfig.primaryDisplay = "name" for (let link of links) { tableConfig.schema[link] = { @@ -407,7 +427,7 @@ class TestConfiguration { } async createAttachmentTable() { - const table = basicTable() + const table: any = basicTable() table.schema.attachment = { type: "attachment", } @@ -416,7 +436,7 @@ class TestConfiguration { // ROW - async createRow(config = null) { + async createRow(config: any = null) { if (!this.table) { throw "Test requires table to be configured." } @@ -425,11 +445,11 @@ class TestConfiguration { return this._req(config, { tableId }, controllers.row.save) } - async getRow(tableId, rowId) { + async getRow(tableId: string, rowId: string) { return this._req(null, { tableId, rowId }, controllers.row.find) } - async getRows(tableId) { + async getRows(tableId: string) { if (!tableId && this.table) { tableId = this.table._id } @@ -438,12 +458,12 @@ class TestConfiguration { // ROLE - async createRole(config = null) { + async createRole(config?: any) { config = config || basicRole() return this._req(config, null, controllers.role.save) } - async addPermission(roleId, resourceId, level = "read") { + async addPermission(roleId: string, resourceId: string, level = "read") { return this._req( null, { @@ -457,7 +477,7 @@ class TestConfiguration { // VIEW - async createView(config) { + async createView(config?: any) { if (!this.table) { throw "Test requires table to be configured." } @@ -470,7 +490,7 @@ class TestConfiguration { // AUTOMATION - async createAutomation(config) { + async createAutomation(config?: any) { config = config || basicAutomation() if (config._rev) { delete config._rev @@ -485,7 +505,7 @@ class TestConfiguration { return this._req(null, null, controllers.automation.fetch) } - async deleteAutomation(automation = null) { + async deleteAutomation(automation?: any) { automation = automation || this.automation if (!automation) { return @@ -497,7 +517,7 @@ class TestConfiguration { ) } - async createWebhook(config = null) { + async createWebhook(config?: any) { if (!this.automation) { throw "Must create an automation before creating webhook." } @@ -507,14 +527,14 @@ class TestConfiguration { // DATASOURCE - async createDatasource(config = null) { + async createDatasource(config?: any) { config = config || basicDatasource() const response = await this._req(config, null, controllers.datasource.save) this.datasource = response.datasource return this.datasource } - async updateDatasource(datasource) { + async updateDatasource(datasource: any) { const response = await this._req( datasource, { datasourceId: datasource._id }, @@ -524,7 +544,7 @@ class TestConfiguration { return this.datasource } - async restDatasource(cfg) { + async restDatasource(cfg?: any) { return this.createDatasource({ datasource: { ...basicDatasource().datasource, @@ -559,7 +579,14 @@ class TestConfiguration { // QUERY - async previewQuery(request, config, datasource, fields, params, verb) { + async previewQuery( + request: any, + config: any, + datasource: any, + fields: any, + params: any, + verb: string + ) { return request .post(`/api/queries/preview`) .send({ @@ -574,7 +601,7 @@ class TestConfiguration { .expect(200) } - async createQuery(config = null) { + async createQuery(config?: any) { if (!this.datasource && !config) { throw "No datasource created for query." } @@ -584,17 +611,17 @@ class TestConfiguration { // SCREEN - async createScreen(config = null) { + async createScreen(config?: any) { config = config || basicScreen() return this._req(config, null, controllers.screen.save) } // LAYOUT - async createLayout(config = null) { + async createLayout(config?: any) { config = config || basicLayout() return await this._req(config, null, controllers.layout.save) } } -module.exports = TestConfiguration +export = TestConfiguration diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index bbc0bfa0ee..2212a5e100 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -1,7 +1,6 @@ { "compilerOptions": { "target": "es6", - "allowJs": true, "module": "commonjs", "lib": ["es2020"], "strict": true, diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts index f267aa339f..184fed629d 100644 --- a/packages/types/src/documents/app/automation.ts +++ b/packages/types/src/documents/app/automation.ts @@ -115,4 +115,5 @@ export type AutomationStepInput = { context: Record emitter: EventEmitter appId: string + apiKey?: string } From 9b6bd124995ce110807004897f89c473865e207a Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 29 Nov 2022 11:00:54 +0000 Subject: [PATCH 099/179] Remove _id from filter field list in external dbs --- .../settings/controls/FilterEditor/FilterDrawer.svelte | 7 ++++++- .../settings/controls/FilterEditor/FilterEditor.svelte | 7 ++----- packages/builder/src/helpers/searchFields.js | 10 +++++++++- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte index a419f5ad46..019a61a3bf 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterDrawer.svelte @@ -30,9 +30,14 @@ export let allowBindings = true export let allOr = false export let fillWidth = false + export let tableId $: dispatch("change", filters) - $: enrichedSchemaFields = getFields(schemaFields || []) + $: enrichedSchemaFields = getFields( + schemaFields || [], + { allowLinks: true }, + tableId + ) $: fieldOptions = enrichedSchemaFields.map(field => field.name) || [] $: valueTypeOptions = allowBindings ? ["Value", "Binding"] : ["Value"] diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte index 05ee0adda8..72913aeb17 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte @@ -28,11 +28,7 @@ function addNumbering(filters) { let count = 1 for (let value of filters) { - if ( - value.field && - value.field?.match(QUERY_START_REGEX) == null && - value.field !== "_id" - ) { + if (value.field && value.field?.match(QUERY_START_REGEX) == null) { value.field = `${count++}:${value.field}` } } @@ -92,6 +88,7 @@ filters={initialFilters} {bindings} {schemaFields} + tableId={dataSource.tableId} bind:allOr on:change={event => { toSaveFilters = event.detail diff --git a/packages/builder/src/helpers/searchFields.js b/packages/builder/src/helpers/searchFields.js index a9c837d570..29a5f77a0d 100644 --- a/packages/builder/src/helpers/searchFields.js +++ b/packages/builder/src/helpers/searchFields.js @@ -16,7 +16,11 @@ export function getTableFields(linkField) { })) } -export function getFields(fields, { allowLinks } = { allowLinks: true }) { +export function getFields( + fields, + { allowLinks } = { allowLinks: true }, + tableId +) { let filteredFields = fields.filter( field => !BannedSearchTypes.includes(field.type) ) @@ -30,5 +34,9 @@ export function getFields(fields, { allowLinks } = { allowLinks: true }) { const staticFormulaFields = fields.filter( field => field.type === "formula" && field.formulaType === "static" ) + const table = get(tables).list.find(table => table._id === tableId) + if (table?.type === "external") { + filteredFields = filteredFields.filter(field => field.name !== "_id") + } return filteredFields.concat(staticFormulaFields) } From 618bba54c0986312fb6acdd8705baf7dec120d8f Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Tue, 29 Nov 2022 11:16:37 +0000 Subject: [PATCH 100/179] Updating lock files. --- packages/builder/yarn.lock | 1016 ++---------------------------------- packages/server/yarn.lock | 98 +--- packages/worker/yarn.lock | 121 +---- 3 files changed, 66 insertions(+), 1169 deletions(-) diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index f1dd22207b..b68e166d9c 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -2,11 +2,6 @@ # yarn lockfile v1 -"@adobe/spectrum-css-workflow-icons@^1.2.1": - version "1.5.4" - resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.5.4.tgz#0e09ff519c36139176c3ba3ce617a995c9032f67" - integrity sha512-sZ19YOLGw5xTZzCEkVXPjf53lXVzo063KmDTJjpSjy/XLVsF+RaX0b436SfSM4hsIUZ7n27+UsbOvzFaFjcYXw== - "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" @@ -920,136 +915,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/bbui@2.1.22-alpha.9": - version "2.1.22-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.1.22-alpha.9.tgz#829f60db76ba2ae3c40032885b4cf7cf70c22935" - integrity sha512-uLdLstalEWIe3gyRr1ngfqCTNGLQu6KFl9z9U1JDn4iNYYLP1gnyd0JFvX+E2L/v/fIuV8FiAPhlG10beszYmQ== - dependencies: - "@adobe/spectrum-css-workflow-icons" "^1.2.1" - "@budibase/string-templates" "2.1.22-alpha.9" - "@spectrum-css/actionbutton" "^1.0.1" - "@spectrum-css/actiongroup" "^1.0.1" - "@spectrum-css/avatar" "^3.0.2" - "@spectrum-css/button" "^3.0.1" - "@spectrum-css/buttongroup" "^3.0.2" - "@spectrum-css/checkbox" "^3.0.2" - "@spectrum-css/dialog" "^3.0.1" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/dropzone" "^3.0.2" - "@spectrum-css/fieldgroup" "^3.0.2" - "@spectrum-css/fieldlabel" "^3.0.1" - "@spectrum-css/icon" "^3.0.1" - "@spectrum-css/illustratedmessage" "^3.0.2" - "@spectrum-css/inlinealert" "^2.0.1" - "@spectrum-css/inputgroup" "^3.0.2" - "@spectrum-css/label" "^2.0.10" - "@spectrum-css/link" "^3.1.1" - "@spectrum-css/menu" "^3.0.1" - "@spectrum-css/modal" "^3.0.1" - "@spectrum-css/pagination" "^3.0.3" - "@spectrum-css/picker" "^1.0.1" - "@spectrum-css/popover" "^3.0.1" - "@spectrum-css/progressbar" "^1.0.2" - "@spectrum-css/progresscircle" "^1.0.2" - "@spectrum-css/radio" "^3.0.2" - "@spectrum-css/search" "^3.0.2" - "@spectrum-css/sidenav" "^3.0.2" - "@spectrum-css/slider" "3.0.1" - "@spectrum-css/statuslight" "^3.0.2" - "@spectrum-css/stepper" "^3.0.3" - "@spectrum-css/switch" "^1.0.2" - "@spectrum-css/table" "^3.0.1" - "@spectrum-css/tabs" "^3.2.12" - "@spectrum-css/tags" "^3.0.2" - "@spectrum-css/textfield" "^3.0.1" - "@spectrum-css/toast" "^3.0.1" - "@spectrum-css/tooltip" "^3.0.3" - "@spectrum-css/treeview" "^3.0.2" - "@spectrum-css/typography" "^3.0.1" - "@spectrum-css/underlay" "^2.0.9" - "@spectrum-css/vars" "^3.0.1" - dayjs "^1.10.4" - easymde "^2.16.1" - svelte-flatpickr "^3.2.3" - svelte-portal "^1.0.0" - -"@budibase/client@2.1.22-alpha.9": - version "2.1.22-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.1.22-alpha.9.tgz#2dfb63eed66fdd132c90c045e70ed6fb86546790" - integrity sha512-vzIdF/4vKzJkF5pbMPnOBRIO0/W3sYv5dZv9lH0OSy8rKm7A9Gb59tz7xkJvmo7ro2tn9M7/Xsh5GuzTWuweaw== - dependencies: - "@budibase/bbui" "2.1.22-alpha.9" - "@budibase/frontend-core" "2.1.22-alpha.9" - "@budibase/string-templates" "2.1.22-alpha.9" - "@spectrum-css/button" "^3.0.3" - "@spectrum-css/card" "^3.0.3" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/link" "^3.1.3" - "@spectrum-css/page" "^3.0.1" - "@spectrum-css/tag" "^3.1.4" - "@spectrum-css/typography" "^3.0.2" - "@spectrum-css/vars" "^3.0.1" - apexcharts "^3.22.1" - dayjs "^1.10.5" - downloadjs "1.4.7" - html5-qrcode "^2.2.1" - leaflet "^1.7.1" - regexparam "^1.3.0" - sanitize-html "^2.7.0" - screenfull "^6.0.1" - shortid "^2.2.15" - socket.io-client "^4.5.1" - svelte "^3.49.0" - svelte-apexcharts "^1.0.2" - svelte-flatpickr "^3.1.0" - svelte-spa-router "^3.0.5" - -"@budibase/frontend-core@2.1.22-alpha.9": - version "2.1.22-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.1.22-alpha.9.tgz#2d8e91c32032e2087172b764cde5553e04624f06" - integrity sha512-sPmD/Mogct7veqtJLLU15BbKpbx/9fsclweh1/LuMloZQiq45gB5oJMnSn5lQoqi5YG2S+BgvGZBAw/U3AyvDA== - dependencies: - "@budibase/bbui" "2.1.22-alpha.9" - lodash "^4.17.21" - svelte "^3.46.2" - -"@budibase/handlebars-helpers@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" - integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ== - dependencies: - array-sort "^1.0.0" - define-property "^2.0.2" - extend-shallow "^3.0.2" - for-in "^1.0.2" - get-object "^0.2.0" - get-value "^3.0.1" - handlebars "^4.7.7" - handlebars-utils "^1.0.6" - has-value "^2.0.2" - helper-md "^0.2.2" - html-tag "^2.0.0" - is-even "^1.0.0" - is-glob "^4.0.1" - kind-of "^6.0.3" - micromatch "^3.1.5" - relative "^3.0.2" - striptags "^3.1.1" - to-gfm-code-block "^0.1.1" - year "^0.2.1" - -"@budibase/string-templates@2.1.22-alpha.9": - version "2.1.22-alpha.9" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.1.22-alpha.9.tgz#9696839112333a5f1d08a2e3b1701c2830ee1d72" - integrity sha512-EcyAOLJk8kiaieLoMbh/EX7w4mbQzoW2QX34eyO7bUHDxZFTjUidGDufC+Qh6iazIYsU7k6YNV5HxtYDNhCzFw== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1447,6 +1312,11 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.19.1.tgz#8762f668d3fc2416fbde31d15d13009544caeb54" integrity sha512-M5MhTLnjqYFwxMwcFPBpBgYQqI9hCvtVuj/A+NvcBHpe7VWOXdn/Sys+zD6C76DWGFYQdw3OWCsZimP24dL8mA== +"@sentry/types@^7.2.0": + version "7.21.1" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.21.1.tgz#408a7b95a66ddc30c4359979594e03bee8f9fbdc" + integrity sha512-3/IKnd52Ol21amQvI+kz+WB76s8/LR5YvFJzMgIoI2S8d82smIr253zGijRXxHPEif8kMLX4Yt+36VzrLxg6+A== + "@sentry/utils@5.19.1": version "5.19.1" resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.19.1.tgz#e1134db40e4bb9732251e515721cec7ee94d4d9c" @@ -1486,113 +1356,6 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@socket.io/component-emitter@~3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" - integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== - -"@spectrum-css/actionbutton@^1.0.1": - version "1.1.14" - resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.1.14.tgz#4e12eb7f482fb5944c3d97547591964baebeb1d4" - integrity sha512-ViBjdWi23J6vIR4t8JTRQ6jY/+KgpZgCALj3otgy495zMNG7jPeN7sKoy6i6JZJcdIRJA4MjOTVvcDOGkYWUZg== - -"@spectrum-css/actiongroup@^1.0.1": - version "1.0.26" - resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.26.tgz#181ee059f28b1342389a128c39d20d2e10566aae" - integrity sha512-T1IK9a2Gxix9givm+chGvFtZh5oGBZQc/S2UA9F76JZKu45eCkLkvUH6F670XOrBhDGkVfzvN21QnFymSY43ow== - -"@spectrum-css/avatar@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95" - integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ== - -"@spectrum-css/button@^3.0.1", "@spectrum-css/button@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" - integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== - -"@spectrum-css/buttongroup@^3.0.2": - version "3.0.10" - resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.10.tgz#897ea04b3ffea389fc7fe5bf67a6d1f3454b774d" - integrity sha512-U7D24vgHYhlqOyaLJZ5LPskDAuD7cGZktmWvXtvLqG6RFyTr7JHn5oPRuo6mLzaggIHqCdJylOjZ4FHqT4LpTQ== - -"@spectrum-css/card@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b" - integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg== - -"@spectrum-css/checkbox@^3.0.2": - version "3.1.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.1.3.tgz#584cdea28a4e7e203314bfeccf69d6d1ab3799af" - integrity sha512-c1l8jQCj/CniHNNvZR/wr/PM8C/EuwhFyWXwzfr2npkgnWqdbcooIa0QfDRYtVy9U5/N8MM2IDLiZ8kPf7LKqQ== - -"@spectrum-css/dialog@^3.0.1": - version "3.0.12" - resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.12.tgz#fc97e002ca768a3d99dd10cb6a135c2b06052004" - integrity sha512-50rbFa+9eUKT+3uYBX7CkmI7SbQ0Z3CAFwjyjai+itYZ8kf/FcHVFwcLjgrry9scUnKhexMs94kkr0gfQpPe8Q== - -"@spectrum-css/divider@^1.0.3": - version "1.0.27" - resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.27.tgz#435bf738a65b4eb15c899edf5c536bea22f2d679" - integrity sha512-hWKPHOEo9lkOGN5zecpVVwVxE3x0SJHQJKDNx1g0xs/P/AthAboK+L1c9Rq29czNfcQ2kUjumi4igzQzcqABMQ== - dependencies: - "@spectrum-css/vars" "^8.0.0" - -"@spectrum-css/dropzone@^3.0.2": - version "3.0.26" - resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.26.tgz#d9da999f40643581518e2f56dcac5eb46e5269b2" - integrity sha512-YUHIqjJ3vqlF4wsyCC7VEHaV4KsbT35FnmyGvykJg5kcbXHHkVa2ioyRrknx4jwqhWWEX8e/SeKxS6k3jd4aFg== - -"@spectrum-css/fieldgroup@^3.0.2": - version "3.1.4" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.1.4.tgz#aede57bda56c41310d262774a8805eefc89ddf74" - integrity sha512-ynqkD1OWicCEW7hgYQWzJUrUih+guJHjDtPbTKYhCbnxPqi6aifKmLstBehCgs4iG4+YfGDdZTppW64A3o5foQ== - -"@spectrum-css/fieldlabel@^3.0.1": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.3.tgz#f73c04d20734d4718ffb620dc46458904685b449" - integrity sha512-nEvIkEXCD5n4fW67Unq6Iu7VXoauEd/JGpfTY02VsC5p4FJLnwKfPDbJUuUsqClAxqw7nAsmXVKtn4zQFf5yPQ== - -"@spectrum-css/icon@^3.0.1": - version "3.0.24" - resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.24.tgz#a09a4720b1a54abc1dc22378187f8ba16f0f6404" - integrity sha512-P/HTD9Wgh1o+l0VQtk3XNn9v7dJVprpOSix1MiUKMktKDpIN9013KEOcR2z84/12Bs5atGCs/mvkSHgjKTdNAA== - -"@spectrum-css/illustratedmessage@^3.0.2": - version "3.0.17" - resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.17.tgz#49cb2549fda97a6812156bfba6ccdd3a18bebd11" - integrity sha512-kpDqeq1U+rEjG1XuiXkbGvS71vn6mpFF/hiwCgFJWudVOfypDPQ4KLfYw1ditFSUzMCm5H6U/RqAShAJn8oMWA== - -"@spectrum-css/inlinealert@^2.0.1": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.6.tgz#4c5e923a1f56a96cc1adb30ef1f06ae04f2c6376" - integrity sha512-OpvvoWP02wWyCnF4IgG8SOPkXymovkC9cGtgMS1FdDubnG3tJZB/JeKTsRR9C9Vt3WBaOmISRdSKlZ4lC9CFzA== - -"@spectrum-css/inputgroup@^3.0.2": - version "3.0.8" - resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.8.tgz#fc23afc8a73c24d17249c9d2337e8b42085b298b" - integrity sha512-cmQWzFp0GU+4IMc8SSeVFdmQDlRUdPelXaQdKUR9mZuO2iYettg37s0lfBCeJyYkUNTagz0zP8O7A0iXfmeE6g== - -"@spectrum-css/label@^2.0.10": - version "2.0.10" - resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001" - integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ== - -"@spectrum-css/link@^3.1.1", "@spectrum-css/link@^3.1.3": - version "3.1.23" - resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.23.tgz#9d9ff64c41366edbfdb19d04a5deec88bf2ea8fd" - integrity sha512-CAJQGnGTrTtR4tF1L94ou9Y+c4vnx9d5rWhb3AMzKb2Focqz02xSkTyaCCH7OM/3CwD8TCLOMANon8LcRpGAjA== - -"@spectrum-css/menu@^3.0.1": - version "3.0.21" - resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.21.tgz#d1f7e6e69d30b5e1edd7ed2c86ea4e08dfd670ab" - integrity sha512-G5AIUO26O6IAc6HUGZu4AZgyw0QRyLfSbcKlFGu4oJHzP36cQc1S1uCh8Xp4g5d+n6mU62LxNDLSMpVbwnA00A== - -"@spectrum-css/modal@^3.0.1": - version "3.0.24" - resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.24.tgz#e321bda4f0676379ff1e78b556ef6f306b3ded65" - integrity sha512-kld3B0PkFNSmcv9vvw6w3E8wwB5fq7S3mIrO3bSb39SmWwG3YIv9/tZPWy+OXUj8CihqsE2y+7fCMECJT3G4Cw== - "@spectrum-css/page@^3.0.1": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.8.tgz#001efa9e4c10095df9b2b37cf7d7d6eb60140190" @@ -1600,116 +1363,6 @@ dependencies: "@spectrum-css/vars" "^4.3.0" -"@spectrum-css/pagination@^3.0.3": - version "3.0.11" - resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.11.tgz#68d9f34fe8eb36bf922e41b11f49eac62ac2fc41" - integrity sha512-wjZr7NAcqHK6fxNIGKTYEVtAOJugJTbcz4d8K7DZuUDgBVwLJJHJBi4uJ4KrIRYliMWOvqWTZzCJLmmTfx4cyw== - -"@spectrum-css/picker@^1.0.1": - version "1.2.13" - resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.2.13.tgz#4a253bda84338187e47cc8b90e7e069e535369ce" - integrity sha512-07Ke3Qb/mwK3is3MZ+APcjuEYRdY1aEgI8GtnLijO8OC98ChrneAJAiLEZuj6NseCIrFEKsrLfqJF+kunxpeAA== - -"@spectrum-css/popover@^3.0.1": - version "3.0.11" - resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.11.tgz#a7450c01bcf1609264b4a9df58821368b9e224d1" - integrity sha512-bzyNQJVw6Mn1EBelTaRlXCdd0ZfykNX9O6SHx3a+jXPYu8VBrRpHm0gsfWzPAz1etd1vj1CxwG/teQt4qvyZ/Q== - -"@spectrum-css/progressbar@^1.0.2": - version "1.0.33" - resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.33.tgz#0fbf815355e3b352ab0965a0d1ff9424c145204e" - integrity sha512-DLNkEd9XsyxSYRyLsV2cy9clByDoHy+GpKGOu7q6STtYYl7Y2hjBvNk9DNaLc78PBCXDf4MJ/j59vl5VmfRctA== - -"@spectrum-css/progresscircle@^1.0.2": - version "1.0.23" - resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.23.tgz#b8872716d2f54bf4bb20d571527f8ee4b04f5c10" - integrity sha512-J6IYhospCebEZ/+82vxBAckl5XATuNPQ5n0QSUFnRxql824x4B/mFhLt/PPLJtPBxEty6OA3GQ4evxAYutqEqQ== - -"@spectrum-css/radio@^3.0.2": - version "3.0.24" - resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.24.tgz#7a08476edf42be2007b75f7765c18c26eb3a9880" - integrity sha512-C/saSKXb3dNCWprsP4iXkFFEmRrxwsdm2Al04myZ6pxOJ4tr1WjHAAtorwUgaUiyR87OnL1mGX2aWrFEN1mvtQ== - -"@spectrum-css/search@^3.0.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.1.2.tgz#8d43f35f884f7c190e7694c8d26a3f2cfed01ef0" - integrity sha512-8cMK1QB07dbReZ/ECyTyoT2dELZ7hK1b3jEDiWSeLBbXcKirR1OI24sZEnewQY/XWFd/62Z1YdNaaA8S6UuXWQ== - -"@spectrum-css/sidenav@^3.0.2": - version "3.0.25" - resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.25.tgz#b9c0c7056269340d876ff28a155ac722aed72aad" - integrity sha512-aEV07fBQebI1MqXSpJ+RQxz1zsRZa0KTfr7iYUxhTjEFc05kbG4F5eIMflySq+w370xBSwCv/SMYB4Ncm+AcgQ== - -"@spectrum-css/slider@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49" - integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q== - -"@spectrum-css/statuslight@^3.0.2": - version "3.0.8" - resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.8.tgz#3b0ea80712573679870a85d469850230e794a0f7" - integrity sha512-zMTHs8lk+I7fLdi9waEEbsCmJ1FxeHcjQ0yltWxuRmGk2vl4MQdQIuHIMI63iblqEaiwnJRjXJoKnWlNvndTJQ== - -"@spectrum-css/stepper@^3.0.3": - version "3.0.28" - resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.28.tgz#f46d6000f67abb46e4903bbf5712050f656dd3c0" - integrity sha512-gBegbFeWzUZouBsxVXkwKPefLsFjKAqt6aBAIDScQiaSgM0tYqENJoABVuodqBMIqUr/DmllNCbca/Ihqwmhjw== - -"@spectrum-css/switch@^1.0.2": - version "1.0.23" - resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.23.tgz#c523c2f528ca16feca57f01b0e703e14f38c0919" - integrity sha512-6ym5p672xPCzfIBn8vtCtswGZ77cXb9BZEMSqwqu9O2MCi1QRPk3ot82SRXqjT2i5yeDgQR2dyBWrjzOh97mJg== - -"@spectrum-css/table@^3.0.1": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.3.tgz#7f7f19905ef3275cbf907ce3a5818e63c30b2caf" - integrity sha512-nxwzVjLPsXoY/v4sdxOVYLcC+cEbGgJyLcLclT5LT9MGSbngFeUMJzzVR4EvehzuN4dH7hrATG7Mbuq29Mf0Hg== - -"@spectrum-css/tabs@^3.2.12": - version "3.2.21" - resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.21.tgz#a8888b83d6b74ba05a00cacdb27a1e8bf4639071" - integrity sha512-25WGV1Sih7dW69/RvB1Ts6xVDJDhVEyYZzIGAll0PDST1GjBMHuGblqN/fZpDy/r/rop3GoHIsumtIMvOBdJKw== - -"@spectrum-css/tag@^3.1.4": - version "3.3.15" - resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278" - integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q== - -"@spectrum-css/tags@^3.0.2": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac" - integrity sha512-SL8vPxVDfWcY5VdIuyl0TImEXcOU1I7yCyXkk7MudMwfnYs81FaIyY32hFV9OHj0Tz/36UzRzc7AVMSuRQ53pw== - -"@spectrum-css/textfield@^3.0.1": - version "3.2.6" - resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.2.6.tgz#ad55cc6dd64f006fc659150298d3df463118fa24" - integrity sha512-yNTlrteDJcjKJRL7HV7vF2fZ9SLEDaRcLR6Zf2iwe0fdzzY0SXo9LGf0zoVRe47eW3UFrGC1cMyX27y2MMH1ag== - -"@spectrum-css/toast@^3.0.1": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.3.tgz#97c1527384707600832ecda35643ed304615250f" - integrity sha512-CjLeaMs+cjUXojCCRtbj0YkD2BoZW16kjj2o5omkEpUTjA34IJ8xJ1a+CCtDILWekhXvN0MBN4sbumcnwcnx8w== - -"@spectrum-css/tooltip@^3.0.3": - version "3.1.20" - resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.1.20.tgz#c3b6cf274be3ed552f86534f1fede7169827dc83" - integrity sha512-37knTGAjj4GE22M3MQrLa4PyecEc07xOZIle9igfRohXUwHv6ZIyoqy2/cQfmBkeGP6iGEzy8oKJp4nbBKZGsQ== - -"@spectrum-css/treeview@^3.0.2": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.3.tgz#aeda5175158b9f8d7529cb2b394428eb2a428046" - integrity sha512-D5gGzZC/KtRArdx86Mesc9+99W9nTbUOeyYGqoJoAfJSOttoT6Tk5CrDvlCmAqjKf5rajemAkGri1ChqvUIwkw== - -"@spectrum-css/typography@^3.0.1", "@spectrum-css/typography@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" - integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== - -"@spectrum-css/underlay@^2.0.9": - version "2.0.32" - resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.32.tgz#6d3d5ae495d341755beeeccf5469483474f0f777" - integrity sha512-6rV9hHi20wCUig19tyByTkbX3ak3E1qEHOu+Gk0vRcEXRWy1yGoQ4+VTGBp5FRKfbvGfJ9Gu6hqZ6rGTwAVYPQ== - "@spectrum-css/vars@^3.0.1": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999" @@ -1720,11 +1373,6 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-4.3.0.tgz#03ddf67d3aa8a9a4cb0edbbd259465c9ced7e70d" integrity sha512-ZQ2XAhgu4G9yBeXQNDAz07Z8oZNnMt5o9vzf/mpBA7Teb/JI+8qXp2wt8D245SzmtNlFkG/bzRYvQc0scgZeCQ== -"@spectrum-css/vars@^8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-8.0.0.tgz#b88a3b1165b63de50ab01f20ccafb42115d67443" - integrity sha512-cClQgNyH1VdNu6zdiZ5M7kbQDZS4/wPAclk5IPO5+nMhSzqTesUL/zfiaPB95MTCKFyVJrFpOeJ37HmUifWJ3A== - "@sveltejs/vite-plugin-svelte@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.1.tgz#7f468f03c933fcdfc60d4773671c73f33b9ef4d6" @@ -1836,18 +1484,6 @@ dependencies: "@babel/types" "^7.3.0" -"@types/codemirror@^5.60.4": - version "5.60.5" - resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.5.tgz#5b989a3b4bbe657458cf372c92b6bfda6061a2b7" - integrity sha512-TiECZmm8St5YxjFUp64LK0c8WU5bxMDt9YaAek1UqUb9swrSCoJhh92fWu1p3mTEqlHjhB5sY7OFBhWroJXZVg== - dependencies: - "@types/tern" "*" - -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== - "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" @@ -1902,11 +1538,6 @@ jest-diff "^27.0.0" pretty-format "^27.0.0" -"@types/marked@^4.0.7": - version "4.0.7" - resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.7.tgz#400a76809fd08c2bbd9e25f3be06ea38c8e0a1d3" - integrity sha512-eEAhnz21CwvKVW+YvRvcTuFKNU9CV1qH+opcgVK3pIMI6YZzDm6gc8o2vHjldFk6MGKt5pueSB7IOpvpx5Qekw== - "@types/minimatch@*": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -1952,13 +1583,6 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== -"@types/tern@*": - version "0.23.4" - resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" - integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg== - dependencies: - "@types/estree" "*" - "@types/testing-library__jest-dom@^5.9.1": version "5.14.1" resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz#014162a5cee6571819d48e999980694e2f657c3c" @@ -2010,7 +1634,7 @@ acorn-walk@^7.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.1.1, acorn-walk@^8.2.0: +acorn-walk@^8.1.1: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -2030,11 +1654,6 @@ acorn@^8.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== -acorn@^8.7.0: - version "8.8.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" - integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== - agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -2102,18 +1721,6 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" -apexcharts@^3.19.2, apexcharts@^3.22.1: - version "3.36.3" - resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.36.3.tgz#debd58ded07163d51e00aeb15827d594e0cc8129" - integrity sha512-8/FXEs0ohXMff07Gv28XjhPwEJphIUdq2/wii/pcvi54Tw6z1mjrV8ydN8rlWi/ve8BAPBefJkLmRWv7UOBsLw== - dependencies: - svg.draggable.js "^2.2.2" - svg.easing.js "^2.0.0" - svg.filter.js "^2.0.2" - svg.pathmorphing.js "^0.1.3" - svg.resize.js "^1.4.3" - svg.select.js "^3.0.1" - arch@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" @@ -2124,7 +1731,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.10, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -2154,15 +1761,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-sort@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" - integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== - dependencies: - default-compare "^1.0.0" - get-value "^2.0.6" - kind-of "^5.0.2" - array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -2215,13 +1813,6 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autolinker@~0.28.0: - version "0.28.1" - resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" - integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ== - dependencies: - gulp-header "^1.7.1" - aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -2627,23 +2218,11 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= -codemirror-spell-checker@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e" - integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ== - dependencies: - typo-js "*" - codemirror@^5.59.0: version "5.63.3" resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.63.3.tgz#97042a242027fe0c87c09b36bc01931d37b76527" integrity sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw== -codemirror@^5.63.1: - version "5.65.10" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.10.tgz#4276a93b8534ce91f14b733ba9a1ac949666eac9" - integrity sha512-IXAG5wlhbgcTJ6rZZcmi4+sjWIbJqIGfeg3tNa3yX84Jb3T4huS5qzQAo/cUisc1l3bI47WZodpyf7cYcocDKg== - collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -2728,13 +2307,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concat-with-sourcemaps@*: - version "1.1.0" - resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" - integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== - dependencies: - source-map "^0.6.1" - configent@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/configent/-/configent-2.2.0.tgz#2de230fc43f22c47cfd99016aa6962d6f9546994" @@ -2772,11 +2344,6 @@ core-util-is@1.0.2: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" @@ -2923,11 +2490,6 @@ dayjs@^1.10.4: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== -dayjs@^1.10.5: - version "1.11.6" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.6.tgz#2e79a226314ec3ec904e3ee1dd5a4f5e5b1c7afb" - integrity sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ== - dayjs@^1.11.2: version "1.11.2" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5" @@ -2954,7 +2516,7 @@ debug@^3.1.0: dependencies: ms "^2.1.1" -debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: +debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -2986,13 +2548,6 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -default-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" - integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== - dependencies: - kind-of "^5.0.2" - define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -3064,20 +2619,6 @@ dom-accessibility-api@^0.5.6: resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz#caa6d08f60388d0bb4539dd75fe458a9a1d0014c" integrity sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g== -dom-serializer@^1.0.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" - integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" - -domelementtype@^2.0.1, domelementtype@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== - domexception@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" @@ -3085,22 +2626,6 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -domhandler@^4.0.0, domhandler@^4.2.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" - integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== - dependencies: - domelementtype "^2.2.0" - -domutils@^2.5.2: - version "2.8.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" - integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== - dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" - dotenv@^8.2.0: version "8.6.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" @@ -3116,17 +2641,6 @@ duplexer@~0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -easymde@^2.16.1: - version "2.18.0" - resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b" - integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA== - dependencies: - "@types/codemirror" "^5.60.4" - "@types/marked" "^4.0.7" - codemirror "^5.63.1" - codemirror-spell-checker "1.1.2" - marked "^4.1.0" - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -3157,22 +2671,6 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -engine.io-client@~6.2.3: - version "6.2.3" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458" - integrity sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - engine.io-parser "~5.0.3" - ws "~8.2.3" - xmlhttprequest-ssl "~2.0.0" - -engine.io-parser@~5.0.3: - version "5.0.4" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" - integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg== - enquirer@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" @@ -3180,16 +2678,6 @@ enquirer@^2.3.6: dependencies: ansi-colors "^4.1.1" -ent@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== - -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== - error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -3344,11 +2832,6 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" @@ -3596,6 +3079,11 @@ fd-slicer@~1.1.0: dependencies: pend "~1.2.0" +fflate@^0.4.1: + version "0.4.8" + resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae" + integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA== + figures@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" @@ -3628,11 +3116,6 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -flatpickr@^4.5.2: - version "4.6.13" - resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94" - integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw== - fn-name@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-3.0.0.tgz#0596707f635929634d791f452309ab41558e3c5c" @@ -3683,11 +3166,6 @@ from@~0: resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= -fs-exists-sync@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== - fs-extra@^10.0.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" @@ -3764,14 +3242,6 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" -get-object@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" - integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ== - dependencies: - is-number "^2.0.2" - isobject "^0.2.0" - get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -3801,13 +3271,6 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= -get-value@^3.0.0, get-value@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" - integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== - dependencies: - isobject "^3.0.1" - getos@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5" @@ -3894,35 +3357,6 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= -gulp-header@^1.7.1: - version "1.8.12" - resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" - integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== - dependencies: - concat-with-sourcemaps "*" - lodash.template "^4.4.0" - through2 "^2.0.0" - -handlebars-utils@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" - integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== - dependencies: - kind-of "^6.0.0" - typeof-article "^0.1.1" - -handlebars@^4.7.6, handlebars@^4.7.7: - version "4.7.7" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" - integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.0" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - harmony-reflect@^1.4.6: version "1.6.2" resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" @@ -3961,14 +3395,6 @@ has-value@^1.0.0: has-values "^1.0.0" isobject "^3.0.0" -has-value@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" - integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== - dependencies: - get-value "^3.0.0" - has-values "^2.0.1" - has-values@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" @@ -3982,13 +3408,6 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has-values@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" - integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== - dependencies: - kind-of "^6.0.2" - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -3996,16 +3415,6 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -helper-md@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" - integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q== - dependencies: - ent "^2.2.0" - extend-shallow "^2.0.1" - fs-exists-sync "^0.1.0" - remarkable "^1.6.2" - hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -4023,29 +3432,6 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-tag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" - integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== - dependencies: - is-self-closing "^1.0.1" - kind-of "^6.0.0" - -html5-qrcode@^2.2.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.1.tgz#81861de0feb006de5aa6a1dbe8d301b244a7bb6f" - integrity sha512-sSAgpmmUlssKm9az18I6d7fytH5jPq4xG7E4mCuhsGpMsDwk05AumKNsag5rfxwgMFPiUQg7CcRiOCXlgSJxmg== - -htmlparser2@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" - integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.0.0" - domutils "^2.5.2" - entities "^2.0.0" - http-proxy-agent@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" @@ -4132,7 +3518,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.4, inherits@~2.0.3: +inherits@2, inherits@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -4231,13 +3617,6 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -is-even@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" - integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg== - dependencies: - is-odd "^0.1.2" - is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -4280,13 +3659,6 @@ is-installed-globally@~0.4.0: global-dirs "^3.0.0" is-path-inside "^3.0.2" -is-number@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg== - dependencies: - kind-of "^3.0.2" - is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -4299,13 +3671,6 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-odd@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" - integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw== - dependencies: - is-number "^3.0.0" - is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -4323,23 +3688,11 @@ is-plain-object@^3.0.0: resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b" integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g== -is-plain-object@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" - integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== - is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-self-closing@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" - integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== - dependencies: - self-closing-tags "^1.0.1" - is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -4372,7 +3725,7 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@1.0.0, isarray@~1.0.0: +isarray@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -4382,11 +3735,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -isobject@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" - integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ== - isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -4969,7 +4317,7 @@ jsprim@^2.0.2: json-schema "0.4.0" verror "1.10.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= @@ -4983,12 +4331,12 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0, kind-of@^5.0.2: +kind-of@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: +kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -5008,11 +4356,6 @@ lazy-ass@1.6.0, lazy-ass@^1.6.0: resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM= -leaflet@^1.7.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414" - integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ== - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -5057,11 +4400,6 @@ lodash-es@^4.17.11: resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -5092,22 +4430,7 @@ lodash.once@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= -lodash.template@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" - integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.templatesettings "^4.0.0" - -lodash.templatesettings@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" - integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== - dependencies: - lodash._reinterpolate "^3.0.0" - -lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: +lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5206,11 +4529,6 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -marked@^4.1.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.3.tgz#bd76a5eb510ff1d8421bc6c3b2f0b93488c15bea" - integrity sha512-slWRdJkbTZ+PjkyJnE30Uid64eHwbwa1Q25INCAYfZlK4o6ylagBy/Le9eWntqJFoFT93ikUKMv47GZ4gTwHkw== - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -5226,7 +4544,7 @@ methods@^1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^3.1.4, micromatch@^3.1.5: +micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -5390,11 +4708,6 @@ ncp@^2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= -neo-async@^2.6.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -5605,11 +4918,6 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-srcset@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" - integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q== - parse5@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -5701,15 +5009,6 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -postcss@^8.3.11: - version "8.4.19" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc" - integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA== - dependencies: - nanoid "^3.3.4" - picocolors "^1.0.0" - source-map-js "^1.0.2" - postcss@^8.4.16: version "8.4.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" @@ -5719,10 +5018,14 @@ postcss@^8.4.16: picocolors "^1.0.0" source-map-js "^1.0.2" -posthog-js@1.4.5: - version "1.4.5" - resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.4.5.tgz#b16235afe47938bd71eaed4ede3790c8b910ed71" - integrity sha512-Rzc5/DpuX55BqwNEbZB0tLav1gEinnr5H+82cbLiMtXLADlxmCwZiEaVXcC3XOqW0x8bcAEehicx1TbpfBamzA== +posthog-js@^1.36.0: + version "1.36.0" + resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.36.0.tgz#cbefa031a1e7ee6ff25dae29b8aa77bd741adbba" + integrity sha512-LL9lbJxN46GbckRKSFZxX7fwNAvKUbi5nLFF0hMkmKY9o9zoz58oA0DJBZkqyEXK+15XzNoyLxF+wnxSPNwn3g== + dependencies: + "@sentry/types" "^7.2.0" + fflate "^0.4.1" + rrweb-snapshot "^1.1.14" prelude-ls@~1.1.2: version "1.1.2" @@ -5754,11 +5057,6 @@ pretty-format@^27.0.0, pretty-format@^27.3.1: ansi-styles "^5.0.0" react-is "^17.0.1" -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" @@ -5850,19 +5148,6 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -5903,16 +5188,6 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexparam@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa" - integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw== - -regexparam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" - integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== - regexpu-core@^4.7.1: version "4.8.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" @@ -5937,21 +5212,6 @@ regjsparser@^0.7.0: dependencies: jsesc "~0.5.0" -relative@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" - integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA== - dependencies: - isobject "^2.0.0" - -remarkable@^1.6.2: - version "1.7.4" - resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" - integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== - dependencies: - argparse "^1.0.10" - autolinker "~0.28.0" - remixicon@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-2.5.0.tgz#b5e245894a1550aa23793f95daceadbf96ad1a41" @@ -6085,6 +5345,11 @@ rollup@^2.44.0: optionalDependencies: fsevents "~2.3.2" +rrweb-snapshot@^1.1.14: + version "1.1.14" + resolved "https://registry.yarnpkg.com/rrweb-snapshot/-/rrweb-snapshot-1.1.14.tgz#9d4d9be54a28a893373428ee4393ec7e5bd83fcc" + integrity sha512-eP5pirNjP5+GewQfcOQY4uBiDnpqxNRc65yKPW0eSoU1XamDfc4M8oqpXGMyUyvLyxFDB0q0+DChuxxiU2FXBQ== + rsvp@^4.8.4: version "4.8.5" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" @@ -6116,7 +5381,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -6148,18 +5413,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sanitize-html@^2.7.0: - version "2.7.3" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.7.3.tgz#166c868444ee4f9fd7352ac8c63fa86c343fc2bd" - integrity sha512-jMaHG29ak4miiJ8wgqA1849iInqORgNv7SLfSw9LtfOhEUQ1C0YHKH73R+hgyufBW9ZFeJrb057k9hjlfBCVlw== - dependencies: - deepmerge "^4.2.2" - escape-string-regexp "^4.0.0" - htmlparser2 "^6.0.0" - is-plain-object "^5.0.0" - parse-srcset "^1.0.2" - postcss "^8.3.11" - saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -6167,16 +5420,6 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -screenfull@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238" - integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw== - -self-closing-tags@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" - integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== - "semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -6250,13 +5493,6 @@ shortid@2.2.15: dependencies: nanoid "^2.1.0" -shortid@^2.2.15: - version "2.2.16" - resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" - integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== - dependencies: - nanoid "^2.1.0" - signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.5" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" @@ -6320,24 +5556,6 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -socket.io-client@^4.5.1: - version "4.5.3" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.3.tgz#bed69209d001465b2fea650d2e95c1e82768ab5e" - integrity sha512-I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.2" - engine.io-client "~6.2.3" - socket.io-parser "~4.2.0" - -socket.io-parser@~4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" - integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" @@ -6507,13 +5725,6 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -6548,11 +5759,6 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -striptags@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" - integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== - supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -6587,25 +5793,11 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -svelte-apexcharts@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/svelte-apexcharts/-/svelte-apexcharts-1.0.2.tgz#4e000f8b8f7c901c05658c845457dfc8314d54c1" - integrity sha512-6qlx4rE+XsonZ0FZudfwqOQ34Pq+3wpxgAD75zgEmGoYhYBJcwmikTuTf3o8ZBsZue9U/pAwhNy3ed1Bkq1gmA== - dependencies: - apexcharts "^3.19.2" - svelte-dnd-action@^0.9.8: version "0.9.12" resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.12.tgz#78cf33097986488c6d069eca517af473cd998730" integrity sha512-GlXIB3/56IMR5A0+qUx+FX7Q7n8uCAIeuYdgSBmn9iOlxWc+mgM8P1kNwAKCMSTdQ4IQETVQILNgWVY1KIFzsg== -svelte-flatpickr@^3.1.0, svelte-flatpickr@^3.2.3: - version "3.2.6" - resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.2.6.tgz#595a97b2f25a669e61fe743f90a10dce783bbd49" - integrity sha512-0ePUyE9OjInYFqQwRKOxnFSu4dQX9+/rzFMynq2fKYXx406ZUThzSx72gebtjr0DoAQbsH2///BBZa5qk4qZXg== - dependencies: - flatpickr "^4.5.2" - svelte-hmr@^0.14.12: version "0.14.12" resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.14.12.tgz#a127aec02f1896500b10148b2d4d21ddde39973f" @@ -6626,83 +5818,11 @@ svelte-portal@0.1.0: resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-0.1.0.tgz#cc2821cc84b05ed5814e0218dcdfcbebc53c1742" integrity sha512-kef+ksXVKun224mRxat+DdO4C+cGHla+fEcZfnBAvoZocwiaceOfhf5azHYOPXSSB1igWVFTEOF3CDENPnuWxg== -svelte-portal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" - integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== - -svelte-spa-router@^3.0.5: - version "3.3.0" - resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c" - integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ== - dependencies: - regexparam "2.0.1" - -svelte@^3.46.2, svelte@^3.49.0: - version "3.53.1" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.53.1.tgz#db9d7df7a8f570e8e22547444c149208b1914442" - integrity sha512-Q4/hHkktZogGhN5iqxqSi9sjEVoe/NbIxX4hXEHoasTxj+TxEQVAq66LnDMdAZxjmsodkoI5F3slqsS68U7FNw== - svelte@^3.48.0: version "3.49.0" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029" integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA== -svg.draggable.js@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" - integrity sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw== - dependencies: - svg.js "^2.0.1" - -svg.easing.js@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/svg.easing.js/-/svg.easing.js-2.0.0.tgz#8aa9946b0a8e27857a5c40a10eba4091e5691f12" - integrity sha512-//ctPdJMGy22YoYGV+3HEfHbm6/69LJUTAqI2/5qBvaNHZ9uUFVC82B0Pl299HzgH13rKrBgi4+XyXXyVWWthA== - dependencies: - svg.js ">=2.3.x" - -svg.filter.js@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/svg.filter.js/-/svg.filter.js-2.0.2.tgz#91008e151389dd9230779fcbe6e2c9a362d1c203" - integrity sha512-xkGBwU+dKBzqg5PtilaTb0EYPqPfJ9Q6saVldX+5vCRy31P6TlRCP3U9NxH3HEufkKkpNgdTLBJnmhDHeTqAkw== - dependencies: - svg.js "^2.2.5" - -svg.js@>=2.3.x, svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5: - version "2.7.1" - resolved "https://registry.yarnpkg.com/svg.js/-/svg.js-2.7.1.tgz#eb977ed4737001eab859949b4a398ee1bb79948d" - integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA== - -svg.pathmorphing.js@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz#c25718a1cc7c36e852ecabc380e758ac09bb2b65" - integrity sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww== - dependencies: - svg.js "^2.4.0" - -svg.resize.js@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/svg.resize.js/-/svg.resize.js-1.4.3.tgz#885abd248e0cd205b36b973c4b578b9a36f23332" - integrity sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw== - dependencies: - svg.js "^2.6.5" - svg.select.js "^2.1.2" - -svg.select.js@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-2.1.2.tgz#e41ce13b1acff43a7441f9f8be87a2319c87be73" - integrity sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ== - dependencies: - svg.js "^2.2.5" - -svg.select.js@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-3.0.1.tgz#a4198e359f3825739226415f82176a90ea5cc917" - integrity sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw== - dependencies: - svg.js "^2.6.5" - symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -6752,14 +5872,6 @@ throttleit@^1.0.0: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= -through2@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - through@2, through@^2.3.8, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -6782,11 +5894,6 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= -to-gfm-code-block@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" - integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg== - to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" @@ -6942,28 +6049,11 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typeof-article@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" - integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw== - dependencies: - kind-of "^3.1.0" - typescript@4.7.3: version "4.7.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== -typo-js@*: - version "1.2.2" - resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" - integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== - -uglify-js@^3.1.4: - version "3.17.4" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" - integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== - unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" @@ -7037,11 +6127,6 @@ utf-8-validate@^5.0.2: dependencies: node-gyp-build "^4.3.0" -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - uuid@8.3.1: version "8.3.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" @@ -7100,14 +6185,6 @@ vite@^3.0.8: optionalDependencies: fsevents "~2.3.2" -vm2@^3.9.4: - version "3.9.11" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.11.tgz#a880f510a606481719ec3f9803b940c5805a06fe" - integrity sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg== - dependencies: - acorn "^8.7.0" - acorn-walk "^8.2.0" - w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -7208,11 +6285,6 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== - wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -7251,11 +6323,6 @@ ws@^7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== -ws@~8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" - integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== - xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" @@ -7266,16 +6333,6 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xmlhttprequest-ssl@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" - integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== - -xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - y18n@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" @@ -7342,11 +6399,6 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -year@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" - integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w== - yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 4e68957ab2..2bd74dfc2c 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.32-alpha.11": - version "2.1.32-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.11.tgz#bbf49464c95d3bc10e58d478d53fb88012c7bc35" - integrity sha512-JPlJIDkN6Id2K++MysV0Wx05KS8qFmdyhE1OTt1e7EVYrYdCHubWPmJynEfd0ceMEkMTqdssN7nUuQfMXBP4dA== +"@budibase/backend-core@2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.39.tgz#0ada64b114d2b61e6a4a782227348e1bfd33ebc6" + integrity sha512-OW1SOS0jWHoHBVMZo3A36F5urgphduOXWqegtHRL3o3cFmf38l8XI6TtKDWrfSkJat0FKrzjJs1vAnIh9cQeMA== dependencies: - "@budibase/types" "2.1.32-alpha.11" + "@budibase/types" "^2.1.39" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1293,7 +1293,6 @@ koa-passport "4.1.4" lodash "4.17.21" lodash.isarguments "3.1.0" - nano "^10.1.0" node-fetch "2.6.7" passport-google-auth "1.0.2" passport-google-oauth "2.0.0" @@ -1361,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.32-alpha.11": - version "2.1.32-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.11.tgz#40e57623403133eeef1e3e1f5b6f9226dabd9b39" - integrity sha512-/XW5BDP7IueDSeAhDw6/Lp1kIQBxCTgjk9GLmpCuvSv4HEN1mu1bobebASaaqiZ7YVx8dPZXQV8bfzSKl6eHOg== +"@budibase/pro@2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.39.tgz#31d59a9e3bde75f9b83cff8db1b8fcb75c16fafe" + integrity sha512-GQ5Z0U03C9RifZhPQX9dc61yLM9YkRZOjl7mHXIrcm6ytUA3I/DMuGcN83hwlxlPOem9utofDmXfCE288nLDZg== dependencies: - "@budibase/backend-core" "2.1.32-alpha.11" - "@budibase/types" "2.1.32-alpha.11" + "@budibase/backend-core" "2.1.39" + "@budibase/types" "2.1.39" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1391,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.32-alpha.11": - version "2.1.32-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.11.tgz#a69b002ab80fd7a97b1204b12ef867a16d48122a" - integrity sha512-lyN7EZQAe2I815z9IEQ1kZS1eDrWxsvyyGMM6tLucm/49d+FutqAqTuMvU0OatjEzaxBflEQLhv98EGX4vDVuw== +"@budibase/types@2.1.39", "@budibase/types@^2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.39.tgz#ffa88a87c18d565c02576c5b75cde29326a4263c" + integrity sha512-S5v3lQbUxyzGYWMo5P3V+e47O4CNyhih2uHr+YLvdMtaq8Pj7jNHrZU9pxEFF0ldZDAFC3Z5WZaUglNXfZyZCw== "@bull-board/api@3.7.0": version "3.7.0" @@ -3413,7 +3412,7 @@ "@types/cookiejar" "*" "@types/node" "*" -"@types/tough-cookie@*", "@types/tough-cookie@^4.0.2": +"@types/tough-cookie@*": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== @@ -4298,15 +4297,6 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" -axios@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" - integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== - dependencies: - follow-redirects "^1.15.0" - form-data "^4.0.0" - proxy-from-env "^1.1.0" - babel-jest@27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444" @@ -7011,11 +7001,6 @@ follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.8, fo resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== -follow-redirects@^1.15.0: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== - for-each@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -7790,13 +7775,6 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== -http-cookie-agent@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/http-cookie-agent/-/http-cookie-agent-4.0.2.tgz#dcdaae18ed1f7452d81ae4d5cd80b227d6831b69" - integrity sha512-noTmxdH5CuytTnLj/Qv3Z84e/YFq8yLXAw3pqIYZ25Edhb9pQErIAC+ednw40Cic6Le/h9ryph5/TqsvkOaUCw== - dependencies: - agent-base "^6.0.2" - http-errors@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" @@ -10764,18 +10742,6 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== -nano@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/nano/-/nano-10.1.0.tgz#afdd5a7440e62f09a8e23f41fcea328d27383922" - integrity sha512-COeN2TpLcHuSN44QLnPmfZCoCsKAg8/aelPOVqqm/2/MvRHDEA11/Kld5C4sLzDlWlhFZ3SO2WGJGevCsvcEzQ== - dependencies: - "@types/tough-cookie" "^4.0.2" - axios "^1.1.3" - http-cookie-agent "^4.0.2" - node-abort-controller "^3.0.1" - qs "^6.11.0" - tough-cookie "^4.1.2" - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -10838,11 +10804,6 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-abort-controller@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.0.1.tgz#f91fa50b1dee3f909afabb7e261b1e1d6b0cb74e" - integrity sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw== - node-addon-api@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" @@ -12203,11 +12164,6 @@ protobufjs@6.11.3, protobufjs@^6.11.2, protobufjs@^6.11.3, protobufjs@^6.8.6: "@types/node" ">=13.7.0" long "^4.0.0" -proxy-from-env@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -12270,13 +12226,6 @@ q@^1.1.2: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== -qs@^6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - qs@^6.4.0, qs@^6.5.1: version "6.10.5" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4" @@ -14260,16 +14209,6 @@ tough-cookie@^3.0.1: psl "^1.1.28" punycode "^2.1.1" -tough-cookie@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" - integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== - dependencies: - psl "^1.1.33" - punycode "^2.1.1" - universalify "^0.2.0" - url-parse "^1.5.3" - tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" @@ -14550,11 +14489,6 @@ universalify@^0.1.0, universalify@^0.1.2: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" - integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== - universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index f670f90db6..b953c15e0e 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.32-alpha.11": - version "2.1.32-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.32-alpha.11.tgz#bbf49464c95d3bc10e58d478d53fb88012c7bc35" - integrity sha512-JPlJIDkN6Id2K++MysV0Wx05KS8qFmdyhE1OTt1e7EVYrYdCHubWPmJynEfd0ceMEkMTqdssN7nUuQfMXBP4dA== +"@budibase/backend-core@2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.39.tgz#0ada64b114d2b61e6a4a782227348e1bfd33ebc6" + integrity sha512-OW1SOS0jWHoHBVMZo3A36F5urgphduOXWqegtHRL3o3cFmf38l8XI6TtKDWrfSkJat0FKrzjJs1vAnIh9cQeMA== dependencies: - "@budibase/types" "2.1.32-alpha.11" + "@budibase/types" "^2.1.39" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -490,7 +490,6 @@ koa-passport "4.1.4" lodash "4.17.21" lodash.isarguments "3.1.0" - nano "^10.1.0" node-fetch "2.6.7" passport-google-auth "1.0.2" passport-google-oauth "2.0.0" @@ -508,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.32-alpha.11": - version "2.1.32-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.32-alpha.11.tgz#40e57623403133eeef1e3e1f5b6f9226dabd9b39" - integrity sha512-/XW5BDP7IueDSeAhDw6/Lp1kIQBxCTgjk9GLmpCuvSv4HEN1mu1bobebASaaqiZ7YVx8dPZXQV8bfzSKl6eHOg== +"@budibase/pro@2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.39.tgz#31d59a9e3bde75f9b83cff8db1b8fcb75c16fafe" + integrity sha512-GQ5Z0U03C9RifZhPQX9dc61yLM9YkRZOjl7mHXIrcm6ytUA3I/DMuGcN83hwlxlPOem9utofDmXfCE288nLDZg== dependencies: - "@budibase/backend-core" "2.1.32-alpha.11" - "@budibase/types" "2.1.32-alpha.11" + "@budibase/backend-core" "2.1.39" + "@budibase/types" "2.1.39" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.32-alpha.11": - version "2.1.32-alpha.11" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.32-alpha.11.tgz#a69b002ab80fd7a97b1204b12ef867a16d48122a" - integrity sha512-lyN7EZQAe2I815z9IEQ1kZS1eDrWxsvyyGMM6tLucm/49d+FutqAqTuMvU0OatjEzaxBflEQLhv98EGX4vDVuw== +"@budibase/types@2.1.39", "@budibase/types@^2.1.39": + version "2.1.39" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.39.tgz#ffa88a87c18d565c02576c5b75cde29326a4263c" + integrity sha512-S5v3lQbUxyzGYWMo5P3V+e47O4CNyhih2uHr+YLvdMtaq8Pj7jNHrZU9pxEFF0ldZDAFC3Z5WZaUglNXfZyZCw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" @@ -1541,11 +1540,6 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== -"@types/tough-cookie@^4.0.2": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" - integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== - "@types/uuid@8.3.4": version "8.3.4" resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" @@ -1693,7 +1687,7 @@ after-all-results@^2.0.0: resolved "https://registry.yarnpkg.com/after-all-results/-/after-all-results-2.0.0.tgz#6ac2fc202b500f88da8f4f5530cfa100f4c6a2d0" integrity sha512-2zHEyuhSJOuCrmas9YV0YL/MFCWLxe1dS6k/ENhgYrb/JqyMnadLN4iIAc9kkZrbElMDyyAGH/0J18OPErOWLg== -agent-base@6, agent-base@^6.0.2: +agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -1923,15 +1917,6 @@ axios@0.24.0: dependencies: follow-redirects "^1.14.4" -axios@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" - integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== - dependencies: - follow-redirects "^1.15.0" - form-data "^4.0.0" - proxy-from-env "^1.1.0" - babel-jest@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5" @@ -3437,11 +3422,6 @@ follow-redirects@^1.14.4: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== -follow-redirects@^1.15.0: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -3866,13 +3846,6 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== -http-cookie-agent@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/http-cookie-agent/-/http-cookie-agent-4.0.2.tgz#dcdaae18ed1f7452d81ae4d5cd80b227d6831b69" - integrity sha512-noTmxdH5CuytTnLj/Qv3Z84e/YFq8yLXAw3pqIYZ25Edhb9pQErIAC+ednw40Cic6Le/h9ryph5/TqsvkOaUCw== - dependencies: - agent-base "^6.0.2" - http-errors@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" @@ -5542,18 +5515,6 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nano@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/nano/-/nano-10.1.0.tgz#afdd5a7440e62f09a8e23f41fcea328d27383922" - integrity sha512-COeN2TpLcHuSN44QLnPmfZCoCsKAg8/aelPOVqqm/2/MvRHDEA11/Kld5C4sLzDlWlhFZ3SO2WGJGevCsvcEzQ== - dependencies: - "@types/tough-cookie" "^4.0.2" - axios "^1.1.3" - http-cookie-agent "^4.0.2" - node-abort-controller "^3.0.1" - qs "^6.11.0" - tough-cookie "^4.1.2" - napi-macros@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b" @@ -5589,11 +5550,6 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-abort-controller@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.0.1.tgz#f91fa50b1dee3f909afabb7e261b1e1d6b0cb74e" - integrity sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw== - node-addon-api@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" @@ -6430,11 +6386,6 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -proxy-from-env@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" - integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== - prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -6502,13 +6453,6 @@ qs@^6.10.3, qs@^6.4.0: dependencies: side-channel "^1.0.4" -qs@^6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - qs@~6.5.2: version "6.5.3" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" @@ -6519,11 +6463,6 @@ querystring@0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g== -querystringify@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" - integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -6745,11 +6684,6 @@ require-in-the-middle@^5.0.3: module-details-from-path "^1.0.3" resolve "^1.22.1" -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== - resolve-alpn@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" @@ -7505,16 +7439,6 @@ touch@^3.1.0: punycode "^2.1.1" universalify "^0.1.2" -tough-cookie@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" - integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== - dependencies: - psl "^1.1.33" - punycode "^2.1.1" - universalify "^0.2.0" - url-parse "^1.5.3" - tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" @@ -7708,11 +7632,6 @@ universalify@^0.1.2: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -universalify@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" - integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== - unpipe@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -7775,14 +7694,6 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" -url-parse@^1.5.3: - version "1.5.10" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" - integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - url@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" From 659f974eba521f6341a6288317391269f03765ce Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Tue, 29 Nov 2022 11:26:23 +0000 Subject: [PATCH 101/179] Updating typescript eslinter version to all match and resolve issue with our current Typescript version. --- package.json | 4 +- packages/server/package.json | 2 +- packages/server/yarn.lock | 79 ++++++++++++++++++++---------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 70 ++++++++++++++++---------------- 5 files changed, 82 insertions(+), 75 deletions(-) diff --git a/package.json b/package.json index af513fc8dd..6c147698ad 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "devDependencies": { "@rollup/plugin-json": "^4.0.2", - "@typescript-eslint/parser": "4.28.0", + "@typescript-eslint/parser": "5.45.0", "babel-eslint": "^10.0.3", "eslint": "^7.28.0", "eslint-plugin-cypress": "^2.11.3", @@ -87,4 +87,4 @@ "install:pro": "bash scripts/pro/install.sh", "dep:clean": "yarn clean && yarn bootstrap" } -} \ No newline at end of file +} diff --git a/packages/server/package.json b/packages/server/package.json index 85799f329c..51c9dfdb30 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -137,7 +137,7 @@ "@types/oracledb": "5.2.2", "@types/pouchdb": "6.4.0", "@types/redis": "4.0.11", - "@typescript-eslint/parser": "5.12.0", + "@typescript-eslint/parser": "5.45.0", "apidoc": "0.50.4", "babel-jest": "27.5.1", "copyfiles": "2.4.1", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 2bd74dfc2c..8ff6af32aa 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -3470,49 +3470,49 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/parser@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.12.0.tgz#0ca669861813df99ce54916f66f524c625ed2434" - integrity sha512-MfSwg9JMBojMUoGjUmX+D2stoQj1CBYTCP0qnnVtu9A+YQXVKNtLjasYh+jozOcrb/wau8TCfWOkQTiOAruBog== +"@typescript-eslint/parser@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.45.0.tgz#b18a5f6b3cf1c2b3e399e9d2df4be40d6b0ddd0e" + integrity sha512-brvs/WSM4fKUmF5Ot/gEve6qYiCMjm6w4HkHPfS6ZNmxTS0m0iNN4yOChImaCkqc1hRwFGqUyanMXuGal6oyyQ== dependencies: - "@typescript-eslint/scope-manager" "5.12.0" - "@typescript-eslint/types" "5.12.0" - "@typescript-eslint/typescript-estree" "5.12.0" - debug "^4.3.2" + "@typescript-eslint/scope-manager" "5.45.0" + "@typescript-eslint/types" "5.45.0" + "@typescript-eslint/typescript-estree" "5.45.0" + debug "^4.3.4" -"@typescript-eslint/scope-manager@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.12.0.tgz#59619e6e5e2b1ce6cb3948b56014d3a24da83f5e" - integrity sha512-GAMobtIJI8FGf1sLlUWNUm2IOkIjvn7laFWyRx7CLrv6nLBI7su+B7lbStqVlK5NdLvHRFiJo2HhiDF7Ki01WQ== +"@typescript-eslint/scope-manager@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.45.0.tgz#7a4ac1bfa9544bff3f620ab85947945938319a96" + integrity sha512-noDMjr87Arp/PuVrtvN3dXiJstQR1+XlQ4R1EvzG+NMgXi8CuMCXpb8JqNtFHKceVSQ985BZhfRdowJzbv4yKw== dependencies: - "@typescript-eslint/types" "5.12.0" - "@typescript-eslint/visitor-keys" "5.12.0" + "@typescript-eslint/types" "5.45.0" + "@typescript-eslint/visitor-keys" "5.45.0" -"@typescript-eslint/types@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.12.0.tgz#5b4030a28222ee01e851836562c07769eecda0b8" - integrity sha512-JowqbwPf93nvf8fZn5XrPGFBdIK8+yx5UEGs2QFAYFI8IWYfrzz+6zqlurGr2ctShMaJxqwsqmra3WXWjH1nRQ== +"@typescript-eslint/types@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.45.0.tgz#794760b9037ee4154c09549ef5a96599621109c5" + integrity sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA== -"@typescript-eslint/typescript-estree@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.0.tgz#cabf545fd592722f0e2b4104711e63bf89525cd2" - integrity sha512-Dd9gVeOqt38QHR0BEA8oRaT65WYqPYbIc5tRFQPkfLquVEFPD1HAtbZT98TLBkEcCkvwDYOAvuSvAD9DnQhMfQ== +"@typescript-eslint/typescript-estree@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz#f70a0d646d7f38c0dfd6936a5e171a77f1e5291d" + integrity sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ== dependencies: - "@typescript-eslint/types" "5.12.0" - "@typescript-eslint/visitor-keys" "5.12.0" - debug "^4.3.2" - globby "^11.0.4" + "@typescript-eslint/types" "5.45.0" + "@typescript-eslint/visitor-keys" "5.45.0" + debug "^4.3.4" + globby "^11.1.0" is-glob "^4.0.3" - semver "^7.3.5" + semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/visitor-keys@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.0.tgz#1ac9352ed140b07ba144ebf371b743fdf537ec16" - integrity sha512-cFwTlgnMV6TgezQynx2c/4/tx9Tufbuo9LPzmWqyRC3QC4qTGkAG1C6pBr0/4I10PAI/FlYunI3vJjIcu+ZHMg== +"@typescript-eslint/visitor-keys@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz#e0d160e9e7fdb7f8da697a5b78e7a14a22a70528" + integrity sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg== dependencies: - "@typescript-eslint/types" "5.12.0" - eslint-visitor-keys "^3.0.0" + "@typescript-eslint/types" "5.45.0" + eslint-visitor-keys "^3.3.0" "@webassemblyjs/ast@1.11.1": version "1.11.1" @@ -5527,7 +5527,7 @@ dayjs@^1.10.4, dayjs@^1.10.5: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.3.tgz#4754eb694a624057b9ad2224b67b15d552589258" integrity sha512-xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A== -debug@4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2: +debug@4, debug@^4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -6401,7 +6401,7 @@ eslint-visitor-keys@^1.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^3.0.0: +eslint-visitor-keys@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== @@ -7422,7 +7422,7 @@ globalyzer@0.1.0: resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465" integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q== -globby@^11.0.4: +globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -12942,6 +12942,13 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.3.7: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + dependencies: + lru-cache "^6.0.0" + seq-queue@^0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" diff --git a/packages/worker/package.json b/packages/worker/package.json index 4b2c0f2722..f5f5f12b18 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -78,7 +78,7 @@ "@types/node-fetch": "2.6.1", "@types/pouchdb": "6.4.0", "@types/uuid": "8.3.4", - "@typescript-eslint/parser": "5.12.0", + "@typescript-eslint/parser": "5.45.0", "copyfiles": "2.4.1", "eslint": "6.8.0", "jest": "28.1.1", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index b953c15e0e..35722d687e 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -1564,49 +1564,49 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/parser@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.12.0.tgz#0ca669861813df99ce54916f66f524c625ed2434" - integrity sha512-MfSwg9JMBojMUoGjUmX+D2stoQj1CBYTCP0qnnVtu9A+YQXVKNtLjasYh+jozOcrb/wau8TCfWOkQTiOAruBog== +"@typescript-eslint/parser@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.45.0.tgz#b18a5f6b3cf1c2b3e399e9d2df4be40d6b0ddd0e" + integrity sha512-brvs/WSM4fKUmF5Ot/gEve6qYiCMjm6w4HkHPfS6ZNmxTS0m0iNN4yOChImaCkqc1hRwFGqUyanMXuGal6oyyQ== dependencies: - "@typescript-eslint/scope-manager" "5.12.0" - "@typescript-eslint/types" "5.12.0" - "@typescript-eslint/typescript-estree" "5.12.0" - debug "^4.3.2" + "@typescript-eslint/scope-manager" "5.45.0" + "@typescript-eslint/types" "5.45.0" + "@typescript-eslint/typescript-estree" "5.45.0" + debug "^4.3.4" -"@typescript-eslint/scope-manager@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.12.0.tgz#59619e6e5e2b1ce6cb3948b56014d3a24da83f5e" - integrity sha512-GAMobtIJI8FGf1sLlUWNUm2IOkIjvn7laFWyRx7CLrv6nLBI7su+B7lbStqVlK5NdLvHRFiJo2HhiDF7Ki01WQ== +"@typescript-eslint/scope-manager@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.45.0.tgz#7a4ac1bfa9544bff3f620ab85947945938319a96" + integrity sha512-noDMjr87Arp/PuVrtvN3dXiJstQR1+XlQ4R1EvzG+NMgXi8CuMCXpb8JqNtFHKceVSQ985BZhfRdowJzbv4yKw== dependencies: - "@typescript-eslint/types" "5.12.0" - "@typescript-eslint/visitor-keys" "5.12.0" + "@typescript-eslint/types" "5.45.0" + "@typescript-eslint/visitor-keys" "5.45.0" -"@typescript-eslint/types@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.12.0.tgz#5b4030a28222ee01e851836562c07769eecda0b8" - integrity sha512-JowqbwPf93nvf8fZn5XrPGFBdIK8+yx5UEGs2QFAYFI8IWYfrzz+6zqlurGr2ctShMaJxqwsqmra3WXWjH1nRQ== +"@typescript-eslint/types@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.45.0.tgz#794760b9037ee4154c09549ef5a96599621109c5" + integrity sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA== -"@typescript-eslint/typescript-estree@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.0.tgz#cabf545fd592722f0e2b4104711e63bf89525cd2" - integrity sha512-Dd9gVeOqt38QHR0BEA8oRaT65WYqPYbIc5tRFQPkfLquVEFPD1HAtbZT98TLBkEcCkvwDYOAvuSvAD9DnQhMfQ== +"@typescript-eslint/typescript-estree@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz#f70a0d646d7f38c0dfd6936a5e171a77f1e5291d" + integrity sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ== dependencies: - "@typescript-eslint/types" "5.12.0" - "@typescript-eslint/visitor-keys" "5.12.0" - debug "^4.3.2" - globby "^11.0.4" + "@typescript-eslint/types" "5.45.0" + "@typescript-eslint/visitor-keys" "5.45.0" + debug "^4.3.4" + globby "^11.1.0" is-glob "^4.0.3" - semver "^7.3.5" + semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/visitor-keys@5.12.0": - version "5.12.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.0.tgz#1ac9352ed140b07ba144ebf371b743fdf537ec16" - integrity sha512-cFwTlgnMV6TgezQynx2c/4/tx9Tufbuo9LPzmWqyRC3QC4qTGkAG1C6pBr0/4I10PAI/FlYunI3vJjIcu+ZHMg== +"@typescript-eslint/visitor-keys@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz#e0d160e9e7fdb7f8da697a5b78e7a14a22a70528" + integrity sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg== dependencies: - "@typescript-eslint/types" "5.12.0" - eslint-visitor-keys "^3.0.0" + "@typescript-eslint/types" "5.45.0" + eslint-visitor-keys "^3.3.0" abbrev@1: version "1.1.1" @@ -3110,7 +3110,7 @@ eslint-visitor-keys@^1.1.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint-visitor-keys@^3.0.0: +eslint-visitor-keys@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== @@ -3672,7 +3672,7 @@ globalthis@^1.0.1: dependencies: define-properties "^1.1.3" -globby@^11.0.4: +globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== From c1e2c04c89df9f5ce6d5b25d7f6726a9473d9a34 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 29 Nov 2022 11:33:39 +0000 Subject: [PATCH 102/179] v2.1.40-alpha.0 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 196113a33a..535393e618 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.39", + "version": "2.1.40-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 6b350ca7a6..6abd448ce7 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.39", + "version": "2.1.40-alpha.0", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.39", + "@budibase/types": "2.1.40-alpha.0", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5d3aea92f8..cdf7ce1f8e 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.39", + "version": "2.1.40-alpha.0", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.39", + "@budibase/string-templates": "2.1.40-alpha.0", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index ed7e0a9310..a86d386aa4 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.39", + "version": "2.1.40-alpha.0", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.39", - "@budibase/client": "^2.1.39", - "@budibase/frontend-core": "^2.1.39", - "@budibase/string-templates": "^2.1.39", + "@budibase/bbui": "2.1.40-alpha.0", + "@budibase/client": "2.1.40-alpha.0", + "@budibase/frontend-core": "2.1.40-alpha.0", + "@budibase/string-templates": "2.1.40-alpha.0", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 644a77c34d..3572cba626 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.39", + "version": "2.1.40-alpha.0", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.39", - "@budibase/string-templates": "^2.1.39", - "@budibase/types": "^2.1.39", + "@budibase/backend-core": "2.1.40-alpha.0", + "@budibase/string-templates": "2.1.40-alpha.0", + "@budibase/types": "2.1.40-alpha.0", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 2f31afd3eb..8785e13f43 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.39", + "version": "2.1.40-alpha.0", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.39", - "@budibase/frontend-core": "^2.1.39", - "@budibase/string-templates": "^2.1.39", + "@budibase/bbui": "2.1.40-alpha.0", + "@budibase/frontend-core": "2.1.40-alpha.0", + "@budibase/string-templates": "2.1.40-alpha.0", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 240716848f..a3098c7fed 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.39", + "version": "2.1.40-alpha.0", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.39", + "@budibase/bbui": "2.1.40-alpha.0", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c7708fcc51..d7c62486a8 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.39", + "version": "2.1.40-alpha.0", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 85799f329c..3c5ddca35e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.39", + "version": "2.1.40-alpha.0", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.39", - "@budibase/client": "^2.1.39", + "@budibase/backend-core": "2.1.40-alpha.0", + "@budibase/client": "2.1.40-alpha.0", "@budibase/pro": "2.1.39", - "@budibase/string-templates": "^2.1.39", - "@budibase/types": "^2.1.39", + "@budibase/string-templates": "2.1.40-alpha.0", + "@budibase/types": "2.1.40-alpha.0", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ea10351553..aa06b83ff9 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.39", + "version": "2.1.40-alpha.0", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index f502413aa7..8b911e5acd 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.39", + "version": "2.1.40-alpha.0", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4b2c0f2722..2308f99bbb 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.39", + "version": "2.1.40-alpha.0", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.39", + "@budibase/backend-core": "2.1.40-alpha.0", "@budibase/pro": "2.1.39", - "@budibase/string-templates": "^2.1.39", - "@budibase/types": "^2.1.39", + "@budibase/string-templates": "2.1.40-alpha.0", + "@budibase/types": "2.1.40-alpha.0", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 97db236711c55464d9d95e5ad4c461b98ecf29ab Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Tue, 29 Nov 2022 11:33:43 +0000 Subject: [PATCH 103/179] v2.1.40 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 196113a33a..cea5038c67 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.39", + "version": "2.1.40", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 6cea393288..768070865d 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.39", + "version": "2.1.40", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.39", + "@budibase/types": "^2.1.40", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 5d3aea92f8..daac9b03d6 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.39", + "version": "2.1.40", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.39", + "@budibase/string-templates": "^2.1.40", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index a2545545d7..ded6fcb712 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.39", + "version": "2.1.40", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.39", - "@budibase/client": "^2.1.39", - "@budibase/frontend-core": "^2.1.39", - "@budibase/string-templates": "^2.1.39", + "@budibase/bbui": "^2.1.40", + "@budibase/client": "^2.1.40", + "@budibase/frontend-core": "^2.1.40", + "@budibase/string-templates": "^2.1.40", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 644a77c34d..ebda782396 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.39", + "version": "2.1.40", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.39", - "@budibase/string-templates": "^2.1.39", - "@budibase/types": "^2.1.39", + "@budibase/backend-core": "^2.1.40", + "@budibase/string-templates": "^2.1.40", + "@budibase/types": "^2.1.40", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 2f31afd3eb..e3c9cd6fad 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.39", + "version": "2.1.40", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.39", - "@budibase/frontend-core": "^2.1.39", - "@budibase/string-templates": "^2.1.39", + "@budibase/bbui": "^2.1.40", + "@budibase/frontend-core": "^2.1.40", + "@budibase/string-templates": "^2.1.40", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 240716848f..e3abfbf473 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.39", + "version": "2.1.40", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.39", + "@budibase/bbui": "^2.1.40", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index c7708fcc51..5075130af3 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.39", + "version": "2.1.40", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index f2123e7beb..8dd26e5444 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.39", + "version": "2.1.40", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.39", - "@budibase/client": "^2.1.39", + "@budibase/backend-core": "^2.1.40", + "@budibase/client": "^2.1.40", "@budibase/pro": "2.1.39", - "@budibase/string-templates": "^2.1.39", - "@budibase/types": "^2.1.39", + "@budibase/string-templates": "^2.1.40", + "@budibase/types": "^2.1.40", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 7203486769..e807c9be25 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.39", + "version": "2.1.40", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 383d7c5d05..e18e1af8b1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.39", + "version": "2.1.40", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7bb82c744f..3a72d04fa8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.39", + "version": "2.1.40", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.39", + "@budibase/backend-core": "^2.1.40", "@budibase/pro": "2.1.39", - "@budibase/string-templates": "^2.1.39", - "@budibase/types": "^2.1.39", + "@budibase/string-templates": "^2.1.40", + "@budibase/types": "^2.1.40", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 2ac638fc261a9066b5a909dc97f2bd9986516100 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 29 Nov 2022 11:36:24 +0000 Subject: [PATCH 104/179] Only allow admin to create new user --- packages/worker/src/api/controllers/global/users.ts | 4 ++++ packages/worker/src/api/routes/global/users.js | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index ea1df5b45a..d76c1741a3 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -23,6 +23,10 @@ const MAX_USERS_UPLOAD_LIMIT = 1000 export const save = async (ctx: any) => { try { + if (!ctx.request.body._id && !ctx.internal && + (!ctx.user || !ctx.user.admin || !ctx.user.admin.global)) { + ctx.throw(403, "Only admin user can create new user.") + } ctx.body = await sdk.users.save(ctx.request.body) } catch (err: any) { ctx.throw(err.status || 400, err) diff --git a/packages/worker/src/api/routes/global/users.js b/packages/worker/src/api/routes/global/users.js index 99c2f52c6f..7740276dee 100644 --- a/packages/worker/src/api/routes/global/users.js +++ b/packages/worker/src/api/routes/global/users.js @@ -57,14 +57,14 @@ router ) .post( "/api/global/users/bulk", - builderOrAdmin, + adminOnly, users.buildUserBulkUserValidation(), controller.bulkUpdate ) .get("/api/global/users", builderOrAdmin, controller.fetch) .post("/api/global/users/search", builderOrAdmin, controller.search) - .delete("/api/global/users/:id", builderOrAdmin, controller.destroy) + .delete("/api/global/users/:id", adminOnly, controller.destroy) .get("/api/global/users/count/:appId", builderOrAdmin, controller.countByApp) .get("/api/global/roles/:appId") .post( From 4fee031a686a195b7da169faf513e795009dad11 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 29 Nov 2022 11:37:04 +0000 Subject: [PATCH 105/179] Update pro version to 2.1.40-alpha.0 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 173 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 198 +++++++++++++++++++---------------- 4 files changed, 198 insertions(+), 177 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 3c5ddca35e..407fb135f1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.1.40-alpha.0", "@budibase/client": "2.1.40-alpha.0", - "@budibase/pro": "2.1.39", + "@budibase/pro": "2.1.40-alpha.0", "@budibase/string-templates": "2.1.40-alpha.0", "@budibase/types": "2.1.40-alpha.0", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 2bd74dfc2c..ba4b1025df 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.39.tgz#0ada64b114d2b61e6a4a782227348e1bfd33ebc6" - integrity sha512-OW1SOS0jWHoHBVMZo3A36F5urgphduOXWqegtHRL3o3cFmf38l8XI6TtKDWrfSkJat0FKrzjJs1vAnIh9cQeMA== +"@budibase/backend-core@2.1.40-alpha.0": + version "2.1.40-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.0.tgz#f494c8644e2d39a4fd92cca010318166a97c6f43" + integrity sha512-k1r8h7UGNOV295p6NU5g0cuvkKtWJub5w4swCHZZfXrOPLkBASuAdM6jbd75cjInWr+1ivpOUBWNhsxHnsZh4A== dependencies: - "@budibase/types" "^2.1.39" + "@budibase/types" "2.1.40-alpha.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1293,8 +1293,8 @@ koa-passport "4.1.4" lodash "4.17.21" lodash.isarguments "3.1.0" + nano "^10.1.0" node-fetch "2.6.7" - passport-google-auth "1.0.2" passport-google-oauth "2.0.0" passport-jwt "4.0.0" passport-local "1.0.0" @@ -1360,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.39.tgz#31d59a9e3bde75f9b83cff8db1b8fcb75c16fafe" - integrity sha512-GQ5Z0U03C9RifZhPQX9dc61yLM9YkRZOjl7mHXIrcm6ytUA3I/DMuGcN83hwlxlPOem9utofDmXfCE288nLDZg== +"@budibase/pro@2.1.40-alpha.0": + version "2.1.40-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.0.tgz#2b43c7eadfdb70a8af4c690a7f892ee009b44d50" + integrity sha512-zrr5lFVzq5CerbsrCO/71cj3JV9Lq7nqs02lwmzZJboELz8CTdmC23Tk9TKACosOLowgZxJqsa5qMJBSC5X+kg== dependencies: - "@budibase/backend-core" "2.1.39" - "@budibase/types" "2.1.39" + "@budibase/backend-core" "2.1.40-alpha.0" + "@budibase/types" "2.1.40-alpha.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.39", "@budibase/types@^2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.39.tgz#ffa88a87c18d565c02576c5b75cde29326a4263c" - integrity sha512-S5v3lQbUxyzGYWMo5P3V+e47O4CNyhih2uHr+YLvdMtaq8Pj7jNHrZU9pxEFF0ldZDAFC3Z5WZaUglNXfZyZCw== +"@budibase/types@2.1.40-alpha.0": + version "2.1.40-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.0.tgz#d7168082f052e57a50aa8ef1b1dbef98b58e0fc9" + integrity sha512-FGsDvSCYRPuPOtbcwsIuah//ZHml5Oi86Dvb+G7Hdgt7CszkBJCwMCJPIM+FZ5wOYnZj0LV/sOJbOt0vpFXiPg== "@bull-board/api@3.7.0": version "3.7.0" @@ -3412,7 +3412,7 @@ "@types/cookiejar" "*" "@types/node" "*" -"@types/tough-cookie@*": +"@types/tough-cookie@*", "@types/tough-cookie@^4.0.2": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== @@ -4187,13 +4187,6 @@ async@^3.2.1, async@^3.2.3: resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== -async@~2.1.4: - version "2.1.5" - resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc" - integrity sha512-+g/Ncjbx0JSq2Mk03WQkyKvNh5q9Qvyo/RIqIqnmC5feJY70PNl2ESwZU2BhAB+AZPkHNzzyC2Dq2AS5VnTKhQ== - dependencies: - lodash "^4.14.0" - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -4297,6 +4290,15 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" +axios@^1.1.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.0.tgz#1cb65bd75162c70e9f8d118a905126c4a201d383" + integrity sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + babel-jest@27.5.1: version "27.5.1" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444" @@ -7001,6 +7003,11 @@ follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.8, fo resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + for-each@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -7484,16 +7491,6 @@ google-auth-library@^7.14.0: jws "^4.0.0" lru-cache "^6.0.0" -google-auth-library@~0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-0.10.0.tgz#6e15babee85fd1dd14d8d128a295b6838d52136e" - integrity sha512-KM54Y9GhdAzfXUHmWEoYmaOykSLuMG7W4HvVLYqyogxOyE6px8oSS8W13ngqW0oDGZ915GFW3V6OM6+qcdvPOA== - dependencies: - gtoken "^1.2.1" - jws "^3.1.4" - lodash.noop "^3.0.1" - request "^2.74.0" - google-gax@^2.24.1: version "2.30.5" resolved "https://registry.yarnpkg.com/google-gax/-/google-gax-2.30.5.tgz#e836f984f3228900a8336f608c83d75f9cb73eff" @@ -7513,13 +7510,6 @@ google-gax@^2.24.1: protobufjs "6.11.3" retry-request "^4.0.0" -google-p12-pem@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-0.1.2.tgz#33c46ab021aa734fa0332b3960a9a3ffcb2f3177" - integrity sha512-puhMlJ2+E/rgvxWaqgN/nC7x623OAE8MR9vBUqxF0inCE7HoVfCHvTeQ9+BR+rj9KM0fIg6XV6tmbt7XHHssoQ== - dependencies: - node-forge "^0.7.1" - google-p12-pem@^3.1.3: version "3.1.4" resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-3.1.4.tgz#123f7b40da204de4ed1fbf2fd5be12c047fc8b3b" @@ -7536,15 +7526,6 @@ google-spreadsheet@3.2.0: google-auth-library "^6.1.3" lodash "^4.17.21" -googleapis@^16.0.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-16.1.0.tgz#0f19f2d70572d918881a0f626e3b1a2fa8629576" - integrity sha512-5czmF7xkIlJKc1+/+5tltrI1skoR3HKtkDOld9rk+DOucTpZRjOhCoJzoSjxB3M8rP2tEb1VIr1TPyzR3V2PUQ== - dependencies: - async "~2.1.4" - google-auth-library "~0.10.0" - string-template "~1.0.0" - got@^8.3.1: version "8.3.2" resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937" @@ -7590,16 +7571,6 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1. resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -gtoken@^1.2.1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-1.2.3.tgz#5509571b8afd4322e124cf66cf68115284c476d8" - integrity sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w== - dependencies: - google-p12-pem "^0.1.0" - jws "^3.0.0" - mime "^1.4.1" - request "^2.72.0" - gtoken@^5.0.4: version "5.3.2" resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-5.3.2.tgz#deb7dc876abe002178e0515e383382ea9446d58f" @@ -7775,6 +7746,13 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== +http-cookie-agent@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/http-cookie-agent/-/http-cookie-agent-4.0.2.tgz#dcdaae18ed1f7452d81ae4d5cd80b227d6831b69" + integrity sha512-noTmxdH5CuytTnLj/Qv3Z84e/YFq8yLXAw3pqIYZ25Edhb9pQErIAC+ednw40Cic6Le/h9ryph5/TqsvkOaUCw== + dependencies: + agent-base "^6.0.2" + http-errors@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" @@ -9629,7 +9607,7 @@ jwa@^2.0.0: ecdsa-sig-formatter "1.0.11" safe-buffer "^5.0.1" -jws@3.x.x, jws@^3.0.0, jws@^3.1.4, jws@^3.2.2: +jws@3.x.x, jws@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA== @@ -10179,11 +10157,6 @@ lodash.mergewith@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55" integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ== -lodash.noop@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.noop/-/lodash.noop-3.0.1.tgz#38188f4d650a3a474258439b96ec45b32617133c" - integrity sha512-TmYdmu/pebrdTIBDK/FDx9Bmfzs9x0sZG6QIJuMDTqEPfeciLcN13ij+cOd0i9vwJfBtbG9UQ+C7MkXgYxrIJg== - lodash.omit@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60" @@ -10214,7 +10187,7 @@ lodash.xor@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6" integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ== -lodash@4.17.21, lodash@^4.14.0, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3: +lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -10742,6 +10715,18 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== +nano@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/nano/-/nano-10.1.0.tgz#afdd5a7440e62f09a8e23f41fcea328d27383922" + integrity sha512-COeN2TpLcHuSN44QLnPmfZCoCsKAg8/aelPOVqqm/2/MvRHDEA11/Kld5C4sLzDlWlhFZ3SO2WGJGevCsvcEzQ== + dependencies: + "@types/tough-cookie" "^4.0.2" + axios "^1.1.3" + http-cookie-agent "^4.0.2" + node-abort-controller "^3.0.1" + qs "^6.11.0" + tough-cookie "^4.1.2" + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -10804,6 +10789,11 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-abort-controller@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.0.1.tgz#f91fa50b1dee3f909afabb7e261b1e1d6b0cb74e" + integrity sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw== + node-addon-api@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" @@ -10821,11 +10811,6 @@ node-fetch@2.6.7, node-fetch@^2.6.1, node-fetch@^2.6.7: dependencies: whatwg-url "^5.0.0" -node-forge@^0.7.1: - version "0.7.6" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac" - integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw== - node-forge@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -11425,14 +11410,6 @@ pascalcase@^0.1.1: resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== -passport-google-auth@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/passport-google-auth/-/passport-google-auth-1.0.2.tgz#8b300b5aa442ef433de1d832ed3112877d0b2938" - integrity sha512-cfAqna6jZLyMEwUdd4PIwAh2mQKQVEDAaRIaom1pG6h4x4Gwjllf/Jflt3TkR1Sen5Rkvr3l7kSXCWE1EKkh8g== - dependencies: - googleapis "^16.0.0" - passport-strategy "1.x" - passport-google-oauth1@1.x.x: version "1.0.0" resolved "https://registry.yarnpkg.com/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz#af74a803df51ec646f66a44d82282be6f108e0cc" @@ -11495,7 +11472,7 @@ passport-oauth2@1.x.x: uid2 "0.0.x" utils-merge "1.x.x" -passport-strategy@1.x, passport-strategy@1.x.x, passport-strategy@^1.0.0: +passport-strategy@1.x.x, passport-strategy@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4" integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA== @@ -12164,6 +12141,11 @@ protobufjs@6.11.3, protobufjs@^6.11.2, protobufjs@^6.11.3, protobufjs@^6.8.6: "@types/node" ">=13.7.0" long "^4.0.0" +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -12226,6 +12208,13 @@ q@^1.1.2: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== +qs@^6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + qs@^6.4.0, qs@^6.5.1: version "6.10.5" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4" @@ -12609,7 +12598,7 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@^2.72.0, request@^2.74.0, request@^2.87.0, request@^2.88.0, request@^2.88.2: +request@^2.87.0, request@^2.88.0, request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -13519,11 +13508,6 @@ string-similarity@^4.0.1, string-similarity@^4.0.4: resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-4.0.4.tgz#42d01ab0b34660ea8a018da8f56a3309bb8b2a5b" integrity sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ== -string-template@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/string-template/-/string-template-1.0.0.tgz#9e9f2233dc00f218718ec379a28a5673ecca8b96" - integrity sha512-SLqR3GBUXuoPP5MmYtD7ompvXiG87QjT6lzOszyXjTM86Uu7At7vNnt2xgyTLq5o9T4IxTYFyGxcULqpsmsfdg== - "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -14209,6 +14193,16 @@ tough-cookie@^3.0.1: psl "^1.1.28" punycode "^2.1.1" +tough-cookie@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" + integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + tr46@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" @@ -14489,6 +14483,11 @@ universalify@^0.1.0, universalify@^0.1.2: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" diff --git a/packages/worker/package.json b/packages/worker/package.json index 2308f99bbb..922ef1302e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.1.40-alpha.0", - "@budibase/pro": "2.1.39", + "@budibase/pro": "2.1.40-alpha.0", "@budibase/string-templates": "2.1.40-alpha.0", "@budibase/types": "2.1.40-alpha.0", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index b953c15e0e..0cbb9f5867 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.39.tgz#0ada64b114d2b61e6a4a782227348e1bfd33ebc6" - integrity sha512-OW1SOS0jWHoHBVMZo3A36F5urgphduOXWqegtHRL3o3cFmf38l8XI6TtKDWrfSkJat0FKrzjJs1vAnIh9cQeMA== +"@budibase/backend-core@2.1.40-alpha.0": + version "2.1.40-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.0.tgz#f494c8644e2d39a4fd92cca010318166a97c6f43" + integrity sha512-k1r8h7UGNOV295p6NU5g0cuvkKtWJub5w4swCHZZfXrOPLkBASuAdM6jbd75cjInWr+1ivpOUBWNhsxHnsZh4A== dependencies: - "@budibase/types" "^2.1.39" + "@budibase/types" "2.1.40-alpha.0" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -490,8 +490,8 @@ koa-passport "4.1.4" lodash "4.17.21" lodash.isarguments "3.1.0" + nano "^10.1.0" node-fetch "2.6.7" - passport-google-auth "1.0.2" passport-google-oauth "2.0.0" passport-jwt "4.0.0" passport-local "1.0.0" @@ -507,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.39.tgz#31d59a9e3bde75f9b83cff8db1b8fcb75c16fafe" - integrity sha512-GQ5Z0U03C9RifZhPQX9dc61yLM9YkRZOjl7mHXIrcm6ytUA3I/DMuGcN83hwlxlPOem9utofDmXfCE288nLDZg== +"@budibase/pro@2.1.40-alpha.0": + version "2.1.40-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.0.tgz#2b43c7eadfdb70a8af4c690a7f892ee009b44d50" + integrity sha512-zrr5lFVzq5CerbsrCO/71cj3JV9Lq7nqs02lwmzZJboELz8CTdmC23Tk9TKACosOLowgZxJqsa5qMJBSC5X+kg== dependencies: - "@budibase/backend-core" "2.1.39" - "@budibase/types" "2.1.39" + "@budibase/backend-core" "2.1.40-alpha.0" + "@budibase/types" "2.1.40-alpha.0" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.39", "@budibase/types@^2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.39.tgz#ffa88a87c18d565c02576c5b75cde29326a4263c" - integrity sha512-S5v3lQbUxyzGYWMo5P3V+e47O4CNyhih2uHr+YLvdMtaq8Pj7jNHrZU9pxEFF0ldZDAFC3Z5WZaUglNXfZyZCw== +"@budibase/types@2.1.40-alpha.0": + version "2.1.40-alpha.0" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.0.tgz#d7168082f052e57a50aa8ef1b1dbef98b58e0fc9" + integrity sha512-FGsDvSCYRPuPOtbcwsIuah//ZHml5Oi86Dvb+G7Hdgt7CszkBJCwMCJPIM+FZ5wOYnZj0LV/sOJbOt0vpFXiPg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" @@ -1540,6 +1540,11 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== +"@types/tough-cookie@^4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" + integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== + "@types/uuid@8.3.4": version "8.3.4" resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" @@ -1687,7 +1692,7 @@ after-all-results@^2.0.0: resolved "https://registry.yarnpkg.com/after-all-results/-/after-all-results-2.0.0.tgz#6ac2fc202b500f88da8f4f5530cfa100f4c6a2d0" integrity sha512-2zHEyuhSJOuCrmas9YV0YL/MFCWLxe1dS6k/ENhgYrb/JqyMnadLN4iIAc9kkZrbElMDyyAGH/0J18OPErOWLg== -agent-base@6: +agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== @@ -1860,13 +1865,6 @@ async-value@^1.2.2: resolved "https://registry.yarnpkg.com/async-value/-/async-value-1.2.2.tgz#84517a1e7cb6b1a5b5e181fa31be10437b7fb125" integrity sha512-8rwtYe32OAS1W9CTwvknoyts+mc3ta8N7Pi0h7AjkMaKvsFbr39K+gEfZ7Z81aPXQ1sK5M23lgLy1QfZpcpadQ== -async@~2.1.4: - version "2.1.5" - resolved "https://registry.yarnpkg.com/async/-/async-2.1.5.tgz#e587c68580994ac67fc56ff86d3ac56bdbe810bc" - integrity sha512-+g/Ncjbx0JSq2Mk03WQkyKvNh5q9Qvyo/RIqIqnmC5feJY70PNl2ESwZU2BhAB+AZPkHNzzyC2Dq2AS5VnTKhQ== - dependencies: - lodash "^4.14.0" - asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -1917,6 +1915,15 @@ axios@0.24.0: dependencies: follow-redirects "^1.14.4" +axios@^1.1.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.0.tgz#1cb65bd75162c70e9f8d118a905126c4a201d383" + integrity sha512-zT7wZyNYu3N5Bu0wuZ6QccIf93Qk1eV8LOewxgjOZFd2DenOs98cJ7+Y6703d0wkaXGY6/nZd4EweJaHz9uzQw== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + babel-jest@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5" @@ -3422,6 +3429,11 @@ follow-redirects@^1.14.4: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -3684,32 +3696,6 @@ globby@^11.0.4: merge2 "^1.4.1" slash "^3.0.0" -google-auth-library@~0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-0.10.0.tgz#6e15babee85fd1dd14d8d128a295b6838d52136e" - integrity sha512-KM54Y9GhdAzfXUHmWEoYmaOykSLuMG7W4HvVLYqyogxOyE6px8oSS8W13ngqW0oDGZ915GFW3V6OM6+qcdvPOA== - dependencies: - gtoken "^1.2.1" - jws "^3.1.4" - lodash.noop "^3.0.1" - request "^2.74.0" - -google-p12-pem@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/google-p12-pem/-/google-p12-pem-0.1.2.tgz#33c46ab021aa734fa0332b3960a9a3ffcb2f3177" - integrity sha512-puhMlJ2+E/rgvxWaqgN/nC7x623OAE8MR9vBUqxF0inCE7HoVfCHvTeQ9+BR+rj9KM0fIg6XV6tmbt7XHHssoQ== - dependencies: - node-forge "^0.7.1" - -googleapis@^16.0.0: - version "16.1.0" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-16.1.0.tgz#0f19f2d70572d918881a0f626e3b1a2fa8629576" - integrity sha512-5czmF7xkIlJKc1+/+5tltrI1skoR3HKtkDOld9rk+DOucTpZRjOhCoJzoSjxB3M8rP2tEb1VIr1TPyzR3V2PUQ== - dependencies: - async "~2.1.4" - google-auth-library "~0.10.0" - string-template "~1.0.0" - got@11.8.3: version "11.8.3" resolved "https://registry.yarnpkg.com/got/-/got-11.8.3.tgz#f496c8fdda5d729a90b4905d2b07dbd148170770" @@ -3749,16 +3735,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.2.9: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -gtoken@^1.2.1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-1.2.3.tgz#5509571b8afd4322e124cf66cf68115284c476d8" - integrity sha512-wQAJflfoqSgMWrSBk9Fg86q+sd6s7y6uJhIvvIPz++RElGlMtEqsdAR2oWwZ/WTEtp7P9xFbJRrT976oRgzJ/w== - dependencies: - google-p12-pem "^0.1.0" - jws "^3.0.0" - mime "^1.4.1" - request "^2.72.0" - har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -3846,6 +3822,13 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== +http-cookie-agent@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/http-cookie-agent/-/http-cookie-agent-4.0.2.tgz#dcdaae18ed1f7452d81ae4d5cd80b227d6831b69" + integrity sha512-noTmxdH5CuytTnLj/Qv3Z84e/YFq8yLXAw3pqIYZ25Edhb9pQErIAC+ednw40Cic6Le/h9ryph5/TqsvkOaUCw== + dependencies: + agent-base "^6.0.2" + http-errors@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" @@ -4889,7 +4872,7 @@ jwa@^1.4.1: ecdsa-sig-formatter "1.0.11" safe-buffer "^5.0.1" -jws@^3.0.0, jws@^3.1.4, jws@^3.2.2: +jws@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA== @@ -5215,11 +5198,6 @@ lodash.memoize@4.x: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== -lodash.noop@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash.noop/-/lodash.noop-3.0.1.tgz#38188f4d650a3a474258439b96ec45b32617133c" - integrity sha512-TmYdmu/pebrdTIBDK/FDx9Bmfzs9x0sZG6QIJuMDTqEPfeciLcN13ij+cOd0i9vwJfBtbG9UQ+C7MkXgYxrIJg== - lodash.once@^4.0.0: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" @@ -5235,7 +5213,7 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== -lodash@4.17.21, lodash@^4.14.0, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21: +lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5400,7 +5378,7 @@ mime@2.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== -mime@^1.3.4, mime@^1.4.1: +mime@^1.3.4: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== @@ -5515,6 +5493,18 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +nano@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/nano/-/nano-10.1.0.tgz#afdd5a7440e62f09a8e23f41fcea328d27383922" + integrity sha512-COeN2TpLcHuSN44QLnPmfZCoCsKAg8/aelPOVqqm/2/MvRHDEA11/Kld5C4sLzDlWlhFZ3SO2WGJGevCsvcEzQ== + dependencies: + "@types/tough-cookie" "^4.0.2" + axios "^1.1.3" + http-cookie-agent "^4.0.2" + node-abort-controller "^3.0.1" + qs "^6.11.0" + tough-cookie "^4.1.2" + napi-macros@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b" @@ -5550,6 +5540,11 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +node-abort-controller@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.0.1.tgz#f91fa50b1dee3f909afabb7e261b1e1d6b0cb74e" + integrity sha512-/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw== + node-addon-api@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" @@ -5567,11 +5562,6 @@ node-fetch@2.6.7, node-fetch@^2.6.1, node-fetch@^2.6.7: dependencies: whatwg-url "^5.0.0" -node-forge@^0.7.1: - version "0.7.6" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.6.tgz#fdf3b418aee1f94f0ef642cd63486c77ca9724ac" - integrity sha512-sol30LUpz1jQFBjOKwbjxijiE3b6pjd74YwfD0fJOKPjF+fONKb2Yg8rYgS6+bK6VDl+/wfr4IYpC7jDzLUIfw== - node-gyp-build-optional-packages@5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz#92a89d400352c44ad3975010368072b41ad66c17" @@ -5889,14 +5879,6 @@ parseurl@^1.3.2, parseurl@^1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -passport-google-auth@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/passport-google-auth/-/passport-google-auth-1.0.2.tgz#8b300b5aa442ef433de1d832ed3112877d0b2938" - integrity sha512-cfAqna6jZLyMEwUdd4PIwAh2mQKQVEDAaRIaom1pG6h4x4Gwjllf/Jflt3TkR1Sen5Rkvr3l7kSXCWE1EKkh8g== - dependencies: - googleapis "^16.0.0" - passport-strategy "1.x" - passport-google-oauth1@1.x.x: version "1.0.0" resolved "https://registry.yarnpkg.com/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz#af74a803df51ec646f66a44d82282be6f108e0cc" @@ -5959,7 +5941,7 @@ passport-oauth2@1.x.x: uid2 "0.0.x" utils-merge "1.x.x" -passport-strategy@1.x, passport-strategy@1.x.x, passport-strategy@^1.0.0: +passport-strategy@1.x.x, passport-strategy@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4" integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA== @@ -6386,6 +6368,11 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" +proxy-from-env@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -6453,6 +6440,13 @@ qs@^6.10.3, qs@^6.4.0: dependencies: side-channel "^1.0.4" +qs@^6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" + qs@~6.5.2: version "6.5.3" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" @@ -6463,6 +6457,11 @@ querystring@0.2.0: resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g== +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -6644,7 +6643,7 @@ remove-trailing-slash@^0.1.1: resolved "https://registry.yarnpkg.com/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz#be2285a59f39c74d1bce4f825950061915e3780d" integrity sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA== -request@^2.72.0, request@^2.74.0, request@^2.88.0: +request@^2.88.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -6684,6 +6683,11 @@ require-in-the-middle@^5.0.3: module-details-from-path "^1.0.3" resolve "^1.22.1" +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + resolve-alpn@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" @@ -7118,11 +7122,6 @@ string-similarity@^4.0.1: resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-4.0.4.tgz#42d01ab0b34660ea8a018da8f56a3309bb8b2a5b" integrity sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ== -string-template@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/string-template/-/string-template-1.0.0.tgz#9e9f2233dc00f218718ec379a28a5673ecca8b96" - integrity sha512-SLqR3GBUXuoPP5MmYtD7ompvXiG87QjT6lzOszyXjTM86Uu7At7vNnt2xgyTLq5o9T4IxTYFyGxcULqpsmsfdg== - "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -7439,6 +7438,16 @@ touch@^3.1.0: punycode "^2.1.1" universalify "^0.1.2" +tough-cookie@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" + integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== + dependencies: + psl "^1.1.33" + punycode "^2.1.1" + universalify "^0.2.0" + url-parse "^1.5.3" + tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" @@ -7632,6 +7641,11 @@ universalify@^0.1.2: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + unpipe@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -7694,6 +7708,14 @@ url-parse-lax@^3.0.0: dependencies: prepend-http "^2.0.0" +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" + url@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" From 956ff5d3d6746fc9c9187727d01a22edc3b4cf6e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 29 Nov 2022 12:18:18 +0000 Subject: [PATCH 106/179] v2.1.40-alpha.1 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 535393e618..37577f16f1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 6abd448ce7..c9e7c7e7c5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.1.40-alpha.0", + "@budibase/types": "2.1.40-alpha.1", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index cdf7ce1f8e..9c078d431c 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "2.1.40-alpha.0", + "@budibase/string-templates": "2.1.40-alpha.1", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index a86d386aa4..5b17b7724c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.1.40-alpha.0", - "@budibase/client": "2.1.40-alpha.0", - "@budibase/frontend-core": "2.1.40-alpha.0", - "@budibase/string-templates": "2.1.40-alpha.0", + "@budibase/bbui": "2.1.40-alpha.1", + "@budibase/client": "2.1.40-alpha.1", + "@budibase/frontend-core": "2.1.40-alpha.1", + "@budibase/string-templates": "2.1.40-alpha.1", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 3572cba626..5f399b21d3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.1.40-alpha.0", - "@budibase/string-templates": "2.1.40-alpha.0", - "@budibase/types": "2.1.40-alpha.0", + "@budibase/backend-core": "2.1.40-alpha.1", + "@budibase/string-templates": "2.1.40-alpha.1", + "@budibase/types": "2.1.40-alpha.1", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 8785e13f43..7e55f462a4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.1.40-alpha.0", - "@budibase/frontend-core": "2.1.40-alpha.0", - "@budibase/string-templates": "2.1.40-alpha.0", + "@budibase/bbui": "2.1.40-alpha.1", + "@budibase/frontend-core": "2.1.40-alpha.1", + "@budibase/string-templates": "2.1.40-alpha.1", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index a3098c7fed..00449faa13 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.1.40-alpha.0", + "@budibase/bbui": "2.1.40-alpha.1", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index d7c62486a8..a4e3c37039 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index b566e59727..5bd0b7c5fc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.1.40-alpha.0", - "@budibase/client": "2.1.40-alpha.0", + "@budibase/backend-core": "2.1.40-alpha.1", + "@budibase/client": "2.1.40-alpha.1", "@budibase/pro": "2.1.40-alpha.0", - "@budibase/string-templates": "2.1.40-alpha.0", - "@budibase/types": "2.1.40-alpha.0", + "@budibase/string-templates": "2.1.40-alpha.1", + "@budibase/types": "2.1.40-alpha.1", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index aa06b83ff9..c5e1311466 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 8b911e5acd..c88b815382 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 57fd3c94e9..0a2f895e9c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.40-alpha.0", + "version": "2.1.40-alpha.1", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.1.40-alpha.0", + "@budibase/backend-core": "2.1.40-alpha.1", "@budibase/pro": "2.1.40-alpha.0", - "@budibase/string-templates": "2.1.40-alpha.0", - "@budibase/types": "2.1.40-alpha.0", + "@budibase/string-templates": "2.1.40-alpha.1", + "@budibase/types": "2.1.40-alpha.1", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 4279d3687e0563ff0bb6bbf08c0743e968d87817 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 29 Nov 2022 12:19:37 +0000 Subject: [PATCH 107/179] Update table migration test to use imports, and update TestConfiguration to work with type parameters --- .../functions/tests/tableSettings.spec.ts | 14 +++++----- .../src/tests/utilities/TestConfiguration.js | 28 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts index 2d8cb3806d..32cf744987 100644 --- a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts +++ b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts @@ -1,8 +1,8 @@ import { App, Screen, ScreenProps } from "@budibase/types" -const { db: dbCore } = require("@budibase/backend-core") -const TestConfig = require("../../../tests/utilities/TestConfiguration") -const migration = require("../tableSettings") +import { db as dbCore } from "@budibase/backend-core" +import TestConfig from "../../../tests/utilities/TestConfiguration" +import { run as runMigration } from "../tableSettings" // Local type for allowing any child components inside screens type MigratingScreenProps = ScreenProps & { _children: any[] } @@ -35,7 +35,7 @@ describe("run", () => { // Run migration screen = await dbCore.doWithDB(app.appId, async (db: any) => { - await migration.run(db) + await runMigration(db) return await db.get(screen._id) }) @@ -64,7 +64,7 @@ describe("run", () => { // Run migration screen = await dbCore.doWithDB(app.appId, async (db: any) => { - await migration.run(db) + await runMigration(db) return await db.get(screen._id) }) @@ -92,7 +92,7 @@ describe("run", () => { // Run migration screen = await dbCore.doWithDB(app.appId, async (db: any) => { - await migration.run(db) + await runMigration(db) return await db.get(screen._id) }) @@ -121,7 +121,7 @@ describe("run", () => { // Run migration screen = await dbCore.doWithDB(app.appId, async (db: any) => { - await migration.run(db) + await runMigration(db) return await db.get(screen._id) }) diff --git a/packages/server/src/tests/utilities/TestConfiguration.js b/packages/server/src/tests/utilities/TestConfiguration.js index 76c79b838f..501e1ed5d6 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.js +++ b/packages/server/src/tests/utilities/TestConfiguration.js @@ -87,7 +87,7 @@ class TestConfiguration { } return tenancy.doInTenant(TENANT_ID, () => { // check if already in a context - if (context.getAppId() == null && appId !== null) { + if (context.getAppId() == null && appId != null) { return context.doInAppContext(appId, async () => { return task() }) @@ -196,7 +196,7 @@ class TestConfiguration { } async createUser( - id = null, + id, firstName = FIRSTNAME, lastName = LASTNAME, email = EMAIL, @@ -366,25 +366,25 @@ class TestConfiguration { // TABLE - async updateTable(config = null) { + async updateTable(config) { config = config || basicTable() this.table = await this._req(config, null, controllers.table.save) return this.table } - async createTable(config = null) { + async createTable(config) { if (config != null && config._id) { delete config._id } return this.updateTable(config) } - async getTable(tableId = null) { + async getTable(tableId) { tableId = tableId || this.table._id return this._req(null, { tableId }, controllers.table.find) } - async createLinkedTable(relationshipType = null, links = ["link"]) { + async createLinkedTable(relationshipType, links = ["link"]) { if (!this.table) { throw "Must have created a table first." } @@ -416,7 +416,7 @@ class TestConfiguration { // ROW - async createRow(config = null) { + async createRow(config) { if (!this.table) { throw "Test requires table to be configured." } @@ -438,7 +438,7 @@ class TestConfiguration { // ROLE - async createRole(config = null) { + async createRole(config) { config = config || basicRole() return this._req(config, null, controllers.role.save) } @@ -485,7 +485,7 @@ class TestConfiguration { return this._req(null, null, controllers.automation.fetch) } - async deleteAutomation(automation = null) { + async deleteAutomation(automation) { automation = automation || this.automation if (!automation) { return @@ -497,7 +497,7 @@ class TestConfiguration { ) } - async createWebhook(config = null) { + async createWebhook(config) { if (!this.automation) { throw "Must create an automation before creating webhook." } @@ -507,7 +507,7 @@ class TestConfiguration { // DATASOURCE - async createDatasource(config = null) { + async createDatasource(config) { config = config || basicDatasource() const response = await this._req(config, null, controllers.datasource.save) this.datasource = response.datasource @@ -574,7 +574,7 @@ class TestConfiguration { .expect(200) } - async createQuery(config = null) { + async createQuery(config) { if (!this.datasource && !config) { throw "No datasource created for query." } @@ -584,14 +584,14 @@ class TestConfiguration { // SCREEN - async createScreen(config = null) { + async createScreen(config) { config = config || basicScreen() return this._req(config, null, controllers.screen.save) } // LAYOUT - async createLayout(config = null) { + async createLayout(config) { config = config || basicLayout() return await this._req(config, null, controllers.layout.save) } From b0f65526d8356107c42cf89c107322f1d5c2edbd Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 29 Nov 2022 12:21:36 +0000 Subject: [PATCH 108/179] Update pro version to 2.1.40-alpha.1 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5bd0b7c5fc..a57ee6c084 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.1.40-alpha.1", "@budibase/client": "2.1.40-alpha.1", - "@budibase/pro": "2.1.40-alpha.0", + "@budibase/pro": "2.1.40-alpha.1", "@budibase/string-templates": "2.1.40-alpha.1", "@budibase/types": "2.1.40-alpha.1", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 973064b888..7e12dc5619 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.40-alpha.0": - version "2.1.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.0.tgz#f494c8644e2d39a4fd92cca010318166a97c6f43" - integrity sha512-k1r8h7UGNOV295p6NU5g0cuvkKtWJub5w4swCHZZfXrOPLkBASuAdM6jbd75cjInWr+1ivpOUBWNhsxHnsZh4A== +"@budibase/backend-core@2.1.40-alpha.1": + version "2.1.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.1.tgz#fd1a002e6a4b42a43c25937abe99afa5d4c68bab" + integrity sha512-XXj3QPqylmKwO27lhfcJ2lhBxjN3Q91bZ0nv/SDVwOMqTT/FzypG00cA/dL3E91BoibwGYd9KYvs6FAEFscG8A== dependencies: - "@budibase/types" "2.1.40-alpha.0" + "@budibase/types" "2.1.40-alpha.1" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1360,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.40-alpha.0": - version "2.1.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.0.tgz#2b43c7eadfdb70a8af4c690a7f892ee009b44d50" - integrity sha512-zrr5lFVzq5CerbsrCO/71cj3JV9Lq7nqs02lwmzZJboELz8CTdmC23Tk9TKACosOLowgZxJqsa5qMJBSC5X+kg== +"@budibase/pro@2.1.40-alpha.1": + version "2.1.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.1.tgz#a5cd55772be5f2b9d30b9cbed6cb01b69b64870f" + integrity sha512-e3Rkk+qvMwPDhw2HqDOe9NvRN91C/lTA9pwwgP25aNzMGLjIlIt9gbpEOj9LkWCVhLypmyPxlbHA9DtJinBpzg== dependencies: - "@budibase/backend-core" "2.1.40-alpha.0" - "@budibase/types" "2.1.40-alpha.0" + "@budibase/backend-core" "2.1.40-alpha.1" + "@budibase/types" "2.1.40-alpha.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.40-alpha.0": - version "2.1.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.0.tgz#d7168082f052e57a50aa8ef1b1dbef98b58e0fc9" - integrity sha512-FGsDvSCYRPuPOtbcwsIuah//ZHml5Oi86Dvb+G7Hdgt7CszkBJCwMCJPIM+FZ5wOYnZj0LV/sOJbOt0vpFXiPg== +"@budibase/types@2.1.40-alpha.1": + version "2.1.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.1.tgz#b94b19dad8bc652d6ca7020173468e758db77737" + integrity sha512-k6oOeyitqW61mRHmxXZLRxeK/F7To+pWoOnSdwJxYedD5SWPdnMdR01KZFj2ahnKU+VBWNf67NppWLDfDeKM9g== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 0a2f895e9c..fc3c09ea08 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.1.40-alpha.1", - "@budibase/pro": "2.1.40-alpha.0", + "@budibase/pro": "2.1.40-alpha.1", "@budibase/string-templates": "2.1.40-alpha.1", "@budibase/types": "2.1.40-alpha.1", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index e14f4c930b..7ed6841141 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.40-alpha.0": - version "2.1.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.0.tgz#f494c8644e2d39a4fd92cca010318166a97c6f43" - integrity sha512-k1r8h7UGNOV295p6NU5g0cuvkKtWJub5w4swCHZZfXrOPLkBASuAdM6jbd75cjInWr+1ivpOUBWNhsxHnsZh4A== +"@budibase/backend-core@2.1.40-alpha.1": + version "2.1.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.1.tgz#fd1a002e6a4b42a43c25937abe99afa5d4c68bab" + integrity sha512-XXj3QPqylmKwO27lhfcJ2lhBxjN3Q91bZ0nv/SDVwOMqTT/FzypG00cA/dL3E91BoibwGYd9KYvs6FAEFscG8A== dependencies: - "@budibase/types" "2.1.40-alpha.0" + "@budibase/types" "2.1.40-alpha.1" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -507,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.40-alpha.0": - version "2.1.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.0.tgz#2b43c7eadfdb70a8af4c690a7f892ee009b44d50" - integrity sha512-zrr5lFVzq5CerbsrCO/71cj3JV9Lq7nqs02lwmzZJboELz8CTdmC23Tk9TKACosOLowgZxJqsa5qMJBSC5X+kg== +"@budibase/pro@2.1.40-alpha.1": + version "2.1.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.1.tgz#a5cd55772be5f2b9d30b9cbed6cb01b69b64870f" + integrity sha512-e3Rkk+qvMwPDhw2HqDOe9NvRN91C/lTA9pwwgP25aNzMGLjIlIt9gbpEOj9LkWCVhLypmyPxlbHA9DtJinBpzg== dependencies: - "@budibase/backend-core" "2.1.40-alpha.0" - "@budibase/types" "2.1.40-alpha.0" + "@budibase/backend-core" "2.1.40-alpha.1" + "@budibase/types" "2.1.40-alpha.1" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.40-alpha.0": - version "2.1.40-alpha.0" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.0.tgz#d7168082f052e57a50aa8ef1b1dbef98b58e0fc9" - integrity sha512-FGsDvSCYRPuPOtbcwsIuah//ZHml5Oi86Dvb+G7Hdgt7CszkBJCwMCJPIM+FZ5wOYnZj0LV/sOJbOt0vpFXiPg== +"@budibase/types@2.1.40-alpha.1": + version "2.1.40-alpha.1" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.1.tgz#b94b19dad8bc652d6ca7020173468e758db77737" + integrity sha512-k6oOeyitqW61mRHmxXZLRxeK/F7To+pWoOnSdwJxYedD5SWPdnMdR01KZFj2ahnKU+VBWNf67NppWLDfDeKM9g== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 85c4095656d73e63ffaf08c1f51f5be9157a591d Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 29 Nov 2022 15:13:58 +0000 Subject: [PATCH 109/179] Fix unit tests --- .../src/api/controllers/global/users.ts | 9 ++++-- .../worker/src/tests/TestConfiguration.ts | 29 ++++++++++++++----- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index d76c1741a3..df1797132e 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -23,9 +23,12 @@ const MAX_USERS_UPLOAD_LIMIT = 1000 export const save = async (ctx: any) => { try { - if (!ctx.request.body._id && !ctx.internal && - (!ctx.user || !ctx.user.admin || !ctx.user.admin.global)) { - ctx.throw(403, "Only admin user can create new user.") + if ( + !ctx.request.body._id && + !ctx.internal && + (!ctx.user || !ctx.user.admin || !ctx.user.admin.global) + ) { + ctx.throw(403, "Only admin user can create new user.") } ctx.body = await sdk.users.save(ctx.request.body) } catch (err: any) { diff --git a/packages/worker/src/tests/TestConfiguration.ts b/packages/worker/src/tests/TestConfiguration.ts index 746e1ccf1b..b6da8693da 100644 --- a/packages/worker/src/tests/TestConfiguration.ts +++ b/packages/worker/src/tests/TestConfiguration.ts @@ -72,12 +72,24 @@ class TestConfiguration { // UTILS - async _req(config: any, params: any, controlFunc: any) { + async _req(config: any, params: any, controlFunc: any, opts: { force?: boolean } = {}) { const request: any = {} // fake cookies, we don't need them request.cookies = { set: () => {}, get: () => {} } request.config = { jwtSecret: env.JWT_SECRET } - request.user = { tenantId: this.getTenantId() } + if (opts.force) { + request.user = { + tenantId: this.getTenantId(), + admin: { global: true }, + builder: { global: true }, + } + } else if (this.defaultUser) { + request.user = this.defaultUser + } else { + request.user = { + tenantId: this.getTenantId() + } + } request.query = {} request.request = { body: config, @@ -129,7 +141,7 @@ class TestConfiguration { email: "test@test.com", password: "test", }) - this.defaultUser = await this.createUser(user) + this.defaultUser = await this.createUser(user, { force: true }) } async createTenant1User() { @@ -137,15 +149,16 @@ class TestConfiguration { email: "tenant1@test.com", password: "test", }) - this.tenant1User = await this.createUser(user) + this.tenant1User = await this.createUser(user, { force: true }) } async createSession(user: User) { - await sessions.createASession(user._id!, { + const session: any = { sessionId: "sessionid", tenantId: user.tenantId, csrfToken: CSRF_TOKEN, - }) + } + await sessions.createASession(user._id!, session) } cookieHeader(cookies: any) { @@ -185,11 +198,11 @@ class TestConfiguration { }) } - async createUser(user?: User) { + async createUser(user?: User, opts: any = {}) { if (!user) { user = structures.users.user() } - const response = await this._req(user, null, controllers.users.save) + const response = await this._req(user, null, controllers.users.save, opts) const body = response as CreateUserResponse return this.getUser(body.email) } From 035a601c28478375d41ae4d5ad132f6520730138 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 29 Nov 2022 15:14:29 +0000 Subject: [PATCH 110/179] lint --- packages/worker/src/tests/TestConfiguration.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/worker/src/tests/TestConfiguration.ts b/packages/worker/src/tests/TestConfiguration.ts index b6da8693da..2875cc00e9 100644 --- a/packages/worker/src/tests/TestConfiguration.ts +++ b/packages/worker/src/tests/TestConfiguration.ts @@ -72,7 +72,12 @@ class TestConfiguration { // UTILS - async _req(config: any, params: any, controlFunc: any, opts: { force?: boolean } = {}) { + async _req( + config: any, + params: any, + controlFunc: any, + opts: { force?: boolean } = {} + ) { const request: any = {} // fake cookies, we don't need them request.cookies = { set: () => {}, get: () => {} } @@ -86,8 +91,8 @@ class TestConfiguration { } else if (this.defaultUser) { request.user = this.defaultUser } else { - request.user = { - tenantId: this.getTenantId() + request.user = { + tenantId: this.getTenantId(), } } request.query = {} @@ -153,7 +158,7 @@ class TestConfiguration { } async createSession(user: User) { - const session: any = { + const session: any = { sessionId: "sessionid", tenantId: user.tenantId, csrfToken: CSRF_TOKEN, From 903d259fc4b06bb826e30cf9e51073d6d82899aa Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Tue, 29 Nov 2022 15:23:01 +0000 Subject: [PATCH 111/179] Removing old JS file. --- .../server/src/utilities/fileSystem/index.js | 333 ------------------ 1 file changed, 333 deletions(-) delete mode 100644 packages/server/src/utilities/fileSystem/index.js diff --git a/packages/server/src/utilities/fileSystem/index.js b/packages/server/src/utilities/fileSystem/index.js deleted file mode 100644 index 8e93d33ed9..0000000000 --- a/packages/server/src/utilities/fileSystem/index.js +++ /dev/null @@ -1,333 +0,0 @@ -const { budibaseTempDir } = require("../budibaseDir") -const fs = require("fs") -const { join } = require("path") -const uuid = require("uuid/v4") -const { - doWithDB, - dangerousGetDB, - closeDB, -} = require("@budibase/backend-core/db") -const { ObjectStoreBuckets } = require("../../constants") -const { - upload, - retrieve, - retrieveToTmp, - streamUpload, - deleteFolder, - downloadTarball, -} = require("./utilities") -const { updateClientLibrary } = require("./clientLibrary") -const env = require("../../environment") -const { - USER_METDATA_PREFIX, - LINK_USER_METADATA_PREFIX, - TABLE_ROW_PREFIX, -} = require("../../db/utils") -const MemoryStream = require("memorystream") -const { getAppId } = require("@budibase/backend-core/context") - -const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..") -const NODE_MODULES_PATH = join(TOP_LEVEL_PATH, "node_modules") - -/** - * The single stack system (Cloud and Builder) should not make use of the file system where possible, - * this file handles all of the file access for the system with the intention of limiting it all to one - * place. Keeping all of this logic in one place means that when we need to do file system access (like - * downloading a package or opening a temporary file) in can be done in way that we can confirm it shouldn't - * be done through an object store instead. - */ - -/** - * Upon first startup of instance there may not be everything we need in tmp directory, set it up. - */ -exports.init = () => { - const tempDir = budibaseTempDir() - if (!fs.existsSync(tempDir)) { - fs.mkdirSync(tempDir) - } - const clientLibPath = join(budibaseTempDir(), "budibase-client.js") - if (env.isTest() && !fs.existsSync(clientLibPath)) { - fs.copyFileSync(require.resolve("@budibase/client"), clientLibPath) - } -} - -/** - * Checks if the system is currently in development mode and if it is makes sure - * everything required to function is ready. - */ -exports.checkDevelopmentEnvironment = () => { - if (!env.isDev() || env.isTest()) { - return - } - if (!fs.existsSync(budibaseTempDir())) { - fs.mkdirSync(budibaseTempDir()) - } - let error - if (!fs.existsSync(join(process.cwd(), ".env"))) { - error = "Must run via yarn once to generate environment." - } - if (error) { - console.error(error) - process.exit(-1) - } -} - -/** - * This function manages temporary template files which are stored by Koa. - * @param {Object} template The template object retrieved from the Koa context object. - * @returns {Object} Returns an fs read stream which can be loaded into the database. - */ -exports.getTemplateStream = async template => { - if (template.file) { - return fs.createReadStream(template.file.path) - } else { - const [type, name] = template.key.split("/") - const tmpPath = await exports.downloadTemplate(type, name) - return fs.createReadStream(join(tmpPath, name, "db", "dump.txt")) - } -} - -/** - * Used to retrieve a handlebars file from the system which will be used as a template. - * This is allowable as the template handlebars files should be static and identical across - * the cluster. - * @param {string} path The path to the handlebars file which is to be loaded. - * @returns {string} The loaded handlebars file as a string - loaded as utf8. - */ -exports.loadHandlebarsFile = path => { - return fs.readFileSync(path, "utf8") -} - -/** - * When return a file from the API need to write the file to the system temporarily so we - * can create a read stream to send. - * @param {string} contents the contents of the file which is to be returned from the API. - * @return {Object} the read stream which can be put into the koa context body. - */ -exports.apiFileReturn = contents => { - const path = join(budibaseTempDir(), uuid()) - fs.writeFileSync(path, "\ufeff" + contents) - const readerStream = fs.createReadStream(path) - readerStream.setEncoding("binary") - return readerStream -} - -exports.defineFilter = excludeRows => { - const ids = [USER_METDATA_PREFIX, LINK_USER_METADATA_PREFIX] - if (excludeRows) { - ids.push(TABLE_ROW_PREFIX) - } - return doc => - !ids.map(key => doc._id.includes(key)).reduce((prev, curr) => prev || curr) -} - -/** - * Local utility to back up the database state for an app, excluding global user - * data or user relationships. - * @param {string} appId The app to backup - * @param {object} config Config to send to export DB - * @param {boolean} includeRows Flag to state whether the export should include data. - * @returns {*} either a string or a stream of the backup - */ -const backupAppData = async (appId, config, includeRows) => { - return await exports.exportDB(appId, { - ...config, - filter: exports.defineFilter(includeRows), - }) -} - -/** - * Takes a copy of the database state for an app to the object store. - * @param {string} appId The ID of the app which is to be backed up. - * @param {string} backupName The name of the backup located in the object store. - * @return {*} a readable stream to the completed backup file - */ -exports.performBackup = async (appId, backupName) => { - return await backupAppData(appId, { exportName: backupName }) -} - -/** - * Streams a backup of the database state for an app - * @param {string} appId The ID of the app which is to be backed up. - * @param {boolean} includeRows Flag to state whether the export should include data. - * @returns {*} a readable stream of the backup which is written in real time - */ -exports.streamBackup = async (appId, includeRows) => { - return await backupAppData(appId, { stream: true }, includeRows) -} - -/** - * Exports a DB to either file or a variable (memory). - * @param {string} dbName the DB which is to be exported. - * @param {string} exportName optional - provide a filename to write the backup to a file - * @param {boolean} stream optional - whether to perform a full backup - * @param {function} filter optional - a filter function to clear out any un-wanted docs. - * @return {*} either a readable stream or a string - */ -exports.exportDB = async (dbName, { stream, filter, exportName } = {}) => { - // streaming a DB dump is a bit more complicated, can't close DB - if (stream) { - const db = dangerousGetDB(dbName) - const memStream = new MemoryStream() - memStream.on("end", async () => { - await closeDB(db) - }) - db.dump(memStream, { filter }) - return memStream - } - - return doWithDB(dbName, async db => { - // Write the dump to file if required - if (exportName) { - const path = join(budibaseTempDir(), exportName) - const writeStream = fs.createWriteStream(path) - await db.dump(writeStream, { filter }) - - // Upload the dump to the object store if self hosted - if (env.SELF_HOSTED) { - await streamUpload( - ObjectStoreBuckets.BACKUPS, - join(dbName, exportName), - fs.createReadStream(path) - ) - } - - return fs.createReadStream(path) - } - - // Stringify the dump in memory if required - const memStream = new MemoryStream() - let appString = "" - memStream.on("data", chunk => { - appString += chunk.toString() - }) - await db.dump(memStream, { filter }) - return appString - }) -} - -/** - * Writes the provided contents to a temporary file, which can be used briefly. - * @param {string} fileContents contents which will be written to a temp file. - * @return {string} the path to the temp file. - */ -exports.storeTempFile = fileContents => { - const path = join(budibaseTempDir(), uuid()) - fs.writeFileSync(path, fileContents) - return path -} - -/** - * Utility function for getting a file read stream - a simple in memory buffered read - * stream doesn't work for pouchdb. - */ -exports.stringToFileStream = contents => { - const path = exports.storeTempFile(contents) - return fs.createReadStream(path) -} - -/** - * Creates a temp file and returns it from the API. - * @param {string} fileContents the contents to be returned in file. - */ -exports.sendTempFile = fileContents => { - const path = exports.storeTempFile(fileContents) - return fs.createReadStream(path) -} - -/** - * Uploads the latest client library to the object store. - * @param {string} appId The ID of the app which is being created. - * @return {Promise} once promise completes app resources should be ready in object store. - */ -exports.createApp = async appId => { - await updateClientLibrary(appId) -} - -/** - * Removes all of the assets created for an app in the object store. - * @param {string} appId The ID of the app which is being deleted. - * @return {Promise} once promise completes the app resources will be removed from object store. - */ -exports.deleteApp = async appId => { - await deleteFolder(ObjectStoreBuckets.APPS, `${appId}/`) -} - -/** - * Retrieves a template and pipes it to minio as well as making it available temporarily. - * @param {string} type The type of template which is to be retrieved. - * @param name - * @return {Promise<*>} - */ -exports.downloadTemplate = async (type, name) => { - const DEFAULT_TEMPLATES_BUCKET = - "prod-budi-templates.s3-eu-west-1.amazonaws.com" - const templateUrl = `https://${DEFAULT_TEMPLATES_BUCKET}/templates/${type}/${name}.tar.gz` - return downloadTarball(templateUrl, ObjectStoreBuckets.TEMPLATES, type) -} - -/** - * Retrieves component libraries from object store (or tmp symlink if in local) - */ -exports.getComponentLibraryManifest = async library => { - const appId = getAppId() - const filename = "manifest.json" - /* istanbul ignore next */ - // when testing in cypress and so on we need to get the package - // as the environment may not be fully fleshed out for dev or prod - if (env.isTest()) { - library = library.replace("standard-components", "client") - const lib = library.split("/")[1] - const path = require.resolve(library).split(lib)[0] - return require(join(path, lib, filename)) - } else if (env.isDev()) { - const path = join(NODE_MODULES_PATH, "@budibase", "client", filename) - // always load from new so that updates are refreshed - delete require.cache[require.resolve(path)] - return require(path) - } - - let resp - try { - // Try to load the manifest from the new file location - const path = join(appId, filename) - resp = await retrieve(ObjectStoreBuckets.APPS, path) - } catch (error) { - // Fallback to loading it from the old location for old apps - const path = join(appId, "node_modules", library, "package", filename) - resp = await retrieve(ObjectStoreBuckets.APPS, path) - } - if (typeof resp !== "string") { - resp = resp.toString("utf8") - } - return JSON.parse(resp) -} - -/** - * All file reads come through here just to make sure all of them make sense - * allows a centralised location to check logic is all good. - */ -exports.readFileSync = (filepath, options = "utf8") => { - return fs.readFileSync(filepath, options) -} - -/** - * Given a set of app IDs makes sure file system is cleared of any of their temp info. - */ -exports.cleanup = appIds => { - for (let appId of appIds) { - const path = join(budibaseTempDir(), appId) - if (fs.existsSync(path)) { - fs.rmdirSync(path, { recursive: true }) - } - } -} - -/** - * Full function definition for below can be found in the utilities. - */ -exports.upload = upload -exports.retrieve = retrieve -exports.retrieveToTmp = retrieveToTmp -exports.TOP_LEVEL_PATH = TOP_LEVEL_PATH -exports.NODE_MODULES_PATH = NODE_MODULES_PATH From 791d74dd94eec2d9f438996f4b040978ebe46c5e Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Tue, 29 Nov 2022 15:38:25 +0000 Subject: [PATCH 112/179] Fixing sentry init. --- packages/worker/src/index.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts index b513b11279..50fb2fcb8d 100644 --- a/packages/worker/src/index.ts +++ b/packages/worker/src/index.ts @@ -21,7 +21,7 @@ import koaBody from "koa-body" import http from "http" import api from "./api" import * as redis from "./utilities/redis" -import Sentry from "@sentry/node" +const Sentry = require("@sentry/node") const koaSession = require("koa-session") const logger = require("koa-pino-logger") const destroyable = require("server-destroy") @@ -46,18 +46,18 @@ app.use(auth.passport.session()) app.use(api.routes()) // sentry -if (env.isProd()) { - Sentry.init() +//if (env.isProd()) { +Sentry.init() - app.on("error", (err, ctx) => { - Sentry.withScope(function (scope: Scope) { - scope.addEventProcessor(function (event: Event) { - return Sentry.Handlers.parseRequest(event, ctx.request) - }) - Sentry.captureException(err) +app.on("error", (err, ctx) => { + Sentry.withScope(function (scope: Scope) { + scope.addEventProcessor(function (event: Event) { + return Sentry.Handlers.parseRequest(event, ctx.request) }) + Sentry.captureException(err) }) -} +}) +//} const server = http.createServer(app.callback()) destroyable(server) From 8e4cb2f079009d95918f8d18db3458fb5efbe768 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Tue, 29 Nov 2022 15:43:44 +0000 Subject: [PATCH 113/179] Adding back prod check. --- packages/worker/src/index.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts index 50fb2fcb8d..34e6937f3a 100644 --- a/packages/worker/src/index.ts +++ b/packages/worker/src/index.ts @@ -46,18 +46,18 @@ app.use(auth.passport.session()) app.use(api.routes()) // sentry -//if (env.isProd()) { -Sentry.init() +if (env.isProd()) { + Sentry.init() -app.on("error", (err, ctx) => { - Sentry.withScope(function (scope: Scope) { - scope.addEventProcessor(function (event: Event) { - return Sentry.Handlers.parseRequest(event, ctx.request) + app.on("error", (err, ctx) => { + Sentry.withScope(function (scope: Scope) { + scope.addEventProcessor(function (event: Event) { + return Sentry.Handlers.parseRequest(event, ctx.request) + }) + Sentry.captureException(err) }) - Sentry.captureException(err) }) -}) -//} +} const server = http.createServer(app.callback()) destroyable(server) From de0b16397150fc37145f9dd43261a52f3832bea2 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Tue, 29 Nov 2022 16:03:22 +0000 Subject: [PATCH 114/179] Adding test case for char encoding and being explicit about utf8 export. --- packages/server/src/api/routes/tests/view.spec.js | 6 +++--- packages/server/src/utilities/fileSystem/index.ts | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/server/src/api/routes/tests/view.spec.js b/packages/server/src/api/routes/tests/view.spec.js index 2ea90ce32d..bd5177b905 100644 --- a/packages/server/src/api/routes/tests/view.spec.js +++ b/packages/server/src/api/routes/tests/view.spec.js @@ -347,7 +347,7 @@ describe("/views", () => { const setupExport = async () => { const table = await config.createTable() - await config.createRow({ name: "test-name", description: "test-desc" }) + await config.createRow({ name: "test-name", description: "ùúûü" }) return table } @@ -362,11 +362,11 @@ describe("/views", () => { const rows = JSON.parse(res.text) expect(rows.length).toBe(1) expect(rows[0].name).toBe("test-name") - expect(rows[0].description).toBe("test-desc") + expect(rows[0].description).toBe("ùúûü") } const assertCSVExport = (res) => { - expect(res.text).toBe("\"name\",\"description\"\n\"test-name\",\"test-desc\"") + expect(res.text).toBe(`"name","description"\n"test-name","ùúûü"`) } it("should be able to export a table as JSON", async () => { diff --git a/packages/server/src/utilities/fileSystem/index.ts b/packages/server/src/utilities/fileSystem/index.ts index a888c72b57..58a687c31b 100644 --- a/packages/server/src/utilities/fileSystem/index.ts +++ b/packages/server/src/utilities/fileSystem/index.ts @@ -80,14 +80,16 @@ export function loadHandlebarsFile(path: string) { * When return a file from the API need to write the file to the system temporarily so we * can create a read stream to send. * @param {string} contents the contents of the file which is to be returned from the API. + * @param {string} encoding the encoding of the file to return (utf8 default) * @return {Object} the read stream which can be put into the koa context body. */ -export function apiFileReturn(contents: string) { +export function apiFileReturn( + contents: string, + encoding: BufferEncoding = "utf8" +) { const path = join(budibaseTempDir(), uuid()) - fs.writeFileSync(path, "\ufeff" + contents) - const readerStream = fs.createReadStream(path) - readerStream.setEncoding("binary") - return readerStream + fs.writeFileSync(path, contents, { encoding }) + return fs.createReadStream(path, { encoding }) } export function streamFile(path: string) { From 2de437aaa710d7a13e8491a28fef83e5d862bd8c Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 29 Nov 2022 16:08:31 +0000 Subject: [PATCH 115/179] Fix to ensure only the budibase datasource type is altered on save --- packages/server/src/api/controllers/datasource.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index cb1eb9ccaf..d47629ed3e 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -153,7 +153,9 @@ export async function update(ctx: BBContext) { const auth = datasource.config.auth await invalidateVariables(datasource, ctx.request.body) - const dataSourceBody = !datasource.plus + const isBudibaseSource = datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE + + const dataSourceBody = isBudibaseSource ? { name: ctx.request.body?.name } : ctx.request.body @@ -168,7 +170,7 @@ export async function update(ctx: BBContext) { datasource._rev = response.rev // Drain connection pools when configuration is changed - if (datasource.source && datasource.plus) { + if (datasource.source && !isBudibaseSource) { const source = await getIntegration(datasource.source) if (source && source.pool) { await source.pool.end() From 7db3f4ca94b3d2db409ae4f93fbf1991560e5f37 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 29 Nov 2022 16:11:53 +0000 Subject: [PATCH 116/179] Added unit tests --- .../src/api/routes/global/tests/users.spec.ts | 16 ++++++++++++++++ packages/worker/src/tests/api/users.ts | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/worker/src/api/routes/global/tests/users.spec.ts b/packages/worker/src/api/routes/global/tests/users.spec.ts index 218bc60800..8984105c88 100644 --- a/packages/worker/src/api/routes/global/tests/users.spec.ts +++ b/packages/worker/src/api/routes/global/tests/users.spec.ts @@ -262,6 +262,14 @@ describe("/api/global/users", () => { expect(events.user.created).toBeCalledTimes(1) }) + + it("should not allow a non-admin user to create a new user", async () => { + const nonAdmin = await config.createUser(structures.users.builderUser()) + await config.createSession(nonAdmin) + + const newUser = structures.users.user() + await api.users.saveUser(newUser, 403, config.authHeaders(nonAdmin)) + }) }) describe("update", () => { @@ -418,6 +426,14 @@ describe("/api/global/users", () => { expect(user).toStrictEqual(dbUser) expect(response.body.message).toBe("Email address cannot be changed") }) + + it("should allow a non-admin user to update an existing user", async () => { + const existingUser = await config.createUser(structures.users.user()) + const nonAdmin = await config.createUser(structures.users.builderUser()) + await config.createSession(nonAdmin) + + await api.users.saveUser(existingUser, 200, config.authHeaders(nonAdmin)) + }) }) describe("bulk (delete)", () => { diff --git a/packages/worker/src/tests/api/users.ts b/packages/worker/src/tests/api/users.ts index 3677bfffc6..a2f26052bc 100644 --- a/packages/worker/src/tests/api/users.ts +++ b/packages/worker/src/tests/api/users.ts @@ -91,11 +91,11 @@ export class UserAPI { // USER - saveUser = (user: User, status?: number) => { + saveUser = (user: User, status?: number, headers?: any) => { return this.request .post(`/api/global/users`) .send(user) - .set(this.config.defaultHeaders()) + .set(headers ?? this.config.defaultHeaders()) .expect("Content-Type", /json/) .expect(status ? status : 200) } From 1fbbcab3e39fa2922471e6abc837cf7b19ff8ff2 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 29 Nov 2022 16:16:09 +0000 Subject: [PATCH 117/179] v2.1.40-alpha.2 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 37577f16f1..314d83aba0 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index c9e7c7e7c5..374ecffbe3 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.1.40-alpha.1", + "@budibase/types": "2.1.40-alpha.2", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 9c078d431c..7241c240e9 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "2.1.40-alpha.1", + "@budibase/string-templates": "2.1.40-alpha.2", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 5b17b7724c..5a7f87aa51 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.1.40-alpha.1", - "@budibase/client": "2.1.40-alpha.1", - "@budibase/frontend-core": "2.1.40-alpha.1", - "@budibase/string-templates": "2.1.40-alpha.1", + "@budibase/bbui": "2.1.40-alpha.2", + "@budibase/client": "2.1.40-alpha.2", + "@budibase/frontend-core": "2.1.40-alpha.2", + "@budibase/string-templates": "2.1.40-alpha.2", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 5f399b21d3..e1660a016f 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.1.40-alpha.1", - "@budibase/string-templates": "2.1.40-alpha.1", - "@budibase/types": "2.1.40-alpha.1", + "@budibase/backend-core": "2.1.40-alpha.2", + "@budibase/string-templates": "2.1.40-alpha.2", + "@budibase/types": "2.1.40-alpha.2", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 7e55f462a4..21f81b9d65 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.1.40-alpha.1", - "@budibase/frontend-core": "2.1.40-alpha.1", - "@budibase/string-templates": "2.1.40-alpha.1", + "@budibase/bbui": "2.1.40-alpha.2", + "@budibase/frontend-core": "2.1.40-alpha.2", + "@budibase/string-templates": "2.1.40-alpha.2", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 00449faa13..50df7eb569 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.1.40-alpha.1", + "@budibase/bbui": "2.1.40-alpha.2", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a4e3c37039..1c8d658b33 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a57ee6c084..8e0e8b3405 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.1.40-alpha.1", - "@budibase/client": "2.1.40-alpha.1", + "@budibase/backend-core": "2.1.40-alpha.2", + "@budibase/client": "2.1.40-alpha.2", "@budibase/pro": "2.1.40-alpha.1", - "@budibase/string-templates": "2.1.40-alpha.1", - "@budibase/types": "2.1.40-alpha.1", + "@budibase/string-templates": "2.1.40-alpha.2", + "@budibase/types": "2.1.40-alpha.2", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c5e1311466..78702b56a5 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index c88b815382..56437cb0db 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index fc3c09ea08..1285511870 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.40-alpha.1", + "version": "2.1.40-alpha.2", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.1.40-alpha.1", + "@budibase/backend-core": "2.1.40-alpha.2", "@budibase/pro": "2.1.40-alpha.1", - "@budibase/string-templates": "2.1.40-alpha.1", - "@budibase/types": "2.1.40-alpha.1", + "@budibase/string-templates": "2.1.40-alpha.2", + "@budibase/types": "2.1.40-alpha.2", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 90b93a851f8ca6eb67bf1aec44ba3a8737508a30 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 29 Nov 2022 16:20:13 +0000 Subject: [PATCH 118/179] Update pro version to 2.1.40-alpha.2 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 8e0e8b3405..0ce085fe70 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.1.40-alpha.2", "@budibase/client": "2.1.40-alpha.2", - "@budibase/pro": "2.1.40-alpha.1", + "@budibase/pro": "2.1.40-alpha.2", "@budibase/string-templates": "2.1.40-alpha.2", "@budibase/types": "2.1.40-alpha.2", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 7e12dc5619..1352574002 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.40-alpha.1": - version "2.1.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.1.tgz#fd1a002e6a4b42a43c25937abe99afa5d4c68bab" - integrity sha512-XXj3QPqylmKwO27lhfcJ2lhBxjN3Q91bZ0nv/SDVwOMqTT/FzypG00cA/dL3E91BoibwGYd9KYvs6FAEFscG8A== +"@budibase/backend-core@2.1.40-alpha.2": + version "2.1.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.2.tgz#8f761eecc425db1c199825fb178c063b07fad56b" + integrity sha512-SnBGufcwadOVTANVu4Y/IQHGPAr84MRZiHEd0DapK8nAxOWsHhZZrYc/t0ReROMwTfOevRHUXEarMB70t8asdg== dependencies: - "@budibase/types" "2.1.40-alpha.1" + "@budibase/types" "2.1.40-alpha.2" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1360,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.40-alpha.1": - version "2.1.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.1.tgz#a5cd55772be5f2b9d30b9cbed6cb01b69b64870f" - integrity sha512-e3Rkk+qvMwPDhw2HqDOe9NvRN91C/lTA9pwwgP25aNzMGLjIlIt9gbpEOj9LkWCVhLypmyPxlbHA9DtJinBpzg== +"@budibase/pro@2.1.40-alpha.2": + version "2.1.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.2.tgz#eaf5cec93ffb8d499de8e030894b8e9b017303e5" + integrity sha512-Plq3RzWE9hdXPEQgZWF3fNWrf3sTEf06Qh1OgAIH1S/xna9LN3lQaZ79u7UFphYtCb9mv7SPRUSa1hrC4x1jjA== dependencies: - "@budibase/backend-core" "2.1.40-alpha.1" - "@budibase/types" "2.1.40-alpha.1" + "@budibase/backend-core" "2.1.40-alpha.2" + "@budibase/types" "2.1.40-alpha.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.40-alpha.1": - version "2.1.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.1.tgz#b94b19dad8bc652d6ca7020173468e758db77737" - integrity sha512-k6oOeyitqW61mRHmxXZLRxeK/F7To+pWoOnSdwJxYedD5SWPdnMdR01KZFj2ahnKU+VBWNf67NppWLDfDeKM9g== +"@budibase/types@2.1.40-alpha.2": + version "2.1.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.2.tgz#0aef32164ac10202afb3227fdb1ca3a9a021a227" + integrity sha512-AHNwIF3DpIOMagYE77ugpaTVcp0mxoBxoevWhenhhaHhqPTNmHg8Wn5JH0UhawTlYnGM0y/m6gRiixwwIzm5YA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 1285511870..9f145ee33a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.1.40-alpha.2", - "@budibase/pro": "2.1.40-alpha.1", + "@budibase/pro": "2.1.40-alpha.2", "@budibase/string-templates": "2.1.40-alpha.2", "@budibase/types": "2.1.40-alpha.2", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 7ed6841141..d25d49a6a3 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.40-alpha.1": - version "2.1.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.1.tgz#fd1a002e6a4b42a43c25937abe99afa5d4c68bab" - integrity sha512-XXj3QPqylmKwO27lhfcJ2lhBxjN3Q91bZ0nv/SDVwOMqTT/FzypG00cA/dL3E91BoibwGYd9KYvs6FAEFscG8A== +"@budibase/backend-core@2.1.40-alpha.2": + version "2.1.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.2.tgz#8f761eecc425db1c199825fb178c063b07fad56b" + integrity sha512-SnBGufcwadOVTANVu4Y/IQHGPAr84MRZiHEd0DapK8nAxOWsHhZZrYc/t0ReROMwTfOevRHUXEarMB70t8asdg== dependencies: - "@budibase/types" "2.1.40-alpha.1" + "@budibase/types" "2.1.40-alpha.2" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -507,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.40-alpha.1": - version "2.1.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.1.tgz#a5cd55772be5f2b9d30b9cbed6cb01b69b64870f" - integrity sha512-e3Rkk+qvMwPDhw2HqDOe9NvRN91C/lTA9pwwgP25aNzMGLjIlIt9gbpEOj9LkWCVhLypmyPxlbHA9DtJinBpzg== +"@budibase/pro@2.1.40-alpha.2": + version "2.1.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.2.tgz#eaf5cec93ffb8d499de8e030894b8e9b017303e5" + integrity sha512-Plq3RzWE9hdXPEQgZWF3fNWrf3sTEf06Qh1OgAIH1S/xna9LN3lQaZ79u7UFphYtCb9mv7SPRUSa1hrC4x1jjA== dependencies: - "@budibase/backend-core" "2.1.40-alpha.1" - "@budibase/types" "2.1.40-alpha.1" + "@budibase/backend-core" "2.1.40-alpha.2" + "@budibase/types" "2.1.40-alpha.2" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.40-alpha.1": - version "2.1.40-alpha.1" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.1.tgz#b94b19dad8bc652d6ca7020173468e758db77737" - integrity sha512-k6oOeyitqW61mRHmxXZLRxeK/F7To+pWoOnSdwJxYedD5SWPdnMdR01KZFj2ahnKU+VBWNf67NppWLDfDeKM9g== +"@budibase/types@2.1.40-alpha.2": + version "2.1.40-alpha.2" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.2.tgz#0aef32164ac10202afb3227fdb1ca3a9a021a227" + integrity sha512-AHNwIF3DpIOMagYE77ugpaTVcp0mxoBxoevWhenhhaHhqPTNmHg8Wn5JH0UhawTlYnGM0y/m6gRiixwwIzm5YA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From a3cb7e9516f3e643b5de746090bb4143fcabd16f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 29 Nov 2022 16:21:59 +0000 Subject: [PATCH 119/179] Add basic component type --- .../functions/tests/tableSettings.spec.ts | 8 +- packages/types/src/documents/app/component.ts | 9 ++ packages/types/src/documents/app/index.ts | 1 + packages/types/src/documents/app/screen.ts | 7 +- yarn.lock | 92 +++++++++++-------- 5 files changed, 66 insertions(+), 51 deletions(-) create mode 100644 packages/types/src/documents/app/component.ts diff --git a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts index 32cf744987..70701443c5 100644 --- a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts +++ b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts @@ -1,17 +1,13 @@ -import { App, Screen, ScreenProps } from "@budibase/types" +import { App, Screen, ScreenProps, Component } from "@budibase/types" import { db as dbCore } from "@budibase/backend-core" import TestConfig from "../../../tests/utilities/TestConfiguration" import { run as runMigration } from "../tableSettings" -// Local type for allowing any child components inside screens -type MigratingScreenProps = ScreenProps & { _children: any[] } -type MigratingScreen = Screen & { props: MigratingScreenProps } - describe("run", () => { const config = new TestConfig(false) let app: App - let screen: MigratingScreen + let screen: Component beforeAll(async () => { await config.init() diff --git a/packages/types/src/documents/app/component.ts b/packages/types/src/documents/app/component.ts new file mode 100644 index 0000000000..654b2c87cb --- /dev/null +++ b/packages/types/src/documents/app/component.ts @@ -0,0 +1,9 @@ +import { Document } from "../document" + +export interface Component extends Document { + _instanceName: string + _styles: { [key: string]: any } + _component: string + _children?: Component[] + [key: string]: any +} diff --git a/packages/types/src/documents/app/index.ts b/packages/types/src/documents/app/index.ts index 8544617c30..b81c9e36ac 100644 --- a/packages/types/src/documents/app/index.ts +++ b/packages/types/src/documents/app/index.ts @@ -13,3 +13,4 @@ export * from "./user" export * from "./backup" export * from "./webhook" export * from "./links" +export * from "./component" diff --git a/packages/types/src/documents/app/screen.ts b/packages/types/src/documents/app/screen.ts index a3778d140f..5f79620ae4 100644 --- a/packages/types/src/documents/app/screen.ts +++ b/packages/types/src/documents/app/screen.ts @@ -1,10 +1,7 @@ import { Document } from "../document" +import { Component } from "./component" -export interface ScreenProps extends Document { - _instanceName: string - _styles: { [key: string]: any } - _component: string - _children: ScreenProps[] +export interface ScreenProps extends Component { size?: string gap?: string direction?: string diff --git a/yarn.lock b/yarn.lock index 4cfb66951c..60cb598a60 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1011,45 +1011,45 @@ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== -"@typescript-eslint/parser@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.0.tgz#2404c16751a28616ef3abab77c8e51d680a12caa" - integrity sha512-7x4D22oPY8fDaOCvkuXtYYTQ6mTMmkivwEzS+7iml9F9VkHGbbZ3x4fHRwxAb5KeuSkLqfnYjs46tGx2Nour4A== +"@typescript-eslint/parser@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.45.0.tgz#b18a5f6b3cf1c2b3e399e9d2df4be40d6b0ddd0e" + integrity sha512-brvs/WSM4fKUmF5Ot/gEve6qYiCMjm6w4HkHPfS6ZNmxTS0m0iNN4yOChImaCkqc1hRwFGqUyanMXuGal6oyyQ== dependencies: - "@typescript-eslint/scope-manager" "4.28.0" - "@typescript-eslint/types" "4.28.0" - "@typescript-eslint/typescript-estree" "4.28.0" - debug "^4.3.1" + "@typescript-eslint/scope-manager" "5.45.0" + "@typescript-eslint/types" "5.45.0" + "@typescript-eslint/typescript-estree" "5.45.0" + debug "^4.3.4" -"@typescript-eslint/scope-manager@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz#6a3009d2ab64a30fc8a1e257a1a320067f36a0ce" - integrity sha512-eCALCeScs5P/EYjwo6se9bdjtrh8ByWjtHzOkC4Tia6QQWtQr3PHovxh3TdYTuFcurkYI4rmFsRFpucADIkseg== +"@typescript-eslint/scope-manager@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.45.0.tgz#7a4ac1bfa9544bff3f620ab85947945938319a96" + integrity sha512-noDMjr87Arp/PuVrtvN3dXiJstQR1+XlQ4R1EvzG+NMgXi8CuMCXpb8JqNtFHKceVSQ985BZhfRdowJzbv4yKw== dependencies: - "@typescript-eslint/types" "4.28.0" - "@typescript-eslint/visitor-keys" "4.28.0" - -"@typescript-eslint/types@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.0.tgz#a33504e1ce7ac51fc39035f5fe6f15079d4dafb0" - integrity sha512-p16xMNKKoiJCVZY5PW/AfILw2xe1LfruTcfAKBj3a+wgNYP5I9ZEKNDOItoRt53p4EiPV6iRSICy8EPanG9ZVA== + "@typescript-eslint/types" "5.45.0" + "@typescript-eslint/visitor-keys" "5.45.0" "@typescript-eslint/types@4.33.0": version "4.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== -"@typescript-eslint/typescript-estree@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz#e66d4e5aa2ede66fec8af434898fe61af10c71cf" - integrity sha512-m19UQTRtxMzKAm8QxfKpvh6OwQSXaW1CdZPoCaQuLwAq7VZMNuhJmZR4g5281s2ECt658sldnJfdpSZZaxUGMQ== +"@typescript-eslint/types@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.45.0.tgz#794760b9037ee4154c09549ef5a96599621109c5" + integrity sha512-QQij+u/vgskA66azc9dCmx+rev79PzX8uDHpsqSjEFtfF2gBUTRCpvYMh2gw2ghkJabNkPlSUCimsyBEQZd1DA== + +"@typescript-eslint/typescript-estree@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.45.0.tgz#f70a0d646d7f38c0dfd6936a5e171a77f1e5291d" + integrity sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ== dependencies: - "@typescript-eslint/types" "4.28.0" - "@typescript-eslint/visitor-keys" "4.28.0" - debug "^4.3.1" - globby "^11.0.3" - is-glob "^4.0.1" - semver "^7.3.5" + "@typescript-eslint/types" "5.45.0" + "@typescript-eslint/visitor-keys" "5.45.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.3.7" tsutils "^3.21.0" "@typescript-eslint/typescript-estree@^4.33.0": @@ -1065,14 +1065,6 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/visitor-keys@4.28.0": - version "4.28.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz#255c67c966ec294104169a6939d96f91c8a89434" - integrity sha512-PjJyTWwrlrvM5jazxYF5ZPs/nl0kHDZMVbuIcbpawVXaDPelp3+S9zpOz5RmVUfS/fD5l5+ZXNKnWhNYjPzCvw== - dependencies: - "@typescript-eslint/types" "4.28.0" - eslint-visitor-keys "^2.0.0" - "@typescript-eslint/visitor-keys@4.33.0": version "4.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz#2a22f77a41604289b7a186586e9ec48ca92ef1dd" @@ -1081,6 +1073,14 @@ "@typescript-eslint/types" "4.33.0" eslint-visitor-keys "^2.0.0" +"@typescript-eslint/visitor-keys@5.45.0": + version "5.45.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.45.0.tgz#e0d160e9e7fdb7f8da697a5b78e7a14a22a70528" + integrity sha512-jc6Eccbn2RtQPr1s7th6jJWQHBHI6GBVQkCHoJFQ5UreaKm59Vxw+ynQUPPY2u2Amquc+7tmEoC2G52ApsGNNg== + dependencies: + "@typescript-eslint/types" "5.45.0" + eslint-visitor-keys "^3.3.0" + JSONStream@^1.0.4, JSONStream@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" @@ -2015,7 +2015,7 @@ debug@^3.1.0: dependencies: ms "^2.1.1" -debug@^4.0.0, debug@^4.3.1, debug@^4.3.3: +debug@^4.0.0, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -2446,6 +2446,11 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== +eslint-visitor-keys@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" + integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== + eslint@^7.28.0: version "7.32.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" @@ -3081,7 +3086,7 @@ globals@^13.6.0, globals@^13.9.0: dependencies: type-fest "^0.20.2" -globby@^11.0.3: +globby@^11.0.3, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -3606,7 +3611,7 @@ is-glob@^3.1.0: dependencies: is-extglob "^2.1.0" -is-glob@^4.0.0, is-glob@^4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== @@ -5843,6 +5848,13 @@ semver@^7.3.4: dependencies: lru-cache "^6.0.0" +semver@^7.3.7: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + dependencies: + lru-cache "^6.0.0" + semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" From bc33af13f91bfd1bb5a1a5fa793084bd92c8ce19 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 29 Nov 2022 16:27:06 +0000 Subject: [PATCH 120/179] Fix types in table migration tests --- .../functions/tests/tableSettings.spec.ts | 94 +++++++++++-------- 1 file changed, 55 insertions(+), 39 deletions(-) diff --git a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts index 70701443c5..8d28a43322 100644 --- a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts +++ b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts @@ -1,4 +1,4 @@ -import { App, Screen, ScreenProps, Component } from "@budibase/types" +import { App, Screen } from "@budibase/types" import { db as dbCore } from "@budibase/backend-core" import TestConfig from "../../../tests/utilities/TestConfiguration" @@ -7,7 +7,7 @@ import { run as runMigration } from "../tableSettings" describe("run", () => { const config = new TestConfig(false) let app: App - let screen: Component + let screen: Screen beforeAll(async () => { await config.init() @@ -19,14 +19,18 @@ describe("run", () => { it("migrates table block row on click settings", async () => { // Add legacy table block as first child - screen.props._children[0] = { - _component: "@budibase/standard-components/tableblock", - _id: "foo", - linkRows: true, - linkURL: "/rows/:id", - linkPeek: true, - linkColumn: "name", - } + screen.props._children = [ + { + _instanceName: "Table Block", + _styles: {}, + _component: "@budibase/standard-components/tableblock", + _id: "foo", + linkRows: true, + linkURL: "/rows/:id", + linkPeek: true, + linkColumn: "name", + }, + ] await config.createScreen(screen) // Run migration @@ -36,7 +40,7 @@ describe("run", () => { }) // Verify new "onClick" setting - const onClick = screen.props._children[0].onClick + const onClick = screen.props._children?.[0].onClick expect(onClick).toBeDefined() expect(onClick.length).toBe(1) expect(onClick[0]["##eventHandlerType"]).toBe("Navigate To") @@ -48,14 +52,18 @@ describe("run", () => { it("migrates table row on click settings", async () => { // Add legacy table block as first child - screen.props._children[0] = { - _component: "@budibase/standard-components/table", - _id: "foo", - linkRows: true, - linkURL: "/rows/:id", - linkPeek: true, - linkColumn: "name", - } + screen.props._children = [ + { + _instanceName: "Table", + _styles: {}, + _component: "@budibase/standard-components/table", + _id: "foo", + linkRows: true, + linkURL: "/rows/:id", + linkPeek: true, + linkColumn: "name", + }, + ] await config.createScreen(screen) // Run migration @@ -65,7 +73,7 @@ describe("run", () => { }) // Verify new "onClick" setting - const onClick = screen.props._children[0].onClick + const onClick = screen.props._children?.[0].onClick expect(onClick).toBeDefined() expect(onClick.length).toBe(1) expect(onClick[0]["##eventHandlerType"]).toBe("Navigate To") @@ -77,13 +85,17 @@ describe("run", () => { it("migrates table block title button settings", async () => { // Add legacy table block as first child - screen.props._children[0] = { - _component: "@budibase/standard-components/tableblock", - _id: "foo", - showTitleButton: true, - titleButtonURL: "/url", - titleButtonPeek: true, - } + screen.props._children = [ + { + _instanceName: "Table Block", + _styles: {}, + _component: "@budibase/standard-components/tableblock", + _id: "foo", + showTitleButton: true, + titleButtonURL: "/url", + titleButtonPeek: true, + }, + ] await config.createScreen(screen) // Run migration @@ -93,7 +105,7 @@ describe("run", () => { }) // Verify new "onClickTitleButton" setting - const onClick = screen.props._children[0].onClickTitleButton + const onClick = screen.props._children?.[0].onClickTitleButton expect(onClick).toBeDefined() expect(onClick.length).toBe(1) expect(onClick[0]["##eventHandlerType"]).toBe("Navigate To") @@ -103,16 +115,20 @@ describe("run", () => { it("ignores components that have already been migrated", async () => { // Add legacy table block as first child - screen.props._children[0] = { - _component: "@budibase/standard-components/tableblock", - _id: "foo", - linkRows: true, - linkURL: "/rows/:id", - linkPeek: true, - linkColumn: "name", - onClick: "foo", - } - const initialDefinition = JSON.stringify(screen.props._children[0]) + screen.props._children = [ + { + _instanceName: "Table Block", + _styles: {}, + _component: "@budibase/standard-components/tableblock", + _id: "foo", + linkRows: true, + linkURL: "/rows/:id", + linkPeek: true, + linkColumn: "name", + onClick: "foo", + }, + ] + const initialDefinition = JSON.stringify(screen.props._children?.[0]) await config.createScreen(screen) // Run migration @@ -122,7 +138,7 @@ describe("run", () => { }) // Verify new "onClick" setting - const newDefinition = JSON.stringify(screen.props._children[0]) + const newDefinition = JSON.stringify(screen.props._children?.[0]) expect(initialDefinition).toEqual(newDefinition) }) }) From 08104c918b1c86381d6cca2e99ef3120059bbe48 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 29 Nov 2022 16:38:44 +0000 Subject: [PATCH 121/179] refactor --- packages/worker/src/api/controllers/global/users.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index df1797132e..9d7349851b 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -23,11 +23,10 @@ const MAX_USERS_UPLOAD_LIMIT = 1000 export const save = async (ctx: any) => { try { - if ( - !ctx.request.body._id && - !ctx.internal && - (!ctx.user || !ctx.user.admin || !ctx.user.admin.global) - ) { + const body = ctx.request.body + const isCreate = !body._id + const isAdmin = !!ctx.user.admin?.global + if (isCreate && !isAdmin) { ctx.throw(403, "Only admin user can create new user.") } ctx.body = await sdk.users.save(ctx.request.body) From f1ba4d6d13547c88a2662269d070cfc674dd0761 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 29 Nov 2022 17:23:40 +0000 Subject: [PATCH 122/179] v2.1.40-alpha.3 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 314d83aba0..baed35d8ce 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 374ecffbe3..b4dc26999c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.1.40-alpha.2", + "@budibase/types": "2.1.40-alpha.3", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 7241c240e9..fdcaa8e09f 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "2.1.40-alpha.2", + "@budibase/string-templates": "2.1.40-alpha.3", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 5a7f87aa51..3f5702bd4c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.1.40-alpha.2", - "@budibase/client": "2.1.40-alpha.2", - "@budibase/frontend-core": "2.1.40-alpha.2", - "@budibase/string-templates": "2.1.40-alpha.2", + "@budibase/bbui": "2.1.40-alpha.3", + "@budibase/client": "2.1.40-alpha.3", + "@budibase/frontend-core": "2.1.40-alpha.3", + "@budibase/string-templates": "2.1.40-alpha.3", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index e1660a016f..9afe133b02 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.1.40-alpha.2", - "@budibase/string-templates": "2.1.40-alpha.2", - "@budibase/types": "2.1.40-alpha.2", + "@budibase/backend-core": "2.1.40-alpha.3", + "@budibase/string-templates": "2.1.40-alpha.3", + "@budibase/types": "2.1.40-alpha.3", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 21f81b9d65..263b353b81 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.1.40-alpha.2", - "@budibase/frontend-core": "2.1.40-alpha.2", - "@budibase/string-templates": "2.1.40-alpha.2", + "@budibase/bbui": "2.1.40-alpha.3", + "@budibase/frontend-core": "2.1.40-alpha.3", + "@budibase/string-templates": "2.1.40-alpha.3", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 50df7eb569..b0bd19fdd2 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.1.40-alpha.2", + "@budibase/bbui": "2.1.40-alpha.3", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 1c8d658b33..e431ee1505 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 0ce085fe70..0b3399069e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.1.40-alpha.2", - "@budibase/client": "2.1.40-alpha.2", + "@budibase/backend-core": "2.1.40-alpha.3", + "@budibase/client": "2.1.40-alpha.3", "@budibase/pro": "2.1.40-alpha.2", - "@budibase/string-templates": "2.1.40-alpha.2", - "@budibase/types": "2.1.40-alpha.2", + "@budibase/string-templates": "2.1.40-alpha.3", + "@budibase/types": "2.1.40-alpha.3", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 78702b56a5..4c50a08b67 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 56437cb0db..e770942d72 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 9f145ee33a..9470d4a4ca 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.40-alpha.2", + "version": "2.1.40-alpha.3", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.1.40-alpha.2", + "@budibase/backend-core": "2.1.40-alpha.3", "@budibase/pro": "2.1.40-alpha.2", - "@budibase/string-templates": "2.1.40-alpha.2", - "@budibase/types": "2.1.40-alpha.2", + "@budibase/string-templates": "2.1.40-alpha.3", + "@budibase/types": "2.1.40-alpha.3", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d484dc60117f67f627aef0558091679d18e6778f Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 29 Nov 2022 17:23:54 +0000 Subject: [PATCH 123/179] lint --- packages/worker/src/api/controllers/global/users.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index 9d7349851b..0d2e5b3c7f 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -23,7 +23,7 @@ const MAX_USERS_UPLOAD_LIMIT = 1000 export const save = async (ctx: any) => { try { - const body = ctx.request.body + const body = ctx.request.body const isCreate = !body._id const isAdmin = !!ctx.user.admin?.global if (isCreate && !isAdmin) { From 1fd3521fa9812cfa811f58396439dbdc16fffa3d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 29 Nov 2022 17:27:19 +0000 Subject: [PATCH 124/179] Update pro version to 2.1.40-alpha.3 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 0b3399069e..b68af8aeff 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.1.40-alpha.3", "@budibase/client": "2.1.40-alpha.3", - "@budibase/pro": "2.1.40-alpha.2", + "@budibase/pro": "2.1.40-alpha.3", "@budibase/string-templates": "2.1.40-alpha.3", "@budibase/types": "2.1.40-alpha.3", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 1352574002..209625265c 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.40-alpha.2": - version "2.1.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.2.tgz#8f761eecc425db1c199825fb178c063b07fad56b" - integrity sha512-SnBGufcwadOVTANVu4Y/IQHGPAr84MRZiHEd0DapK8nAxOWsHhZZrYc/t0ReROMwTfOevRHUXEarMB70t8asdg== +"@budibase/backend-core@2.1.40-alpha.3": + version "2.1.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.3.tgz#b454a261d502725aa2963a98fe16fb983616b4ce" + integrity sha512-XoevkptJSAt9WAewwWs5isMITJMT9FAg2r6w31T4xh0YdVNQcR2y6ZK88S3lZUMGibPCdqMJuquOQRx/tH1FqQ== dependencies: - "@budibase/types" "2.1.40-alpha.2" + "@budibase/types" "2.1.40-alpha.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1360,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.40-alpha.2": - version "2.1.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.2.tgz#eaf5cec93ffb8d499de8e030894b8e9b017303e5" - integrity sha512-Plq3RzWE9hdXPEQgZWF3fNWrf3sTEf06Qh1OgAIH1S/xna9LN3lQaZ79u7UFphYtCb9mv7SPRUSa1hrC4x1jjA== +"@budibase/pro@2.1.40-alpha.3": + version "2.1.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.3.tgz#8bbf63aedfd35a366b65c23df7f2a96ed89093ae" + integrity sha512-LJKTAsUqWwOeFH9qw1uNSdtStUYIZnHxeJ2uM4mwHHyNaT7ra903w0bpgTtYl18yaeP3Y3io8EV3ylvjbIxwkw== dependencies: - "@budibase/backend-core" "2.1.40-alpha.2" - "@budibase/types" "2.1.40-alpha.2" + "@budibase/backend-core" "2.1.40-alpha.3" + "@budibase/types" "2.1.40-alpha.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.40-alpha.2": - version "2.1.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.2.tgz#0aef32164ac10202afb3227fdb1ca3a9a021a227" - integrity sha512-AHNwIF3DpIOMagYE77ugpaTVcp0mxoBxoevWhenhhaHhqPTNmHg8Wn5JH0UhawTlYnGM0y/m6gRiixwwIzm5YA== +"@budibase/types@2.1.40-alpha.3": + version "2.1.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.3.tgz#8424b699be84e78fe1e7a6dccd3eee882c3abfb2" + integrity sha512-Tr1K59RBVAnAKLvj1bhZ6ffRqc9cCjDrEGycMRYoFLlVhtRsm51NF60NpeyhnZgYX5TNZPreu0gvSt9AmjYz0Q== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 9470d4a4ca..7af82ff9ec 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.1.40-alpha.3", - "@budibase/pro": "2.1.40-alpha.2", + "@budibase/pro": "2.1.40-alpha.3", "@budibase/string-templates": "2.1.40-alpha.3", "@budibase/types": "2.1.40-alpha.3", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d25d49a6a3..249ff1d6e4 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.40-alpha.2": - version "2.1.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.2.tgz#8f761eecc425db1c199825fb178c063b07fad56b" - integrity sha512-SnBGufcwadOVTANVu4Y/IQHGPAr84MRZiHEd0DapK8nAxOWsHhZZrYc/t0ReROMwTfOevRHUXEarMB70t8asdg== +"@budibase/backend-core@2.1.40-alpha.3": + version "2.1.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.3.tgz#b454a261d502725aa2963a98fe16fb983616b4ce" + integrity sha512-XoevkptJSAt9WAewwWs5isMITJMT9FAg2r6w31T4xh0YdVNQcR2y6ZK88S3lZUMGibPCdqMJuquOQRx/tH1FqQ== dependencies: - "@budibase/types" "2.1.40-alpha.2" + "@budibase/types" "2.1.40-alpha.3" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -507,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.40-alpha.2": - version "2.1.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.2.tgz#eaf5cec93ffb8d499de8e030894b8e9b017303e5" - integrity sha512-Plq3RzWE9hdXPEQgZWF3fNWrf3sTEf06Qh1OgAIH1S/xna9LN3lQaZ79u7UFphYtCb9mv7SPRUSa1hrC4x1jjA== +"@budibase/pro@2.1.40-alpha.3": + version "2.1.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.3.tgz#8bbf63aedfd35a366b65c23df7f2a96ed89093ae" + integrity sha512-LJKTAsUqWwOeFH9qw1uNSdtStUYIZnHxeJ2uM4mwHHyNaT7ra903w0bpgTtYl18yaeP3Y3io8EV3ylvjbIxwkw== dependencies: - "@budibase/backend-core" "2.1.40-alpha.2" - "@budibase/types" "2.1.40-alpha.2" + "@budibase/backend-core" "2.1.40-alpha.3" + "@budibase/types" "2.1.40-alpha.3" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.40-alpha.2": - version "2.1.40-alpha.2" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.2.tgz#0aef32164ac10202afb3227fdb1ca3a9a021a227" - integrity sha512-AHNwIF3DpIOMagYE77ugpaTVcp0mxoBxoevWhenhhaHhqPTNmHg8Wn5JH0UhawTlYnGM0y/m6gRiixwwIzm5YA== +"@budibase/types@2.1.40-alpha.3": + version "2.1.40-alpha.3" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.3.tgz#8424b699be84e78fe1e7a6dccd3eee882c3abfb2" + integrity sha512-Tr1K59RBVAnAKLvj1bhZ6ffRqc9cCjDrEGycMRYoFLlVhtRsm51NF60NpeyhnZgYX5TNZPreu0gvSt9AmjYz0Q== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From bd954a087097ffee12b0a03fce5c285739e1d0a9 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 29 Nov 2022 18:28:26 +0000 Subject: [PATCH 125/179] Enable capturing events for certain setting changes, and track usage of side panels inside table blocks --- packages/builder/src/analytics/constants.js | 1 + .../settings/ComponentSettingsSection.svelte | 18 ++++++++++++++---- packages/client/manifest.json | 1 + 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/analytics/constants.js b/packages/builder/src/analytics/constants.js index 424b32c8a4..1bb8517a2b 100644 --- a/packages/builder/src/analytics/constants.js +++ b/packages/builder/src/analytics/constants.js @@ -1,5 +1,6 @@ export const Events = { COMPONENT_CREATED: "component:created", + COMPONENT_UPDATED: "component:updated", APP_VIEW_PUBLISHED: "app:view_published", } diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte index eafedd61b8..bf8bff1292 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsSection.svelte @@ -6,6 +6,7 @@ import ResetFieldsButton from "components/design/settings/controls/ResetFieldsButton.svelte" import EjectBlockButton from "components/design/settings/controls/EjectBlockButton.svelte" import { getComponentForSetting } from "components/design/settings/componentSettings" + import analytics, { Events } from "analytics" export let componentDefinition export let componentInstance @@ -44,9 +45,18 @@ return sections } - const updateSetting = async (key, value) => { + const updateSetting = async (setting, value) => { try { - await store.actions.components.updateSetting(key, value) + await store.actions.components.updateSetting(setting.key, value) + + // Send event if required + if (setting.sendEvents) { + analytics.captureEvent(Events.COMPONENT_UPDATED, { + name: componentInstance._component, + setting: setting.key, + value, + }) + } } catch (error) { notifications.error("Error updating component prop") } @@ -113,7 +123,7 @@ label="Name" key="_instanceName" value={componentInstance._instanceName} - onChange={val => updateSetting("_instanceName", val)} + onChange={val => updateSetting({ key: "_instanceName" }, val)} /> {/if} {#each section.settings as setting (setting.key)} @@ -126,7 +136,7 @@ value={componentInstance[setting.key]} defaultValue={setting.defaultValue} nested={setting.nested} - onChange={val => updateSetting(setting.key, val)} + onChange={val => updateSetting(setting, val)} highlighted={$store.highlightedSettingKey === setting.key} info={setting.info} props={{ diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 4bd7bc2b5d..d7b0184876 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -4546,6 +4546,7 @@ { "type": "radio", "key": "clickBehaviour", + "sendEvents": true, "defaultValue": "actions", "info": "Details side panel is only compatible with internal or SQL tables", "options": [ From 24d5fc4af3cf845cbde458b72f6e90c732dbc03d Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Tue, 29 Nov 2022 22:11:44 +0000 Subject: [PATCH 126/179] Fix default env processing typescript error --- packages/worker/src/environment.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/worker/src/environment.ts b/packages/worker/src/environment.ts index f4c339ad6d..37d40a2a9c 100644 --- a/packages/worker/src/environment.ts +++ b/packages/worker/src/environment.ts @@ -89,7 +89,7 @@ for (let [key, value] of Object.entries(environment)) { // handle the edge case of "0" to disable an environment variable if (value === "0") { // @ts-ignore - env[key] = 0 + environment[key] = 0 } } From 5c318f9d9f9f4b4377c8a6d3345321a50692ac14 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 29 Nov 2022 22:24:37 +0000 Subject: [PATCH 127/179] v2.1.40-alpha.4 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index baed35d8ce..bb8f2b26ba 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b4dc26999c..da716bf753 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.1.40-alpha.3", + "@budibase/types": "2.1.40-alpha.4", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index fdcaa8e09f..448b525326 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "2.1.40-alpha.3", + "@budibase/string-templates": "2.1.40-alpha.4", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3f5702bd4c..5bb7c8b5b7 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.1.40-alpha.3", - "@budibase/client": "2.1.40-alpha.3", - "@budibase/frontend-core": "2.1.40-alpha.3", - "@budibase/string-templates": "2.1.40-alpha.3", + "@budibase/bbui": "2.1.40-alpha.4", + "@budibase/client": "2.1.40-alpha.4", + "@budibase/frontend-core": "2.1.40-alpha.4", + "@budibase/string-templates": "2.1.40-alpha.4", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 9afe133b02..4555416bf6 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.1.40-alpha.3", - "@budibase/string-templates": "2.1.40-alpha.3", - "@budibase/types": "2.1.40-alpha.3", + "@budibase/backend-core": "2.1.40-alpha.4", + "@budibase/string-templates": "2.1.40-alpha.4", + "@budibase/types": "2.1.40-alpha.4", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 263b353b81..d897b55fe7 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.1.40-alpha.3", - "@budibase/frontend-core": "2.1.40-alpha.3", - "@budibase/string-templates": "2.1.40-alpha.3", + "@budibase/bbui": "2.1.40-alpha.4", + "@budibase/frontend-core": "2.1.40-alpha.4", + "@budibase/string-templates": "2.1.40-alpha.4", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index b0bd19fdd2..99e6dc7bc3 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.1.40-alpha.3", + "@budibase/bbui": "2.1.40-alpha.4", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e431ee1505..5d557d3dbd 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index b68af8aeff..cfc5b6f7cc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.1.40-alpha.3", - "@budibase/client": "2.1.40-alpha.3", + "@budibase/backend-core": "2.1.40-alpha.4", + "@budibase/client": "2.1.40-alpha.4", "@budibase/pro": "2.1.40-alpha.3", - "@budibase/string-templates": "2.1.40-alpha.3", - "@budibase/types": "2.1.40-alpha.3", + "@budibase/string-templates": "2.1.40-alpha.4", + "@budibase/types": "2.1.40-alpha.4", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 4c50a08b67..63088298a6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index e770942d72..f842b0d6d5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7af82ff9ec..0653dd6e9d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.40-alpha.3", + "version": "2.1.40-alpha.4", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.1.40-alpha.3", + "@budibase/backend-core": "2.1.40-alpha.4", "@budibase/pro": "2.1.40-alpha.3", - "@budibase/string-templates": "2.1.40-alpha.3", - "@budibase/types": "2.1.40-alpha.3", + "@budibase/string-templates": "2.1.40-alpha.4", + "@budibase/types": "2.1.40-alpha.4", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 88285257553ba301b8f979c2e7f81e144f808754 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 29 Nov 2022 22:27:53 +0000 Subject: [PATCH 128/179] Update pro version to 2.1.40-alpha.4 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index cfc5b6f7cc..4d7ec13d9a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.1.40-alpha.4", "@budibase/client": "2.1.40-alpha.4", - "@budibase/pro": "2.1.40-alpha.3", + "@budibase/pro": "2.1.40-alpha.4", "@budibase/string-templates": "2.1.40-alpha.4", "@budibase/types": "2.1.40-alpha.4", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 209625265c..8aef32a169 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.40-alpha.3": - version "2.1.40-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.3.tgz#b454a261d502725aa2963a98fe16fb983616b4ce" - integrity sha512-XoevkptJSAt9WAewwWs5isMITJMT9FAg2r6w31T4xh0YdVNQcR2y6ZK88S3lZUMGibPCdqMJuquOQRx/tH1FqQ== +"@budibase/backend-core@2.1.40-alpha.4": + version "2.1.40-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.4.tgz#3eec0f7cc66d058e3a6c513c38afb10cb4eb8363" + integrity sha512-rjtAYnyT0hn8EUUv9QntBkgDbG+qpqwe6dnivoZjTwaJ40lSndSGyL/Tgl5ry/C9RBdIdNzTEsWtWywTsfyNhQ== dependencies: - "@budibase/types" "2.1.40-alpha.3" + "@budibase/types" "2.1.40-alpha.4" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1360,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.40-alpha.3": - version "2.1.40-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.3.tgz#8bbf63aedfd35a366b65c23df7f2a96ed89093ae" - integrity sha512-LJKTAsUqWwOeFH9qw1uNSdtStUYIZnHxeJ2uM4mwHHyNaT7ra903w0bpgTtYl18yaeP3Y3io8EV3ylvjbIxwkw== +"@budibase/pro@2.1.40-alpha.4": + version "2.1.40-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.4.tgz#d856e742b0d7b18af8d8dc50008cec269229403f" + integrity sha512-hbcDNVktjXQN8QVnQIugtI4tek33O2tnuxdiLpfqGNoHA6Jfkd0Ofi2JexFkncfSHqHioCiVURIvh/6zCCNy0g== dependencies: - "@budibase/backend-core" "2.1.40-alpha.3" - "@budibase/types" "2.1.40-alpha.3" + "@budibase/backend-core" "2.1.40-alpha.4" + "@budibase/types" "2.1.40-alpha.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.40-alpha.3": - version "2.1.40-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.3.tgz#8424b699be84e78fe1e7a6dccd3eee882c3abfb2" - integrity sha512-Tr1K59RBVAnAKLvj1bhZ6ffRqc9cCjDrEGycMRYoFLlVhtRsm51NF60NpeyhnZgYX5TNZPreu0gvSt9AmjYz0Q== +"@budibase/types@2.1.40-alpha.4": + version "2.1.40-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.4.tgz#dfa732c8a7518a2443b40f3d8f1889cb386fbddf" + integrity sha512-0M24L9Mkgak+XbXJkRvQIiRUuq0qf1g/8XhB3JP6ey9dpbby3aXRODiNhilBiyZkHwxMESMpzkPTV1MbBuTOCw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 0653dd6e9d..4fbdeab568 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.1.40-alpha.4", - "@budibase/pro": "2.1.40-alpha.3", + "@budibase/pro": "2.1.40-alpha.4", "@budibase/string-templates": "2.1.40-alpha.4", "@budibase/types": "2.1.40-alpha.4", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 249ff1d6e4..c1b4fcd16b 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.40-alpha.3": - version "2.1.40-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.3.tgz#b454a261d502725aa2963a98fe16fb983616b4ce" - integrity sha512-XoevkptJSAt9WAewwWs5isMITJMT9FAg2r6w31T4xh0YdVNQcR2y6ZK88S3lZUMGibPCdqMJuquOQRx/tH1FqQ== +"@budibase/backend-core@2.1.40-alpha.4": + version "2.1.40-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.4.tgz#3eec0f7cc66d058e3a6c513c38afb10cb4eb8363" + integrity sha512-rjtAYnyT0hn8EUUv9QntBkgDbG+qpqwe6dnivoZjTwaJ40lSndSGyL/Tgl5ry/C9RBdIdNzTEsWtWywTsfyNhQ== dependencies: - "@budibase/types" "2.1.40-alpha.3" + "@budibase/types" "2.1.40-alpha.4" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -507,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.40-alpha.3": - version "2.1.40-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.3.tgz#8bbf63aedfd35a366b65c23df7f2a96ed89093ae" - integrity sha512-LJKTAsUqWwOeFH9qw1uNSdtStUYIZnHxeJ2uM4mwHHyNaT7ra903w0bpgTtYl18yaeP3Y3io8EV3ylvjbIxwkw== +"@budibase/pro@2.1.40-alpha.4": + version "2.1.40-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.4.tgz#d856e742b0d7b18af8d8dc50008cec269229403f" + integrity sha512-hbcDNVktjXQN8QVnQIugtI4tek33O2tnuxdiLpfqGNoHA6Jfkd0Ofi2JexFkncfSHqHioCiVURIvh/6zCCNy0g== dependencies: - "@budibase/backend-core" "2.1.40-alpha.3" - "@budibase/types" "2.1.40-alpha.3" + "@budibase/backend-core" "2.1.40-alpha.4" + "@budibase/types" "2.1.40-alpha.4" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.40-alpha.3": - version "2.1.40-alpha.3" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.3.tgz#8424b699be84e78fe1e7a6dccd3eee882c3abfb2" - integrity sha512-Tr1K59RBVAnAKLvj1bhZ6ffRqc9cCjDrEGycMRYoFLlVhtRsm51NF60NpeyhnZgYX5TNZPreu0gvSt9AmjYz0Q== +"@budibase/types@2.1.40-alpha.4": + version "2.1.40-alpha.4" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.4.tgz#dfa732c8a7518a2443b40f3d8f1889cb386fbddf" + integrity sha512-0M24L9Mkgak+XbXJkRvQIiRUuq0qf1g/8XhB3JP6ey9dpbby3aXRODiNhilBiyZkHwxMESMpzkPTV1MbBuTOCw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From b9a56cbf4c9044ef49d6cea53e429e74baacda98 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 30 Nov 2022 09:24:52 +0000 Subject: [PATCH 129/179] v2.1.40-alpha.5 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index bb8f2b26ba..cc3d386d7c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index da716bf753..53813059bb 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "2.1.40-alpha.4", + "@budibase/types": "2.1.40-alpha.5", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 448b525326..b473a00094 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "2.1.40-alpha.4", + "@budibase/string-templates": "2.1.40-alpha.5", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 5bb7c8b5b7..3a21e7dc34 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.1.40-alpha.4", - "@budibase/client": "2.1.40-alpha.4", - "@budibase/frontend-core": "2.1.40-alpha.4", - "@budibase/string-templates": "2.1.40-alpha.4", + "@budibase/bbui": "2.1.40-alpha.5", + "@budibase/client": "2.1.40-alpha.5", + "@budibase/frontend-core": "2.1.40-alpha.5", + "@budibase/string-templates": "2.1.40-alpha.5", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 4555416bf6..3a7c83fee1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.1.40-alpha.4", - "@budibase/string-templates": "2.1.40-alpha.4", - "@budibase/types": "2.1.40-alpha.4", + "@budibase/backend-core": "2.1.40-alpha.5", + "@budibase/string-templates": "2.1.40-alpha.5", + "@budibase/types": "2.1.40-alpha.5", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index d897b55fe7..67c01da8ce 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.1.40-alpha.4", - "@budibase/frontend-core": "2.1.40-alpha.4", - "@budibase/string-templates": "2.1.40-alpha.4", + "@budibase/bbui": "2.1.40-alpha.5", + "@budibase/frontend-core": "2.1.40-alpha.5", + "@budibase/string-templates": "2.1.40-alpha.5", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 99e6dc7bc3..14c67102b0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.1.40-alpha.4", + "@budibase/bbui": "2.1.40-alpha.5", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 5d557d3dbd..5542f89e4b 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 4d7ec13d9a..7b8f0f2a93 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.1.40-alpha.4", - "@budibase/client": "2.1.40-alpha.4", + "@budibase/backend-core": "2.1.40-alpha.5", + "@budibase/client": "2.1.40-alpha.5", "@budibase/pro": "2.1.40-alpha.4", - "@budibase/string-templates": "2.1.40-alpha.4", - "@budibase/types": "2.1.40-alpha.4", + "@budibase/string-templates": "2.1.40-alpha.5", + "@budibase/types": "2.1.40-alpha.5", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 63088298a6..67a30c5651 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index f842b0d6d5..7ca67d225a 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4fbdeab568..c784a12f3e 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.40-alpha.4", + "version": "2.1.40-alpha.5", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.1.40-alpha.4", + "@budibase/backend-core": "2.1.40-alpha.5", "@budibase/pro": "2.1.40-alpha.4", - "@budibase/string-templates": "2.1.40-alpha.4", - "@budibase/types": "2.1.40-alpha.4", + "@budibase/string-templates": "2.1.40-alpha.5", + "@budibase/types": "2.1.40-alpha.5", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From d7c6855fa82072a94b37daabe301eccfe11b1a0e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 30 Nov 2022 09:28:50 +0000 Subject: [PATCH 130/179] Update pro version to 2.1.40-alpha.5 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 7b8f0f2a93..ac62e3a0e0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.1.40-alpha.5", "@budibase/client": "2.1.40-alpha.5", - "@budibase/pro": "2.1.40-alpha.4", + "@budibase/pro": "2.1.40-alpha.5", "@budibase/string-templates": "2.1.40-alpha.5", "@budibase/types": "2.1.40-alpha.5", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 8aef32a169..c21a7ef278 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,12 +1273,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.40-alpha.4": - version "2.1.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.4.tgz#3eec0f7cc66d058e3a6c513c38afb10cb4eb8363" - integrity sha512-rjtAYnyT0hn8EUUv9QntBkgDbG+qpqwe6dnivoZjTwaJ40lSndSGyL/Tgl5ry/C9RBdIdNzTEsWtWywTsfyNhQ== +"@budibase/backend-core@2.1.40-alpha.5": + version "2.1.40-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.5.tgz#7f52dfe3c6616c632653801f01cec346356c2bae" + integrity sha512-cmP25VK2QoCldxdmRfxEdPzajhQWJxjaTmweYalyj58ZyJPUN+/lXBGvjJkcpMd+9QQMv1IkO5qUBMkS/lAQlg== dependencies: - "@budibase/types" "2.1.40-alpha.4" + "@budibase/types" "2.1.40-alpha.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1360,13 +1360,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.40-alpha.4": - version "2.1.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.4.tgz#d856e742b0d7b18af8d8dc50008cec269229403f" - integrity sha512-hbcDNVktjXQN8QVnQIugtI4tek33O2tnuxdiLpfqGNoHA6Jfkd0Ofi2JexFkncfSHqHioCiVURIvh/6zCCNy0g== +"@budibase/pro@2.1.40-alpha.5": + version "2.1.40-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.5.tgz#c45894842643718883a6ff1e1cb0cd04dc0e9fbd" + integrity sha512-/kOpcqDm0xSewB4ylvqfjobMdhaVxOxRhC8HZ1s6ZRokW/qs4EhU3VvhkIGSOp276k9rm8Cb0PvsK2B2ATKZKQ== dependencies: - "@budibase/backend-core" "2.1.40-alpha.4" - "@budibase/types" "2.1.40-alpha.4" + "@budibase/backend-core" "2.1.40-alpha.5" + "@budibase/types" "2.1.40-alpha.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1390,10 +1390,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.40-alpha.4": - version "2.1.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.4.tgz#dfa732c8a7518a2443b40f3d8f1889cb386fbddf" - integrity sha512-0M24L9Mkgak+XbXJkRvQIiRUuq0qf1g/8XhB3JP6ey9dpbby3aXRODiNhilBiyZkHwxMESMpzkPTV1MbBuTOCw== +"@budibase/types@2.1.40-alpha.5": + version "2.1.40-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.5.tgz#3e87ff10de0e2ee672b8bf9138f2a894d846abf8" + integrity sha512-Zqi2CvMT5026afrGUBkSXFZKpaEoUAviQLvHq1JSgh0EBzQp6D5o42yKBaHns1PnS6REt4JHex5p6e3wdXjoFw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index c784a12f3e..9844e87c55 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.1.40-alpha.5", - "@budibase/pro": "2.1.40-alpha.4", + "@budibase/pro": "2.1.40-alpha.5", "@budibase/string-templates": "2.1.40-alpha.5", "@budibase/types": "2.1.40-alpha.5", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index c1b4fcd16b..4db599a979 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,12 +470,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.40-alpha.4": - version "2.1.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.4.tgz#3eec0f7cc66d058e3a6c513c38afb10cb4eb8363" - integrity sha512-rjtAYnyT0hn8EUUv9QntBkgDbG+qpqwe6dnivoZjTwaJ40lSndSGyL/Tgl5ry/C9RBdIdNzTEsWtWywTsfyNhQ== +"@budibase/backend-core@2.1.40-alpha.5": + version "2.1.40-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.40-alpha.5.tgz#7f52dfe3c6616c632653801f01cec346356c2bae" + integrity sha512-cmP25VK2QoCldxdmRfxEdPzajhQWJxjaTmweYalyj58ZyJPUN+/lXBGvjJkcpMd+9QQMv1IkO5qUBMkS/lAQlg== dependencies: - "@budibase/types" "2.1.40-alpha.4" + "@budibase/types" "2.1.40-alpha.5" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -507,22 +507,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.40-alpha.4": - version "2.1.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.4.tgz#d856e742b0d7b18af8d8dc50008cec269229403f" - integrity sha512-hbcDNVktjXQN8QVnQIugtI4tek33O2tnuxdiLpfqGNoHA6Jfkd0Ofi2JexFkncfSHqHioCiVURIvh/6zCCNy0g== +"@budibase/pro@2.1.40-alpha.5": + version "2.1.40-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.40-alpha.5.tgz#c45894842643718883a6ff1e1cb0cd04dc0e9fbd" + integrity sha512-/kOpcqDm0xSewB4ylvqfjobMdhaVxOxRhC8HZ1s6ZRokW/qs4EhU3VvhkIGSOp276k9rm8Cb0PvsK2B2ATKZKQ== dependencies: - "@budibase/backend-core" "2.1.40-alpha.4" - "@budibase/types" "2.1.40-alpha.4" + "@budibase/backend-core" "2.1.40-alpha.5" + "@budibase/types" "2.1.40-alpha.5" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.40-alpha.4": - version "2.1.40-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.4.tgz#dfa732c8a7518a2443b40f3d8f1889cb386fbddf" - integrity sha512-0M24L9Mkgak+XbXJkRvQIiRUuq0qf1g/8XhB3JP6ey9dpbby3aXRODiNhilBiyZkHwxMESMpzkPTV1MbBuTOCw== +"@budibase/types@2.1.40-alpha.5": + version "2.1.40-alpha.5" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.40-alpha.5.tgz#3e87ff10de0e2ee672b8bf9138f2a894d846abf8" + integrity sha512-Zqi2CvMT5026afrGUBkSXFZKpaEoUAviQLvHq1JSgh0EBzQp6D5o42yKBaHns1PnS6REt4JHex5p6e3wdXjoFw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From d60a70af82c660cf3201c29e8e0467e6c64011e0 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Wed, 30 Nov 2022 09:29:56 +0000 Subject: [PATCH 131/179] Move custom rbac from controller to routes --- .../src/api/controllers/global/users.ts | 6 ---- .../worker/src/api/routes/global/users.js | 10 +++++- .../worker/src/tests/TestConfiguration.ts | 34 +++++-------------- 3 files changed, 17 insertions(+), 33 deletions(-) diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index 0d2e5b3c7f..ea1df5b45a 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -23,12 +23,6 @@ const MAX_USERS_UPLOAD_LIMIT = 1000 export const save = async (ctx: any) => { try { - const body = ctx.request.body - const isCreate = !body._id - const isAdmin = !!ctx.user.admin?.global - if (isCreate && !isAdmin) { - ctx.throw(403, "Only admin user can create new user.") - } ctx.body = await sdk.users.save(ctx.request.body) } catch (err: any) { ctx.throw(err.status || 400, err) diff --git a/packages/worker/src/api/routes/global/users.js b/packages/worker/src/api/routes/global/users.js index 7740276dee..af1fbb0baf 100644 --- a/packages/worker/src/api/routes/global/users.js +++ b/packages/worker/src/api/routes/global/users.js @@ -40,6 +40,14 @@ function buildInviteMultipleValidation() { )) } +const createUserAdminOnly = (ctx, next) => { + if (!ctx.request.body._id) { + return adminOnly(ctx, next) + } else { + return builderOrAdmin(ctx, next) + } +} + function buildInviteAcceptValidation() { // prettier-ignore return joiValidator.body(Joi.object({ @@ -51,7 +59,7 @@ function buildInviteAcceptValidation() { router .post( "/api/global/users", - builderOrAdmin, + createUserAdminOnly, users.buildUserSaveValidation(), controller.save ) diff --git a/packages/worker/src/tests/TestConfiguration.ts b/packages/worker/src/tests/TestConfiguration.ts index 2875cc00e9..746e1ccf1b 100644 --- a/packages/worker/src/tests/TestConfiguration.ts +++ b/packages/worker/src/tests/TestConfiguration.ts @@ -72,29 +72,12 @@ class TestConfiguration { // UTILS - async _req( - config: any, - params: any, - controlFunc: any, - opts: { force?: boolean } = {} - ) { + async _req(config: any, params: any, controlFunc: any) { const request: any = {} // fake cookies, we don't need them request.cookies = { set: () => {}, get: () => {} } request.config = { jwtSecret: env.JWT_SECRET } - if (opts.force) { - request.user = { - tenantId: this.getTenantId(), - admin: { global: true }, - builder: { global: true }, - } - } else if (this.defaultUser) { - request.user = this.defaultUser - } else { - request.user = { - tenantId: this.getTenantId(), - } - } + request.user = { tenantId: this.getTenantId() } request.query = {} request.request = { body: config, @@ -146,7 +129,7 @@ class TestConfiguration { email: "test@test.com", password: "test", }) - this.defaultUser = await this.createUser(user, { force: true }) + this.defaultUser = await this.createUser(user) } async createTenant1User() { @@ -154,16 +137,15 @@ class TestConfiguration { email: "tenant1@test.com", password: "test", }) - this.tenant1User = await this.createUser(user, { force: true }) + this.tenant1User = await this.createUser(user) } async createSession(user: User) { - const session: any = { + await sessions.createASession(user._id!, { sessionId: "sessionid", tenantId: user.tenantId, csrfToken: CSRF_TOKEN, - } - await sessions.createASession(user._id!, session) + }) } cookieHeader(cookies: any) { @@ -203,11 +185,11 @@ class TestConfiguration { }) } - async createUser(user?: User, opts: any = {}) { + async createUser(user?: User) { if (!user) { user = structures.users.user() } - const response = await this._req(user, null, controllers.users.save, opts) + const response = await this._req(user, null, controllers.users.save) const body = response as CreateUserResponse return this.getUser(body.email) } From c7cd93439249256b85f1dbfa76dc2599799cb564 Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 30 Nov 2022 09:50:39 +0000 Subject: [PATCH 132/179] v2.1.41 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index cea5038c67..d18f5d0511 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.1.40", + "version": "2.1.41", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 768070865d..e10895e4b4 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.1.40", + "version": "2.1.41", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^2.1.40", + "@budibase/types": "^2.1.41", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index daac9b03d6..09a0140820 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.1.40", + "version": "2.1.41", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^2.1.40", + "@budibase/string-templates": "^2.1.41", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index ded6fcb712..93cf12e845 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.1.40", + "version": "2.1.41", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "^2.1.40", - "@budibase/client": "^2.1.40", - "@budibase/frontend-core": "^2.1.40", - "@budibase/string-templates": "^2.1.40", + "@budibase/bbui": "^2.1.41", + "@budibase/client": "^2.1.41", + "@budibase/frontend-core": "^2.1.41", + "@budibase/string-templates": "^2.1.41", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index ebda782396..fbcdc05fba 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.1.40", + "version": "2.1.41", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "^2.1.40", - "@budibase/string-templates": "^2.1.40", - "@budibase/types": "^2.1.40", + "@budibase/backend-core": "^2.1.41", + "@budibase/string-templates": "^2.1.41", + "@budibase/types": "^2.1.41", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index e3c9cd6fad..1eb9628878 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.1.40", + "version": "2.1.41", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^2.1.40", - "@budibase/frontend-core": "^2.1.40", - "@budibase/string-templates": "^2.1.40", + "@budibase/bbui": "^2.1.41", + "@budibase/frontend-core": "^2.1.41", + "@budibase/string-templates": "^2.1.41", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index e3abfbf473..cd61fda8df 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.1.40", + "version": "2.1.41", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^2.1.40", + "@budibase/bbui": "^2.1.41", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 5075130af3..f33c049ea5 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.1.40", + "version": "2.1.41", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 8dd26e5444..190d3c0b84 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.1.40", + "version": "2.1.41", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^2.1.40", - "@budibase/client": "^2.1.40", + "@budibase/backend-core": "^2.1.41", + "@budibase/client": "^2.1.41", "@budibase/pro": "2.1.39", - "@budibase/string-templates": "^2.1.40", - "@budibase/types": "^2.1.40", + "@budibase/string-templates": "^2.1.41", + "@budibase/types": "^2.1.41", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index e807c9be25..be31842dcb 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.1.40", + "version": "2.1.41", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index e18e1af8b1..99ce8587d4 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.1.40", + "version": "2.1.41", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 3a72d04fa8..3c1c60181f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.1.40", + "version": "2.1.41", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^2.1.40", + "@budibase/backend-core": "^2.1.41", "@budibase/pro": "2.1.39", - "@budibase/string-templates": "^2.1.40", - "@budibase/types": "^2.1.40", + "@budibase/string-templates": "^2.1.41", + "@budibase/types": "^2.1.41", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From b23ad76b3b1d482600144a1811ed06cb1be4beae Mon Sep 17 00:00:00 2001 From: Budibase Release Bot <> Date: Wed, 30 Nov 2022 09:54:06 +0000 Subject: [PATCH 133/179] Update pro version to 2.1.41 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 190d3c0b84..0c64853ee1 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^2.1.41", "@budibase/client": "^2.1.41", - "@budibase/pro": "2.1.39", + "@budibase/pro": "2.1.41", "@budibase/string-templates": "^2.1.41", "@budibase/types": "^2.1.41", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 9a67ebf55f..b3f7339651 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.39.tgz#0ada64b114d2b61e6a4a782227348e1bfd33ebc6" - integrity sha512-OW1SOS0jWHoHBVMZo3A36F5urgphduOXWqegtHRL3o3cFmf38l8XI6TtKDWrfSkJat0FKrzjJs1vAnIh9cQeMA== +"@budibase/backend-core@2.1.41": + version "2.1.41" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.41.tgz#069f50d01d7e8f860a96d99282cdaaad562101a1" + integrity sha512-p6plW5SZ5vsf1YfwJGrQBlzHwIywqqw6xzdYU/8GmPJMRqvq62BaSSSJdsFGAPw/jjpYXoO/Hgx0CPivbG+jRg== dependencies: - "@budibase/types" "^2.1.39" + "@budibase/types" "^2.1.41" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1181,13 +1181,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.39.tgz#31d59a9e3bde75f9b83cff8db1b8fcb75c16fafe" - integrity sha512-GQ5Z0U03C9RifZhPQX9dc61yLM9YkRZOjl7mHXIrcm6ytUA3I/DMuGcN83hwlxlPOem9utofDmXfCE288nLDZg== +"@budibase/pro@2.1.41": + version "2.1.41" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.41.tgz#f8fd94c00a69ce3f3eca79fd18dc64be23af88e4" + integrity sha512-T/1Llf+HTQm0hodsx8of+lPGRTlsQ4cPQUfaBcUFcF37i0c11VzvK3b7LMeDkvcYJb9wUuw/NQ2K+2DACgXiiw== dependencies: - "@budibase/backend-core" "2.1.39" - "@budibase/types" "2.1.39" + "@budibase/backend-core" "2.1.41" + "@budibase/types" "2.1.41" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1211,10 +1211,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.1.39", "@budibase/types@^2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.39.tgz#ffa88a87c18d565c02576c5b75cde29326a4263c" - integrity sha512-S5v3lQbUxyzGYWMo5P3V+e47O4CNyhih2uHr+YLvdMtaq8Pj7jNHrZU9pxEFF0ldZDAFC3Z5WZaUglNXfZyZCw== +"@budibase/types@2.1.41", "@budibase/types@^2.1.41": + version "2.1.41" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.41.tgz#72c2367a9fa97cdf7adea1ca2c3e62d6bb9fdf29" + integrity sha512-Wgm81aYyCZAtOywRtIbQhGkisNrJkEYbr9YgOYKjrcLEMc6X2zzsxWZBdTjcuhINkWzgpJ+RvUl3OlD811L18g== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 3c1c60181f..b3cc8051a7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^2.1.41", - "@budibase/pro": "2.1.39", + "@budibase/pro": "2.1.41", "@budibase/string-templates": "^2.1.41", "@budibase/types": "^2.1.41", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 4c6b66ad6b..550db09cae 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.39.tgz#0ada64b114d2b61e6a4a782227348e1bfd33ebc6" - integrity sha512-OW1SOS0jWHoHBVMZo3A36F5urgphduOXWqegtHRL3o3cFmf38l8XI6TtKDWrfSkJat0FKrzjJs1vAnIh9cQeMA== +"@budibase/backend-core@2.1.41": + version "2.1.41" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.41.tgz#069f50d01d7e8f860a96d99282cdaaad562101a1" + integrity sha512-p6plW5SZ5vsf1YfwJGrQBlzHwIywqqw6xzdYU/8GmPJMRqvq62BaSSSJdsFGAPw/jjpYXoO/Hgx0CPivbG+jRg== dependencies: - "@budibase/types" "^2.1.39" + "@budibase/types" "^2.1.41" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -328,22 +328,22 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.39.tgz#31d59a9e3bde75f9b83cff8db1b8fcb75c16fafe" - integrity sha512-GQ5Z0U03C9RifZhPQX9dc61yLM9YkRZOjl7mHXIrcm6ytUA3I/DMuGcN83hwlxlPOem9utofDmXfCE288nLDZg== +"@budibase/pro@2.1.41": + version "2.1.41" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.41.tgz#f8fd94c00a69ce3f3eca79fd18dc64be23af88e4" + integrity sha512-T/1Llf+HTQm0hodsx8of+lPGRTlsQ4cPQUfaBcUFcF37i0c11VzvK3b7LMeDkvcYJb9wUuw/NQ2K+2DACgXiiw== dependencies: - "@budibase/backend-core" "2.1.39" - "@budibase/types" "2.1.39" + "@budibase/backend-core" "2.1.41" + "@budibase/types" "2.1.41" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@2.1.39", "@budibase/types@^2.1.39": - version "2.1.39" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.39.tgz#ffa88a87c18d565c02576c5b75cde29326a4263c" - integrity sha512-S5v3lQbUxyzGYWMo5P3V+e47O4CNyhih2uHr+YLvdMtaq8Pj7jNHrZU9pxEFF0ldZDAFC3Z5WZaUglNXfZyZCw== +"@budibase/types@2.1.41", "@budibase/types@^2.1.41": + version "2.1.41" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.41.tgz#72c2367a9fa97cdf7adea1ca2c3e62d6bb9fdf29" + integrity sha512-Wgm81aYyCZAtOywRtIbQhGkisNrJkEYbr9YgOYKjrcLEMc6X2zzsxWZBdTjcuhINkWzgpJ+RvUl3OlD811L18g== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" From bca9672926731a595cfb2272ecdea8aa22dc6ea5 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 30 Nov 2022 14:18:31 +0000 Subject: [PATCH 134/179] Add ability to show component info above the settings panel and add info to side panels --- .../src/DetailSummary/DetailSummary.svelte | 23 ++++++++---- .../settings/ComponentInfoSection.svelte | 36 +++++++++++++++++++ .../settings/ComponentSettingsPanel.svelte | 4 +++ packages/client/manifest.json | 3 +- 4 files changed, 58 insertions(+), 8 deletions(-) create mode 100644 packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentInfoSection.svelte diff --git a/packages/bbui/src/DetailSummary/DetailSummary.svelte b/packages/bbui/src/DetailSummary/DetailSummary.svelte index 518c615504..f7e2611792 100644 --- a/packages/bbui/src/DetailSummary/DetailSummary.svelte +++ b/packages/bbui/src/DetailSummary/DetailSummary.svelte @@ -19,13 +19,19 @@
-
-
{name}
- {#if collapsible} - - {/if} -
-
+ {#if name} +
+
{name}
+ {#if collapsible} + + {/if} +
+ {/if} +
@@ -72,6 +78,9 @@ padding: var(--spacing-s) var(--spacing-xl) var(--spacing-xl) var(--spacing-xl); } + .property-panel.no-title { + padding: var(--spacing-xl); + } .show { display: flex; diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentInfoSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentInfoSection.svelte new file mode 100644 index 0000000000..756a4bb43e --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentInfoSection.svelte @@ -0,0 +1,36 @@ + + + +
+
+ + {componentDefinition.name} +
+ {componentDefinition.info} +
+ + + \ No newline at end of file diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte index 688d7c5db9..c301bfdc20 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ComponentSettingsPanel.svelte @@ -5,6 +5,7 @@ import DesignSection from "./DesignSection.svelte" import CustomStylesSection from "./CustomStylesSection.svelte" import ConditionalUISection from "./ConditionalUISection.svelte" + import ComponentInfoSection from "./ComponentInfoSection.svelte" import { getBindableProperties, getComponentBindableProperties, @@ -29,6 +30,9 @@ {#if $selectedComponent} {#key $selectedComponent._id} + {#if componentDefinition.info} + + {/if}