From 549e4e0dc52ff3e1ccb57eadb9fd5fa1a4be9594 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 23 Jan 2023 15:38:43 +0000 Subject: [PATCH 1/6] Onboarding core components (#9412) * Update BB logo to black * Update top nav bar and core layout * Add redesign for apps pages * Update user and groups pages * More WIP portal redesign! * Fix top nav colours and fix selected tab not updating * Remove log * Update copy on settings pages * Update and standardise page headers and subtitles, and remove side nav titles * Update font styles to allow for easy customisation * Update button styles to always use newStyles, update auth page styles * Update settings pages to new designs * Update structure for account pages * Add initial rewrite of app overview section * Update config checklist to properly center * Update app overview version and name/url screens * Add tooltip to explain why URL cannot be changed until unpublishing * Update overview automation history tab * Update overview backups page * Rewrite app overview access tab * Update table hover colours * Remove scrolling from tables when not required and stop selects from updating their own state locally * Update table styles to support flexible column widths much better * Fix extremely long strings in breadcrumbs not wrapping * Fix multiple issues with long text overflow * Fix flashing in version settings page * Fix loading bugs in app backups page * Add sidebar for portal and use it for automation history. Fix multiple overflow and scrolling issues * Tidy up * Update user details page to use tables and match designs * Update users detail page * Update user and group details pages with new tables * Fix automation error linking from apps page and improve automation fetching logic in automation history * Move theme and API key into user profile dropdown instead of settings * Move settings before account and show plugins for devs * Convert plugins page to table and update components and modals * Update links when going back from the builder * Update plugin search placeholder * Fix URLs in app overview * Properly handle text overflow in plugins table * Remove getting started checklist * Fix checklist removal and fix profile modal * Update email details page to match new designs * Cleanup * Add licensing and env logic to determine which account links to show * Update upgrade button URL for cloud accounts * Update app list to use a more compact style * Make core page layout responsive and update apps list to be responsive * Update mobile design of apps page * Update more pages to be responsive and add mobile specific components * Refactor main portal page into multiple components * Update multiple pages to be responsive and improve loading experience * Make automation history page responsive * Update backups page to be responsive * Update pickers to use absolutely positioned root popover so that overflow does not matter * Fix some responsive styles * Fix update link in app overview * Improve dropdown logic * Lint * Update click outside handler to handle modals properly * Remove log * Fix mobile menu upgrade button not closing menu * Hide groups page if disabled at tenant level * Centralise menu logic and show full menu on mobile * Update app access assignment and fix backups table * Ensure avatars cannot be squished * Standardise disabled field text colour * Allow developer users to access users, groups and usage pages * Allow readonly access to users and groups for developer users * Remove logs * Improve users page loading experience * Improve responsiveness on apps list page and fix discussions link styles * Update spacing on user and group detail page and fix usage page showing wrong copy * Fix logo override not working * Pin minio version to an old one that supports the fs backend in dev * Shrink upgrade button * Shrink user dropdown * Update assignment modal text * Remove clickable visual styles from plugins * Always show groups section in app access page * Update app overview button styles to include more CTAs * Hide edit and view links in more menu on overview page unless on mobile * Make usage stats responsive and fix layout issues * Add core page layout for onboarding to frontend-core * Add initial work on fancy form components for onboarding * Add checkbox component and add error handling to fancy form fields * Add fancy select and improve other fancy components * Update fancy components and fix select rounded corners * Fix mobile styles for split pages * Revert google button * Fix links not working with click handlers * Fix label animation * Improve styles of fancy components * Improve mobile compatibility with fancy button radio * Revert changes to builder files for testing * Tidy up small UI issues * Improve some minor design issues * Fix issue with scroll padding not being applied * Ensure unauthorised users cannot view pages they should not be able to * Lint --- .../bbui/src/ActionButton/ActionButton.svelte | 1 + .../bbui/src/FancyForm/FancyButton.svelte | 29 ++++ .../src/FancyForm/FancyButtonRadio.svelte | 70 +++++++++ .../bbui/src/FancyForm/FancyCheckbox.svelte | 53 +++++++ packages/bbui/src/FancyForm/FancyField.svelte | 126 ++++++++++++++++ .../bbui/src/FancyForm/FancyFieldLabel.svelte | 25 ++++ packages/bbui/src/FancyForm/FancyForm.svelte | 40 ++++++ packages/bbui/src/FancyForm/FancyInput.svelte | 63 ++++++++ .../bbui/src/FancyForm/FancySelect.svelte | 135 ++++++++++++++++++ packages/bbui/src/FancyForm/index.js | 6 + packages/bbui/src/Form/Core/Select.svelte | 3 + packages/bbui/src/Layout/Page.svelte | 8 +- packages/bbui/src/Link/Link.svelte | 5 +- packages/bbui/src/index.js | 3 + .../components/portal/page/SideNavItem.svelte | 2 +- .../src/pages/builder/portal/_layout.svelte | 2 +- .../builder/portal/account/_layout.svelte | 9 +- .../pages/builder/portal/apps/index.svelte | 2 +- .../builder/portal/settings/_layout.svelte | 5 +- .../pages/builder/portal/users/_layout.svelte | 5 +- .../src/components/SplitPage.svelte | 50 +++++++ .../src/components/TestimonialPage.svelte | 62 ++++++++ .../frontend-core/src/components/index.js | 2 + packages/frontend-core/src/index.js | 1 + 24 files changed, 694 insertions(+), 13 deletions(-) create mode 100644 packages/bbui/src/FancyForm/FancyButton.svelte create mode 100644 packages/bbui/src/FancyForm/FancyButtonRadio.svelte create mode 100644 packages/bbui/src/FancyForm/FancyCheckbox.svelte create mode 100644 packages/bbui/src/FancyForm/FancyField.svelte create mode 100644 packages/bbui/src/FancyForm/FancyFieldLabel.svelte create mode 100644 packages/bbui/src/FancyForm/FancyForm.svelte create mode 100644 packages/bbui/src/FancyForm/FancyInput.svelte create mode 100644 packages/bbui/src/FancyForm/FancySelect.svelte create mode 100644 packages/bbui/src/FancyForm/index.js create mode 100644 packages/frontend-core/src/components/SplitPage.svelte create mode 100644 packages/frontend-core/src/components/TestimonialPage.svelte create mode 100644 packages/frontend-core/src/components/index.js diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte index cfc810807e..cc4417be2a 100644 --- a/packages/bbui/src/ActionButton/ActionButton.svelte +++ b/packages/bbui/src/ActionButton/ActionButton.svelte @@ -88,6 +88,7 @@ } .is-selected:not(.spectrum-ActionButton--emphasized) { background: var(--spectrum-global-color-gray-300); + border-color: var(--spectrum-global-color-gray-700); } .noPadding { padding: 0; diff --git a/packages/bbui/src/FancyForm/FancyButton.svelte b/packages/bbui/src/FancyForm/FancyButton.svelte new file mode 100644 index 0000000000..09615df8fa --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyButton.svelte @@ -0,0 +1,29 @@ + + + + {#if icon} + {#if icon.includes("/")} + button + {:else} + + {/if} + {/if} +
+ +
+ + + diff --git a/packages/bbui/src/FancyForm/FancyButtonRadio.svelte b/packages/bbui/src/FancyForm/FancyButtonRadio.svelte new file mode 100644 index 0000000000..510fd8efb8 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyButtonRadio.svelte @@ -0,0 +1,70 @@ + + + + {#if label} + {label} + {/if} + +
+ {#each options as option} + onChange(getOptionValue(option))} + > + {getOptionLabel(option)} + + {/each} +
+ + + diff --git a/packages/bbui/src/FancyForm/FancyCheckbox.svelte b/packages/bbui/src/FancyForm/FancyCheckbox.svelte new file mode 100644 index 0000000000..191cc79485 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyCheckbox.svelte @@ -0,0 +1,53 @@ + + + + + + +
+ {#if text} + {text} + {/if} + +
+ + + diff --git a/packages/bbui/src/FancyForm/FancyField.svelte b/packages/bbui/src/FancyForm/FancyField.svelte new file mode 100644 index 0000000000..89f2dec7d0 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyField.svelte @@ -0,0 +1,126 @@ + + +
+
+
+ +
+ {#if error} +
+ +
+ {/if} +
+ {#if error} +
+ {error} +
+ {/if} +
+ + diff --git a/packages/bbui/src/FancyForm/FancyFieldLabel.svelte b/packages/bbui/src/FancyForm/FancyFieldLabel.svelte new file mode 100644 index 0000000000..181cff50e4 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyFieldLabel.svelte @@ -0,0 +1,25 @@ + + +
+ +
+ + diff --git a/packages/bbui/src/FancyForm/FancyForm.svelte b/packages/bbui/src/FancyForm/FancyForm.svelte new file mode 100644 index 0000000000..f874238572 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyForm.svelte @@ -0,0 +1,40 @@ + + +
+ +
+ + diff --git a/packages/bbui/src/FancyForm/FancyInput.svelte b/packages/bbui/src/FancyForm/FancyInput.svelte new file mode 100644 index 0000000000..ef254949c8 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyInput.svelte @@ -0,0 +1,63 @@ + + + + {#if label} + {label} + {/if} + (focused = true)} + on:blur={() => (focused = false)} + class:placeholder + /> + + + diff --git a/packages/bbui/src/FancyForm/FancySelect.svelte b/packages/bbui/src/FancyForm/FancySelect.svelte new file mode 100644 index 0000000000..240871fc9a --- /dev/null +++ b/packages/bbui/src/FancyForm/FancySelect.svelte @@ -0,0 +1,135 @@ + + + (open = true)} +> + {#if label} + {label} + {/if} + +
+ {value || ""} +
+ +
+ +
+ + + (open = false)} + useAnchorWidth={true} + maxWidth={null} +> +
+ {#if options.length} + {#each options as option, idx} +
onChange(getOptionValue(option, idx))} + > + + {getOptionLabel(option, idx)} + + {#if value === getOptionValue(option, idx)} + + {/if} +
+ {/each} + {/if} +
+ + + diff --git a/packages/bbui/src/FancyForm/index.js b/packages/bbui/src/FancyForm/index.js new file mode 100644 index 0000000000..241036fb35 --- /dev/null +++ b/packages/bbui/src/FancyForm/index.js @@ -0,0 +1,6 @@ +export { default as FancyInput } from "./FancyInput.svelte" +export { default as FancyCheckbox } from "./FancyCheckbox.svelte" +export { default as FancySelect } from "./FancySelect.svelte" +export { default as FancyButton } from "./FancyButton.svelte" +export { default as FancyForm } from "./FancyForm.svelte" +export { default as FancyButtonRadio } from "./FancyButtonRadio.svelte" diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte index 3e15b7f6ef..721083e3a6 100644 --- a/packages/bbui/src/Form/Core/Select.svelte +++ b/packages/bbui/src/Form/Core/Select.svelte @@ -18,8 +18,11 @@ export let autoWidth = false export let autocomplete = false export let sort = false + const dispatch = createEventDispatcher() + let open = false + $: fieldText = getFieldText(value, options, placeholder) $: fieldIcon = getFieldAttribute(getOptionIcon, value, options) $: fieldColour = getFieldAttribute(getOptionColour, value, options) diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte index 15aabd2c61..01111fda9a 100644 --- a/packages/bbui/src/Layout/Page.svelte +++ b/packages/bbui/src/Layout/Page.svelte @@ -18,6 +18,7 @@
+
import "@spectrum-css/link/dist/index-vars.css" + import { createEventDispatcher } from "svelte" export let href = "#" export let size = "M" @@ -9,10 +10,12 @@ export let overBackground = false export let target export let download + + const dispatch = createEventDispatcher() dispatch("click") && e.stopPropagation()} {href} {target} {download} diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 601c4dcbca..3de0bc2f46 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -101,3 +101,6 @@ export { banner, BANNER_TYPES } from "./Stores/banner" // Helpers export * as Helpers from "./helpers" + +// Fancy form components +export * from "./FancyForm" diff --git a/packages/builder/src/components/portal/page/SideNavItem.svelte b/packages/builder/src/components/portal/page/SideNavItem.svelte index b31afb683f..c22b8b6113 100644 --- a/packages/builder/src/components/portal/page/SideNavItem.svelte +++ b/packages/builder/src/components/portal/page/SideNavItem.svelte @@ -5,7 +5,7 @@ - {text} + {text || ""} diff --git a/packages/frontend-core/src/components/TestimonialPage.svelte b/packages/frontend-core/src/components/TestimonialPage.svelte new file mode 100644 index 0000000000..3028d4447a --- /dev/null +++ b/packages/frontend-core/src/components/TestimonialPage.svelte @@ -0,0 +1,62 @@ + + + + +
+
+ +
+ "Here is an example of how Budibase changed my life for the better and + now all I do is eat, sleep, build apps, repeat." +
+
+ +
+
No-code Enthusiast
+
Bedroom TLD
+
+
+ +
+
+ + + diff --git a/packages/frontend-core/src/components/index.js b/packages/frontend-core/src/components/index.js new file mode 100644 index 0000000000..7ca21c4ff9 --- /dev/null +++ b/packages/frontend-core/src/components/index.js @@ -0,0 +1,2 @@ +export { default as SplitPage } from "./SplitPage.svelte" +export { default as TestimonialPage } from "./TestimonialPage.svelte" diff --git a/packages/frontend-core/src/index.js b/packages/frontend-core/src/index.js index aecca81cda..01bf05c69e 100644 --- a/packages/frontend-core/src/index.js +++ b/packages/frontend-core/src/index.js @@ -3,3 +3,4 @@ export { fetchData } from "./fetch/fetchData" export * as Constants from "./constants" export * from "./stores" export * from "./utils" +export * from "./components" From 4436a2131b790f1454e7923f1f8cb75e3b9c3cfd Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 23 Jan 2023 15:53:12 +0000 Subject: [PATCH 2/6] v2.2.12-alpha.33 --- 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 0606169dd3..74eaa3e18a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ca87d6daa4..30fd97c124 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.32", + "@budibase/types": "2.2.12-alpha.33", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6b67ca77d0..d88bb8a3d8 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.2.12-alpha.32", + "version": "2.2.12-alpha.33", "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.2.12-alpha.32", + "@budibase/string-templates": "2.2.12-alpha.33", "@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 82c939d1f4..a333827bbd 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.32", - "@budibase/client": "2.2.12-alpha.32", - "@budibase/frontend-core": "2.2.12-alpha.32", - "@budibase/string-templates": "2.2.12-alpha.32", + "@budibase/bbui": "2.2.12-alpha.33", + "@budibase/client": "2.2.12-alpha.33", + "@budibase/frontend-core": "2.2.12-alpha.33", + "@budibase/string-templates": "2.2.12-alpha.33", "@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 fd514d6917..d4ebbeaee1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "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.2.12-alpha.32", - "@budibase/string-templates": "2.2.12-alpha.32", - "@budibase/types": "2.2.12-alpha.32", + "@budibase/backend-core": "2.2.12-alpha.33", + "@budibase/string-templates": "2.2.12-alpha.33", + "@budibase/types": "2.2.12-alpha.33", "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 6f6422c236..19ca5d6b69 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "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.2.12-alpha.32", - "@budibase/frontend-core": "2.2.12-alpha.32", - "@budibase/string-templates": "2.2.12-alpha.32", + "@budibase/bbui": "2.2.12-alpha.33", + "@budibase/frontend-core": "2.2.12-alpha.33", + "@budibase/string-templates": "2.2.12-alpha.33", "@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 321d95a284..48987c620b 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.32", + "@budibase/bbui": "2.2.12-alpha.33", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index ad4f5615f1..26699b8bb1 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 0ba9468623..ea448f11a0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "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.2.12-alpha.32", - "@budibase/client": "2.2.12-alpha.32", + "@budibase/backend-core": "2.2.12-alpha.33", + "@budibase/client": "2.2.12-alpha.33", "@budibase/pro": "2.2.12-alpha.32", - "@budibase/string-templates": "2.2.12-alpha.32", - "@budibase/types": "2.2.12-alpha.32", + "@budibase/string-templates": "2.2.12-alpha.33", + "@budibase/types": "2.2.12-alpha.33", "@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 b523f2cd0e..89350c4ba3 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "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 8a27829c47..95ed13050b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "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 3cef4d12f6..8c53517919 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.32", + "@budibase/backend-core": "2.2.12-alpha.33", "@budibase/pro": "2.2.12-alpha.32", - "@budibase/string-templates": "2.2.12-alpha.32", - "@budibase/types": "2.2.12-alpha.32", + "@budibase/string-templates": "2.2.12-alpha.33", + "@budibase/types": "2.2.12-alpha.33", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From fc0652f3820f6c4ec2cb676cd4b74a74421e40ac Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 23 Jan 2023 15:57:26 +0000 Subject: [PATCH 3/6] Update pro version to 2.2.12-alpha.33 --- 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 ea448f11a0..02b805d97a 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.2.12-alpha.33", "@budibase/client": "2.2.12-alpha.33", - "@budibase/pro": "2.2.12-alpha.32", + "@budibase/pro": "2.2.12-alpha.33", "@budibase/string-templates": "2.2.12-alpha.33", "@budibase/types": "2.2.12-alpha.33", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 0514fed5d6..8da4fe0f19 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.32.tgz#5d53fdde38e80fdade73c59cb81623041984a5fc" - integrity sha512-XoaqGrttx01wlblI0+O23R9uS5FTMgK07juY6mUkdReCK46IvmG7FFnuYu0euKVRbhChSf5X8S+fvKIAEi1ZFw== +"@budibase/backend-core@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.33.tgz#c89c23b215b21ad2a5f9dff0a19d9902ce80b9ac" + integrity sha512-jDYFAw/m4sLSNGydFX9WUBcFW3+E4wRfFWU67oz4G2lqzIfVKy4MAVZdZaex1fomSJspEuH1v0b+PEB5MpUiyg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.32" + "@budibase/types" "2.2.12-alpha.33" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.32.tgz#4f35b0ada97458cc69ee41ebb40d56b361518065" - integrity sha512-Kn/IahgIb9Ydzmasv4Bhlh3rvyAC2tBVSoI33OZ/6PKF0vPYJNJkFds3iGELNV7SyWoLbVWb2z5SQ4SSaOYsJw== +"@budibase/pro@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.33.tgz#e6e1c8de90a8fe25c7ea954230ba6106e7f65760" + integrity sha512-eXU1AJVYpV6Ca4t8d/5MpUvP508grVAcL5m+3qxnAXaP9nQkbxL1vvPD2etYJB6y2rR5vxxb+LZRHGQD1jnxzw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.32" - "@budibase/types" "2.2.12-alpha.32" + "@budibase/backend-core" "2.2.12-alpha.33" + "@budibase/types" "2.2.12-alpha.33" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1405,10 +1405,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.32.tgz#71af8e8cff66acbfd65aa87e66183dd95d76ce6f" - integrity sha512-ZZwmO+0ORGEFbU/EQvtnjo1VonUbBdsciFkTOiopVupU5iNY2oCKgbYTQiTZZisQrRuiKdPV6P17uV+YTkjQSQ== +"@budibase/types@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.33.tgz#89f8d407ef3f9484563ebf2b10515d70433614f5" + integrity sha512-crvFyeBkpw9q0C0bqDCgdvOR/e5QIia+AHNfIgW17zLaZChtTv4vNGJ3wuMy2GE6AOUx9D98tNK6lI7oJemAWA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 8c53517919..bf62d79396 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.33", - "@budibase/pro": "2.2.12-alpha.32", + "@budibase/pro": "2.2.12-alpha.33", "@budibase/string-templates": "2.2.12-alpha.33", "@budibase/types": "2.2.12-alpha.33", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 052edf0197..caa21ca3fb 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.32.tgz#5d53fdde38e80fdade73c59cb81623041984a5fc" - integrity sha512-XoaqGrttx01wlblI0+O23R9uS5FTMgK07juY6mUkdReCK46IvmG7FFnuYu0euKVRbhChSf5X8S+fvKIAEi1ZFw== +"@budibase/backend-core@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.33.tgz#c89c23b215b21ad2a5f9dff0a19d9902ce80b9ac" + integrity sha512-jDYFAw/m4sLSNGydFX9WUBcFW3+E4wRfFWU67oz4G2lqzIfVKy4MAVZdZaex1fomSJspEuH1v0b+PEB5MpUiyg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.32" + "@budibase/types" "2.2.12-alpha.33" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,23 +521,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.32.tgz#4f35b0ada97458cc69ee41ebb40d56b361518065" - integrity sha512-Kn/IahgIb9Ydzmasv4Bhlh3rvyAC2tBVSoI33OZ/6PKF0vPYJNJkFds3iGELNV7SyWoLbVWb2z5SQ4SSaOYsJw== +"@budibase/pro@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.33.tgz#e6e1c8de90a8fe25c7ea954230ba6106e7f65760" + integrity sha512-eXU1AJVYpV6Ca4t8d/5MpUvP508grVAcL5m+3qxnAXaP9nQkbxL1vvPD2etYJB6y2rR5vxxb+LZRHGQD1jnxzw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.32" - "@budibase/types" "2.2.12-alpha.32" + "@budibase/backend-core" "2.2.12-alpha.33" + "@budibase/types" "2.2.12-alpha.33" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.32.tgz#71af8e8cff66acbfd65aa87e66183dd95d76ce6f" - integrity sha512-ZZwmO+0ORGEFbU/EQvtnjo1VonUbBdsciFkTOiopVupU5iNY2oCKgbYTQiTZZisQrRuiKdPV6P17uV+YTkjQSQ== +"@budibase/types@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.33.tgz#89f8d407ef3f9484563ebf2b10515d70433614f5" + integrity sha512-crvFyeBkpw9q0C0bqDCgdvOR/e5QIia+AHNfIgW17zLaZChtTv4vNGJ3wuMy2GE6AOUx9D98tNK6lI7oJemAWA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 0daacf3425b2ef0d58c4f0ec8c6c85c27c59d4a8 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Mon, 23 Jan 2023 16:46:02 +0000 Subject: [PATCH 4/6] Add fields for MongoDB SSL cert file paths (#8260) * Added fields for tls certificate files * lint * Only include cert fields if SELF_HOSTED * lint * Refactor getSchema function * Add datasource field group with accordion * Handle no display column on fieldGroup field * Override text transform accordian header * Renamed from TLS to SSL in UI config * readable flag * Add accordion component * Refactor --- packages/bbui/package.json | 3 +- packages/bbui/src/Accordion/Accordion.svelte | 58 ++ packages/bbui/src/index.js | 1 + packages/bbui/yarn.lock | 13 +- packages/builder/package.json | 3 +- .../IntegrationConfigForm.svelte | 35 +- packages/builder/yarn.lock | 5 + packages/server/src/integrations/mongodb.ts | 596 ++++++++++-------- packages/types/src/sdk/datasources.ts | 13 +- 9 files changed, 442 insertions(+), 285 deletions(-) create mode 100644 packages/bbui/src/Accordion/Accordion.svelte diff --git a/packages/bbui/package.json b/packages/bbui/package.json index d88bb8a3d8..cea1075963 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -38,6 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", + "@spectrum-css/accordion": "3.0.24", "@budibase/string-templates": "2.2.12-alpha.33", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", @@ -89,4 +90,4 @@ "loader-utils": "1.4.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/bbui/src/Accordion/Accordion.svelte b/packages/bbui/src/Accordion/Accordion.svelte new file mode 100644 index 0000000000..1c88450c9a --- /dev/null +++ b/packages/bbui/src/Accordion/Accordion.svelte @@ -0,0 +1,58 @@ + + +
+
+

+ + +

+
+ +
+
+
+ + diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 3de0bc2f46..b56aa597ad 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -75,6 +75,7 @@ export { default as ListItem } from "./List/ListItem.svelte" export { default as IconSideNav } from "./IconSideNav/IconSideNav.svelte" export { default as IconSideNavItem } from "./IconSideNav/IconSideNavItem.svelte" export { default as Slider } from "./Form/Slider.svelte" +export { default as Accordion } from "./Accordion/Accordion.svelte" // Renderers export { default as BoldRenderer } from "./Table/BoldRenderer.svelte" diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock index 72e36a6474..3286c33e69 100644 --- a/packages/bbui/yarn.lock +++ b/packages/bbui/yarn.lock @@ -109,10 +109,15 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@spectrum-css/actionbutton@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577" - integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw== +"@spectrum-css/accordion@3.0.24": + version "3.0.24" + resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74" + integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA== + +"@spectrum-css/actionbutton@^1.0.1": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.2.tgz#7753a94c64cebecfca6749ef20e37a5ea80c59be" + integrity sha512-laDWk7PCgy2I0AGsMjTmYKkiMVYVoF1B4tffJf4cIp66znTiqPHEbLDh5EDNU88JLTY2bWoCOY4cJxvXk5gERw== "@spectrum-css/actiongroup@1.0.1": version "1.0.1" diff --git a/packages/builder/package.json b/packages/builder/package.json index a333827bbd..38f18cea0e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -78,6 +78,7 @@ "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", + "@spectrum-css/accordion": "^3.0.24", "codemirror": "^5.59.0", "dayjs": "^1.11.2", "downloadjs": "1.4.7", @@ -123,4 +124,4 @@ "vite": "^3.0.8" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} +} \ No newline at end of file diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index 05649e1773..6b35f3313f 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -6,6 +6,7 @@ Toggle, Button, TextArea, + Accordion, } from "@budibase/bbui" import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte" import { capitalise } from "helpers" @@ -51,15 +52,24 @@ let addButton - function getDisplayName(key) { + function getDisplayName(key, fieldKey) { let name - if (schema[key]?.display) { + if (fieldKey && schema[key]["fields"][fieldKey]?.display) { + name = schema[key]["fields"][fieldKey].display + } else if (fieldKey) { + name = fieldKey + } else if (schema[key]?.display) { name = schema[key].display } else { name = key } return capitalise(name) } + function getFieldGroupKeys(fieldGroup) { + return Object.entries(schema[fieldGroup].fields || {}) + .filter(el => filter(el)) + .map(([key]) => key) + }
@@ -100,6 +110,27 @@ error={$validation.errors[configKey]} />
+ {:else if schema[configKey].type === "fieldGroup"} + !!config[fieldKey] + )} + header={getDisplayName(configKey)} + > + + {#each getFieldGroupKeys(configKey) as fieldKey} +
+ + +
+ {/each} + + {:else}
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index bf3f7defb7..a491d14404 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -1356,6 +1356,11 @@ dependencies: "@sinonjs/commons" "^1.7.0" +"@spectrum-css/accordion@^3.0.24": + version "3.0.24" + resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74" + integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA== + "@spectrum-css/page@^3.0.1": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.8.tgz#001efa9e4c10095df9b2b37cf7d7d6eb60140190" diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index 9ccefbda58..38b3891fe4 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -12,11 +12,16 @@ import { FindOneAndUpdateOptions, UpdateOptions, OperationOptions, + MongoClientOptions, } from "mongodb" +import environment from "../environment" interface MongoDBConfig { connectionString: string db: string + tlsCertificateFile: string + tlsCertificateKeyFile: string + tlsCAFile: string } interface MongoDBQuery { @@ -26,292 +31,331 @@ interface MongoDBQuery { } } -const SCHEMA: Integration = { - docs: "https://github.com/mongodb/node-mongodb-native", - friendlyName: "MongoDB", - type: "Non-relational", - description: - "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era.", - datasource: { - connectionString: { - type: DatasourceFieldType.STRING, - required: true, - default: "mongodb://localhost:27017", - }, - db: { - type: DatasourceFieldType.STRING, - required: true, - }, - }, - query: { - create: { - type: QueryType.JSON, - }, - read: { - type: QueryType.JSON, - }, - update: { - type: QueryType.JSON, - }, - delete: { - type: QueryType.JSON, - }, - aggregate: { - type: QueryType.JSON, - readable: true, - steps: [ - { - key: "$addFields", - template: "{\n\t\n}", - }, - { - key: "$bucket", - template: `{ - "groupBy": "", - "boundaries": [], - "default": "", - "output": {} -}`, - }, - { - key: "$bucketAuto", - template: `{ - "groupBy": "", - "buckets": 1, - "output": {}, - "granularity": "R5" -}`, - }, - { - key: "$changeStream", - template: `{ - "allChangesForCluster": true, - "fullDocument": "", - "fullDocumentBeforeChange": "", - "resumeAfter": 1, - "showExpandedEvents": true, - "startAfter": {}, - "startAtOperationTime": "" -}`, - }, - { - key: "$collStats", - template: `{ - "latencyStats": { "histograms": true } }, - "storageStats": { "scale": 1 } }, - "count": {}, - "queryExecStats": {} -}`, - }, - { - key: "$count", - template: ``, - }, - { - key: "$densify", - template: `{ - "field": "", - "partitionByFields": [], - "range": { - "step": 1, - "unit": 1, - "bounds": "full" - } -}`, - }, - { - key: "$documents", - template: `[]`, - }, - { - key: "$facet", - template: `{\n\t\n}`, - }, - { - key: "$fill", - template: `{ - "partitionBy": "", - "partitionByFields": [], - "sortBy": {}, - "output": {} -}`, - }, - { - key: "$geoNear", - template: `{ - "near": { - "type": "Point", - "coordinates": [ - -73.98142, 40.71782 - ] - }, - "key": "location", - "distanceField": "dist.calculated", - "query": { "category": "Parks" } -}`, - }, - { - key: "$graphLookup", - template: `{ - "from": "", - "startWith": "", - "connectFromField": "", - "connectToField": "", - "as": "", - "maxDepth": 1, - "depthField": "", - "restrictSearchWithMatch": {} -}`, - }, - { - key: "$group", - template: `{ - "_id": "" -}`, - }, - { - key: "$indexStats", - template: "{\n\t\n}", - }, - { - key: "$limit", - template: `1`, - }, - { - key: "$listLocalSessions", - template: `{\n\t\n}`, - }, - { - key: "$listSessions", - template: `{\n\t\n}`, - }, - { - key: "$lookup", - template: `{ - "from": "", - "localField": "", - "foreignField": "", - "as": "" -}`, - }, - { - key: "$match", - template: "{\n\t\n}", - }, - { - key: "$merge", - template: `{ - "into": {}, - "on": "_id", - "whenMatched": "replace", - "whenNotMatched": "insert" -}`, - }, - { - key: "$out", - template: `{ - "db": "", - "coll": "" -}`, - }, - { - key: "$planCacheStats", - template: "{\n\t\n}", - }, - { - key: "$project", - template: "{\n\t\n}", - }, - { - key: "$redact", - template: "", - }, - { - key: "$replaceRoot", - template: `{ "newRoot": "" }`, - }, - { - key: "$replaceWith", - template: ``, - }, - { - key: "$sample", - template: `{ "size": 3 }`, - }, - { - key: "$set", - template: "{\n\t\n}", - }, - { - key: "$setWindowFields", - template: `{ - "partitionBy": "", - "sortBy": {}, - "output": {} -}`, - }, - { - key: "$skip", - template: `1`, - }, - { - key: "$sort", - template: "{\n\t\n}", - }, - { - key: "$sortByCount", - template: "", - }, - { - key: "$unionWith", - template: `{ - "coll": "", - "pipeline": [] -}`, - }, - { - key: "$unset", - template: "", - }, - { - key: "$unwind", - template: `{ - "path": "", - "includeArrayIndex": "", - "preserveNullAndEmptyArrays": true -}`, - }, - ], - }, - }, - extra: { - collection: { - displayName: "Collection", - type: DatasourceFieldType.STRING, - required: true, - }, - actionType: { - displayName: "Query Type", - type: DatasourceFieldType.LIST, - required: true, - data: { - read: ["find", "findOne", "findOneAndUpdate", "count", "distinct"], - create: ["insertOne", "insertMany"], - update: ["updateOne", "updateMany"], - delete: ["deleteOne", "deleteMany"], - aggregate: ["json", "pipeline"], +const getSchema = () => { + let schema = { + docs: "https://github.com/mongodb/node-mongodb-native", + friendlyName: "MongoDB", + type: "Non-relational", + description: + "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era.", + datasource: { + connectionString: { + type: DatasourceFieldType.STRING, + required: true, + default: "mongodb://localhost:27017", + display: "Connection string", + }, + db: { + type: DatasourceFieldType.STRING, + required: true, + display: "DB", }, }, - }, + query: { + create: { + type: QueryType.JSON, + }, + read: { + type: QueryType.JSON, + }, + update: { + type: QueryType.JSON, + }, + delete: { + type: QueryType.JSON, + }, + aggregate: { + type: QueryType.JSON, + readable: true, + steps: [ + { + key: "$addFields", + template: "{\n\t\n}", + }, + { + key: "$bucket", + template: `{ + "groupBy": "", + "boundaries": [], + "default": "", + "output": {} + }`, + }, + { + key: "$bucketAuto", + template: `{ + "groupBy": "", + "buckets": 1, + "output": {}, + "granularity": "R5" + }`, + }, + { + key: "$changeStream", + template: `{ + "allChangesForCluster": true, + "fullDocument": "", + "fullDocumentBeforeChange": "", + "resumeAfter": 1, + "showExpandedEvents": true, + "startAfter": {}, + "startAtOperationTime": "" + }`, + }, + { + key: "$collStats", + template: `{ + "latencyStats": { "histograms": true } }, + "storageStats": { "scale": 1 } }, + "count": {}, + "queryExecStats": {} + }`, + }, + { + key: "$count", + template: ``, + }, + { + key: "$densify", + template: `{ + "field": "", + "partitionByFields": [], + "range": { + "step": 1, + "unit": 1, + "bounds": "full" + } + }`, + }, + { + key: "$documents", + template: `[]`, + }, + { + key: "$facet", + template: `{\n\t\n}`, + }, + { + key: "$fill", + template: `{ + "partitionBy": "", + "partitionByFields": [], + "sortBy": {}, + "output": {} + }`, + }, + { + key: "$geoNear", + template: `{ + "near": { + "type": "Point", + "coordinates": [ + -73.98142, 40.71782 + ] + }, + "key": "location", + "distanceField": "dist.calculated", + "query": { "category": "Parks" } + }`, + }, + { + key: "$graphLookup", + template: `{ + "from": "", + "startWith": "", + "connectFromField": "", + "connectToField": "", + "as": "", + "maxDepth": 1, + "depthField": "", + "restrictSearchWithMatch": {} + }`, + }, + { + key: "$group", + template: `{ + "_id": "" + }`, + }, + { + key: "$indexStats", + template: "{\n\t\n}", + }, + { + key: "$limit", + template: `1`, + }, + { + key: "$listLocalSessions", + template: `{\n\t\n}`, + }, + { + key: "$listSessions", + template: `{\n\t\n}`, + }, + { + key: "$lookup", + template: `{ + "from": "", + "localField": "", + "foreignField": "", + "as": "" + }`, + }, + { + key: "$match", + template: "{\n\t\n}", + }, + { + key: "$merge", + template: `{ + "into": {}, + "on": "_id", + "whenMatched": "replace", + "whenNotMatched": "insert" + }`, + }, + { + key: "$out", + template: `{ + "db": "", + "coll": "" + }`, + }, + { + key: "$planCacheStats", + template: "{\n\t\n}", + }, + { + key: "$project", + template: "{\n\t\n}", + }, + { + key: "$redact", + template: "", + }, + { + key: "$replaceRoot", + template: `{ "newRoot": "" }`, + }, + { + key: "$replaceWith", + template: ``, + }, + { + key: "$sample", + template: `{ "size": 3 }`, + }, + { + key: "$set", + template: "{\n\t\n}", + }, + { + key: "$setWindowFields", + template: `{ + "partitionBy": "", + "sortBy": {}, + "output": {} + }`, + }, + { + key: "$skip", + template: `1`, + }, + { + key: "$sort", + template: "{\n\t\n}", + }, + { + key: "$sortByCount", + template: "", + }, + { + key: "$unionWith", + template: `{ + "coll": "", + "pipeline": [] + }`, + }, + { + key: "$unset", + template: "", + }, + { + key: "$unwind", + template: `{ + "path": "", + "includeArrayIndex": "", + "preserveNullAndEmptyArrays": true + }`, + }, + ], + }, + }, + extra: { + collection: { + displayName: "Collection", + type: DatasourceFieldType.STRING, + required: true, + }, + actionType: { + displayName: "Query Type", + type: DatasourceFieldType.LIST, + required: true, + data: { + read: ["find", "findOne", "findOneAndUpdate", "count", "distinct"], + create: ["insertOne", "insertMany"], + update: ["updateOne", "updateMany"], + delete: ["deleteOne", "deleteMany"], + aggregate: ["json", "pipeline"], + }, + }, + }, + } + if (environment.SELF_HOSTED) { + schema.datasource = { + ...schema.datasource, + //@ts-ignore + tls: { + type: DatasourceFieldType.FIELD_GROUP, + display: "Configure SSL", + fields: { + tlsCertificateFile: { + type: DatasourceFieldType.STRING, + required: false, + display: "Certificate file path", + }, + tlsCertificateKeyFile: { + type: DatasourceFieldType.STRING, + required: false, + display: "Certificate Key file path", + }, + tlsCAFile: { + type: DatasourceFieldType.STRING, + required: false, + display: "CA file path", + }, + }, + }, + } + } + return schema } +const SCHEMA: Integration = getSchema() + class MongoIntegration implements IntegrationBase { private config: MongoDBConfig private client: any constructor(config: MongoDBConfig) { this.config = config - this.client = new MongoClient(config.connectionString) + const options: MongoClientOptions = { + tlsCertificateFile: config.tlsCertificateFile || undefined, + tlsCertificateKeyFile: config.tlsCertificateKeyFile || undefined, + tlsCAFile: config.tlsCAFile || undefined, + } + this.client = new MongoClient(config.connectionString, options) } async connect() { diff --git a/packages/types/src/sdk/datasources.ts b/packages/types/src/sdk/datasources.ts index 279a76446f..1847725c9d 100644 --- a/packages/types/src/sdk/datasources.ts +++ b/packages/types/src/sdk/datasources.ts @@ -33,6 +33,7 @@ export enum DatasourceFieldType { OBJECT = "object", JSON = "json", FILE = "file", + FIELD_GROUP = "fieldGroup", } export enum SourceName { @@ -95,6 +96,16 @@ export interface ExtraQueryConfig { } } +export interface DatasourceConfig { + [key: string]: { + type: string + display?: string + required?: boolean + default?: any + deprecated?: boolean + } +} + export interface Integration { docs: string plus?: boolean @@ -104,7 +115,7 @@ export interface Integration { friendlyName: string type?: string iconUrl?: string - datasource: {} + datasource: DatasourceConfig query: { [key: string]: QueryDefinition } From 496a984215737242f7558fb98f48e096f3929b25 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 23 Jan 2023 16:56:43 +0000 Subject: [PATCH 5/6] v2.2.12-alpha.34 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 14 +++++++------- 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, 35 insertions(+), 35 deletions(-) diff --git a/lerna.json b/lerna.json index 74eaa3e18a..7c81df52ba 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 30fd97c124..f0bcbd54cb 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.33", + "@budibase/types": "2.2.12-alpha.34", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index cea1075963..ed4f9a93b7 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.2.12-alpha.33", + "version": "2.2.12-alpha.34", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", + "@budibase/string-templates": "2.2.12-alpha.34", "@spectrum-css/accordion": "3.0.24", - "@budibase/string-templates": "2.2.12-alpha.33", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/avatar": "3.0.2", @@ -90,4 +90,4 @@ "loader-utils": "1.4.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/builder/package.json b/packages/builder/package.json index 38f18cea0e..69c0c1dc3c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,14 +71,14 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.33", - "@budibase/client": "2.2.12-alpha.33", - "@budibase/frontend-core": "2.2.12-alpha.33", - "@budibase/string-templates": "2.2.12-alpha.33", + "@budibase/bbui": "2.2.12-alpha.34", + "@budibase/client": "2.2.12-alpha.34", + "@budibase/frontend-core": "2.2.12-alpha.34", + "@budibase/string-templates": "2.2.12-alpha.34", "@sentry/browser": "5.19.1", + "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", - "@spectrum-css/accordion": "^3.0.24", "codemirror": "^5.59.0", "dayjs": "^1.11.2", "downloadjs": "1.4.7", @@ -124,4 +124,4 @@ "vite": "^3.0.8" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} \ No newline at end of file +} diff --git a/packages/cli/package.json b/packages/cli/package.json index d4ebbeaee1..46064d7a52 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "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.2.12-alpha.33", - "@budibase/string-templates": "2.2.12-alpha.33", - "@budibase/types": "2.2.12-alpha.33", + "@budibase/backend-core": "2.2.12-alpha.34", + "@budibase/string-templates": "2.2.12-alpha.34", + "@budibase/types": "2.2.12-alpha.34", "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 19ca5d6b69..f1b384e3a6 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "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.2.12-alpha.33", - "@budibase/frontend-core": "2.2.12-alpha.33", - "@budibase/string-templates": "2.2.12-alpha.33", + "@budibase/bbui": "2.2.12-alpha.34", + "@budibase/frontend-core": "2.2.12-alpha.34", + "@budibase/string-templates": "2.2.12-alpha.34", "@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 48987c620b..a612ab26b3 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.33", + "@budibase/bbui": "2.2.12-alpha.34", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 26699b8bb1..0a1c37690e 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 02b805d97a..2761abbaa6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "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.2.12-alpha.33", - "@budibase/client": "2.2.12-alpha.33", + "@budibase/backend-core": "2.2.12-alpha.34", + "@budibase/client": "2.2.12-alpha.34", "@budibase/pro": "2.2.12-alpha.33", - "@budibase/string-templates": "2.2.12-alpha.33", - "@budibase/types": "2.2.12-alpha.33", + "@budibase/string-templates": "2.2.12-alpha.34", + "@budibase/types": "2.2.12-alpha.34", "@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 89350c4ba3..e0d2f109e2 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "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 95ed13050b..657430c8bf 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "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 bf62d79396..d12b8c884b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.33", + "@budibase/backend-core": "2.2.12-alpha.34", "@budibase/pro": "2.2.12-alpha.33", - "@budibase/string-templates": "2.2.12-alpha.33", - "@budibase/types": "2.2.12-alpha.33", + "@budibase/string-templates": "2.2.12-alpha.34", + "@budibase/types": "2.2.12-alpha.34", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7ef9b6c3571f29673a572fa364c936a64d04a93a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 23 Jan 2023 17:00:29 +0000 Subject: [PATCH 6/6] Update pro version to 2.2.12-alpha.34 --- 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 2761abbaa6..4440c6bd68 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.2.12-alpha.34", "@budibase/client": "2.2.12-alpha.34", - "@budibase/pro": "2.2.12-alpha.33", + "@budibase/pro": "2.2.12-alpha.34", "@budibase/string-templates": "2.2.12-alpha.34", "@budibase/types": "2.2.12-alpha.34", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 8da4fe0f19..4d6ab08f2c 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.33.tgz#c89c23b215b21ad2a5f9dff0a19d9902ce80b9ac" - integrity sha512-jDYFAw/m4sLSNGydFX9WUBcFW3+E4wRfFWU67oz4G2lqzIfVKy4MAVZdZaex1fomSJspEuH1v0b+PEB5MpUiyg== +"@budibase/backend-core@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.34.tgz#0e2042ab8b2e52bf04c672283a50e153a3157e88" + integrity sha512-cViRaNxmi3RmAOZpBlRtFEj7l6umJjgB1k8B3J6KArvdxezZmV0smQrpX4colDLJhRfm1O5vQm6oigxGgZRpXg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.33" + "@budibase/types" "2.2.12-alpha.34" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.33.tgz#e6e1c8de90a8fe25c7ea954230ba6106e7f65760" - integrity sha512-eXU1AJVYpV6Ca4t8d/5MpUvP508grVAcL5m+3qxnAXaP9nQkbxL1vvPD2etYJB6y2rR5vxxb+LZRHGQD1jnxzw== +"@budibase/pro@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.34.tgz#7978fc6b8590990fc262a861e94b5d6f11488e3e" + integrity sha512-A/GYLM/yGQMqPmli+hkOFVyc6gv+BwdnClb2Ajyak72zoyRU4pMrcI5TSGevuYEiBXbebZjOZS8TAxZNYO04Zw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.33" - "@budibase/types" "2.2.12-alpha.33" + "@budibase/backend-core" "2.2.12-alpha.34" + "@budibase/types" "2.2.12-alpha.34" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1405,10 +1405,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.33.tgz#89f8d407ef3f9484563ebf2b10515d70433614f5" - integrity sha512-crvFyeBkpw9q0C0bqDCgdvOR/e5QIia+AHNfIgW17zLaZChtTv4vNGJ3wuMy2GE6AOUx9D98tNK6lI7oJemAWA== +"@budibase/types@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.34.tgz#1f1b9993221f4f43cb300d08870a5a81736d4bd1" + integrity sha512-SWjZDUi6e2KBVPVW3ErjGSsr86/mpNrYurWyv9QVbk0leNI6K1Zlokk6CsDaHatcrRTPVdNxQBfgYzsp8gWaCQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index d12b8c884b..4f86e6d0e3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.34", - "@budibase/pro": "2.2.12-alpha.33", + "@budibase/pro": "2.2.12-alpha.34", "@budibase/string-templates": "2.2.12-alpha.34", "@budibase/types": "2.2.12-alpha.34", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index caa21ca3fb..3e85190c9b 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.33.tgz#c89c23b215b21ad2a5f9dff0a19d9902ce80b9ac" - integrity sha512-jDYFAw/m4sLSNGydFX9WUBcFW3+E4wRfFWU67oz4G2lqzIfVKy4MAVZdZaex1fomSJspEuH1v0b+PEB5MpUiyg== +"@budibase/backend-core@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.34.tgz#0e2042ab8b2e52bf04c672283a50e153a3157e88" + integrity sha512-cViRaNxmi3RmAOZpBlRtFEj7l6umJjgB1k8B3J6KArvdxezZmV0smQrpX4colDLJhRfm1O5vQm6oigxGgZRpXg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.33" + "@budibase/types" "2.2.12-alpha.34" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,23 +521,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.33.tgz#e6e1c8de90a8fe25c7ea954230ba6106e7f65760" - integrity sha512-eXU1AJVYpV6Ca4t8d/5MpUvP508grVAcL5m+3qxnAXaP9nQkbxL1vvPD2etYJB6y2rR5vxxb+LZRHGQD1jnxzw== +"@budibase/pro@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.34.tgz#7978fc6b8590990fc262a861e94b5d6f11488e3e" + integrity sha512-A/GYLM/yGQMqPmli+hkOFVyc6gv+BwdnClb2Ajyak72zoyRU4pMrcI5TSGevuYEiBXbebZjOZS8TAxZNYO04Zw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.33" - "@budibase/types" "2.2.12-alpha.33" + "@budibase/backend-core" "2.2.12-alpha.34" + "@budibase/types" "2.2.12-alpha.34" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.33.tgz#89f8d407ef3f9484563ebf2b10515d70433614f5" - integrity sha512-crvFyeBkpw9q0C0bqDCgdvOR/e5QIia+AHNfIgW17zLaZChtTv4vNGJ3wuMy2GE6AOUx9D98tNK6lI7oJemAWA== +"@budibase/types@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.34.tgz#1f1b9993221f4f43cb300d08870a5a81736d4bd1" + integrity sha512-SWjZDUi6e2KBVPVW3ErjGSsr86/mpNrYurWyv9QVbk0leNI6K1Zlokk6CsDaHatcrRTPVdNxQBfgYzsp8gWaCQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1"