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

Merge branch 'develop' of github.com:Budibase/budibase into group-fixes

This commit is contained in:
Michael Drury 2022-09-24 17:04:31 +01:00
parent 1485aa6eb7 e4200c0f5d
commit 70c3c1b8d8
17 changed files with 77 additions and 82 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": "1.4.8-alpha.6", "version": "1.4.8-alpha.7",
"npmClient": "yarn", "npmClient": "yarn",
"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": "1.4.8-alpha.6", "version": "1.4.8-alpha.7",
"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",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll" "test:watch": "jest --watchAll"
}, },
"dependencies": { "dependencies": {
"@budibase/types": "1.4.8-alpha.6", "@budibase/types": "1.4.8-alpha.7",
"@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-sdk": "2.1030.0", "aws-sdk": "2.1030.0",

4
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": "1.4.8-alpha.6", "version": "1.4.8-alpha.7",
"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,7 +38,7 @@
], ],
"dependencies": { "dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1", "@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/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1", "@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2", "@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/builder", "name": "@budibase/builder",
"version": "1.4.8-alpha.6", "version": "1.4.8-alpha.7",
"license": "GPL-3.0", "license": "GPL-3.0",
"private": true, "private": true,
"scripts": { "scripts": {
@ -71,10 +71,10 @@
} }
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "1.4.8-alpha.6", "@budibase/bbui": "1.4.8-alpha.7",
"@budibase/client": "1.4.8-alpha.6", "@budibase/client": "1.4.8-alpha.7",
"@budibase/frontend-core": "1.4.8-alpha.6", "@budibase/frontend-core": "1.4.8-alpha.7",
"@budibase/string-templates": "1.4.8-alpha.6", "@budibase/string-templates": "1.4.8-alpha.7",
"@sentry/browser": "5.19.1", "@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1", "@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1", "@spectrum-css/vars": "^3.0.1",

25
packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
View File

@ -18,8 +18,8 @@
let paymentFailedModal let paymentFailedModal
let accountDowngradeModal let accountDowngradeModal
let userLoaded = false let userLoaded = false
let loaded = false
let licensingLoaded = false let licensingLoaded = false
let domLoaded = false
let currentModalCfg = null let currentModalCfg = null
const processModals = () => { const processModals = () => {
@ -82,12 +82,18 @@
} }
} }
$: if (!userLoaded && $auth.user) {
userLoaded = true
}
$: if ( $: if (
userLoaded && userLoaded &&
licensingLoaded && $licensing.usageMetrics &&
loaded && domLoaded &&
!licensingLoaded &&
isEnabled(TENANT_FEATURE_FLAGS.LICENSING) isEnabled(TENANT_FEATURE_FLAGS.LICENSING)
) { ) {
licensingLoaded = true
queuedModals = processModals() queuedModals = processModals()
queuedBanners = getBanners() queuedBanners = getBanners()
showNextModal() showNextModal()
@ -95,18 +101,7 @@
} }
onMount(async () => { onMount(async () => {
auth.subscribe(state => { domLoaded = true
if (state.user && !userLoaded) {
userLoaded = true
}
})
licensing.subscribe(state => {
if (state.usageMetrics && !licensingLoaded) {
licensingLoaded = true
}
})
loaded = true
}) })
</script> </script>

4
packages/builder/src/pages/builder/portal/apps/create.svelte
View File

@ -45,7 +45,7 @@
}) })
const initiateAppCreation = () => { const initiateAppCreation = () => {
if ($licensing.usageMetrics.apps >= 100) { if ($licensing?.usageMetrics?.apps >= 100) {
appLimitModal.show() appLimitModal.show()
} else { } else {
template = null template = null
@ -60,7 +60,7 @@
} }
const initiateAppImport = () => { const initiateAppImport = () => {
if ($licensing.usageMetrics.apps >= 100) { if ($licensing?.usageMetrics?.apps >= 100) {
appLimitModal.show() appLimitModal.show()
} else { } else {
template = { fromFile: true } template = { fromFile: true }

2
packages/builder/src/pages/builder/portal/apps/index.svelte
View File

@ -127,7 +127,7 @@
} }
const initiateAppCreation = async () => { const initiateAppCreation = async () => {
if ($licensing.usageMetrics.apps >= 100) { if ($licensing?.usageMetrics?.apps >= 100) {
appLimitModal.show() appLimitModal.show()
} else if ($apps?.length) { } else if ($apps?.length) {
$goto("/builder/portal/apps/create") $goto("/builder/portal/apps/create")

2
packages/builder/src/stores/portal/licensing.js
View File

@ -17,7 +17,7 @@ export const createLicensingStore = () => {
// the currently used quotas from the db // the currently used quotas from the db
quotaUsage: undefined, quotaUsage: undefined,
// derived quota metrics for percentages used // derived quota metrics for percentages used
usageMetrics: {}, usageMetrics: undefined,
// quota reset // quota reset
quotaResetDaysRemaining: undefined, quotaResetDaysRemaining: undefined,
quotaResetDate: undefined, quotaResetDate: undefined,

8
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/cli", "name": "@budibase/cli",
"version": "1.4.8-alpha.6", "version": "1.4.8-alpha.7",
"description": "Budibase CLI, for developers, self hosting and migrations.", "description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js", "main": "src/index.js",
"bin": { "bin": {
@ -26,9 +26,9 @@
"outputPath": "build" "outputPath": "build"
}, },
"dependencies": { "dependencies": {
"@budibase/backend-core": "1.4.8-alpha.6", "@budibase/backend-core": "1.4.8-alpha.7",
"@budibase/string-templates": "1.4.8-alpha.6", "@budibase/string-templates": "1.4.8-alpha.7",
"@budibase/types": "1.4.8-alpha.6", "@budibase/types": "1.4.8-alpha.7",
"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",

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@budibase/client", "name": "@budibase/client",
"version": "1.4.8-alpha.6", "version": "1.4.8-alpha.7",
"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,9 +19,9 @@
"dev:builder": "rollup -cw" "dev:builder": "rollup -cw"
}, },
"dependencies": { "dependencies": {
"@budibase/bbui": "1.4.8-alpha.6", "@budibase/bbui": "1.4.8-alpha.7",
"@budibase/frontend-core": "1.4.8-alpha.6", "@budibase/frontend-core": "1.4.8-alpha.7",
"@budibase/string-templates": "1.4.8-alpha.6", "@budibase/string-templates": "1.4.8-alpha.7",
"@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",

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

@ -1,12 +1,12 @@
{ {
"name": "@budibase/frontend-core", "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", "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": "1.4.8-alpha.6", "@budibase/bbui": "1.4.8-alpha.7",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"svelte": "^3.46.2" "svelte": "^3.46.2"
} }

12
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": "1.4.8-alpha.6", "version": "1.4.8-alpha.7",
"description": "Budibase Web Server", "description": "Budibase Web Server",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -77,11 +77,11 @@
"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": "1.4.8-alpha.6", "@budibase/backend-core": "1.4.8-alpha.7",
"@budibase/client": "1.4.8-alpha.6", "@budibase/client": "1.4.8-alpha.7",
"@budibase/pro": "1.4.8-alpha.6", "@budibase/pro": "1.4.8-alpha.7",
"@budibase/string-templates": "1.4.8-alpha.6", "@budibase/string-templates": "1.4.8-alpha.7",
"@budibase/types": "1.4.8-alpha.6", "@budibase/types": "1.4.8-alpha.7",
"@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",

30
packages/server/yarn.lock
View File

@ -1094,12 +1094,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.8-alpha.6": "@budibase/backend-core@1.4.8-alpha.7":
version "1.4.8-alpha.6" version "1.4.8-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.6.tgz#d0f1971abe8bf46ee194381e7ff3b197872305e4" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.7.tgz#0343897cabb7a134fff937615819a670000a6945"
integrity sha512-ufDFSyG3DPIh+rfLCVlZDTU+UaJ2viMSIGz0k+/9S262wmpBAc4VIPgY4+6Aagxi7iiyphVxJ4rej0oWc6czmw== integrity sha512-+60D0mVrRWxS+yHy0lNYD7mATUAEQgN5ExobWGO44rzmSMOnAobVHhnANy4bI/p2x3KPxk5ERvJNmOmMcIeUzQ==
dependencies: dependencies:
"@budibase/types" "1.4.8-alpha.6" "@budibase/types" "1.4.8-alpha.7"
"@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-sdk "2.1030.0" aws-sdk "2.1030.0"
@ -1180,13 +1180,13 @@
svelte-flatpickr "^3.2.3" svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0" svelte-portal "^1.0.0"
"@budibase/pro@1.4.8-alpha.6": "@budibase/pro@1.4.8-alpha.7":
version "1.4.8-alpha.6" version "1.4.8-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.6.tgz#8754f9d656f518505c37ad3e5988bbf668a14563" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.7.tgz#00b87c2e26983ad9bd8a1aa28fc29b71341d42e4"
integrity sha512-b1X+kBI2S8viSpWa/lcU8a9IxYntTeCKyQ/4e8yX+ulEyqWjuG7eRPrd2DiiQSgMCQu2hmRYtJTTyQrgVm0QqA== integrity sha512-zMfjDoHbzg4GvecedY+MqhK0wQ3qdbjv82z7mGU+Xo9PDVM+SKCwHO5qqHqweCZWamVyeCMn7yjf4a+TpM+iSg==
dependencies: dependencies:
"@budibase/backend-core" "1.4.8-alpha.6" "@budibase/backend-core" "1.4.8-alpha.7"
"@budibase/types" "1.4.8-alpha.6" "@budibase/types" "1.4.8-alpha.7"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
joi "17.6.0" joi "17.6.0"
node-fetch "^2.6.1" node-fetch "^2.6.1"
@ -1209,10 +1209,10 @@
svelte-apexcharts "^1.0.2" svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0" svelte-flatpickr "^3.1.0"
"@budibase/types@1.4.8-alpha.6": "@budibase/types@1.4.8-alpha.7":
version "1.4.8-alpha.6" version "1.4.8-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.6.tgz#f4f1e3be1d70a62b06ab70a22257d927c028cd48" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.7.tgz#98c705e387b9f6b0d0b784b5d49a753d34f34bac"
integrity sha512-DIXAJ3XxL3aEUiAcOfySV7NjhgxWwBEZ/1ls8En3UwT8mdlhVwHCb5tODSqEOF3Ib7Cyjzw1EI43uEyO8F1xdA== integrity sha512-XH+dnVGtic2+3fHI1fiFQUOQ2m7rQWaJBuPeZRRKyDZ2pTuLAaiGxHjOEJ+AhIs0d/TSusGNSuObLvFMHrclHQ==
"@bull-board/api@3.7.0": "@bull-board/api@3.7.0":
version "3.7.0" version "3.7.0"

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

@ -1,6 +1,6 @@
{ {
"name": "@budibase/string-templates", "name": "@budibase/string-templates",
"version": "1.4.8-alpha.6", "version": "1.4.8-alpha.7",
"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": "1.4.8-alpha.6", "version": "1.4.8-alpha.7",
"description": "Budibase types", "description": "Budibase types",
"main": "dist/index.js", "main": "dist/index.js",
"types": "dist/index.d.ts", "types": "dist/index.d.ts",

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": "1.4.8-alpha.6", "version": "1.4.8-alpha.7",
"description": "Budibase background service", "description": "Budibase background service",
"main": "src/index.ts", "main": "src/index.ts",
"repository": { "repository": {
@ -36,10 +36,10 @@
"author": "Budibase", "author": "Budibase",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@budibase/backend-core": "1.4.8-alpha.6", "@budibase/backend-core": "1.4.8-alpha.7",
"@budibase/pro": "1.4.8-alpha.6", "@budibase/pro": "1.4.8-alpha.7",
"@budibase/string-templates": "1.4.8-alpha.6", "@budibase/string-templates": "1.4.8-alpha.7",
"@budibase/types": "1.4.8-alpha.6", "@budibase/types": "1.4.8-alpha.7",
"@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",

30
packages/worker/yarn.lock
View File

@ -291,12 +291,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.8-alpha.6": "@budibase/backend-core@1.4.8-alpha.7":
version "1.4.8-alpha.6" version "1.4.8-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.6.tgz#d0f1971abe8bf46ee194381e7ff3b197872305e4" resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.8-alpha.7.tgz#0343897cabb7a134fff937615819a670000a6945"
integrity sha512-ufDFSyG3DPIh+rfLCVlZDTU+UaJ2viMSIGz0k+/9S262wmpBAc4VIPgY4+6Aagxi7iiyphVxJ4rej0oWc6czmw== integrity sha512-+60D0mVrRWxS+yHy0lNYD7mATUAEQgN5ExobWGO44rzmSMOnAobVHhnANy4bI/p2x3KPxk5ERvJNmOmMcIeUzQ==
dependencies: dependencies:
"@budibase/types" "1.4.8-alpha.6" "@budibase/types" "1.4.8-alpha.7"
"@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-sdk "2.1030.0" aws-sdk "2.1030.0"
@ -327,21 +327,21 @@
uuid "8.3.2" uuid "8.3.2"
zlib "1.0.5" zlib "1.0.5"
"@budibase/pro@1.4.8-alpha.6": "@budibase/pro@1.4.8-alpha.7":
version "1.4.8-alpha.6" version "1.4.8-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.6.tgz#8754f9d656f518505c37ad3e5988bbf668a14563" resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.8-alpha.7.tgz#00b87c2e26983ad9bd8a1aa28fc29b71341d42e4"
integrity sha512-b1X+kBI2S8viSpWa/lcU8a9IxYntTeCKyQ/4e8yX+ulEyqWjuG7eRPrd2DiiQSgMCQu2hmRYtJTTyQrgVm0QqA== integrity sha512-zMfjDoHbzg4GvecedY+MqhK0wQ3qdbjv82z7mGU+Xo9PDVM+SKCwHO5qqHqweCZWamVyeCMn7yjf4a+TpM+iSg==
dependencies: dependencies:
"@budibase/backend-core" "1.4.8-alpha.6" "@budibase/backend-core" "1.4.8-alpha.7"
"@budibase/types" "1.4.8-alpha.6" "@budibase/types" "1.4.8-alpha.7"
"@koa/router" "8.0.8" "@koa/router" "8.0.8"
joi "17.6.0" joi "17.6.0"
node-fetch "^2.6.1" node-fetch "^2.6.1"
"@budibase/types@1.4.8-alpha.6": "@budibase/types@1.4.8-alpha.7":
version "1.4.8-alpha.6" version "1.4.8-alpha.7"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.6.tgz#f4f1e3be1d70a62b06ab70a22257d927c028cd48" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.8-alpha.7.tgz#98c705e387b9f6b0d0b784b5d49a753d34f34bac"
integrity sha512-DIXAJ3XxL3aEUiAcOfySV7NjhgxWwBEZ/1ls8En3UwT8mdlhVwHCb5tODSqEOF3Ib7Cyjzw1EI43uEyO8F1xdA== integrity sha512-XH+dnVGtic2+3fHI1fiFQUOQ2m7rQWaJBuPeZRRKyDZ2pTuLAaiGxHjOEJ+AhIs0d/TSusGNSuObLvFMHrclHQ==
"@cspotcode/source-map-consumer@0.8.0": "@cspotcode/source-map-consumer@0.8.0":
version "0.8.0" version "0.8.0"