From 38d0fd943ae50b8105495ba21427d265512b25bc Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Sat, 29 Apr 2023 22:06:41 +0100 Subject: [PATCH 1/4] Remove business minimum quantity from backend --- .../tests/core/utilities/structures/licenses.ts | 1 - packages/types/src/sdk/licensing/plan.ts | 2 -- packages/types/src/sdk/licensing/quota.ts | 6 ------ yarn.lock | 12 ++++++------ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/packages/backend-core/tests/core/utilities/structures/licenses.ts b/packages/backend-core/tests/core/utilities/structures/licenses.ts index 38392925d9..810f31cf4f 100644 --- a/packages/backend-core/tests/core/utilities/structures/licenses.ts +++ b/packages/backend-core/tests/core/utilities/structures/licenses.ts @@ -28,7 +28,6 @@ export const plan = (type: PlanType = PlanType.FREE): PurchasedPlan => { return { type, usesInvoicing: false, - minUsers: 1, model: PlanModel.PER_USER, price: price(), } diff --git a/packages/types/src/sdk/licensing/plan.ts b/packages/types/src/sdk/licensing/plan.ts index 360d7d08e5..3e214a01ff 100644 --- a/packages/types/src/sdk/licensing/plan.ts +++ b/packages/types/src/sdk/licensing/plan.ts @@ -17,7 +17,6 @@ export enum PriceDuration { export interface AvailablePlan { type: PlanType maxUsers: number - minUsers: number prices: AvailablePrice[] } @@ -38,7 +37,6 @@ export interface PurchasedPlan { type: PlanType model: PlanModel usesInvoicing: boolean - minUsers: number price?: PurchasedPrice } diff --git a/packages/types/src/sdk/licensing/quota.ts b/packages/types/src/sdk/licensing/quota.ts index ea51f7a490..73afa1ed05 100644 --- a/packages/types/src/sdk/licensing/quota.ts +++ b/packages/types/src/sdk/licensing/quota.ts @@ -55,12 +55,6 @@ export const isConstantQuota = ( return quotaType === QuotaType.CONSTANT } -export interface Minimums { - users: number -} - -export type PlanMinimums = { [key in PlanType]: Minimums } - export type PlanQuotas = { [key in PlanType]: Quotas | undefined } export type MonthlyQuotas = { diff --git a/yarn.lock b/yarn.lock index cf8e311c3a..3b403d6444 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ pouchdb-promise "^6.0.4" through2 "^2.0.0" -"@budibase/pro@2.5.6-alpha.40": - version "2.5.6-alpha.40" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.40.tgz#96e85d22b61425bfd055377864938245c6ef17ec" - integrity sha512-hWKPVbGbjWcO3evIViICOL6g4hsv051lwUqCLRdZnSIiKCPlrr5JSsiINFinMHof55rHK5LALbGzJL4Ju82UeQ== +"@budibase/pro@2.5.6-alpha.41": + version "2.5.6-alpha.41" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.41.tgz#2632b398159211bf64bf6caff9753c877b6fc09d" + integrity sha512-8Zfm+RtcXY77gdXXHti8QT+Vt+1ApuVqYL3KCkxBVbpzgQci/F3mipNXUX8bEy/y+QYAdgn6psDTWAqyr9VALg== dependencies: - "@budibase/backend-core" "2.5.6-alpha.40" + "@budibase/backend-core" "2.5.6-alpha.41" "@budibase/shared-core" "2.4.44-alpha.1" "@budibase/string-templates" "2.4.44-alpha.1" - "@budibase/types" "2.5.6-alpha.40" + "@budibase/types" "2.5.6-alpha.41" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" From bad6eb30f4191fdb529388416e148378f87a100c Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Sun, 30 Apr 2023 22:57:08 +0100 Subject: [PATCH 2/4] Update usage bar to warn when greater than 100% --- packages/builder/src/components/usage/Usage.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/usage/Usage.svelte b/packages/builder/src/components/usage/Usage.svelte index 6e81abfe63..23d8ddc2f3 100644 --- a/packages/builder/src/components/usage/Usage.svelte +++ b/packages/builder/src/components/usage/Usage.svelte @@ -27,7 +27,7 @@ onMount(() => { unlimited = isUnlimited() percentage = getPercentage() - if (warnWhenFull && percentage === 100) { + if (warnWhenFull && percentage >= 100) { showWarning = true } }) From 9f7b212f2223ee6a7ba3e4abe78bb2740730d45f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 2 May 2023 08:44:05 +0000 Subject: [PATCH 3/4] v2.5.6-alpha.42 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 12 ++++++------ packages/frontend-core/package.json | 6 +++--- packages/sdk/package.json | 2 +- packages/server/package.json | 12 ++++++------ packages/shared-core/package.json | 4 ++-- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lerna.json b/lerna.json index 0c65845ddb..5ad64883d4 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "npmClient": "yarn", "useWorkspaces": true, "packages": ["packages/*"], diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 63ef522827..1302568db5 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -24,7 +24,7 @@ "dependencies": { "@budibase/nano": "10.1.2", "@budibase/pouchdb-replication-stream": "1.2.10", - "@budibase/types": "2.5.6-alpha.41", + "@budibase/types": "2.5.6-alpha.42", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4b0c3cb588..ff82bbc2c4 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/shared-core": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/shared-core": "2.5.6-alpha.42", + "@budibase/string-templates": "2.5.6-alpha.42", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 8b8c5a25fe..0015174bcf 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "license": "GPL-3.0", "private": true, "scripts": { @@ -58,10 +58,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.41", - "@budibase/frontend-core": "2.5.6-alpha.41", - "@budibase/shared-core": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", + "@budibase/bbui": "2.5.6-alpha.42", + "@budibase/frontend-core": "2.5.6-alpha.42", + "@budibase/shared-core": "2.5.6-alpha.42", + "@budibase/string-templates": "2.5.6-alpha.42", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 96aab6c687..87f8885baa 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "dist/index.js", "bin": { @@ -29,9 +29,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", - "@budibase/types": "2.5.6-alpha.41", + "@budibase/backend-core": "2.5.6-alpha.42", + "@budibase/string-templates": "2.5.6-alpha.42", + "@budibase/types": "2.5.6-alpha.42", "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 cc6d913791..7ff0ddae9c 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,11 +19,11 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.5.6-alpha.41", - "@budibase/frontend-core": "2.5.6-alpha.41", - "@budibase/shared-core": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", - "@budibase/types": "2.5.6-alpha.41", + "@budibase/bbui": "2.5.6-alpha.42", + "@budibase/frontend-core": "2.5.6-alpha.42", + "@budibase/shared-core": "2.5.6-alpha.42", + "@budibase/string-templates": "2.5.6-alpha.42", + "@budibase/types": "2.5.6-alpha.42", "@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 22b516fb26..c0b60cb091 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,13 +1,13 @@ { "name": "@budibase/frontend-core", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.5.6-alpha.41", - "@budibase/shared-core": "2.5.6-alpha.41", + "@budibase/bbui": "2.5.6-alpha.42", + "@budibase/shared-core": "2.5.6-alpha.42", "dayjs": "^1.11.7", "lodash": "^4.17.21", "socket.io-client": "^4.6.1", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 4e3128a840..13cc20f9e9 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 4969f7ee53..c33af6ea45 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -45,12 +45,12 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.5.6-alpha.41", - "@budibase/client": "2.5.6-alpha.41", + "@budibase/backend-core": "2.5.6-alpha.42", + "@budibase/client": "2.5.6-alpha.42", "@budibase/pro": "2.5.6-alpha.41", - "@budibase/shared-core": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", - "@budibase/types": "2.5.6-alpha.41", + "@budibase/shared-core": "2.5.6-alpha.42", + "@budibase/string-templates": "2.5.6-alpha.42", + "@budibase/types": "2.5.6-alpha.42", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json index 1b7e52a064..4ea3deea5f 100644 --- a/packages/shared-core/package.json +++ b/packages/shared-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/shared-core", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Shared data utils", "main": "dist/cjs/src/index.js", "types": "dist/mjs/src/index.d.ts", @@ -20,7 +20,7 @@ "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\"" }, "dependencies": { - "@budibase/types": "2.5.6-alpha.41" + "@budibase/types": "2.5.6-alpha.42" }, "devDependencies": { "concurrently": "^7.6.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 606ed0c367..e1397182dc 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "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 95573987bc..3068068d4c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase types", "main": "dist/cjs/index.js", "types": "dist/mjs/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index e6b47c34ba..0d47c30299 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.5.6-alpha.41", + "version": "2.5.6-alpha.42", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -37,10 +37,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.5.6-alpha.41", + "@budibase/backend-core": "2.5.6-alpha.42", "@budibase/pro": "2.5.6-alpha.41", - "@budibase/string-templates": "2.5.6-alpha.41", - "@budibase/types": "2.5.6-alpha.41", + "@budibase/string-templates": "2.5.6-alpha.42", + "@budibase/types": "2.5.6-alpha.42", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 003ac1c380c7dd88b2b8baa7fdfb9bc59992e03f Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 2 May 2023 08:45:36 +0000 Subject: [PATCH 4/4] Update pro version to 2.5.6-alpha.42 --- 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 c33af6ea45..cc8a8208dc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -47,7 +47,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.5.6-alpha.42", "@budibase/client": "2.5.6-alpha.42", - "@budibase/pro": "2.5.6-alpha.41", + "@budibase/pro": "2.5.6-alpha.42", "@budibase/shared-core": "2.5.6-alpha.42", "@budibase/string-templates": "2.5.6-alpha.42", "@budibase/types": "2.5.6-alpha.42", diff --git a/packages/worker/package.json b/packages/worker/package.json index 0d47c30299..ae9358f084 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -38,7 +38,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.5.6-alpha.42", - "@budibase/pro": "2.5.6-alpha.41", + "@budibase/pro": "2.5.6-alpha.42", "@budibase/string-templates": "2.5.6-alpha.42", "@budibase/types": "2.5.6-alpha.42", "@koa/router": "8.0.8",