From a625f9e107007d3926856173b266b7111ba882d2 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 5 Jul 2022 15:23:04 +0100 Subject: [PATCH 01/30] Only add defined schema fields to dynamic filter --- packages/backend-core/yarn.lock | 5 --- .../app/dynamic-filter/DynamicFilter.svelte | 4 +- packages/server/yarn.lock | 40 ++++++++++++------- packages/worker/yarn.lock | 40 ++++++++++++------- 4 files changed, 55 insertions(+), 34 deletions(-) diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock index 7d4d42263..77dbc6142 100644 --- a/packages/backend-core/yarn.lock +++ b/packages/backend-core/yarn.lock @@ -291,11 +291,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/types@^1.0.206": - version "1.0.208" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.208.tgz#c45cb494fb5b85229e15a34c6ac1805bae5be867" - integrity sha512-zKIHg6TGK+soVxMNZNrGypP3DCrd3jhlUQEFeQ+rZR6/tCue1G74bjzydY5FjnLEsXeLH1a0hkS5HulTmvQ2bA== - "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" diff --git a/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte b/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte index 80716e945..141ce2e95 100644 --- a/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte +++ b/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte @@ -61,7 +61,9 @@ clonedSchema = schema } else { allowedFields?.forEach(field => { - clonedSchema[field] = schema[field] + if (schema[field]) { + clonedSchema[field] = schema[field] + } }) } return Object.values(clonedSchema || {}) diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 3488841d3..a042cf3a1 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1080,12 +1080,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.212-alpha.10": - version "1.0.212-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.10.tgz#21c74d209c5fecea4b49e0c59db87069493169bc" - integrity sha512-8UcYfVC/8HYK3QkdysSVyiPUbNHXKpayoM9NMrJEA+QUSRcchQBLn1/5qhEAwfnPz55X+BlNV1whIJdMzXbP2A== +"@budibase/backend-core@1.0.212-alpha.15": + version "1.0.212-alpha.15" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.15.tgz#90ad9fed55a1e08c3ae69069e5d01e51477afd13" + integrity sha512-auIkpv9/W6iA1brt4vUtZivTS/8baqgPATOb+CCGzCukcDvrxkBQEEepAz0DYonKlFznsKSMkjOvgAY70wcm2Q== dependencies: - "@budibase/types" "^1.0.212-alpha.10" + "@budibase/types" "^1.0.212-alpha.15" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1101,6 +1101,7 @@ passport-google-oauth "2.0.0" passport-jwt "4.0.0" passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" posthog-node "1.3.0" pouchdb "7.3.0" pouchdb-find "7.2.2" @@ -1161,12 +1162,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.0.212-alpha.10": - version "1.0.212-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.10.tgz#0a0c2e695884075db03068c93705d1bc233b0c7a" - integrity sha512-qNzaT7+Wyy7roS/QX/WCpyhddapbarur3uPj8SBfVql8YEvEZw/f+3aOS3Ixj5m5r5eQxphWm/dCXC3RYjXKFg== +"@budibase/pro@1.0.212-alpha.15": + version "1.0.212-alpha.15" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.15.tgz#b1fe270960828ee5e096b7f958114c3782303deb" + integrity sha512-sAUeauSROZiTdQUB8PSjVrGi+C//sMvxs5B4kSBgu0+pJ5kDaa6jOd291dMfDFgVTlHQJvzGM0Z+FXooYIHLAQ== dependencies: - "@budibase/backend-core" "1.0.212-alpha.10" + "@budibase/backend-core" "1.0.212-alpha.15" + "@budibase/types" "1.0.212-alpha.12" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": @@ -1187,10 +1189,15 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@^1.0.212-alpha.10": - version "1.0.214" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.214.tgz#400724fb23a1ce4b80bd04ed472a376d59126069" - integrity sha512-KD9XkCdL+R4Nal/X2IX0Bv+AxsylGzAAmo7M6tuoM7YAegskmsX5Kfk5yasnbMnhOdICyvbJ1D6Hz7WKwdApzw== +"@budibase/types@1.0.212-alpha.12": + version "1.0.212-alpha.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.212-alpha.12.tgz#d45aa03d18f9ddc20d66e034072c0dc759eaf1ed" + integrity sha512-o4ZXUuqW6ryLj9/LptXBRwPPofl6PB5eo+HDt7KNMq7beVSC48uS+N/cQEF325OKrrulZRAGEStnUaLkFz3M9A== + +"@budibase/types@^1.0.212-alpha.15": + version "1.0.218" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.218.tgz#534dd41c4a42a9061256c75b46bd78ec27ce47cd" + integrity sha512-X5mNdkHZtjEp/B+5mrtcTTUAj76XkF1U6/kEA9sQ9XHano9b22u/gbXTm/VdSuwqTXwN9abh5xAHhZDNSCrgiw== "@bull-board/api@3.7.0": version "3.7.0" @@ -10570,6 +10577,11 @@ passport-oauth1@1.x.x: passport-strategy "1.x.x" utils-merge "1.x.x" +passport-oauth2-refresh@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4" + integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A== + passport-oauth2@1.x.x: version "1.6.1" resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b" diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index ea888298f..9896e6ec4 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -293,12 +293,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.212-alpha.10": - version "1.0.212-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.10.tgz#21c74d209c5fecea4b49e0c59db87069493169bc" - integrity sha512-8UcYfVC/8HYK3QkdysSVyiPUbNHXKpayoM9NMrJEA+QUSRcchQBLn1/5qhEAwfnPz55X+BlNV1whIJdMzXbP2A== +"@budibase/backend-core@1.0.212-alpha.15": + version "1.0.212-alpha.15" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.15.tgz#90ad9fed55a1e08c3ae69069e5d01e51477afd13" + integrity sha512-auIkpv9/W6iA1brt4vUtZivTS/8baqgPATOb+CCGzCukcDvrxkBQEEepAz0DYonKlFznsKSMkjOvgAY70wcm2Q== dependencies: - "@budibase/types" "^1.0.212-alpha.10" + "@budibase/types" "^1.0.212-alpha.15" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -314,6 +314,7 @@ passport-google-oauth "2.0.0" passport-jwt "4.0.0" passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" posthog-node "1.3.0" pouchdb "7.3.0" pouchdb-find "7.2.2" @@ -325,18 +326,24 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.0.212-alpha.10": - version "1.0.212-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.10.tgz#0a0c2e695884075db03068c93705d1bc233b0c7a" - integrity sha512-qNzaT7+Wyy7roS/QX/WCpyhddapbarur3uPj8SBfVql8YEvEZw/f+3aOS3Ixj5m5r5eQxphWm/dCXC3RYjXKFg== +"@budibase/pro@1.0.212-alpha.15": + version "1.0.212-alpha.15" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.15.tgz#b1fe270960828ee5e096b7f958114c3782303deb" + integrity sha512-sAUeauSROZiTdQUB8PSjVrGi+C//sMvxs5B4kSBgu0+pJ5kDaa6jOd291dMfDFgVTlHQJvzGM0Z+FXooYIHLAQ== dependencies: - "@budibase/backend-core" "1.0.212-alpha.10" + "@budibase/backend-core" "1.0.212-alpha.15" + "@budibase/types" "1.0.212-alpha.12" node-fetch "^2.6.1" -"@budibase/types@^1.0.212-alpha.10": - version "1.0.214" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.214.tgz#400724fb23a1ce4b80bd04ed472a376d59126069" - integrity sha512-KD9XkCdL+R4Nal/X2IX0Bv+AxsylGzAAmo7M6tuoM7YAegskmsX5Kfk5yasnbMnhOdICyvbJ1D6Hz7WKwdApzw== +"@budibase/types@1.0.212-alpha.12": + version "1.0.212-alpha.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.212-alpha.12.tgz#d45aa03d18f9ddc20d66e034072c0dc759eaf1ed" + integrity sha512-o4ZXUuqW6ryLj9/LptXBRwPPofl6PB5eo+HDt7KNMq7beVSC48uS+N/cQEF325OKrrulZRAGEStnUaLkFz3M9A== + +"@budibase/types@^1.0.212-alpha.15": + version "1.0.218" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.218.tgz#534dd41c4a42a9061256c75b46bd78ec27ce47cd" + integrity sha512-X5mNdkHZtjEp/B+5mrtcTTUAj76XkF1U6/kEA9sQ9XHano9b22u/gbXTm/VdSuwqTXwN9abh5xAHhZDNSCrgiw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" @@ -4981,6 +4988,11 @@ passport-oauth1@1.x.x: passport-strategy "1.x.x" utils-merge "1.x.x" +passport-oauth2-refresh@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4" + integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A== + passport-oauth2@1.x.x: version "1.6.1" resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b" From 65aab29ee692cb1e7e88af71f0b1b6b11ca153b8 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Tue, 5 Jul 2022 16:59:32 +0100 Subject: [PATCH 02/30] Don't try to check externalType of related tables --- packages/server/src/integrations/base/sql.ts | 8 +++- packages/server/yarn.lock | 40 +++++++++++++------- packages/worker/yarn.lock | 40 +++++++++++++------- 3 files changed, 58 insertions(+), 30 deletions(-) diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts index 2758b6f1f..fbbc42151 100644 --- a/packages/server/src/integrations/base/sql.ts +++ b/packages/server/src/integrations/base/sql.ts @@ -99,8 +99,12 @@ function generateSelectStatement( const fieldNames = field.split(/\./g) const tableName = fieldNames[0] const columnName = fieldNames[1] - if (columnName && knex.client.config.client === SqlClients.POSTGRES) { - const externalType = schema?.[columnName].externalType + if ( + columnName && + schema?.[columnName] && + knex.client.config.client === SqlClients.POSTGRES + ) { + const externalType = schema[columnName].externalType if (externalType?.includes("money")) { return knex.raw( `"${tableName}"."${columnName}"::money::numeric as "${field}"` diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 3488841d3..a042cf3a1 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1080,12 +1080,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.212-alpha.10": - version "1.0.212-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.10.tgz#21c74d209c5fecea4b49e0c59db87069493169bc" - integrity sha512-8UcYfVC/8HYK3QkdysSVyiPUbNHXKpayoM9NMrJEA+QUSRcchQBLn1/5qhEAwfnPz55X+BlNV1whIJdMzXbP2A== +"@budibase/backend-core@1.0.212-alpha.15": + version "1.0.212-alpha.15" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.15.tgz#90ad9fed55a1e08c3ae69069e5d01e51477afd13" + integrity sha512-auIkpv9/W6iA1brt4vUtZivTS/8baqgPATOb+CCGzCukcDvrxkBQEEepAz0DYonKlFznsKSMkjOvgAY70wcm2Q== dependencies: - "@budibase/types" "^1.0.212-alpha.10" + "@budibase/types" "^1.0.212-alpha.15" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -1101,6 +1101,7 @@ passport-google-oauth "2.0.0" passport-jwt "4.0.0" passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" posthog-node "1.3.0" pouchdb "7.3.0" pouchdb-find "7.2.2" @@ -1161,12 +1162,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.0.212-alpha.10": - version "1.0.212-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.10.tgz#0a0c2e695884075db03068c93705d1bc233b0c7a" - integrity sha512-qNzaT7+Wyy7roS/QX/WCpyhddapbarur3uPj8SBfVql8YEvEZw/f+3aOS3Ixj5m5r5eQxphWm/dCXC3RYjXKFg== +"@budibase/pro@1.0.212-alpha.15": + version "1.0.212-alpha.15" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.15.tgz#b1fe270960828ee5e096b7f958114c3782303deb" + integrity sha512-sAUeauSROZiTdQUB8PSjVrGi+C//sMvxs5B4kSBgu0+pJ5kDaa6jOd291dMfDFgVTlHQJvzGM0Z+FXooYIHLAQ== dependencies: - "@budibase/backend-core" "1.0.212-alpha.10" + "@budibase/backend-core" "1.0.212-alpha.15" + "@budibase/types" "1.0.212-alpha.12" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": @@ -1187,10 +1189,15 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@^1.0.212-alpha.10": - version "1.0.214" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.214.tgz#400724fb23a1ce4b80bd04ed472a376d59126069" - integrity sha512-KD9XkCdL+R4Nal/X2IX0Bv+AxsylGzAAmo7M6tuoM7YAegskmsX5Kfk5yasnbMnhOdICyvbJ1D6Hz7WKwdApzw== +"@budibase/types@1.0.212-alpha.12": + version "1.0.212-alpha.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.212-alpha.12.tgz#d45aa03d18f9ddc20d66e034072c0dc759eaf1ed" + integrity sha512-o4ZXUuqW6ryLj9/LptXBRwPPofl6PB5eo+HDt7KNMq7beVSC48uS+N/cQEF325OKrrulZRAGEStnUaLkFz3M9A== + +"@budibase/types@^1.0.212-alpha.15": + version "1.0.218" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.218.tgz#534dd41c4a42a9061256c75b46bd78ec27ce47cd" + integrity sha512-X5mNdkHZtjEp/B+5mrtcTTUAj76XkF1U6/kEA9sQ9XHano9b22u/gbXTm/VdSuwqTXwN9abh5xAHhZDNSCrgiw== "@bull-board/api@3.7.0": version "3.7.0" @@ -10570,6 +10577,11 @@ passport-oauth1@1.x.x: passport-strategy "1.x.x" utils-merge "1.x.x" +passport-oauth2-refresh@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4" + integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A== + passport-oauth2@1.x.x: version "1.6.1" resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b" diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index ea888298f..9896e6ec4 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -293,12 +293,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.212-alpha.10": - version "1.0.212-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.10.tgz#21c74d209c5fecea4b49e0c59db87069493169bc" - integrity sha512-8UcYfVC/8HYK3QkdysSVyiPUbNHXKpayoM9NMrJEA+QUSRcchQBLn1/5qhEAwfnPz55X+BlNV1whIJdMzXbP2A== +"@budibase/backend-core@1.0.212-alpha.15": + version "1.0.212-alpha.15" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.212-alpha.15.tgz#90ad9fed55a1e08c3ae69069e5d01e51477afd13" + integrity sha512-auIkpv9/W6iA1brt4vUtZivTS/8baqgPATOb+CCGzCukcDvrxkBQEEepAz0DYonKlFznsKSMkjOvgAY70wcm2Q== dependencies: - "@budibase/types" "^1.0.212-alpha.10" + "@budibase/types" "^1.0.212-alpha.15" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" bcrypt "5.0.1" @@ -314,6 +314,7 @@ passport-google-oauth "2.0.0" passport-jwt "4.0.0" passport-local "1.0.0" + passport-oauth2-refresh "^2.1.0" posthog-node "1.3.0" pouchdb "7.3.0" pouchdb-find "7.2.2" @@ -325,18 +326,24 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.0.212-alpha.10": - version "1.0.212-alpha.10" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.10.tgz#0a0c2e695884075db03068c93705d1bc233b0c7a" - integrity sha512-qNzaT7+Wyy7roS/QX/WCpyhddapbarur3uPj8SBfVql8YEvEZw/f+3aOS3Ixj5m5r5eQxphWm/dCXC3RYjXKFg== +"@budibase/pro@1.0.212-alpha.15": + version "1.0.212-alpha.15" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.212-alpha.15.tgz#b1fe270960828ee5e096b7f958114c3782303deb" + integrity sha512-sAUeauSROZiTdQUB8PSjVrGi+C//sMvxs5B4kSBgu0+pJ5kDaa6jOd291dMfDFgVTlHQJvzGM0Z+FXooYIHLAQ== dependencies: - "@budibase/backend-core" "1.0.212-alpha.10" + "@budibase/backend-core" "1.0.212-alpha.15" + "@budibase/types" "1.0.212-alpha.12" node-fetch "^2.6.1" -"@budibase/types@^1.0.212-alpha.10": - version "1.0.214" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.214.tgz#400724fb23a1ce4b80bd04ed472a376d59126069" - integrity sha512-KD9XkCdL+R4Nal/X2IX0Bv+AxsylGzAAmo7M6tuoM7YAegskmsX5Kfk5yasnbMnhOdICyvbJ1D6Hz7WKwdApzw== +"@budibase/types@1.0.212-alpha.12": + version "1.0.212-alpha.12" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.212-alpha.12.tgz#d45aa03d18f9ddc20d66e034072c0dc759eaf1ed" + integrity sha512-o4ZXUuqW6ryLj9/LptXBRwPPofl6PB5eo+HDt7KNMq7beVSC48uS+N/cQEF325OKrrulZRAGEStnUaLkFz3M9A== + +"@budibase/types@^1.0.212-alpha.15": + version "1.0.218" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.0.218.tgz#534dd41c4a42a9061256c75b46bd78ec27ce47cd" + integrity sha512-X5mNdkHZtjEp/B+5mrtcTTUAj76XkF1U6/kEA9sQ9XHano9b22u/gbXTm/VdSuwqTXwN9abh5xAHhZDNSCrgiw== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" @@ -4981,6 +4988,11 @@ passport-oauth1@1.x.x: passport-strategy "1.x.x" utils-merge "1.x.x" +passport-oauth2-refresh@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4" + integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A== + passport-oauth2@1.x.x: version "1.6.1" resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b" From 9a7e5ba830f9c26617a6488cdab73529f79a2c15 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Thu, 7 Jul 2022 11:07:05 +0100 Subject: [PATCH 03/30] Smoke Build Changes - Timing issues Timing issues persist for the smoke build. Increasing timeout values to try and combat this --- packages/builder/cypress.json | 2 +- .../adminAndManagement/userManagement.spec.js | 4 ++-- .../builder/cypress/integration/appOverview.spec.js | 4 ++-- .../integration/datasources/postgreSql.spec.js | 2 +- .../cypress/integration/renameAnApplication.spec.js | 13 +++++-------- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json index 844b77666..f1eada481 100644 --- a/packages/builder/cypress.json +++ b/packages/builder/cypress.json @@ -13,7 +13,7 @@ "HOST_IP": "" }, "retries": { - "runMode": 0, + "runMode": 1, "openMode": 0 } } \ No newline at end of file diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js index a8ba27f7a..e4be5e3be 100644 --- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js @@ -46,8 +46,8 @@ filterTests(["smoke", "all"], () => { cy.createApp(name) } else { cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) - cy.wait(500) - cy.get(interact.CREATE_APP_BUTTON, { timeout: 1000 }).click({ force: true }) + cy.wait(1000) + cy.get(interact.CREATE_APP_BUTTON, { timeout: 2000 }).click({ force: true }) cy.createAppFromScratch(name) } } diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js index 9a08f7204..5856786bc 100644 --- a/packages/builder/cypress/integration/appOverview.spec.js +++ b/packages/builder/cypress/integration/appOverview.spec.js @@ -333,8 +333,8 @@ filterTests(["all"], () => { cy.wait(1000) }) - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - cy.get(".appTable .app-row-actions button", { timeout: 1000 }) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 }) + cy.get(".appTable .app-row-actions button", { timeout: 5000 }) .contains("Manage") .eq(0) .click({ force: true }) diff --git a/packages/builder/cypress/integration/datasources/postgreSql.spec.js b/packages/builder/cypress/integration/datasources/postgreSql.spec.js index de959e203..598055225 100644 --- a/packages/builder/cypress/integration/datasources/postgreSql.spec.js +++ b/packages/builder/cypress/integration/datasources/postgreSql.spec.js @@ -151,7 +151,7 @@ filterTests(["all"], () => { cy.get("@query").its("response.body").should("not.be.empty") // Save query cy.get(".spectrum-Button").contains("Save Query").click({ force: true }) - cy.get(".hierarchy-items-container").should("contain", queryName) + cy.get(".spectrum-Tabs-content", { timeout: 2000 }).should("contain", queryName) }) it("should switch to schema with no tables", () => { diff --git a/packages/builder/cypress/integration/renameAnApplication.spec.js b/packages/builder/cypress/integration/renameAnApplication.spec.js index 370efadff..4460750b0 100644 --- a/packages/builder/cypress/integration/renameAnApplication.spec.js +++ b/packages/builder/cypress/integration/renameAnApplication.spec.js @@ -12,7 +12,7 @@ filterTests(["all"], () => { const appName = "Cypress Tests" const appRename = "Cypress Renamed" // Rename app, Search for app, Confirm name was changed - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) renameApp(appName, appRename) cy.reload() cy.searchForApplication(appRename) @@ -39,7 +39,7 @@ filterTests(["all"], () => { .click({ force: true }) }) // Rename app, Search for app, Confirm name was changed - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) renameApp(appName, appRename, true) cy.get(interact.APP_TABLE).find(interact.WRAPPER).should("have.length", 1) cy.applicationInAppTable(appRename) @@ -47,7 +47,7 @@ filterTests(["all"], () => { it("Should try to rename an application to have no name", () => { const appName = "Cypress Tests" - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) renameApp(appName, " ", false, true) // Close modal and confirm name has not been changed cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 1000 }).contains("Cancel").click() @@ -57,7 +57,7 @@ filterTests(["all"], () => { xit("Should create two applications with the same name", () => { // It is not possible to have applications with the same name const appName = "Cypress Tests" - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) cy.get(interact.SPECTRUM_BUTTON), { timeout: 500 } .contains("Create app") .click({ force: true }) @@ -80,18 +80,15 @@ filterTests(["all"], () => { const appName = "Cypress Tests" const numberName = 12345 const specialCharName = "£$%^" - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) renameApp(appName, numberName) - cy.reload() cy.applicationInAppTable(numberName) - cy.reload() renameApp(numberName, specialCharName) cy.get(interact.ERROR).should( "have.text", "App name must be letters, numbers and spaces only" ) // Set app name back to Cypress Tests - cy.reload() renameApp(numberName, appName) }) From d006763b9f509ee4693f6c15ed9660d94b96d475 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 10:40:17 +0000 Subject: [PATCH 04/30] v1.0.219-alpha.8 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 49a7e0698..046b10e6a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 549ba4e81..731241922 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.7", + "@budibase/types": "^1.0.219-alpha.8", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 343193eda..e36b596fb 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.7", + "@budibase/string-templates": "^1.0.219-alpha.8", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 5751c2af4..3e9264fae 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.7", - "@budibase/client": "^1.0.219-alpha.7", - "@budibase/frontend-core": "^1.0.219-alpha.7", - "@budibase/string-templates": "^1.0.219-alpha.7", + "@budibase/bbui": "^1.0.219-alpha.8", + "@budibase/client": "^1.0.219-alpha.8", + "@budibase/frontend-core": "^1.0.219-alpha.8", + "@budibase/string-templates": "^1.0.219-alpha.8", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 1a07a4bd7..9051d54b7 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index f1586d6f4..a503af0cb 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.7", - "@budibase/frontend-core": "^1.0.219-alpha.7", - "@budibase/string-templates": "^1.0.219-alpha.7", + "@budibase/bbui": "^1.0.219-alpha.8", + "@budibase/frontend-core": "^1.0.219-alpha.8", + "@budibase/string-templates": "^1.0.219-alpha.8", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index f5b1d2abb..d10cf3812 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.7", + "@budibase/bbui": "^1.0.219-alpha.8", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 641619371..dee7ffa7f 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.7", - "@budibase/client": "^1.0.219-alpha.7", + "@budibase/backend-core": "^1.0.219-alpha.8", + "@budibase/client": "^1.0.219-alpha.8", "@budibase/pro": "1.0.219-alpha.7", - "@budibase/string-templates": "^1.0.219-alpha.7", - "@budibase/types": "^1.0.219-alpha.7", + "@budibase/string-templates": "^1.0.219-alpha.8", + "@budibase/types": "^1.0.219-alpha.8", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 860c44ec4..787db8a16 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 72a0047e8..c27eab7cc 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index b00bc4259..127ce5a2d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.7", + "version": "1.0.219-alpha.8", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.7", + "@budibase/backend-core": "^1.0.219-alpha.8", "@budibase/pro": "1.0.219-alpha.7", - "@budibase/string-templates": "^1.0.219-alpha.7", - "@budibase/types": "^1.0.219-alpha.7", + "@budibase/string-templates": "^1.0.219-alpha.8", + "@budibase/types": "^1.0.219-alpha.8", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 0a4d3261624bc7437e69681d16765892cea54f9f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 10:41:47 +0000 Subject: [PATCH 05/30] Update pro version to 1.0.219-alpha.8 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index dee7ffa7f..21ce84829 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.8", "@budibase/client": "^1.0.219-alpha.8", - "@budibase/pro": "1.0.219-alpha.7", + "@budibase/pro": "1.0.219-alpha.8", "@budibase/string-templates": "^1.0.219-alpha.8", "@budibase/types": "^1.0.219-alpha.8", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 127ce5a2d..09f2ddb18 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.8", - "@budibase/pro": "1.0.219-alpha.7", + "@budibase/pro": "1.0.219-alpha.8", "@budibase/string-templates": "^1.0.219-alpha.8", "@budibase/types": "^1.0.219-alpha.8", "@koa/router": "8.0.8", From 00229a9fca73b5f4d5b17bbaf94b99f1a90bdc94 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Thu, 7 Jul 2022 12:02:13 +0100 Subject: [PATCH 06/30] Updating pro release script to fix dependencies. --- scripts/pro/release.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/pro/release.sh b/scripts/pro/release.sh index e08f27158..fc1d8132d 100755 --- a/scripts/pro/release.sh +++ b/scripts/pro/release.sh @@ -36,10 +36,11 @@ cd ../budibase-pro # Install NPM credentials echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} >> .npmrc -# Sync backend-core version in packages/pro/package.json +# Sync budibase dependency versions in packages/pro/package.json # Ensures pro does not use out of date dependency cd packages/pro jq '.dependencies."@budibase/backend-core"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json +jq '.dependencies."@budibase/types"="'$VERSION'"' package.json > package.json.tmp && mv package.json.tmp package.json # Go back to pro repo root cd - @@ -91,4 +92,4 @@ cd - git add packages/server/package.json git add packages/worker/package.json git commit -m "Update pro version to $VERSION" -git push \ No newline at end of file +git push From b2f9898d0faef404230d6ae8ef5303032edd4b2b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 11:12:43 +0000 Subject: [PATCH 07/30] v1.0.219-alpha.9 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 046b10e6a..dcf4da894 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 731241922..15b2b6df5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.8", + "@budibase/types": "^1.0.219-alpha.9", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e36b596fb..686d358fc 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.8", + "@budibase/string-templates": "^1.0.219-alpha.9", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 3e9264fae..bd4f34f13 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.8", - "@budibase/client": "^1.0.219-alpha.8", - "@budibase/frontend-core": "^1.0.219-alpha.8", - "@budibase/string-templates": "^1.0.219-alpha.8", + "@budibase/bbui": "^1.0.219-alpha.9", + "@budibase/client": "^1.0.219-alpha.9", + "@budibase/frontend-core": "^1.0.219-alpha.9", + "@budibase/string-templates": "^1.0.219-alpha.9", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 9051d54b7..a666742eb 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index a503af0cb..1ee4e2443 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.8", - "@budibase/frontend-core": "^1.0.219-alpha.8", - "@budibase/string-templates": "^1.0.219-alpha.8", + "@budibase/bbui": "^1.0.219-alpha.9", + "@budibase/frontend-core": "^1.0.219-alpha.9", + "@budibase/string-templates": "^1.0.219-alpha.9", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index d10cf3812..ad0556c59 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.8", + "@budibase/bbui": "^1.0.219-alpha.9", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 21ce84829..0a557c785 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.8", - "@budibase/client": "^1.0.219-alpha.8", + "@budibase/backend-core": "^1.0.219-alpha.9", + "@budibase/client": "^1.0.219-alpha.9", "@budibase/pro": "1.0.219-alpha.8", - "@budibase/string-templates": "^1.0.219-alpha.8", - "@budibase/types": "^1.0.219-alpha.8", + "@budibase/string-templates": "^1.0.219-alpha.9", + "@budibase/types": "^1.0.219-alpha.9", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 787db8a16..33bd8710f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index c27eab7cc..fa0a50897 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 09f2ddb18..80cc21142 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.8", + "version": "1.0.219-alpha.9", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.8", + "@budibase/backend-core": "^1.0.219-alpha.9", "@budibase/pro": "1.0.219-alpha.8", - "@budibase/string-templates": "^1.0.219-alpha.8", - "@budibase/types": "^1.0.219-alpha.8", + "@budibase/string-templates": "^1.0.219-alpha.9", + "@budibase/types": "^1.0.219-alpha.9", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 0dc7a827a0cc8f986bd4ba592331084d666795f5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 11:14:18 +0000 Subject: [PATCH 08/30] Update pro version to 1.0.219-alpha.9 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 0a557c785..79eb23a5b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.9", "@budibase/client": "^1.0.219-alpha.9", - "@budibase/pro": "1.0.219-alpha.8", + "@budibase/pro": "1.0.219-alpha.9", "@budibase/string-templates": "^1.0.219-alpha.9", "@budibase/types": "^1.0.219-alpha.9", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 80cc21142..63f44ad2b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.9", - "@budibase/pro": "1.0.219-alpha.8", + "@budibase/pro": "1.0.219-alpha.9", "@budibase/string-templates": "^1.0.219-alpha.9", "@budibase/types": "^1.0.219-alpha.9", "@koa/router": "8.0.8", From 025405c09f9d825e2c96c4a028f4f3940b59d656 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Thu, 7 Jul 2022 12:50:30 +0100 Subject: [PATCH 09/30] Cypress: User Details Test Fix It seems that at times, Cypress is running so fast that it does not type entire words (it sometimes misses the first couple of letters. I've put a small change in the userManagement test file to try and revolve this. - Adding a wait and clear in association with the type command --- .../integration/adminAndManagement/userManagement.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js index e4be5e3be..69f3c2ec1 100644 --- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js @@ -176,12 +176,12 @@ filterTests(["smoke", "all"], () => { // Add First name cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => { cy.wait(500) - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().type("bb") + cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).wait(500).clear().click().type("bb") }) // Add Last name cy.get(interact.FIELD, { timeout: 1000 }).eq(3).within(() => { cy.wait(500) - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().type("test") + cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().wait(500).clear().type("test") }) cy.get(interact.FIELD, { timeout: 1000 }).eq(0).click() // Reload page From ecc49c6225cbf1417ed2fb9a6899ac1aff95fe2c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 12:13:32 +0000 Subject: [PATCH 10/30] v1.0.219-alpha.10 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index dcf4da894..89ef3fccc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 15b2b6df5..01f0b319c 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.9", + "@budibase/types": "^1.0.219-alpha.10", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 686d358fc..dc6dc27c6 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.9", + "@budibase/string-templates": "^1.0.219-alpha.10", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index bd4f34f13..ab580440a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.9", - "@budibase/client": "^1.0.219-alpha.9", - "@budibase/frontend-core": "^1.0.219-alpha.9", - "@budibase/string-templates": "^1.0.219-alpha.9", + "@budibase/bbui": "^1.0.219-alpha.10", + "@budibase/client": "^1.0.219-alpha.10", + "@budibase/frontend-core": "^1.0.219-alpha.10", + "@budibase/string-templates": "^1.0.219-alpha.10", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index a666742eb..c4836f72e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 1ee4e2443..861c6dd28 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.9", - "@budibase/frontend-core": "^1.0.219-alpha.9", - "@budibase/string-templates": "^1.0.219-alpha.9", + "@budibase/bbui": "^1.0.219-alpha.10", + "@budibase/frontend-core": "^1.0.219-alpha.10", + "@budibase/string-templates": "^1.0.219-alpha.10", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index ad0556c59..fae146a28 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.9", + "@budibase/bbui": "^1.0.219-alpha.10", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 79eb23a5b..3eaaac5b0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.9", - "@budibase/client": "^1.0.219-alpha.9", + "@budibase/backend-core": "^1.0.219-alpha.10", + "@budibase/client": "^1.0.219-alpha.10", "@budibase/pro": "1.0.219-alpha.9", - "@budibase/string-templates": "^1.0.219-alpha.9", - "@budibase/types": "^1.0.219-alpha.9", + "@budibase/string-templates": "^1.0.219-alpha.10", + "@budibase/types": "^1.0.219-alpha.10", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 33bd8710f..54c58262f 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index fa0a50897..17aa127c9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 63f44ad2b..179944d25 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.9", + "version": "1.0.219-alpha.10", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.9", + "@budibase/backend-core": "^1.0.219-alpha.10", "@budibase/pro": "1.0.219-alpha.9", - "@budibase/string-templates": "^1.0.219-alpha.9", - "@budibase/types": "^1.0.219-alpha.9", + "@budibase/string-templates": "^1.0.219-alpha.10", + "@budibase/types": "^1.0.219-alpha.10", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From c7e7fc25e9f5519c33b837d8dd8575e09a54ee61 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 12:15:04 +0000 Subject: [PATCH 11/30] Update pro version to 1.0.219-alpha.10 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 3eaaac5b0..9c1ece825 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.10", "@budibase/client": "^1.0.219-alpha.10", - "@budibase/pro": "1.0.219-alpha.9", + "@budibase/pro": "1.0.219-alpha.10", "@budibase/string-templates": "^1.0.219-alpha.10", "@budibase/types": "^1.0.219-alpha.10", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 179944d25..eac161513 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.10", - "@budibase/pro": "1.0.219-alpha.9", + "@budibase/pro": "1.0.219-alpha.10", "@budibase/string-templates": "^1.0.219-alpha.10", "@budibase/types": "^1.0.219-alpha.10", "@koa/router": "8.0.8", From c8843b095060d44e0fee76ee5c04b5ed6b255525 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Thu, 7 Jul 2022 15:13:15 +0100 Subject: [PATCH 12/30] Cypress: Increasing timeout values Getting close.... but there are still some minor timing issues against the smoke build. I am increasing a few timeout values within postgreSQL & commands files --- .../cypress/integration/datasources/postgreSql.spec.js | 7 +++---- packages/builder/cypress/support/commands.js | 8 +++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/builder/cypress/integration/datasources/postgreSql.spec.js b/packages/builder/cypress/integration/datasources/postgreSql.spec.js index 598055225..15e31308f 100644 --- a/packages/builder/cypress/integration/datasources/postgreSql.spec.js +++ b/packages/builder/cypress/integration/datasources/postgreSql.spec.js @@ -231,10 +231,9 @@ filterTests(["all"], () => { // Run and Save query cy.get(".spectrum-Button").contains("Run Query").click({ force: true }) cy.wait(500) - cy.get(".spectrum-Button", { timeout: 500 }).contains("Save Query").click({ force: true }) - //cy.reload() - //cy.wait(500) - cy.get(".nav-item").should("contain", queryRename) + cy.get(".spectrum-Button", { timeout: 2000 }).contains("Save Query").click({ force: true }) + cy.reload({ timeout: 5000 }) + cy.get(".nav-item", { timeout: 2000 }).should("contain", queryRename) }) it("should delete a query", () => { diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index 16bb11ea8..6f05b2a9f 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -134,16 +134,18 @@ Cypress.Commands.add("createApp", (name, addDefaultTable) => { const shouldCreateDefaultTable = typeof addDefaultTable != "boolean" ? true : addDefaultTable - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 }) cy.wait(1000) - cy.get(`[data-cy="create-app-btn"]`, { timeout: 2000 }).click({ force: true }) + cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({ force: true }) // If apps already exist cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`) .its("body") .then(val => { if (val.length > 0) { - cy.get(`[data-cy="create-app-btn"]`).click({ force: true }) + cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({ + force: true, + }) } }) From d312605ac68de3c799eef49916c6d559a15b5b57 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 14:41:07 +0000 Subject: [PATCH 13/30] v1.0.219-alpha.11 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 89ef3fccc..793ecfc46 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.10", + "version": "1.0.219-alpha.11", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 01f0b319c..8cce90a97 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.10", + "version": "1.0.219-alpha.11", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.10", + "@budibase/types": "^1.0.219-alpha.11", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index dc6dc27c6..4ee1512de 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.10", + "version": "1.0.219-alpha.11", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.10", + "@budibase/string-templates": "^1.0.219-alpha.11", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index ab580440a..0e446db54 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.10", + "version": "1.0.219-alpha.11", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.10", - "@budibase/client": "^1.0.219-alpha.10", - "@budibase/frontend-core": "^1.0.219-alpha.10", - "@budibase/string-templates": "^1.0.219-alpha.10", + "@budibase/bbui": "^1.0.219-alpha.11", + "@budibase/client": "^1.0.219-alpha.11", + "@budibase/frontend-core": "^1.0.219-alpha.11", + "@budibase/string-templates": "^1.0.219-alpha.11", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index c4836f72e..541509d77 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.10", + "version": "1.0.219-alpha.11", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 861c6dd28..c58aa0690 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.10", + "version": "1.0.219-alpha.11", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.10", - "@budibase/frontend-core": "^1.0.219-alpha.10", - "@budibase/string-templates": "^1.0.219-alpha.10", + "@budibase/bbui": "^1.0.219-alpha.11", + "@budibase/frontend-core": "^1.0.219-alpha.11", + "@budibase/string-templates": "^1.0.219-alpha.11", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index fae146a28..65926bb6d 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.10", + "version": "1.0.219-alpha.11", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.10", + "@budibase/bbui": "^1.0.219-alpha.11", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 9c1ece825..3098cf133 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.10", + "version": "1.0.219-alpha.11", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.10", - "@budibase/client": "^1.0.219-alpha.10", + "@budibase/backend-core": "^1.0.219-alpha.11", + "@budibase/client": "^1.0.219-alpha.11", "@budibase/pro": "1.0.219-alpha.10", - "@budibase/string-templates": "^1.0.219-alpha.10", - "@budibase/types": "^1.0.219-alpha.10", + "@budibase/string-templates": "^1.0.219-alpha.11", + "@budibase/types": "^1.0.219-alpha.11", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 54c58262f..3866fe44b 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.10", + "version": "1.0.219-alpha.11", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 17aa127c9..71d919e4b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.10", + "version": "1.0.219-alpha.11", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index eac161513..7e1e5858c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.10", + "version": "1.0.219-alpha.11", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.10", + "@budibase/backend-core": "^1.0.219-alpha.11", "@budibase/pro": "1.0.219-alpha.10", - "@budibase/string-templates": "^1.0.219-alpha.10", - "@budibase/types": "^1.0.219-alpha.10", + "@budibase/string-templates": "^1.0.219-alpha.11", + "@budibase/types": "^1.0.219-alpha.11", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 63a5eb303574b36ecc259a8b79514333a7518430 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 7 Jul 2022 14:42:44 +0000 Subject: [PATCH 14/30] Update pro version to 1.0.219-alpha.11 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 3098cf133..dc82b6b5b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.11", "@budibase/client": "^1.0.219-alpha.11", - "@budibase/pro": "1.0.219-alpha.10", + "@budibase/pro": "1.0.219-alpha.11", "@budibase/string-templates": "^1.0.219-alpha.11", "@budibase/types": "^1.0.219-alpha.11", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 7e1e5858c..57e8a376f 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.11", - "@budibase/pro": "1.0.219-alpha.10", + "@budibase/pro": "1.0.219-alpha.11", "@budibase/string-templates": "^1.0.219-alpha.11", "@budibase/types": "^1.0.219-alpha.11", "@koa/router": "8.0.8", From f166ff9ac08ed2fda8623df5484744786560fc56 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 8 Jul 2022 08:17:27 +0000 Subject: [PATCH 15/30] v1.0.219-alpha.12 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 793ecfc46..84b793b18 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.11", + "version": "1.0.219-alpha.12", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 8cce90a97..f84fa48b9 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.11", + "version": "1.0.219-alpha.12", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.11", + "@budibase/types": "^1.0.219-alpha.12", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4ee1512de..e92ca3e2d 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.11", + "version": "1.0.219-alpha.12", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.11", + "@budibase/string-templates": "^1.0.219-alpha.12", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 0e446db54..e54d1f084 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.11", + "version": "1.0.219-alpha.12", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.11", - "@budibase/client": "^1.0.219-alpha.11", - "@budibase/frontend-core": "^1.0.219-alpha.11", - "@budibase/string-templates": "^1.0.219-alpha.11", + "@budibase/bbui": "^1.0.219-alpha.12", + "@budibase/client": "^1.0.219-alpha.12", + "@budibase/frontend-core": "^1.0.219-alpha.12", + "@budibase/string-templates": "^1.0.219-alpha.12", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 541509d77..bad63fae5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.11", + "version": "1.0.219-alpha.12", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index c58aa0690..029ee3f06 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.11", + "version": "1.0.219-alpha.12", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.11", - "@budibase/frontend-core": "^1.0.219-alpha.11", - "@budibase/string-templates": "^1.0.219-alpha.11", + "@budibase/bbui": "^1.0.219-alpha.12", + "@budibase/frontend-core": "^1.0.219-alpha.12", + "@budibase/string-templates": "^1.0.219-alpha.12", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 65926bb6d..5396b47c9 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.11", + "version": "1.0.219-alpha.12", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.11", + "@budibase/bbui": "^1.0.219-alpha.12", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index dc82b6b5b..5b419b8cb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.11", + "version": "1.0.219-alpha.12", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.11", - "@budibase/client": "^1.0.219-alpha.11", + "@budibase/backend-core": "^1.0.219-alpha.12", + "@budibase/client": "^1.0.219-alpha.12", "@budibase/pro": "1.0.219-alpha.11", - "@budibase/string-templates": "^1.0.219-alpha.11", - "@budibase/types": "^1.0.219-alpha.11", + "@budibase/string-templates": "^1.0.219-alpha.12", + "@budibase/types": "^1.0.219-alpha.12", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 3866fe44b..ed9358437 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.11", + "version": "1.0.219-alpha.12", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 71d919e4b..e573d0648 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.11", + "version": "1.0.219-alpha.12", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 57e8a376f..f2b8b8abd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.11", + "version": "1.0.219-alpha.12", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.11", + "@budibase/backend-core": "^1.0.219-alpha.12", "@budibase/pro": "1.0.219-alpha.11", - "@budibase/string-templates": "^1.0.219-alpha.11", - "@budibase/types": "^1.0.219-alpha.11", + "@budibase/string-templates": "^1.0.219-alpha.12", + "@budibase/types": "^1.0.219-alpha.12", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ae9d10164955ea2f60e6029570a0d9e9eb61424b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 8 Jul 2022 08:19:04 +0000 Subject: [PATCH 16/30] Update pro version to 1.0.219-alpha.12 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5b419b8cb..0543f4ead 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.12", "@budibase/client": "^1.0.219-alpha.12", - "@budibase/pro": "1.0.219-alpha.11", + "@budibase/pro": "1.0.219-alpha.12", "@budibase/string-templates": "^1.0.219-alpha.12", "@budibase/types": "^1.0.219-alpha.12", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index f2b8b8abd..6ec225d88 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.12", - "@budibase/pro": "1.0.219-alpha.11", + "@budibase/pro": "1.0.219-alpha.12", "@budibase/string-templates": "^1.0.219-alpha.12", "@budibase/types": "^1.0.219-alpha.12", "@koa/router": "8.0.8", From dfc21184cf9bf8988c7ec84a571399eb8e6db6e9 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 8 Jul 2022 09:29:16 +0100 Subject: [PATCH 17/30] Fixed issue where mutation was causing expression bindings to be lost. Request retries will now have them intact for re-enrichment --- packages/server/src/threads/query.js | 32 ++++++++++++++++------------ 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/packages/server/src/threads/query.js b/packages/server/src/threads/query.js index 7c94c3d25..0fe331c7b 100644 --- a/packages/server/src/threads/query.js +++ b/packages/server/src/threads/query.js @@ -10,6 +10,7 @@ const { } = require("@budibase/backend-core/auth") const { user: userCache } = require("@budibase/backend-core/cache") const { getGlobalIDFromUserMetadataID } = require("../db/utils") +const { cloneDeep } = require("lodash/fp") const { isSQL } = require("../integrations/utils") const { @@ -41,20 +42,22 @@ class QueryRunner { async execute() { let { datasource, fields, queryVerb, transformer } = this - const Integration = integrations[datasource.source] + let datasourceClone = cloneDeep(datasource) + let fieldsClone = cloneDeep(fields) + + const Integration = integrations[datasourceClone.source] if (!Integration) { throw "Integration type does not exist." } - if (datasource.config.authConfigs) { - datasource.config.authConfigs = datasource.config.authConfigs.map( - config => { + if (datasourceClone.config.authConfigs) { + datasourceClone.config.authConfigs = + datasourceClone.config.authConfigs.map(config => { return enrichQueryFields(config, this.ctx) - } - ) + }) } - const integration = new Integration(datasource.config) + const integration = new Integration(datasourceClone.config) // pre-query, make sure datasource variables are added to parameters const parameters = await this.addDatasourceVariables() @@ -65,19 +68,19 @@ class QueryRunner { const enrichedContext = { ...enrichedParameters, ...this.ctx } // Parse global headers - if (datasource.config.defaultHeaders) { - datasource.config.defaultHeaders = enrichQueryFields( - datasource.config.defaultHeaders, + if (datasourceClone.config.defaultHeaders) { + datasourceClone.config.defaultHeaders = enrichQueryFields( + datasourceClone.config.defaultHeaders, enrichedContext ) } let query // handle SQL injections by interpolating the variables - if (isSQL(datasource)) { - query = interpolateSQL(fields, enrichedParameters, integration) + if (isSQL(datasourceClone)) { + query = interpolateSQL(fieldsClone, enrichedParameters, integration) } else { - query = enrichQueryFields(fields, enrichedContext) + query = enrichQueryFields(fieldsClone, enrichedContext) } // Add pagination values for REST queries @@ -116,9 +119,10 @@ class QueryRunner { await this.refreshOAuth2(this.ctx) // Attempt to refresh the access token from the provider this.hasRefreshedOAuth = true + } else { + this.hasRerun = true } - this.hasRerun = true await threadUtils.invalidateDynamicVariables(this.cachedVariables) return this.execute() } From dc4365d70871d724b33c8de0ecdcf40d3764436b Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 8 Jul 2022 08:40:36 +0000 Subject: [PATCH 18/30] v1.0.219-alpha.13 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 84b793b18..427021815 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.12", + "version": "1.0.219-alpha.13", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f84fa48b9..56bc766c0 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.12", + "version": "1.0.219-alpha.13", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.12", + "@budibase/types": "^1.0.219-alpha.13", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e92ca3e2d..1345d67ca 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.12", + "version": "1.0.219-alpha.13", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.12", + "@budibase/string-templates": "^1.0.219-alpha.13", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index e54d1f084..37084ef5a 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.12", + "version": "1.0.219-alpha.13", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.12", - "@budibase/client": "^1.0.219-alpha.12", - "@budibase/frontend-core": "^1.0.219-alpha.12", - "@budibase/string-templates": "^1.0.219-alpha.12", + "@budibase/bbui": "^1.0.219-alpha.13", + "@budibase/client": "^1.0.219-alpha.13", + "@budibase/frontend-core": "^1.0.219-alpha.13", + "@budibase/string-templates": "^1.0.219-alpha.13", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index bad63fae5..36ddcc55a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.12", + "version": "1.0.219-alpha.13", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 029ee3f06..c2b040ed4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.12", + "version": "1.0.219-alpha.13", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.12", - "@budibase/frontend-core": "^1.0.219-alpha.12", - "@budibase/string-templates": "^1.0.219-alpha.12", + "@budibase/bbui": "^1.0.219-alpha.13", + "@budibase/frontend-core": "^1.0.219-alpha.13", + "@budibase/string-templates": "^1.0.219-alpha.13", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 5396b47c9..fccba2ace 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.12", + "version": "1.0.219-alpha.13", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.12", + "@budibase/bbui": "^1.0.219-alpha.13", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 0543f4ead..2da328ecd 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.12", + "version": "1.0.219-alpha.13", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.12", - "@budibase/client": "^1.0.219-alpha.12", + "@budibase/backend-core": "^1.0.219-alpha.13", + "@budibase/client": "^1.0.219-alpha.13", "@budibase/pro": "1.0.219-alpha.12", - "@budibase/string-templates": "^1.0.219-alpha.12", - "@budibase/types": "^1.0.219-alpha.12", + "@budibase/string-templates": "^1.0.219-alpha.13", + "@budibase/types": "^1.0.219-alpha.13", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index ed9358437..cf17148b6 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.12", + "version": "1.0.219-alpha.13", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index e573d0648..d7c61e093 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.12", + "version": "1.0.219-alpha.13", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 6ec225d88..6cc5283f3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.12", + "version": "1.0.219-alpha.13", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.12", + "@budibase/backend-core": "^1.0.219-alpha.13", "@budibase/pro": "1.0.219-alpha.12", - "@budibase/string-templates": "^1.0.219-alpha.12", - "@budibase/types": "^1.0.219-alpha.12", + "@budibase/string-templates": "^1.0.219-alpha.13", + "@budibase/types": "^1.0.219-alpha.13", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 6d1d7e1d813d6c8a38046a7e912388dc6c5390a8 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 8 Jul 2022 08:42:23 +0000 Subject: [PATCH 19/30] Update pro version to 1.0.219-alpha.13 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 2da328ecd..34436f93e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.13", "@budibase/client": "^1.0.219-alpha.13", - "@budibase/pro": "1.0.219-alpha.12", + "@budibase/pro": "1.0.219-alpha.13", "@budibase/string-templates": "^1.0.219-alpha.13", "@budibase/types": "^1.0.219-alpha.13", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 6cc5283f3..e9f0037d5 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.13", - "@budibase/pro": "1.0.219-alpha.12", + "@budibase/pro": "1.0.219-alpha.13", "@budibase/string-templates": "^1.0.219-alpha.13", "@budibase/types": "^1.0.219-alpha.13", "@koa/router": "8.0.8", From 0ee86353480fa8b596fbf68f7d9d2fa04327578a Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 8 Jul 2022 11:09:06 +0100 Subject: [PATCH 20/30] make auth check optional when caller is automation --- .../server/src/api/controllers/query/index.ts | 16 +++++++++------- .../server/src/automations/steps/executeQuery.js | 3 ++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts index ce6eeda7c..b15333f80 100644 --- a/packages/server/src/api/controllers/query/index.ts +++ b/packages/server/src/api/controllers/query/index.ts @@ -166,14 +166,16 @@ export async function preview(ctx: any) { } } -async function execute(ctx: any, opts = { rowsOnly: false }) { +async function execute(ctx: any, opts = { rowsOnly: false, isAutomation: false }) { const db = getAppDB() const query = await db.get(ctx.params.queryId) const datasource = await db.get(query.datasourceId) - - const authConfigCtx: any = getAuthConfig(ctx) - + + let authConfigCtx: any = {} + if (!opts.isAutomation) { + authConfigCtx = getAuthConfig(ctx) + } const enrichedParameters = ctx.request.body.parameters || {} // make sure parameters are fully enriched with defaults if (query && query.parameters) { @@ -214,11 +216,11 @@ async function execute(ctx: any, opts = { rowsOnly: false }) { } export async function executeV1(ctx: any) { - return execute(ctx, { rowsOnly: true }) + return execute(ctx, { rowsOnly: true, isAutomation: false }) } -export async function executeV2(ctx: any) { - return execute(ctx, { rowsOnly: false }) +export async function executeV2(ctx: any, isAutomation?: any) { + return execute(ctx, { rowsOnly: false, isAutomation }) } const removeDynamicVariables = async (queryId: any) => { diff --git a/packages/server/src/automations/steps/executeQuery.js b/packages/server/src/automations/steps/executeQuery.js index 156df504e..b33ed678b 100644 --- a/packages/server/src/automations/steps/executeQuery.js +++ b/packages/server/src/automations/steps/executeQuery.js @@ -71,8 +71,9 @@ exports.run = async function ({ inputs, appId, emitter }) { }, }) + const isAutomation = true try { - await queryController.executeV2(ctx) + await queryController.executeV2(ctx, isAutomation) const { data, ...rest } = ctx.body return { response: data, From 4bf9dda4d6ce16eca5843bab5a80864a22a5b62f Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 8 Jul 2022 11:11:03 +0100 Subject: [PATCH 21/30] linting --- packages/server/src/api/controllers/query/index.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts index b15333f80..ea407dbcd 100644 --- a/packages/server/src/api/controllers/query/index.ts +++ b/packages/server/src/api/controllers/query/index.ts @@ -166,12 +166,15 @@ export async function preview(ctx: any) { } } -async function execute(ctx: any, opts = { rowsOnly: false, isAutomation: false }) { +async function execute( + ctx: any, + opts = { rowsOnly: false, isAutomation: false } +) { const db = getAppDB() const query = await db.get(ctx.params.queryId) const datasource = await db.get(query.datasourceId) - + let authConfigCtx: any = {} if (!opts.isAutomation) { authConfigCtx = getAuthConfig(ctx) From 41d8fa8340dba4b1bad63a562ebf518075edf056 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 8 Jul 2022 11:19:41 +0100 Subject: [PATCH 22/30] Updated query tests to remove altered datasource. Updated messaging for refresh failure messaging --- packages/server/src/api/routes/tests/query.spec.js | 1 - packages/server/src/threads/query.js | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/src/api/routes/tests/query.spec.js b/packages/server/src/api/routes/tests/query.spec.js index 273bdb999..00cae3a9c 100644 --- a/packages/server/src/api/routes/tests/query.spec.js +++ b/packages/server/src/api/routes/tests/query.spec.js @@ -218,7 +218,6 @@ describe("/queries", () => { expect(res.body.schemaFields).toEqual(["a", "b"]) expect(res.body.rows.length).toEqual(1) expect(events.query.previewed).toBeCalledTimes(1) - datasource.config = { schema: "public" } expect(events.query.previewed).toBeCalledWith(datasource, query) }) diff --git a/packages/server/src/threads/query.js b/packages/server/src/threads/query.js index 0fe331c7b..757fdc040 100644 --- a/packages/server/src/threads/query.js +++ b/packages/server/src/threads/query.js @@ -191,8 +191,9 @@ class QueryRunner { } else { // In this event the user may have oAuth issues that // could require re-authenticating with their provider. + let errorMessage = resp.err.data ? resp.err.data : resp.err.toString() throw new Error( - "OAuth2 access token could not be refreshed: " + resp.err.toString() + "OAuth2 access token could not be refreshed: " + errorMessage ) } From 9825f26fb1edf2bf24936e489fab1f88a1ae054a Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Fri, 8 Jul 2022 11:33:11 +0100 Subject: [PATCH 23/30] Cypress: Smoke Build Test Changes More timing related changes to assist with smoke build tests - Increasing timeouts where applicable --- .../integration/addRadioButtons.spec.js | 1 + .../adminAndManagement/userManagement.spec.js | 16 ++++++------ .../cypress/integration/appOverview.spec.js | 7 +++--- .../cypress/integration/createView.spec.js | 1 - .../datasources/postgreSql.spec.js | 10 +++++--- packages/builder/cypress/support/commands.js | 25 +++++++++++-------- 6 files changed, 33 insertions(+), 27 deletions(-) diff --git a/packages/builder/cypress/integration/addRadioButtons.spec.js b/packages/builder/cypress/integration/addRadioButtons.spec.js index 402db195a..578b51934 100644 --- a/packages/builder/cypress/integration/addRadioButtons.spec.js +++ b/packages/builder/cypress/integration/addRadioButtons.spec.js @@ -10,6 +10,7 @@ filterTests(['all'], () => { it("should add Radio Buttons options picker on form, add data, and confirm", () => { cy.navigateToFrontend() + cy.wait(500) cy.addComponent("Form", "Form") cy.addComponent("Form", "Options Picker").then((componentId) => { // Provide field setting diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js index 69f3c2ec1..562e1e149 100644 --- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js +++ b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js @@ -43,7 +43,7 @@ filterTests(["smoke", "all"], () => { const uuid = () => Cypress._.random(0, 1e6) const name = uuid() if(i < 1){ - cy.createApp(name) + cy.createApp(name, false) } else { cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) cy.wait(1000) @@ -56,7 +56,7 @@ filterTests(["smoke", "all"], () => { // Navigate back to the user cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) cy.get(interact.SPECTRUM_SIDENAV).contains("Users").click() - cy.get(interact.SPECTRUM_TABLE, { timeout: 500 }).contains("bbuser").click() + cy.get(interact.SPECTRUM_TABLE, { timeout: 1000 }).contains("bbuser").click() for (let i = 0; i < 3; i++) { cy.get(interact.SPECTRUM_TABLE, { timeout: 3000}) .eq(1) @@ -65,24 +65,24 @@ filterTests(["smoke", "all"], () => { .find(interact.SPECTRUM_TABLE_CELL) .eq(0) .click() - cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 500 }) + cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 1000 }) .contains("Choose an option") .click() .then(() => { if (i == 0) { - cy.get(interact.SPECTRUM_MENU, { timeout: 1000 }).contains("Admin").click({ force: true }) + cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Admin").click({ force: true }) } else if (i == 1) { - cy.get(interact.SPECTRUM_MENU, { timeout: 1000 }).contains("Power").click({ force: true }) + cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Power").click({ force: true }) } else if (i == 2) { - cy.get(interact.SPECTRUM_MENU, { timeout: 1000 }).contains("Basic").click({ force: true }) + cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Basic").click({ force: true }) } - cy.get(interact.SPECTRUM_BUTTON, { timeout: 1000 }) + cy.get(interact.SPECTRUM_BUTTON, { timeout: 2000 }) .contains("Update role") .click({ force: true }) }) - cy.reload() + cy.reload({ timeout: 5000 }) cy.wait(1000) } // Confirm roles exist within Configure roles table diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js index 5856786bc..dbfce3ce6 100644 --- a/packages/builder/cypress/integration/appOverview.spec.js +++ b/packages/builder/cypress/integration/appOverview.spec.js @@ -6,7 +6,7 @@ filterTests(["all"], () => { before(() => { cy.login() cy.deleteAllApps() - cy.createTestApp() + cy.createApp("Cypress Tests") }) it("Should be accessible from the applications list", () => { @@ -82,13 +82,14 @@ filterTests(["all"], () => { }) it("Should reflect the app deployment state", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) + cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) cy.get(".appTable .app-row-actions button") .contains("Edit") .eq(0) .click({ force: true }) - cy.get(".toprightnav button.spectrum-Button") + cy.wait(500) + cy.get(".toprightnav button.spectrum-Button", { timeout: 2000 }) .contains("Publish") .click({ force: true }) cy.get(".spectrum-Modal [data-cy='deploy-app-modal']") diff --git a/packages/builder/cypress/integration/createView.spec.js b/packages/builder/cypress/integration/createView.spec.js index a2d09d97b..9adc486f7 100644 --- a/packages/builder/cypress/integration/createView.spec.js +++ b/packages/builder/cypress/integration/createView.spec.js @@ -5,7 +5,6 @@ filterTests(['smoke', 'all'], () => { context("Create a View", () => { before(() => { cy.login() - cy.createTestApp() cy.createTable("data") cy.addColumn("data", "group", "Text") diff --git a/packages/builder/cypress/integration/datasources/postgreSql.spec.js b/packages/builder/cypress/integration/datasources/postgreSql.spec.js index 15e31308f..ccecfbd5d 100644 --- a/packages/builder/cypress/integration/datasources/postgreSql.spec.js +++ b/packages/builder/cypress/integration/datasources/postgreSql.spec.js @@ -217,20 +217,21 @@ filterTests(["all"], () => { it("should edit a query name", () => { // Access query - cy.get(".hierarchy-items-container") + cy.get(".hierarchy-items-container", { timeout: 2000 }) .contains(queryName + " (1)") .click() // Rename query - cy.get(".spectrum-Form-item") + cy.wait(1000) + cy.get(".spectrum-Form-item", { timeout: 2000 }) .eq(0) .within(() => { cy.get("input").clear().type(queryRename) }) // Run and Save query - cy.get(".spectrum-Button").contains("Run Query").click({ force: true }) - cy.wait(500) + cy.get(".spectrum-Button", { timeout: 2000 }).contains("Run Query").click({ force: true }) + cy.wait(1000) cy.get(".spectrum-Button", { timeout: 2000 }).contains("Save Query").click({ force: true }) cy.reload({ timeout: 5000 }) cy.get(".nav-item", { timeout: 2000 }).should("contain", queryRename) @@ -250,6 +251,7 @@ filterTests(["all"], () => { .contains("Delete Query") .click({ force: true }) // Confirm deletion + cy.reload({ timeout: 5000 }) cy.get(".nav-item", { timeout: 1000 }).should("not.contain", queryName) }) diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js index 6f05b2a9f..b2ab8e678 100644 --- a/packages/builder/cypress/support/commands.js +++ b/packages/builder/cypress/support/commands.js @@ -403,17 +403,19 @@ Cypress.Commands.add("createAppFromScratch", appName => { Cypress.Commands.add("createTable", (tableName, initialTable) => { if (!initialTable) { cy.navigateToDataSection() - cy.get(`[data-cy="new-table"]`).click() + cy.get(`[data-cy="new-table"]`, { timeout: 2000 }).click() } cy.wait(2000) - cy.get(".item") + cy.get(".item", { timeout: 2000 }) .contains("Budibase DB") .click({ force: true }) .then(() => { - cy.get(".spectrum-Button").contains("Continue").click({ force: true }) + cy.get(".spectrum-Button", { timeout: 2000 }) + .contains("Continue") + .click({ force: true }) }) - cy.get(".spectrum-Modal").within(() => { - cy.get("input", { timeout: 1000 }).first().type(tableName).blur() + cy.get(".spectrum-Modal", { timeout: 2000 }).within(() => { + cy.get("input", { timeout: 2000 }).first().type(tableName).blur() cy.get(".spectrum-ButtonGroup").contains("Create").click() }) cy.contains(tableName).should("be.visible") @@ -507,12 +509,13 @@ Cypress.Commands.add("addCustomSourceOptions", totalOptions => { // DESIGN AREA Cypress.Commands.add("addComponent", (category, component) => { if (category) { - cy.get(`[data-cy="category-${category}"]`, { timeout: 1000 }).click({ + cy.get(`[data-cy="category-${category}"]`, { timeout: 3000 }).click({ force: true, }) } + cy.wait(500) if (component) { - cy.get(`[data-cy="component-${component}"]`, { timeout: 1000 }).click({ + cy.get(`[data-cy="component-${component}"]`, { timeout: 3000 }).click({ force: true, }) } @@ -520,7 +523,7 @@ Cypress.Commands.add("addComponent", (category, component) => { cy.location().then(loc => { const params = loc.pathname.split("/") const componentId = params[params.length - 1] - cy.getComponent(componentId).should("exist") + cy.getComponent(componentId, { timeout: 3000 }).should("exist") return cy.wrap(componentId) }) }) @@ -624,8 +627,8 @@ Cypress.Commands.add("navigateToFrontend", () => { // Clicks on Design tab and then the Home nav item cy.wait(500) cy.contains("Design").click() - cy.get(".spectrum-Search").type("/") - cy.get(".nav-item").contains("home").click() + cy.get(".spectrum-Search", { timeout: 2000 }).type("/") + cy.get(".nav-item", { timeout: 2000 }).contains("home").click() }) Cypress.Commands.add("navigateToDataSection", () => { @@ -785,7 +788,7 @@ Cypress.Commands.add("createRestQuery", (method, restUrl, queryPrettyName) => { // MISC Cypress.Commands.add("closeModal", () => { - cy.get(".spectrum-Modal").within(() => { + cy.get(".spectrum-Modal", { timeout: 2000 }).within(() => { cy.get(".close-icon").click() cy.wait(1000) // Wait for modal to close }) From 76708282a3962fee90223d408dd212302c51c19d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 8 Jul 2022 11:01:57 +0000 Subject: [PATCH 24/30] v1.0.219-alpha.14 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 427021815..4302b135c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.13", + "version": "1.0.219-alpha.14", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 56bc766c0..786f19584 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.13", + "version": "1.0.219-alpha.14", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.13", + "@budibase/types": "^1.0.219-alpha.14", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 1345d67ca..50df080a7 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.13", + "version": "1.0.219-alpha.14", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.13", + "@budibase/string-templates": "^1.0.219-alpha.14", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 37084ef5a..fb71e8b65 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.13", + "version": "1.0.219-alpha.14", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.13", - "@budibase/client": "^1.0.219-alpha.13", - "@budibase/frontend-core": "^1.0.219-alpha.13", - "@budibase/string-templates": "^1.0.219-alpha.13", + "@budibase/bbui": "^1.0.219-alpha.14", + "@budibase/client": "^1.0.219-alpha.14", + "@budibase/frontend-core": "^1.0.219-alpha.14", + "@budibase/string-templates": "^1.0.219-alpha.14", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 36ddcc55a..f612e5203 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.13", + "version": "1.0.219-alpha.14", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index c2b040ed4..842e5bec4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.13", + "version": "1.0.219-alpha.14", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.13", - "@budibase/frontend-core": "^1.0.219-alpha.13", - "@budibase/string-templates": "^1.0.219-alpha.13", + "@budibase/bbui": "^1.0.219-alpha.14", + "@budibase/frontend-core": "^1.0.219-alpha.14", + "@budibase/string-templates": "^1.0.219-alpha.14", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index fccba2ace..107a76ef0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.13", + "version": "1.0.219-alpha.14", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.13", + "@budibase/bbui": "^1.0.219-alpha.14", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 34436f93e..71d91f8e0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.13", + "version": "1.0.219-alpha.14", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.13", - "@budibase/client": "^1.0.219-alpha.13", + "@budibase/backend-core": "^1.0.219-alpha.14", + "@budibase/client": "^1.0.219-alpha.14", "@budibase/pro": "1.0.219-alpha.13", - "@budibase/string-templates": "^1.0.219-alpha.13", - "@budibase/types": "^1.0.219-alpha.13", + "@budibase/string-templates": "^1.0.219-alpha.14", + "@budibase/types": "^1.0.219-alpha.14", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index cf17148b6..7c8cf36bd 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.13", + "version": "1.0.219-alpha.14", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index d7c61e093..f41e8db81 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.13", + "version": "1.0.219-alpha.14", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index e9f0037d5..946b7231c 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.13", + "version": "1.0.219-alpha.14", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.13", + "@budibase/backend-core": "^1.0.219-alpha.14", "@budibase/pro": "1.0.219-alpha.13", - "@budibase/string-templates": "^1.0.219-alpha.13", - "@budibase/types": "^1.0.219-alpha.13", + "@budibase/string-templates": "^1.0.219-alpha.14", + "@budibase/types": "^1.0.219-alpha.14", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 54d46fe3db80f080da630931baa32bd23a387bc4 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 8 Jul 2022 11:03:42 +0000 Subject: [PATCH 25/30] Update pro version to 1.0.219-alpha.14 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 71d91f8e0..232bed8ff 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.14", "@budibase/client": "^1.0.219-alpha.14", - "@budibase/pro": "1.0.219-alpha.13", + "@budibase/pro": "1.0.219-alpha.14", "@budibase/string-templates": "^1.0.219-alpha.14", "@budibase/types": "^1.0.219-alpha.14", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 946b7231c..0fee7d2e3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.14", - "@budibase/pro": "1.0.219-alpha.13", + "@budibase/pro": "1.0.219-alpha.14", "@budibase/string-templates": "^1.0.219-alpha.14", "@budibase/types": "^1.0.219-alpha.14", "@koa/router": "8.0.8", From 218abe39ccb83d5eadeba137d7bb6aca11ebbfbd Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 8 Jul 2022 12:16:27 +0100 Subject: [PATCH 26/30] add isAutomation to object --- packages/server/src/api/controllers/query/index.ts | 9 ++++++--- packages/server/src/automations/steps/executeQuery.js | 3 +-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts index ea407dbcd..8dcf57034 100644 --- a/packages/server/src/api/controllers/query/index.ts +++ b/packages/server/src/api/controllers/query/index.ts @@ -168,7 +168,7 @@ export async function preview(ctx: any) { async function execute( ctx: any, - opts = { rowsOnly: false, isAutomation: false } + opts: any = { rowsOnly: false, isAutomation: false } ) { const db = getAppDB() @@ -219,10 +219,13 @@ async function execute( } export async function executeV1(ctx: any) { - return execute(ctx, { rowsOnly: true, isAutomation: false }) + return execute(ctx, { rowsOnly: true }) } -export async function executeV2(ctx: any, isAutomation?: any) { +export async function executeV2( + ctx: any, + { isAutomation }: { isAutomation?: boolean } = {} +) { return execute(ctx, { rowsOnly: false, isAutomation }) } diff --git a/packages/server/src/automations/steps/executeQuery.js b/packages/server/src/automations/steps/executeQuery.js index b33ed678b..30f74e17b 100644 --- a/packages/server/src/automations/steps/executeQuery.js +++ b/packages/server/src/automations/steps/executeQuery.js @@ -71,9 +71,8 @@ exports.run = async function ({ inputs, appId, emitter }) { }, }) - const isAutomation = true try { - await queryController.executeV2(ctx, isAutomation) + await queryController.executeV2(ctx, { isAutomation: true }) const { data, ...rest } = ctx.body return { response: data, From 66ddcc18b4410188b02023e665eed0b84c7dff39 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 8 Jul 2022 12:12:41 +0000 Subject: [PATCH 27/30] v1.0.219-alpha.15 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 4302b135c..318495acb 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.14", + "version": "1.0.219-alpha.15", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 786f19584..342db867a 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.14", + "version": "1.0.219-alpha.15", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.14", + "@budibase/types": "^1.0.219-alpha.15", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 50df080a7..6ae309ad5 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.14", + "version": "1.0.219-alpha.15", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.14", + "@budibase/string-templates": "^1.0.219-alpha.15", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index fb71e8b65..aae01d8f2 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.14", + "version": "1.0.219-alpha.15", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.14", - "@budibase/client": "^1.0.219-alpha.14", - "@budibase/frontend-core": "^1.0.219-alpha.14", - "@budibase/string-templates": "^1.0.219-alpha.14", + "@budibase/bbui": "^1.0.219-alpha.15", + "@budibase/client": "^1.0.219-alpha.15", + "@budibase/frontend-core": "^1.0.219-alpha.15", + "@budibase/string-templates": "^1.0.219-alpha.15", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index f612e5203..d136e9bff 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.14", + "version": "1.0.219-alpha.15", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 842e5bec4..2242adba5 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.14", + "version": "1.0.219-alpha.15", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.14", - "@budibase/frontend-core": "^1.0.219-alpha.14", - "@budibase/string-templates": "^1.0.219-alpha.14", + "@budibase/bbui": "^1.0.219-alpha.15", + "@budibase/frontend-core": "^1.0.219-alpha.15", + "@budibase/string-templates": "^1.0.219-alpha.15", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 107a76ef0..ecee5d961 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.14", + "version": "1.0.219-alpha.15", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.14", + "@budibase/bbui": "^1.0.219-alpha.15", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index 232bed8ff..3d49fdf68 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.14", + "version": "1.0.219-alpha.15", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.14", - "@budibase/client": "^1.0.219-alpha.14", + "@budibase/backend-core": "^1.0.219-alpha.15", + "@budibase/client": "^1.0.219-alpha.15", "@budibase/pro": "1.0.219-alpha.14", - "@budibase/string-templates": "^1.0.219-alpha.14", - "@budibase/types": "^1.0.219-alpha.14", + "@budibase/string-templates": "^1.0.219-alpha.15", + "@budibase/types": "^1.0.219-alpha.15", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 7c8cf36bd..2db243fb5 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.14", + "version": "1.0.219-alpha.15", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index f41e8db81..c88534890 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.14", + "version": "1.0.219-alpha.15", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 0fee7d2e3..6c979c181 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.14", + "version": "1.0.219-alpha.15", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.14", + "@budibase/backend-core": "^1.0.219-alpha.15", "@budibase/pro": "1.0.219-alpha.14", - "@budibase/string-templates": "^1.0.219-alpha.14", - "@budibase/types": "^1.0.219-alpha.14", + "@budibase/string-templates": "^1.0.219-alpha.15", + "@budibase/types": "^1.0.219-alpha.15", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 474948d27cc00438812fcbd9081a3511af17c38e Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 8 Jul 2022 12:14:13 +0000 Subject: [PATCH 28/30] Update pro version to 1.0.219-alpha.15 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 3d49fdf68..ac8223aba 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.15", "@budibase/client": "^1.0.219-alpha.15", - "@budibase/pro": "1.0.219-alpha.14", + "@budibase/pro": "1.0.219-alpha.15", "@budibase/string-templates": "^1.0.219-alpha.15", "@budibase/types": "^1.0.219-alpha.15", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 6c979c181..e0b53828b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.15", - "@budibase/pro": "1.0.219-alpha.14", + "@budibase/pro": "1.0.219-alpha.15", "@budibase/string-templates": "^1.0.219-alpha.15", "@budibase/types": "^1.0.219-alpha.15", "@koa/router": "8.0.8", From 2e50ccf547daf4bb0282faa72bef39ed65fdf78f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 8 Jul 2022 12:31:06 +0000 Subject: [PATCH 29/30] v1.0.219-alpha.16 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 2 +- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lerna.json b/lerna.json index 318495acb..53939d3bd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.0.219-alpha.15", + "version": "1.0.219-alpha.16", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 342db867a..bf47aaae8 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.0.219-alpha.15", + "version": "1.0.219-alpha.16", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -20,7 +20,7 @@ "test:watch": "jest --watchAll" }, "dependencies": { - "@budibase/types": "^1.0.219-alpha.15", + "@budibase/types": "^1.0.219-alpha.16", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", "bcrypt": "5.0.1", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6ae309ad5..d569614d6 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "1.0.219-alpha.15", + "version": "1.0.219-alpha.16", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "^1.2.1", - "@budibase/string-templates": "^1.0.219-alpha.15", + "@budibase/string-templates": "^1.0.219-alpha.16", "@spectrum-css/actionbutton": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/avatar": "^3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index aae01d8f2..8aa08ca7d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.0.219-alpha.15", + "version": "1.0.219-alpha.16", "license": "GPL-3.0", "private": true, "scripts": { @@ -69,10 +69,10 @@ } }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.15", - "@budibase/client": "^1.0.219-alpha.15", - "@budibase/frontend-core": "^1.0.219-alpha.15", - "@budibase/string-templates": "^1.0.219-alpha.15", + "@budibase/bbui": "^1.0.219-alpha.16", + "@budibase/client": "^1.0.219-alpha.16", + "@budibase/frontend-core": "^1.0.219-alpha.16", + "@budibase/string-templates": "^1.0.219-alpha.16", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index d136e9bff..1fbb876fc 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.0.219-alpha.15", + "version": "1.0.219-alpha.16", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { diff --git a/packages/client/package.json b/packages/client/package.json index 2242adba5..cdbf663be 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.0.219-alpha.15", + "version": "1.0.219-alpha.16", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.15", - "@budibase/frontend-core": "^1.0.219-alpha.15", - "@budibase/string-templates": "^1.0.219-alpha.15", + "@budibase/bbui": "^1.0.219-alpha.16", + "@budibase/frontend-core": "^1.0.219-alpha.16", + "@budibase/string-templates": "^1.0.219-alpha.16", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index ecee5d961..beb3eec08 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.0.219-alpha.15", + "version": "1.0.219-alpha.16", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "^1.0.219-alpha.15", + "@budibase/bbui": "^1.0.219-alpha.16", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index ac8223aba..9be7b0066 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.0.219-alpha.15", + "version": "1.0.219-alpha.16", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -77,11 +77,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "^1.0.219-alpha.15", - "@budibase/client": "^1.0.219-alpha.15", + "@budibase/backend-core": "^1.0.219-alpha.16", + "@budibase/client": "^1.0.219-alpha.16", "@budibase/pro": "1.0.219-alpha.15", - "@budibase/string-templates": "^1.0.219-alpha.15", - "@budibase/types": "^1.0.219-alpha.15", + "@budibase/string-templates": "^1.0.219-alpha.16", + "@budibase/types": "^1.0.219-alpha.16", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 2db243fb5..96dc3aa96 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.0.219-alpha.15", + "version": "1.0.219-alpha.16", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index c88534890..997b95955 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.0.219-alpha.15", + "version": "1.0.219-alpha.16", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index e0b53828b..4fb37e23d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.0.219-alpha.15", + "version": "1.0.219-alpha.16", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -34,10 +34,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "^1.0.219-alpha.15", + "@budibase/backend-core": "^1.0.219-alpha.16", "@budibase/pro": "1.0.219-alpha.15", - "@budibase/string-templates": "^1.0.219-alpha.15", - "@budibase/types": "^1.0.219-alpha.15", + "@budibase/string-templates": "^1.0.219-alpha.16", + "@budibase/types": "^1.0.219-alpha.16", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From ce24807c32b7dcfb7bdc9325ed161b3beee099b6 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Fri, 8 Jul 2022 12:32:33 +0000 Subject: [PATCH 30/30] Update pro version to 1.0.219-alpha.16 --- packages/server/package.json | 2 +- packages/worker/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 9be7b0066..667194f03 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -79,7 +79,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "^1.0.219-alpha.16", "@budibase/client": "^1.0.219-alpha.16", - "@budibase/pro": "1.0.219-alpha.15", + "@budibase/pro": "1.0.219-alpha.16", "@budibase/string-templates": "^1.0.219-alpha.16", "@budibase/types": "^1.0.219-alpha.16", "@bull-board/api": "3.7.0", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4fb37e23d..42e6f1fff 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -35,7 +35,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "^1.0.219-alpha.16", - "@budibase/pro": "1.0.219-alpha.15", + "@budibase/pro": "1.0.219-alpha.16", "@budibase/string-templates": "^1.0.219-alpha.16", "@budibase/types": "^1.0.219-alpha.16", "@koa/router": "8.0.8",