MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/user-side-panel-ux-updates

This commit is contained in:
Dean 2023-05-02 14:35:38 +01:00
parent bb98160317 003ac1c380
commit f7ce1bf15d
18 changed files with 48 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.5.6-alpha.41", "version": "2.5.6-alpha.42",
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"packages": ["packages/*"], "packages": ["packages/*"],

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/backend-core", "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", "description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js", "main": "dist/src/index.js",
"types": "dist/src/index.d.ts", "types": "dist/src/index.d.ts",
@ -24,7 +24,7 @@
"dependencies": { "dependencies": {
"@budibase/nano": "10.1.2", "@budibase/nano": "10.1.2",
"@budibase/pouchdb-replication-stream": "1.2.10", "@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", "@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",
"aws-cloudfront-sign": "2.2.0", "aws-cloudfront-sign": "2.2.0",

1
packages/backend-core/tests/core/utilities/structures/licenses.ts
View File

@ -28,7 +28,6 @@ export const plan = (type: PlanType = PlanType.FREE): PurchasedPlan => {
return { return {
type, type,
usesInvoicing: false, usesInvoicing: false,
minUsers: 1,
model: PlanModel.PER_USER, model: PlanModel.PER_USER,
price: price(), price: price(),
} }

6
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/bbui", "name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.", "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", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"module": "dist/bbui.es.js", "module": "dist/bbui.es.js",
@ -38,8 +38,8 @@
], ],
"dependencies": { "dependencies": {
"@adobe/spectrum-css-workflow-icons": "1.2.1", "@adobe/spectrum-css-workflow-icons": "1.2.1",
"@budibase/shared-core": "2.5.6-alpha.41", "@budibase/shared-core": "2.5.6-alpha.42",
"@budibase/string-templates": "2.5.6-alpha.41", "@budibase/string-templates": "2.5.6-alpha.42",
"@spectrum-css/accordion": "3.0.24", "@spectrum-css/accordion": "3.0.24",
"@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/actiongroup": "1.0.1",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "2.5.6-alpha.41", "version": "2.5.6-alpha.42",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -58,10 +58,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "2.5.6-alpha.41", "@budibase/bbui": "2.5.6-alpha.42",
"@budibase/frontend-core": "2.5.6-alpha.41", "@budibase/frontend-core": "2.5.6-alpha.42",
"@budibase/shared-core": "2.5.6-alpha.41", "@budibase/shared-core": "2.5.6-alpha.42",
"@budibase/string-templates": "2.5.6-alpha.41", "@budibase/string-templates": "2.5.6-alpha.42",
"@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/fontawesome-svg-core": "^6.2.1",
"@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1",
"@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1",

2
packages/builder/src/components/usage/Usage.svelte
View File

@ -27,7 +27,7 @@
onMount(() => { onMount(() => {
unlimited = isUnlimited() unlimited = isUnlimited()
percentage = getPercentage() percentage = getPercentage()
if (warnWhenFull && percentage === 100) { if (warnWhenFull && percentage >= 100) {
showWarning = true showWarning = true
} }
}) })

8
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "2.5.6-alpha.41", "version": "2.5.6-alpha.42",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {
@ -29,9 +29,9 @@
"outputPath": "build" "outputPath": "build"
}, },
"dependencies": { "dependencies": {
"@budibase/backend-core": "2.5.6-alpha.41", "@budibase/backend-core": "2.5.6-alpha.42",
"@budibase/string-templates": "2.5.6-alpha.41", "@budibase/string-templates": "2.5.6-alpha.42",
"@budibase/types": "2.5.6-alpha.41", "@budibase/types": "2.5.6-alpha.42",
"axios": "0.21.2", "axios": "0.21.2",
"chalk": "4.1.0", "chalk": "4.1.0",
"cli-progress": "3.11.2", "cli-progress": "3.11.2",

12
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "2.5.6-alpha.41", "version": "2.5.6-alpha.42",
"license": "MPL-2.0", "license": "MPL-2.0",
"module": "dist/budibase-client.js", "module": "dist/budibase-client.js",
"main": "dist/budibase-client.js", "main": "dist/budibase-client.js",
@ -19,11 +19,11 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "2.5.6-alpha.41", "@budibase/bbui": "2.5.6-alpha.42",
"@budibase/frontend-core": "2.5.6-alpha.41", "@budibase/frontend-core": "2.5.6-alpha.42",
"@budibase/shared-core": "2.5.6-alpha.41", "@budibase/shared-core": "2.5.6-alpha.42",
"@budibase/string-templates": "2.5.6-alpha.41", "@budibase/string-templates": "2.5.6-alpha.42",
"@budibase/types": "2.5.6-alpha.41", "@budibase/types": "2.5.6-alpha.42",
"@spectrum-css/button": "^3.0.3", "@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3", "@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3", "@spectrum-css/divider": "^1.0.3",

6
packages/frontend-core/package.json
View File

@ -1,13 +1,13 @@
{ {
"name": "@budibase/frontend-core", "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", "description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",
"svelte": "src/index.js", "svelte": "src/index.js",
"dependencies": { "dependencies": {
"@budibase/bbui": "2.5.6-alpha.41", "@budibase/bbui": "2.5.6-alpha.42",
"@budibase/shared-core": "2.5.6-alpha.41", "@budibase/shared-core": "2.5.6-alpha.42",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"socket.io-client": "^4.6.1", "socket.io-client": "^4.6.1",

2
packages/sdk/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/sdk", "name": "@budibase/sdk",
"version": "2.5.6-alpha.41", "version": "2.5.6-alpha.42",
"description": "Budibase Public API SDK", "description": "Budibase Public API SDK",
"author": "Budibase", "author": "Budibase",
"license": "MPL-2.0", "license": "MPL-2.0",

14
packages/server/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/server", "name": "@budibase/server",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "2.5.6-alpha.41", "version": "2.5.6-alpha.42",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -45,12 +45,12 @@
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@apidevtools/swagger-parser": "10.0.3", "@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "2.5.6-alpha.41", "@budibase/backend-core": "2.5.6-alpha.42",
"@budibase/client": "2.5.6-alpha.41", "@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.41", "@budibase/shared-core": "2.5.6-alpha.42",
"@budibase/string-templates": "2.5.6-alpha.41", "@budibase/string-templates": "2.5.6-alpha.42",
"@budibase/types": "2.5.6-alpha.41", "@budibase/types": "2.5.6-alpha.42",
"@bull-board/api": "3.7.0", "@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4", "@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0", "@elastic/elasticsearch": "7.10.0",

4
packages/shared-core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/shared-core", "name": "@budibase/shared-core",
"version": "2.5.6-alpha.41", "version": "2.5.6-alpha.42",
"description": "Shared data utils", "description": "Shared data utils",
"main": "dist/cjs/src/index.js", "main": "dist/cjs/src/index.js",
"types": "dist/mjs/src/index.d.ts", "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\"" "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
}, },
"dependencies": { "dependencies": {
"@budibase/types": "2.5.6-alpha.41" "@budibase/types": "2.5.6-alpha.42"
}, },
"devDependencies": { "devDependencies": {
"concurrently": "^7.6.0", "concurrently": "^7.6.0",

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/string-templates", "name": "@budibase/string-templates",
"version": "2.5.6-alpha.41", "version": "2.5.6-alpha.42",
"description": "Handlebars wrapper for Budibase templating.", "description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs", "main": "src/index.cjs",
"module": "dist/bundle.mjs", "module": "dist/bundle.mjs",

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/types", "name": "@budibase/types",
"version": "2.5.6-alpha.41", "version": "2.5.6-alpha.42",
"description": "Budibase types", "description": "Budibase types",
"main": "dist/cjs/index.js", "main": "dist/cjs/index.js",
"types": "dist/mjs/index.d.ts", "types": "dist/mjs/index.d.ts",

2
packages/types/src/sdk/licensing/plan.ts
View File

@ -17,7 +17,6 @@ export enum PriceDuration {
export interface AvailablePlan { export interface AvailablePlan {
type: PlanType type: PlanType
maxUsers: number maxUsers: number
minUsers: number
prices: AvailablePrice[] prices: AvailablePrice[]
} }
@ -38,7 +37,6 @@ export interface PurchasedPlan {
type: PlanType type: PlanType
model: PlanModel model: PlanModel
usesInvoicing: boolean usesInvoicing: boolean
minUsers: number
price?: PurchasedPrice price?: PurchasedPrice
} }

6
packages/types/src/sdk/licensing/quota.ts
View File

@ -55,12 +55,6 @@ export const isConstantQuota = (
return quotaType === QuotaType.CONSTANT 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 PlanQuotas = { [key in PlanType]: Quotas | undefined }
export type MonthlyQuotas = { export type MonthlyQuotas = {

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "@budibase/worker", "name": "@budibase/worker",
"email": "hi@budibase.com", "email": "hi@budibase.com",
"version": "2.5.6-alpha.41", "version": "2.5.6-alpha.42",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -37,10 +37,10 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "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/pro": "2.5.6-alpha.42",
"@budibase/string-templates": "2.5.6-alpha.41", "@budibase/string-templates": "2.5.6-alpha.42",
"@budibase/types": "2.5.6-alpha.41", "@budibase/types": "2.5.6-alpha.42",
"@koa/router": "8.0.8", "@koa/router": "8.0.8",
"@sentry/node": "6.17.7", "@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2", "@techpass/passport-openidconnect": "0.3.2",

12
yarn.lock
View File

@ -1486,15 +1486,15 @@
pouchdb-promise "^6.0.4" pouchdb-promise "^6.0.4"
through2 "^2.0.0" through2 "^2.0.0"
"@budibase/pro@2.5.6-alpha.40": "@budibase/pro@2.5.6-alpha.41":
version "2.5.6-alpha.40" version "2.5.6-alpha.41"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.40.tgz#96e85d22b61425bfd055377864938245c6ef17ec" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.5.6-alpha.41.tgz#2632b398159211bf64bf6caff9753c877b6fc09d"
integrity sha512-hWKPVbGbjWcO3evIViICOL6g4hsv051lwUqCLRdZnSIiKCPlrr5JSsiINFinMHof55rHK5LALbGzJL4Ju82UeQ== integrity sha512-8Zfm+RtcXY77gdXXHti8QT+Vt+1ApuVqYL3KCkxBVbpzgQci/F3mipNXUX8bEy/y+QYAdgn6psDTWAqyr9VALg==
dependencies: 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/shared-core" "2.4.44-alpha.1"
"@budibase/string-templates" "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" "@koa/router" "8.0.8"
bull "4.10.1" bull "4.10.1"
joi "17.6.0" joi "17.6.0"