diff --git a/lerna.json b/lerna.json index 0603adfc2f..ccb391b7f9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.4.8-alpha.6", + "version": "1.4.8-alpha.7", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 34b6f1609e..31b10d9b1f 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "1.4.8-alpha.6", + "version": "1.4.8-alpha.7", "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.4.8-alpha.6", + "@budibase/types": "1.4.8-alpha.7", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-sdk": "2.1030.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 23dd18988b..0e9b1f2899 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.4.8-alpha.6", + "version": "1.4.8-alpha.7", "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.4.8-alpha.6", + "@budibase/string-templates": "1.4.8-alpha.7", "@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 e6f60b1241..ce6b8f5022 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "1.4.8-alpha.6", + "version": "1.4.8-alpha.7", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "1.4.8-alpha.6", - "@budibase/client": "1.4.8-alpha.6", - "@budibase/frontend-core": "1.4.8-alpha.6", - "@budibase/string-templates": "1.4.8-alpha.6", + "@budibase/bbui": "1.4.8-alpha.7", + "@budibase/client": "1.4.8-alpha.7", + "@budibase/frontend-core": "1.4.8-alpha.7", + "@budibase/string-templates": "1.4.8-alpha.7", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte b/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte index 8e4033b017..eedecb0412 100644 --- a/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte +++ b/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte @@ -18,8 +18,8 @@ let paymentFailedModal let accountDowngradeModal let userLoaded = false - let loaded = false let licensingLoaded = false + let domLoaded = false let currentModalCfg = null const processModals = () => { @@ -82,12 +82,18 @@ } } + $: if (!userLoaded && $auth.user) { + userLoaded = true + } + $: if ( userLoaded && - licensingLoaded && - loaded && + $licensing.usageMetrics && + domLoaded && + !licensingLoaded && isEnabled(TENANT_FEATURE_FLAGS.LICENSING) ) { + licensingLoaded = true queuedModals = processModals() queuedBanners = getBanners() showNextModal() @@ -95,18 +101,7 @@ } onMount(async () => { - auth.subscribe(state => { - if (state.user && !userLoaded) { - userLoaded = true - } - }) - - licensing.subscribe(state => { - if (state.usageMetrics && !licensingLoaded) { - licensingLoaded = true - } - }) - loaded = true + domLoaded = true }) diff --git a/packages/builder/src/pages/builder/portal/apps/create.svelte b/packages/builder/src/pages/builder/portal/apps/create.svelte index 8635d48cec..8fff6e7f10 100644 --- a/packages/builder/src/pages/builder/portal/apps/create.svelte +++ b/packages/builder/src/pages/builder/portal/apps/create.svelte @@ -45,7 +45,7 @@ }) const initiateAppCreation = () => { - if ($licensing.usageMetrics.apps >= 100) { + if ($licensing?.usageMetrics?.apps >= 100) { appLimitModal.show() } else { template = null @@ -60,7 +60,7 @@ } const initiateAppImport = () => { - if ($licensing.usageMetrics.apps >= 100) { + if ($licensing?.usageMetrics?.apps >= 100) { appLimitModal.show() } else { template = { fromFile: true } diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index e4cacada81..99721e980d 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -127,7 +127,7 @@ } const initiateAppCreation = async () => { - if ($licensing.usageMetrics.apps >= 100) { + if ($licensing?.usageMetrics?.apps >= 100) { appLimitModal.show() } else if ($apps?.length) { $goto("/builder/portal/apps/create") diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index f8f3f53a3e..d927555ceb 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -17,7 +17,7 @@ export const createLicensingStore = () => { // the currently used quotas from the db quotaUsage: undefined, // derived quota metrics for percentages used - usageMetrics: {}, + usageMetrics: undefined, // quota reset quotaResetDaysRemaining: undefined, quotaResetDate: undefined, diff --git a/packages/cli/package.json b/packages/cli/package.json index f15ecde936..efe2967b4e 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "1.4.8-alpha.6", + "version": "1.4.8-alpha.7", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "1.4.8-alpha.6", - "@budibase/string-templates": "1.4.8-alpha.6", - "@budibase/types": "1.4.8-alpha.6", + "@budibase/backend-core": "1.4.8-alpha.7", + "@budibase/string-templates": "1.4.8-alpha.7", + "@budibase/types": "1.4.8-alpha.7", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index a4d9865716..1bab3c8247 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "1.4.8-alpha.6", + "version": "1.4.8-alpha.7", "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.4.8-alpha.6", - "@budibase/frontend-core": "1.4.8-alpha.6", - "@budibase/string-templates": "1.4.8-alpha.6", + "@budibase/bbui": "1.4.8-alpha.7", + "@budibase/frontend-core": "1.4.8-alpha.7", + "@budibase/string-templates": "1.4.8-alpha.7", "@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 8bbf353557..db0f29a5f2 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "1.4.8-alpha.6", + "version": "1.4.8-alpha.7", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "1.4.8-alpha.6", + "@budibase/bbui": "1.4.8-alpha.7", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/server/package.json b/packages/server/package.json index cb8dd051c7..15b8b68b01 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "1.4.8-alpha.6", + "version": "1.4.8-alpha.7", "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.4.8-alpha.6", - "@budibase/client": "1.4.8-alpha.6", - "@budibase/pro": "1.4.8-alpha.6", - "@budibase/string-templates": "1.4.8-alpha.6", - "@budibase/types": "1.4.8-alpha.6", + "@budibase/backend-core": "1.4.8-alpha.7", + "@budibase/client": "1.4.8-alpha.7", + "@budibase/pro": "1.4.8-alpha.7", + "@budibase/string-templates": "1.4.8-alpha.7", + "@budibase/types": "1.4.8-alpha.7", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index c2c7c2b298..58caaaabef 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1094,12 +1094,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.4.8-alpha.6": - version "1.4.8-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.6.tgz#d0f1971abe8bf46ee194381e7ff3b197872305e4" - integrity sha512-ufDFSyG3DPIh+rfLCVlZDTU+UaJ2viMSIGz0k+/9S262wmpBAc4VIPgY4+6Aagxi7iiyphVxJ4rej0oWc6czmw== +"@budibase/backend-core@1.4.8-alpha.7": + version "1.4.8-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.7.tgz#0343897cabb7a134fff937615819a670000a6945" + integrity sha512-+60D0mVrRWxS+yHy0lNYD7mATUAEQgN5ExobWGO44rzmSMOnAobVHhnANy4bI/p2x3KPxk5ERvJNmOmMcIeUzQ== dependencies: - "@budibase/types" "1.4.8-alpha.6" + "@budibase/types" "1.4.8-alpha.7" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -1180,13 +1180,13 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/pro@1.4.8-alpha.6": - version "1.4.8-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.6.tgz#8754f9d656f518505c37ad3e5988bbf668a14563" - integrity sha512-b1X+kBI2S8viSpWa/lcU8a9IxYntTeCKyQ/4e8yX+ulEyqWjuG7eRPrd2DiiQSgMCQu2hmRYtJTTyQrgVm0QqA== +"@budibase/pro@1.4.8-alpha.7": + version "1.4.8-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.7.tgz#00b87c2e26983ad9bd8a1aa28fc29b71341d42e4" + integrity sha512-zMfjDoHbzg4GvecedY+MqhK0wQ3qdbjv82z7mGU+Xo9PDVM+SKCwHO5qqHqweCZWamVyeCMn7yjf4a+TpM+iSg== dependencies: - "@budibase/backend-core" "1.4.8-alpha.6" - "@budibase/types" "1.4.8-alpha.6" + "@budibase/backend-core" "1.4.8-alpha.7" + "@budibase/types" "1.4.8-alpha.7" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" @@ -1209,10 +1209,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@1.4.8-alpha.6": - version "1.4.8-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.6.tgz#f4f1e3be1d70a62b06ab70a22257d927c028cd48" - integrity sha512-DIXAJ3XxL3aEUiAcOfySV7NjhgxWwBEZ/1ls8En3UwT8mdlhVwHCb5tODSqEOF3Ib7Cyjzw1EI43uEyO8F1xdA== +"@budibase/types@1.4.8-alpha.7": + version "1.4.8-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.7.tgz#98c705e387b9f6b0d0b784b5d49a753d34f34bac" + integrity sha512-XH+dnVGtic2+3fHI1fiFQUOQ2m7rQWaJBuPeZRRKyDZ2pTuLAaiGxHjOEJ+AhIs0d/TSusGNSuObLvFMHrclHQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 7912b3717f..103ff7f86a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "1.4.8-alpha.6", + "version": "1.4.8-alpha.7", "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 53cb400338..11620d609f 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "1.4.8-alpha.6", + "version": "1.4.8-alpha.7", "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 27f47ff656..5ff11699db 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "1.4.8-alpha.6", + "version": "1.4.8-alpha.7", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "1.4.8-alpha.6", - "@budibase/pro": "1.4.8-alpha.6", - "@budibase/string-templates": "1.4.8-alpha.6", - "@budibase/types": "1.4.8-alpha.6", + "@budibase/backend-core": "1.4.8-alpha.7", + "@budibase/pro": "1.4.8-alpha.7", + "@budibase/string-templates": "1.4.8-alpha.7", + "@budibase/types": "1.4.8-alpha.7", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 91ca8deda2..0950015a9f 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -291,12 +291,12 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@1.4.8-alpha.6": - version "1.4.8-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.6.tgz#d0f1971abe8bf46ee194381e7ff3b197872305e4" - integrity sha512-ufDFSyG3DPIh+rfLCVlZDTU+UaJ2viMSIGz0k+/9S262wmpBAc4VIPgY4+6Aagxi7iiyphVxJ4rej0oWc6czmw== +"@budibase/backend-core@1.4.8-alpha.7": + version "1.4.8-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.7.tgz#0343897cabb7a134fff937615819a670000a6945" + integrity sha512-+60D0mVrRWxS+yHy0lNYD7mATUAEQgN5ExobWGO44rzmSMOnAobVHhnANy4bI/p2x3KPxk5ERvJNmOmMcIeUzQ== dependencies: - "@budibase/types" "1.4.8-alpha.6" + "@budibase/types" "1.4.8-alpha.7" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-sdk "2.1030.0" @@ -327,21 +327,21 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/pro@1.4.8-alpha.6": - version "1.4.8-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.6.tgz#8754f9d656f518505c37ad3e5988bbf668a14563" - integrity sha512-b1X+kBI2S8viSpWa/lcU8a9IxYntTeCKyQ/4e8yX+ulEyqWjuG7eRPrd2DiiQSgMCQu2hmRYtJTTyQrgVm0QqA== +"@budibase/pro@1.4.8-alpha.7": + version "1.4.8-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.7.tgz#00b87c2e26983ad9bd8a1aa28fc29b71341d42e4" + integrity sha512-zMfjDoHbzg4GvecedY+MqhK0wQ3qdbjv82z7mGU+Xo9PDVM+SKCwHO5qqHqweCZWamVyeCMn7yjf4a+TpM+iSg== dependencies: - "@budibase/backend-core" "1.4.8-alpha.6" - "@budibase/types" "1.4.8-alpha.6" + "@budibase/backend-core" "1.4.8-alpha.7" + "@budibase/types" "1.4.8-alpha.7" "@koa/router" "8.0.8" joi "17.6.0" node-fetch "^2.6.1" -"@budibase/types@1.4.8-alpha.6": - version "1.4.8-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.6.tgz#f4f1e3be1d70a62b06ab70a22257d927c028cd48" - integrity sha512-DIXAJ3XxL3aEUiAcOfySV7NjhgxWwBEZ/1ls8En3UwT8mdlhVwHCb5tODSqEOF3Ib7Cyjzw1EI43uEyO8F1xdA== +"@budibase/types@1.4.8-alpha.7": + version "1.4.8-alpha.7" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.7.tgz#98c705e387b9f6b0d0b784b5d49a753d34f34bac" + integrity sha512-XH+dnVGtic2+3fHI1fiFQUOQ2m7rQWaJBuPeZRRKyDZ2pTuLAaiGxHjOEJ+AhIs0d/TSusGNSuObLvFMHrclHQ== "@cspotcode/source-map-consumer@0.8.0": version "0.8.0"