From 5b47a66098798f932cef1f7c7bc33c0bc6ea930e Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 9 Jun 2022 11:13:52 +0100 Subject: [PATCH 01/65] Use executeV2 External Data Connector --- .../src/automations/steps/executeQuery.js | 2 +- packages/server/yarn.lock | 18 +++++++++--------- packages/worker/yarn.lock | 18 +++++++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/server/src/automations/steps/executeQuery.js b/packages/server/src/automations/steps/executeQuery.js index 99c2c40783..156df504e9 100644 --- a/packages/server/src/automations/steps/executeQuery.js +++ b/packages/server/src/automations/steps/executeQuery.js @@ -72,7 +72,7 @@ exports.run = async function ({ inputs, appId, emitter }) { }) try { - await queryController.executeV1(ctx) + await queryController.executeV2(ctx) const { data, ...rest } = ctx.body return { response: data, diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index cf9f013aa6..775765e4e8 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1014,10 +1014,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.197": - version "1.0.197" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.197.tgz#3458d70c6d44376b7930672d6af8c6e89ddf4069" - integrity sha512-Cgzr1bJWKRg3+jqte7rnKPziWiH5Q+r/piRvHuD7EVmh2+xJLfWUz9iml72aFfcgRIOX8SyhejG7KTwxILx/vg== +"@budibase/backend-core@1.0.198": + version "1.0.198" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.198.tgz#4b9a4dc4dabc73da31b5f95e38c6cfd2c87bfd09" + integrity sha512-IYTY3yuZQ0YVFy4v9zqX0L3ZhFowzY40DgthfbdCbdwHiaoLFpSi0+ynLHxholz3a7eCTcW6M5a3dHqy4kXtIQ== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -1092,12 +1092,12 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.0.197": - version "1.0.197" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.197.tgz#a171b46bb8ee6251881ae9262136270533b3958d" - integrity sha512-SCVKjNgpzefmrXnLmkpQJLvYViykyzA6B9TwL7qrb6fBeXwAiSZ3hXGjNgZkVpy/v43hccPWt9BJFzFp457wgQ== +"@budibase/pro@1.0.198": + version "1.0.198" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.198.tgz#b585e269e12317ede722e2b3814329bc63b60185" + integrity sha512-ow3R2MZZKwTsAZQ8knPQsVdzS28frAP5/csj0rW1O53mOsVu6K5LZLJMlZ72cLsLDZPHKtAku7Xgb+b+YWtbvA== dependencies: - "@budibase/backend-core" "1.0.197" + "@budibase/backend-core" "1.0.198" node-fetch "^2.6.1" "@budibase/standard-components@^0.9.139": diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 977725108a..ab3baaf823 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -293,10 +293,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.0.197": - version "1.0.197" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.197.tgz#3458d70c6d44376b7930672d6af8c6e89ddf4069" - integrity sha512-Cgzr1bJWKRg3+jqte7rnKPziWiH5Q+r/piRvHuD7EVmh2+xJLfWUz9iml72aFfcgRIOX8SyhejG7KTwxILx/vg== +"@budibase/backend-core@1.0.198": + version "1.0.198" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.0.198.tgz#4b9a4dc4dabc73da31b5f95e38c6cfd2c87bfd09" + integrity sha512-IYTY3yuZQ0YVFy4v9zqX0L3ZhFowzY40DgthfbdCbdwHiaoLFpSi0+ynLHxholz3a7eCTcW6M5a3dHqy4kXtIQ== dependencies: "@techpass/passport-openidconnect" "^0.3.0" aws-sdk "^2.901.0" @@ -322,12 +322,12 @@ uuid "^8.3.2" zlib "^1.0.5" -"@budibase/pro@1.0.197": - version "1.0.197" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.197.tgz#a171b46bb8ee6251881ae9262136270533b3958d" - integrity sha512-SCVKjNgpzefmrXnLmkpQJLvYViykyzA6B9TwL7qrb6fBeXwAiSZ3hXGjNgZkVpy/v43hccPWt9BJFzFp457wgQ== +"@budibase/pro@1.0.198": + version "1.0.198" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.0.198.tgz#b585e269e12317ede722e2b3814329bc63b60185" + integrity sha512-ow3R2MZZKwTsAZQ8knPQsVdzS28frAP5/csj0rW1O53mOsVu6K5LZLJMlZ72cLsLDZPHKtAku7Xgb+b+YWtbvA== dependencies: - "@budibase/backend-core" "1.0.197" + "@budibase/backend-core" "1.0.198" node-fetch "^2.6.1" "@cspotcode/source-map-consumer@0.8.0": From 9905d000f443be5d8745beba3cd44409cf108daa Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 10 Jun 2022 11:04:17 +0100 Subject: [PATCH 02/65] Update basic user onboarding modal to be readonly rather than disabled and lighten disabled state text --- packages/bbui/src/Form/Core/TextField.svelte | 4 ++++ .../manage/users/_components/BasicOnboardingModal.svelte | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/bbui/src/Form/Core/TextField.svelte b/packages/bbui/src/Form/Core/TextField.svelte index 6a64876a2c..0a723c140a 100644 --- a/packages/bbui/src/Form/Core/TextField.svelte +++ b/packages/bbui/src/Form/Core/TextField.svelte @@ -112,4 +112,8 @@ .spectrum-Textfield { width: 100%; } + input:disabled { + color: var(--spectrum-global-color-gray-600) !important; + -webkit-text-fill-color: var(--spectrum-global-color-gray-600) !important; + } diff --git a/packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte index a4b06f45a2..c9d4798696 100644 --- a/packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte +++ b/packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte @@ -51,7 +51,7 @@ bind:value={$email} error={$touched && $error} /> - +
From 4219b2251a46ca1e63425d8b87bc480250536732 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 10 Jun 2022 12:15:58 +0100 Subject: [PATCH 03/65] Add new styles setting to button to use update spectrum styles --- packages/bbui/src/Button/Button.svelte | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/bbui/src/Button/Button.svelte b/packages/bbui/src/Button/Button.svelte index e8f6b4500e..36abcbf4da 100644 --- a/packages/bbui/src/Button/Button.svelte +++ b/packages/bbui/src/Button/Button.svelte @@ -14,6 +14,7 @@ export let active = false export let tooltip = undefined export let dataCy + export let newStyles = false let showTooltip = false @@ -25,6 +26,7 @@ class:spectrum-Button--warning={warning} class:spectrum-Button--overBackground={overBackground} class:spectrum-Button--quiet={quiet} + class:new-styles={newStyles} class:active class="spectrum-Button spectrum-Button--size{size.toUpperCase()}" {disabled} @@ -93,4 +95,20 @@ padding-left: var(--spacing-m); line-height: 0; } + .spectrum-Button--primary.new-styles { + background: var(--spectrum-global-color-gray-800); + border-color: transparent; + color: var(--spectrum-global-color-gray-50); + } + .spectrum-Button--primary.new-styles:hover { + background: var(--spectrum-global-color-gray-900); + } + .spectrum-Button--secondary.new-styles { + background: var(--spectrum-global-color-gray-200); + border-color: transparent; + color: var(--spectrum-global-color-gray-900); + } + .spectrum-Button--secondary.new-styles:hover { + background: var(--spectrum-global-color-gray-300); + } From 3a33f5b376c460d80f9f3c8b9208fb11c8a2d04d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 10 Jun 2022 12:16:28 +0100 Subject: [PATCH 04/65] Update apps list page and app rows to match new styles and behaviours --- .../src/components/common/AppLockModal.svelte | 6 +- .../src/components/start/AppRow.svelte | 53 ++----- .../pages/builder/portal/apps/index.svelte | 141 +----------------- 3 files changed, 20 insertions(+), 180 deletions(-) diff --git a/packages/builder/src/components/common/AppLockModal.svelte b/packages/builder/src/components/common/AppLockModal.svelte index 75e2b15925..5ca35f05db 100644 --- a/packages/builder/src/components/common/AppLockModal.svelte +++ b/packages/builder/src/components/common/AppLockModal.svelte @@ -87,7 +87,7 @@ {#if lockedByYou && getExpiryDuration(app) > 0} {processStringSync( - "This lock will expire in {{ duration time 'millisecond' }} from now", + "This lock will expire in {{ duration time 'millisecond' }} from now.", { time: getExpiryDuration(app), } @@ -141,4 +141,8 @@ gap: var(--spacing-s); max-width: 175px; } + .lock-status-text { + font-weight: 400; + color: var(--spectrum-global-color-gray-800); + } diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index d30b8079d7..49f99c9f77 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -1,18 +1,11 @@
@@ -20,7 +13,7 @@
-
appOverview(app)}> +
editApp(app)}> {app.name} @@ -37,7 +30,7 @@ {/if}
- +
@@ -52,47 +45,27 @@
+ -
- - - - - {#if app.lockedYou} - releaseLock(app)} icon="LockOpen"> - Release lock - - {/if} - exportApp(app)} icon="Download">Export - {#if app.deployed} - unpublishApp(app)} icon="GlobeRemove"> - Unpublish - - copyAppId(app)} icon="Copy"> - Copy App ID - - {/if} - {#if !app.deployed} - updateApp(app)} icon="Edit">Edit - deleteApp(app)} icon="Delete">Delete - {/if} - editIcon(app)} icon="Brush">Edit icon -