From 036e355c9bd37eedd1c83547baae671473bd9ba2 Mon Sep 17 00:00:00 2001 From: gitstart Date: Thu, 18 May 2023 14:05:05 +0000 Subject: [PATCH 001/587] disable duplicate for webhook triggers automation Co-authored-by: Moshood Abidemi --- .../AutomationPanel/EditAutomationPopover.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte index 0ce9c781ac..09b9cf07db 100644 --- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte +++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte @@ -32,7 +32,12 @@
- Duplicate + Duplicate Edit Delete From bb4209cd670b142ab042168f43d8f287eaff7762 Mon Sep 17 00:00:00 2001 From: Michael Drury Date: Fri, 26 May 2023 09:21:34 +0100 Subject: [PATCH 002/587] Basic modal put together. --- .../modals/DatasourceConfigModal.svelte | 22 ++- .../modals/FetchTablesModal.svelte | 21 +++ packages/server/package.json | 2 +- packages/worker/package.json | 2 +- yarn.lock | 127 ++++++------------ 5 files changed, 79 insertions(+), 95 deletions(-) create mode 100644 packages/builder/src/components/backend/DatasourceNavigator/modals/FetchTablesModal.svelte diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte index e75109b1be..4c47720692 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte @@ -1,7 +1,14 @@ + + + + saveDatasource()} + onConfirm={() => + datasourcePlus ? saveDatasource() : fetchTablesModal.show()} onCancel={() => modal.show()} - confirmText={datasource.plus ? "Connect" : "Save and continue to query"} + confirmText={datasourcePlus ? "Connect" : "Save and continue to query"} cancelText="Back" - showSecondaryButton={datasource.plus} + showSecondaryButton={datasourcePlus} size="L" disabled={!isValid} > diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/FetchTablesModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/FetchTablesModal.svelte new file mode 100644 index 0000000000..41a1f2d2d0 --- /dev/null +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/FetchTablesModal.svelte @@ -0,0 +1,21 @@ + + + prevModal.show()} + confirmText="Continue" + cancelText="Back" + size="L" + disabled={selected.length === 0} +> + SOME TABLES HERE + diff --git a/packages/server/package.json b/packages/server/package.json index 136eeb609b..2ec1395b71 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "0.0.1", "@budibase/client": "0.0.1", - "@budibase/pro": "develop", + "@budibase/pro": "0.0.1", "@budibase/shared-core": "0.0.1", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", diff --git a/packages/worker/package.json b/packages/worker/package.json index dded20cf30..684bd8755b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "0.0.1", - "@budibase/pro": "develop", + "@budibase/pro": "0.0.1", "@budibase/string-templates": "0.0.1", "@budibase/types": "0.0.1", "@koa/router": "8.0.8", diff --git a/yarn.lock b/yarn.lock index 33225932ea..0d9d795b8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1728,47 +1728,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.6.19-alpha.4": - version "2.6.19-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.6.19-alpha.4.tgz#525dd7ba6c5db4404cf00d1165f79d34a1093826" - integrity sha512-1pfOr+J9xYawedVmvqpQ4b/8C2SQP4cKhFmSz5uErM2SCgbRj+JuzOUTPNX0vzAXPvat/kEegt79xThummDvhA== - dependencies: - "@budibase/nano" "10.1.2" - "@budibase/pouchdb-replication-stream" "1.2.10" - "@budibase/types" "2.6.19-alpha.4" - "@shopify/jest-koa-mocks" "5.0.1" - "@techpass/passport-openidconnect" "0.3.2" - aws-cloudfront-sign "2.2.0" - aws-sdk "2.1030.0" - bcrypt "5.0.1" - bcryptjs "2.4.3" - bull "4.10.1" - correlation-id "4.0.0" - dotenv "16.0.1" - emitter-listener "1.1.2" - ioredis "4.28.0" - joi "17.6.0" - jsonwebtoken "9.0.0" - koa-passport "4.1.4" - koa-pino-logger "4.0.0" - lodash "4.17.21" - lodash.isarguments "3.1.0" - node-fetch "2.6.7" - passport-google-oauth "2.0.0" - passport-jwt "4.0.0" - passport-local "1.0.0" - passport-oauth2-refresh "^2.1.0" - pino "8.11.0" - pino-http "8.3.3" - posthog-node "1.3.0" - pouchdb "7.3.0" - pouchdb-find "7.2.2" - redlock "4.2.0" - sanitize-s3-objectkey "0.0.1" - semver "7.3.7" - tar-fs "2.1.1" - uuid "8.3.2" - "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1869,32 +1828,6 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@develop": - version "2.6.19-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.19-alpha.4.tgz#5d4c885ac9ac4ccfb2f8896961aca903c1178750" - integrity sha512-iu2QzV8Z77c00muBSK+NVsZdug3lLD0lR+vcKancGEz1PPE4yNIH7g8jB6i8h9agArbx9S2ICeHQqGb6nQaGHQ== - dependencies: - "@budibase/backend-core" "2.6.19-alpha.4" - "@budibase/shared-core" "2.6.19-alpha.4" - "@budibase/string-templates" "2.6.19-alpha.4" - "@budibase/types" "2.6.19-alpha.4" - "@koa/router" "8.0.8" - bull "4.10.1" - joi "17.6.0" - jsonwebtoken "8.5.1" - lru-cache "^7.14.1" - memorystream "^0.3.1" - node-fetch "^2.6.1" - scim-patch "^0.7.0" - scim2-parse-filter "^0.2.8" - -"@budibase/shared-core@2.6.19-alpha.4": - version "2.6.19-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/shared-core/-/shared-core-2.6.19-alpha.4.tgz#dd22dd0a18ee4d6739b629f461e5caec90706282" - integrity sha512-ac6iWSsgz70OYbdA+QHPLpTnRbIZ4OecVc6Y7gnEZ78hZ4S5da8a+73jswuy0/t4YsiT/gjukjzjoihg3NemVg== - dependencies: - "@budibase/types" "2.6.19-alpha.4" - "@budibase/standard-components@^0.9.139": version "0.9.139" resolved "https://registry.yarnpkg.com/@budibase/standard-components/-/standard-components-0.9.139.tgz#cf8e2b759ae863e469e50272b3ca87f2827e66e3" @@ -1913,25 +1846,6 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@2.6.19-alpha.4": - version "2.6.19-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.6.19-alpha.4.tgz#92ebd69a6841174b8af91f338c4754ca7c402707" - integrity sha512-KsH3NlQcJibRj98Q8zQ3KQHhfSIWPQfvR80MmBTIe05llEZGox4re4pQQUnlMafaUEyNNtIqVnbTJ1XP0LmFng== - 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.15" - -"@budibase/types@2.6.19-alpha.4": - version "2.6.19-alpha.4" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.6.19-alpha.4.tgz#bcf81699329d3f8509e4b0a489211f35b6cfa7ce" - integrity sha512-qFsXHZTSigcfCv02aTZGsf17vBT/MC+zK9ky7WZVX4h0sJiE0li4A66/tMaSDz3/vQ7ToPRhJK/p+LOWA/oceg== - dependencies: - scim-patch "^0.7.0" - "@bull-board/api@3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af" @@ -3543,6 +3457,11 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/sourcemap-codec@^1.4.13": + version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== + "@jridgewell/trace-mapping@0.3.9": version "0.3.9" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" @@ -4323,7 +4242,7 @@ dependencies: slash "^3.0.0" -"@rollup/plugin-commonjs@^16.0.0": +"@rollup/plugin-commonjs@16.0.0", "@rollup/plugin-commonjs@^16.0.0": version "16.0.0" resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-16.0.0.tgz#169004d56cd0f0a1d0f35915d31a036b0efe281f" integrity sha512-LuNyypCP3msCGVQJ7ki8PqYdpjfEkE/xtFa5DqlF+7IBD0JsfMZ87C58heSwIMint58sAUZbt3ITqOmdQv/dXw== @@ -4406,6 +4325,22 @@ "@rollup/pluginutils" "^3.1.0" magic-string "^0.25.7" +"@rollup/plugin-replace@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz#45f53501b16311feded2485e98419acb8448c61d" + integrity sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA== + dependencies: + "@rollup/pluginutils" "^5.0.1" + magic-string "^0.27.0" + +"@rollup/plugin-typescript@8.3.0": + version "8.3.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.3.0.tgz#bc1077fa5897b980fc27e376c4e377882c63e68b" + integrity sha512-I5FpSvLbtAdwJ+naznv+B4sjXZUcIvLLceYpITAn7wAP8W0wqc5noLdGIp9HGVntNhRWXctwPYrSSFQxtl0FPA== + dependencies: + "@rollup/pluginutils" "^3.1.0" + resolve "^1.17.0" + "@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" @@ -12433,7 +12368,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== -fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.2: +fsevents@^2.1.2, fsevents@^2.3.2, fsevents@~2.3.1, fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -17481,6 +17416,13 @@ magic-string@^0.26.2: dependencies: sourcemap-codec "^1.4.8" +magic-string@^0.27.0: + version "0.27.0" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3" + integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA== + dependencies: + "@jridgewell/sourcemap-codec" "^1.4.13" + make-dir@3.1.0, make-dir@^3.0.0, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" @@ -22307,6 +22249,13 @@ rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.6.0, dependencies: estree-walker "^0.6.1" +rollup@2.45.2: + version "2.45.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.45.2.tgz#8fb85917c9f35605720e92328f3ccbfba6f78b48" + integrity sha512-kRRU7wXzFHUzBIv0GfoFFIN3m9oteY4uAsKllIpQDId5cfnkWF2J130l+27dzDju0E6MScKiV0ZM5Bw8m4blYQ== + optionalDependencies: + fsevents "~2.3.1" + rollup@^2.36.2, rollup@^2.44.0, rollup@^2.45.2, rollup@^2.79.1: version "2.79.1" resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" @@ -24312,7 +24261,7 @@ timed-out@^4.0.1: resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f" integrity sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA== -timekeeper@2.2.0: +timekeeper@2.2.0, timekeeper@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/timekeeper/-/timekeeper-2.2.0.tgz#9645731fce9e3280a18614a57a9d1b72af3ca368" integrity sha512-W3AmPTJWZkRwu+iSNxPIsLZ2ByADsOLbbLxe46UJyWj3mlYLlwucKiq+/dPm0l9wTzqoF3/2PH0AGFCebjq23A== From a330e606bf1a8c655d2c0abbc1528d99b295f438 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 5 Jun 2023 15:17:06 +0100 Subject: [PATCH 003/587] Removing merge artifact. --- .../DatasourceNavigator/modals/DatasourceConfigModal.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte index 1696a1870b..52051fe134 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte @@ -75,7 +75,6 @@ title={`Connect to ${name}`} onConfirm={() => datasourcePlus ? saveDatasource() : fetchTablesModal.show()} - onCancel={() => modal.show()} confirmText={datasourcePlus ? "Connect" : "Save and continue to query"} cancelText="Back" showSecondaryButton={datasourcePlus} From 96f44c0a863569fbf8050f0bd460a38a1ff98488 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 5 Jun 2023 17:40:12 +0100 Subject: [PATCH 004/587] Reworking implementation to a single modal, that changes content rather than progressing to a new modal. --- .../modals/DatasourceConfigModal.svelte | 87 +++++++++++-------- .../modals/FetchTablesModal.svelte | 21 ----- packages/frontend-core/src/api/datasources.js | 11 +++ 3 files changed, 61 insertions(+), 58 deletions(-) delete mode 100644 packages/builder/src/components/backend/DatasourceNavigator/modals/FetchTablesModal.svelte diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte index 52051fe134..e9d23ff0c7 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte @@ -1,14 +1,7 @@ - - - - - datasourcePlus ? saveDatasource() : fetchTablesModal.show()} - confirmText={datasourcePlus ? "Connect" : "Save and continue to query"} - cancelText="Back" + {title} + onConfirm={() => nextStep()} + {confirmText} + cancelText={fetchTableStep ? "Cancel" : "Back"} showSecondaryButton={datasourcePlus} size="L" disabled={!isValid} > - - Connect your database to Budibase using the config below. - - - (isValid = e.detail)} - /> + {#if !fetchTableStep} + + Connect your database to Budibase using the config below. + + + (isValid = e.detail)} + /> + {:else} + Some stuff here + {/if} diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/FetchTablesModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/FetchTablesModal.svelte deleted file mode 100644 index 41a1f2d2d0..0000000000 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/FetchTablesModal.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - - prevModal.show()} - confirmText="Continue" - cancelText="Back" - size="L" - disabled={selected.length === 0} -> - SOME TABLES HERE - diff --git a/packages/frontend-core/src/api/datasources.js b/packages/frontend-core/src/api/datasources.js index 16d19c512f..f7554f64b0 100644 --- a/packages/frontend-core/src/api/datasources.js +++ b/packages/frontend-core/src/api/datasources.js @@ -69,4 +69,15 @@ export const buildDatasourceEndpoints = API => ({ body: { datasource }, }) }, + + /** + * Fetch table names available within the datasource, for filtering out undesired tables + * @param datasource the datasource configuration to use for fetching tables + */ + fetchTablesForDatasource: async datasource => { + return await API.post({ + url: `/api/datasources/tables`, + body: { datasource }, + }) + }, }) From b57557760dd060db96091fa4cc2970e1bfb44525 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 5 Jun 2023 18:36:50 +0100 Subject: [PATCH 005/587] Updating fancy forms to be usable for data table fetching designs. --- .../bbui/src/FancyForm/FancyCheckbox.svelte | 14 +++++++++-- packages/bbui/src/FancyForm/FancyField.svelte | 4 +-- packages/bbui/src/FancyForm/FancyForm.svelte | 12 ++++++++- .../DatasourceNavigator/icons/index.js | 3 +++ .../modals/DatasourceConfigModal.svelte | 25 +++++++++++++++++-- 5 files changed, 51 insertions(+), 7 deletions(-) diff --git a/packages/bbui/src/FancyForm/FancyCheckbox.svelte b/packages/bbui/src/FancyForm/FancyCheckbox.svelte index 191cc79485..21fdb9d7a9 100644 --- a/packages/bbui/src/FancyForm/FancyCheckbox.svelte +++ b/packages/bbui/src/FancyForm/FancyCheckbox.svelte @@ -8,6 +8,8 @@ export let disabled = false export let error = null export let validate = null + export let compact = false + export let noMaxWidth const dispatch = createEventDispatcher() @@ -21,7 +23,16 @@ } - + @@ -39,7 +50,6 @@ } .text { font-size: 15px; - line-height: 17px; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; diff --git a/packages/bbui/src/FancyForm/FancyField.svelte b/packages/bbui/src/FancyForm/FancyField.svelte index 0c99394599..10d847248d 100644 --- a/packages/bbui/src/FancyForm/FancyField.svelte +++ b/packages/bbui/src/FancyForm/FancyField.svelte @@ -61,7 +61,7 @@ From 410d8700e4555c414b50f19b0d626758e030ce2b Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Mon, 5 Jun 2023 18:42:44 +0100 Subject: [PATCH 006/587] Add more tests for user settings --- qa-core/src/internal-api/api/apis/SelfAPI.ts | 18 +++++++++++++++--- .../tests/users/userManagement.spec.ts | 16 ++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/qa-core/src/internal-api/api/apis/SelfAPI.ts b/qa-core/src/internal-api/api/apis/SelfAPI.ts index cd162053a1..022a438249 100644 --- a/qa-core/src/internal-api/api/apis/SelfAPI.ts +++ b/qa-core/src/internal-api/api/apis/SelfAPI.ts @@ -14,10 +14,11 @@ export default class SelfAPI extends BaseAPI { return [response, json] } - async changeSelfPassword(body: Partial): Promise<[Response, User]> { + async changeSelfPassword(): Promise<[Response, User]> { + const body = { + password: "newPassword", + } const [response, json] = await this.post(`/global/self`, body) - expect(json._id).toEqual(body._id) - expect(json._rev).not.toEqual(body._rev) return [response, json] } @@ -26,4 +27,15 @@ export default class SelfAPI extends BaseAPI { expect(json).toHaveProperty("apiKey") return json } + + async changeUserInfo(body: Partial): Promise<[Response, User]> { + const [response, json] = await this.post(`/global/self`, body) + return [response, json] + } + + async generateApiKey(): Promise<[Response, ApiKeyResponse]> { + const [response, json] = await this.post(`/global/self/api_key`) + expect(json).toHaveProperty("apiKey") + return [response, json] + } } diff --git a/qa-core/src/internal-api/tests/users/userManagement.spec.ts b/qa-core/src/internal-api/tests/users/userManagement.spec.ts index 28096c08c9..d1bada05c0 100644 --- a/qa-core/src/internal-api/tests/users/userManagement.spec.ts +++ b/qa-core/src/internal-api/tests/users/userManagement.spec.ts @@ -87,4 +87,20 @@ describe("Internal API - User Management & Permissions", () => { expect(changedUserInfoJson.builder?.global).toBeDefined() expect(changedUserInfoJson.builder?.global).toEqual(true) }) + + it("Set First and Last Name", async () => { + const body: Partial = { + firstName: "newFirstName", + lastName: "newLastName", + } + await config.api.self.changeUserInfo(body) + }) + + it("Generate API key", async () => { + await config.api.self.generateApiKey() + }) + + it("Change Password", async () => { + await config.api.self.changeSelfPassword() + }) }) From 7afbce696baf48b7ba89038ba150a5ea947544b9 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 5 Jun 2023 18:18:08 +0100 Subject: [PATCH 007/587] Create listbox component --- packages/bbui/src/ListBox/Checkbox.svelte | 62 ++++++++++++++ packages/bbui/src/ListBox/ListBox.svelte | 99 +++++++++++++++++++++++ packages/bbui/src/index.js | 1 + 3 files changed, 162 insertions(+) create mode 100644 packages/bbui/src/ListBox/Checkbox.svelte create mode 100644 packages/bbui/src/ListBox/ListBox.svelte diff --git a/packages/bbui/src/ListBox/Checkbox.svelte b/packages/bbui/src/ListBox/Checkbox.svelte new file mode 100644 index 0000000000..3548e4868e --- /dev/null +++ b/packages/bbui/src/ListBox/Checkbox.svelte @@ -0,0 +1,62 @@ + + + + + diff --git a/packages/bbui/src/ListBox/ListBox.svelte b/packages/bbui/src/ListBox/ListBox.svelte new file mode 100644 index 0000000000..04b563160e --- /dev/null +++ b/packages/bbui/src/ListBox/ListBox.svelte @@ -0,0 +1,99 @@ + + +
+ {#if options && Array.isArray(options)} + {#if showSelectAll} +
+ +
+ {/if} + {#each options as option} +
+ +
+ {/each} + {/if} +
+ + diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index d26b938dd5..f1b2e58870 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -78,6 +78,7 @@ export { default as IconSideNavItem } from "./IconSideNav/IconSideNavItem.svelte export { default as Slider } from "./Form/Slider.svelte" export { default as Accordion } from "./Accordion/Accordion.svelte" export { default as File } from "./Form/File.svelte" +export { default as ListBox } from "./ListBox/ListBox.svelte" // Renderers export { default as BoldRenderer } from "./Table/BoldRenderer.svelte" From b7fd069d00962233fe10f6fb89164e7c2e77aa59 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 6 Jun 2023 13:49:11 +0100 Subject: [PATCH 008/587] Fixing endpoint to info from tables for datasource fetching. --- packages/frontend-core/src/api/datasources.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/frontend-core/src/api/datasources.js b/packages/frontend-core/src/api/datasources.js index f7554f64b0..fec897555c 100644 --- a/packages/frontend-core/src/api/datasources.js +++ b/packages/frontend-core/src/api/datasources.js @@ -74,9 +74,9 @@ export const buildDatasourceEndpoints = API => ({ * Fetch table names available within the datasource, for filtering out undesired tables * @param datasource the datasource configuration to use for fetching tables */ - fetchTablesForDatasource: async datasource => { + fetchInfoForDatasource: async datasource => { return await API.post({ - url: `/api/datasources/tables`, + url: `/api/datasources/info`, body: { datasource }, }) }, From f37c49e8afdbbd3c7df05626d22168d7837560e3 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 6 Jun 2023 16:16:09 +0100 Subject: [PATCH 009/587] Initial commit --- .../src/components/start/AppRow.svelte | 2 +- .../builder/app/[application]/_layout.svelte | 78 ++++------- .../automate/[automationId]/_layout.svelte | 15 -- .../automate/[automationId]/index.svelte | 5 - .../app/[application]/automate/_layout.svelte | 131 ------------------ .../app/[application]/automate/index.svelte | 10 -- .../pages/builder/portal/apps/index.svelte | 5 +- 7 files changed, 31 insertions(+), 215 deletions(-) delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/[automationId]/_layout.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/[automationId]/index.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte delete mode 100644 packages/builder/src/pages/builder/app/[application]/automate/index.svelte diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index 142c5c6e31..50e6b8466a 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -22,7 +22,7 @@ } const goToOverview = () => { - $goto(`../overview/${app.devId}`) + $goto(`../../app/${app.devId}/settings`) } diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index f13aa3dab6..d10657bdbe 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -12,6 +12,7 @@ Heading, Modal, notifications, + Button, } from "@budibase/bbui" import AppActions from "components/deploy/AppActions.svelte" import { API } from "api" @@ -144,53 +145,14 @@
{#if $store.initialised}
- -
- -
- $goto("../../portal/apps")}> - Exit to portal - - $goto(`../../portal/overview/${application}`)} - > - Overview - - - $goto(`../../portal/overview/${application}/access`)} - > - Access - - - $goto(`../../portal/overview/${application}/automation-history`)} - > - Automation history - - - $goto(`../../portal/overview/${application}/backups`)} - > - Backups - - - - $goto(`../../portal/overview/${application}/name-and-url`)} - > - Name and URL - - - $goto(`../../portal/overview/${application}/version`)} - > - Version - - - {$store.name} -
-
+ + $goto("../../portal/apps")} + /> + {#if $store.hasLock} {#each $layout.children as { path, title }} @@ -212,6 +174,9 @@
{/if}
+
+ {$store.name} +
@@ -236,6 +201,13 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/automate/index.svelte b/packages/builder/src/pages/builder/app/[application]/automate/index.svelte deleted file mode 100644 index ea2c853139..0000000000 --- a/packages/builder/src/pages/builder/app/[application]/automate/index.svelte +++ /dev/null @@ -1,10 +0,0 @@ - diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 8b8451f036..f2ea7b3896 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -100,7 +100,10 @@ const params = new URLSearchParams({ open: "error", }) - $goto(`../overview/${appId}/automation-history?${params.toString()}`) + $goto( + `/builder/app/${appId}/settings/automation-history?${params.toString()}` + ) + // $goto(`../overview/${appId}/automation-history?${params.toString()}`) } const errorCount = errors => { From 05851f6b19ad819a9c88b6a43ae8884ba0d18b61 Mon Sep 17 00:00:00 2001 From: gitstart Date: Tue, 6 Jun 2023 15:18:15 +0000 Subject: [PATCH 010/587] Fix CSV encoding issue Co-authored-by: Benjamin Mayanja --- .../components/backend/DataTable/modals/ExportModal.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte index 6cefe244bf..95586a384b 100644 --- a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte @@ -130,7 +130,10 @@ notifications.error("Export Failed") } if (response) { - download(response, `export.${exportFormat}`) + download( + new Blob([response], { type: "text/plain" }), + `export.${exportFormat}` + ) notifications.success("Export Successful") } } else { From e1b63842e5e50be106371fd165b704d2a177f9e0 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 6 Jun 2023 16:24:30 +0100 Subject: [PATCH 011/587] Adding in relocated screen components --- .../automation/[automationId]/_layout.svelte | 15 + .../automation/[automationId]/index.svelte | 5 + .../[application]/automation/_layout.svelte | 131 +++++++ .../app/[application]/automation/index.svelte | 10 + .../app/[application]/settings/_layout.svelte | 74 ++++ .../_components/HistoryDetailsPanel.svelte | 82 +++++ .../_components/StatusRenderer.svelte | 27 ++ .../settings/automation-history/index.svelte | 262 ++++++++++++++ .../_components/ActionsRenderer.svelte | 87 +++++ .../_components/AppSizeRenderer.svelte | 41 +++ .../_components/CreateRestoreModal.svelte | 27 ++ .../_components/DatasourceRenderer.svelte | 21 ++ .../backups/_components/StatusRenderer.svelte | 15 + .../_components/TimeAgoRenderer.svelte | 10 + .../backups/_components/TypeRenderer.svelte | 36 ++ .../backups/_components/UserRenderer.svelte | 18 + .../settings/backups/index.svelte | 340 ++++++++++++++++++ .../app/[application]/settings/embed.svelte | 23 ++ .../app/[application]/settings/index.svelte | 4 + .../settings/name-and-url.svelte | 79 ++++ .../app/[application]/settings/version.svelte | 39 ++ 21 files changed, 1346 insertions(+) create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/automation/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/AppSizeRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/CreateRestoreModal.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/embed.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/settings/version.svelte diff --git a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte new file mode 100644 index 0000000000..3be71a1bbe --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte @@ -0,0 +1,15 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte new file mode 100644 index 0000000000..1a15ed48c6 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte @@ -0,0 +1,5 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte new file mode 100644 index 0000000000..79ca5df168 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte @@ -0,0 +1,131 @@ + + + +
+ +
+ {#if $automationStore.automations?.length} + + {:else} +
+
+ + + + + You have no automations + Let's fix that. Call the bots! + + +
+
+ {/if} +
+ + {#if $automationStore.showTestPanel} +
+ +
+ {/if} + + + + + + +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/automation/index.svelte b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte new file mode 100644 index 0000000000..ea2c853139 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte @@ -0,0 +1,10 @@ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte new file mode 100644 index 0000000000..3c0299d50a --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte @@ -0,0 +1,74 @@ + + + +
+ + + + + + + + + + + + + + +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte new file mode 100644 index 0000000000..5b9c925130 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte @@ -0,0 +1,82 @@ + + +{#if history} + +
+ + +
+ + {history.automationName} + + + {#if history.status === STOPPED_ERROR} +
+ +
+ {/if} + {#if exists} +
+ +
+ {/if} + {#key history} +
+ +
+ {/key} + +{:else} + No details found +{/if} + + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte new file mode 100644 index 0000000000..f041faa349 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte @@ -0,0 +1,27 @@ + + + + {info.message} + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte new file mode 100644 index 0000000000..c1c6be997b --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte @@ -0,0 +1,262 @@ + + + + + Automation History + View the automations your app has executed + + + +
+
+
+ +
+
+ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte new file mode 100644 index 0000000000..198339dae9 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/DatasourceRenderer.svelte @@ -0,0 +1,21 @@ + + +
+ {#if value != null} + +
{value || 0}
+ {/if} +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte new file mode 100644 index 0000000000..3b3cce731d --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/StatusRenderer.svelte @@ -0,0 +1,15 @@ + + + + {status} + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte new file mode 100644 index 0000000000..fd67b4010b --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TimeAgoRenderer.svelte @@ -0,0 +1,10 @@ + + +{dayjs(value).fromNow()} diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte new file mode 100644 index 0000000000..86ad0f3d4e --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte @@ -0,0 +1,36 @@ + + +
+ {printTrigger(trigger)} + {type} +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte new file mode 100644 index 0000000000..399877a801 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/UserRenderer.svelte @@ -0,0 +1,18 @@ + + +
+ +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte new file mode 100644 index 0000000000..1d612117e2 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte @@ -0,0 +1,340 @@ + + + + +
+ Backups + {#if !$licensing.backupsEnabled} + + Premium + + {/if} +
+ Back up your apps and restore them to their previous state + + + + {#if !$licensing.backupsEnabled} + {#if !$auth.accountPortalAccess && $admin.cloud} + Contact your account holder to upgrade your plan. + {/if} +
+ {#if $auth.accountPortalAccess} + + {/if} + +
+ {:else if !backupData?.length && !loading && !filterOpt && !startDate} +
+ + BackupsDefault + + You have no backups yet + You can manually back up your app any time + +
+ +
+ +
+ {:else} + +
+
+
+ - - - - - - {text} - - - diff --git a/packages/bbui/src/ListBox/ListBox.svelte b/packages/bbui/src/ListBox/ListBox.svelte deleted file mode 100644 index 04b563160e..0000000000 --- a/packages/bbui/src/ListBox/ListBox.svelte +++ /dev/null @@ -1,99 +0,0 @@ - - -
- {#if options && Array.isArray(options)} - {#if showSelectAll} -
- -
- {/if} - {#each options as option} -
- -
- {/each} - {/if} -
- - diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index f1b2e58870..d26b938dd5 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -78,7 +78,6 @@ export { default as IconSideNavItem } from "./IconSideNav/IconSideNavItem.svelte export { default as Slider } from "./Form/Slider.svelte" export { default as Accordion } from "./Accordion/Accordion.svelte" export { default as File } from "./Form/File.svelte" -export { default as ListBox } from "./ListBox/ListBox.svelte" // Renderers export { default as BoldRenderer } from "./Table/BoldRenderer.svelte" diff --git a/packages/builder/src/builderStore/datasource.js b/packages/builder/src/builderStore/datasource.js index 6509216a5b..10f1facb1c 100644 --- a/packages/builder/src/builderStore/datasource.js +++ b/packages/builder/src/builderStore/datasource.js @@ -41,6 +41,10 @@ export async function createRestDatasource(integration) { export async function validateDatasourceConfig(config) { const datasource = prepareData(config) - const resp = await API.validateDatasource(datasource) - return resp + return await API.validateDatasource(datasource) +} + +export async function getDatasourceInfo(config) { + const datasource = prepareData(config) + return await API.fetchInfoForDatasource(datasource) } diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte index 481dd29856..626c61ea5f 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte @@ -13,6 +13,7 @@ import { saveDatasource as save, validateDatasourceConfig, + getDatasourceInfo, } from "builderStore/datasource" import { DatasourceFeature } from "@budibase/types" @@ -22,7 +23,10 @@ let datasource = cloneDeep(integration) let isValid = false let fetchTableStep = false + let selectedTables = [] + let tableList = [] + $: console.log(selectedTables) $: name = IntegrationNames[datasource?.type] || datasource?.name || datasource?.type $: datasourcePlus = datasource?.plus @@ -78,6 +82,8 @@ } if (datasourcePlus) { notifications.success("Connected to datasource successfully.") + const info = await getDatasourceInfo(datasource) + tableList = info.tableNames fetchTableStep = true return false } else { @@ -110,7 +116,7 @@ /> {:else}
- +
{/if} diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 75b33083fb..4660d05b1e 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -174,7 +174,7 @@ export async function information( } const tableNames = await connector.getTableNames() ctx.body = { - tableNames, + tableNames: tableNames.sort(), } } diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts index 47295716e6..33ecf45982 100644 --- a/packages/server/src/integrations/postgres.ts +++ b/packages/server/src/integrations/postgres.ts @@ -322,7 +322,8 @@ class PostgresIntegration extends Sql implements DatasourcePlus { await this.openConnection() const columnsResponse: { rows: PostgresColumn[] } = await this.client.query(this.COLUMNS_SQL) - return columnsResponse.rows.map(row => row.table_name) + const names = columnsResponse.rows.map(row => row.table_name) + return [...new Set(names)] } finally { await this.closeConnection() } From b2633dc2dbcbfdf45e42efc36dbf37b449f2dae1 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 6 Jun 2023 17:46:40 +0100 Subject: [PATCH 015/587] Binding drawer fixes --- .../components/backend/DataTable/formula.js | 4 ++ .../common/bindings/BindingPanel.svelte | 42 ++++++++++--------- .../common/bindings/BindingPicker.svelte | 11 ++--- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/formula.js b/packages/builder/src/components/backend/DataTable/formula.js index 9fd5949178..43e8dc721e 100644 --- a/packages/builder/src/components/backend/DataTable/formula.js +++ b/packages/builder/src/components/backend/DataTable/formula.js @@ -76,6 +76,10 @@ export function getBindings({ // will be replaced by the main array binding readableBinding: label, runtimeBinding: binding, + display: { + name: label, + type: field.name === FIELDS.LINK.name ? "Array" : field.name, + }, }) } return bindings diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index 3843eabf45..07b3ce18b4 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -339,25 +339,29 @@ {/if}
- - + {#if drawerActions?.hide} + + {/if} + {#if bindingDrawerActions?.save} + + {/if}
diff --git a/packages/builder/src/components/common/bindings/BindingPicker.svelte b/packages/builder/src/components/common/bindings/BindingPicker.svelte index 0f709fd262..50e7c66682 100644 --- a/packages/builder/src/components/common/bindings/BindingPicker.svelte +++ b/packages/builder/src/components/common/bindings/BindingPicker.svelte @@ -36,7 +36,7 @@ .map(([name, categoryBindings]) => ({ name, bindings: categoryBindings?.filter(binding => { - return binding.readableBinding.match(searchRgx) + return !search || binding.readableBinding.match(searchRgx) }), })) .filter(category => { @@ -46,7 +46,11 @@ ) }) $: filteredHelpers = helpers?.filter(helper => { - return helper.label.match(searchRgx) || helper.description.match(searchRgx) + return ( + !search || + helper.label.match(searchRgx) || + helper.description.match(searchRgx) + ) }) const getHelperExample = (helper, js) => { @@ -124,9 +128,6 @@ { - if (!search) { - return - } search = null }} class:searching={search} From dab1db227154cd3ae72a89c73f9e17b3c8c911b5 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 6 Jun 2023 18:27:03 +0100 Subject: [PATCH 016/587] Updating datasource save API to allow specifying a filter for which tables to fetch and then linking this up with the new frontend. --- .../builder/src/builderStore/datasource.js | 5 +- .../modals/DatasourceConfigModal.svelte | 8 ++- .../builder/src/stores/backend/datasources.js | 6 ++- packages/frontend-core/src/api/datasources.js | 5 +- .../server/src/api/controllers/datasource.ts | 49 ++++++++++--------- packages/types/src/api/web/app/datasource.ts | 1 + 6 files changed, 46 insertions(+), 28 deletions(-) diff --git a/packages/builder/src/builderStore/datasource.js b/packages/builder/src/builderStore/datasource.js index 10f1facb1c..49250d2628 100644 --- a/packages/builder/src/builderStore/datasource.js +++ b/packages/builder/src/builderStore/datasource.js @@ -23,10 +23,11 @@ function prepareData(config) { return datasource } -export async function saveDatasource(config, skipFetch = false) { +export async function saveDatasource(config, { skipFetch, tablesFilter } = {}) { const datasource = prepareData(config) // Create datasource - const resp = await datasources.save(datasource, !skipFetch && datasource.plus) + const fetchSchema = !skipFetch && datasource.plus + const resp = await datasources.save(datasource, { fetchSchema, tablesFilter }) // update the tables incase datasource plus await tables.fetch() diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte index 626c61ea5f..3ab0b17840 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte @@ -62,7 +62,11 @@ if (!datasource.name) { datasource.name = name } - const resp = await save(datasource) + const opts = {} + if (datasourcePlus && selectedTables) { + opts.tablesFilter = selectedTables + } + const resp = await save(datasource, opts) $goto(`./datasource/${resp._id}`) notifications.success("Datasource created successfully.") } catch (err) { @@ -80,7 +84,7 @@ if (!connected) { return false } - if (datasourcePlus) { + if (datasourcePlus && !fetchTableStep) { notifications.success("Connected to datasource successfully.") const info = await getDatasourceInfo(datasource) tableList = info.tableNames diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js index 0815f9d766..e774aae8c6 100644 --- a/packages/builder/src/stores/backend/datasources.js +++ b/packages/builder/src/stores/backend/datasources.js @@ -57,7 +57,10 @@ export function createDatasourcesStore() { return updateDatasource(response) } - const save = async (body, fetchSchema = false) => { + const save = async (body, { fetchSchema, tablesFilter } = {}) => { + if (fetchSchema == null) { + fetchSchema = false + } let response if (body._id) { response = await API.updateDatasource(body) @@ -65,6 +68,7 @@ export function createDatasourcesStore() { response = await API.createDatasource({ datasource: body, fetchSchema, + tablesFilter, }) } return updateDatasource(response) diff --git a/packages/frontend-core/src/api/datasources.js b/packages/frontend-core/src/api/datasources.js index fec897555c..1ba17cc610 100644 --- a/packages/frontend-core/src/api/datasources.js +++ b/packages/frontend-core/src/api/datasources.js @@ -26,13 +26,16 @@ export const buildDatasourceEndpoints = API => ({ * Creates a datasource * @param datasource the datasource to create * @param fetchSchema whether to fetch the schema or not + * @param tablesFilter a list of tables to actually fetch rather than simply + * all that are accessible. */ - createDatasource: async ({ datasource, fetchSchema }) => { + createDatasource: async ({ datasource, fetchSchema, tablesFilter }) => { return await API.post({ url: "/api/datasources", body: { datasource, fetchSchema, + tablesFilter, }, }) }, diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 4660d05b1e..bbbcf96538 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -103,6 +103,22 @@ async function buildSchemaHelper(datasource: Datasource) { return { tables: connector.tables, error } } +async function buildFilteredSchema(datasource: Datasource, filter?: string[]) { + let { tables, error } = await buildSchemaHelper(datasource) + let finalTables = tables + if (filter) { + finalTables = {} + for (let key in tables) { + if ( + filter.some((filter: any) => filter.toLowerCase() === key.toLowerCase()) + ) { + finalTables[key] = tables[key] + } + } + } + return { tables: finalTables, error } +} + export async function fetch(ctx: UserCtx) { // Get internal tables const db = context.getAppDB() @@ -180,37 +196,22 @@ export async function information( export async function buildSchemaFromDb(ctx: UserCtx) { const db = context.getAppDB() - const datasource = await sdk.datasources.get(ctx.params.datasourceId) const tablesFilter = ctx.request.body.tablesFilter + const datasource = await sdk.datasources.get(ctx.params.datasourceId) - let { tables, error } = await buildSchemaHelper(datasource) - if (tablesFilter) { - if (!datasource.entities) { - datasource.entities = {} - } - for (let key in tables) { - if ( - tablesFilter.some( - (filter: any) => filter.toLowerCase() === key.toLowerCase() - ) - ) { - datasource.entities[key] = tables[key] - } - } - } else { - datasource.entities = tables - } + const { tables, error } = await buildFilteredSchema(datasource, tablesFilter) + datasource.entities = tables setDefaultDisplayColumns(datasource) const dbResp = await db.put(datasource) datasource._rev = dbResp.rev const cleanedDatasource = await sdk.datasources.removeSecretSingle(datasource) - const response: any = { datasource: cleanedDatasource } + const res: any = { datasource: cleanedDatasource } if (error) { - response.error = error + res.error = error } - ctx.body = response + ctx.body = res } /** @@ -320,6 +321,7 @@ export async function save( const db = context.getAppDB() const plus = ctx.request.body.datasource.plus const fetchSchema = ctx.request.body.fetchSchema + const tablesFilter = ctx.request.body.tablesFilter const datasource = { _id: generateDatasourceID({ plus }), @@ -329,7 +331,10 @@ export async function save( let schemaError = null if (fetchSchema) { - const { tables, error } = await buildSchemaHelper(datasource) + const { tables, error } = await buildFilteredSchema( + datasource, + tablesFilter + ) schemaError = error datasource.entities = tables setDefaultDisplayColumns(datasource) diff --git a/packages/types/src/api/web/app/datasource.ts b/packages/types/src/api/web/app/datasource.ts index d692f17421..d0688a24d3 100644 --- a/packages/types/src/api/web/app/datasource.ts +++ b/packages/types/src/api/web/app/datasource.ts @@ -12,6 +12,7 @@ export interface UpdateDatasourceResponse { export interface CreateDatasourceRequest { datasource: Datasource fetchSchema?: boolean + tablesFilter: string[] } export interface VerifyDatasourceRequest { From ae1f7ae21a2815f78a10e5fde8a4815b3c53b268 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 6 Jun 2023 18:50:50 +0100 Subject: [PATCH 017/587] Changing copy around datasource creation modals. --- .../modals/DatasourceConfigModal.svelte | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte index 3ab0b17840..acc04e4da3 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte @@ -106,12 +106,16 @@ size="L" disabled={!isValid} > + + + {#if !fetchTableStep} + Connect your database to Budibase using the config below + {:else} + Choose what tables you want to sync with Budibase + {/if} + + {#if !fetchTableStep} - - Connect your database to Budibase using the config below. - - Date: Wed, 7 Jun 2023 06:43:30 +0000 Subject: [PATCH 018/587] Update other places where download is used Co-authored-by: v1b3m --- .../backend/DataTable/modals/ExportModal.svelte | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte index 95586a384b..ac168698fc 100644 --- a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte @@ -92,13 +92,20 @@ }, } + function downloadWithBlob(data, filename) { + download(new Blob([data], { type: "text/plain" }), filename) + } + async function exportView() { try { const data = await API.exportView({ viewName: view, format: exportFormat, }) - download(data, `export.${exportFormat === "csv" ? "csv" : "json"}`) + downloadWithBlob( + data, + `export.${exportFormat === "csv" ? "csv" : "json"}` + ) } catch (error) { notifications.error(`Unable to export ${exportFormat.toUpperCase()} data`) } @@ -111,7 +118,7 @@ rows: selectedRows.map(row => row._id), format: exportFormat, }) - download(data, `export.${exportFormat}`) + downloadWithBlob(data, `export.${exportFormat}`) } else if (filters || sorting) { let response try { @@ -130,10 +137,7 @@ notifications.error("Export Failed") } if (response) { - download( - new Blob([response], { type: "text/plain" }), - `export.${exportFormat}` - ) + downloadWithBlob(response, `export.${exportFormat}`) notifications.success("Export Successful") } } else { From 1e3883b2137dd4f88e81c304422b1bbdf42f0755 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 7 Jun 2023 09:35:07 +0100 Subject: [PATCH 019/587] Added missing headless flag for the bindable combobox --- .../components/common/bindings/DrawerBindableCombobox.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte index bb01d557b8..55f7866453 100644 --- a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte +++ b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte @@ -76,7 +76,7 @@ {/if}
- + Add the objects on the left to enrich your text. From ee1d76110396689bb5409823048c6032253fde81 Mon Sep 17 00:00:00 2001 From: Dean Date: Wed, 7 Jun 2023 09:44:55 +0100 Subject: [PATCH 020/587] Fix for QueryEditor width --- packages/builder/src/components/integration/QueryEditor.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/builder/src/components/integration/QueryEditor.svelte b/packages/builder/src/components/integration/QueryEditor.svelte index f543438b9c..51fdb4879e 100644 --- a/packages/builder/src/components/integration/QueryEditor.svelte +++ b/packages/builder/src/components/integration/QueryEditor.svelte @@ -186,7 +186,6 @@ } div :global(.CodeMirror) { - width: var(--code-mirror-width) !important; height: var(--code-mirror-height) !important; border-radius: var(--border-radius-s); font-family: var(--font-mono); From 4d013056aaaf46749683d6ff63d0667ec26bdd87 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 7 Jun 2023 10:24:16 +0100 Subject: [PATCH 021/587] Fix svelte transitions in grid new row component breaking routify --- .../src/components/grid/layout/NewRow.svelte | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte index 85b430f79b..40e43c2ed9 100644 --- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte @@ -148,9 +148,9 @@ class:floating={offset > 0} style="--offset:{offset}px; --sticky-width:{width}px;" > -
-
-
+
+
+
{#if isAdding} @@ -179,7 +179,7 @@ {/if}
-
+
{#each $renderedColumns as column, columnIdx} @@ -209,7 +209,7 @@
-
+
@@ -246,4 +245,8 @@ display: flex; gap: var(--spacing-m); } + + .table-checkboxes { + width: 100%; + } diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts index c886e6a15f..028f8e7e93 100644 --- a/packages/server/src/sdk/app/datasources/datasources.ts +++ b/packages/server/src/sdk/app/datasources/datasources.ts @@ -164,5 +164,6 @@ export function mergeConfigs(update: Datasource, old: Datasource) { delete update.config[key] } } + return update } From 5b312b32b4c1bf34ff45497b7263b2b702487c7c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 7 Jun 2023 17:57:56 +0000 Subject: [PATCH 045/587] Bump version to 2.7.7 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 891d732bf7..7aa8fe4547 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.6", + "version": "2.7.7", "npmClient": "yarn", "packages": [ "packages/backend-core", From 5820996e4d55e4c1ffb5dd4ffc5e2ea528fa097c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 8 Jun 2023 08:35:36 +0100 Subject: [PATCH 046/587] Update grid flags to allow readonly modifications of schema --- packages/client/src/components/app/GridBlock.svelte | 3 +-- .../src/components/grid/cells/HeaderCell.svelte | 4 ++-- .../src/components/grid/controls/AddColumnButton.svelte | 2 +- .../frontend-core/src/components/grid/layout/Grid.svelte | 9 +++------ .../src/components/grid/layout/HeaderRow.svelte | 2 +- .../frontend-core/src/components/grid/stores/columns.js | 6 ++++-- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index aae41b30c6..3bf7fef231 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -21,9 +21,8 @@ {allowEditRows} {allowDeleteRows} showControls={false} - allowAddColumns={false} - allowEditColumns={false} allowExpandRows={false} + allowSchemaChanges={false} />
diff --git a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte index 21ee210233..db2e1a729b 100644 --- a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte @@ -163,7 +163,7 @@ Edit column @@ -171,7 +171,7 @@ icon="Label" on:click={makeDisplayColumn} disabled={idx === "sticky" || - !$config.allowEditColumns || + !$config.allowSchemaChanges || bannedDisplayColumnTypes.includes(column.schema.type)} > Use as display column diff --git a/packages/frontend-core/src/components/grid/controls/AddColumnButton.svelte b/packages/frontend-core/src/components/grid/controls/AddColumnButton.svelte index 6ad241eb65..20125bc49c 100644 --- a/packages/frontend-core/src/components/grid/controls/AddColumnButton.svelte +++ b/packages/frontend-core/src/components/grid/controls/AddColumnButton.svelte @@ -10,7 +10,7 @@ quiet size="M" on:click={() => dispatch("add-column")} - disabled={!$config.allowAddColumns} + disabled={!$config.allowSchemaChanges} > Add column diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index ae4409ddca..e33cb65940 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -35,11 +35,10 @@ export let tableId = null export let schemaOverrides = null export let allowAddRows = true - export let allowAddColumns = true - export let allowEditColumns = true export let allowExpandRows = true export let allowEditRows = true export let allowDeleteRows = true + export let allowSchemaChanges = true export let stripeRows = false export let collaboration = true export let showAvatars = true @@ -53,8 +52,7 @@ const schemaOverridesStore = writable(schemaOverrides) const config = writable({ allowAddRows, - allowAddColumns, - allowEditColumns, + allowSchemaChanges, allowExpandRows, allowEditRows, allowDeleteRows, @@ -88,8 +86,7 @@ $: schemaOverridesStore.set(schemaOverrides) $: config.set({ allowAddRows, - allowAddColumns, - allowEditColumns, + allowSchemaChanges, allowExpandRows, allowEditRows, allowDeleteRows, diff --git a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte index 9d6cc2275b..c22ee511a3 100644 --- a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte @@ -29,7 +29,7 @@ {/each}
- {#if $config.allowAddColumns} + {#if $config.allowSchemaChanges}
{ } export const deriveStores = context => { - const { table, columns, stickyColumn, API, dispatch } = context + const { table, columns, stickyColumn, API, dispatch, config } = context // Updates the tables primary display column const changePrimaryDisplay = async column => { @@ -95,7 +95,9 @@ export const deriveStores = context => { dispatch("updatetable", newTable) // Update server - await API.saveTable(newTable) + if (get(config).allowSchemaChanges) { + await API.saveTable(newTable) + } } return { From 9021a095b1a91d5daa80ce44b173408e477abb55 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 8 Jun 2023 10:56:21 +0100 Subject: [PATCH 047/587] Create datasource on the second step --- .../modals/GoogleDatasourceConfigModal.svelte | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index 39185350e0..83806153c9 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -21,6 +21,7 @@ import { saveDatasource } from "builderStore/datasource" import { DatasourceFeature } from "@budibase/types" + import { API } from "api" export let integration export let continueSetupId = false @@ -50,20 +51,6 @@ let allSheets let selectedSheets - const saveDatasourceAndRedirect = async () => { - try { - const resp = await saveDatasource(datasource, { - tablesFilter: selectedSheets, - }) - $goto(`./datasource/${resp._id}`) - notifications.success(`Datasource created successfully.`) - } catch (err) { - notifications.error(err?.message ?? "Error saving datasource") - // prevent the modal from closing - return false - } - } - $: modalConfig = { [GoogleDatasouceConfigStep.AUTH]: { title: `Connect to ${integrationName}`, @@ -82,8 +69,21 @@ } } + try { + const resp = await saveDatasource(datasource, { + tablesFilter: selectedSheets, + skipFetch: true, + }) + datasource = resp + } catch (err) { + notifications.error(err?.message ?? "Error saving datasource") + // prevent the modal from closing + return false + } + if (!integration.features[DatasourceFeature.FETCH_TABLE_NAMES]) { - saveDatasourceAndRedirect() + $goto(`./datasource/${datasource._id}`) + notifications.success(`Datasource created successfully.`) return } @@ -107,7 +107,23 @@ ? "Fetch sheets" : "Continue without fetching", onConfirm: async () => { - await saveDatasourceAndRedirect() + try { + if (selectedSheets.length) { + await API.buildDatasourceSchema({ + datasourceId: datasource._id, + tablesFilter: selectedSheets, + }) + } + + $goto(`./datasource/${datasource._id}`) + } catch (err) { + notifications.error(err?.message ?? "Error fetching the sheets") + // prevent the modal from closing + return false + } + }, + onCancel: async () => { + $goto(`./datasource/${datasource._id}`) }, }, } @@ -120,6 +136,7 @@ confirmText={modalConfig[step].confirmButtonText} showConfirmButton={!!modalConfig[step].onConfirm} onConfirm={modalConfig[step].onConfirm} + onCancel={modalConfig[step].onCancel} disabled={!isValid} > {#if step === GoogleDatasouceConfigStep.AUTH} From a9787ff6081e4b55e69667d05e2925af7c46c1f0 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 8 Jun 2023 12:00:34 +0100 Subject: [PATCH 048/587] fix REST connector failure to save --- .../DatasourceNavigator/modals/DatasourceConfigModal.svelte | 2 +- .../[application]/data/datasource/[datasourceId]/index.svelte | 2 +- packages/server/src/sdk/app/datasources/datasources.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte index 21c7e07a25..31a0d21cd8 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte @@ -37,7 +37,7 @@ } async function saveDatasource() { - if (integration.features[DatasourceFeature.CONNECTION_CHECKING]) { + if (integration.features?.[DatasourceFeature.CONNECTION_CHECKING]) { const valid = await validateConfig() if (!valid) { return false diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte index a853fcea0c..c70ab492c4 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte @@ -65,7 +65,7 @@ } const saveDatasource = async () => { - if (integration.features[DatasourceFeature.CONNECTION_CHECKING]) { + if (integration.features?.[DatasourceFeature.CONNECTION_CHECKING]) { const valid = await validateConfig() if (!valid) { return false diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts index c886e6a15f..25b05e351e 100644 --- a/packages/server/src/sdk/app/datasources/datasources.ts +++ b/packages/server/src/sdk/app/datasources/datasources.ts @@ -135,7 +135,7 @@ export function mergeConfigs(update: Datasource, old: Datasource) { // specific to REST datasources, fix the auth configs again if required if (hasAuthConfigs(update)) { const configs = update.config.authConfigs as RestAuthConfig[] - const oldConfigs = old.config?.authConfigs as RestAuthConfig[] + const oldConfigs = old.config?.authConfigs as RestAuthConfig[] || [] for (let config of configs) { if (config.type !== RestAuthType.BASIC) { continue From e4500c8e897586a79274bdd1edbad742cbe45d71 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 8 Jun 2023 11:15:10 +0000 Subject: [PATCH 049/587] Bump version to 2.7.8 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 7aa8fe4547..ea653cbc00 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.7", + "version": "2.7.8", "npmClient": "yarn", "packages": [ "packages/backend-core", From fa64ca3d6b0a99f708d02fa085136f15b41b177e Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 8 Jun 2023 12:44:41 +0100 Subject: [PATCH 050/587] lint --- packages/server/src/sdk/app/datasources/datasources.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts index 25b05e351e..74c2ff7eb0 100644 --- a/packages/server/src/sdk/app/datasources/datasources.ts +++ b/packages/server/src/sdk/app/datasources/datasources.ts @@ -135,7 +135,7 @@ export function mergeConfigs(update: Datasource, old: Datasource) { // specific to REST datasources, fix the auth configs again if required if (hasAuthConfigs(update)) { const configs = update.config.authConfigs as RestAuthConfig[] - const oldConfigs = old.config?.authConfigs as RestAuthConfig[] || [] + const oldConfigs = (old.config?.authConfigs as RestAuthConfig[]) || [] for (let config of configs) { if (config.type !== RestAuthType.BASIC) { continue From 15c236110181b990daa74641c327fc8cfdbd15d8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 8 Jun 2023 11:48:43 +0000 Subject: [PATCH 051/587] Bump version to 2.7.9 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index ea653cbc00..3b1bf49547 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.8", + "version": "2.7.9", "npmClient": "yarn", "packages": [ "packages/backend-core", From 532583e66eb87e7f8826ce82ae6c569e37c2edf2 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 8 Jun 2023 13:47:16 +0100 Subject: [PATCH 052/587] Fixing develop currentapp.spec.js test case, when packages within backend-core import all of backend-core they can create cyclics that cause issues. --- .../src/middleware/passport/datasource/google.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/backend-core/src/middleware/passport/datasource/google.ts b/packages/backend-core/src/middleware/passport/datasource/google.ts index 2f91e01d9a..ae6b3b4913 100644 --- a/packages/backend-core/src/middleware/passport/datasource/google.ts +++ b/packages/backend-core/src/middleware/passport/datasource/google.ts @@ -1,10 +1,11 @@ import * as google from "../sso/google" import { Cookie } from "../../../constants" -import { clearCookie, getCookie } from "../../../utils" import * as configs from "../../../configs" -import { BBContext, SSOProfile } from "@budibase/types" +import * as cache from "../../../cache" +import * as utils from "../../../utils" +import { UserCtx, SSOProfile } from "@budibase/types" import { ssoSaveUserNoOp } from "../sso/sso" -import { cache, utils } from "../../../" + const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy type Passport = { @@ -22,7 +23,7 @@ async function fetchGoogleCreds() { export async function preAuth( passport: Passport, - ctx: BBContext, + ctx: UserCtx, next: Function ) { // get the relevant config @@ -49,7 +50,7 @@ export async function preAuth( export async function postAuth( passport: Passport, - ctx: BBContext, + ctx: UserCtx, next: Function ) { // get the relevant config @@ -57,7 +58,7 @@ export async function postAuth( const platformUrl = await configs.getPlatformUrl({ tenantAware: false }) let callbackUrl = `${platformUrl}/api/global/auth/datasource/google/callback` - const authStateCookie = getCookie(ctx, Cookie.DatasourceAuth) + const authStateCookie = utils.getCookie(ctx, Cookie.DatasourceAuth) return passport.authenticate( new GoogleStrategy( @@ -72,7 +73,7 @@ export async function postAuth( _profile: SSOProfile, done: Function ) => { - clearCookie(ctx, Cookie.DatasourceAuth) + utils.clearCookie(ctx, Cookie.DatasourceAuth) done(null, { accessToken, refreshToken }) } ), From e1ede8edbe120576eafb57488fc78f86555083c3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 8 Jun 2023 13:09:49 +0000 Subject: [PATCH 053/587] Bump version to 2.7.7-alpha.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 11719e4275..7e8c55649b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.7-alpha.0", + "version": "2.7.7-alpha.1", "npmClient": "yarn", "packages": [ "packages/backend-core", From c0578d4cc2a5999fa56f9289455349cf8c3dd1f3 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Thu, 8 Jun 2023 14:25:35 +0100 Subject: [PATCH 054/587] Send meeting invite via automation email smtp (#10787) * Pass calendar props into sendSmtpEmail * Add calendar event to message * Add Checkbox and DatePicker automation field UI * Add URL prop * Add url to sendSmtpEmail unit test * Refactor * Code review comments * Make location optional * Add EmailInvite type --------- Co-authored-by: mike12345567 --- .../SetupPanel/AutomationBlockSetup.svelte | 412 ++++++++++-------- .../src/automations/steps/sendSmtpEmail.ts | 59 ++- .../automations/tests/sendSmtpEmail.spec.js | 71 --- .../automations/tests/sendSmtpEmail.spec.ts | 74 ++++ .../server/src/utilities/workerRequests.ts | 29 +- .../types/src/documents/app/automation.ts | 30 ++ packages/worker/package.json | 1 + .../src/api/controllers/global/email.ts | 2 + packages/worker/src/utilities/email.ts | 41 +- yarn.lock | 12 + 10 files changed, 437 insertions(+), 294 deletions(-) delete mode 100644 packages/server/src/automations/tests/sendSmtpEmail.spec.js create mode 100644 packages/server/src/automations/tests/sendSmtpEmail.spec.ts diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 6ab750c3d6..a8fa700b90 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -13,6 +13,8 @@ Modal, notifications, Icon, + Checkbox, + DatePicker, } from "@budibase/bbui" import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte" import { automationStore, selectedAutomation } from "builderStore" @@ -306,6 +308,11 @@ drawer.hide() } + function canShowField(key, value) { + const dependsOn = value.dependsOn + return !dependsOn || !!inputData[dependsOn] + } + onMount(async () => { try { await environment.loadVariables() @@ -317,210 +324,233 @@
{#each deprecatedSchemaProperties as [key, value]} -
- {#if key !== "fields"} - - {/if} - {#if value.type === "string" && value.enum} - onChange(e, key)} - value={inputData[key]} - options={Object.keys(table?.schema || {})} - /> - {:else if value.customType === "filters"} - Define filters - - - (tempFilters = e.detail)} - /> - - {:else if value.customType === "password"} - onChange(e, key)} - value={inputData[key]} - /> - {:else if value.customType === "email"} - {#if isTestModal} - onChange(e, key)} - {bindings} - fillWidth - updateOnChange={false} - /> - {:else} - onChange(e, key)} - {bindings} - allowJS={false} - updateOnChange={false} - drawerLeft="260px" - /> + {#if canShowField(key, value)} +
+ {#if key !== "fields" && value.type !== "boolean"} + {/if} - {:else if value.customType === "query"} - onChange(e, key)} - value={inputData[key]} - /> - {:else if value.customType === "cron"} - onChange(e, key)} value={inputData[key]} /> - {:else if value.customType === "queryParams"} - onChange(e, key)} - value={inputData[key]} - {bindings} - /> - {:else if value.customType === "table"} - onChange(e, key)} - /> - {:else if value.customType === "row"} - { - if (e.detail?.key) { - onChange(e, e.detail.key) - } else { - onChange(e, key) - } - }} - {bindings} - {isTestModal} - {isUpdateRow} - /> - {:else if value.customType === "webhookUrl"} - onChange(e, key)} - value={inputData[key]} - /> - {:else if value.customType === "fields"} - onChange(e, key)} - {bindings} - {isTestModal} - /> - {:else if value.customType === "triggerSchema"} - onChange(e, key)} value={inputData[key]} /> - {:else if value.customType === "code"} - - { - // need to pass without the value inside - onChange({ detail: e.detail }, key) - inputData[key] = e.detail - }} - completions={[ - jsAutocomplete([ - ...bindingsToCompletions(bindings, EditorModes.JS), - ]), - ]} - mode={EditorModes.JS} - height={500} - /> -
- -
-
Add available bindings by typing $
-
-
- - {:else if value.customType === "loopOption"} - onChange(e, key)} + value={inputData[key]} + options={Object.keys(table?.schema || {})} + /> + {:else if value.customType === "filters"} + Define filters + + + (tempFilters = e.detail)} + /> + + {:else if value.customType === "password"} + onChange(e, key)} + value={inputData[key]} + /> + {:else if value.customType === "email"} + {#if isTestModal} + onChange(e, key)} + {bindings} + fillWidth + updateOnChange={false} + /> + {:else} onChange(e, key)} {bindings} + allowJS={false} updateOnChange={false} - placeholder={value.customType === "queryLimit" ? queryLimit : ""} drawerLeft="260px" /> -
+ {/if} + {:else if value.customType === "query"} + onChange(e, key)} + value={inputData[key]} + /> + {:else if value.customType === "cron"} + onChange(e, key)} + value={inputData[key]} + /> + {:else if value.customType === "queryParams"} + onChange(e, key)} + value={inputData[key]} + {bindings} + /> + {:else if value.customType === "table"} + onChange(e, key)} + /> + {:else if value.customType === "row"} + { + if (e.detail?.key) { + onChange(e, e.detail.key) + } else { + onChange(e, key) + } + }} + {bindings} + {isTestModal} + {isUpdateRow} + /> + {:else if value.customType === "webhookUrl"} + onChange(e, key)} + value={inputData[key]} + /> + {:else if value.customType === "fields"} + onChange(e, key)} + {bindings} + {isTestModal} + /> + {:else if value.customType === "triggerSchema"} + onChange(e, key)} + value={inputData[key]} + /> + {:else if value.customType === "code"} + + { + // need to pass without the value inside + onChange({ detail: e.detail }, key) + inputData[key] = e.detail + }} + completions={[ + jsAutocomplete([ + ...bindingsToCompletions(bindings, EditorModes.JS), + ]), + ]} + mode={EditorModes.JS} + height={500} + /> +
+ +
+
Add available bindings by typing $
+
+
+ + {:else if value.customType === "loopOption"} + devToolsStore.actions.changeRole(e.detail)} /> {#if !$context.device.mobile} - + {/if} + window.parent.closePreview?.()} + > + Exit preview +
From 3439ac6aaf67c6bbd4d3ef9266d1cf8a82201fcd Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 9 Jun 2023 11:03:49 +0100 Subject: [PATCH 058/587] Improve background colour usage with preview modal --- packages/client/src/components/ClientApp.svelte | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index 51e0f4f550..f9ecb495d1 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -105,6 +105,7 @@ lang="en" dir="ltr" class="spectrum spectrum--medium {$themeStore.baseTheme} {$themeStore.theme}" + class:builder={$builderStore.inBuilder} > @@ -221,12 +222,14 @@ overflow: hidden; height: 100%; width: 100%; - background: transparent; display: flex; flex-direction: row; justify-content: center; align-items: center; } + #spectrum-root.builder { + background: transparent; + } #clip-root { max-width: 100%; From e452c0bcd12adf594f8c37968b17df43f55f9fd2 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 9 Jun 2023 11:40:34 +0100 Subject: [PATCH 059/587] Update command palette preview action to open new preview --- .../builder/src/components/commandPalette/CommandPalette.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/commandPalette/CommandPalette.svelte b/packages/builder/src/components/commandPalette/CommandPalette.svelte index ae946dc10c..3a369446a3 100644 --- a/packages/builder/src/components/commandPalette/CommandPalette.svelte +++ b/packages/builder/src/components/commandPalette/CommandPalette.svelte @@ -69,7 +69,7 @@ name: "App", description: "", icon: "Play", - action: () => window.open(`/${$store.appId}`), + action: () => store.update(state => ({ ...state, showPreview: true })), }, { type: "Preview", From 462ae1c89426e36f2c9da5ab81b6396bec718e4e Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 9 Jun 2023 11:41:55 +0100 Subject: [PATCH 060/587] Update builder blur transition duration to match other animations --- .../builder/src/pages/builder/app/[application]/_layout.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index a13236c4f5..ee3f6e877e 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -253,7 +253,7 @@ width: 100%; display: flex; flex-direction: column; - transition: filter 130ms ease-out; + transition: filter 260ms ease-out; } .root.blur { filter: blur(8px); From 795d8a5875809cf44dfadaddfbc5e772312c6023 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 9 Jun 2023 11:42:10 +0100 Subject: [PATCH 061/587] Merge commit --- .../app/[application]/settings/_layout.svelte | 29 ++------- .../settings/automation-history/index.svelte | 10 ++- .../app/[application]/settings/embed.svelte | 62 +++++++++++++++++-- .../app/[application]/settings/index.svelte | 16 ++++- 4 files changed, 87 insertions(+), 30 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte index 3c0299d50a..f853e95baa 100644 --- a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte @@ -1,27 +1,10 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte index c1c6be997b..6ab2744dbb 100644 --- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/index.svelte @@ -190,7 +190,15 @@ />
- {#if (licensePlan?.type !== Constants.PlanType.ENTERPRISE && $auth.user.accountPortalAccess) || !$admin.cloud} + + + {` acc portal access ${$auth.user.accountPortalAccess} `} + + {#if (!$licensing.isEnterprisePlan && $auth.user.accountPortalAccess) || !$admin.cloud} diff --git a/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte b/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte index 9e450557c4..90be8d0803 100644 --- a/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte +++ b/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte @@ -1,23 +1,75 @@ Embed - View the automations your app has executed + Embed your app into your other tools of choice +
+
{embed}
+ {#if appDeployed} +
+ +
+ {:else} +
+ Embeds will only work with a published app +
+ {/if} +
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/index.svelte index a99eb55f7a..df88627420 100644 --- a/packages/builder/src/pages/builder/app/[application]/settings/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/settings/index.svelte @@ -1,4 +1,18 @@ From 6836ca8573c1025bba859db413743058f1013aed Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 9 Jun 2023 11:47:05 +0100 Subject: [PATCH 062/587] Merge commit --- packages/builder/src/stores/portal/licensing.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index ded77894f9..e94e7d2e21 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -76,7 +76,16 @@ export const createLicensingStore = () => { await actions.setQuotaUsage() }, setNavigation: () => { - const upgradeUrl = `${get(admin).accountPortalUrl}/portal/upgrade` + //"/builder/portal/account/upgrade" + const adminStore = get(admin) + const authStore = get(auth) + + //Add cloud check here too??? + + const upgradeUrl = authStore?.user?.accountPortalAccess + ? `${adminStore.accountPortalUrl}/portal/upgrade` + : "/builder/portal/account/upgrade" + const goToUpgradePage = () => { window.location.href = upgradeUrl } From 26d3c93b3069dceb5a84ddb601ffa579fb050fc4 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 9 Jun 2023 11:48:19 +0100 Subject: [PATCH 063/587] Update devtools header text --- packages/client/src/components/devtools/DevToolsHeader.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/devtools/DevToolsHeader.svelte b/packages/client/src/components/devtools/DevToolsHeader.svelte index fe02283841..4297eac2cf 100644 --- a/packages/client/src/components/devtools/DevToolsHeader.svelte +++ b/packages/client/src/components/devtools/DevToolsHeader.svelte @@ -53,7 +53,7 @@ icon="Close" on:click={() => window.parent.closePreview?.()} > - Exit preview + Close preview
From 0bd35be8614268711dc3aebb04ee35d11f5a73d0 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 9 Jun 2023 11:57:17 +0100 Subject: [PATCH 064/587] Navigate when the modal is closed and the datasource was created --- .../modals/GoogleDatasourceConfigModal.svelte | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index 83806153c9..819d1e7d2d 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -10,7 +10,7 @@ import { IntegrationNames, IntegrationTypes } from "constants/backend" import GoogleButton from "../_components/GoogleButton.svelte" import { organisation } from "stores/portal" - import { onMount } from "svelte" + import { onMount, onDestroy } from "svelte" import { validateDatasourceConfig, getDatasourceInfo, @@ -34,6 +34,7 @@ onMount(async () => { await organisation.init() }) + const integrationName = IntegrationNames[IntegrationTypes.GOOGLE_SHEETS] export const GoogleDatasouceConfigStep = { @@ -82,7 +83,6 @@ } if (!integration.features[DatasourceFeature.FETCH_TABLE_NAMES]) { - $goto(`./datasource/${datasource._id}`) notifications.success(`Datasource created successfully.`) return } @@ -115,18 +115,22 @@ }) } - $goto(`./datasource/${datasource._id}`) + return } catch (err) { notifications.error(err?.message ?? "Error fetching the sheets") // prevent the modal from closing return false } }, - onCancel: async () => { - $goto(`./datasource/${datasource._id}`) - }, }, } + + // This will handle the user closing the modal pressing outside the modal + onDestroy(async () => { + if (step === GoogleDatasouceConfigStep.SET_SHEETS) { + await $goto(`./datasource/${datasource._id}`) + } + }) {#if step === GoogleDatasouceConfigStep.AUTH} From 86fa2626498c47c81c99360640f1fc679d7b49ee Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 9 Jun 2023 12:00:16 +0100 Subject: [PATCH 065/587] Fix flash --- .../modals/GoogleDatasourceConfigModal.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index 819d1e7d2d..5733a8c015 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -29,6 +29,8 @@ let datasource = cloneDeep(integration) datasource.config.continueSetupId = continueSetupId + let { schema } = datasource + $: isGoogleConfigured = !!$organisation.googleDatasourceConfigured onMount(async () => { @@ -164,7 +166,7 @@ Add the URL of the sheet you want to connect. (isValid = e.detail)} From a875c09979d9acb66e7ff9f67476e444c143cfe0 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 9 Jun 2023 12:23:48 +0100 Subject: [PATCH 066/587] Display error --- .../modals/GoogleDatasourceConfigModal.svelte | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index 5733a8c015..a482d20258 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -6,6 +6,7 @@ Link, notifications, FancyCheckboxGroup, + InlineAlert, } from "@budibase/bbui" import { IntegrationNames, IntegrationTypes } from "constants/backend" import GoogleButton from "../_components/GoogleButton.svelte" @@ -53,6 +54,7 @@ let allSheets let selectedSheets + let setSheetsErrorTitle, setSheetsErrorMessage $: modalConfig = { [GoogleDatasouceConfigStep.AUTH]: { @@ -119,7 +121,19 @@ return } catch (err) { - notifications.error(err?.message ?? "Error fetching the sheets") + const message = err?.message ?? "Error fetching the sheets" + // Handling message with format: Error title - error description + const indexSeparator = message.indexOf(" - ") + if (indexSeparator >= 0) { + setSheetsErrorTitle = message.substr(0, indexSeparator) + setSheetsErrorMessage = + message[indexSeparator + 3].toUpperCase() + + message.substr(indexSeparator + 4) + } else { + setSheetsErrorTitle = null + setSheetsErrorMessage = message + } + // prevent the modal from closing return false } @@ -182,6 +196,14 @@ bind:selected={selectedSheets} selectAllText="Select all sheets" /> + + {#if setSheetsErrorTitle || setSheetsErrorMessage} + + {/if} {/if} From 8492ef18fa56d0600b35b5bd6b3b70d921e8293d Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 9 Jun 2023 12:36:09 +0100 Subject: [PATCH 067/587] Ignore 409 errors on user syncs --- packages/server/src/events/docUpdates/syncUsers.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/server/src/events/docUpdates/syncUsers.ts b/packages/server/src/events/docUpdates/syncUsers.ts index 7957178168..5777445249 100644 --- a/packages/server/src/events/docUpdates/syncUsers.ts +++ b/packages/server/src/events/docUpdates/syncUsers.ts @@ -26,6 +26,10 @@ export default function process(updateCb?: UpdateCallback) { // if something not found - no changes to perform if (err?.status === 404) { return + } + // The user has already been sync in another process + else if (err?.status === 409) { + return } else { logging.logAlert("Failed to perform user/group app sync", err) } From 0aa3e19d095b1623972e3c269e0fa332c7d5cdd7 Mon Sep 17 00:00:00 2001 From: Pedro Silva Date: Fri, 9 Jun 2023 12:44:31 +0100 Subject: [PATCH 068/587] Add verifications --- .../src/internal-api/tests/users/userManagement.spec.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/qa-core/src/internal-api/tests/users/userManagement.spec.ts b/qa-core/src/internal-api/tests/users/userManagement.spec.ts index d1bada05c0..42bda21102 100644 --- a/qa-core/src/internal-api/tests/users/userManagement.spec.ts +++ b/qa-core/src/internal-api/tests/users/userManagement.spec.ts @@ -94,6 +94,11 @@ describe("Internal API - User Management & Permissions", () => { lastName: "newLastName", } await config.api.self.changeUserInfo(body) + + const [changedUserInfoResponse, changedUserInfoJson] = + await config.api.self.getSelf() + expect(changedUserInfoJson.firstName).toEqual("newFirstName") + expect(changedUserInfoJson.lastName).toEqual("newLastName") }) it("Generate API key", async () => { @@ -102,5 +107,9 @@ describe("Internal API - User Management & Permissions", () => { it("Change Password", async () => { await config.api.self.changeSelfPassword() + const [changedUserInfoResponse, changedUserInfoJson] = + await config.api.self.getSelf() + + await config.login(changedUserInfoJson.email!, "newPassword") }) }) From 24a00c66bbfdd82b23f5647cc6e2c91ca57f38c7 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Fri, 9 Jun 2023 13:01:55 +0100 Subject: [PATCH 069/587] Unexpected token when export data (#10721) * Tidy ID string for JSON parse * Display error for composite keys * Unit test WIP * directly assign the mock function on the datasource * Unit tests for exportRows ID handling --------- Co-authored-by: Martin McKeaveney --- .../src/api/controllers/row/external.ts | 12 +- .../src/api/controllers/tests/row.spec.ts | 120 ++++++++++++++++++ 2 files changed, 129 insertions(+), 3 deletions(-) create mode 100644 packages/server/src/api/controllers/tests/row.spec.ts diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts index a68586b099..44396df67b 100644 --- a/packages/server/src/api/controllers/row/external.ts +++ b/packages/server/src/api/controllers/row/external.ts @@ -237,9 +237,15 @@ export async function exportRows(ctx: UserCtx) { ctx.request.body = { query: { oneOf: { - _id: ctx.request.body.rows.map( - (row: string) => JSON.parse(decodeURI(row))[0] - ), + _id: ctx.request.body.rows.map((row: string) => { + const ids = JSON.parse( + decodeURI(row).replace(/'/g, `"`).replace(/%2C/g, ",") + ) + if (ids.length > 1) { + ctx.throw(400, "Export data does not support composite keys.") + } + return ids[0] + }), }, }, } diff --git a/packages/server/src/api/controllers/tests/row.spec.ts b/packages/server/src/api/controllers/tests/row.spec.ts new file mode 100644 index 0000000000..19e86d08be --- /dev/null +++ b/packages/server/src/api/controllers/tests/row.spec.ts @@ -0,0 +1,120 @@ +import { exportRows } from "../row/external" +import sdk from "../../../sdk" +import { ExternalRequest } from "../row/ExternalRequest" + +// @ts-ignore +sdk.datasources = { + get: jest.fn(), +} + +jest.mock("../row/ExternalRequest") +jest.mock("../view/exporters", () => ({ + csv: jest.fn(), + Format: { + CSV: "csv", + }, +})) +jest.mock("../../../utilities/fileSystem") + +function getUserCtx() { + return { + params: { + tableId: "datasource__tablename", + }, + query: { + format: "csv", + }, + request: { + body: {}, + }, + throw: jest.fn(() => { + throw "Err" + }), + attachment: jest.fn(), + } +} + +describe("external row controller", () => { + describe("exportRows", () => { + beforeAll(() => { + //@ts-ignore + jest.spyOn(ExternalRequest.prototype, "run").mockImplementation(() => []) + }) + + afterEach(() => { + jest.clearAllMocks() + }) + + it("should throw a 400 if no datasource entities are present", async () => { + let userCtx = getUserCtx() + try { + //@ts-ignore + await exportRows(userCtx) + } catch (e) { + expect(userCtx.throw).toHaveBeenCalledWith( + 400, + "Datasource has not been configured for plus API." + ) + } + }) + + it("should handle single quotes from a row ID", async () => { + //@ts-ignore + sdk.datasources.get.mockImplementation(() => ({ + entities: { + tablename: { + schema: {}, + }, + }, + })) + let userCtx = getUserCtx() + userCtx.request.body = { + rows: ["['d001']"], + } + + //@ts-ignore + await exportRows(userCtx) + + expect(userCtx.request.body).toEqual({ + query: { + oneOf: { + _id: ["d001"], + }, + }, + }) + }) + + it("should throw a 400 if any composite keys are present", async () => { + let userCtx = getUserCtx() + userCtx.request.body = { + rows: ["[123]", "['d001'%2C'10111']"], + } + try { + //@ts-ignore + await exportRows(userCtx) + } catch (e) { + expect(userCtx.throw).toHaveBeenCalledWith( + 400, + "Export data does not support composite keys." + ) + } + }) + + it("should throw a 400 if no table name was found", async () => { + let userCtx = getUserCtx() + userCtx.params.tableId = "datasource__" + userCtx.request.body = { + rows: ["[123]"], + } + try { + //@ts-ignore + await exportRows(userCtx) + } catch (e) { + expect(userCtx.throw).toHaveBeenCalledWith( + 400, + "Could not find table name." + ) + } + }) + }) +}) From b88e5ecc958d3f090bee8c4f510ec311692669c4 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Fri, 9 Jun 2023 13:02:29 +0100 Subject: [PATCH 070/587] Return all rows if oneOf value is falsey (#10638) --- packages/backend-core/src/db/lucene.ts | 3 +++ .../backend-core/src/db/tests/lucene.spec.ts | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/packages/backend-core/src/db/lucene.ts b/packages/backend-core/src/db/lucene.ts index 4660be81aa..d501bb2166 100644 --- a/packages/backend-core/src/db/lucene.ts +++ b/packages/backend-core/src/db/lucene.ts @@ -343,6 +343,9 @@ export class QueryBuilder { } const oneOf = (key: string, value: any) => { + if (!value) { + return `*:*` + } if (!Array.isArray(value)) { if (typeof value === "string") { value = value.split(",") diff --git a/packages/backend-core/src/db/tests/lucene.spec.ts b/packages/backend-core/src/db/tests/lucene.spec.ts index b4791a86e0..a82828d8f2 100644 --- a/packages/backend-core/src/db/tests/lucene.spec.ts +++ b/packages/backend-core/src/db/tests/lucene.spec.ts @@ -114,6 +114,25 @@ describe("lucene", () => { expect(resp.rows.length).toBe(2) }) + it("should return all rows when doing a one of search against falsey value", async () => { + const builder = new QueryBuilder(dbName, INDEX_NAME) + builder.addOneOf("property", null) + let resp = await builder.run() + expect(resp.rows.length).toBe(3) + + builder.addOneOf("property", undefined) + resp = await builder.run() + expect(resp.rows.length).toBe(3) + + builder.addOneOf("property", "") + resp = await builder.run() + expect(resp.rows.length).toBe(3) + + builder.addOneOf("property", []) + resp = await builder.run() + expect(resp.rows.length).toBe(0) + }) + it("should be able to perform a contains search", async () => { const builder = new QueryBuilder(dbName, INDEX_NAME) builder.addContains("property", ["word"]) From 881e3503e5fd256e0bfa405e4514b96296336f2e Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 9 Jun 2023 13:08:26 +0100 Subject: [PATCH 071/587] Lint --- .../builder/app/[application]/_components/PreviewOverlay.svelte | 2 +- packages/client/src/components/devtools/DevToolsHeader.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte index 3e01ec2526..d069d1b4c7 100644 --- a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte @@ -37,7 +37,7 @@
- ` + + + + + + + + + Export your app + Export your latest edited or published app + + +
+ exportApp({ published: false })}> + Export latest edited app + + exportApp({ published: true })} + > + Export latest published app + +
+ + + diff --git a/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte b/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte index 86af5df3bc..8228739287 100644 --- a/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte +++ b/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte @@ -13,6 +13,7 @@ import { store } from "builderStore" import { apps } from "stores/portal" import UpdateAppModal from "components/start/UpdateAppModal.svelte" + import { API } from "api" let updatingModal @@ -20,6 +21,14 @@ $: app = filteredApps.length ? filteredApps[0] : {} $: appUrl = `${window.origin}/app${app?.url}` $: appDeployed = app?.status === AppStatus.DEPLOYED + + const initialiseApp = async () => { + // In order for these changes to make it back into the app, the app package must be reinitialied + // could this have negative side affects??? + console.log("Reinitialise") + const applicationPkg = await API.fetchAppPackage(app.devId) + await store.actions.initialise(applicationPkg) + } @@ -68,7 +77,12 @@ - + { + await initialiseApp() + }} + /> diff --git a/packages/bbui/src/FancyForm/FancyField.svelte b/packages/bbui/src/FancyForm/FancyField.svelte index a4d453bb77..455f4b38fb 100644 --- a/packages/bbui/src/FancyForm/FancyField.svelte +++ b/packages/bbui/src/FancyForm/FancyField.svelte @@ -11,8 +11,7 @@ export let value export let ref export let autoHeight - export let compress - export let lighter + export let compact = false const formContext = getContext("fancy-form") const id = Math.random() @@ -40,12 +39,11 @@
@@ -65,7 +63,6 @@ diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index e33cb65940..e6550fa5a5 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -232,7 +232,7 @@ border-bottom: 2px solid var(--spectrum-global-color-gray-200); padding: var(--cell-padding); gap: var(--cell-spacing); - background: var(--background); + background: var(--spectrum-global-color-gray-100); z-index: 2; } .controls-left, diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte index 85b430f79b..4581e37746 100644 --- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte @@ -141,6 +141,17 @@ }) + +{#if !visible} +
dispatch("add-row-inline")} + transition:fade|local={{ duration: 130 }} + > + +
+{/if} + {#if visible}
+ /* New row FAB */ + .new-row-fab { + position: absolute; + top: var(--default-row-height); + left: calc(var(--gutter-width) / 2); + transform: translateX(8px) translateY(-50%); + background: var(--cell-background); + padding: 4px; + border-radius: 50%; + border: var(--cell-border); + z-index: 10; + } + .new-row-fab:hover { + background: var(--cell-background-hover); + cursor: pointer; + } + .container { position: absolute; top: var(--default-row-height); From f56bd3ad13257fbede01e1a1d9004941c526da33 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 13 Jun 2023 17:19:12 +0100 Subject: [PATCH 130/587] Fix grid loading overlay color in client apps --- packages/frontend-core/src/components/grid/layout/Grid.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index e6550fa5a5..c4828e2791 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -268,7 +268,7 @@ left: 0; width: 100%; height: 100%; - background: var(--background); + background: var(--spectrum-global-color-gray-100); opacity: 0.6; } From 68082eecf9e7529bf2bea124c402d2d781288a4a Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 13 Jun 2023 18:21:22 +0100 Subject: [PATCH 131/587] Fix for circular issue with primary display fields on SQL tables introduced in most recent update - if somehow the primary display field is set to a relationship field there was a chance of cyclic structure occurring which Koa could not convert to JSON. --- .../api/controllers/row/ExternalRequest.ts | 6 +++++- packages/server/src/integrations/utils.ts | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts index b13ec22cfd..f6b75aca05 100644 --- a/packages/server/src/api/controllers/row/ExternalRequest.ts +++ b/packages/server/src/api/controllers/row/ExternalRequest.ts @@ -19,6 +19,7 @@ import { breakRowIdField, convertRowId, generateRowIdField, + getPrimaryDisplay, isRowId, isSQL, } from "../../../integrations/utils" @@ -391,7 +392,10 @@ export class ExternalRequest { } } relatedRow = processFormulas(linkedTable, relatedRow) - const relatedDisplay = display ? relatedRow[display] : undefined + let relatedDisplay + if (display) { + relatedDisplay = getPrimaryDisplay(relatedRow[display]) + } row[relationship.column][key] = { primaryDisplay: relatedDisplay || "Invalid display column", _id: relatedRow._id, diff --git a/packages/server/src/integrations/utils.ts b/packages/server/src/integrations/utils.ts index de8b318bb1..5ff9f07b89 100644 --- a/packages/server/src/integrations/utils.ts +++ b/packages/server/src/integrations/utils.ts @@ -328,3 +328,22 @@ export function finaliseExternalTables( .reduce((r, [k, v]) => ({ ...r, [k]: v }), {}) return { tables: finalTables, errors } } + +/** + * Checks if the provided input is an object, but specifically not a date type object. + * Used during coercion of types and relationship handling, dates are considered valid + * and can be used as a display field, but objects and arrays cannot. + * @param test + */ +export function getPrimaryDisplay(test: any): string | undefined { + if (test instanceof Date) { + return test.toISOString() + } + if (Array.isArray(test) && test[0] && typeof test[0] !== "object") { + return test.join(", ") + } + if (typeof test === "object") { + return undefined + } + return test as string +} From 3be2d8beeaf8264014d60c8e8ad94f64d430a4c0 Mon Sep 17 00:00:00 2001 From: Jonny McCullagh Date: Wed, 14 Jun 2023 08:41:29 +0100 Subject: [PATCH 132/587] new deploy trigger (#10892) * point the deploys at the new env --- .github/workflows/deploy-cloud.yaml | 70 +++++++++------------------- .github/workflows/deploy-preprod.yml | 45 +++--------------- 2 files changed, 27 insertions(+), 88 deletions(-) diff --git a/.github/workflows/deploy-cloud.yaml b/.github/workflows/deploy-cloud.yaml index 9f933746d6..389b10f7d3 100644 --- a/.github/workflows/deploy-cloud.yaml +++ b/.github/workflows/deploy-cloud.yaml @@ -12,31 +12,22 @@ jobs: runs-on: ubuntu-latest steps: - # - name: Fail if not a tag - # run: | - # if [[ $GITHUB_REF != refs/tags/* ]]; then - # echo "Workflow Dispatch can only be run on tags" - # exit 1 - # fi - - - uses: actions/checkout@v2 - # with: - # fetch-depth: 0 - - # - name: Fail if tag is not in master - # run: | - # if ! git merge-base --is-ancestor ${{ github.sha }} origin/master; then - # echo "Tag is not in master. This pipeline can only execute tags that are present on the master branch" - # exit 1 - # fi - - - name: Pull values.yaml from budibase-infra + - name: Fail if not a tag run: | - curl -H "Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}" \ - -H 'Accept: application/vnd.github.v3.raw' \ - -o values.production.yaml \ - -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/values.yaml - wc -l values.production.yaml + if [[ $GITHUB_REF != refs/tags/* ]]; then + echo "Workflow Dispatch can only be run on tags" + exit 1 + fi + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Fail if tag is not in master + run: | + if ! git merge-base --is-ancestor ${{ github.sha }} origin/master; then + echo "Tag is not in master. This pipeline can only execute tags that are present on the master branch" + exit 1 + fi - name: Get the latest budibase release version id: version @@ -48,29 +39,10 @@ jobs: fi echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + - uses: passeidireto/trigger-external-workflow-action@main + env: + PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }} with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - - - name: Deploy to EKS - uses: craftech-io/eks-helm-deploy-action@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS__KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - cluster-name: budibase-eks-production - config-files: values.production.yaml - chart-path: charts/budibase - namespace: budibase - values: globals.appVersion=v${{ env.RELEASE_VERSION }},services.couchdb.url=${{ secrets.PRODUCTION_COUCHDB_URL }},services.couchdb.password=${{ secrets.PRODUCTION_COUCHDB_PASSWORD }} - name: budibase-prod - - - name: Discord Webhook Action - uses: tsickert/discord-webhook@v4.0.0 - with: - webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }} - content: "Production Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Cloud." - embed-title: ${{ env.RELEASE_VERSION }} + repository: budibase/budibase-deploys + event: budicloud-prod-deploy + github_pat: ${{ secrets.GH_ACCESS_TOKEN }} diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml index 81395bc7e3..9b7bca4770 100644 --- a/.github/workflows/deploy-preprod.yml +++ b/.github/workflows/deploy-preprod.yml @@ -24,51 +24,18 @@ jobs: echo "Tag is not in master. This pipeline can only execute tags that are present on the master branch" exit 1 fi - - name: Get the latest budibase release version id: version run: | release_version=$(cat lerna.json | jq -r '.version') echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - - name: Pull values.yaml from budibase-infra - run: | - curl -H "Authorization: token ${{ secrets.GH_ACCESS_TOKEN }}" \ - -H 'Accept: application/vnd.github.v3.raw' \ - -o values.preprod.yaml \ - -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-preprod/values.yaml - wc -l values.preprod.yaml - - name: Deploy to Preprod Environment - uses: budibase/helm@v1.8.0 - with: - release: budibase-preprod - namespace: budibase - chart: charts/budibase - token: ${{ github.token }} - helm: helm3 - values: | - globals: - appVersion: v${{ env.RELEASE_VERSION }} - ingress: - enabled: true - nginx: true - value-files: >- - [ - "values.preprod.yaml" - ] + - uses: passeidireto/trigger-external-workflow-action@main env: - KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}' - - - name: Discord Webhook Action - uses: tsickert/discord-webhook@v4.0.0 + PAYLOAD_VERSION: ${{ env.RELEASE_VERSION }} with: - webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }} - content: "Preprod Deployment Complete: ${{ env.RELEASE_VERSION }} deployed to Budibase Pre-prod." - embed-title: ${{ env.RELEASE_VERSION }} + repository: budibase/budibase-deploys + event: budicloud-preprod-deploy + github_pat: ${{ secrets.GH_ACCESS_TOKEN }} + From bf566ab031c725585d79492189c15a023fbc3dca Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 14 Jun 2023 07:44:52 +0000 Subject: [PATCH 133/587] Bump version to 2.7.15 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 67a076b0d3..6eadee202c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.14", + "version": "2.7.15", "npmClient": "yarn", "packages": [ "packages/backend-core", From 9991fd9558bbb877525ed8fe69ffce6120dfaca0 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 14 Jun 2023 09:09:59 +0100 Subject: [PATCH 134/587] Add grid block setting for striping row colours --- packages/client/manifest.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 883d6fa0a6..327b05a320 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5261,6 +5261,12 @@ "label": "Delete rows", "key": "allowDeleteRows", "defaultValue": true + }, + { + "type": "boolean", + "label": "Stripe rows", + "key": "stripeRows", + "defaultValue": false } ] } From ed9065aae3c76b33706d62fc84054aef7f9577e6 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 14 Jun 2023 09:10:09 +0100 Subject: [PATCH 135/587] Hide add row FAB when selecting rows --- packages/client/src/components/app/GridBlock.svelte | 8 +++++--- .../components/grid/controls/BulkDeleteHandler.svelte | 10 ++-------- .../src/components/grid/layout/Grid.svelte | 2 ++ .../src/components/grid/layout/NewRow.svelte | 7 +++++-- .../src/components/grid/layout/StickyColumn.svelte | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index 7e69fcdcea..6fe436c0e2 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -5,9 +5,10 @@ import { Grid } from "@budibase/frontend-core" export let table - export let allowAddRows - export let allowEditRows - export let allowDeleteRows + export let allowAddRows = true + export let allowEditRows = true + export let allowDeleteRows = true + export let stripeRows = false const component = getContext("component") const { styleable, API, builderStore } = getContext("sdk") @@ -23,6 +24,7 @@ {allowAddRows} {allowEditRows} {allowDeleteRows} + {stripeRows} showControls={false} allowExpandRows={false} allowSchemaChanges={false} diff --git a/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte b/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte index f87b529390..3218ef9ffe 100644 --- a/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte +++ b/packages/frontend-core/src/components/grid/controls/BulkDeleteHandler.svelte @@ -6,15 +6,9 @@ let modal - $: selectedRowCount = Object.values($selectedRows).filter(x => !!x).length + $: selectedRowCount = Object.values($selectedRows).length $: rowsToDelete = Object.entries($selectedRows) - .map(entry => { - if (entry[1] === true) { - return $rows.find(x => x._id === entry[0]) - } else { - return null - } - }) + .map(entry => $rows.find(x => x._id === entry[0])) .filter(x => x != null) // Deletion callback when confirmed diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index c4828e2791..8cf5803f23 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -57,6 +57,7 @@ allowEditRows, allowDeleteRows, stripeRows, + showControls, }) // Build up context @@ -91,6 +92,7 @@ allowEditRows, allowDeleteRows, stripeRows, + showControls, }) // Set context for children to consume diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte index 4581e37746..06e4f0bfd6 100644 --- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte @@ -26,6 +26,8 @@ maxScrollTop, rowVerticalInversionIndex, columnHorizontalInversionIndex, + config, + selectedRows, } = getContext("grid") let visible = false @@ -37,6 +39,7 @@ $: width = GutterWidth + ($stickyColumn?.width || 0) $: $tableId, (visible = false) $: invertY = shouldInvertY(offset, $rowVerticalInversionIndex, $renderedRows) + $: selectedRowCount = Object.values($selectedRows).length const shouldInvertY = (offset, inversionIndex, rows) => { if (offset === 0) { @@ -142,7 +145,7 @@ -{#if !visible} +{#if !visible && !$config.showControls && !selectedRowCount}
dispatch("add-row-inline")} @@ -243,7 +246,7 @@ position: absolute; top: var(--default-row-height); left: calc(var(--gutter-width) / 2); - transform: translateX(8px) translateY(-50%); + transform: translateX(6px) translateY(-50%); background: var(--cell-background); padding: 4px; border-radius: 50%; diff --git a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte index 801772ed51..f8a65faadb 100644 --- a/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte +++ b/packages/frontend-core/src/components/grid/layout/StickyColumn.svelte @@ -26,7 +26,7 @@ } = getContext("grid") $: rowCount = $rows.length - $: selectedRowCount = Object.values($selectedRows).filter(x => !!x).length + $: selectedRowCount = Object.values($selectedRows).length $: width = GutterWidth + ($stickyColumn?.width || 0) const selectAll = () => { From 328336463c1c47955bc37104e965737f783d08c3 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 14 Jun 2023 09:19:11 +0100 Subject: [PATCH 136/587] Standardise usage of CSS variables to work inside client and builder --- .../grid/cells/AttachmentCell.svelte | 2 +- .../components/grid/cells/HeaderCell.svelte | 2 +- .../components/grid/cells/OptionsCell.svelte | 2 +- .../grid/cells/RelationshipCell.svelte | 2 +- .../src/components/grid/layout/Grid.svelte | 28 ++++++++++--------- .../components/grid/layout/HeaderRow.svelte | 4 +-- .../grid/layout/StickyColumn.svelte | 2 +- 7 files changed, 22 insertions(+), 20 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte b/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte index 4d830723c2..c054c57498 100644 --- a/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte @@ -138,7 +138,7 @@ top: 100%; left: 0; width: 320px; - background: var(--background); + background: var(--grid-background-alt); border: var(--cell-border); padding: var(--cell-padding); box-shadow: 0 0 20px -4px rgba(0, 0, 0, 0.15); diff --git a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte index db2e1a729b..e773af9e14 100644 --- a/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/HeaderCell.svelte @@ -218,7 +218,7 @@ .header-cell :global(.cell) { padding: 0 var(--cell-padding); gap: calc(2 * var(--cell-spacing)); - background: var(--spectrum-global-color-gray-100); + background: var(--grid-background-alt); } .name { diff --git a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte index 9399617eb7..46ad048c20 100644 --- a/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/OptionsCell.svelte @@ -240,7 +240,7 @@ justify-content: space-between; align-items: center; gap: var(--cell-spacing); - background-color: var(--background); + background-color: var(--grid-background-alt); } .option:hover, .option.focused { diff --git a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte index 40b6de5eaa..2bd0a17054 100644 --- a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte @@ -453,7 +453,7 @@ var(--max-cell-render-height) + var(--row-height) - var(--max-relationship-height) ); - background: var(--background); + background: var(--grid-background-alt); border: var(--cell-border); box-shadow: 0 0 20px -4px rgba(0, 0, 0, 0.15); display: flex; diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index 8cf5803f23..39a67d44eb 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -168,6 +168,18 @@ diff --git a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte index c22ee511a3..f31cc198fb 100644 --- a/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte +++ b/packages/frontend-core/src/components/grid/layout/HeaderRow.svelte @@ -42,7 +42,7 @@ From e6ad3a4719aeb92668ed8e55864d16f63fa330ac Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 14 Jun 2023 17:17:29 +0100 Subject: [PATCH 170/587] Type pg --- packages/server/src/integrations/postgres.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts index 33ecf45982..9b2f94db8f 100644 --- a/packages/server/src/integrations/postgres.ts +++ b/packages/server/src/integrations/postgres.ts @@ -20,7 +20,7 @@ import Sql from "./base/sql" import { PostgresColumn } from "./base/types" import { escapeDangerousCharacters } from "../utilities" -import { Client, types } from "pg" +import { Client, ClientConfig, types } from "pg" // Return "date" and "timestamp" types as plain strings. // This lets us reference the original stored timezone. @@ -144,7 +144,7 @@ class PostgresIntegration extends Sql implements DatasourcePlus { super(SqlClient.POSTGRES) this.config = config - let newConfig = { + let newConfig: ClientConfig = { ...this.config, ssl: this.config.ssl ? { From 0b58985b3892e869c75ff43e56abfbe794155203 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 14 Jun 2023 16:42:09 +0000 Subject: [PATCH 171/587] Bump version to 2.7.18 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 0d0c7f3017..0e157d312c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.17", + "version": "2.7.18", "npmClient": "yarn", "packages": [ "packages/backend-core", From 08894e91d6893239a6ff2725a5a6d7bf8e9cf062 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 14 Jun 2023 18:48:44 +0100 Subject: [PATCH 172/587] fix for fonts in production --- packages/builder/index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/builder/index.html b/packages/builder/index.html index 02743a383b..eb151de75c 100644 --- a/packages/builder/index.html +++ b/packages/builder/index.html @@ -5,10 +5,10 @@ Budibase - - - - + + + + From 4ea5b69ed3783796796a8cca02c8472f35349f1e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 14 Jun 2023 21:40:51 +0000 Subject: [PATCH 173/587] Bump version to 2.7.19 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 0e157d312c..a934df1b65 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.18", + "version": "2.7.19", "npmClient": "yarn", "packages": [ "packages/backend-core", From 5e5dc902d1ce91fa7e112db28c4e98025cae2362 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 15 Jun 2023 09:04:21 +0100 Subject: [PATCH 174/587] Broadcast datasource change via websocket when making changes to tables --- packages/builder/src/stores/backend/tables.js | 2 - .../src/api/controllers/table/external.ts | 8 ++ packages/server/src/websockets/builder.ts | 80 +++++++++++++------ packages/server/src/websockets/grid.ts | 54 +++++++++---- packages/server/src/websockets/websocket.ts | 22 +++-- packages/types/src/sdk/websocket.ts | 4 + 6 files changed, 125 insertions(+), 45 deletions(-) diff --git a/packages/builder/src/stores/backend/tables.js b/packages/builder/src/stores/backend/tables.js index f8796712a8..d79ed6f072 100644 --- a/packages/builder/src/stores/backend/tables.js +++ b/packages/builder/src/stores/backend/tables.js @@ -1,5 +1,4 @@ import { get, writable, derived } from "svelte/store" -import { datasources } from "./" import { cloneDeep } from "lodash/fp" import { API } from "api" import { SWITCHABLE_TYPES } from "constants/backend" @@ -63,7 +62,6 @@ export function createTablesStore() { const savedTable = await API.saveTable(updatedTable) replaceTable(savedTable._id, savedTable) - await datasources.fetch() select(savedTable._id) return savedTable } diff --git a/packages/server/src/api/controllers/table/external.ts b/packages/server/src/api/controllers/table/external.ts index ee789ddd3a..f35691cb62 100644 --- a/packages/server/src/api/controllers/table/external.ts +++ b/packages/server/src/api/controllers/table/external.ts @@ -26,6 +26,7 @@ import { RelationshipTypes, } from "@budibase/types" import sdk from "../../../sdk" +import { builderSocket } from "../../../websockets" const { cloneDeep } = require("lodash/fp") async function makeTableRequest( @@ -318,6 +319,13 @@ export async function save(ctx: UserCtx) { datasource.entities[tableToSave.name] = tableToSave await db.put(datasource) + // Since tables are stored inside datasources, we need to notify clients + // that the datasource definition changed + const updatedDatasource = await db.get(datasource._id) + builderSocket?.emitDatasourceUpdate(ctx, updatedDatasource, { + includeOriginator: true, + }) + return tableToSave } diff --git a/packages/server/src/websockets/builder.ts b/packages/server/src/websockets/builder.ts index 0f2c43e5ab..53b0a10905 100644 --- a/packages/server/src/websockets/builder.ts +++ b/packages/server/src/websockets/builder.ts @@ -3,7 +3,13 @@ import { BaseSocket } from "./websocket" import { permissions, events } from "@budibase/backend-core" import http from "http" import Koa from "koa" -import { Datasource, Table, SocketSession, ContextUser } from "@budibase/types" +import { + Datasource, + Table, + SocketSession, + ContextUser, + SocketMessageOptions, +} from "@budibase/types" import { gridSocket } from "./index" import { clearLock, updateLock } from "../utilities/redis" import { Socket } from "socket.io" @@ -66,33 +72,61 @@ export default class BuilderSocket extends BaseSocket { } } - emitTableUpdate(ctx: any, table: Table) { - this.emitToRoom(ctx, ctx.appId, BuilderSocketEvent.TableChange, { - id: table._id, - table, - }) - gridSocket?.emitTableUpdate(ctx, table) + emitTableUpdate(ctx: any, table: Table, options?: SocketMessageOptions) { + this.emitToRoom( + ctx, + ctx.appId, + BuilderSocketEvent.TableChange, + { + id: table._id, + table, + }, + options + ) + gridSocket?.emitTableUpdate(ctx, table, options) } - emitTableDeletion(ctx: any, id: string) { - this.emitToRoom(ctx, ctx.appId, BuilderSocketEvent.TableChange, { - id, - table: null, - }) - gridSocket?.emitTableDeletion(ctx, id) + emitTableDeletion(ctx: any, id: string, options?: SocketMessageOptions) { + this.emitToRoom( + ctx, + ctx.appId, + BuilderSocketEvent.TableChange, + { + id, + table: null, + }, + options + ) + gridSocket?.emitTableDeletion(ctx, id, options) } - emitDatasourceUpdate(ctx: any, datasource: Datasource) { - this.emitToRoom(ctx, ctx.appId, BuilderSocketEvent.DatasourceChange, { - id: datasource._id, - datasource, - }) + emitDatasourceUpdate( + ctx: any, + datasource: Datasource, + options?: SocketMessageOptions + ) { + this.emitToRoom( + ctx, + ctx.appId, + BuilderSocketEvent.DatasourceChange, + { + id: datasource._id, + datasource, + }, + options + ) } - emitDatasourceDeletion(ctx: any, id: string) { - this.emitToRoom(ctx, ctx.appId, BuilderSocketEvent.DatasourceChange, { - id, - datasource: null, - }) + emitDatasourceDeletion(ctx: any, id: string, options?: SocketMessageOptions) { + this.emitToRoom( + ctx, + ctx.appId, + BuilderSocketEvent.DatasourceChange, + { + id, + datasource: null, + }, + options + ) } } diff --git a/packages/server/src/websockets/grid.ts b/packages/server/src/websockets/grid.ts index 6731c2d899..38ec091816 100644 --- a/packages/server/src/websockets/grid.ts +++ b/packages/server/src/websockets/grid.ts @@ -4,7 +4,7 @@ import { permissions } from "@budibase/backend-core" import http from "http" import Koa from "koa" import { getTableId } from "../api/controllers/row/utils" -import { Row, Table } from "@budibase/types" +import { Row, SocketMessageOptions, Table } from "@budibase/types" import { Socket } from "socket.io" import { GridSocketEvent } from "@budibase/shared-core" @@ -29,27 +29,51 @@ export default class GridSocket extends BaseSocket { }) } - emitRowUpdate(ctx: any, row: Row) { + emitRowUpdate(ctx: any, row: Row, options?: SocketMessageOptions) { const tableId = getTableId(ctx) - this.emitToRoom(ctx, tableId, GridSocketEvent.RowChange, { - id: row._id, - row, - }) + this.emitToRoom( + ctx, + tableId, + GridSocketEvent.RowChange, + { + id: row._id, + row, + }, + options + ) } - emitRowDeletion(ctx: any, id: string) { + emitRowDeletion(ctx: any, id: string, options?: SocketMessageOptions) { const tableId = getTableId(ctx) - this.emitToRoom(ctx, tableId, GridSocketEvent.RowChange, { id, row: null }) + this.emitToRoom( + ctx, + tableId, + GridSocketEvent.RowChange, + { id, row: null }, + options + ) } - emitTableUpdate(ctx: any, table: Table) { - this.emitToRoom(ctx, table._id!, GridSocketEvent.TableChange, { - id: table._id, - table, - }) + emitTableUpdate(ctx: any, table: Table, options?: SocketMessageOptions) { + this.emitToRoom( + ctx, + table._id!, + GridSocketEvent.TableChange, + { + id: table._id, + table, + }, + options + ) } - emitTableDeletion(ctx: any, id: string) { - this.emitToRoom(ctx, id, GridSocketEvent.TableChange, { id, table: null }) + emitTableDeletion(ctx: any, id: string, options?: SocketMessageOptions) { + this.emitToRoom( + ctx, + id, + GridSocketEvent.TableChange, + { id, table: null }, + options + ) } } diff --git a/packages/server/src/websockets/websocket.ts b/packages/server/src/websockets/websocket.ts index d8cc10bda4..59a9d698d7 100644 --- a/packages/server/src/websockets/websocket.ts +++ b/packages/server/src/websockets/websocket.ts @@ -9,7 +9,7 @@ import { createAdapter } from "@socket.io/redis-adapter" import { Socket } from "socket.io" import { getSocketPubSubClients } from "../utilities/redis" import { SocketEvent, SocketSessionTTL } from "@budibase/shared-core" -import { SocketSession } from "@budibase/types" +import { SocketSession, SocketMessageOptions } from "@budibase/types" export class BaseSocket { io: Server @@ -276,12 +276,24 @@ export class BaseSocket { this.io.sockets.emit(event, payload) } - // Emit an event to everyone in a room, including metadata of whom - // the originator of the request was - emitToRoom(ctx: any, room: string, event: string, payload: any) { + // Emit an event to everyone in a room + emitToRoom( + ctx: any, + room: string, + event: string, + payload: any, + options?: SocketMessageOptions + ) { + // By default, we include the session API of the originator so that they can ignore + // this event. If we want to include the originator then we leave it unset to that all + // clients will react to it. + let apiSessionId = null + if (!options?.includeOriginator) { + apiSessionId = ctx.headers?.[Header.SESSION_ID] + } this.io.in(room).emit(event, { ...payload, - apiSessionId: ctx.headers?.[Header.SESSION_ID], + apiSessionId, }) } } diff --git a/packages/types/src/sdk/websocket.ts b/packages/types/src/sdk/websocket.ts index 40e2654e82..770f44d9b2 100644 --- a/packages/types/src/sdk/websocket.ts +++ b/packages/types/src/sdk/websocket.ts @@ -7,3 +7,7 @@ export interface SocketSession { room?: string connectedAt: number } + +export interface SocketMessageOptions { + includeOriginator?: boolean +} From a9d74f759fb753b8108fb85c911e1c6a2afede38 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 15 Jun 2023 08:26:54 +0000 Subject: [PATCH 175/587] Bump version to 2.7.16-alpha.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index c4a6b0c2cc..7a32623867 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.16-alpha.0", + "version": "2.7.16-alpha.1", "npmClient": "yarn", "packages": [ "packages/backend-core", From 99a8fc7c123986a430509296ea767926c6f4843d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 15 Jun 2023 09:27:45 +0100 Subject: [PATCH 176/587] Revert websocket changes and just fetch datasources constantly --- .../backend/DataTable/DataTable.svelte | 13 ++- .../modals/CreateTableModal.svelte | 1 + .../popovers/EditTablePopover.svelte | 1 + .../src/components/grid/stores/columns.js | 6 +- .../src/api/controllers/table/external.ts | 9 ++- packages/server/src/websockets/builder.ts | 80 ++++++------------- packages/server/src/websockets/grid.ts | 54 ++++--------- packages/server/src/websockets/websocket.ts | 19 +---- packages/types/src/sdk/websocket.ts | 4 - 9 files changed, 63 insertions(+), 124 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index 1b0c92bde0..4ed41c5b34 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -1,5 +1,5 @@
@@ -37,7 +46,7 @@ allowDeleteRows={!isUsersTable} schemaOverrides={isUsersTable ? userSchemaOverrides : null} showAvatars={false} - on:updatetable={e => tables.replaceTable(id, e.detail)} + on:updatetable={handleGridTableUpdate} > {#if isInternal} diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte index bd1761620d..bfca91afaa 100644 --- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte +++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte @@ -93,6 +93,7 @@ try { await beforeSave() table = await tables.save(newTable) + await datasources.fetch() await afterSave(table) } catch (e) { notifications.error(e) diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte index 01c62d56f7..11ef60480b 100644 --- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte +++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte @@ -65,6 +65,7 @@ const updatedTable = cloneDeep(table) updatedTable.name = updatedName await tables.save(updatedTable) + await datasources.fetch() notifications.success("Table renamed successfully") } diff --git a/packages/frontend-core/src/components/grid/stores/columns.js b/packages/frontend-core/src/components/grid/stores/columns.js index 024fdc29bc..82a26d923c 100644 --- a/packages/frontend-core/src/components/grid/stores/columns.js +++ b/packages/frontend-core/src/components/grid/stores/columns.js @@ -90,12 +90,12 @@ export const deriveStores = context => { // Update local state table.set(newTable) + // Update server + await API.saveTable(newTable) + // Broadcast change to external state can be updated, as this change // will not be received by the builder websocket because we caused it ourselves dispatch("updatetable", newTable) - - // Update server - await API.saveTable(newTable) } return { diff --git a/packages/server/src/api/controllers/table/external.ts b/packages/server/src/api/controllers/table/external.ts index f35691cb62..24d4242478 100644 --- a/packages/server/src/api/controllers/table/external.ts +++ b/packages/server/src/api/controllers/table/external.ts @@ -322,9 +322,7 @@ export async function save(ctx: UserCtx) { // Since tables are stored inside datasources, we need to notify clients // that the datasource definition changed const updatedDatasource = await db.get(datasource._id) - builderSocket?.emitDatasourceUpdate(ctx, updatedDatasource, { - includeOriginator: true, - }) + builderSocket?.emitDatasourceUpdate(ctx, updatedDatasource) return tableToSave } @@ -352,6 +350,11 @@ export async function destroy(ctx: UserCtx) { await db.put(datasource) + // Since tables are stored inside datasources, we need to notify clients + // that the datasource definition changed + const updatedDatasource = await db.get(datasource._id) + builderSocket?.emitDatasourceUpdate(ctx, updatedDatasource) + return tableToDelete } diff --git a/packages/server/src/websockets/builder.ts b/packages/server/src/websockets/builder.ts index 53b0a10905..0f2c43e5ab 100644 --- a/packages/server/src/websockets/builder.ts +++ b/packages/server/src/websockets/builder.ts @@ -3,13 +3,7 @@ import { BaseSocket } from "./websocket" import { permissions, events } from "@budibase/backend-core" import http from "http" import Koa from "koa" -import { - Datasource, - Table, - SocketSession, - ContextUser, - SocketMessageOptions, -} from "@budibase/types" +import { Datasource, Table, SocketSession, ContextUser } from "@budibase/types" import { gridSocket } from "./index" import { clearLock, updateLock } from "../utilities/redis" import { Socket } from "socket.io" @@ -72,61 +66,33 @@ export default class BuilderSocket extends BaseSocket { } } - emitTableUpdate(ctx: any, table: Table, options?: SocketMessageOptions) { - this.emitToRoom( - ctx, - ctx.appId, - BuilderSocketEvent.TableChange, - { - id: table._id, - table, - }, - options - ) - gridSocket?.emitTableUpdate(ctx, table, options) + emitTableUpdate(ctx: any, table: Table) { + this.emitToRoom(ctx, ctx.appId, BuilderSocketEvent.TableChange, { + id: table._id, + table, + }) + gridSocket?.emitTableUpdate(ctx, table) } - emitTableDeletion(ctx: any, id: string, options?: SocketMessageOptions) { - this.emitToRoom( - ctx, - ctx.appId, - BuilderSocketEvent.TableChange, - { - id, - table: null, - }, - options - ) - gridSocket?.emitTableDeletion(ctx, id, options) + emitTableDeletion(ctx: any, id: string) { + this.emitToRoom(ctx, ctx.appId, BuilderSocketEvent.TableChange, { + id, + table: null, + }) + gridSocket?.emitTableDeletion(ctx, id) } - emitDatasourceUpdate( - ctx: any, - datasource: Datasource, - options?: SocketMessageOptions - ) { - this.emitToRoom( - ctx, - ctx.appId, - BuilderSocketEvent.DatasourceChange, - { - id: datasource._id, - datasource, - }, - options - ) + emitDatasourceUpdate(ctx: any, datasource: Datasource) { + this.emitToRoom(ctx, ctx.appId, BuilderSocketEvent.DatasourceChange, { + id: datasource._id, + datasource, + }) } - emitDatasourceDeletion(ctx: any, id: string, options?: SocketMessageOptions) { - this.emitToRoom( - ctx, - ctx.appId, - BuilderSocketEvent.DatasourceChange, - { - id, - datasource: null, - }, - options - ) + emitDatasourceDeletion(ctx: any, id: string) { + this.emitToRoom(ctx, ctx.appId, BuilderSocketEvent.DatasourceChange, { + id, + datasource: null, + }) } } diff --git a/packages/server/src/websockets/grid.ts b/packages/server/src/websockets/grid.ts index 38ec091816..6731c2d899 100644 --- a/packages/server/src/websockets/grid.ts +++ b/packages/server/src/websockets/grid.ts @@ -4,7 +4,7 @@ import { permissions } from "@budibase/backend-core" import http from "http" import Koa from "koa" import { getTableId } from "../api/controllers/row/utils" -import { Row, SocketMessageOptions, Table } from "@budibase/types" +import { Row, Table } from "@budibase/types" import { Socket } from "socket.io" import { GridSocketEvent } from "@budibase/shared-core" @@ -29,51 +29,27 @@ export default class GridSocket extends BaseSocket { }) } - emitRowUpdate(ctx: any, row: Row, options?: SocketMessageOptions) { + emitRowUpdate(ctx: any, row: Row) { const tableId = getTableId(ctx) - this.emitToRoom( - ctx, - tableId, - GridSocketEvent.RowChange, - { - id: row._id, - row, - }, - options - ) + this.emitToRoom(ctx, tableId, GridSocketEvent.RowChange, { + id: row._id, + row, + }) } - emitRowDeletion(ctx: any, id: string, options?: SocketMessageOptions) { + emitRowDeletion(ctx: any, id: string) { const tableId = getTableId(ctx) - this.emitToRoom( - ctx, - tableId, - GridSocketEvent.RowChange, - { id, row: null }, - options - ) + this.emitToRoom(ctx, tableId, GridSocketEvent.RowChange, { id, row: null }) } - emitTableUpdate(ctx: any, table: Table, options?: SocketMessageOptions) { - this.emitToRoom( - ctx, - table._id!, - GridSocketEvent.TableChange, - { - id: table._id, - table, - }, - options - ) + emitTableUpdate(ctx: any, table: Table) { + this.emitToRoom(ctx, table._id!, GridSocketEvent.TableChange, { + id: table._id, + table, + }) } - emitTableDeletion(ctx: any, id: string, options?: SocketMessageOptions) { - this.emitToRoom( - ctx, - id, - GridSocketEvent.TableChange, - { id, table: null }, - options - ) + emitTableDeletion(ctx: any, id: string) { + this.emitToRoom(ctx, id, GridSocketEvent.TableChange, { id, table: null }) } } diff --git a/packages/server/src/websockets/websocket.ts b/packages/server/src/websockets/websocket.ts index 59a9d698d7..89fcc8869d 100644 --- a/packages/server/src/websockets/websocket.ts +++ b/packages/server/src/websockets/websocket.ts @@ -9,7 +9,7 @@ import { createAdapter } from "@socket.io/redis-adapter" import { Socket } from "socket.io" import { getSocketPubSubClients } from "../utilities/redis" import { SocketEvent, SocketSessionTTL } from "@budibase/shared-core" -import { SocketSession, SocketMessageOptions } from "@budibase/types" +import { SocketSession } from "@budibase/types" export class BaseSocket { io: Server @@ -277,23 +277,10 @@ export class BaseSocket { } // Emit an event to everyone in a room - emitToRoom( - ctx: any, - room: string, - event: string, - payload: any, - options?: SocketMessageOptions - ) { - // By default, we include the session API of the originator so that they can ignore - // this event. If we want to include the originator then we leave it unset to that all - // clients will react to it. - let apiSessionId = null - if (!options?.includeOriginator) { - apiSessionId = ctx.headers?.[Header.SESSION_ID] - } + emitToRoom(ctx: any, room: string, event: string, payload: any) { this.io.in(room).emit(event, { ...payload, - apiSessionId, + apiSessionId: ctx.headers?.[Header.SESSION_ID], }) } } diff --git a/packages/types/src/sdk/websocket.ts b/packages/types/src/sdk/websocket.ts index 770f44d9b2..40e2654e82 100644 --- a/packages/types/src/sdk/websocket.ts +++ b/packages/types/src/sdk/websocket.ts @@ -7,7 +7,3 @@ export interface SocketSession { room?: string connectedAt: number } - -export interface SocketMessageOptions { - includeOriginator?: boolean -} From 3cbebaf40da830ab80bcfc77ee5cc32afd5cb6e6 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 15 Jun 2023 09:29:46 +0100 Subject: [PATCH 177/587] Restore original comment --- packages/server/src/websockets/websocket.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/server/src/websockets/websocket.ts b/packages/server/src/websockets/websocket.ts index 89fcc8869d..d8cc10bda4 100644 --- a/packages/server/src/websockets/websocket.ts +++ b/packages/server/src/websockets/websocket.ts @@ -276,7 +276,8 @@ export class BaseSocket { this.io.sockets.emit(event, payload) } - // Emit an event to everyone in a room + // Emit an event to everyone in a room, including metadata of whom + // the originator of the request was emitToRoom(ctx: any, room: string, event: string, payload: any) { this.io.in(room).emit(event, { ...payload, From 9e535a1ca4a80c5a8dd84064d0d00f377b7d8bb3 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 15 Jun 2023 09:35:22 +0100 Subject: [PATCH 178/587] Account for table 'type' field meaning different things in different endpoints --- .../src/components/backend/DataTable/DataTable.svelte | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/DataTable.svelte b/packages/builder/src/components/backend/DataTable/DataTable.svelte index 4ed41c5b34..981a619ebd 100644 --- a/packages/builder/src/components/backend/DataTable/DataTable.svelte +++ b/packages/builder/src/components/backend/DataTable/DataTable.svelte @@ -30,8 +30,11 @@ const handleGridTableUpdate = async e => { tables.replaceTable(id, e.detail) - // We need to refresh datasources when an external table changes - if (e.detail?.type === "external") { + // We need to refresh datasources when an external table changes. + // Type "external" may exist - sometimes type is "table" and sometimes it + // is "external" - it has different meanings in different endpoints. + // If we check both these then we hopefully catch all external tables. + if (e.detail?.type === "external" || e.detail?.sql) { await datasources.fetch() } } From f2ce876c5f2c5cbae4d7b5a04dac53e5cb2d79f5 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 15 Jun 2023 09:39:27 +0100 Subject: [PATCH 179/587] Refresh tables list when some other user adds a datasource --- packages/builder/src/stores/backend/datasources.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js index 0815f9d766..af914cbee7 100644 --- a/packages/builder/src/stores/backend/datasources.js +++ b/packages/builder/src/stores/backend/datasources.js @@ -113,6 +113,10 @@ export function createDatasourcesStore() { ...state, list: [...state.list, datasource], })) + + // If this is a new datasource then we should refresh the tables list, + // because otherwise we'll never see the new tables + tables.fetch() } // Update existing datasource From 7e3b6fd07b1ceaa5a24c68c6bffc4b0e1fa65afd Mon Sep 17 00:00:00 2001 From: Conor Webb <126772285+ConorWebb96@users.noreply.github.com> Date: Thu, 15 Jun 2023 09:41:17 +0100 Subject: [PATCH 180/587] Prevent premature closure of imported users modal. (#10916) --- packages/bbui/src/Modal/Modal.svelte | 3 ++- .../builder/src/pages/builder/portal/users/users/index.svelte | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/bbui/src/Modal/Modal.svelte b/packages/bbui/src/Modal/Modal.svelte index f56ef1187f..384cfe6cac 100644 --- a/packages/bbui/src/Modal/Modal.svelte +++ b/packages/bbui/src/Modal/Modal.svelte @@ -8,6 +8,7 @@ export let fixed = false export let inline = false + export let disableCancel = false const dispatch = createEventDispatcher() let visible = fixed || inline @@ -38,7 +39,7 @@ } export function cancel() { - if (!visible) { + if (!visible || disableCancel) { return } dispatch("cancel") diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte index f23d84f8bc..0aec29c2e2 100644 --- a/packages/builder/src/pages/builder/portal/users/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte @@ -373,7 +373,7 @@ - + Date: Thu, 15 Jun 2023 08:44:35 +0000 Subject: [PATCH 181/587] Bump version to 2.7.16-alpha.2 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 7a32623867..f1d711e915 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.16-alpha.1", + "version": "2.7.16-alpha.2", "npmClient": "yarn", "packages": [ "packages/backend-core", From e8f28113da9b14cb13bf39b81330877fd73f36d0 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 15 Jun 2023 10:56:46 +0100 Subject: [PATCH 182/587] Merge commit --- .../src/components/deploy/AppActions.svelte | 371 +++++++++++++----- 1 file changed, 271 insertions(+), 100 deletions(-) diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte index 9813237317..6a381608bd 100644 --- a/packages/builder/src/components/deploy/AppActions.svelte +++ b/packages/builder/src/components/deploy/AppActions.svelte @@ -7,9 +7,15 @@ Body, Button, ActionButton, + Icon, + Link, + Modal, + StatusLight, } from "@budibase/bbui" import RevertModal from "components/deploy/RevertModal.svelte" import VersionModal from "components/deploy/VersionModal.svelte" + import UpdateAppModal from "components/start/UpdateAppModal.svelte" + import { processStringSync } from "@budibase/string-templates" import ConfirmDialog from "components/common/ConfirmDialog.svelte" import analytics, { Events, EventSource } from "analytics" @@ -21,16 +27,22 @@ import { store } from "builderStore" import TourWrap from "components/portal/onboarding/TourWrap.svelte" import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js" + import { url, goto } from "@roxi/routify" export let application - let publishPopover - let publishPopoverAnchor let unpublishModal + let updateAppModal + let revertModal + let versionModal - $: filteredApps = $apps.filter( - app => app.devId === application && app.status === "published" - ) + let appActionPopover + let appActionPopoverOpen = false + let appActionPopoverAnchor + + let publishing + + $: filteredApps = $apps.filter(app => app.devId === application) $: selectedApp = filteredApps?.length ? filteredApps[0] : null $: deployments = [] @@ -38,7 +50,30 @@ .filter(deployment => deployment.status === "SUCCESS") .sort((a, b) => a.updatedAt > b.updatedAt) - $: isPublished = selectedApp && latestDeployments?.length > 0 + $: isPublished = + selectedApp?.status === "published" && latestDeployments?.length > 0 + + $: updateAvailable = + $store.upgradableVersion && + $store.version && + $store.upgradableVersion !== $store.version + + const initialiseApp = async () => { + console.log("AppActions :: Reinitialise") + const applicationPkg = await API.fetchAppPackage($store.devId) + await store.actions.initialise(applicationPkg) + } + + const updateDeploymentString = () => { + return deployments?.length + ? processStringSync("Published {{ duration time 'millisecond' }} ago", { + time: + new Date().getTime() - new Date(deployments[0].updatedAt).getTime(), + }) + : "" + } + + $: deploymentString = updateDeploymentString(deployments) const reviewPendingDeployments = (deployments, newDeployments) => { if (deployments.length > 0) { @@ -77,11 +112,35 @@ } } + async function publishApp() { + try { + publishing = true + + let published = await API.publishAppChanges($store.appId) + + notifications.send("App published", { + type: "success", + icon: "GlobeCheck", + }) + + await completePublish() + } catch (error) { + analytics.captureException(error) + notifications.error("Error publishing app") + } + publishing = false + } + const unpublishApp = () => { - publishPopover.hide() + appActionPopover.hide() unpublishModal.show() } + const revertApp = () => { + appActionPopover.hide() + revertModal.show() + } + const confirmUnpublishApp = async () => { if (!application || !isPublished) { //confirm the app has loaded. @@ -90,7 +149,10 @@ try { await API.unpublishApp(selectedApp.prodId) await apps.load() - notifications.success("App unpublished successfully") + notifications.send("App unpublished", { + type: "success", + icon: "GlobeStrike", + }) } catch (err) { notifications.error("Error unpublishing app") } @@ -116,81 +178,25 @@ {#if $store.hasLock}
-
- -
- - - {#if isPublished} -
-
- + + {#if updateAvailable} +
+
+ + Update
- -
- - Your published app - - - {processStringSync( - "Last published {{ duration time 'millisecond' }} ago", - { - time: - new Date().getTime() - - new Date(latestDeployments[0].updatedAt).getTime(), - } - )} - - -
- - -
- -
-
{/if} - - {#if !isPublished} - - {/if} - - - + +
{ store.update(state => { state.builderSidePanel = true @@ -198,13 +204,124 @@ }) }} > + Users - - +
+
+ +
+ +
+ + + Preview +
+
+ +
+
+ +
{ + appActionPopover.show() + }} + > + + + + Publish + + + +
+
+ { + appActionPopoverOpen = false + }} + on:open={() => { + appActionPopoverOpen = true + }} + > +
+ + + + { + if (isPublished) { + viewApp() + } else { + appActionPopover.hide() + updateAppModal.show() + } + }} + > + {selectedApp ? `${selectedApp?.url}` : ""} + {#if isPublished} + + {:else} + + {/if} + + + + + + {#if isPublished} + {deploymentString} + + Unpublish + + + Revert + + {:else} + Not published + {/if} + + +
+ {#if $store.hasLock} + + + {/if} +
+ +
+ +
+ Are you sure you want to unpublish the app {selectedApp?.name}? + + + { + await initialiseApp() + }} + /> + + + + {/if} -
- - {#if $store.hasLock} - - {/if} -
- From 08ea400312a21fcada9621e78e9aa4dddc16b566 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 15 Jun 2023 10:59:24 +0100 Subject: [PATCH 183/587] Merge commit --- .../src/pages/builder/app/[application]/_layout.svelte | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index d10657bdbe..3a6fe11ef0 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -178,7 +178,9 @@ {$store.name}
- + + +
{/if} @@ -226,6 +228,7 @@ flex: 0 0 60px; background: var(--background); padding: 0 var(--spacing-xl); + padding-right: 0px; display: grid; grid-template-columns: 1fr auto 1fr; flex-direction: row; @@ -266,7 +269,10 @@ flex-direction: row; justify-content: flex-end; align-items: center; - gap: var(--spacing-l); + } + + .toprightnav :global(.avatars) { + margin-right: var(--spacing-l); } .secondary-editor { From 4d3ab040bfe8d1146f5ef159d2f5826fec385e97 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 15 Jun 2023 11:06:01 +0100 Subject: [PATCH 184/587] Support postgres client certificates --- packages/server/src/integrations/postgres.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts index 9b2f94db8f..b1f20f97ec 100644 --- a/packages/server/src/integrations/postgres.ts +++ b/packages/server/src/integrations/postgres.ts @@ -42,6 +42,8 @@ interface PostgresConfig { schema: string ssl?: boolean ca?: string + clientKey?: string + clientCert?: string rejectUnauthorized?: boolean } @@ -98,6 +100,19 @@ const SCHEMA: Integration = { required: false, }, ca: { + display: "Server CA", + type: DatasourceFieldType.LONGFORM, + default: false, + required: false, + }, + clientKey: { + display: "Client key", + type: DatasourceFieldType.LONGFORM, + default: false, + required: false, + }, + clientCert: { + display: "Client cert", type: DatasourceFieldType.LONGFORM, default: false, required: false, @@ -150,6 +165,8 @@ class PostgresIntegration extends Sql implements DatasourcePlus { ? { rejectUnauthorized: this.config.rejectUnauthorized, ca: this.config.ca, + key: this.config.clientKey, + cert: this.config.clientCert, } : undefined, } From 6a42d76c62119689f94199035bbb83dc6c9d7a0d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 15 Jun 2023 11:19:46 +0100 Subject: [PATCH 185/587] Add border radius to grid block --- packages/client/src/components/app/GridBlock.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index 6fe436c0e2..da9ae74411 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -37,6 +37,8 @@ flex-direction: column; align-items: stretch; border: 1px solid var(--spectrum-global-color-gray-300); + border-radius: 4px; + overflow: hidden; } div.in-builder :global(*) { pointer-events: none; From 7f9891b5a7b0dda54d34840608c24139502cc016 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 15 Jun 2023 11:48:12 +0100 Subject: [PATCH 186/587] Update lerna out of beta --- package.json | 2 +- yarn.lock | 1135 ++++++++++++++++++++------------------------------ 2 files changed, 446 insertions(+), 691 deletions(-) diff --git a/package.json b/package.json index 56f015f8c0..22e531d53a 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "husky": "^8.0.3", "js-yaml": "^4.1.0", "kill-port": "^1.6.1", - "lerna": "7.0.0-alpha.0", + "lerna": "^7.0.1", "madge": "^6.0.0", "minimist": "^1.2.8", "nx": "^16.2.1", diff --git a/yarn.lock b/yarn.lock index b15c549640..a404df15fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2601,10 +2601,17 @@ resolved "https://registry.yarnpkg.com/@ioredis/commands/-/commands-1.2.0.tgz#6d61b3097470af1fdbbe622795b8921d42018e11" integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg== -"@isaacs/string-locale-compare@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b" - integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ== +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" @@ -3591,32 +3598,32 @@ path-to-regexp "1.x" urijs "^1.19.2" -"@lerna/child-process@7.0.0-alpha.0": - version "7.0.0-alpha.0" - resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-7.0.0-alpha.0.tgz#0d297551a34ebdf459fb3b6d51cb77ac832972a4" - integrity sha512-ZnFKrkjQms/ABsJFq/nDhmxZjgM9i1uO8I6MAMyItFKT4dcW5ut/LjNFCDP9kadlT52uFCd1W/vnU/OFDNKZaA== +"@lerna/child-process@7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-7.0.1.tgz#b4edc965c88b2247ccc1c9bfb3dce1f42baec928" + integrity sha512-lov3hXcX+g76fjQ5kg6+QdffL6kFw/aH3sG7NGk61mZfsWCDum9kcp9biqIRAmD6xJbrQsr1i0i9YeCMnHJ6pA== dependencies: chalk "^4.1.0" execa "^5.0.0" strong-log-transformer "^2.1.0" -"@lerna/create@7.0.0-alpha.0": - version "7.0.0-alpha.0" - resolved "https://registry.yarnpkg.com/@lerna/create/-/create-7.0.0-alpha.0.tgz#f445dac6323620192ed14581f2aaea5646a1862a" - integrity sha512-QeslfpF5qF8usQzo2wimtBJiDZ02hnBn+FroCUmNBKhTqVeji5o/uyGforywMiwQXRooLOQyeqOFHFBowZynJQ== +"@lerna/create@7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@lerna/create/-/create-7.0.1.tgz#a204a087b3b7a2ea7bb00d374faf4f306cd48aca" + integrity sha512-vv9gtbrn/gBwQLdDlUeatO3uY58nxMktv9h9/5GEFcBesV9MAeQ0zRz8zkr2C0DX/m25lE+J5KTzJqZtMb03kw== dependencies: - "@lerna/child-process" "7.0.0-alpha.0" - dedent "^0.7.0" - fs-extra "^9.1.0" - init-package-json "^3.0.2" + "@lerna/child-process" "7.0.1" + dedent "0.7.0" + fs-extra "^11.1.1" + init-package-json "5.0.0" npm-package-arg "8.1.1" p-reduce "^2.1.0" - pacote "15.1.1" - pify "^5.0.0" + pacote "^15.2.0" + pify "5.0.0" semver "^7.3.4" slash "^3.0.0" validate-npm-package-license "^3.0.4" - validate-npm-package-name "^4.0.0" + validate-npm-package-name "5.0.0" yargs-parser "20.2.4" "@lezer/common@^1.0.0": @@ -3712,45 +3719,6 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@npmcli/arborist@6.2.3": - version "6.2.3" - resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-6.2.3.tgz#31f8aed2588341864d3811151d929c01308f8e71" - integrity sha512-lpGOC2ilSJXcc2zfW9QtukcCTcMbl3fVI0z4wvFB2AFIl0C+Q6Wv7ccrpdrQa8rvJ1ZVuc6qkX7HVTyKlzGqKA== - dependencies: - "@isaacs/string-locale-compare" "^1.1.0" - "@npmcli/fs" "^3.1.0" - "@npmcli/installed-package-contents" "^2.0.0" - "@npmcli/map-workspaces" "^3.0.2" - "@npmcli/metavuln-calculator" "^5.0.0" - "@npmcli/name-from-folder" "^2.0.0" - "@npmcli/node-gyp" "^3.0.0" - "@npmcli/package-json" "^3.0.0" - "@npmcli/query" "^3.0.0" - "@npmcli/run-script" "^6.0.0" - bin-links "^4.0.1" - cacache "^17.0.4" - common-ancestor-path "^1.0.1" - hosted-git-info "^6.1.1" - json-parse-even-better-errors "^3.0.0" - json-stringify-nice "^1.1.4" - minimatch "^6.1.6" - nopt "^7.0.0" - npm-install-checks "^6.0.0" - npm-package-arg "^10.1.0" - npm-pick-manifest "^8.0.1" - npm-registry-fetch "^14.0.3" - npmlog "^7.0.1" - pacote "^15.0.8" - parse-conflict-json "^3.0.0" - proc-log "^3.0.0" - promise-all-reject-late "^1.0.0" - promise-call-limit "^1.0.1" - read-package-json-fast "^3.0.2" - semver "^7.3.7" - ssri "^10.0.1" - treeverse "^3.0.0" - walk-up-path "^1.0.0" - "@npmcli/fs@^2.1.0": version "2.1.2" resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" @@ -3780,7 +3748,7 @@ semver "^7.3.5" which "^3.0.0" -"@npmcli/installed-package-contents@^2.0.0", "@npmcli/installed-package-contents@^2.0.1": +"@npmcli/installed-package-contents@^2.0.1": version "2.0.2" resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz#bfd817eccd9e8df200919e73f57f9e3d9e4f9e33" integrity sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ== @@ -3788,26 +3756,6 @@ npm-bundled "^3.0.0" npm-normalize-package-bin "^3.0.0" -"@npmcli/map-workspaces@^3.0.2": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@npmcli/map-workspaces/-/map-workspaces-3.0.3.tgz#476944b63cd1f65bf83c6fdc7f4ca7be56906b1f" - integrity sha512-HlCvFuTzw4UNoKyZdqiNrln+qMF71QJkxy2dsusV8QQdoa89e2TF4dATCzBxbl4zzRzdDoWWyP5ADVrNAH9cRQ== - dependencies: - "@npmcli/name-from-folder" "^2.0.0" - glob "^9.3.1" - minimatch "^7.4.2" - read-package-json-fast "^3.0.0" - -"@npmcli/metavuln-calculator@^5.0.0": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@npmcli/metavuln-calculator/-/metavuln-calculator-5.0.1.tgz#426b3e524c2008bcc82dbc2ef390aefedd643d76" - integrity sha512-qb8Q9wIIlEPj3WeA1Lba91R4ZboPL0uspzV0F9uwP+9AYMVB2zOoa7Pbk12g6D2NHAinSbHh6QYmGuRyHZ874Q== - dependencies: - cacache "^17.0.0" - json-parse-even-better-errors "^3.0.0" - pacote "^15.0.0" - semver "^7.3.5" - "@npmcli/move-file@^2.0.0": version "2.0.1" resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" @@ -3816,35 +3764,11 @@ mkdirp "^1.0.4" rimraf "^3.0.2" -"@npmcli/name-from-folder@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz#c44d3a7c6d5c184bb6036f4d5995eee298945815" - integrity sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg== - -"@npmcli/node-gyp@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-2.0.0.tgz#8c20e53e34e9078d18815c1d2dda6f2420d75e35" - integrity sha512-doNI35wIe3bBaEgrlPfdJPaCpUR89pJWep4Hq3aRdh6gKazIVWfs0jHttvSSoq47ZXgC7h73kDsUl8AoIQUB+A== - "@npmcli/node-gyp@^3.0.0": version "3.0.0" resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz#101b2d0490ef1aa20ed460e4c0813f0db560545a" integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA== -"@npmcli/package-json@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/package-json/-/package-json-3.0.0.tgz#c9219a197e1be8dbf43c4ef8767a72277c0533b6" - integrity sha512-NnuPuM97xfiCpbTEJYtEuKz6CFbpUHtaT0+5via5pQeI25omvQDFbp1GcGJ/c4zvL/WX0qbde6YiLgfZbWFgvg== - dependencies: - json-parse-even-better-errors "^3.0.0" - -"@npmcli/promise-spawn@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-3.0.0.tgz#53283b5f18f855c6925f23c24e67c911501ef573" - integrity sha512-s9SgS+p3a9Eohe68cSI3fi+hpcZUmXq5P7w0kMlAsWVtR7XbK3ptkZqKT2cK1zLDObJ3sR+8P59sJE0w/KTL1g== - dependencies: - infer-owner "^1.0.4" - "@npmcli/promise-spawn@^6.0.0", "@npmcli/promise-spawn@^6.0.1": version "6.0.2" resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz#c8bc4fa2bd0f01cb979d8798ba038f314cfa70f2" @@ -3852,23 +3776,16 @@ dependencies: which "^3.0.0" -"@npmcli/query@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/query/-/query-3.0.0.tgz#51a0dfb85811e04f244171f164b6bc83b36113a7" - integrity sha512-MFNDSJNgsLZIEBVZ0Q9w9K7o07j5N4o4yjtdz2uEpuCZlXGMuPENiRaFYk0vRqAA64qVuUQwC05g27fRtfUgnA== +"@npmcli/run-script@6.0.2": + version "6.0.2" + resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-6.0.2.tgz#a25452d45ee7f7fb8c16dfaf9624423c0c0eb885" + integrity sha512-NCcr1uQo1k5U+SYlnIrbAh3cxy+OQT1VtqiAbxdymSlptbzBb62AjH2xXgjNCoP073hoa1CfCAcwoZ8k96C4nA== dependencies: - postcss-selector-parser "^6.0.10" - -"@npmcli/run-script@4.1.7": - version "4.1.7" - resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-4.1.7.tgz#b1a2f57568eb738e45e9ea3123fb054b400a86f7" - integrity sha512-WXr/MyM4tpKA4BotB81NccGAv8B48lNH0gRoILucbcAhTQXLCoi6HflMV3KdXubIqvP9SuLsFn68Z7r4jl+ppw== - dependencies: - "@npmcli/node-gyp" "^2.0.0" - "@npmcli/promise-spawn" "^3.0.0" + "@npmcli/node-gyp" "^3.0.0" + "@npmcli/promise-spawn" "^6.0.0" node-gyp "^9.0.0" - read-package-json-fast "^2.0.3" - which "^2.0.2" + read-package-json-fast "^3.0.0" + which "^3.0.0" "@npmcli/run-script@^6.0.0": version "6.0.0" @@ -4098,10 +4015,10 @@ dependencies: "@octokit/types" "^9.0.0" -"@octokit/core@^4.0.0": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.0.tgz#8c253ba9605aca605bc46187c34fcccae6a96648" - integrity sha512-AgvDRUg3COpR82P7PBdGZF/NNqGmtMq2NiPqeSsDIeCfYFOZ9gddqWNQHnFdEUf+YwOj4aZYmJnlPp7OXmDIDg== +"@octokit/core@^4.2.1": + version "4.2.1" + resolved "https://registry.yarnpkg.com/@octokit/core/-/core-4.2.1.tgz#fee6341ad0ce60c29cc455e056cd5b500410a588" + integrity sha512-tEDxFx8E38zF3gT7sSMDrT1tGumDgsw5yPG6BBh/X+5ClIQfMH/Yqocxz1PnHx6CHyF6pxmovUTOfZAUvQ0Lvw== dependencies: "@octokit/auth-token" "^3.0.0" "@octokit/graphql" "^5.0.0" @@ -4129,45 +4046,40 @@ "@octokit/types" "^9.0.0" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^12.11.0": - version "12.11.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-12.11.0.tgz#da5638d64f2b919bca89ce6602d059f1b52d3ef0" - integrity sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ== - -"@octokit/openapi-types@^14.0.0": - version "14.0.0" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-14.0.0.tgz#949c5019028c93f189abbc2fb42f333290f7134a" - integrity sha512-HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw== - "@octokit/openapi-types@^16.0.0": version "16.0.0" resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-16.0.0.tgz#d92838a6cd9fb4639ca875ddb3437f1045cc625e" integrity sha512-JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA== +"@octokit/openapi-types@^18.0.0": + version "18.0.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-18.0.0.tgz#f43d765b3c7533fd6fb88f3f25df079c24fccf69" + integrity sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw== + "@octokit/plugin-enterprise-rest@6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437" integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw== -"@octokit/plugin-paginate-rest@^3.0.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-3.1.0.tgz#86f8be759ce2d6d7c879a31490fd2f7410b731f0" - integrity sha512-+cfc40pMzWcLkoDcLb1KXqjX0jTGYXjKuQdFQDc6UAknISJHnZTiBqld6HDwRJvD4DsouDKrWXNbNV0lE/3AXA== +"@octokit/plugin-paginate-rest@^6.1.2": + version "6.1.2" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.1.2.tgz#f86456a7a1fe9e58fec6385a85cf1b34072341f8" + integrity sha512-qhrmtQeHU/IivxucOV1bbI/xZyC/iOBhclokv7Sut5vnejAIAEXVcGQeRpQlU39E0WwK9lNvJHphHri/DB6lbQ== dependencies: - "@octokit/types" "^6.41.0" + "@octokit/tsconfig" "^1.0.2" + "@octokit/types" "^9.2.3" "@octokit/plugin-request-log@^1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85" integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA== -"@octokit/plugin-rest-endpoint-methods@^6.0.0": - version "6.8.1" - resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.8.1.tgz#97391fda88949eb15f68dc291957ccbe1d3e8ad1" - integrity sha512-QrlaTm8Lyc/TbU7BL/8bO49vp+RZ6W3McxxmmQTgYxf2sWkO8ZKuj4dLhPNJD6VCUW1hetCmeIM0m6FTVpDiEg== +"@octokit/plugin-rest-endpoint-methods@^7.1.2": + version "7.2.3" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.2.3.tgz#37a84b171a6cb6658816c82c4082ac3512021797" + integrity sha512-I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA== dependencies: - "@octokit/types" "^8.1.1" - deprecation "^2.3.1" + "@octokit/types" "^10.0.0" "@octokit/request-error@^3.0.0": version "3.0.3" @@ -4190,29 +4102,27 @@ node-fetch "^2.6.7" universal-user-agent "^6.0.0" -"@octokit/rest@19.0.3": - version "19.0.3" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.3.tgz#b9a4e8dc8d53e030d611c053153ee6045f080f02" - integrity sha512-5arkTsnnRT7/sbI4fqgSJ35KiFaN7zQm0uQiQtivNQLI8RQx8EHwJCajcTUwmaCMNDg7tdCvqAnc7uvHHPxrtQ== +"@octokit/rest@19.0.11": + version "19.0.11" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-19.0.11.tgz#2ae01634fed4bd1fca5b642767205ed3fd36177c" + integrity sha512-m2a9VhaP5/tUw8FwfnW2ICXlXpLPIqxtg3XcAiGMLj/Xhw3RSBfZ8le/466ktO1Gcjr8oXudGnHhxV1TXJgFxw== dependencies: - "@octokit/core" "^4.0.0" - "@octokit/plugin-paginate-rest" "^3.0.0" + "@octokit/core" "^4.2.1" + "@octokit/plugin-paginate-rest" "^6.1.2" "@octokit/plugin-request-log" "^1.0.4" - "@octokit/plugin-rest-endpoint-methods" "^6.0.0" + "@octokit/plugin-rest-endpoint-methods" "^7.1.2" -"@octokit/types@^6.41.0": - version "6.41.0" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.41.0.tgz#e58ef78d78596d2fb7df9c6259802464b5f84a04" - integrity sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg== - dependencies: - "@octokit/openapi-types" "^12.11.0" +"@octokit/tsconfig@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@octokit/tsconfig/-/tsconfig-1.0.2.tgz#59b024d6f3c0ed82f00d08ead5b3750469125af7" + integrity sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA== -"@octokit/types@^8.1.1": - version "8.2.1" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-8.2.1.tgz#a6de091ae68b5541f8d4fcf9a12e32836d4648aa" - integrity sha512-8oWMUji8be66q2B9PmEIUyQm00VPDPun07umUWSaCwxmeaquFBro4Hcc3ruVoDo3zkQyZBlRvhIMEYS3pBhanw== +"@octokit/types@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-10.0.0.tgz#7ee19c464ea4ada306c43f1a45d444000f419a4a" + integrity sha512-Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg== dependencies: - "@octokit/openapi-types" "^14.0.0" + "@octokit/openapi-types" "^18.0.0" "@octokit/types@^9.0.0": version "9.0.0" @@ -4221,6 +4131,13 @@ dependencies: "@octokit/openapi-types" "^16.0.0" +"@octokit/types@^9.2.3": + version "9.3.2" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-9.3.2.tgz#3f5f89903b69f6a2d196d78ec35f888c0013cac5" + integrity sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA== + dependencies: + "@octokit/openapi-types" "^18.0.0" + "@opentelemetry/api@^1.0.1", "@opentelemetry/api@^1.1.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.4.0.tgz#2c91791a9ba6ca0a0f4aaac5e45d58df13639ac8" @@ -4241,6 +4158,11 @@ dependencies: esquery "^1.4.0" +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" @@ -4660,6 +4582,15 @@ resolved "https://registry.yarnpkg.com/@sigstore/protobuf-specs/-/protobuf-specs-0.1.0.tgz#957cb64ea2f5ce527cc9cf02a096baeb0d2b99b4" integrity sha512-a31EnjuIDSX8IXBUib3cYLDRlPMU36AWX4xS8ysLaNu4ZzUesDiPt83pgrW2X1YLMe5L2HbDyaKK5BrL4cNKaQ== +"@sigstore/tuf@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@sigstore/tuf/-/tuf-1.0.0.tgz#13b69323e7bf8de458cd6c952c57acd1169772a5" + integrity sha512-bLzi9GeZgMCvjJeLUIfs8LJYCxrPRA8IXQkzUtaFKKVPTz0mucRyqFcV2U20yg9K+kYAD0YSitzGfRZCFLjdHQ== + dependencies: + "@sigstore/protobuf-specs" "^0.1.0" + make-fetch-happen "^11.0.1" + tuf-js "^1.1.3" + "@sinclair/typebox@^0.24.1": version "0.24.51" resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f" @@ -5382,14 +5313,6 @@ resolved "https://registry.yarnpkg.com/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz#eade9fd1f537993bc1f0949f3aea276ecc4fab31" integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ== -"@tufjs/models@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.2.tgz#6c1e99210ada62c057b1742b5528d85acbfe0a47" - integrity sha512-uxarDtxTIK3f8hJS4yFhW/lvTa3tsiQU5iDCRut+NCnOXvNtEul0Ct58NIIcIx9Rkt7OFEK31Ndpqsd663nsew== - dependencies: - "@tufjs/canonical-json" "1.0.0" - minimatch "^8.0.3" - "@tufjs/models@1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@tufjs/models/-/models-1.0.4.tgz#5a689630f6b9dbda338d4b208019336562f176ef" @@ -6591,7 +6514,7 @@ dependencies: argparse "^2.0.1" -JSONStream@^1.0.4: +JSONStream@^1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0" integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ== @@ -6614,11 +6537,6 @@ abbrev@1, abbrev@^1.0.0: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -abbrev@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-2.0.0.tgz#cf59829b8b4f03f89dda2771cb7f3653828c89bf" - integrity sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ== - abort-controller@3.0.0, abort-controller@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" @@ -6895,7 +6813,7 @@ ansi-styles@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== -ansi-styles@^6.0.0: +ansi-styles@^6.0.0, ansi-styles@^6.1.0: version "6.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== @@ -6976,7 +6894,7 @@ aproba@^1.0.3: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -"aproba@^1.0.3 || ^2.0.0", aproba@^2.0.0: +"aproba@^1.0.3 || ^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== @@ -7020,14 +6938,6 @@ are-we-there-yet@^3.0.0: delegates "^1.0.0" readable-stream "^3.6.0" -are-we-there-yet@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-4.0.0.tgz#3ff397dc14f08b52dd8b2a64d3cee154ab8760d2" - integrity sha512-nSXlV+u3vtVjRgihdTzbfWYzxPWGo424zPgQbHD0ZqIla3jqYAewDcvee0Ua2hjS5IfTAmjGlx1Jf0PKwjZDEw== - dependencies: - delegates "^1.0.0" - readable-stream "^4.1.0" - are-we-there-yet@~1.1.2: version "1.1.7" resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" @@ -7709,16 +7619,6 @@ bignumber.js@^9.0.0: resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz#c4df7dc496bd849d4c9464344c1aa74228b4dac6" integrity sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig== -bin-links@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/bin-links/-/bin-links-4.0.1.tgz#afeb0549e642f61ff889b58ea2f8dca78fb9d8d3" - integrity sha512-bmFEM39CyX336ZGGRsGPlc6jZHriIoHacOQcTt72MktIjpPhZoP4te2jOyUXF3BLILmJ8aNLncoPVeIIFlrDeA== - dependencies: - cmd-shim "^6.0.0" - npm-normalize-package-bin "^3.0.0" - read-cmd-shim "^4.0.0" - write-file-atomic "^5.0.0" - binary-extensions@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" @@ -8126,10 +8026,10 @@ byline@^5.0.0: resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" integrity sha512-s6webAy+R4SR8XVuJWt2V2rGvhnrhxN+9S15GNuTK3wKPOXFF6RNc+8ug2XhH+2s4f+uudG4kUVYmYOQWL2g0Q== -byte-size@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-7.0.0.tgz#36528cd1ca87d39bd9abd51f5715dc93b6ceb032" - integrity sha512-NNiBxKgxybMBtWdmvx7ZITJi4ZG+CYUgwOSZTfqB1qogkRHrhbQE/R2r5Fh94X+InN5MCYz6SvB/ejHMj/HbsQ== +byte-size@8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-8.1.1.tgz#3424608c62d59de5bfda05d31e0313c6174842ae" + integrity sha512-tUkzZWK0M/qdoLEqikxBWe4kumyuwjl3HO6zHTr4yEI23EojPtLYXdG1+AQY7MN0cGyNDvEaJ8wiYQm6P2bPxg== bytes@3.1.2, bytes@^3.0.0: version "3.1.2" @@ -8165,7 +8065,7 @@ cacache@^16.1.0: tar "^6.1.11" unique-filename "^2.0.0" -cacache@^17.0.0, cacache@^17.0.4: +cacache@^17.0.0: version "17.0.5" resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.0.5.tgz#6dbec26c11f1f6a2b558bc11ed3316577c339ebc" integrity sha512-Y/PRQevNSsjAPWykl9aeGz8Pr+OI6BYM9fYDNMvOkuUiG9IhG4LEmaYrZZZvioMUEQ+cBCxT0v8wrnCURccyKA== @@ -8617,14 +8517,7 @@ cluster-key-slot@1.1.2, cluster-key-slot@^1.1.0: resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac" integrity sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA== -cmd-shim@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-5.0.0.tgz#8d0aaa1a6b0708630694c4dbde070ed94c707724" - integrity sha512-qkCtZ59BidfEwHltnJwkyVZn+XQojdAySM1D1gSeh11Z4pW1Kpolkyo53L5noc0nrxmIvyFwTmJRo4xs7FFLPw== - dependencies: - mkdirp-infer-owner "^2.0.0" - -cmd-shim@^6.0.0: +cmd-shim@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-6.0.1.tgz#a65878080548e1dca760b3aea1e21ed05194da9d" integrity sha512-S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q== @@ -8817,11 +8710,6 @@ commander@^9.1.0, commander@^9.4.1: resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== -common-ancestor-path@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7" - integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w== - common-tags@^1.8.0: version "1.8.2" resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6" @@ -8928,14 +8816,6 @@ condense-newlines@^0.2.1: is-whitespace "^0.3.0" kind-of "^3.0.2" -config-chain@1.1.12: - version "1.1.12" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa" - integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA== - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" - config-chain@^1.1.13: version "1.1.13" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" @@ -8997,87 +8877,78 @@ content-type@^1.0.2, content-type@^1.0.4, content-type@~1.0.4: resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== -conventional-changelog-angular@5.0.12: - version "5.0.12" - resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.12.tgz#c979b8b921cbfe26402eb3da5bbfda02d865a2b9" - integrity sha512-5GLsbnkR/7A89RyHLvvoExbiGbd9xKdKqDTrArnPbOqBqG/2wIosu0fHwpeIRI8Tl94MhVNBXcLJZl92ZQ5USw== +conventional-changelog-angular@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-6.0.0.tgz#a9a9494c28b7165889144fd5b91573c4aa9ca541" + integrity sha512-6qLgrBF4gueoC7AFVHu51nHL9pF9FRjXrH+ceVf7WmAfH3gs+gEYOkvxhjMPjZu57I4AGUGoNTY8V7Hrgf1uqg== dependencies: compare-func "^2.0.0" - q "^1.5.1" -conventional-changelog-core@4.2.4: - version "4.2.4" - resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-4.2.4.tgz#e50d047e8ebacf63fac3dc67bf918177001e1e9f" - integrity sha512-gDVS+zVJHE2v4SLc6B0sLsPiloR0ygU7HaDW14aNJE1v4SlqJPILPl/aJC7YdtRE4CybBf8gDwObBvKha8Xlyg== +conventional-changelog-core@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-5.0.1.tgz#3c331b155d5b9850f47b4760aeddfc983a92ad49" + integrity sha512-Rvi5pH+LvgsqGwZPZ3Cq/tz4ty7mjijhr3qR4m9IBXNbxGGYgTVVO+duXzz9aArmHxFtwZ+LRkrNIMDQzgoY4A== dependencies: add-stream "^1.0.0" - conventional-changelog-writer "^5.0.0" - conventional-commits-parser "^3.2.0" - dateformat "^3.0.0" - get-pkg-repo "^4.0.0" - git-raw-commits "^2.0.8" + conventional-changelog-writer "^6.0.0" + conventional-commits-parser "^4.0.0" + dateformat "^3.0.3" + get-pkg-repo "^4.2.1" + git-raw-commits "^3.0.0" git-remote-origin-url "^2.0.0" - git-semver-tags "^4.1.1" - lodash "^4.17.15" - normalize-package-data "^3.0.0" - q "^1.5.1" + git-semver-tags "^5.0.0" + normalize-package-data "^3.0.3" read-pkg "^3.0.0" read-pkg-up "^3.0.0" - through2 "^4.0.0" -conventional-changelog-preset-loader@^2.3.4: - version "2.3.4" - resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.3.4.tgz#14a855abbffd59027fd602581f1f34d9862ea44c" - integrity sha512-GEKRWkrSAZeTq5+YjUZOYxdHq+ci4dNwHvpaBC3+ENalzFWuCWa9EZXSuZBpkr72sMdKB+1fyDV4takK1Lf58g== +conventional-changelog-preset-loader@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-3.0.0.tgz#14975ef759d22515d6eabae6396c2ae721d4c105" + integrity sha512-qy9XbdSLmVnwnvzEisjxdDiLA4OmV3o8db+Zdg4WiFw14fP3B6XNz98X0swPPpkTd/pc1K7+adKgEDM1JCUMiA== -conventional-changelog-writer@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-5.0.1.tgz#e0757072f045fe03d91da6343c843029e702f359" - integrity sha512-5WsuKUfxW7suLblAbFnxAcrvf6r+0b7GvNaWUwUIk0bXMnENP/PEieGKVUQrjPqwPT4o3EPAASBXiY6iHooLOQ== +conventional-changelog-writer@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-6.0.0.tgz#8c8dea0441c6e648c9b25bb784e750d02f8002d5" + integrity sha512-8PyWTnn7zBIt9l4hj4UusFs1TyG+9Ulu1zlOAc72L7Sdv9Hsc8E86ot7htY3HXCVhXHB/NO0pVGvZpwsyJvFfw== dependencies: - conventional-commits-filter "^2.0.7" - dateformat "^3.0.0" + conventional-commits-filter "^3.0.0" + dateformat "^3.0.3" handlebars "^4.7.7" json-stringify-safe "^5.0.1" - lodash "^4.17.15" - meow "^8.0.0" - semver "^6.0.0" - split "^1.0.0" - through2 "^4.0.0" + meow "^8.1.2" + semver "^6.3.0" + split "^1.0.1" -conventional-commits-filter@^2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz#f8d9b4f182fce00c9af7139da49365b136c8a0b3" - integrity sha512-ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA== +conventional-commits-filter@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-3.0.0.tgz#bf1113266151dd64c49cd269e3eb7d71d7015ee2" + integrity sha512-1ymej8b5LouPx9Ox0Dw/qAO2dVdfpRFq28e5Y0jJEU8ZrLdy0vOSkkIInwmxErFGhg6SALro60ZrwYFVTUDo4Q== dependencies: lodash.ismatch "^4.4.0" - modify-values "^1.0.0" + modify-values "^1.0.1" -conventional-commits-parser@^3.2.0: - version "3.2.4" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz#a7d3b77758a202a9b2293d2112a8d8052c740972" - integrity sha512-nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q== +conventional-commits-parser@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-4.0.0.tgz#02ae1178a381304839bce7cea9da5f1b549ae505" + integrity sha512-WRv5j1FsVM5FISJkoYMR6tPk07fkKT0UodruX4je86V4owk451yjXAKzKAPOs9l7y59E2viHUS9eQ+dfUA9NSg== dependencies: - JSONStream "^1.0.4" + JSONStream "^1.3.5" is-text-path "^1.0.1" - lodash "^4.17.15" - meow "^8.0.0" - split2 "^3.0.0" - through2 "^4.0.0" + meow "^8.1.2" + split2 "^3.2.2" -conventional-recommended-bump@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-6.1.0.tgz#cfa623285d1de554012f2ffde70d9c8a22231f55" - integrity sha512-uiApbSiNGM/kkdL9GTOLAqC4hbptObFo4wW2QRyHsKciGAfQuLU1ShZ1BIVI/+K2BE/W1AWYQMCXAsv4dyKPaw== +conventional-recommended-bump@7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-7.0.1.tgz#ec01f6c7f5d0e2491c2d89488b0d757393392424" + integrity sha512-Ft79FF4SlOFvX4PkwFDRnaNiIVX7YbmqGU0RwccUaiGvgp3S0a8ipR2/Qxk31vclDNM+GSdJOVs2KrsUCjblVA== dependencies: concat-stream "^2.0.0" - conventional-changelog-preset-loader "^2.3.4" - conventional-commits-filter "^2.0.7" - conventional-commits-parser "^3.2.0" - git-raw-commits "^2.0.8" - git-semver-tags "^4.1.1" - meow "^8.0.0" - q "^1.5.1" + conventional-changelog-preset-loader "^3.0.0" + conventional-commits-filter "^3.0.0" + conventional-commits-parser "^4.0.0" + git-raw-commits "^3.0.0" + git-semver-tags "^5.0.0" + meow "^8.1.2" convert-source-map@^1.4.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.9.0" @@ -9172,17 +9043,6 @@ cors@~2.8.5: object-assign "^4" vary "^1" -cosmiconfig@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" - integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" @@ -9194,6 +9054,16 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" +cosmiconfig@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd" + integrity sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ== + dependencies: + import-fresh "^3.2.1" + js-yaml "^4.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" + cpu-features@~0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.4.tgz#0023475bb4f4c525869c162e4108099e35bf19d8" @@ -9587,7 +9457,7 @@ date-utils@*: resolved "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz#61fb16cdc1274b3c9acaaffe9fc69df8720a2b64" integrity sha512-wJMBjqlwXR0Iv0wUo/lFbhSQ7MmG1hl36iuxuE91kW+5b5sWbase73manEqNH9sOLFAMG83B4ffNKq9/Iq0FVA== -dateformat@^3.0.0: +dateformat@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== @@ -9972,7 +9842,7 @@ dependency-tree@^9.0.0: precinct "^9.0.0" typescript "^4.0.0" -deprecation@^2.0.0, deprecation@^2.3.1: +deprecation@^2.0.0: version "2.3.1" resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== @@ -10360,13 +10230,6 @@ domutils@^3.0.1: domelementtype "^2.3.0" domhandler "^5.0.1" -dot-prop@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" - integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== - dependencies: - is-obj "^2.0.0" - dot-prop@^5.1.0, dot-prop@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" @@ -10741,7 +10604,7 @@ env-paths@^2.2.0: resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== -envinfo@^7.7.3, envinfo@^7.7.4: +envinfo@7.8.1, envinfo@^7.7.3: version "7.8.1" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== @@ -12286,6 +12149,14 @@ foreach@^2.0.5, foreach@~2.0.1: resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.6.tgz#87bcc8a1a0e74000ff2bf9802110708cfb02eb6e" integrity sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg== +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -12405,16 +12276,6 @@ fs-extra@8.1.0, fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@9.1.0, fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - fs-extra@^10.0.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" @@ -12424,7 +12285,7 @@ fs-extra@^10.0.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^11.1.0: +fs-extra@^11.1.0, fs-extra@^11.1.1: version "11.1.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== @@ -12442,6 +12303,16 @@ fs-extra@^7.0.1: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -12540,20 +12411,6 @@ gauge@^4.0.3: strip-ansi "^6.0.1" wide-align "^1.1.5" -gauge@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-5.0.0.tgz#e270ca9d97dae84abf64e5277ef1ebddc7dd1e2f" - integrity sha512-0s5T5eciEG7Q3ugkxAkFtaDhrrhXsCRivA5y8C9WMHWuI8UlMOJg7+Iwf7Mccii+Dfs3H5jHepU0joPVyQU0Lw== - dependencies: - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.3" - console-control-strings "^1.1.0" - has-unicode "^2.0.1" - signal-exit "^3.0.7" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.5" - gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -12694,7 +12551,7 @@ get-paths@0.0.7: dependencies: pify "^4.0.1" -get-pkg-repo@^4.0.0: +get-pkg-repo@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-4.2.1.tgz#75973e1c8050c73f48190c52047c4cee3acbf385" integrity sha512-2+QbHjFRfGB74v/pYWjd5OhU3TDIC2Gv/YKUTk/tCvAz0pkn/Mz6P3uByuBimLOcPvN2jYdScl3xGFSrx0jEcA== @@ -12810,16 +12667,14 @@ gifwrap@^0.9.2: image-q "^4.0.0" omggif "^1.0.10" -git-raw-commits@^2.0.8: - version "2.0.11" - resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723" - integrity sha512-VnctFhw+xfj8Va1xtfEqCUD2XDrbAPSJx+hSrE5K7fGdjZruW7XV+QOrN7LF/RJyvspRiD2I0asWsxFp0ya26A== +git-raw-commits@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-3.0.0.tgz#5432f053a9744f67e8db03dbc48add81252cfdeb" + integrity sha512-b5OHmZ3vAgGrDn/X0kS+9qCfNKWe4K/jFnhwzVWWg0/k5eLa3060tZShrRg8Dja5kPc+YjS0Gc6y7cRr44Lpjw== dependencies: dargs "^7.0.0" - lodash "^4.17.15" - meow "^8.0.0" - split2 "^3.0.0" - through2 "^4.0.0" + meow "^8.1.2" + split2 "^3.2.2" git-remote-origin-url@^2.0.0: version "2.0.0" @@ -12829,13 +12684,13 @@ git-remote-origin-url@^2.0.0: gitconfiglocal "^1.0.0" pify "^2.3.0" -git-semver-tags@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-4.1.1.tgz#63191bcd809b0ec3e151ba4751c16c444e5b5780" - integrity sha512-OWyMt5zBe7xFs8vglMmhM9lRQzCWL3WjHtxNNfJTMngGym7pC1kh8sP6jevfydJ6LP3ZvGxfb6ABYgPUM0mtsA== +git-semver-tags@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-5.0.0.tgz#775ff55effae0b50b755448408de6cd56ce293e2" + integrity sha512-fZ+tmZ1O5aXW/T5nLzZLbxWAHdQTLLXalOECMNAmhoEQSfqZjtaeMjpsXH4C5qVhrICTkVQeQFujB1lKzIHljA== dependencies: - meow "^8.0.0" - semver "^6.0.0" + meow "^8.1.2" + semver "^6.3.0" git-up@^7.0.0: version "7.0.0" @@ -12900,6 +12755,17 @@ glob@7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^10.2.2: + version "10.2.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.2.7.tgz#9dd2828cd5bc7bd861e7738d91e7113dda41d7d8" + integrity sha512-jTKehsravOJo8IJxUGfZILnkvVJM/MOfHRs8QcXolVef2zNI9Tqyy5+SeuOAZd3upViEZQLyFpQhYiHLrMUNmA== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.0.3" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2" + path-scurry "^1.7.0" + glob@^5.0.15: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" @@ -13202,16 +13068,16 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@4.2.10, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -graceful-fs@^4.2.6: +graceful-fs@4.2.11, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== +graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -13467,14 +13333,7 @@ hosted-git-info@^4.0.0, hosted-git-info@^4.0.1: dependencies: lru-cache "^6.0.0" -hosted-git-info@^5.0.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.2.1.tgz#0ba1c97178ef91f3ab30842ae63d6a272341156f" - integrity sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw== - dependencies: - lru-cache "^7.5.1" - -hosted-git-info@^6.0.0, hosted-git-info@^6.1.1: +hosted-git-info@^6.0.0: version "6.1.1" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-6.1.1.tgz#629442c7889a69c05de604d52996b74fe6f26d58" integrity sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w== @@ -13811,7 +13670,7 @@ import-lazy@^2.1.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== -import-local@^3.0.2: +import-local@3.1.0, import-local@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== @@ -13872,23 +13731,23 @@ ini@2.0.0: resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== -ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: +ini@^1.3.2, ini@^1.3.4, ini@^1.3.8, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -init-package-json@3.0.2, init-package-json@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-3.0.2.tgz#f5bc9bac93f2bdc005778bc2271be642fecfcd69" - integrity sha512-YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A== +init-package-json@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/init-package-json/-/init-package-json-5.0.0.tgz#030cf0ea9c84cfc1b0dc2e898b45d171393e4b40" + integrity sha512-kBhlSheBfYmq3e0L1ii+VKe3zBTLL5lDCDWR+f9dLmEGSB3MqLlMlsolubSsyI88Bg6EA+BIMlomAnQ1SwgQBw== dependencies: - npm-package-arg "^9.0.1" - promzard "^0.3.0" - read "^1.0.7" - read-package-json "^5.0.0" + npm-package-arg "^10.0.0" + promzard "^1.0.0" + read "^2.0.0" + read-package-json "^6.0.0" semver "^7.3.5" validate-npm-package-license "^3.0.4" - validate-npm-package-name "^4.0.0" + validate-npm-package-name "^5.0.0" inline-process-browser@^1.0.0: version "1.0.0" @@ -14147,20 +14006,20 @@ is-callable@^1.1.4, is-callable@^1.2.4: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-ci@2.0.0, is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== - dependencies: - ci-info "^2.0.0" - -is-ci@^3.0.0: +is-ci@3.0.1, is-ci@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== dependencies: ci-info "^3.2.0" +is-ci@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" + integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== + dependencies: + ci-info "^2.0.0" + is-class-hotfix@~0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/is-class-hotfix/-/is-class-hotfix-0.0.6.tgz#a527d31fb23279281dde5f385c77b5de70a72435" @@ -14751,6 +14610,15 @@ isurl@^1.0.0-alpha5: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" +jackspeak@^2.0.3: + version "2.2.1" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.2.1.tgz#655e8cf025d872c9c03d3eb63e8f0c024fef16a6" + integrity sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + jake@^10.8.5: version "10.8.5" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" @@ -14972,6 +14840,16 @@ jest-config@^29.5.0: slash "^3.0.0" strip-json-comments "^3.1.1" +"jest-diff@>=29.4.3 < 30", jest-diff@^29.5.0: + version "29.5.0" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63" + integrity sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw== + dependencies: + chalk "^4.0.0" + diff-sequences "^29.4.3" + jest-get-type "^29.4.3" + pretty-format "^29.5.0" + jest-diff@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" @@ -15012,16 +14890,6 @@ jest-diff@^29.4.3: jest-get-type "^29.4.3" pretty-format "^29.4.3" -jest-diff@^29.5.0: - version "29.5.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63" - integrity sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw== - dependencies: - chalk "^4.0.0" - diff-sequences "^29.4.3" - jest-get-type "^29.4.3" - pretty-format "^29.5.0" - jest-docblock@^26.0.0: version "26.0.0" resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-26.0.0.tgz#3e2fa20899fc928cb13bd0ff68bd3711a36889b5" @@ -16172,11 +16040,6 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= -json-stringify-nice@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67" - integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw== - json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -16291,16 +16154,6 @@ jstransform@~3.0.0: esprima-fb "~3001.1.0-dev-harmony-fb" source-map "0.1.31" -just-diff-apply@^5.2.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.5.0.tgz#771c2ca9fa69f3d2b54e7c3f5c1dfcbcc47f9f0f" - integrity sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw== - -just-diff@^6.0.0: - version "6.0.2" - resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-6.0.2.tgz#03b65908543ac0521caf6d8eb85035f7d27ea285" - integrity sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA== - jwa@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a" @@ -16672,48 +16525,47 @@ leaflet@^1.7.1: resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414" integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ== -lerna@7.0.0-alpha.0: - version "7.0.0-alpha.0" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-7.0.0-alpha.0.tgz#9ac8562c684bf5baaa4812b11a58c086b19d16ba" - integrity sha512-FyRCXnU4lJ4h+oUYZyKh034vLIlRr7Bxa6EQIgc12VBXb+UPcFtCGRFjNWEqrf69Sl1X/c15vim4nmEUd4O2BA== +lerna@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-7.0.1.tgz#056fc44f0e4852a06e943197d3d0d05d59d84559" + integrity sha512-kX279o8N/L2URwoR3Pf4TdIl5P8G443qAFy095ZD+Vu1tOMo8U6xOc221EgHoMuYhdqlT3f0vgn5bMMr/xNYhQ== dependencies: - "@lerna/child-process" "7.0.0-alpha.0" - "@lerna/create" "7.0.0-alpha.0" - "@npmcli/arborist" "6.2.3" - "@npmcli/run-script" "4.1.7" + "@lerna/child-process" "7.0.1" + "@lerna/create" "7.0.1" + "@npmcli/run-script" "6.0.2" "@nx/devkit" ">=16.1.3 < 17" "@octokit/plugin-enterprise-rest" "6.0.1" - "@octokit/rest" "19.0.3" - byte-size "7.0.0" + "@octokit/rest" "19.0.11" + byte-size "8.1.1" chalk "4.1.0" clone-deep "4.0.1" - cmd-shim "5.0.0" + cmd-shim "6.0.1" columnify "1.6.0" - config-chain "1.1.12" - conventional-changelog-angular "5.0.12" - conventional-changelog-core "4.2.4" - conventional-recommended-bump "6.1.0" - cosmiconfig "7.0.0" + conventional-changelog-angular "6.0.0" + conventional-changelog-core "5.0.1" + conventional-recommended-bump "7.0.1" + cosmiconfig "^8.2.0" dedent "0.7.0" - dot-prop "6.0.1" - envinfo "^7.7.4" + envinfo "7.8.1" execa "5.0.0" - fs-extra "9.1.0" + fs-extra "^11.1.1" get-port "5.1.1" get-stream "6.0.0" git-url-parse "13.1.0" glob-parent "5.1.2" globby "11.1.0" - graceful-fs "4.2.10" + graceful-fs "4.2.11" has-unicode "2.0.1" - import-local "^3.0.2" - init-package-json "3.0.2" + import-local "3.1.0" + ini "^1.3.8" + init-package-json "5.0.0" inquirer "^8.2.4" - is-ci "2.0.0" + is-ci "3.0.1" is-stream "2.0.0" - js-yaml "^4.1.0" - libnpmaccess "^6.0.3" - libnpmpublish "7.1.4" + jest-diff ">=29.4.3 < 30" + js-yaml "4.1.0" + libnpmaccess "7.0.2" + libnpmpublish "7.3.0" load-json-file "6.2.0" make-dir "3.1.0" minimatch "3.0.5" @@ -16721,7 +16573,7 @@ lerna@7.0.0-alpha.0: node-fetch "2.6.7" npm-package-arg "8.1.1" npm-packlist "5.1.1" - npm-registry-fetch "^14.0.3" + npm-registry-fetch "^14.0.5" npmlog "^6.0.2" nx ">=16.1.3 < 17" p-map "4.0.0" @@ -16730,25 +16582,25 @@ lerna@7.0.0-alpha.0: p-queue "6.6.2" p-reduce "2.1.0" p-waterfall "2.1.1" - pacote "15.1.1" + pacote "^15.2.0" pify "5.0.0" - read-cmd-shim "3.0.0" - read-package-json "5.0.1" + read-cmd-shim "4.0.0" + read-package-json "6.0.4" resolve-from "5.0.0" rimraf "^4.4.1" semver "^7.3.8" signal-exit "3.0.7" slash "3.0.0" - ssri "9.0.1" + ssri "^9.0.1" strong-log-transformer "2.1.0" tar "6.1.11" temp-dir "1.0.0" typescript ">=3 < 6" - upath "^2.0.1" - uuid "8.3.2" + upath "2.0.1" + uuid "^9.0.0" validate-npm-package-license "3.0.4" - validate-npm-package-name "4.0.0" - write-file-atomic "4.0.1" + validate-npm-package-name "5.0.0" + write-file-atomic "5.0.1" write-pkg "4.0.0" yargs "16.2.0" yargs-parser "20.2.4" @@ -16948,20 +16800,18 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -libnpmaccess@^6.0.3: - version "6.0.4" - resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-6.0.4.tgz#2dd158bd8a071817e2207d3b201d37cf1ad6ae6b" - integrity sha512-qZ3wcfIyUoW0+qSFkMBovcTrSGJ3ZeyvpR7d5N9pEYv/kXs8sHP2wiqEIXBKLFrZlmM0kR0RJD7mtfLngtlLag== +libnpmaccess@7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-7.0.2.tgz#7f056c8c933dd9c8ba771fa6493556b53c5aac52" + integrity sha512-vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw== dependencies: - aproba "^2.0.0" - minipass "^3.1.1" - npm-package-arg "^9.0.1" - npm-registry-fetch "^13.0.0" + npm-package-arg "^10.1.0" + npm-registry-fetch "^14.0.3" -libnpmpublish@7.1.4: - version "7.1.4" - resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-7.1.4.tgz#a0d138e00e52a0c71ffc82273acf0082fc2dfb36" - integrity sha512-mMntrhVwut5prP4rJ228eEbEyvIzLWhqFuY90j5QeXBCTT2pWSMno7Yo2S2qplPUr02zPurGH4heGLZ+wORczg== +libnpmpublish@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-7.3.0.tgz#2ceb2b36866d75a6cd7b4aa748808169f4d17e37" + integrity sha512-fHUxw5VJhZCNSls0KLNEG0mCD2PN1i14gH5elGOgiVnU3VgTcRahagYP2LKI1m0tFCJ+XrAm0zVYyF5RCbXzcg== dependencies: ci-info "^3.6.1" normalize-package-data "^5.0.0" @@ -17428,6 +17278,11 @@ lru-cache@^9.0.0: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.0.1.tgz#ac061ed291f8b9adaca2b085534bb1d3b61bef83" integrity sha512-C8QsKIN1UIXeOs3iWmiZ1lQY+EnKDojWd37fXy1aSbJvH4iSma1uy2OWuoB3m4SYRli5+CUjDv3Dij5DVoetmg== +lru-cache@^9.1.1: + version "9.1.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835" + integrity sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ== + lru_map@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/lru_map/-/lru_map-0.3.3.tgz#b5c8351b9464cbd750335a79650a0ec0e56118dd" @@ -17539,7 +17394,7 @@ make-error@1.x, make-error@^1.1.1: resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== -make-fetch-happen@^10.0.3, make-fetch-happen@^10.0.6: +make-fetch-happen@^10.0.3: version "10.2.1" resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== @@ -17754,7 +17609,7 @@ memorystream@0.3.1, memorystream@^0.3.1: resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw== -meow@^8.0.0: +meow@^8.1.2: version "8.1.2" resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897" integrity sha512-r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q== @@ -17929,13 +17784,6 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@^6.1.6: - version "6.2.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-6.2.0.tgz#2b70fd13294178c69c04dfc05aebdb97a4e79e42" - integrity sha512-sauLxniAmvnhhRjFwPNnJKaPFYyddAgbYdeUpHULtCT/GhzdCx/MDNy+Y40lBxTQUrMzDE8e0S43Z5uqfO0REg== - dependencies: - brace-expansion "^2.0.1" - minimatch@^7.4.2: version "7.4.6" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb" @@ -17943,7 +17791,7 @@ minimatch@^7.4.2: dependencies: brace-expansion "^2.0.1" -minimatch@^8.0.2, minimatch@^8.0.3: +minimatch@^8.0.2: version "8.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-8.0.4.tgz#847c1b25c014d4e9a7f68aaf63dedd668a626229" integrity sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA== @@ -17957,6 +17805,13 @@ minimatch@^9.0.0: dependencies: brace-expansion "^2.0.1" +minimatch@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253" + integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -18056,6 +17911,11 @@ minipass@^5.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== +"minipass@^5.0.0 || ^6.0.2": + version "6.0.2" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-6.0.2.tgz#542844b6c4ce95b202c0995b0a471f1229de4c81" + integrity sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w== + minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -18077,15 +17937,6 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp-infer-owner@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mkdirp-infer-owner/-/mkdirp-infer-owner-2.0.0.tgz#55d3b368e7d89065c38f32fd38e638f0ab61d316" - integrity sha512-sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw== - dependencies: - chownr "^2.0.0" - infer-owner "^1.0.4" - mkdirp "^1.0.3" - mkdirp@^0.5.0, mkdirp@^0.5.1: version "0.5.6" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" @@ -18159,7 +18010,7 @@ mock-require@^3.0.3: get-caller-file "^1.0.2" normalize-path "^2.1.1" -modify-values@^1.0.0: +modify-values@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw== @@ -18309,11 +18160,16 @@ multistream@^4.1.0: once "^1.4.0" readable-stream "^3.6.0" -mute-stream@0.0.8, mute-stream@~0.0.4: +mute-stream@0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +mute-stream@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e" + integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA== + mysql2@2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.3.tgz#944f3deca4b16629052ff8614fbf89d5552545a0" @@ -18668,13 +18524,6 @@ nopt@^6.0.0: dependencies: abbrev "^1.0.0" -nopt@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.1.0.tgz#91f6a3366182176e72ecab93a09c19b63b485f28" - integrity sha512-ZFPLe9Iu0tnx7oWhFxAo4s7QTn8+NNDDxYNaKLjE7Dp0tbakQ3M1QhQzsnzXHQBTUO3K9BmwaxnyO8Ayn2I95Q== - dependencies: - abbrev "^2.0.0" - nopt@~1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" @@ -18692,7 +18541,7 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-package-data@^3.0.0: +normalize-package-data@^3.0.0, normalize-package-data@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== @@ -18702,16 +18551,6 @@ normalize-package-data@^3.0.0: semver "^7.3.4" validate-npm-package-license "^3.0.1" -normalize-package-data@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c" - integrity sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg== - dependencies: - hosted-git-info "^5.0.0" - is-core-module "^2.8.1" - semver "^7.3.5" - validate-npm-package-license "^3.0.4" - normalize-package-data@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-5.0.0.tgz#abcb8d7e724c40d88462b84982f7cbf6859b4588" @@ -18784,11 +18623,6 @@ npm-normalize-package-bin@^1.0.1: resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== -npm-normalize-package-bin@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz#9447a1adaaf89d8ad0abe24c6c84ad614a675fff" - integrity sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ== - npm-normalize-package-bin@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz#6097436adb4ef09e2628b59a7882576fe53ce485" @@ -18813,16 +18647,6 @@ npm-package-arg@^10.0.0, npm-package-arg@^10.1.0: semver "^7.3.5" validate-npm-package-name "^5.0.0" -npm-package-arg@^9.0.1: - version "9.1.2" - resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-9.1.2.tgz#fc8acecb00235f42270dda446f36926ddd9ac2bc" - integrity sha512-pzd9rLEx4TfNJkovvlBSLGhq31gGu2QDexFPWT19yCDh0JgnRhlBLNo5759N0AJmBk+kQ9Y/hXoLnlgFD+ukmg== - dependencies: - hosted-git-info "^5.0.0" - proc-log "^2.0.1" - semver "^7.3.5" - validate-npm-package-name "^4.0.0" - npm-packlist@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.1.tgz#79bcaf22a26b6c30aa4dd66b976d69cc286800e0" @@ -18840,7 +18664,7 @@ npm-packlist@^7.0.0: dependencies: ignore-walk "^6.0.0" -npm-pick-manifest@^8.0.0, npm-pick-manifest@^8.0.1: +npm-pick-manifest@^8.0.0: version "8.0.1" resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz#c6acd97d1ad4c5dbb80eac7b386b03ffeb289e5f" integrity sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA== @@ -18850,19 +18674,6 @@ npm-pick-manifest@^8.0.0, npm-pick-manifest@^8.0.1: npm-package-arg "^10.0.0" semver "^7.3.5" -npm-registry-fetch@^13.0.0: - version "13.3.1" - resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-13.3.1.tgz#bb078b5fa6c52774116ae501ba1af2a33166af7e" - integrity sha512-eukJPi++DKRTjSBRcDZSDDsGqRK3ehbxfFUcgaRd0Yp6kRwOwh2WVn0r+8rMB4nnuzvAk6rQVzl6K5CkYOmnvw== - dependencies: - make-fetch-happen "^10.0.6" - minipass "^3.1.6" - minipass-fetch "^2.0.3" - minipass-json-stream "^1.0.1" - minizlib "^2.1.2" - npm-package-arg "^9.0.1" - proc-log "^2.0.0" - npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3: version "14.0.3" resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz#8545e321c2b36d2c6fe6e009e77e9f0e527f547b" @@ -18876,6 +18687,19 @@ npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3: npm-package-arg "^10.0.0" proc-log "^3.0.0" +npm-registry-fetch@^14.0.5: + version "14.0.5" + resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz#fe7169957ba4986a4853a650278ee02e568d115d" + integrity sha512-kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA== + dependencies: + make-fetch-happen "^11.0.0" + minipass "^5.0.0" + minipass-fetch "^3.0.0" + minipass-json-stream "^1.0.1" + minizlib "^2.1.2" + npm-package-arg "^10.0.0" + proc-log "^3.0.0" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -18920,16 +18744,6 @@ npmlog@^6.0.0, npmlog@^6.0.2: gauge "^4.0.3" set-blocking "^2.0.0" -npmlog@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-7.0.1.tgz#7372151a01ccb095c47d8bf1d0771a4ff1f53ac8" - integrity sha512-uJ0YFk/mCQpLBt+bxN88AKd+gyqZvZDbtiNxk6Waqcj2aPRyfVx8ITawkyQynxUagInjdYT1+qj4NfA5KJJUxg== - dependencies: - are-we-there-yet "^4.0.0" - console-control-strings "^1.1.0" - gauge "^5.0.0" - set-blocking "^2.0.0" - nth-check@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" @@ -19650,10 +19464,10 @@ packet-reader@1.0.0: resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ== -pacote@15.1.1, pacote@^15.0.0, pacote@^15.0.8: - version "15.1.1" - resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.1.1.tgz#94d8c6e0605e04d427610b3aacb0357073978348" - integrity sha512-eeqEe77QrA6auZxNHIp+1TzHQ0HBKf5V6c8zcaYZ134EJe1lCi+fjXATkNiEEfbG+e50nu02GLvUtmZcGOYabQ== +pacote@^15.2.0: + version "15.2.0" + resolved "https://registry.yarnpkg.com/pacote/-/pacote-15.2.0.tgz#0f0dfcc3e60c7b39121b2ac612bf8596e95344d3" + integrity sha512-rJVZeIwHTUta23sIZgEIM62WYwbmGbThdbnkt81ravBplQv+HjyroqnLRNH2+sLJHcGZmLRmhPwACqhfTcOmnA== dependencies: "@npmcli/git" "^4.0.0" "@npmcli/installed-package-contents" "^2.0.1" @@ -19661,7 +19475,7 @@ pacote@15.1.1, pacote@^15.0.0, pacote@^15.0.8: "@npmcli/run-script" "^6.0.0" cacache "^17.0.0" fs-minipass "^3.0.0" - minipass "^4.0.0" + minipass "^5.0.0" npm-package-arg "^10.0.0" npm-packlist "^7.0.0" npm-pick-manifest "^8.0.0" @@ -19670,7 +19484,7 @@ pacote@15.1.1, pacote@^15.0.0, pacote@^15.0.8: promise-retry "^2.0.1" read-package-json "^6.0.0" read-package-json-fast "^3.0.0" - sigstore "^1.0.0" + sigstore "^1.3.0" ssri "^10.0.0" tar "^6.1.11" @@ -19715,15 +19529,6 @@ parse-bmfont-xml@^1.1.4: xml-parse-from-string "^1.0.0" xml2js "^0.4.5" -parse-conflict-json@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz#67dc55312781e62aa2ddb91452c7606d1969960c" - integrity sha512-01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw== - dependencies: - json-parse-even-better-errors "^3.0.0" - just-diff "^6.0.0" - just-diff-apply "^5.2.0" - parse-headers@^2.0.0: version "2.0.5" resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.5.tgz#069793f9356a54008571eb7f9761153e6c770da9" @@ -19919,6 +19724,14 @@ path-scurry@^1.6.1: lru-cache "^9.0.0" minipass "^5.0.0" +path-scurry@^1.7.0: + version "1.9.2" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.9.2.tgz#90f9d296ac5e37e608028e28a447b11d385b3f63" + integrity sha512-qSDLy2aGFPm8i4rsbHd4MNyTcrzHFsLQykrtbuGRknZZCBBVXSv2tSCDN2Cg6Rt/GFRw8GoW9y9Ecw5rIPG1sg== + dependencies: + lru-cache "^9.1.1" + minipass "^5.0.0 || ^6.0.2" + path-to-regexp@0.1.7, path-to-regexp@^0.1.2: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -20531,7 +20344,7 @@ postcss-reduce-transforms@^5.1.0: dependencies: postcss-value-parser "^4.2.0" -postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: version "6.0.11" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== @@ -21077,11 +20890,6 @@ private@^0.1.6, private@~0.1.5: resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg== -proc-log@^2.0.0, proc-log@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-2.0.1.tgz#8f3f69a1f608de27878f91f5c688b225391cb685" - integrity sha512-Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw== - proc-log@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8" @@ -21117,16 +20925,6 @@ progress@^2.0.0, progress@^2.0.3: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -promise-all-reject-late@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz#f8ebf13483e5ca91ad809ccc2fcf25f26f8643c2" - integrity sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw== - -promise-call-limit@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/promise-call-limit/-/promise-call-limit-1.0.2.tgz#f64b8dd9ef7693c9c7613e7dfe8d6d24de3031ea" - integrity sha512-1vTUnfI2hzui8AEIixbdAJlFY4LFDXqQswy/2eOlThAscXCY4It8FdVuI0fMJGAB2aWGbdQf/gv0skKYXmdrHA== - promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" @@ -21153,12 +20951,12 @@ prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" -promzard@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz#26a5d6ee8c7dee4cb12208305acfb93ba382a9ee" - integrity sha512-JZeYqd7UAcHCwI+sTOeUDYkvEU+1bQ7iE0UT1MgB/tERkAPkesW46MrpIySzODi+owTjZtiF8Ay5j9m60KmMBw== +promzard@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/promzard/-/promzard-1.0.0.tgz#3246f8e6c9895a77c0549cefb65828ac0f6c006b" + integrity sha512-KQVDEubSUHGSt5xLakaToDFrSoZhStB8dXLzk2xvwR67gJktrHFvpR63oZgHyK19WKbHFLXJqCPXdVR3aBP8Ig== dependencies: - read "1" + read "^2.0.0" prop-types@^15.7.2: version "15.8.1" @@ -21356,7 +21154,7 @@ python-struct@^1.1.3: dependencies: long "^4.0.0" -q@^1.1.2, q@^1.5.1: +q@^1.1.2: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== @@ -21506,25 +21304,12 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== -read-cmd-shim@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-3.0.0.tgz#62b8c638225c61e6cc607f8f4b779f3b8238f155" - integrity sha512-KQDVjGqhZk92PPNRj9ZEXEuqg8bUobSKRw+q0YQ3TKI5xkce7bUJobL4Z/OtiEbAAv70yEpYIXp4iQ9L8oPVog== - -read-cmd-shim@^4.0.0: +read-cmd-shim@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz#640a08b473a49043e394ae0c7a34dd822c73b9bb" integrity sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q== -read-package-json-fast@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83" - integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ== - dependencies: - json-parse-even-better-errors "^2.3.0" - npm-normalize-package-bin "^1.0.1" - -read-package-json-fast@^3.0.0, read-package-json-fast@^3.0.2: +read-package-json-fast@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049" integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw== @@ -21532,25 +21317,15 @@ read-package-json-fast@^3.0.0, read-package-json-fast@^3.0.2: json-parse-even-better-errors "^3.0.0" npm-normalize-package-bin "^3.0.0" -read-package-json@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.1.tgz#1ed685d95ce258954596b13e2e0e76c7d0ab4c26" - integrity sha512-MALHuNgYWdGW3gKzuNMuYtcSSZbGQm94fAp16xt8VsYTLBjUSc55bLMKe6gzpWue0Tfi6CBgwCSdDAqutGDhMg== +read-package-json@6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-6.0.4.tgz#90318824ec456c287437ea79595f4c2854708836" + integrity sha512-AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw== dependencies: - glob "^8.0.1" - json-parse-even-better-errors "^2.3.1" - normalize-package-data "^4.0.0" - npm-normalize-package-bin "^1.0.1" - -read-package-json@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-5.0.2.tgz#b8779ccfd169f523b67208a89cc912e3f663f3fa" - integrity sha512-BSzugrt4kQ/Z0krro8zhTwV1Kd79ue25IhNN/VtHFy1mG/6Tluyi+msc0UpwaoQzxSHa28mntAjIZY6kEgfR9Q== - dependencies: - glob "^8.0.1" - json-parse-even-better-errors "^2.3.1" - normalize-package-data "^4.0.0" - npm-normalize-package-bin "^2.0.0" + glob "^10.2.2" + json-parse-even-better-errors "^3.0.0" + normalize-package-data "^5.0.0" + npm-normalize-package-bin "^3.0.0" read-package-json@^6.0.0: version "6.0.1" @@ -21598,12 +21373,12 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -read@1, read@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz#b3da19bd052431a97671d44a42634adf710b40c4" - integrity sha512-rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ== +read@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/read/-/read-2.1.0.tgz#69409372c54fe3381092bc363a00650b6ac37218" + integrity sha512-bvxi1QLJHcaywCAEsAk4DG3nVoqiY2Csps3qzWalhj5hFqRn1d/OixkFXtLO1PrgHUcAP0FNaSY/5GYNfENFFQ== dependencies: - mute-stream "~0.0.4" + mute-stream "~1.0.0" readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.26-4, readable-stream@^1.0.27-1: version "1.1.14" @@ -21615,7 +21390,7 @@ readable-stream@1.1.14, readable-stream@1.1.x, readable-stream@^1.0.26-4, readab isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.4.0: +"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.4.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -21669,7 +21444,7 @@ readable-stream@^3.0.1, readable-stream@^3.0.6, readable-stream@^3.1.1, readable string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@^4.0.0, readable-stream@^4.1.0: +readable-stream@^4.0.0: version "4.3.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.3.0.tgz#0914d0c72db03b316c9733bb3461d64a3cc50cba" integrity sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ== @@ -22867,14 +22642,20 @@ signal-exit@3.0.7, signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, s resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== -sigstore@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.2.0.tgz#ae5b31dac75c2d31e7873897e2862f0d0b205bce" - integrity sha512-Fr9+W1nkBSIZCkJQR7jDn/zI0UXNsVpp+7mDQkCnZOIxG9p6yNXBx9xntHsfUyYHE55XDkkVV3+rYbrkzAeesA== +signal-exit@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.0.2.tgz#ff55bb1d9ff2114c13b400688fa544ac63c36967" + integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q== + +sigstore@^1.3.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/sigstore/-/sigstore-1.6.0.tgz#887a4007c6ee83f3ef3fd844be1a0840e849c301" + integrity sha512-QODKff/qW/TXOZI6V/Clqu74xnInAS6it05mufj4/fSewexLtfEntgLZZcBtUK44CDQyUE5TUXYy1ARYzlfG9g== dependencies: "@sigstore/protobuf-specs" "^0.1.0" + "@sigstore/tuf" "^1.0.0" make-fetch-happen "^11.0.1" - tuf-js "^1.0.0" + tuf-js "^1.1.3" sigstore@^1.4.0: version "1.5.2" @@ -23323,7 +23104,7 @@ split2@^2.1.0: dependencies: through2 "^2.0.2" -split2@^3.0.0: +split2@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== @@ -23342,7 +23123,7 @@ split@0.3: dependencies: through "2" -split@^1.0.0, split@^1.0.1: +split@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9" integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg== @@ -23395,13 +23176,6 @@ sshpk@^1.14.1, sshpk@^1.7.0: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -ssri@9.0.1, ssri@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" - integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== - dependencies: - minipass "^3.1.1" - ssri@^10.0.0, ssri@^10.0.1: version "10.0.3" resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.3.tgz#7f83da39058ca1d599d174e9eee4237659710bf4" @@ -23409,6 +23183,13 @@ ssri@^10.0.0, ssri@^10.0.1: dependencies: minipass "^4.0.0" +ssri@^9.0.0, ssri@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" + integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== + dependencies: + minipass "^3.1.1" + stable@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" @@ -23561,6 +23342,15 @@ 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-width-cjs@npm:string-width@^4.2.0", "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" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" @@ -23570,15 +23360,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"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" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^3.0.0, string-width@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" @@ -23588,7 +23369,7 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^5.0.0: +string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== @@ -23669,6 +23450,13 @@ stringify-object@^3.2.1: is-obj "^1.0.1" is-regexp "^1.0.0" +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", 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" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -23683,13 +23471,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: dependencies: ansi-regex "^4.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" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" @@ -24375,13 +24156,6 @@ through2@^2.0.0, through2@^2.0.1, through2@^2.0.2, through2@^2.0.3: readable-stream "~2.3.6" xtend "~4.0.1" -through2@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" - integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw== - dependencies: - readable-stream "3" - through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -24625,11 +24399,6 @@ tree-kill@^1.2.2: resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== -treeverse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/treeverse/-/treeverse-3.0.0.tgz#dd82de9eb602115c6ebd77a574aae67003cb48c8" - integrity sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ== - trim-newlines@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" @@ -24768,14 +24537,6 @@ tsutils@^3.21.0: dependencies: tslib "^1.8.1" -tuf-js@^1.0.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.3.tgz#db3aada70fbf91fd9def9ad255645eaf81309f69" - integrity sha512-jGYi5nG/kqgfTFQSdoN6PW9eIn+XRZqdXku+fSwNk6UpWIsWaV7pzAqPgFr85edOPhoyJDyBqCS+DCnHroMvrw== - dependencies: - "@tufjs/models" "1.0.2" - make-fetch-happen "^11.0.1" - tuf-js@^1.1.3: version "1.1.6" resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.6.tgz#ad3e7a20237b83b51c2a8f9d1ddf093279a10fc2" @@ -25140,7 +24901,7 @@ untildify@^4.0.0: resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== -upath@^2.0.1: +upath@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w== @@ -25330,6 +25091,11 @@ uuid@^3.1.0, uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" + integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== + v8-compile-cache-lib@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" @@ -25366,10 +25132,10 @@ validate-npm-package-license@3.0.4, validate-npm-package-license@^3.0.1, validat spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" -validate-npm-package-name@4.0.0, validate-npm-package-name@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-4.0.0.tgz#fe8f1c50ac20afdb86f177da85b3600f0ac0d747" - integrity sha512-mzR0L8ZDktZjpX4OB46KT+56MAhl4EIazWP/+G/HPGuvfdaqg4YsCdtOm6U9+LOFyYDoh4dpnpxZRB9MQQns5Q== +validate-npm-package-name@5.0.0, validate-npm-package-name@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz#f16afd48318e6f90a1ec101377fa0384cfc8c713" + integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ== dependencies: builtins "^5.0.0" @@ -25380,13 +25146,6 @@ validate-npm-package-name@^3.0.0: dependencies: builtins "^1.0.3" -validate-npm-package-name@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz#f16afd48318e6f90a1ec101377fa0384cfc8c713" - integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ== - dependencies: - builtins "^5.0.0" - validate.js@0.13.1: version "0.13.1" resolved "https://registry.yarnpkg.com/validate.js/-/validate.js-0.13.1.tgz#b58bfac04a0f600a340f62e5227e70d95971e92a" @@ -25548,11 +25307,6 @@ wait-on@7.0.1: minimist "^1.2.7" rxjs "^7.8.0" -walk-up-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e" - integrity sha512-hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg== - walkdir@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/walkdir/-/walkdir-0.4.1.tgz#dc119f83f4421df52e3061e514228a2db20afa39" @@ -25892,6 +25646,15 @@ worker-farm@1.7.0: dependencies: errno "~0.1.7" +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" @@ -25910,27 +25673,27 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== +wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -write-file-atomic@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f" - integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ== +write-file-atomic@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.1.tgz#68df4717c55c6fa4281a7860b4c2ba0a6d2b11e7" + integrity sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw== dependencies: imurmurhash "^0.1.4" - signal-exit "^3.0.7" + signal-exit "^4.0.1" write-file-atomic@^2.4.2: version "2.4.3" @@ -25959,14 +25722,6 @@ write-file-atomic@^4.0.1, write-file-atomic@^4.0.2: imurmurhash "^0.1.4" signal-exit "^3.0.7" -write-file-atomic@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-5.0.0.tgz#54303f117e109bf3d540261125c8ea5a7320fab0" - integrity sha512-R7NYMnHSlV42K54lwY9lvW6MnSm1HSJqZL3xiSgi9E7//FYaI74r2G0rd+/X6VAMkHEdzxQaU5HUOXWUz5kA/w== - dependencies: - imurmurhash "^0.1.4" - signal-exit "^3.0.7" - write-json-file@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-3.2.0.tgz#65bbdc9ecd8a1458e15952770ccbadfcff5fe62a" @@ -26180,7 +25935,7 @@ yaml@2.0.0-1: resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.0.0-1.tgz#8c3029b3ee2028306d5bcf396980623115ff8d18" integrity sha512-W7h5dEhywMKenDJh2iX/LABkbFnBxasD27oyXWDS/feDsxiw0dD5ncXdYXgkvAsXIY2MpW/ZKkr9IU30DBdMNQ== -yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2: +yaml@^1.10.2, yaml@^1.7.2: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== From bc82f95410b2a56949f44917ed8d67c0572de22c Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 15 Jun 2023 11:48:49 +0100 Subject: [PATCH 187/587] Update nx to latest --- package.json | 2 +- yarn.lock | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 110 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 22e531d53a..49ffc5fef7 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "lerna": "^7.0.1", "madge": "^6.0.0", "minimist": "^1.2.8", - "nx": "^16.2.1", + "nx": "^16.3.2", "prettier": "^2.3.1", "prettier-plugin-svelte": "^2.3.0", "rimraf": "^3.0.2", diff --git a/yarn.lock b/yarn.lock index a404df15fa..d00fff35d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3833,6 +3833,13 @@ dependencies: nx "16.2.2" +"@nrwl/tao@16.3.2": + version "16.3.2" + resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-16.3.2.tgz#eefc1974342afbbe48e4e5351d6707ad2f9fb179" + integrity sha512-2Kg7dtv6JcQagCZPSq+okceI81NqmXGGgbKWqS7sOfdmp1otxS9uiUFNXw+Pdtnw38mdRviMtSOXScntu4sUKg== + dependencies: + nx "16.3.2" + "@nrwl/workspace@16.2.1": version "16.2.1" resolved "https://registry.yarnpkg.com/@nrwl/workspace/-/workspace-16.2.1.tgz#22e83a4b545e563fd157c407b387113a6bc639bc" @@ -3902,6 +3909,11 @@ resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.2.2.tgz#7fb43fe8976a12b58f008d336d4898164254b740" integrity sha512-CKfyLl92mhWqpv1hRTj3WgjVBY6yj3Et5T31m1N0assNWdTfuSB4ycdWzdlxXHx3yptnTOD/FCymTpUQI0GZRQ== +"@nx/nx-darwin-arm64@16.3.2": + version "16.3.2" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.3.2.tgz#83b6e78b27d2d7da8f7626560f52070c8735d28a" + integrity sha512-YfYVNfsJBzBcBnJUU4AcA6A4QMkgnVlETfp4KGL36Otq542mRY1ISGHdox63ocI5AKh5gay5AaGcR4wR9PU9Vg== + "@nx/nx-darwin-x64@16.2.1": version "16.2.1" resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.2.1.tgz#f878b9257bb5ed939c5095b72f1f37fe01bab950" @@ -3912,6 +3924,16 @@ resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.2.2.tgz#74b20875e1bcd450291a58026df9728f0b70f681" integrity sha512-++uDfp/Oo8DDVU53DiJVkRNjNbOLzahDH6dINeA/3yTCU/IS0wXoaoclNZBReMWlDKTVvWgLF/eSbGINMqUHRg== +"@nx/nx-darwin-x64@16.3.2": + version "16.3.2" + resolved "https://registry.yarnpkg.com/@nx/nx-darwin-x64/-/nx-darwin-x64-16.3.2.tgz#0ae2a64356542c5fb73ca8038ce10ec4512e7fcb" + integrity sha512-bJtpozz0zSRVRrcQ76GrlT3TWEGTymLYWrVG51bH5KZ46t6/a4EQBI3uL3vubMmOZ0jR4ywybOcPBBhxmBJ68w== + +"@nx/nx-freebsd-x64@16.3.2": + version "16.3.2" + resolved "https://registry.yarnpkg.com/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.3.2.tgz#202adf4d6070f47ed46450f006ecd50851147c74" + integrity sha512-ZvufI0bWqT67nLbBo6ejrIGxypdoedRQTP/tudWbs/4isvxLe1uVku1BfKCTQUsJG367SqNOU1H5kzI/MRr3ow== + "@nx/nx-linux-arm-gnueabihf@16.2.1": version "16.2.1" resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.2.1.tgz#a0f7d2c1f90d78bf30c7beae7c5481a71fb2652a" @@ -3922,6 +3944,11 @@ resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.2.2.tgz#5afa251361b609ed966d31cac6a789174bd6b3a5" integrity sha512-A4XFk63Q7fxgZaHnigIeofp/xOT2ZGDoNUyzld+UTlyJyNcClcOcqrro74aKOCG7PH0D56oE06JW3g7GKszgsA== +"@nx/nx-linux-arm-gnueabihf@16.3.2": + version "16.3.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.3.2.tgz#62314a82566e3647866b9dd4167a2d0e1397f001" + integrity sha512-IQL4kxdiZLvifar7+SIum3glRuVsxtE0dL8RvteSDXrxDQnaTUrjILC+VGhalRmk7ngBbGKNrhWOeeL7390CzQ== + "@nx/nx-linux-arm64-gnu@16.2.1": version "16.2.1" resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.2.1.tgz#30dead7a96437c7cbb041a45e1c0e7292fb2151a" @@ -3932,6 +3959,11 @@ resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.2.2.tgz#5d2c4f75ba582844d139729f4b194d39b8fc81d1" integrity sha512-aQpTLVSawFVr33pBWjj8elqvjA5uWvzDW7hGaFQPgWgmjxrtJikIAkcLjfNOz8XYjRAP4OZkTVh4/E3GUch0kQ== +"@nx/nx-linux-arm64-gnu@16.3.2": + version "16.3.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.3.2.tgz#02826400aa55b8f44bac83332dd29647d0e95001" + integrity sha512-f6AWgPVu3mfUEoOBa0rY2/7QY0Or9eR0KtLFpcPh7RUpxPw2EXzIbjD/0RGipdpspSrgiMKbZpsUjo6mXBFsQA== + "@nx/nx-linux-arm64-musl@16.2.1": version "16.2.1" resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.2.1.tgz#31219ecf98f9fe78b5fc06c9e0102d99e335bc5b" @@ -3942,6 +3974,11 @@ resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.2.2.tgz#5346829cddd27223c1c1b79c93eb195442b86907" integrity sha512-20vyNYQ2SYSaWdxORj9HdOyGxiqE8SauaFiBjjid6/e5mSyaSKu+HHGsvhDUqzlWn3OaABKBqx0iYa9Kmf3BOQ== +"@nx/nx-linux-arm64-musl@16.3.2": + version "16.3.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.3.2.tgz#a0a81520e0904aa026a7ab0a8a3bf3facec9f14c" + integrity sha512-AvrWcYz7021E3b5P9/0i26p60XMZfw86Epks51L6AhlflarlOH4AcEChc7APMtb1ELAIbDWx2S6oIDRbQ7rtVA== + "@nx/nx-linux-x64-gnu@16.2.1": version "16.2.1" resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.2.1.tgz#fb89cbbdf852e27093e0296ff7414ccccdf3591a" @@ -3952,6 +3989,11 @@ resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.2.2.tgz#702922f71076a041325add15b145f0e33726ec4a" integrity sha512-0G8kYpEmGHD+tT7RvUEvVXvPbvQD9GfEjeWEzZAdNAAMJu7JFjIo/oZDJYV7cMvXnC+tbpI9Gba5xfv8Al95eA== +"@nx/nx-linux-x64-gnu@16.3.2": + version "16.3.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.3.2.tgz#e79b5c142ec8d9bfb458ea5803bc4b62abbcf296" + integrity sha512-K2pWGAcbCNm6b7UZI9cc8z4Rb540QcuepBXD7akjPjWerzXriT6VCn4i9mVKsCg2mwSfknTJJVJ1PZwJSmTl/Q== + "@nx/nx-linux-x64-musl@16.2.1": version "16.2.1" resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.2.1.tgz#82b1b5ba04ef6e4d49527841239bf9e0fb1456e3" @@ -3962,6 +4004,11 @@ resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.2.2.tgz#ca2b0b1c98f16dfe66b7cffbec1e7b4c877058b4" integrity sha512-Incv7DbKLfh6kakzMBuy6GYRgI+jEdZBRiFw0GoN9EsknmrPT/URn+w6uuicGGEXOLYpO3HUO3E374+b5Wz2zg== +"@nx/nx-linux-x64-musl@16.3.2": + version "16.3.2" + resolved "https://registry.yarnpkg.com/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.3.2.tgz#900aee8f171638b9fb44378e2ac0548cb4aa99a7" + integrity sha512-sY1QDuQlqyYiRPJZanrtV07tU0DOXiCrWb0pDsGiO0qHuUSmW5Vw17GWEY4z3rt0/5U8fJ+/9WQrneviOmsOKg== + "@nx/nx-win32-arm64-msvc@16.2.1": version "16.2.1" resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.2.1.tgz#8a19a0c2db565f6d07a2d0b4a8b8fc6c8c86fadd" @@ -3972,6 +4019,11 @@ resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.2.2.tgz#4ad8f7bf300dac63227e51c393345cc2306368d3" integrity sha512-8m+Usj9faCl0pdQLFeBGhbYUObT3/tno5oGMPtJLyRjITNvTZAaIS4FFctp/rwJPehDBRQsUxwMJ2JRaU4jQdA== +"@nx/nx-win32-arm64-msvc@16.3.2": + version "16.3.2" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.3.2.tgz#88db772b3535648e147b1a0206b1a1fe875fa9a5" + integrity sha512-wBfohT2hjrLKn9WFHvG0MFVk7uYhgYNiptnTLdTouziHgFyZ08vyl7XYBq55BwHPMQ5iswVoEfjn/5ZBfCPscg== + "@nx/nx-win32-x64-msvc@16.2.1": version "16.2.1" resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.2.1.tgz#848b4c5b118f6a6f92f59c1643297e938c439242" @@ -3982,6 +4034,11 @@ resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.2.2.tgz#0afbeb2133613a5a3b0083e18a250472ccf45932" integrity sha512-liHtyVVOttcqHIV3Xrg/1AJzEgfiOCeqJsleHXHGgPr1fxPx7SIZaa3/QnDY1lNMN+t6Gvj0/r2Ba3iuptYD3Q== +"@nx/nx-win32-x64-msvc@16.3.2": + version "16.3.2" + resolved "https://registry.yarnpkg.com/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.3.2.tgz#2195faaf1fc465c7a89bfdd62323fdd2a5d91f15" + integrity sha512-QC0sWrfQm0/WdvvM//7UAgm+otbak6bznZ0zawTeqmLBh1hLjNeweyzSVKQEtZtlzDMKpzCVuuwkJq+VKBLvmw== + "@nx/workspace@16.2.1": version "16.2.1" resolved "https://registry.yarnpkg.com/@nx/workspace/-/workspace-16.2.1.tgz#52cc54bf9970fe6769459b1315eb7f6db8ec387f" @@ -18775,7 +18832,7 @@ nwsapi@^2.2.2: resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5" integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g== -nx@16.2.1, nx@^16.2.1: +nx@16.2.1: version "16.2.1" resolved "https://registry.yarnpkg.com/nx/-/nx-16.2.1.tgz#8571a4663c79dc9d60c98599b19146b58c59b473" integrity sha512-O+yGcYIQtYKYagbIuOQFk1P8ki5PHn0BZjdZpsa4K8UZ4pCaRWzlwWwwUL91FUJe6tdhic5710DwAAakbGKP7Q== @@ -18875,6 +18932,57 @@ nx@16.2.2, "nx@>=16.1.3 < 17": "@nx/nx-win32-arm64-msvc" "16.2.2" "@nx/nx-win32-x64-msvc" "16.2.2" +nx@16.3.2, nx@^16.3.2: + version "16.3.2" + resolved "https://registry.yarnpkg.com/nx/-/nx-16.3.2.tgz#92a2d7ef06d15b3b111b7cf9d35de08de0a22d90" + integrity sha512-fOzCVL7qoCJAcYTJwvJ9j+PSaL791ro4AICWuLxaphZsp2jcLoav4Ev7ONPks2Wlkt8FS9bee3nqQ3w1ya36Og== + dependencies: + "@nrwl/tao" "16.3.2" + "@parcel/watcher" "2.0.4" + "@yarnpkg/lockfile" "^1.1.0" + "@yarnpkg/parsers" "^3.0.0-rc.18" + "@zkochan/js-yaml" "0.0.6" + axios "^1.0.0" + chalk "^4.1.0" + cli-cursor "3.1.0" + cli-spinners "2.6.1" + cliui "^7.0.2" + dotenv "~10.0.0" + enquirer "~2.3.6" + fast-glob "3.2.7" + figures "3.2.0" + flat "^5.0.2" + fs-extra "^11.1.0" + glob "7.1.4" + ignore "^5.0.4" + js-yaml "4.1.0" + jsonc-parser "3.2.0" + lines-and-columns "~2.0.3" + minimatch "3.0.5" + npm-run-path "^4.0.1" + open "^8.4.0" + semver "7.3.4" + string-width "^4.2.3" + strong-log-transformer "^2.1.0" + tar-stream "~2.2.0" + tmp "~0.2.1" + tsconfig-paths "^4.1.2" + tslib "^2.3.0" + v8-compile-cache "2.3.0" + yargs "^17.6.2" + yargs-parser "21.1.1" + optionalDependencies: + "@nx/nx-darwin-arm64" "16.3.2" + "@nx/nx-darwin-x64" "16.3.2" + "@nx/nx-freebsd-x64" "16.3.2" + "@nx/nx-linux-arm-gnueabihf" "16.3.2" + "@nx/nx-linux-arm64-gnu" "16.3.2" + "@nx/nx-linux-arm64-musl" "16.3.2" + "@nx/nx-linux-x64-gnu" "16.3.2" + "@nx/nx-linux-x64-musl" "16.3.2" + "@nx/nx-win32-arm64-msvc" "16.3.2" + "@nx/nx-win32-x64-msvc" "16.3.2" + oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" From ea30b4a1769cadc98fbbf6a29409547faa94c963 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 15 Jun 2023 10:57:03 +0000 Subject: [PATCH 188/587] Bump version to 2.7.20-alpha.0 --- lerna.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index cb0b8dcc26..94f9d9120b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.19", + "version": "2.7.20-alpha.0", "npmClient": "yarn", "packages": [ "packages/backend-core", @@ -31,4 +31,4 @@ "loadEnvFiles": false } } -} +} \ No newline at end of file From 2f1274c88e59d735d3e4edc0fc6b7a0a9a1877ef Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Thu, 15 Jun 2023 12:37:57 +0100 Subject: [PATCH 189/587] Remove useWorkspaces (breaking change) --- lerna.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index f1d711e915..77932417d5 100644 --- a/lerna.json +++ b/lerna.json @@ -16,7 +16,6 @@ "packages/worker", "packages/pro/packages/pro" ], - "useWorkspaces": true, "command": { "publish": { "ignoreChanges": [ @@ -31,4 +30,4 @@ "loadEnvFiles": false } } -} \ No newline at end of file +} From 3be274c756a4fedb50f31b6288a80baf1b753c3a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 15 Jun 2023 11:47:45 +0000 Subject: [PATCH 190/587] Bump version to 2.7.20-alpha.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 94f9d9120b..e763ce2252 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.20-alpha.0", + "version": "2.7.20-alpha.1", "npmClient": "yarn", "packages": [ "packages/backend-core", From 9ca264642e8d02a0fede53afcbb35ff3d2ad23c2 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 15 Jun 2023 12:47:33 +0000 Subject: [PATCH 191/587] Bump version to 2.7.20-alpha.2 --- lerna.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index 795b0d6dc2..00e6aa61f9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.20-alpha.1", + "version": "2.7.20-alpha.2", "npmClient": "yarn", "packages": [ "packages/backend-core", @@ -30,4 +30,4 @@ "loadEnvFiles": false } } -} +} \ No newline at end of file From 73cae6198f23f5d09b2550845d2ca36b3c579e44 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 15 Jun 2023 14:23:33 +0100 Subject: [PATCH 192/587] Improve grid logic around vertically inverting row popovers --- .../frontend-core/src/components/grid/stores/viewport.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/frontend-core/src/components/grid/stores/viewport.js b/packages/frontend-core/src/components/grid/stores/viewport.js index bda56dc34f..f258b7daef 100644 --- a/packages/frontend-core/src/components/grid/stores/viewport.js +++ b/packages/frontend-core/src/components/grid/stores/viewport.js @@ -110,9 +110,10 @@ export const deriveStores = context => { const rowVerticalInversionIndex = derived( [visualRowCapacity, rowHeight], ([$visualRowCapacity, $rowHeight]) => { - return ( - $visualRowCapacity - Math.ceil(MaxCellRenderHeight / $rowHeight) - 2 - ) + const maxCellRenderRows = Math.ceil(MaxCellRenderHeight / $rowHeight) + const topIdx = $visualRowCapacity - maxCellRenderRows - 2 + const bottomIdx = maxCellRenderRows + 1 + return Math.max(topIdx, bottomIdx) } ) From dd8e54c5e13fe8de7947afc0c1d748adbffbc603 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 15 Jun 2023 15:20:14 +0100 Subject: [PATCH 193/587] update airgap script and enable support for offline mode --- .../scripts/airgapped/airgappedDockerBuild.js | 21 ++++++++++++------- package.json | 1 + .../pages/builder/portal/apps/_layout.svelte | 21 ++++++++++++------- .../pages/builder/portal/apps/index.svelte | 2 +- packages/builder/src/stores/portal/admin.js | 1 + packages/server/src/environment.ts | 1 + .../src/api/controllers/system/environment.ts | 1 + .../routes/system/tests/environment.spec.ts | 1 + packages/worker/src/environment.ts | 1 + 9 files changed, 34 insertions(+), 16 deletions(-) diff --git a/hosting/scripts/airgapped/airgappedDockerBuild.js b/hosting/scripts/airgapped/airgappedDockerBuild.js index cc0ea48eb3..58bc7c09a9 100755 --- a/hosting/scripts/airgapped/airgappedDockerBuild.js +++ b/hosting/scripts/airgapped/airgappedDockerBuild.js @@ -2,7 +2,9 @@ const fs = require("fs") const { execSync } = require("child_process") const path = require("path") -const IMAGES = { +const IS_SINGLE_IMAGE = process.env.SINGLE_IMAGE + +let IMAGES = { worker: "budibase/worker", apps: "budibase/apps", proxy: "budibase/proxy", @@ -10,7 +12,13 @@ const IMAGES = { couch: "ibmcom/couchdb3", curl: "curlimages/curl", redis: "redis", - watchtower: "containrrr/watchtower" + watchtower: "containrrr/watchtower", +} + +if (IS_SINGLE_IMAGE) { + IMAGES = { + budibase: "budibase/budibase" + } } const FILES = { @@ -39,11 +47,10 @@ for (let image in IMAGES) { } // copy config files -copyFile(FILES.COMPOSE) +if (!IS_SINGLE_IMAGE) { + copyFile(FILES.COMPOSE) +} copyFile(FILES.ENV) // compress -execSync(`tar -czf bb-airgapped.tar.gz hosting/scripts/bb-airgapped`) - -// clean up -fs.rmdirSync(OUTPUT_DIR, { recursive: true }) \ No newline at end of file +execSync(`tar -czf bb-airgapped.tar.gz hosting/scripts/bb-airgapped`) \ No newline at end of file diff --git a/package.json b/package.json index 56f015f8c0..c11ab662a3 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "build:docker:selfhost": "lerna run --stream build:docker && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh latest && cd -", "build:docker:develop": "node scripts/pinVersions && lerna run --stream build:docker && yarn build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh develop && cd -", "build:docker:airgap": "node hosting/scripts/airgapped/airgappedDockerBuild", + "build:docker:airgap:single": "SINGLE_IMAGE=1 node hosting/scripts/airgapped/airgappedDockerBuild", "build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -", "build:docker:single:multiarch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/single/Dockerfile -t budibase:latest .", "build:docker:single:image": "docker build -f hosting/single/Dockerfile -t budibase:latest .", diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte index 8c887da093..e7c0966c91 100644 --- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/apps/_layout.svelte @@ -1,6 +1,6 @@ - + - + -
+
{#if text} {text} {/if} @@ -57,10 +47,6 @@ line-clamp: 2; -webkit-box-orient: vertical; } - .text.compact { - font-size: 13px; - line-height: 15px; - } .text > :global(*) { font-size: inherit !important; } diff --git a/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte b/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte deleted file mode 100644 index aaea388c36..0000000000 --- a/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte +++ /dev/null @@ -1,68 +0,0 @@ - - -{#if options && Array.isArray(options)} -
- - {#if showSelectAll} - - {/if} - {#each options as option, i} - - {/each} - -
-{/if} - - diff --git a/packages/bbui/src/FancyForm/FancyField.svelte b/packages/bbui/src/FancyForm/FancyField.svelte index 455f4b38fb..0c99394599 100644 --- a/packages/bbui/src/FancyForm/FancyField.svelte +++ b/packages/bbui/src/FancyForm/FancyField.svelte @@ -11,7 +11,6 @@ export let value export let ref export let autoHeight - export let compact = false const formContext = getContext("fancy-form") const id = Math.random() @@ -43,7 +42,6 @@ class:disabled class:focused class:clickable - class:compact class:auto-height={autoHeight} >
@@ -63,6 +61,7 @@ diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte index ceb8fd7f4b..b7d70d88b7 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleButton.svelte @@ -3,6 +3,8 @@ import { store } from "builderStore" import { auth } from "stores/portal" + export let preAuthStep + export let datasource export let disabled export let samePage @@ -13,8 +15,18 @@ class:disabled {disabled} on:click={async () => { + let ds = datasource let appId = $store.appId - const url = `/api/global/auth/${tenantId}/datasource/google?appId=${appId}` + if (!ds) { + const resp = await preAuthStep() + if (resp.datasource && resp.appId) { + ds = resp.datasource + appId = resp.appId + } else { + ds = resp + } + } + const url = `/api/global/auth/${tenantId}/datasource/google?datasourceId=${ds._id}&appId=${appId}` if (samePage) { window.location = url } else { diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js index 2486942dea..18aa361570 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js @@ -44,9 +44,6 @@ export default ICONS export function getIcon(integrationType, schema) { const integrationList = get(integrations) - if (!integrationList) { - return - } if (integrationList[integrationType]?.iconUrl) { return { url: integrationList[integrationType].iconUrl } } else if (schema?.custom || !ICONS[integrationType]) { diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte index 1d84dbbe39..31a0d21cd8 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/DatasourceConfigModal.svelte @@ -1,19 +1,12 @@ nextStep()} - {confirmText} - cancelText={fetchTableStep ? "Cancel" : "Back"} - showSecondaryButton={datasourcePlus} + title={`Connect to ${name}`} + onConfirm={() => saveDatasource()} + confirmText={datasource.plus ? "Connect" : "Save and continue to query"} + cancelText="Back" + showSecondaryButton={datasource.plus} size="L" disabled={!isValid} > - - {#if !fetchTableStep} - Connect your database to Budibase using the config below - {:else} - Choose what tables you want to sync with Budibase - {/if} + Connect your database to Budibase using the config below. - {#if !fetchTableStep} - (isValid = e.detail)} - /> - {:else} -
- -
- {/if} + (isValid = e.detail)} + /> - - diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte index 14f81f915c..0783a9fe53 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte @@ -1,207 +1,43 @@ - {#if step === GoogleDatasouceConfigStep.AUTH} - - {#if isGoogleConfigured === true} - - Authenticate with your google account to use the {integrationName} integration. - - - {:else if isGoogleConfigured === false} + + {#if isGoogleConfigured === true} + Google authentication is not enabled, please complete Google SSO - configuration.Authenticate with your google account to use the {IntegrationNames[ + datasource.type + ]} integration. - Configure Google SSO - {/if} - {/if} - {#if step === GoogleDatasouceConfigStep.SET_URL} - - Add the URL of the sheet you want to connect. - - (isValid = e.detail)} - /> - - {/if} - {#if step === GoogleDatasouceConfigStep.SET_SHEETS} - - Select which spreadsheets you want to connect. - - - - {#if setSheetsErrorTitle || setSheetsErrorMessage} - - {/if} + save(datasource, true)} /> + {:else if isGoogleConfigured === false} + Google authentication is not enabled, please complete Google SSO + configuration. + Configure Google SSO {/if} diff --git a/packages/builder/src/components/commandPalette/CommandPalette.svelte b/packages/builder/src/components/commandPalette/CommandPalette.svelte index 3a369446a3..ae946dc10c 100644 --- a/packages/builder/src/components/commandPalette/CommandPalette.svelte +++ b/packages/builder/src/components/commandPalette/CommandPalette.svelte @@ -69,7 +69,7 @@ name: "App", description: "", icon: "Play", - action: () => store.update(state => ({ ...state, showPreview: true })), + action: () => window.open(`/${$store.appId}`), }, { type: "Preview", diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte index a85eb5a154..9813237317 100644 --- a/packages/builder/src/components/deploy/AppActions.svelte +++ b/packages/builder/src/components/deploy/AppActions.svelte @@ -62,10 +62,7 @@ } const previewApp = () => { - store.update(state => ({ - ...state, - showPreview: true, - })) + window.open(`/${application}`) } const viewApp = () => { diff --git a/packages/builder/src/components/start/ExportAppModal.svelte b/packages/builder/src/components/start/ExportAppModal.svelte index 4a69aaef74..948416b192 100644 --- a/packages/builder/src/components/start/ExportAppModal.svelte +++ b/packages/builder/src/components/start/ExportAppModal.svelte @@ -1,128 +1,27 @@ - - {#if currentStep === Step.CONFIG} - - - - - {#if !encypt} - - {/if} - {/if} - {#if currentStep === Step.SET_PASSWORD} - - {/if} + + + Apps can be exported with or without data that is within internal tables - + select this below. + diff --git a/packages/builder/src/helpers/validation/validation.js b/packages/builder/src/helpers/validation/validation.js index f64bf56835..db5dfe4430 100644 --- a/packages/builder/src/helpers/validation/validation.js +++ b/packages/builder/src/helpers/validation/validation.js @@ -6,6 +6,7 @@ export function createValidationStore(initialValue, ...validators) { let touched = false const value = writable(initialValue || "") + const error = derived(value, $v => validate($v, validators)) const touchedStore = derived(value, () => { if (!touched) { touched = true @@ -13,10 +14,6 @@ export function createValidationStore(initialValue, ...validators) { } return touched }) - const error = derived( - [value, touchedStore], - ([$v, $t]) => $t && validate($v, validators) - ) return [value, error, touchedStore] } diff --git a/packages/builder/src/helpers/validation/yup/index.js b/packages/builder/src/helpers/validation/yup/index.js index b5bdf030a5..20ddaebb1a 100644 --- a/packages/builder/src/helpers/validation/yup/index.js +++ b/packages/builder/src/helpers/validation/yup/index.js @@ -5,7 +5,6 @@ import { notifications } from "@budibase/bbui" export const createValidationStore = () => { const DEFAULT = { - values: {}, errors: {}, touched: {}, valid: false, @@ -34,9 +33,6 @@ export const createValidationStore = () => { case "email": propertyValidator = string().email().nullable() break - case "password": - propertyValidator = string().nullable() - break default: propertyValidator = string().nullable() } @@ -45,68 +41,9 @@ export const createValidationStore = () => { propertyValidator = propertyValidator.required() } - // We want to do this after the possible required validation, to prioritise the required error - switch (type) { - case "password": - propertyValidator = propertyValidator.min(8) - break - } - validator[propertyName] = propertyValidator } - const observe = async (propertyName, value) => { - const values = get(validation).values - let fieldIsValid - if (!values.hasOwnProperty(propertyName)) { - // Initial setup - values[propertyName] = value - return - } - - if (value === values[propertyName]) { - return - } - - const obj = object().shape(validator) - try { - validation.update(store => { - store.errors[propertyName] = null - return store - }) - await obj.validateAt(propertyName, { [propertyName]: value }) - fieldIsValid = true - } catch (error) { - const [fieldError] = error.errors - if (fieldError) { - validation.update(store => { - store.errors[propertyName] = capitalise(fieldError) - store.valid = false - return store - }) - } - } - - if (fieldIsValid) { - // Validate the rest of the fields - try { - await obj.validate( - { ...values, [propertyName]: value }, - { abortEarly: false } - ) - validation.update(store => { - store.valid = true - return store - }) - } catch { - validation.update(store => { - store.valid = false - return store - }) - } - } - } - const check = async values => { const obj = object().shape(validator) // clear the previous errors @@ -150,6 +87,5 @@ export const createValidationStore = () => { check, addValidator, addValidatorType, - observe, } } diff --git a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte deleted file mode 100644 index d069d1b4c7..0000000000 --- a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte +++ /dev/null @@ -1,91 +0,0 @@ - - -
-
-
-
- -
- ` + $: embed = `` diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte deleted file mode 100644 index 333a10bef7..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte +++ /dev/null @@ -1,252 +0,0 @@ - - -{#key appId} - - - - - - -
-
- -
-
- - - - - - - - - - - - - View - - - - Edit - - exportApp({ published: false })} - icon="DownloadFromCloud" - > - Export latest - - {#if isPublished} - exportApp({ published: true })} - icon="DownloadFromCloudOutline" - > - Export published - - Copy app ID - {/if} - {#if !isPublished} - - Delete - - {/if} - -
-
- - - - - - - - - - {#if loaded} - - {/if} - - - - - - - - (deletionConfirmationAppName = null)} - disabled={deletionConfirmationAppName !== app?.name} - > - Are you sure you want to delete {app?.name}? -
- Please enter the app name below to confirm. -

- - -{/key} - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte deleted file mode 100644 index b3aed56a48..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte +++ /dev/null @@ -1,211 +0,0 @@ - - - addData(data)} - showCloseIcon={false} - disabled={!valid} -> - {#if data.length} - - {#each data as input, index} -
-
- x._id !== Constants.Roles.PUBLIC - )} - secondaryPlaceholder="Access" - bind:primaryValue={input.id} - bind:secondaryValue={input.role} - bind:searchTerm={search} - getPrimaryOptionLabel={group => group.name} - getPrimaryOptionValue={group => group.name} - getPrimaryOptionIcon={group => group.icon} - getPrimaryOptionColour={group => group.colour} - getSecondaryOptionLabel={role => role.name} - getSecondaryOptionValue={role => role._id} - getSecondaryOptionColour={role => - RoleUtils.getRoleColour(role._id)} - /> -
-
- removeItem(index)} - /> -
-
- {/each} - - {/if} -
- Add more -
- - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/EditableRoleRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/EditableRoleRenderer.svelte deleted file mode 100644 index d92a522602..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/EditableRoleRenderer.svelte +++ /dev/null @@ -1,26 +0,0 @@ - - -
- rolesContext.updateRole(e.detail, row._id)} - on:remove={() => rolesContext.removeRole(row._id)} - /> -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte deleted file mode 100644 index 62c5da12ec..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte +++ /dev/null @@ -1,271 +0,0 @@ - - - - - Access - Assign users to your app and set their access - - - - {#if $usersFetch.loaded} - -
- Users - -
- -
- You have no users assigned yet -
-
- - - {/if} - - {#if $usersFetch.loaded && $licensing.groupsEnabled} - -
- Groups - -
- -
- You have no groups assigned yet -
-
- - {/if} - - - - - - - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/HistoryDetailsPanel.svelte deleted file mode 100644 index 565c0d1f2f..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/HistoryDetailsPanel.svelte +++ /dev/null @@ -1,82 +0,0 @@ - - -{#if history} - -
- - -
- - {history.automationName} - - - {#if history.status === STOPPED_ERROR} -
- -
- {/if} - {#if exists} -
- -
- {/if} - {#key history} -
- -
- {/key} - -{:else} - No details found -{/if} - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/StatusRenderer.svelte deleted file mode 100644 index f041faa349..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/_components/StatusRenderer.svelte +++ /dev/null @@ -1,27 +0,0 @@ - - - - {info.message} - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte deleted file mode 100644 index 5eb8b9d965..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte +++ /dev/null @@ -1,263 +0,0 @@ - - - - - Automation History - View the automations your app has executed - - - -
-
-
- -
-
- - - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/DatasourceRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/DatasourceRenderer.svelte deleted file mode 100644 index 198339dae9..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/DatasourceRenderer.svelte +++ /dev/null @@ -1,21 +0,0 @@ - - -
- {#if value != null} - -
{value || 0}
- {/if} -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/StatusRenderer.svelte deleted file mode 100644 index 3b3cce731d..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/StatusRenderer.svelte +++ /dev/null @@ -1,15 +0,0 @@ - - - - {status} - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte deleted file mode 100644 index fd67b4010b..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TimeAgoRenderer.svelte +++ /dev/null @@ -1,10 +0,0 @@ - - -{dayjs(value).fromNow()} diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TypeRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TypeRenderer.svelte deleted file mode 100644 index 86ad0f3d4e..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/TypeRenderer.svelte +++ /dev/null @@ -1,36 +0,0 @@ - - -
- {printTrigger(trigger)} - {type} -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte deleted file mode 100644 index 399877a801..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/_components/UserRenderer.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - -
- -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte deleted file mode 100644 index 77d76c9609..0000000000 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte +++ /dev/null @@ -1,344 +0,0 @@ - - - - -
- Backups - {#if !$licensing.backupsEnabled} - - Premium - - {/if} -
- Back up your apps and restore them to their previous state - - - - {#if !$licensing.backupsEnabled} - {#if !$auth.accountPortalAccess && $admin.cloud} - Contact your account holder to upgrade your plan. - {/if} -
- {#if $auth.accountPortalAccess} - - {/if} - -
- {:else if !backupData?.length && !loading && !filterOpt && !startDate} -
- - BackupsDefault - - You have no backups yet - You can manually back up your app any time - -
- -
- -
- {:else} - -
-
-
- import { setContext, onMount } from "svelte" - import { writable } from "svelte/store" import { fade } from "svelte/transition" import { clickOutside, ProgressCircle } from "@budibase/bbui" import { createEventManagers } from "../lib/events" @@ -30,6 +29,7 @@ GutterWidth, DefaultRowHeight, } from "../lib/constants" + import { memo } from "../../../utils" export let API = null export let tableId = null @@ -43,19 +43,29 @@ export let collaboration = true export let showAvatars = true export let showControls = true + export let filter = null + export let sortColumn = null + export let sortOrder = null // Unique identifier for DOM nodes inside this instance const rand = Math.random() - // State stores - const tableIdStore = writable(tableId) - const schemaOverridesStore = writable(schemaOverrides) - const config = writable({ + // Stores derived from props. + // We use memo here to ensure redundant store reactions don't fire and cause + // wasted API calls. + const tableIdStore = memo(tableId) + const schemaOverridesStore = memo(schemaOverrides) + const filterStore = memo(filter) + const sortStore = memo({ + column: sortColumn, + order: sortOrder, + }) + const config = memo({ allowAddRows, - allowSchemaChanges, allowExpandRows, allowEditRows, allowDeleteRows, + allowSchemaChanges, stripeRows, showControls, }) @@ -67,6 +77,8 @@ config, tableId: tableIdStore, schemaOverrides: schemaOverridesStore, + filter: filterStore, + sort: sortStore, } context = { ...context, ...createEventManagers() } context = attachStores(context) @@ -83,9 +95,14 @@ gridFocused, } = context - // Keep stores up to date + // Keep prop-derived stores up to date $: tableIdStore.set(tableId) $: schemaOverridesStore.set(schemaOverrides) + $: filterStore.set(filter) + $: sortStore.set({ + column: sortColumn, + order: sortOrder, + }) $: config.set({ allowAddRows, allowSchemaChanges, @@ -115,10 +132,10 @@ id="grid-{rand}" class:is-resizing={$isResizing} class:is-reordering={$isReordering} - class:stripe={$config.stripeRows} - style="--row-height:{$rowHeight}px; --default-row-height:{DefaultRowHeight}px; --gutter-width:{GutterWidth}px; --max-cell-render-height:{MaxCellRenderHeight}px; --max-cell-render-width-overflow:{MaxCellRenderWidthOverflow}px; --content-lines:{$contentLines};" + class:stripe={stripeRows} on:mouseenter={() => gridFocused.set(true)} on:mouseleave={() => gridFocused.set(false)} + style="--row-height:{$rowHeight}px; --default-row-height:{DefaultRowHeight}px; --gutter-width:{GutterWidth}px; --max-cell-render-height:{MaxCellRenderHeight}px; --max-cell-render-width-overflow:{MaxCellRenderWidthOverflow}px; --content-lines:{$contentLines};" > {#if showControls}
@@ -170,6 +187,7 @@
diff --git a/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte index 42fb796ac9..33a0a0e2d3 100644 --- a/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte +++ b/packages/frontend-core/src/components/grid/overlays/ResizeOverlay.svelte @@ -65,6 +65,6 @@ margin-left: -1px; width: 2px; height: 100%; - background: var(--spectrum-global-color-blue-400); + background: var(--accent-color); } From 832ee22c0a416d293d7451cd09ac328b23372281 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Mon, 19 Jun 2023 11:43:00 +0100 Subject: [PATCH 229/587] fix issue with adding automation step --- .../automation/SetupPanel/AutomationBlockSetup.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index a8fa700b90..d2e34319da 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -309,7 +309,7 @@ } function canShowField(key, value) { - const dependsOn = value.dependsOn + const dependsOn = value?.dependsOn return !dependsOn || !!inputData[dependsOn] } From d77b2c6ab16d4a9c58e73911717df2be53474dde Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 19 Jun 2023 17:24:40 +0100 Subject: [PATCH 230/587] Refactor how grid settings are used and add option for row height --- packages/client/manifest.json | 36 ++++++++++--- .../src/components/app/GridBlock.svelte | 14 ++--- .../grid/controls/ColumnWidthButton.svelte | 18 +------ .../src/components/grid/layout/Grid.svelte | 54 ++++++------------- .../src/components/grid/stores/columns.js | 18 +++++++ .../src/components/grid/stores/config.js | 23 ++++++++ .../src/components/grid/stores/filter.js | 20 +++++++ .../src/components/grid/stores/index.js | 6 +++ .../src/components/grid/stores/sort.js | 27 ++++++++++ .../src/components/grid/stores/ui.js | 13 +++-- packages/frontend-core/src/utils/index.js | 2 +- packages/frontend-core/src/utils/memo.js | 10 +++- 12 files changed, 168 insertions(+), 73 deletions(-) create mode 100644 packages/frontend-core/src/components/grid/stores/config.js create mode 100644 packages/frontend-core/src/components/grid/stores/filter.js create mode 100644 packages/frontend-core/src/components/grid/stores/sort.js diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 3f36f2f666..3186c40259 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5230,9 +5230,7 @@ "block": true, "name": "Grid block", "icon": "Table", - "styles": [ - "size" - ], + "styles": ["size"], "size": { "width": 600, "height": 400 @@ -5245,23 +5243,49 @@ "key": "table", "required": true }, + { + "type": "columns", + "label": "Columns", + "key": "columns", + "dependsOn": "table" + }, { "type": "filter", "label": "Filtering", - "key": "filter" + "key": "initialFilter" }, { "type": "field/sortable", "label": "Sort column", - "key": "sortColumn" + "key": "initialSortColumn" }, { "type": "select", "label": "Sort order", - "key": "sortOrder", + "key": "initialSortOrder", "options": ["Ascending", "Descending"], "defaultValue": "Ascending" }, + { + "type": "select", + "label": "Row height", + "key": "initialRowHeight", + "placeholder": "Default", + "options": [ + { + "label": "Small", + "value": 36 + }, + { + "label": "Medium", + "value": 64 + }, + { + "label": "Large", + "value": 92 + } + ] + }, { "type": "boolean", "label": "Add rows", diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index 5267582bc8..bfc3a15d1c 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -9,9 +9,10 @@ export let allowEditRows = true export let allowDeleteRows = true export let stripeRows = false - export let filter = null - export let sortColumn = null - export let sortOrder = null + export let initialFilter = null + export let initialSortColumn = null + export let initialSortOrder = null + export let initialRowHeight = null const component = getContext("component") const { styleable, API, builderStore } = getContext("sdk") @@ -28,9 +29,10 @@ {allowEditRows} {allowDeleteRows} {stripeRows} - {filter} - {sortColumn} - {sortOrder} + {initialFilter} + {initialSortColumn} + {initialSortOrder} + {initialRowHeight} showControls={false} allowExpandRows={false} allowSchemaChanges={false} diff --git a/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte index 5ffd968d30..fb20cc50e5 100644 --- a/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte +++ b/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte @@ -33,22 +33,6 @@ selected: allLarge, }, ] - - const changeColumnWidth = async width => { - columns.update(state => { - state.forEach(column => { - column.width = width - }) - return state - }) - if ($stickyColumn) { - stickyColumn.update(state => ({ - ...state, - width, - })) - } - await columns.actions.saveChanges() - }
@@ -70,7 +54,7 @@ {#each sizeOptions as option} changeColumnWidth(option.size)} + on:click={() => columns.actions.changeAllColumnWidths(option.size)} selected={option.selected} > {option.label} diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte index 9edd69d09d..211bb15917 100644 --- a/packages/frontend-core/src/components/grid/layout/Grid.svelte +++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte @@ -29,7 +29,6 @@ GutterWidth, DefaultRowHeight, } from "../lib/constants" - import { memo } from "../../../utils" export let API = null export let tableId = null @@ -43,48 +42,26 @@ export let collaboration = true export let showAvatars = true export let showControls = true - export let filter = null - export let sortColumn = null - export let sortOrder = null + export let initialFilter = null + export let initialSortColumn = null + export let initialSortOrder = null + export let initialRowHeight = null // Unique identifier for DOM nodes inside this instance const rand = Math.random() - // Stores derived from props. - // We use memo here to ensure redundant store reactions don't fire and cause - // wasted API calls. - const tableIdStore = memo(tableId) - const schemaOverridesStore = memo(schemaOverrides) - const filterStore = memo(filter) - const sortStore = memo({ - column: sortColumn, - order: sortOrder, - }) - const config = memo({ - allowAddRows, - allowExpandRows, - allowEditRows, - allowDeleteRows, - allowSchemaChanges, - stripeRows, - showControls, - }) - // Build up context let context = { API: API || createAPIClient(), rand, - config, - tableId: tableIdStore, - schemaOverrides: schemaOverridesStore, - filter: filterStore, - sort: sortStore, + props: $$props, } context = { ...context, ...createEventManagers() } context = attachStores(context) // Reference some stores for local use const { + config, isResizing, isReordering, ui, @@ -95,22 +72,23 @@ gridFocused, } = context - // Keep prop-derived stores up to date - $: tableIdStore.set(tableId) - $: schemaOverridesStore.set(schemaOverrides) - $: filterStore.set(filter) - $: sortStore.set({ - column: sortColumn, - order: sortOrder, - }) + // Keep config store up to date with props $: config.set({ + tableId, + schemaOverrides, allowAddRows, - allowSchemaChanges, allowExpandRows, allowEditRows, allowDeleteRows, + allowSchemaChanges, stripeRows, + collaboration, + showAvatars, showControls, + initialFilter, + initialSortColumn, + initialSortOrder, + initialRowHeight, }) // Set context for children to consume diff --git a/packages/frontend-core/src/components/grid/stores/columns.js b/packages/frontend-core/src/components/grid/stores/columns.js index a0820e77bb..5f34de1434 100644 --- a/packages/frontend-core/src/components/grid/stores/columns.js +++ b/packages/frontend-core/src/components/grid/stores/columns.js @@ -56,6 +56,23 @@ export const deriveStores = context => { }) } + // Updates the width of all columns + const changeAllColumnWidths = async width => { + columns.update(state => { + return state.map(col => ({ + ...col, + width, + })) + }) + if (get(stickyColumn)) { + stickyColumn.update(state => ({ + ...state, + width, + })) + } + await saveChanges() + } + // Persists column changes by saving metadata against table schema const saveChanges = async () => { const $columns = get(columns) @@ -107,6 +124,7 @@ export const deriveStores = context => { saveChanges, saveTable, changePrimaryDisplay, + changeAllColumnWidths, }, }, } diff --git a/packages/frontend-core/src/components/grid/stores/config.js b/packages/frontend-core/src/components/grid/stores/config.js new file mode 100644 index 0000000000..3e8da81e2e --- /dev/null +++ b/packages/frontend-core/src/components/grid/stores/config.js @@ -0,0 +1,23 @@ +import { writable } from "svelte/store" +import { derivedMemo } from "../../../utils" + +export const createStores = context => { + const config = writable(context.props) + const getProp = prop => derivedMemo(config, $config => $config[prop]) + + // Derive and memoize some props so that we can react to them in isolation + const tableId = getProp("tableId") + const initialSortColumn = getProp("initialSortColumn") + const initialSortOrder = getProp("initialSortOrder") + const initialFilter = getProp("initialFilter") + const initialRowHeight = getProp("initialRowHeight") + + return { + config, + tableId, + initialSortColumn, + initialSortOrder, + initialFilter, + initialRowHeight, + } +} diff --git a/packages/frontend-core/src/components/grid/stores/filter.js b/packages/frontend-core/src/components/grid/stores/filter.js new file mode 100644 index 0000000000..1f01aaec40 --- /dev/null +++ b/packages/frontend-core/src/components/grid/stores/filter.js @@ -0,0 +1,20 @@ +import { writable } from "svelte/store" +import { derivedMemo } from "../../../utils" + +export const createStores = context => { + const { props } = context + + // Initialise to default props + const filter = writable(props.initialFilter) + + return { + filter, + } +} + +export const initialise = context => { + const { filter, initialFilter } = context + + // Reset filter when initial filter prop changes + initialFilter.subscribe(filter.set) +} diff --git a/packages/frontend-core/src/components/grid/stores/index.js b/packages/frontend-core/src/components/grid/stores/index.js index aa552a9ffe..588b568c8e 100644 --- a/packages/frontend-core/src/components/grid/stores/index.js +++ b/packages/frontend-core/src/components/grid/stores/index.js @@ -11,8 +11,14 @@ import * as Users from "./users" import * as Validation from "./validation" import * as Viewport from "./viewport" import * as Clipboard from "./clipboard" +import * as Config from "./config" +import * as Sort from "./sort" +import * as Filter from "./filter" const DependencyOrderedStores = [ + Config, + Sort, + Filter, Bounds, Scroll, Rows, diff --git a/packages/frontend-core/src/components/grid/stores/sort.js b/packages/frontend-core/src/components/grid/stores/sort.js new file mode 100644 index 0000000000..211124f640 --- /dev/null +++ b/packages/frontend-core/src/components/grid/stores/sort.js @@ -0,0 +1,27 @@ +import { writable } from "svelte/store" + +export const createStores = context => { + const { props } = context + + // Initialise to default props + const sort = writable({ + column: props.initialSortColumn, + order: props.initialSortOrder || "ascending", + }) + + return { + sort, + } +} + +export const initialise = context => { + const { sort, initialSortColumn, initialSortOrder } = context + + // Reset sort when initial sort props change + initialSortColumn.subscribe(newSortColumn => { + sort.update(state => ({ ...state, column: newSortColumn })) + }) + initialSortOrder.subscribe(newSortOrder => { + sort.update(state => ({ ...state, order: newSortOrder })) + }) +} diff --git a/packages/frontend-core/src/components/grid/stores/ui.js b/packages/frontend-core/src/components/grid/stores/ui.js index f5c0905320..168b0c8184 100644 --- a/packages/frontend-core/src/components/grid/stores/ui.js +++ b/packages/frontend-core/src/components/grid/stores/ui.js @@ -8,12 +8,13 @@ import { NewRowID, } from "../lib/constants" -export const createStores = () => { +export const createStores = context => { + const { props } = context const focusedCellId = writable(null) const focusedCellAPI = writable(null) const selectedRows = writable({}) const hoveredRowId = writable(null) - const rowHeight = writable(DefaultRowHeight) + const rowHeight = writable(props.initialRowHeight || DefaultRowHeight) const previousFocusedRowId = writable(null) const gridFocused = writable(false) const isDragging = writable(false) @@ -98,9 +99,9 @@ export const deriveStores = context => { // Derive the amount of content lines to show in cells depending on row height const contentLines = derived(rowHeight, $rowHeight => { - if ($rowHeight === LargeRowHeight) { + if ($rowHeight >= LargeRowHeight) { return 3 - } else if ($rowHeight === MediumRowHeight) { + } else if ($rowHeight >= MediumRowHeight) { return 2 } return 1 @@ -133,6 +134,7 @@ export const initialise = context => { hoveredRowId, table, rowHeight, + initialRowHeight, } = context // Ensure we clear invalid rows from state if they disappear @@ -189,4 +191,7 @@ export const initialise = context => { table.subscribe($table => { rowHeight.set($table?.rowHeight || DefaultRowHeight) }) + + // Reset row height when initial row height prop changes + initialRowHeight.subscribe(rowHeight.set) } diff --git a/packages/frontend-core/src/utils/index.js b/packages/frontend-core/src/utils/index.js index e3ec87a5e9..26e44410ba 100644 --- a/packages/frontend-core/src/utils/index.js +++ b/packages/frontend-core/src/utils/index.js @@ -3,5 +3,5 @@ export * as JSONUtils from "./json" export * as CookieUtils from "./cookies" export * as RoleUtils from "./roles" export * as Utils from "./utils" -export { memo } from "./memo" +export { memo, derivedMemo } from "./memo" export { createWebsocket } from "./websocket" diff --git a/packages/frontend-core/src/utils/memo.js b/packages/frontend-core/src/utils/memo.js index d46b264d1b..ba0e3f3490 100644 --- a/packages/frontend-core/src/utils/memo.js +++ b/packages/frontend-core/src/utils/memo.js @@ -1,4 +1,4 @@ -import { writable, get } from "svelte/store" +import { writable, get, derived } from "svelte/store" // A simple svelte store which deeply compares all changes and ensures that // subscribed children will only fire when a new value is actually set @@ -33,3 +33,11 @@ export const memo = initialValue => { }, } } + +// Enriched version of svelte's derived store which returns a memo +export const derivedMemo = (store, derivation) => { + const derivedStore = derived(store, derivation) + const memoStore = memo(get(derivedStore)) + derivedStore.subscribe(memoStore.set) + return memoStore +} From fe2d63f741383d1ebf088554d0e3b331f9dd2e6f Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 19 Jun 2023 17:33:10 +0100 Subject: [PATCH 231/587] Fix lint --- .../builder/src/components/start/CreateAppModal.svelte | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte index f6051f54e9..cf42668add 100644 --- a/packages/builder/src/components/start/CreateAppModal.svelte +++ b/packages/builder/src/components/start/CreateAppModal.svelte @@ -1,12 +1,6 @@ -
+
Date: Mon, 19 Jun 2023 17:16:30 +0000 Subject: [PATCH 265/587] Bump version to 2.7.25-alpha.5 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 22be73c393..26b1168353 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.25-alpha.4", + "version": "2.7.25-alpha.5", "npmClient": "yarn", "packages": [ "packages/backend-core", From 757d2d11eff6f558e7bfaa6ea5b6e75432106cf9 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 19 Jun 2023 18:21:14 +0100 Subject: [PATCH 266/587] Add functionality to suppress errors to avoid spam in grids in client apps --- packages/client/src/api/api.js | 5 +++-- packages/frontend-core/src/api/index.js | 10 ++++++++-- packages/frontend-core/src/api/rows.js | 4 +++- .../frontend-core/src/components/grid/stores/rows.js | 12 ++++++++++-- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/packages/client/src/api/api.js b/packages/client/src/api/api.js index b4a137f85d..4062bd3b73 100644 --- a/packages/client/src/api/api.js +++ b/packages/client/src/api/api.js @@ -35,7 +35,8 @@ export const API = createAPIClient({ // We could also log these to sentry. // Or we could check error.status and redirect to login on a 403 etc. onError: error => { - const { status, method, url, message, handled } = error || {} + const { status, method, url, message, handled, suppressErrors } = + error || {} const ignoreErrorUrls = [ "bbtel", "/api/global/self", @@ -49,7 +50,7 @@ export const API = createAPIClient({ } // Notify all errors - if (message) { + if (message && !suppressErrors) { // Don't notify if the URL contains the word analytics as it may be // blocked by browser extensions let ignore = false diff --git a/packages/frontend-core/src/api/index.js b/packages/frontend-core/src/api/index.js index 739e0fe711..05abded61c 100644 --- a/packages/frontend-core/src/api/index.js +++ b/packages/frontend-core/src/api/index.js @@ -75,7 +75,11 @@ export const createAPIClient = config => { let cache = {} // Generates an error object from an API response - const makeErrorFromResponse = async (response, method) => { + const makeErrorFromResponse = async ( + response, + method, + suppressErrors = false + ) => { // Try to read a message from the error let message = response.statusText let json = null @@ -96,6 +100,7 @@ export const createAPIClient = config => { url: response.url, method, handled: true, + suppressErrors, } } @@ -119,6 +124,7 @@ export const createAPIClient = config => { json = true, external = false, parseResponse, + suppressErrors = false, }) => { // Ensure we don't do JSON processing if sending a GET request json = json && method !== "GET" @@ -174,7 +180,7 @@ export const createAPIClient = config => { } } else { delete cache[url] - throw await makeErrorFromResponse(response, method) + throw await makeErrorFromResponse(response, method, suppressErrors) } } diff --git a/packages/frontend-core/src/api/rows.js b/packages/frontend-core/src/api/rows.js index 41ba505d81..8e8570ea2a 100644 --- a/packages/frontend-core/src/api/rows.js +++ b/packages/frontend-core/src/api/rows.js @@ -16,14 +16,16 @@ export const buildRowEndpoints = API => ({ /** * Creates or updates a row in a table. * @param row the row to save + * @param suppressErrors whether or not to suppress error notifications */ - saveRow: async row => { + saveRow: async (row, suppressErrors = false) => { if (!row?.tableId) { return } return await API.post({ url: `/api/${row.tableId}/rows`, body: row, + suppressErrors, }) }, diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js index 9e12e16eb1..d7e623692e 100644 --- a/packages/frontend-core/src/components/grid/stores/rows.js +++ b/packages/frontend-core/src/components/grid/stores/rows.js @@ -4,6 +4,8 @@ import { notifications } from "@budibase/bbui" import { NewRowID, RowPageSize } from "../lib/constants" import { tick } from "svelte" +const SuppressErrors = true + export const createStores = () => { const rows = writable([]) const table = writable(null) @@ -209,7 +211,10 @@ export const deriveStores = context => { const addRow = async (row, idx, bubble = false) => { try { // Create row - const newRow = await API.saveRow({ ...row, tableId: get(tableId) }) + const newRow = await API.saveRow( + { ...row, tableId: get(tableId) }, + SuppressErrors + ) // Update state if (idx != null) { @@ -336,7 +341,10 @@ export const deriveStores = context => { ...state, [rowId]: true, })) - const saved = await API.saveRow({ ...row, ...get(rowChangeCache)[rowId] }) + const saved = await API.saveRow( + { ...row, ...get(rowChangeCache)[rowId] }, + SuppressErrors + ) // Update state after a successful change if (saved?._id) { From 289a75fc9a8e869e5a8cec2bade95ef04d3d033e Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 19 Jun 2023 18:28:38 +0100 Subject: [PATCH 267/587] Few minor updates to the integration suite to make it easier to decipher what is happening under the hood, as well as making it easier to log from these (where there is no pino logging available, importing backend-core breaks things). Also added a new script which can be used to get local environment setup as needed to run qa-core tests. Finally, xdescribe for the failing test until can work out what is wrong with MongoDB installation in QA environment. --- packages/backend-core/jest.config.ts | 2 + packages/server/src/integrations/mongodb.ts | 6 ++- .../src/api/controllers/global/users.ts | 2 +- qa-core/package.json | 1 + qa-core/scripts/createUser.js | 49 +++++++++++++++++++ .../api/AccountInternalAPIClient.ts | 3 +- .../api/BudibaseInternalAPIClient.ts | 3 +- .../dataSources/mongoDB.integration.spec.ts | 2 +- qa-core/src/jest/globalSetup.ts | 1 + .../public-api/api/BudibasePublicAPIClient.ts | 3 +- yarn.lock | 19 ++++++- 11 files changed, 83 insertions(+), 8 deletions(-) create mode 100644 qa-core/scripts/createUser.js diff --git a/packages/backend-core/jest.config.ts b/packages/backend-core/jest.config.ts index 1e69797e71..8d64b24a2f 100644 --- a/packages/backend-core/jest.config.ts +++ b/packages/backend-core/jest.config.ts @@ -31,4 +31,6 @@ const config: Config.InitialOptions = { coverageReporters: ["lcov", "json", "clover"], } +process.env.DISABLE_PINO_LOGGER = "1" + export default config diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index f076536344..0a2dfd856c 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -489,7 +489,11 @@ class MongoIntegration implements IntegrationBase { switch (query.extra.actionType) { case "find": { - return await collection.find(json).toArray() + if (json) { + return await collection.find(json).toArray() + } else { + return await collection.find().toArray() + } } case "findOne": { return await collection.findOne(json) diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index 33335379c0..320f7be01a 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -38,7 +38,7 @@ const MAX_USERS_UPLOAD_LIMIT = 1000 export const save = async (ctx: UserCtx) => { try { - const currentUserId = ctx.user._id + const currentUserId = ctx.user?._id const requestUser = ctx.request.body const user = await userSdk.save(requestUser, { currentUserId }) diff --git a/qa-core/package.json b/qa-core/package.json index 1d36d179ee..13f2e80332 100644 --- a/qa-core/package.json +++ b/qa-core/package.json @@ -10,6 +10,7 @@ }, "scripts": { "setup": "yarn && node scripts/createEnv.js", + "user": "yarn && node scripts/createEnv.js && node scripts/createUser.js", "test": "jest --runInBand --json --outputFile=testResults.json --forceExit", "test:watch": "yarn run test --watch", "test:debug": "DEBUG=1 yarn run test", diff --git a/qa-core/scripts/createUser.js b/qa-core/scripts/createUser.js new file mode 100644 index 0000000000..200bf91fc4 --- /dev/null +++ b/qa-core/scripts/createUser.js @@ -0,0 +1,49 @@ +const dotenv = require("dotenv") +const { join } = require("path") +const fs = require("fs") +const fetch = require("node-fetch") + +function getVarFromDotEnv(path, varName) { + const parsed = dotenv.parse(fs.readFileSync(path)) + return parsed[varName] +} + +async function createUser() { + const serverPath = join(__dirname, "..", "..", "packages", "server", ".env") + const qaCorePath = join(__dirname, "..", ".env") + const apiKey = getVarFromDotEnv(serverPath, "INTERNAL_API_KEY") + const username = getVarFromDotEnv(qaCorePath, "BB_ADMIN_USER_EMAIL") + const password = getVarFromDotEnv(qaCorePath, "BB_ADMIN_USER_PASSWORD") + const url = getVarFromDotEnv(qaCorePath, "BUDIBASE_URL") + const resp = await fetch(`${url}/api/public/v1/users`, { + method: "POST", + headers: { + "Content-Type": "application/json", + "x-budibase-api-key": apiKey, + }, + body: JSON.stringify({ + email: username, + password, + builder: { + global: true, + }, + admin: { + global: true, + }, + roles: {}, + }), + }) + if (resp.status !== 200) { + throw new Error(await resp.text()) + } else { + return await resp.json() + } +} + +createUser() + .then(() => { + console.log("User created - ready to use") + }) + .catch(err => { + console.error("Failed to create user - ", err) + }) diff --git a/qa-core/src/account-api/api/AccountInternalAPIClient.ts b/qa-core/src/account-api/api/AccountInternalAPIClient.ts index df58ab0ce3..85807fd87a 100644 --- a/qa-core/src/account-api/api/AccountInternalAPIClient.ts +++ b/qa-core/src/account-api/api/AccountInternalAPIClient.ts @@ -67,11 +67,12 @@ export default class AccountInternalAPIClient { } const message = `${method} ${url} - ${response.status}` + const isDebug = process.env.LOG_LEVEL === "debug" if (response.status > 499) { console.error(message, data) } else if (response.status >= 400) { console.warn(message, data) - } else { + } else if (isDebug) { console.debug(message, data) } diff --git a/qa-core/src/internal-api/api/BudibaseInternalAPIClient.ts b/qa-core/src/internal-api/api/BudibaseInternalAPIClient.ts index a6921a75b2..ba70bb5ce0 100644 --- a/qa-core/src/internal-api/api/BudibaseInternalAPIClient.ts +++ b/qa-core/src/internal-api/api/BudibaseInternalAPIClient.ts @@ -58,11 +58,12 @@ class BudibaseInternalAPIClient { } const message = `${method} ${url} - ${response.status}` + const isDebug = process.env.LOG_LEVEL === "debug" if (response.status > 499) { console.error(message, data) } else if (response.status >= 400) { console.warn(message, data) - } else { + } else if (isDebug) { console.debug(message, data) } diff --git a/qa-core/src/internal-api/tests/dataSources/mongoDB.integration.spec.ts b/qa-core/src/internal-api/tests/dataSources/mongoDB.integration.spec.ts index 27fc143554..ace9ef32c5 100644 --- a/qa-core/src/internal-api/tests/dataSources/mongoDB.integration.spec.ts +++ b/qa-core/src/internal-api/tests/dataSources/mongoDB.integration.spec.ts @@ -2,7 +2,7 @@ import TestConfiguration from "../../config/TestConfiguration" import * as fixtures from "../../fixtures" import { Query } from "@budibase/types" -describe("Internal API - Data Sources: MongoDB", () => { +xdescribe("Internal API - Data Sources: MongoDB", () => { const config = new TestConfiguration() beforeAll(async () => { diff --git a/qa-core/src/jest/globalSetup.ts b/qa-core/src/jest/globalSetup.ts index 12d227df02..040a65ecef 100644 --- a/qa-core/src/jest/globalSetup.ts +++ b/qa-core/src/jest/globalSetup.ts @@ -1,3 +1,4 @@ +process.env.DISABLE_PINO_LOGGER = "1" import { DEFAULT_TENANT_ID, logging } from "@budibase/backend-core" import { AccountInternalAPI } from "../account-api" import * as fixtures from "../internal-api/fixtures" diff --git a/qa-core/src/public-api/api/BudibasePublicAPIClient.ts b/qa-core/src/public-api/api/BudibasePublicAPIClient.ts index f4fe978812..b75393bdaa 100644 --- a/qa-core/src/public-api/api/BudibasePublicAPIClient.ts +++ b/qa-core/src/public-api/api/BudibasePublicAPIClient.ts @@ -57,11 +57,12 @@ class BudibasePublicAPIClient { } const message = `${method} ${url} - ${response.status}` + const isDebug = process.env.LOG_LEVEL === "debug" if (response.status > 499) { console.error(message, data) } else if (response.status >= 400) { console.warn(message, data) - } else { + } else if (isDebug) { console.debug(message, data) } diff --git a/yarn.lock b/yarn.lock index b15c549640..de64f7d4bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2489,6 +2489,11 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@fontsource/source-sans-pro@^5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@fontsource/source-sans-pro/-/source-sans-pro-5.0.3.tgz#7d6e84a8169ba12fa5e6ce70757aa2ca7e74d855" + integrity sha512-mQnjuif/37VxwRloHZ+wQdoozd2VPWutbFSt1AuSkk7nFXIBQxHJLw80rgCF/osL0t7N/3Gx1V7UJuOX2zxzhQ== + "@fortawesome/fontawesome-common-types@6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz#51f734e64511dbc3674cd347044d02f4dd26e86b" @@ -8406,7 +8411,7 @@ chmodr@1.2.0: resolved "https://registry.yarnpkg.com/chmodr/-/chmodr-1.2.0.tgz#720e96caa09b7f1cdbb01529b7d0ab6bc5e118b9" integrity sha512-Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA== -chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2: +chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -11850,7 +11855,7 @@ fast-glob@3.2.7: merge2 "^1.3.0" micromatch "^4.0.4" -fast-glob@^3.0.3: +fast-glob@^3.0.3, fast-glob@^3.2.11: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== @@ -25423,6 +25428,16 @@ vite-node@0.29.8: picocolors "^1.0.0" vite "^3.0.0 || ^4.0.0" +vite-plugin-static-copy@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vite-plugin-static-copy/-/vite-plugin-static-copy-0.16.0.tgz#2f65227037f17fc99c0782fd0b344e962935e69e" + integrity sha512-dMVEg5Z2SwYRgQnHZaeokvSKB4p/TOTf65JU4sP3U6ccSBsukqdtDOjpmT+xzTFHAA8WJjcS31RMLjUdWQCBzw== + dependencies: + chokidar "^3.5.3" + fast-glob "^3.2.11" + fs-extra "^11.1.0" + picocolors "^1.0.0" + "vite@^3.0.0 || ^4.0.0": version "4.2.2" resolved "https://registry.yarnpkg.com/vite/-/vite-4.2.2.tgz#014c30e5163844f6e96d7fe18fbb702236516dc6" From 7b75d7f13de8bb0d955ee407190afb7a9956792c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 19 Jun 2023 18:32:03 +0100 Subject: [PATCH 268/587] Update column editor and filter editor to make action buttons full width --- .../controls/ColumnEditor/ColumnEditor.svelte | 10 +++++++++- .../controls/FilterEditor/FilterEditor.svelte | 19 ++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte index 59340d4898..fcad4be180 100644 --- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte @@ -75,7 +75,9 @@ } -Configure columns +
+ Configure columns +
Configure the columns in your {subject.toLowerCase()}. @@ -89,3 +91,9 @@ {allowCellEditing} /> + + 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 1d4b629f2e..9d48789947 100644 --- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte @@ -20,15 +20,26 @@ $: datasource = getDatasourceForProvider($currentAsset, componentInstance) $: schema = getSchemaForDatasource($currentAsset, datasource)?.schema $: schemaFields = Object.values(schema || {}) + $: text = getText(value) async function saveFilter() { dispatch("change", tempValue) notifications.success("Filters saved") drawer.hide() } + + const getText = filters => { + if (!filters?.length) { + return "No filters set" + } else { + return `${filters.length} filter${filters.length === 1 ? "" : "s"} set` + } + } -Define filters +
+ {text} +
(tempValue = e.detail)} /> + + From e436c1da1c8266c612751b6f55394a727f30f59c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 19 Jun 2023 18:32:13 +0100 Subject: [PATCH 269/587] Use old icon for grids --- packages/client/manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index e425edc1b1..73ab2ee3ee 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5228,13 +5228,13 @@ }, "gridblock": { "name": "Grid block", - "icon": "ViewTable", + "icon": "Table", "styles": ["size"], "size": { "width": 600, "height": 400 }, - "info": "Grid Block is only compatible with internal or SQL tables", + "info": "Grid Blocks are only compatible with internal or SQL tables", "settings": [ { "type": "table", @@ -5306,7 +5306,7 @@ }, { "type": "boolean", - "label": "Stripe rows", + "label": "High contrast", "key": "stripeRows", "defaultValue": false } From acfe69a3d51e08cf9c548bc18203014255102967 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 19 Jun 2023 18:34:51 +0100 Subject: [PATCH 270/587] Remove the doble deep format references --- lerna.json | 18 ++---------------- package.json | 14 +------------- packages/pro | 2 +- packages/server/jest.config.ts | 5 ++--- packages/server/nodemon.json | 2 +- packages/server/tsconfig.build.json | 2 +- packages/worker/jest.config.ts | 8 +++----- packages/worker/nodemon.json | 2 +- packages/worker/tsconfig.build.json | 2 +- scripts/bootstrap.sh | 2 +- scripts/link-dependencies.sh | 4 ++-- scripts/syncProPackage.js | 2 +- yarn.lock | 24 ++++++++++++++++++++++-- 13 files changed, 39 insertions(+), 48 deletions(-) diff --git a/lerna.json b/lerna.json index 2739b40732..547f5d382e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,21 +1,7 @@ { "version": "2.7.25-alpha.3", "npmClient": "yarn", - "packages": [ - "packages/backend-core", - "packages/bbui", - "packages/builder", - "packages/cli", - "packages/client", - "packages/frontend-core", - "packages/sdk", - "packages/server", - "packages/shared-core", - "packages/string-templates", - "packages/types", - "packages/worker", - "packages/pro/packages/pro" - ], + "packages": ["packages/*"], "useWorkspaces": true, "command": { "publish": { @@ -31,4 +17,4 @@ "loadEnvFiles": false } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 56f015f8c0..d097474309 100644 --- a/package.json +++ b/package.json @@ -95,19 +95,7 @@ }, "workspaces": { "packages": [ - "packages/backend-core", - "packages/bbui", - "packages/builder", - "packages/cli", - "packages/client", - "packages/frontend-core", - "packages/sdk", - "packages/server", - "packages/shared-core", - "packages/string-templates", - "packages/types", - "packages/worker", - "packages/pro/packages/pro" + "packages/*" ] }, "resolutions": { diff --git a/packages/pro b/packages/pro index f4b8449aac..d89fb653d6 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit f4b8449aac9bd265214396afbdce7ff984a2ae34 +Subproject commit d89fb653d6faf2886d580d43bc546d2f09a54989 diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index a7710d1e33..7458420643 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -21,9 +21,8 @@ const baseConfig: Config.InitialProjectOptions = { } // add pro sources if they exist -if (fs.existsSync("../pro/packages")) { - baseConfig.moduleNameMapper!["@budibase/pro"] = - "/../pro/packages/pro/src" +if (fs.existsSync("../pro/src")) { + baseConfig.moduleNameMapper!["@budibase/pro"] = "/../pro" } const config: Config.InitialOptions = { diff --git a/packages/server/nodemon.json b/packages/server/nodemon.json index 77375546e1..47c60d0966 100644 --- a/packages/server/nodemon.json +++ b/packages/server/nodemon.json @@ -1,5 +1,5 @@ { - "watch": ["src", "../backend-core", "../pro/packages/pro"], + "watch": ["src", "../backend-core", "../pro"], "ext": "js,ts,json", "ignore": [ "src/**/*.spec.ts", diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json index 355b7ed6da..4e509bd14e 100644 --- a/packages/server/tsconfig.build.json +++ b/packages/server/tsconfig.build.json @@ -17,7 +17,7 @@ "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], "@budibase/shared-core": ["../shared-core/src"], - "@budibase/pro": ["../pro/packages/pro/src"] + "@budibase/pro": ["../pro/src"] } }, "include": ["src/**/*"], diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts index 49b6c5d425..1cbf22c22a 100644 --- a/packages/worker/jest.config.ts +++ b/packages/worker/jest.config.ts @@ -21,11 +21,9 @@ const config: Config.InitialOptions = { } // add pro sources if they exist -if (fs.existsSync("../pro/packages")) { - config.moduleNameMapper!["@budibase/pro/(.*)"] = - "/../pro/packages/pro/$1" - config.moduleNameMapper!["@budibase/pro"] = - "/../pro/packages/pro/src" +if (fs.existsSync("../pro/src")) { + config.moduleNameMapper!["@budibase/pro/(.*)"] = "/../pro/$1" + config.moduleNameMapper!["@budibase/pro"] = "/../pro/src" } export default config diff --git a/packages/worker/nodemon.json b/packages/worker/nodemon.json index d92cfe22b5..9585d85af5 100644 --- a/packages/worker/nodemon.json +++ b/packages/worker/nodemon.json @@ -1,5 +1,5 @@ { - "watch": ["src", "../backend-core", "../pro/packages/pro"], + "watch": ["src", "../backend-core", "../pro"], "ext": "js,ts,json", "ignore": [ "src/**/*.spec.ts", diff --git a/packages/worker/tsconfig.build.json b/packages/worker/tsconfig.build.json index 59e4bf7d8a..bc477abe4d 100644 --- a/packages/worker/tsconfig.build.json +++ b/packages/worker/tsconfig.build.json @@ -16,7 +16,7 @@ "@budibase/backend-core": ["../backend-core/src"], "@budibase/backend-core/*": ["../backend-core/*"], "@budibase/shared-core": ["../shared-core/src"], - "@budibase/pro": ["../pro/packages/pro/src"] + "@budibase/pro": ["../pro/src"] } }, "include": ["src/**/*"], diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 9a0bc18a28..a5a4fc0108 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,4 +1,4 @@ -if [ -d "packages/pro/packages" ]; then +if [ -d "packages/pro/src" ]; then cd packages/pro yarn diff --git a/scripts/link-dependencies.sh b/scripts/link-dependencies.sh index 9b85f9895d..ed42f29b4a 100755 --- a/scripts/link-dependencies.sh +++ b/scripts/link-dependencies.sh @@ -34,7 +34,7 @@ yarn unlink yarn link cd - -if [ -d packages/pro/packages ]; then +if [ -d packages/pro/src ]; then pro_loaded_locally=true else pro_loaded_locally=false @@ -42,7 +42,7 @@ fi if [ $pro_loaded_locally = true ]; then echo "Linking pro" - cd packages/pro/packages/pro + cd packages/pro yarn unlink yarn link cd - diff --git a/scripts/syncProPackage.js b/scripts/syncProPackage.js index bbbe33f44b..5ea49142ee 100755 --- a/scripts/syncProPackage.js +++ b/scripts/syncProPackage.js @@ -3,7 +3,7 @@ const path = require("path") const { execSync } = require("child_process") let version = "0.0.0" -const localPro = fs.existsSync("packages/pro/packages") +const localPro = fs.existsSync("packages/pro/src") if (!localPro) { const branchName = execSync("git rev-parse --abbrev-ref HEAD") .toString() diff --git a/yarn.lock b/yarn.lock index b15c549640..ec4a060f15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2489,6 +2489,11 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@fontsource/source-sans-pro@^5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@fontsource/source-sans-pro/-/source-sans-pro-5.0.3.tgz#7d6e84a8169ba12fa5e6ce70757aa2ca7e74d855" + integrity sha512-mQnjuif/37VxwRloHZ+wQdoozd2VPWutbFSt1AuSkk7nFXIBQxHJLw80rgCF/osL0t7N/3Gx1V7UJuOX2zxzhQ== + "@fortawesome/fontawesome-common-types@6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz#51f734e64511dbc3674cd347044d02f4dd26e86b" @@ -8406,7 +8411,7 @@ chmodr@1.2.0: resolved "https://registry.yarnpkg.com/chmodr/-/chmodr-1.2.0.tgz#720e96caa09b7f1cdbb01529b7d0ab6bc5e118b9" integrity sha512-Y5uI7Iq/Az6HgJEL6pdw7THVd7jbVOTPwsmcPOBjQL8e3N+pz872kzK5QxYGEy21iRys+iHWV0UZQXDFJo1hyA== -chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2: +chokidar@3.5.3, chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -11850,7 +11855,7 @@ fast-glob@3.2.7: merge2 "^1.3.0" micromatch "^4.0.4" -fast-glob@^3.0.3: +fast-glob@^3.0.3, fast-glob@^3.2.11: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== @@ -13661,6 +13666,11 @@ humanize-ms@^1.2.0, humanize-ms@^1.2.1: dependencies: ms "^2.0.0" +husky@^7.0.1: + version "7.0.4" + resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535" + integrity sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ== + husky@^8.0.3: version "8.0.3" resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184" @@ -25423,6 +25433,16 @@ vite-node@0.29.8: picocolors "^1.0.0" vite "^3.0.0 || ^4.0.0" +vite-plugin-static-copy@^0.16.0: + version "0.16.0" + resolved "https://registry.yarnpkg.com/vite-plugin-static-copy/-/vite-plugin-static-copy-0.16.0.tgz#2f65227037f17fc99c0782fd0b344e962935e69e" + integrity sha512-dMVEg5Z2SwYRgQnHZaeokvSKB4p/TOTf65JU4sP3U6ccSBsukqdtDOjpmT+xzTFHAA8WJjcS31RMLjUdWQCBzw== + dependencies: + chokidar "^3.5.3" + fast-glob "^3.2.11" + fs-extra "^11.1.0" + picocolors "^1.0.0" + "vite@^3.0.0 || ^4.0.0": version "4.2.2" resolved "https://registry.yarnpkg.com/vite/-/vite-4.2.2.tgz#014c30e5163844f6e96d7fe18fbb702236516dc6" From 9fd04cc2c7c82f8fe5a6f3c0efd86fd05edce36d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 19 Jun 2023 18:49:57 +0100 Subject: [PATCH 271/587] Update multiple settings components to enable more generic usage of column selectors and remove some bespoke copy from generic components. Enable display names for grid columns --- .../ColumnEditor/BasicColumnEditor.svelte | 7 +------ .../controls/ColumnEditor/ColumnDrawer.svelte | 6 +++--- .../controls/ColumnEditor/ColumnEditor.svelte | 6 +----- .../settings/controls/FieldConfiguration.svelte | 2 +- packages/client/manifest.json | 7 +++---- .../client/src/components/app/GridBlock.svelte | 16 +++++++++++++++- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/BasicColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/BasicColumnEditor.svelte index 053735cc6d..f051d68a48 100644 --- a/packages/builder/src/components/design/settings/controls/ColumnEditor/BasicColumnEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/BasicColumnEditor.svelte @@ -2,9 +2,4 @@ import ColumnEditor from "./ColumnEditor.svelte" - + diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte index 87fbba3b52..6e57d20751 100644 --- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte +++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnDrawer.svelte @@ -142,10 +142,10 @@
- By default, all table columns will automatically be shown. + By default, all columns will automatically be shown.
- You can manually control which columns are included in your table, - and their appearance, by adding them below. + You can manually control which columns are included by adding them + below.
diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte index fcad4be180..b34edd880a 100644 --- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte +++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte @@ -13,7 +13,6 @@ export let componentInstance export let value = [] export let allowCellEditing = true - export let subject = "Table" const dispatch = createEventDispatcher() @@ -78,10 +77,7 @@
Configure columns
- - - Configure the columns in your {subject.toLowerCase()}. - + import { Button, ActionButton, Drawer } from "@budibase/bbui" import { createEventDispatcher } from "svelte" - import ColumnDrawer from "./ColumnDrawer.svelte" + import ColumnDrawer from "./ColumnEditor/ColumnDrawer.svelte" import { cloneDeep } from "lodash/fp" import { getDatasourceForProvider, diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 73ab2ee3ee..568c17d034 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5243,11 +5243,10 @@ "required": true }, { - "type": "multifield", + "type": "columns/basic", "label": "Columns", - "key": "columnWhitelist", - "dependsOn": "table", - "placeholder": "All columns" + "key": "columns", + "dependsOn": "table" }, { "type": "filter", diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte index ee663ebd6b..4314f6e99c 100644 --- a/packages/client/src/components/app/GridBlock.svelte +++ b/packages/client/src/components/app/GridBlock.svelte @@ -13,10 +13,23 @@ export let initialSortColumn = null export let initialSortOrder = null export let initialRowHeight = null - export let columnWhitelist = null + export let columns = null const component = getContext("component") const { styleable, API, builderStore } = getContext("sdk") + + $: columnWhitelist = columns?.map(col => col.name) + $: schemaOverrides = getSchemaOverrides(columns) + + const getSchemaOverrides = columns => { + let overrides = {} + columns?.forEach(column => { + overrides[column.name] = { + displayName: column.displayName || column.name, + } + }) + return overrides + }
Date: Mon, 19 Jun 2023 18:51:29 +0100 Subject: [PATCH 272/587] Update placeholder text for grid block settings --- packages/client/manifest.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 568c17d034..eb9a45dda1 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -5256,7 +5256,8 @@ { "type": "field/sortable", "label": "Sort column", - "key": "initialSortColumn" + "key": "initialSortColumn", + "placeholder": "Default" }, { "type": "select", From 16280421a446f9c68efc987d56331bc250c84964 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Jun 2023 17:55:35 +0000 Subject: [PATCH 273/587] Bump version to 2.7.25-alpha.6 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 26b1168353..00e9063cfe 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.25-alpha.5", + "version": "2.7.25-alpha.6", "npmClient": "yarn", "packages": [ "packages/backend-core", From 82bafacd72500428cb2580b5c7a8f0454caefad3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 19 Jun 2023 18:40:22 +0000 Subject: [PATCH 274/587] Bump version to 2.7.25-alpha.7 --- lerna.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index eb66b64978..c228cfe62e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.25-alpha.6", + "version": "2.7.25-alpha.7", "npmClient": "yarn", "useNx": true, "packages": [ @@ -31,4 +31,4 @@ "loadEnvFiles": false } } -} +} \ No newline at end of file From 164bacf783444b46ea81139adcc3eb87acda28b8 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 07:42:26 +0100 Subject: [PATCH 275/587] Lint --- packages/frontend-core/src/components/grid/stores/filter.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/stores/filter.js b/packages/frontend-core/src/components/grid/stores/filter.js index 1f01aaec40..76c6a86c21 100644 --- a/packages/frontend-core/src/components/grid/stores/filter.js +++ b/packages/frontend-core/src/components/grid/stores/filter.js @@ -1,5 +1,4 @@ import { writable } from "svelte/store" -import { derivedMemo } from "../../../utils" export const createStores = context => { const { props } = context From 901ba5363036c93cc5d039d3fb200948ddb6ced4 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 07:55:46 +0100 Subject: [PATCH 276/587] Respect the allowExpandRows flag in when considering if rows can be edited in modals --- .../src/components/grid/overlays/MenuOverlay.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte index 15ca08dbdf..36ea977913 100644 --- a/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte +++ b/packages/frontend-core/src/components/grid/overlays/MenuOverlay.svelte @@ -72,7 +72,9 @@ dispatch("edit-row", $focusedRow)} on:click={menu.actions.close} > From 7486d3dde05c5edc3ce25a67cdad2f2c70cab1f3 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 08:01:41 +0100 Subject: [PATCH 277/587] Close context menu when using mouse wheel or menu touching scrollbars --- .../components/grid/layout/GridScrollWrapper.svelte | 6 ++++++ .../src/components/grid/overlays/ScrollOverlay.svelte | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/packages/frontend-core/src/components/grid/layout/GridScrollWrapper.svelte b/packages/frontend-core/src/components/grid/layout/GridScrollWrapper.svelte index 04f0960057..7599135c63 100644 --- a/packages/frontend-core/src/components/grid/layout/GridScrollWrapper.svelte +++ b/packages/frontend-core/src/components/grid/layout/GridScrollWrapper.svelte @@ -12,6 +12,7 @@ bounds, hoveredRowId, hiddenColumnsWidth, + menu, } = getContext("grid") export let scrollVertically = false @@ -30,6 +31,11 @@ const handleWheel = e => { e.preventDefault() debouncedHandleWheel(e.deltaX, e.deltaY, e.clientY) + + // If a context menu was visible, hide it + if ($menu.visible) { + menu.actions.close() + } } const debouncedHandleWheel = domDebounce((deltaX, deltaY, clientY) => { const { top, left } = $scroll diff --git a/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte b/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte index 654a7529b5..315c3d21e5 100644 --- a/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte +++ b/packages/frontend-core/src/components/grid/overlays/ScrollOverlay.svelte @@ -16,6 +16,7 @@ scrollTop, height, isDragging, + menu, } = getContext("grid") // State for dragging bars @@ -45,6 +46,13 @@ $: availWidth = renderWidth - barWidth $: barLeft = ScrollBarSize + availWidth * ($scrollLeft / $maxScrollLeft) + // Helper to close the context menu if it's open + const closeMenu = () => { + if ($menu.visible) { + menu.actions.close() + } + } + // V scrollbar drag handlers const startVDragging = e => { e.preventDefault() @@ -53,6 +61,7 @@ document.addEventListener("mousemove", moveVDragging) document.addEventListener("mouseup", stopVDragging) isDraggingV = true + closeMenu() } const moveVDragging = domDebounce(e => { const delta = e.clientY - initialMouse @@ -77,6 +86,7 @@ document.addEventListener("mousemove", moveHDragging) document.addEventListener("mouseup", stopHDragging) isDraggingH = true + closeMenu() } const moveHDragging = domDebounce(e => { const delta = e.clientX - initialMouse From 2df810c59b1520096d33a3db70d36ba67e120b84 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 09:34:27 +0100 Subject: [PATCH 278/587] Update grid context menu position determination to work regardless of page scroll offsets --- .../src/components/grid/cells/GridCell.svelte | 5 ++++ .../src/components/grid/stores/menu.js | 25 ++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/GridCell.svelte b/packages/frontend-core/src/components/grid/cells/GridCell.svelte index fe4bd70ba4..ac2a4da5a0 100644 --- a/packages/frontend-core/src/components/grid/cells/GridCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/GridCell.svelte @@ -82,6 +82,11 @@ align-items: center; } + /* Disable pointer events for non-focused cells */ + .cell:not(.focused) :global(*) { + pointer-events: none; + } + /* Cell border */ .cell.focused:after, .cell.error:after, diff --git a/packages/frontend-core/src/components/grid/stores/menu.js b/packages/frontend-core/src/components/grid/stores/menu.js index 3f34c0a266..db56f57ce9 100644 --- a/packages/frontend-core/src/components/grid/stores/menu.js +++ b/packages/frontend-core/src/components/grid/stores/menu.js @@ -1,5 +1,5 @@ -import { writable, get } from "svelte/store" -import { GutterWidth } from "../lib/constants" +import { writable } from "svelte/store" +import { tick } from "svelte" export const createStores = () => { const menu = writable({ @@ -14,18 +14,25 @@ export const createStores = () => { } export const deriveStores = context => { - const { menu, bounds, focusedCellId, stickyColumn, rowHeight } = context + const { menu, focusedCellId, rand } = context const open = (cellId, e) => { - const $bounds = get(bounds) - const $stickyColumn = get(stickyColumn) - const $rowHeight = get(rowHeight) e.preventDefault() + + // Get DOM node for grid data wrapper to compute relative position to + const gridNode = document.getElementById(`grid-${rand}`) + const dataNode = gridNode?.getElementsByClassName("grid-data-outer")?.[0] + if (!dataNode) { + return + } + + // Compute bounds of cell relative to outer data node + const targetBounds = e.target.getBoundingClientRect() + const dataBounds = dataNode.getBoundingClientRect() focusedCellId.set(cellId) menu.set({ - left: - e.clientX - $bounds.left + GutterWidth + ($stickyColumn?.width || 0), - top: e.clientY - $bounds.top + $rowHeight, + left: targetBounds.left - dataBounds.left + e.offsetX, + top: targetBounds.top - dataBounds.top + e.offsetY, visible: true, }) } From c1f7774602126beab8ef381082f626f71c119e49 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 09:34:56 +0100 Subject: [PATCH 279/587] Lint --- packages/frontend-core/src/components/grid/stores/menu.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend-core/src/components/grid/stores/menu.js b/packages/frontend-core/src/components/grid/stores/menu.js index db56f57ce9..f1d822aeaf 100644 --- a/packages/frontend-core/src/components/grid/stores/menu.js +++ b/packages/frontend-core/src/components/grid/stores/menu.js @@ -1,5 +1,4 @@ import { writable } from "svelte/store" -import { tick } from "svelte" export const createStores = () => { const menu = writable({ From b712136a6b6f0d181341684b0791936f668a86cb Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 20 Jun 2023 09:56:58 +0100 Subject: [PATCH 280/587] There was a chance or URL overlap - removing this chance. --- qa-core/src/internal-api/fixtures/applications.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qa-core/src/internal-api/fixtures/applications.ts b/qa-core/src/internal-api/fixtures/applications.ts index 542d4345dc..01dd18fc6a 100644 --- a/qa-core/src/internal-api/fixtures/applications.ts +++ b/qa-core/src/internal-api/fixtures/applications.ts @@ -1,19 +1,23 @@ import { generator } from "../../shared" import { CreateAppRequest } from "../../types" +function uniqueWord() { + return generator.word() + generator.hash() +} + export const generateApp = ( overrides: Partial = {} ): CreateAppRequest => ({ - name: generator.word() + generator.hash(), - url: `/${generator.word() + generator.hash()}`, + name: uniqueWord(), + url: `/${uniqueWord()}`, ...overrides, }) // Applications type doesn't work here, save to add useTemplate parameter? export const appFromTemplate = (): CreateAppRequest => { return { - name: generator.word(), - url: `/${generator.word()}`, + name: uniqueWord(), + url: `/${uniqueWord()}`, // @ts-ignore useTemplate: "true", templateName: "Near Miss Register", From bbc21c7c19d30400214cd1ffd24aec9ab2a66b1a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Jun 2023 09:48:10 +0000 Subject: [PATCH 281/587] Bump version to 2.7.25-alpha.8 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index c228cfe62e..eab4d03540 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.25-alpha.7", + "version": "2.7.25-alpha.8", "npmClient": "yarn", "useNx": true, "packages": [ From 9d6fbf067f52c1e87d31e18ae81c4d443eb444d7 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Jun 2023 11:10:23 +0100 Subject: [PATCH 282/587] Restore pointer events for unfocused cells --- .../frontend-core/src/components/grid/cells/GridCell.svelte | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/frontend-core/src/components/grid/cells/GridCell.svelte b/packages/frontend-core/src/components/grid/cells/GridCell.svelte index ac2a4da5a0..fe4bd70ba4 100644 --- a/packages/frontend-core/src/components/grid/cells/GridCell.svelte +++ b/packages/frontend-core/src/components/grid/cells/GridCell.svelte @@ -82,11 +82,6 @@ align-items: center; } - /* Disable pointer events for non-focused cells */ - .cell:not(.focused) :global(*) { - pointer-events: none; - } - /* Cell border */ .cell.focused:after, .cell.error:after, From 6ed5894441ff370cbc6ae0bf893b895b1fdb6132 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 11:14:23 +0100 Subject: [PATCH 283/587] Type --- packages/server/src/api/controllers/datasource.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 1d7643dd7b..86669845e6 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -26,7 +26,6 @@ import { IntegrationBase, DatasourcePlus, SourceName, - Ctx, } from "@budibase/types" import sdk from "../../sdk" import { builderSocket } from "../../websockets" @@ -443,7 +442,7 @@ export async function query(ctx: UserCtx) { } } -export async function getExternalSchema(ctx: Ctx) { +export async function getExternalSchema(ctx: UserCtx) { const { datasource } = ctx.request.body const enrichedDatasource = await getAndMergeDatasource(datasource) const connector = await getConnector(enrichedDatasource) From 94b159b331563eb9566d1d2502105792b8793355 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 11:24:21 +0100 Subject: [PATCH 284/587] Fix merge --- lerna.json | 1 - 1 file changed, 1 deletion(-) diff --git a/lerna.json b/lerna.json index 0ac33d1a32..b7d13b4ece 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,6 @@ "version": "2.7.25-alpha.8", "npmClient": "yarn", "packages": ["packages/*"], - "useWorkspaces": true, "useNx": true, "command": { "publish": { From 8ab5913eb9a7bbd0bbbcc3529a9ffdf4c05129b3 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 11:33:38 +0100 Subject: [PATCH 285/587] Change url --- packages/server/src/api/routes/datasource.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/api/routes/datasource.ts b/packages/server/src/api/routes/datasource.ts index c05d1753a2..7b4945806a 100644 --- a/packages/server/src/api/routes/datasource.ts +++ b/packages/server/src/api/routes/datasource.ts @@ -67,7 +67,7 @@ router datasourceController.destroy ) .get( - "/api/datasources/:datasourceId/external-schema", + "/api/datasources/:datasourceId/schema/external", authorized(permissions.BUILDER), datasourceController.getExternalSchema ) From c0f95b8929eb6d287b7556bcd08211a73a7632d1 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 11:45:37 +0100 Subject: [PATCH 286/587] Update pro ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index d89fb653d6..1ec833d6b2 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit d89fb653d6faf2886d580d43bc546d2f09a54989 +Subproject commit 1ec833d6b25db08585b3d208eeee852710fb5f26 From 978e78ee26079a96be0cde295889c4b85be68068 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 11:57:25 +0100 Subject: [PATCH 287/587] Change PR checks --- .github/workflows/budibase_ci.yml | 38 ++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 6c875f2dfe..27501371be 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -135,15 +135,31 @@ jobs: with: submodules: true token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} - fetch-depth: 0 - - name: Check submodule + + - name: Fetch develop branch + run: git fetch origin develop + + - name: Check pro commit + id: pro_commit run: | - cd packages/pro - git fetch - if ! git merge-base --is-ancestor $(git log -n 1 --pretty=format:%H) origin/develop; then - echo "Current commit has not been merged to develop" - echo "Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md" - exit 1 - else - echo "All good, the submodule had been merged!" - fi + cd submodule + pro_commit=$(git rev-parse HEAD) + latest_commit=$(git rev-parse origin/develop) + echo "::set-output name=pro_commit::$pro_commit" + echo "::set-output name=latest_commit::$latest_commit" + + - name: Check submodule merged to develop + uses: actions/github-script@v4 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const submoduleCommit = '${{ steps.pro_commit.outputs.pro_commit }}'; + const latestCommit = '${{ steps.pro_commit.outputs.latest_commit }}'; + + if (submoduleCommit !== latestCommit) { + console.error('Submodule commit does not match the latest commit on the develop branch.'); + console.error('Refer to the pro repo to merge your changes: https://github.com/Budibase/budibase-pro/blob/develop/docs/getting_started.md') + process.exit(1); + } else { + console.log('All good, the submodule had been merged and setup correctly!') + } From aa3294f08e7b7b2f8c07e6b7c427799786838853 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 20 Jun 2023 12:00:30 +0100 Subject: [PATCH 288/587] Fix --- .github/workflows/budibase_ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 27501371be..fad4055fe9 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -138,6 +138,8 @@ jobs: - name: Fetch develop branch run: git fetch origin develop + with: + token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} - name: Check pro commit id: pro_commit From d82c06d96a29adf1a5018de5ed02f169f2c2d1b2 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 20 Jun 2023 11:01:30 +0000 Subject: [PATCH 289/587] Bump version to 2.7.25-alpha.9 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index eab4d03540..9aad207176 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.25-alpha.8", + "version": "2.7.25-alpha.9", "npmClient": "yarn", "useNx": true, "packages": [ From 602ea9bc4ef976bf01e72ba96943db83cfdbbe73 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 20 Jun 2023 12:33:18 +0100 Subject: [PATCH 290/587] General tidying and refactoring. Updated the publish button behaviour to also take into account revert and version update behaviours. --- .../commandPalette/CommandPalette.svelte | 4 +- .../src/components/deploy/AppActions.svelte | 137 +++++++++++++++++- .../src/components/deploy/RevertModal.svelte | 3 +- .../src/components/deploy/VersionModal.svelte | 2 + .../builder/app/[application]/_layout.svelte | 26 +++- .../app/[application]/settings/_layout.svelte | 2 +- .../app/[application]/settings/index.svelte | 6 - .../settings/name-and-url.svelte | 3 - .../pages/builder/portal/apps/index.svelte | 1 - .../portal/users/groups/[groupId].svelte | 2 +- .../portal/users/users/[userId].svelte | 2 +- packages/builder/src/stores/portal/index.js | 1 - packages/server/src/middleware/builder.ts | 6 - 13 files changed, 159 insertions(+), 36 deletions(-) diff --git a/packages/builder/src/components/commandPalette/CommandPalette.svelte b/packages/builder/src/components/commandPalette/CommandPalette.svelte index 3a369446a3..5421e2f123 100644 --- a/packages/builder/src/components/commandPalette/CommandPalette.svelte +++ b/packages/builder/src/components/commandPalette/CommandPalette.svelte @@ -55,7 +55,7 @@ name: "Automations", description: "", icon: "Compass", - action: () => $goto("./automate"), + action: () => $goto("./automation"), }, { type: "Publish", @@ -127,7 +127,7 @@ type: "Automation", name: automation.name, icon: "ShareAndroid", - action: () => $goto(`./automate/${automation._id}`), + action: () => $goto(`./automation/${automation._id}`), })), ...Constants.Themes.map(theme => ({ type: "Change Builder Theme", diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte index 84feb4f189..def44646dd 100644 --- a/packages/builder/src/components/deploy/AppActions.svelte +++ b/packages/builder/src/components/deploy/AppActions.svelte @@ -24,12 +24,18 @@ import { onMount } from "svelte" import DeployModal from "components/deploy/DeployModal.svelte" import { apps } from "stores/portal" - import { store } from "builderStore" + import { + store, + screenHistoryStore, + automationHistoryStore, + } from "builderStore" import TourWrap from "components/portal/onboarding/TourWrap.svelte" import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js" import { url, goto } from "@roxi/routify" + import { isEqual, cloneDeep } from "lodash" export let application + export let loaded let unpublishModal let updateAppModal @@ -40,7 +46,7 @@ let appActionPopoverOpen = false let appActionPopoverAnchor - let publishing + let publishing = false $: filteredApps = $apps.filter(app => app.devId === application) $: selectedApp = filteredApps?.length ? filteredApps[0] : null @@ -58,6 +64,81 @@ $store.version && $store.upgradableVersion !== $store.version + let cachedVersion = $store.version + "" + let versionAltered = false + let screensAltered = false + let automationsAltered = false + + let publishRecord = { + screenHistory: null, + automationHistory: null, + } + + //Meta Changes + let appMeta = {} + let appMetaUpdated = false + let appMetaInitialised = false + + const unsub = store.subscribe(state => { + let { name, url: appUrl, navigation, theme, customTheme, icon } = state + const update = { + name, + url: appUrl, + navigation: { ...cloneDeep(navigation) }, + theme, + customTheme, + icon, + } + + if (!isEqual(update, appMeta)) { + if (!appMetaInitialised) { + appMetaInitialised = true + } else { + appMetaUpdated = true + } + appMeta = { + ...(appMeta || {}), + ...update, + } + } + }) + + const monitorHistoryStore = (historyStore, publishedHistoryId, cb) => { + if (!historyStore.history.length || historyStore.loading) { + return + } + if (!historyStore.canUndo) { + cb(publishedHistoryId != -1) + return + } + const historyEntry = historyStore.history[historyStore.position - 1] + + if (historyEntry) { + cb(publishedHistoryId != historyEntry.id) + } + } + + $: monitorHistoryStore( + $screenHistoryStore, + publishRecord.screenHistory, + updated => { + screensAltered = updated + } + ) + + $: monitorHistoryStore( + $automationHistoryStore, + publishRecord.automationHistory, + updated => { + automationsAltered = updated + } + ) + + $: versionAltered = cachedVersion != $store.version + $: altered = + screensAltered || appMetaUpdated || automationsAltered || versionAltered + $: canPublish = (!isPublished || altered) && !publishing && loaded + const initialiseApp = async () => { const applicationPkg = await API.fetchAppPackage($store.devId) await store.actions.initialise(applicationPkg) @@ -112,6 +193,27 @@ } } + const resetAppHistory = (historyStore, historyKey) => { + if (historyStore.history.length) { + const historyEntryPos = historyStore.position + const historyEntry = historyStore.history[historyEntryPos - 1] + + publishRecord = { + ...publishRecord, + [historyKey]: historyEntry?.id || -1, + } + } + } + + const resetStateTracking = () => { + resetAppHistory($automationHistoryStore, "automationHistory") + resetAppHistory($screenHistoryStore, "screenHistory") + automationsAltered = false + screensAltered = false + appMetaUpdated = false + cachedVersion = $store.version + "" + } + async function publishApp() { try { publishing = true @@ -124,7 +226,9 @@ }) await completePublish() + resetStateTracking() } catch (error) { + console.error(error) analytics.captureException(error) notifications.error("Error publishing app") } @@ -153,6 +257,7 @@ type: "success", icon: "GlobeStrike", }) + publishRecord = {} } catch (err) { notifications.error("Error unpublishing app") } @@ -176,7 +281,7 @@ {#if $store.hasLock} -
+
{#if updateAvailable} @@ -317,7 +422,7 @@ cta on:click={publishApp} id={"builder-app-publish-button"} - disabled={publishing} + disabled={!canPublish} > Publish @@ -349,8 +454,20 @@ /> - - + + +{:else} +
+
+ + Preview + +
+
{/if} diff --git a/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte b/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte deleted file mode 100644 index fb20cc50e5..0000000000 --- a/packages/frontend-core/src/components/grid/controls/ColumnWidthButton.svelte +++ /dev/null @@ -1,76 +0,0 @@ - - -
- (open = !open)} - selected={open} - disabled={!allCols.length} - tooltip={$compact ? "Width" : null} - > - {$compact ? "" : "Width"} - -
- - -
- {#each sizeOptions as option} - columns.actions.changeAllColumnWidths(option.size)} - selected={option.selected} - > - {option.label} - - {/each} - {#if custom} - Custom - {/if} -
- - - diff --git a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte index fb66b106c9..b8728156db 100644 --- a/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte +++ b/packages/frontend-core/src/components/grid/controls/HideColumnsButton.svelte @@ -3,12 +3,13 @@ import { ActionButton, Popover, Toggle, Icon } from "@budibase/bbui" import { getColumnIcon } from "../lib/utils" - const { columns, stickyColumn, compact } = getContext("grid") + const { columns, stickyColumn } = getContext("grid") let open = false let anchor $: anyHidden = $columns.some(col => !col.visible) + $: text = getText($columns) const toggleVisibility = (column, visible) => { columns.update(state => { @@ -38,6 +39,11 @@ }) columns.actions.saveChanges() } + + const getText = columns => { + const hidden = columns.filter(col => !col.visible).length + return hidden ? `Hide columns (${hidden})` : "Hide columns" + }
@@ -48,13 +54,12 @@ on:click={() => (open = !open)} selected={open || anyHidden} disabled={!$columns.length} - tooltip={$compact ? "Columns" : ""} > - {$compact ? "" : "Columns"} + {text}
- +
{#if $stickyColumn} diff --git a/packages/frontend-core/src/components/grid/controls/RowHeightButton.svelte b/packages/frontend-core/src/components/grid/controls/RowHeightButton.svelte deleted file mode 100644 index e9617ce0b6..0000000000 --- a/packages/frontend-core/src/components/grid/controls/RowHeightButton.svelte +++ /dev/null @@ -1,71 +0,0 @@ - - -
- (open = !open)} - selected={open} - tooltip={$compact ? "Height" : null} - > - {$compact ? "" : "Height"} - -
- - -
- {#each sizeOptions as option} - changeRowHeight(option.size)} - > - {option.label} - - {/each} -
- - - diff --git a/packages/frontend-core/src/components/grid/controls/SizeButton.svelte b/packages/frontend-core/src/components/grid/controls/SizeButton.svelte new file mode 100644 index 0000000000..eb9bf917d9 --- /dev/null +++ b/packages/frontend-core/src/components/grid/controls/SizeButton.svelte @@ -0,0 +1,135 @@ + + +
+ (open = !open)} + selected={open} + disabled={!allCols.length} + > + Size + +
+ + +
+
+ +
+ {#each rowSizeOptions as option} + changeRowHeight(option.size)} + > + {option.label} + + {/each} +
+
+
+ +
+ {#each columnSizeOptions as option} + columns.actions.changeAllColumnWidths(option.size)} + selected={option.selected} + > + {option.label} + + {/each} + {#if custom} + Custom + {/if} +
+
+
+ + + diff --git a/packages/frontend-core/src/components/grid/controls/SortButton.svelte b/packages/frontend-core/src/components/grid/controls/SortButton.svelte index 2018e83e44..bd75249216 100644 --- a/packages/frontend-core/src/components/grid/controls/SortButton.svelte +++ b/packages/frontend-core/src/components/grid/controls/SortButton.svelte @@ -2,7 +2,7 @@ import { getContext } from "svelte" import { ActionButton, Popover, Select } from "@budibase/bbui" - const { sort, columns, stickyColumn, compact } = getContext("grid") + const { sort, columns, stickyColumn } = getContext("grid") let open = false let anchor @@ -90,13 +90,12 @@ on:click={() => (open = !open)} selected={open} disabled={!columnOptions.length} - tooltip={$compact ? "Sort" : ""} > - {$compact ? "" : "Sort"} + Sort
- +
x._instanceName} + getOptionValue={x => x._id} + /> + + +
+ + diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js index eee7f5b757..3b3ee6fd00 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js @@ -16,6 +16,7 @@ export { default as S3Upload } from "./S3Upload.svelte" export { default as ExportData } from "./ExportData.svelte" export { default as ContinueIf } from "./ContinueIf.svelte" export { default as UpdateFieldValue } from "./UpdateFieldValue.svelte" +export { default as ScrollTo } from "./ScrollTo.svelte" export { default as ShowNotification } from "./ShowNotification.svelte" export { default as PromptUser } from "./PromptUser.svelte" export { default as OpenSidePanel } from "./OpenSidePanel.svelte" diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json index bb21116213..2ec7235c59 100644 --- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json +++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json @@ -70,6 +70,11 @@ "type": "form", "component": "UpdateFieldValue" }, + { + "name": "Scroll To Field", + "type": "form", + "component": "ScrollTo" + }, { "name": "Validate Form", "type": "form", diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 71637723c1..5f8d9c007d 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -2221,7 +2221,8 @@ "ValidateForm", "ClearForm", "ChangeFormStep", - "UpdateFieldValue" + "UpdateFieldValue", + "ScrollTo" ], "styles": ["size"], "size": { diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte index 27e854781c..3dc85ecaf6 100644 --- a/packages/client/src/components/app/forms/InnerForm.svelte +++ b/packages/client/src/components/app/forms/InnerForm.svelte @@ -404,12 +404,20 @@ } } + const handleScrollToField = ({ field }) => { + const fieldId = get(getField(field)).fieldState.fieldId + const label = document.querySelector(`label[for="${fieldId}"]`) + document.getElementById(fieldId).focus({ preventScroll: true }) + label.scrollIntoView({ behavior: "smooth" }) + } + // Action context to pass to children const actions = [ { type: ActionTypes.ValidateForm, callback: formApi.validate }, { type: ActionTypes.ClearForm, callback: formApi.reset }, { type: ActionTypes.ChangeFormStep, callback: formApi.changeStep }, { type: ActionTypes.UpdateFieldValue, callback: handleUpdateFieldValue }, + { type: ActionTypes.ScrollTo, callback: handleScrollToField }, ] diff --git a/packages/client/src/constants.js b/packages/client/src/constants.js index 6c882c9792..37a45fbe5d 100644 --- a/packages/client/src/constants.js +++ b/packages/client/src/constants.js @@ -29,6 +29,7 @@ export const ActionTypes = { SetDataProviderSorting: "SetDataProviderSorting", ClearForm: "ClearForm", ChangeFormStep: "ChangeFormStep", + ScrollTo: "ScrollTo", } export const DNDPlaceholderID = "dnd-placeholder" diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js index ed702f6718..68f312f0ad 100644 --- a/packages/client/src/utils/buttonActions.js +++ b/packages/client/src/utils/buttonActions.js @@ -153,6 +153,17 @@ const navigationHandler = action => { routeStore.actions.navigate(url, peek, externalNewTab) } +const scrollHandler = async (action, context) => { + return await executeActionHandler( + context, + action.parameters.componentId, + ActionTypes.ScrollTo, + { + field: action.parameters.field, + } + ) +} + const queryExecutionHandler = async action => { const { datasourceId, queryId, queryParams, notificationOverride } = action.parameters @@ -369,6 +380,7 @@ const handlerMap = { ["Duplicate Row"]: duplicateRowHandler, ["Delete Row"]: deleteRowHandler, ["Navigate To"]: navigationHandler, + ["Scroll To Field"]: scrollHandler, ["Execute Query"]: queryExecutionHandler, ["Trigger Automation"]: triggerAutomationHandler, ["Validate Form"]: validateFormHandler, From f85e1826a21e589fdbf69e4258e60d10999a77c1 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 10:55:58 +0000 Subject: [PATCH 355/587] Bump version to 2.7.26-alpha.3 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 39302af0f0..06ea327572 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.26-alpha.2", + "version": "2.7.26-alpha.3", "npmClient": "yarn", "useNx": true, "packages": [ From fd8400bee58fd23d8b6796d4d48356b32cf4b9b4 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 23 Jun 2023 11:56:59 +0100 Subject: [PATCH 356/587] PR feedback and removed some comments --- packages/builder/src/stores/portal/licensing.js | 3 --- packages/client/src/components/ClientApp.svelte | 5 ++--- packages/client/src/index.js | 4 +++- packages/server/src/api/controllers/static/index.ts | 5 ++--- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index e94e7d2e21..4a59f29f52 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -76,12 +76,9 @@ export const createLicensingStore = () => { await actions.setQuotaUsage() }, setNavigation: () => { - //"/builder/portal/account/upgrade" const adminStore = get(admin) const authStore = get(auth) - //Add cloud check here too??? - const upgradeUrl = authStore?.user?.accountPortalAccess ? `${adminStore.accountPortalUrl}/portal/upgrade` : "/builder/portal/account/upgrade" diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte index 8c6c20f258..06c4681b95 100644 --- a/packages/client/src/components/ClientApp.svelte +++ b/packages/client/src/components/ClientApp.svelte @@ -90,8 +90,7 @@ builderStore.actions.notifyLoaded() } else { builderStore.actions.analyticsPing({ - source: "app", - ...{ embedded: $appStore.embedded || undefined }, + embedded: !!$appStore.embedded, }) } }) @@ -169,7 +168,7 @@ {@html ErrorSVG} - Your application could not be loaded + This Budibase app is not publicly accessible
diff --git a/packages/client/src/index.js b/packages/client/src/index.js index a95ec24746..1550ba4d7b 100644 --- a/packages/client/src/index.js +++ b/packages/client/src/index.js @@ -46,7 +46,9 @@ const loadBudibase = async () => { appStore.actions.setAppId(window["##BUDIBASE_APP_ID##"]) // Set the flag used to determine if the app is being loaded via an iframe - appStore.actions.setAppEmbedded(window["##BUDIBASE_APP_EMBEDDED##"] == "true") + appStore.actions.setAppEmbedded( + window["##BUDIBASE_APP_EMBEDDED##"] === "true" + ) // Fetch environment info if (!get(environmentStore)?.loaded) { diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts index fe3f653051..fc17cd46e0 100644 --- a/packages/server/src/api/controllers/static/index.ts +++ b/packages/server/src/api/controllers/static/index.ts @@ -100,9 +100,8 @@ export const deleteObjects = async function (ctx: any) { } export const serveApp = async function (ctx: any) { - const bbHeaderEmbed = ctx.request.get("x-budibase-embed") - ? ctx.get("x-budibase-embed").toLowerCase() == "true" - : false + const bbHeaderEmbed = + ctx.request.get("x-budibase-embed")?.toLowerCase() === "true" //Public Settings const { config } = await configs.getSettingsConfigDoc() From c642ceef37d015a888e4d6adea7766920a62c081 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 10:57:37 +0000 Subject: [PATCH 357/587] Bump version to 2.7.32 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 7ab2de286c..9730620cc3 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.31", + "version": "2.7.32", "npmClient": "yarn", "packages": [ "packages/backend-core", From fda97f74e11bc2a32153f62ae486ffd85f7036ee Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 11:15:07 +0000 Subject: [PATCH 358/587] Bump version to 2.7.26-alpha.4 --- lerna.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lerna.json b/lerna.json index 98b654c82f..e5daa13e57 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,9 @@ { - "version": "2.7.26-alpha.3", + "version": "2.7.26-alpha.4", "npmClient": "yarn", - "packages": ["packages/*"], + "packages": [ + "packages/*" + ], "useNx": true, "command": { "publish": { @@ -17,4 +19,4 @@ "loadEnvFiles": false } } -} +} \ No newline at end of file From 3ad8625192a3c2c347259e0a7c7c34860ad8e2b5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 13:13:49 +0000 Subject: [PATCH 359/587] Bump version to 2.7.26-alpha.5 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index e5daa13e57..369e8c59bc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.26-alpha.4", + "version": "2.7.26-alpha.5", "npmClient": "yarn", "packages": [ "packages/*" From 22a8b2cbaa96009febd86a2b192dd9a9911b4524 Mon Sep 17 00:00:00 2001 From: Ryan Eaton Date: Fri, 23 Jun 2023 09:22:05 -0400 Subject: [PATCH 360/587] spelling fix --- .../app/[application]/data/datasource/bb_internal/index.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte index 68567fe788..33f3b626a2 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte @@ -32,7 +32,7 @@ Budibase internal tables are part of your app, so the data will be - stored in your apps context. + stored in your app's context. From ceecd85d7652e6a0d19a1fb43da4795b6a48b30c Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 23 Jun 2023 14:47:58 +0100 Subject: [PATCH 361/587] OIDC icon fix recreated on a new branch --- packages/backend-core/src/configs/configs.ts | 5 +++ packages/bbui/src/Form/Core/Picker.svelte | 16 ++++++-- .../auth/_components/OIDCButton.svelte | 5 ++- packages/types/src/documents/global/config.ts | 6 +++ .../src/api/controllers/global/configs.ts | 38 ++++++++++++++++++- 5 files changed, 63 insertions(+), 7 deletions(-) diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts index 701b5bb329..49ace84d52 100644 --- a/packages/backend-core/src/configs/configs.ts +++ b/packages/backend-core/src/configs/configs.ts @@ -5,6 +5,7 @@ import { GoogleInnerConfig, OIDCConfig, OIDCInnerConfig, + OIDCLogosConfig, SCIMConfig, SCIMInnerConfig, SettingsConfig, @@ -191,6 +192,10 @@ export function getDefaultGoogleConfig(): GoogleInnerConfig | undefined { // OIDC +export async function getOIDCLogosDoc(): Promise { + return getConfig(ConfigType.OIDC_LOGOS) +} + async function getOIDCConfigDoc(): Promise { return getConfig(ConfigType.OIDC) } diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index bd575600b1..aada17b318 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -99,9 +99,15 @@ bind:this={button} > {#if fieldIcon} - - - + {#if !useOptionIconImage} + + + + {:else} + + icon + + {/if} {/if} {#if fieldColour} @@ -311,4 +317,8 @@ max-width: 170px; font-size: 12px; } + + .option-extra.icon.field-icon { + display: flex; + } diff --git a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte index 1fa392610b..9d0ab515fb 100644 --- a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte +++ b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte @@ -12,6 +12,7 @@ export let samePage $: show = $organisation.oidc + $: oidcLogoCheck = $oidc.logo let preDefinedIcons = { Oidc: OidcLogo, @@ -29,9 +30,9 @@ } }) - $: src = !$oidc.logo + $: src = !oidcLogoCheck ? OidcLogo - : preDefinedIcons[$oidc.logo] || `/global/logos_oidc/${$oidc.logo}` + : preDefinedIcons[$oidc.logo] || oidcLogoCheck {#if show} diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts index bebb4ae14f..3fd352aada 100644 --- a/packages/types/src/documents/global/config.ts +++ b/packages/types/src/documents/global/config.ts @@ -79,6 +79,12 @@ export interface OIDCConfigs { configs: OIDCInnerConfig[] } +export interface OIDCLogosInnerConfig { + [key: string]: string +} + +export interface OIDCLogosConfig extends Config {} + export interface OIDCInnerConfig { configUrl: string clientID: string diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index 0f22d4aae0..a7d5bac989 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -28,6 +28,7 @@ import { SSOConfig, SSOConfigType, UserCtx, + OIDCLogosConfig, } from "@budibase/types" import * as pro from "@budibase/pro" @@ -280,13 +281,39 @@ export async function save(ctx: UserCtx) { } } +function enrichOIDCLogos(oidcLogos: OIDCLogosConfig) { + if (!oidcLogos) { + return + } + oidcLogos.config = Object.keys(oidcLogos.config).reduce( + (acc: any, key: string) => { + if (!key.endsWith("Etag")) { + const etag = oidcLogos.config[`${key}Etag`] + const objectStoreUrl = objectStore.getGlobalFileUrl( + oidcLogos.type, + key, + etag + ) + acc[key] = objectStoreUrl + } else { + acc[key] = oidcLogos.config[key] + } + return acc + }, + {} + ) +} + export async function find(ctx: UserCtx) { try { // Find the config with the most granular scope based on context const type = ctx.params.type - const scopedConfig = await configs.getConfig(type) + let scopedConfig = await configs.getConfig(type) if (scopedConfig) { + if (type === ConfigType.OIDC_LOGOS) { + enrichOIDCLogos(scopedConfig) + } ctx.body = scopedConfig } else { // don't throw an error, there simply is nothing to return @@ -301,13 +328,20 @@ export async function publicOidc(ctx: Ctx) { try { // Find the config with the most granular scope based on context const config = await configs.getOIDCConfig() + const oidcLogoConfig = await configs.getOIDCLogosDoc() + + if (oidcLogoConfig) { + enrichOIDCLogos(oidcLogoConfig) + } if (!config) { ctx.body = [] } else { ctx.body = [ { - logo: config.logo, + logo: oidcLogoConfig + ? oidcLogoConfig.config[config.logo] + : config.logo, name: config.name, uuid: config.uuid, }, From 3aca0c0ed33e4481dc5b1a8e11c3c89e16a7fbd7 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Fri, 23 Jun 2023 14:48:07 +0100 Subject: [PATCH 362/587] Null safety (#11007) --- packages/server/src/integrations/mongodb.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index 417aa61f41..3f05dca954 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -383,7 +383,7 @@ class MongoIntegration implements IntegrationBase { createObjectIds(json: any): object { const self = this function interpolateObjectIds(json: any) { - for (let field of Object.keys(json)) { + for (let field of Object.keys(json || {})) { if (json[field] instanceof Object) { json[field] = self.createObjectIds(json[field]) } From 478897236272499d498178976005525929c15168 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 13:51:51 +0000 Subject: [PATCH 363/587] Bump version to 2.7.33 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 9730620cc3..b43faee706 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.32", + "version": "2.7.33", "npmClient": "yarn", "packages": [ "packages/backend-core", From 8623840f7d3e4b85f91b8acdd11beb8f67fd8ed4 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 14:23:14 +0000 Subject: [PATCH 364/587] Bump version to 2.7.34-alpha.0 --- lerna.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lerna.json b/lerna.json index 3171d1bf15..894ce11a4a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.33", + "version": "2.7.34-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" @@ -19,4 +19,4 @@ "loadEnvFiles": false } } -} +} \ No newline at end of file From 6f24772f49fc373678f6e62e9e6eacabb02bf226 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 23 Jun 2023 16:40:40 +0100 Subject: [PATCH 365/587] PR Feedback --- .../builder/auth/_components/OIDCButton.svelte | 8 +++----- .../src/api/controllers/global/configs.ts | 18 ++++++++---------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte index 9d0ab515fb..f5dcbe7466 100644 --- a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte +++ b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte @@ -12,7 +12,6 @@ export let samePage $: show = $organisation.oidc - $: oidcLogoCheck = $oidc.logo let preDefinedIcons = { Oidc: OidcLogo, @@ -30,14 +29,13 @@ } }) - $: src = !oidcLogoCheck - ? OidcLogo - : preDefinedIcons[$oidc.logo] || oidcLogoCheck + $: oidcLogoImageURL = preDefinedIcons[$oidc.logo] ?? $oidc.logo + $: logoSrc = oidcLogoImageURL ?? OidcLogo {#if show} { const url = `/api/global/auth/${$auth.tenantId}/oidc/configs/${$oidc.uuid}` if (samePage) { diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts index a7d5bac989..042fcb9393 100644 --- a/packages/worker/src/api/controllers/global/configs.ts +++ b/packages/worker/src/api/controllers/global/configs.ts @@ -327,23 +327,21 @@ export async function find(ctx: UserCtx) { export async function publicOidc(ctx: Ctx) { try { // Find the config with the most granular scope based on context - const config = await configs.getOIDCConfig() - const oidcLogoConfig = await configs.getOIDCLogosDoc() + const oidcConfig = await configs.getOIDCConfig() + const oidcCustomLogos = await configs.getOIDCLogosDoc() - if (oidcLogoConfig) { - enrichOIDCLogos(oidcLogoConfig) + if (oidcCustomLogos) { + enrichOIDCLogos(oidcCustomLogos) } - if (!config) { + if (!oidcConfig) { ctx.body = [] } else { ctx.body = [ { - logo: oidcLogoConfig - ? oidcLogoConfig.config[config.logo] - : config.logo, - name: config.name, - uuid: config.uuid, + logo: oidcCustomLogos?.config[oidcConfig.logo] ?? oidcConfig.logo, + name: oidcConfig.name, + uuid: oidcConfig.uuid, }, ] } From b130de71dcc04764653465818b6492000d2884ea Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 23 Jun 2023 16:45:22 +0100 Subject: [PATCH 366/587] Persist the current step when remounting a form --- packages/client/src/components/app/forms/Form.svelte | 3 +++ packages/client/src/components/app/forms/InnerForm.svelte | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/client/src/components/app/forms/Form.svelte b/packages/client/src/components/app/forms/Form.svelte index b15ab55c5b..39c9bf4b59 100644 --- a/packages/client/src/components/app/forms/Form.svelte +++ b/packages/client/src/components/app/forms/Form.svelte @@ -2,6 +2,7 @@ import { getContext } from "svelte" import InnerForm from "./InnerForm.svelte" import { Helpers } from "@budibase/bbui" + import { writable } from "svelte/store" export let dataSource export let theme @@ -23,6 +24,7 @@ let loaded = false let schema let table + let currentStep = writable(1) $: fetchSchema(dataSource) $: schemaKey = generateSchemaKey(schema) @@ -92,6 +94,7 @@ {initialValues} {disableValidation} {editAutoColumns} + {currentStep} > diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte index 9eb21b0bae..51f25c4971 100644 --- a/packages/client/src/components/app/forms/InnerForm.svelte +++ b/packages/client/src/components/app/forms/InnerForm.svelte @@ -13,11 +13,14 @@ export let disableValidation = false export let editAutoColumns = false + // We export this store so that when we remount the inner form we can still + // persist what step we're on + export let currentStep + const component = getContext("component") const { styleable, Provider, ActionTypes } = getContext("sdk") let fields = [] - const currentStep = writable(1) const formState = writable({ values: {}, errors: {}, From a4ea6a3d342153922fa21d3e12139c2cbacc3681 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 23 Jun 2023 16:50:10 +0100 Subject: [PATCH 367/587] Ensure initial value of current form step inside form state store is correct --- packages/client/src/components/app/forms/InnerForm.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte index 51f25c4971..88ad35f4b9 100644 --- a/packages/client/src/components/app/forms/InnerForm.svelte +++ b/packages/client/src/components/app/forms/InnerForm.svelte @@ -25,7 +25,7 @@ values: {}, errors: {}, valid: true, - currentStep: 1, + currentStep: get(currentStep), }) // Reactive derived stores to derive form state from field array From 1b868ea31c86b9e3f8faee29bfc050aac5d6aaa5 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Fri, 23 Jun 2023 16:51:52 +0100 Subject: [PATCH 368/587] Lint pro on CI --- .github/workflows/budibase_ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index 00b7c608a8..c04031cc9d 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -27,6 +27,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + with: + submodules: true + token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }} - name: Use Node.js 14.x uses: actions/setup-node@v3 with: From ca4011e292ebb3bd9970478f1117fc16d8865efa Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 16:38:13 +0000 Subject: [PATCH 369/587] Bump version to 2.7.34-alpha.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 894ce11a4a..91b5c6e304 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.34-alpha.0", + "version": "2.7.34-alpha.1", "npmClient": "yarn", "packages": [ "packages/*" From c2b4dec88f6fd90994321b64f95f8f90434ed5a1 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 23 Jun 2023 18:09:52 +0100 Subject: [PATCH 370/587] Fix to make foreign keys auto-columns when used in relationships as well as making sure that when fetching tables that they can be removed, using the old fetch mechanism (to be replaced, but needs to work for now). --- .../server/src/api/controllers/datasource.ts | 12 ++-- .../src/api/controllers/table/external.ts | 26 +++++---- packages/server/src/sdk/app/tables/index.ts | 2 + .../server/src/sdk/app/tables/validation.ts | 57 +++++++++++++++++++ packages/types/src/documents/app/table.ts | 5 ++ 5 files changed, 84 insertions(+), 18 deletions(-) create mode 100644 packages/server/src/sdk/app/tables/validation.ts diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 8fe0ab70da..062a185a23 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -183,9 +183,7 @@ export async function buildSchemaFromDb(ctx: UserCtx) { let { tables, error } = await buildSchemaHelper(datasource) if (tablesFilter) { - if (!datasource.entities) { - datasource.entities = {} - } + datasource.entities = {} for (let key in tables) { if ( tablesFilter.some( @@ -200,7 +198,7 @@ export async function buildSchemaFromDb(ctx: UserCtx) { } setDefaultDisplayColumns(datasource) - const dbResp = await db.put(datasource) + const dbResp = await db.put(sdk.tables.checkExternalTableSchemas(datasource)) datasource._rev = dbResp.rev const cleanedDatasource = await sdk.datasources.removeSecretSingle(datasource) @@ -286,7 +284,9 @@ export async function update(ctx: UserCtx) { datasource.config!.auth = auth } - const response = await db.put(datasource) + const response = await db.put( + sdk.tables.checkExternalTableSchemas(datasource) + ) await events.datasource.updated(datasource) datasource._rev = response.rev @@ -327,7 +327,7 @@ export async function save( setDefaultDisplayColumns(datasource) } - const dbResp = await db.put(datasource) + const dbResp = await db.put(sdk.tables.checkExternalTableSchemas(datasource)) await events.datasource.created(datasource) datasource._rev = dbResp.rev diff --git a/packages/server/src/api/controllers/table/external.ts b/packages/server/src/api/controllers/table/external.ts index 24d4242478..8877f0f8d0 100644 --- a/packages/server/src/api/controllers/table/external.ts +++ b/packages/server/src/api/controllers/table/external.ts @@ -1,32 +1,34 @@ import { - buildExternalTableId, breakExternalTableId, + buildExternalTableId, } from "../../../integrations/utils" import { + foreignKeyStructure, generateForeignKey, generateJunctionTableName, - foreignKeyStructure, hasTypeChanged, setStaticSchemas, } from "./utils" import { FieldTypes } from "../../../constants" import { makeExternalQuery } from "../../../integrations/base/query" import { handleRequest } from "../row/external" -import { events, context } from "@budibase/backend-core" -import { parse, isRows, isSchema } from "../../../utilities/schema" +import { context, events } from "@budibase/backend-core" +import { isRows, isSchema, parse } from "../../../utilities/schema" import { + AutoReason, Datasource, - Table, - QueryJson, - Operation, - RenameColumn, FieldSchema, - UserCtx, - TableRequest, + Operation, + QueryJson, RelationshipTypes, + RenameColumn, + Table, + TableRequest, + UserCtx, } from "@budibase/types" import sdk from "../../../sdk" import { builderSocket } from "../../../websockets" + const { cloneDeep } = require("lodash/fp") async function makeTableRequest( @@ -317,7 +319,7 @@ export async function save(ctx: UserCtx) { delete tableToSave._rename // store it into couch now for budibase reference datasource.entities[tableToSave.name] = tableToSave - await db.put(datasource) + await db.put(sdk.tables.checkExternalTableSchemas(datasource)) // Since tables are stored inside datasources, we need to notify clients // that the datasource definition changed @@ -348,7 +350,7 @@ export async function destroy(ctx: UserCtx) { datasource.entities = tables } - await db.put(datasource) + await db.put(sdk.tables.checkExternalTableSchemas(datasource)) // Since tables are stored inside datasources, we need to notify clients // that the datasource definition changed diff --git a/packages/server/src/sdk/app/tables/index.ts b/packages/server/src/sdk/app/tables/index.ts index 6bb09ae845..92ef3f3291 100644 --- a/packages/server/src/sdk/app/tables/index.ts +++ b/packages/server/src/sdk/app/tables/index.ts @@ -7,6 +7,7 @@ import { } from "../../../integrations/utils" import { Table, Database } from "@budibase/types" import datasources from "../datasources" +import { checkExternalTableSchemas } from "./validation" async function getAllInternalTables(db?: Database): Promise { if (!db) { @@ -60,4 +61,5 @@ export default { getAllExternalTables, getExternalTable, getTable, + checkExternalTableSchemas, } diff --git a/packages/server/src/sdk/app/tables/validation.ts b/packages/server/src/sdk/app/tables/validation.ts new file mode 100644 index 0000000000..98ad72ea3d --- /dev/null +++ b/packages/server/src/sdk/app/tables/validation.ts @@ -0,0 +1,57 @@ +import { + Datasource, + FieldType, + RelationshipTypes, + AutoReason, +} from "@budibase/types" + +function checkForeignKeysAreAutoColumns(datasource: Datasource) { + if (!datasource.entities) { + return datasource + } + const tables = Object.values(datasource.entities) + // make sure all foreign key columns are marked as auto columns + const foreignKeys: { tableId: string; key: string }[] = [] + for (let table of tables) { + const relationships = Object.values(table.schema).filter( + column => column.type === FieldType.LINK + ) + relationships.forEach(relationship => { + if (relationship.relationshipType === RelationshipTypes.MANY_TO_MANY) { + const tableId = relationship.through! + foreignKeys.push({ key: relationship.throughTo!, tableId }) + foreignKeys.push({ key: relationship.throughFrom!, tableId }) + } else { + const fk = relationship.foreignKey! + const oneSide = + relationship.relationshipType === RelationshipTypes.ONE_TO_MANY + foreignKeys.push({ + tableId: oneSide ? table._id! : relationship.tableId!, + key: fk, + }) + } + }) + } + + // now make sure schemas are all accurate + for (let table of tables) { + for (let column of Object.values(table.schema)) { + const shouldBeForeign = foreignKeys.find( + options => options.tableId === table._id && options.key === column.name + ) + if (shouldBeForeign) { + column.autocolumn = true + column.autoReason = AutoReason.FOREIGN_KEY + } else if (column.autoReason === AutoReason.FOREIGN_KEY) { + delete column.autocolumn + delete column.autoReason + } + } + } + + return datasource +} + +export function checkExternalTableSchemas(datasource: Datasource) { + return checkForeignKeysAreAutoColumns(datasource) +} diff --git a/packages/types/src/documents/app/table.ts b/packages/types/src/documents/app/table.ts index 7089709808..18b415da5f 100644 --- a/packages/types/src/documents/app/table.ts +++ b/packages/types/src/documents/app/table.ts @@ -9,6 +9,10 @@ export enum RelationshipTypes { MANY_TO_MANY = "many-to-many", } +export enum AutoReason { + FOREIGN_KEY = "foreign_key", +} + export interface FieldSchema { type: FieldType externalType?: string @@ -21,6 +25,7 @@ export interface FieldSchema { foreignKey?: string icon?: string autocolumn?: boolean + autoReason?: AutoReason subtype?: string throughFrom?: string throughTo?: string From e022da5bc8578cde7ce20ac04dcb257432f2cf61 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 23 Jun 2023 18:31:02 +0100 Subject: [PATCH 371/587] Adding test case for foreign key autocolumn enrichment. --- .../sdk/app/tables/tests/validation.spec.ts | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 packages/server/src/sdk/app/tables/tests/validation.spec.ts diff --git a/packages/server/src/sdk/app/tables/tests/validation.spec.ts b/packages/server/src/sdk/app/tables/tests/validation.spec.ts new file mode 100644 index 0000000000..8acc315125 --- /dev/null +++ b/packages/server/src/sdk/app/tables/tests/validation.spec.ts @@ -0,0 +1,98 @@ +import { checkExternalTableSchemas } from "../validation" +import { cloneDeep } from "lodash/fp" +import { Datasource } from "@budibase/types" + +const SCHEMA = { + entities: { + client: { + _id: "tableA", + name: "client", + primary: ["idC"], + primaryDisplay: "Name", + schema: { + idC: { + autocolumn: true, + externalType: "int unsigned", + name: "idC", + type: "number", + }, + Name: { + autocolumn: false, + externalType: "varchar(255)", + name: "Name", + type: "string", + }, + project: { + fieldName: "idC", + foreignKey: "idC", + main: true, + name: "project", + relationshipType: "many-to-one", + tableId: "tableB", + type: "link", + }, + }, + }, + project: { + _id: "tableB", + name: "project", + primary: ["idP"], + primaryDisplay: "Name", + schema: { + idC: { + externalType: "int unsigned", + name: "idC", + type: "number", + }, + idP: { + autocolumn: true, + externalType: "int unsigned", + name: "idProject", + type: "number", + }, + Name: { + autocolumn: false, + externalType: "varchar(255)", + name: "Name", + type: "string", + }, + client: { + fieldName: "idC", + foreignKey: "idC", + name: "client", + relationshipType: "one-to-many", + tableId: "tableA", + type: "link", + }, + }, + sql: true, + type: "table", + }, + }, +} + +describe("validation and update of external table schemas", () => { + function getForeignKeyColumn(datasource: Datasource) { + return datasource.entities!["project"].schema.idC + } + + it("should correctly set utilised foreign keys to autocolumns", () => { + const response = checkExternalTableSchemas(cloneDeep(SCHEMA) as any) + const foreignKey = getForeignKeyColumn(response) + expect(foreignKey.autocolumn).toBe(true) + expect(foreignKey.autoReason).toBe("foreign_key") + }) + + it("should correctly unset foreign keys when no longer used", () => { + const setResponse = checkExternalTableSchemas(cloneDeep(SCHEMA) as any) + const beforeFk = getForeignKeyColumn(setResponse) + delete setResponse.entities!.client.schema.project + delete setResponse.entities!.project.schema.client + const response = checkExternalTableSchemas(cloneDeep(setResponse)) + const afterFk = getForeignKeyColumn(response) + expect(beforeFk.autocolumn).toBe(true) + expect(beforeFk.autoReason).toBe("foreign_key") + expect(afterFk.autocolumn).toBeUndefined() + expect(afterFk.autoReason).toBeUndefined() + }) +}) From 8325b5bb1e0c8d48dbfe5edef89b8c9ae1e2ca4f Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Fri, 23 Jun 2023 18:34:05 +0100 Subject: [PATCH 372/587] Add count to duplicate errors (#10920) * Add count to duplicate errors * Lint: Remove unused prop --- .../common/bindings/DrawerBindableInput.svelte | 1 - .../components/overlay/NotificationDisplay.svelte | 4 ++-- packages/client/src/stores/notification.js | 14 +++++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte index 7fbbf75a30..dacb076bdb 100644 --- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte +++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte @@ -21,7 +21,6 @@ export let allowHelpers = true export let updateOnChange = true export let drawerLeft - export let key const dispatch = createEventDispatcher() let bindingDrawer diff --git a/packages/client/src/components/overlay/NotificationDisplay.svelte b/packages/client/src/components/overlay/NotificationDisplay.svelte index 669fa41a1d..46b3a2a6a1 100644 --- a/packages/client/src/components/overlay/NotificationDisplay.svelte +++ b/packages/client/src/components/overlay/NotificationDisplay.svelte @@ -6,7 +6,7 @@
{#if $notificationStore} - {#each $notificationStore as { type, icon, message, id, dismissable } (id)} + {#each $notificationStore as { type, icon, message, id, dismissable, count } (id)}
1 ? `(${count}) ${message}` : message} {icon} {dismissable} on:dismiss={() => notificationStore.actions.dismiss(id)} diff --git a/packages/client/src/stores/notification.js b/packages/client/src/stores/notification.js index bbde660fd4..2a9f9749ec 100644 --- a/packages/client/src/stores/notification.js +++ b/packages/client/src/stores/notification.js @@ -13,7 +13,13 @@ const createNotificationStore = () => { setTimeout(() => (block = false), timeout) } - const send = (message, type = "info", icon, autoDismiss = true) => { + const send = ( + message, + type = "info", + icon, + autoDismiss = true, + count = 1 + ) => { if (block) { return } @@ -33,6 +39,11 @@ const createNotificationStore = () => { } const _id = id() store.update(state => { + const duplicateError = state.find(err => err.message === message) + if (duplicateError) { + duplicateError.count += 1 + return [...state] + } return [ ...state, { @@ -42,6 +53,7 @@ const createNotificationStore = () => { icon, dismissable: !autoDismiss, delay: get(store) != null, + count, }, ] }) From f60a34ee871b526667d9c8e0e7cf0a8804c938b8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 23 Jun 2023 17:38:15 +0000 Subject: [PATCH 373/587] Bump version to 2.7.34-alpha.2 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 91b5c6e304..ab0f3edab6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.34-alpha.1", + "version": "2.7.34-alpha.2", "npmClient": "yarn", "packages": [ "packages/*" From 798d5d13ab2df2443f740f5a16eb79a9152679ec Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 26 Jun 2023 07:30:32 +0000 Subject: [PATCH 374/587] Bump version to 2.7.34-alpha.3 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index ab0f3edab6..266062fbda 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.34-alpha.2", + "version": "2.7.34-alpha.3", "npmClient": "yarn", "packages": [ "packages/*" From 5d14bb70c6693e6095b15d96e80f3070b8ee9a20 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 26 Jun 2023 08:58:06 +0100 Subject: [PATCH 375/587] Ensure builder websocket is only instantiated once --- packages/builder/src/builderStore/store/frontend.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js index d0414b5733..8160939df9 100644 --- a/packages/builder/src/builderStore/store/frontend.js +++ b/packages/builder/src/builderStore/store/frontend.js @@ -117,10 +117,13 @@ export const getFrontendStore = () => { reset: () => { store.set({ ...INITIAL_FRONTEND_STATE }) websocket?.disconnect() + websocket = null }, initialise: async pkg => { const { layouts, screens, application, clientLibPath, hasLock } = pkg - websocket = createBuilderWebsocket(application.appId) + if (!websocket) { + websocket = createBuilderWebsocket(application.appId) + } await store.actions.components.refreshDefinitions(application.appId) // Reset store state From 3f0fac43ea30a5582383a42ade1dc2d4e6894f42 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 26 Jun 2023 08:58:25 +0100 Subject: [PATCH 376/587] Add padding to secondary user header to match tab spacing --- .../builder/src/pages/builder/app/[application]/_layout.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index 5a22c8bbef..0d5942c39e 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -295,8 +295,9 @@ display: flex; flex-direction: row; gap: 8px; - min-width: 0px; + min-width: 0; overflow: hidden; + margin-left: var(--spacing-xl); } .secondary-editor-body { From 8bfb909280f769889e90dd6af44cbaa316c9cd8c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 26 Jun 2023 09:22:40 +0100 Subject: [PATCH 377/587] Fix scroll overflow in binding drawer --- .../builder/src/components/common/bindings/BindingPanel.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index c95988e90c..beb205fa81 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -469,10 +469,12 @@ display: flex; flex-direction: column; gap: var(--spacing-xl); + overflow: hidden; } .overlay-wrap { position: relative; flex: 1; + overflow: hidden; } .mode-overlay { position: absolute; From 1606ca0c84949fbb8194d1f5e98ca8e5b63c1846 Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Mon, 26 Jun 2023 09:52:02 +0100 Subject: [PATCH 378/587] Refactor Datasource Creation Modal (#10783) --- .../src/FancyForm/FancyCheckboxGroup.svelte | 3 +- packages/builder/package.json | 3 +- .../_components/DatasourceCard.svelte | 60 ----- .../_components/GoogleSignIn.svelte | 145 ------------ .../modals/GoogleDatasourceConfigModal.svelte | 207 ------------------ .../DatasourceConfigEditor/ConfigInput.svelte | 40 ++++ .../fields/Boolean.svelte | 20 ++ .../fields/FieldGroup.svelte | 47 ++++ .../fields/LongForm.svelte | 22 ++ .../fields/Object.svelte | 37 ++++ .../fields/String.svelte | 39 ++++ .../DatasourceConfigEditor/index.svelte | 114 ++++++++++ .../DatasourceConfigEditor/stores/config.js | 26 +++ .../stores/validatedConfig.js | 40 ++++ .../stores/validation.js | 95 ++++++++ .../GoogleAuthPrompt.svelte | 31 +++ .../GoogleButton.svelte | 0 .../TableImportSelection/index.svelte | 62 ++++++ .../tableSelectionStore.js | 64 ++++++ .../index.svelte | 76 +++++++ .../stores/datasourceCreation.js | 92 ++++++++ .../stores/datasourceCreation.test.js | 116 ++++++++++ .../stores/onGoogleAuth.js | 24 ++ .../stores/onGoogleAuth.test.js | 70 ++++++ .../CreateInternalTableModal.svelte | 22 ++ .../builder/app/[application]/data/new.svelte | 183 +++------------- .../builder/src/stores/backend/datasources.js | 97 ++++++-- packages/builder/src/stores/backend/index.js | 3 +- .../src/stores/backend/integrations.js | 12 +- .../src/stores/backend/sortedIntegrations.js | 39 ++++ .../stores/backend/sortedIntegrations.test.js | 127 +++++++++++ packages/builder/src/stores/selectors.js | 35 +++ packages/builder/src/stores/selectors.test.js | 56 +++++ 33 files changed, 1418 insertions(+), 589 deletions(-) delete mode 100644 packages/builder/src/components/backend/DatasourceNavigator/_components/DatasourceCard.svelte delete mode 100644 packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte delete mode 100644 packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/ConfigInput.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/Boolean.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/FieldGroup.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/LongForm.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/Object.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/String.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/stores/config.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/stores/validatedConfig.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/stores/validation.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleAuthPrompt.svelte rename packages/builder/src/{components/backend/DatasourceNavigator/_components => pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal}/GoogleButton.svelte (100%) create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/TableImportSelection/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/TableImportSelection/tableSelectionStore.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.test.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js create mode 100644 packages/builder/src/pages/builder/app/[application]/data/_components/CreateInternalTableModal.svelte create mode 100644 packages/builder/src/stores/backend/sortedIntegrations.js create mode 100644 packages/builder/src/stores/backend/sortedIntegrations.test.js create mode 100644 packages/builder/src/stores/selectors.js create mode 100644 packages/builder/src/stores/selectors.test.js diff --git a/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte b/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte index aaea388c36..ca3a6d937a 100644 --- a/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte +++ b/packages/bbui/src/FancyForm/FancyCheckboxGroup.svelte @@ -12,7 +12,6 @@ const dispatch = createEventDispatcher() $: updateSelected(selectedBooleans) - $: dispatch("change", selected) $: allSelected = selected?.length === options.length $: noneSelected = !selected?.length @@ -28,6 +27,7 @@ } } selected = array + dispatch("change", selected) } function toggleSelectAll() { @@ -36,6 +36,7 @@ } else { selectedBooleans = reset() } + dispatch("change", selected) } diff --git a/packages/builder/package.json b/packages/builder/package.json index a2567dc638..646bb144df 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -9,7 +9,8 @@ "dev:builder": "routify -c dev:vite", "dev:vite": "vite --host 0.0.0.0", "rollup": "rollup -c -w", - "test": "vitest run" + "test": "vitest run", + "test:watch": "vitest" }, "jest": { "globals": { diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/DatasourceCard.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/DatasourceCard.svelte deleted file mode 100644 index 67ecf1c56c..0000000000 --- a/packages/builder/src/components/backend/DatasourceNavigator/_components/DatasourceCard.svelte +++ /dev/null @@ -1,60 +0,0 @@ - - -
dispatcher("selected", integrationType)} - class="item hoverable" -> -
- -
- {schema.friendlyName} - {#if schema.type} - {schema.type || ""} - {/if} -
-
-
- - diff --git a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte b/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte deleted file mode 100644 index c30e8fc2ee..0000000000 --- a/packages/builder/src/components/backend/DatasourceNavigator/_components/GoogleSignIn.svelte +++ /dev/null @@ -1,145 +0,0 @@ - - - - - btn_google_dark_normal_ios - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte deleted file mode 100644 index 14f81f915c..0000000000 --- a/packages/builder/src/components/backend/DatasourceNavigator/modals/GoogleDatasourceConfigModal.svelte +++ /dev/null @@ -1,207 +0,0 @@ - - - - {#if step === GoogleDatasouceConfigStep.AUTH} - - {#if isGoogleConfigured === true} - - Authenticate with your google account to use the {integrationName} integration. - - - {:else if isGoogleConfigured === false} - Google authentication is not enabled, please complete Google SSO - configuration. - Configure Google SSO - {/if} - {/if} - {#if step === GoogleDatasouceConfigStep.SET_URL} - - Add the URL of the sheet you want to connect. - - (isValid = e.detail)} - /> - - {/if} - {#if step === GoogleDatasouceConfigStep.SET_SHEETS} - - Select which spreadsheets you want to connect. - - - - {#if setSheetsErrorTitle || setSheetsErrorMessage} - - {/if} - - {/if} - diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/ConfigInput.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/ConfigInput.svelte new file mode 100644 index 0000000000..37fd579594 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/ConfigInput.svelte @@ -0,0 +1,40 @@ + + + diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/Boolean.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/Boolean.svelte new file mode 100644 index 0000000000..daa4b7a2f9 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/Boolean.svelte @@ -0,0 +1,20 @@ + + +
+ + +
+ + diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/FieldGroup.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/FieldGroup.svelte new file mode 100644 index 0000000000..a83929663b --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/FieldGroup.svelte @@ -0,0 +1,47 @@ + + + !!properties.value)} + header={name} +> + + {#each value as field} +
+ + handleChange(field.key, e.detail)} + value={field.value} + /> +
+ {/each} + + + + diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/LongForm.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/LongForm.svelte new file mode 100644 index 0000000000..efbeb007e8 --- /dev/null +++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/DatasourceConfigEditor/fields/LongForm.svelte @@ -0,0 +1,22 @@ + + +
+ +