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

Merge branch 'master' into bug/sev4/relationship-column-types-must-match

This commit is contained in:
Mel O'Hagan 2022-09-23 16:44:36 +01:00
parent f11e56547f 1bf08a9604
commit 2e1b87e1c5
22 changed files with 2300 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/budibase/templates/app-service-deployment.yaml
View File

@ -78,6 +78,8 @@ spec:
key: objectStoreSecret
- name: MINIO_URL
value: {{ .Values.services.objectStore.url }}
- name: PLUGIN_BUCKET_NAME
value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
- name: PORT
value: {{ .Values.services.apps.port | quote }}
{{ if .Values.services.worker.publicApiRateLimitPerSecond }}

2
charts/budibase/templates/worker-service-deployment.yaml
View File

@ -77,6 +77,8 @@ spec:
key: objectStoreSecret
- name: MINIO_URL
value: {{ .Values.services.objectStore.url }}
- name: PLUGIN_BUCKET_NAME
value: {{ .Values.services.objectStore.pluginBucketName | default "plugins" | quote }}
- name: PORT
value: {{ .Values.services.worker.port | quote }}
- name: MULTI_TENANCY

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "1.4.3",
"version": "1.4.11",
"npmClient": "yarn",
"packages": [
"packages/*"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "1.4.3",
"version": "1.4.11",
"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.3",
"@budibase/types": "^1.4.11",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "1.4.3",
"version": "1.4.11",
"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.3",
"@budibase/string-templates": "^1.4.11",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

5
packages/bbui/src/Form/Core/Dropzone.svelte
View File

@ -65,6 +65,9 @@
}
}
$: showDropzone =
(!maximum || (maximum && value?.length < maximum)) && !disabled
async function processFileList(fileList) {
if (
handleFileTooLarge &&
@ -211,7 +214,7 @@
{/each}
{/if}
{/if}
{#if !maximum || (maximum && value?.length < maximum)}
{#if showDropzone}
<div
class="spectrum-Dropzone"
class:is-invalid={!!error}

10
packages/builder/package.json
View File

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

3
packages/builder/src/stores/portal/plugins.js
View File

@ -34,8 +34,7 @@ export function createPluginsStore() {
}
let res = await API.createPlugin(pluginData)
let newPlugin = res.plugins[0]
let newPlugin = res.plugin
update(state => {
const currentIdx = state.findIndex(plugin => plugin._id === newPlugin._id)
if (currentIdx >= 0) {

6
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "1.4.3",
"version": "1.4.11",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {
@ -26,7 +26,9 @@
"outputPath": "build"
},
"dependencies": {
"@budibase/backend-core": "^1.4.3",
"@budibase/backend-core": "^1.4.11",
"@budibase/string-templates": "^1.4.11",
"@budibase/types": "^1.4.11",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

2239
packages/cli/yarn.lock
View File

File diff suppressed because it is too large Load Diff

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "1.4.3",
"version": "1.4.11",
"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.3",
"@budibase/frontend-core": "^1.4.3",
"@budibase/string-templates": "^1.4.3",
"@budibase/bbui": "^1.4.11",
"@budibase/frontend-core": "^1.4.11",
"@budibase/string-templates": "^1.4.11",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

5
packages/client/src/components/app/embedded-map/EmbeddedMap.svelte
View File

@ -374,6 +374,11 @@
min-height: 180px;
min-width: 200px;
}
.embedded-map :global(a.map-svg-button) {
display: flex;
justify-content: center;
align-items: center;
}
.embedded-map :global(.leaflet-top),
.embedded-map :global(.leaflet-bottom) {
z-index: 998;

4
packages/client/src/components/app/embedded-map/EmbeddedMapControls.js
View File

@ -37,7 +37,7 @@ const FullScreenControl = L.Control.extend({
this._fullScreenButton = this._createButton(
options.fullScreenContent,
options.fullScreenTitle,
"map-fullscreen",
"map-fullscreen map-svg-button",
container,
this._fullScreen
)
@ -87,7 +87,7 @@ const LocationControl = L.Control.extend({
this._locationButton = this._createButton(
options.locationContent,
options.locationTitle,
"map-location",
"map-location map-svg-button",
container,
this._location
)

13
packages/client/src/websocket.js
View File

@ -1,12 +1,13 @@
import { builderStore } from "./stores/index.js"
import { builderStore, environmentStore } from "./stores/index.js"
import { get } from "svelte/store"
import { io } from "socket.io-client"
export const initWebsocket = () => {
const { inBuilder, location } = get(builderStore)
const { cloud } = get(environmentStore)
// Only connect when we're inside the builder preview, for now
if (!inBuilder || !location) {
if (!inBuilder || !location || cloud) {
return
}
@ -17,6 +18,14 @@ export const initWebsocket = () => {
const port = location.port || (tls ? 443 : 80)
const socket = io(`${proto}//${host}:${port}`, {
path: "/socket/client",
// Cap reconnection attempts to 10 (total of 95 seconds before giving up)
reconnectionAttempts: 10,
// Delay initial reconnection attempt by 5 seconds
reconnectionDelay: 5000,
// Then decrease to 10 second intervals
reconnectionDelayMax: 10000,
// Timeout after 5 seconds so we never stack requests
timeout: 5000,
})
// Event handlers

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

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

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "1.4.3",
"version": "1.4.11",
"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.3",
"@budibase/client": "^1.4.3",
"@budibase/pro": "1.4.3",
"@budibase/string-templates": "^1.4.3",
"@budibase/types": "^1.4.3",
"@budibase/backend-core": "^1.4.11",
"@budibase/client": "^1.4.11",
"@budibase/pro": "1.4.10",
"@budibase/string-templates": "^1.4.11",
"@budibase/types": "^1.4.11",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

2
packages/server/src/api/controllers/plugin/index.ts
View File

@ -129,6 +129,6 @@ export async function processUploadedPlugin(
}
const doc = await plugins.storePlugin(metadata, directory, source)
ClientAppSocket.emit("plugins-update", { name: doc.name, hash: doc.hash })
ClientAppSocket.emit("plugin-update", { name: doc.name, hash: doc.hash })
return doc
}

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"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.3":
version "1.4.3"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.3.tgz#b071e9e16ac224efc4193b0a7030f68f4de30cf6"
integrity sha512-LOiX4QFNpRWj6EV0i6OsIrP+uYlLQdcmPPa89N7G8XzaMoRUgfiLKctiIVcObiKZRht1vfnCcOq2BiE/1PMCrQ==
"@budibase/backend-core@1.4.10":
version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.10.tgz#880b58ebfb8a0489fb15266bd8e2930ac097d8d1"
integrity sha512-w18Gwjp9IqIf6W1bAKG7FcVjUfq76yv0DGebK2FFYDEKIijhxGU7+URyHiqQi5Cdve8PRJ13+krPir38kUKH9w==
dependencies:
"@budibase/types" "^1.4.3"
"@budibase/types" "^1.4.10"
"@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.3":
version "1.4.3"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.3.tgz#3d94397711ce8dc32b7c3c4fd3d1a7b05e730059"
integrity sha512-GmZMA1xElsTTIYNegpzKpE2p7RWWyVbWWkPqmCFXnZlji8VoVwQRs/PnJhqYxo4CQguNp8F7NuCtjmNKpgUYBg==
"@budibase/pro@1.4.10":
version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.10.tgz#676d81472df8d600b91a9c4dd25b826ea3adde06"
integrity sha512-vTr37tf6T0FEZOngCI9vJBxvxfmMgpsRP8+HmncVswgxIk3RbRWYF2Th1enemMe/X+lohWqhreTTy1RPQ6dzeA==
dependencies:
"@budibase/backend-core" "1.4.3"
"@budibase/types" "1.4.3"
"@budibase/backend-core" "1.4.10"
"@budibase/types" "1.4.10"
"@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.3", "@budibase/types@^1.4.3":
version "1.4.3"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.3.tgz#cc765bf2882af8f82bc1d8d2dff2a99e79cabc52"
integrity sha512-/V7zUOlTDCCp6aRLtH2ZrHBweHEgpaIJcXJJIePugSc3n2cFCoD/W0MCMWdvrT1x3ocLzU1P5TpwQJ5fyVH4Kg==
"@budibase/types@1.4.10", "@budibase/types@^1.4.10":
version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.10.tgz#6c1ba3859f3d9452f21cea3bffa51541d76afaa0"
integrity sha512-MtHT1GHEMV+fE2Kd64Y21Ut9+HPhE1ScyGTMeNciFEFhSODOy7VEoRXcbEZSk39N5vj3w8lfXGRYNb7zTzrUZw==
"@bull-board/api@3.7.0":
version "3.7.0"

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

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

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "1.4.3",
"version": "1.4.11",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "1.4.3",
"version": "1.4.11",
"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.3",
"@budibase/pro": "1.4.3",
"@budibase/string-templates": "^1.4.3",
"@budibase/types": "^1.4.3",
"@budibase/backend-core": "^1.4.11",
"@budibase/pro": "1.4.10",
"@budibase/string-templates": "^1.4.11",
"@budibase/types": "^1.4.11",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@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"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@1.4.3":
version "1.4.3"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.3.tgz#b071e9e16ac224efc4193b0a7030f68f4de30cf6"
integrity sha512-LOiX4QFNpRWj6EV0i6OsIrP+uYlLQdcmPPa89N7G8XzaMoRUgfiLKctiIVcObiKZRht1vfnCcOq2BiE/1PMCrQ==
"@budibase/backend-core@1.4.10":
version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.4.10.tgz#880b58ebfb8a0489fb15266bd8e2930ac097d8d1"
integrity sha512-w18Gwjp9IqIf6W1bAKG7FcVjUfq76yv0DGebK2FFYDEKIijhxGU7+URyHiqQi5Cdve8PRJ13+krPir38kUKH9w==
dependencies:
"@budibase/types" "^1.4.3"
"@budibase/types" "^1.4.10"
"@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.3":
version "1.4.3"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.3.tgz#3d94397711ce8dc32b7c3c4fd3d1a7b05e730059"
integrity sha512-GmZMA1xElsTTIYNegpzKpE2p7RWWyVbWWkPqmCFXnZlji8VoVwQRs/PnJhqYxo4CQguNp8F7NuCtjmNKpgUYBg==
"@budibase/pro@1.4.10":
version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.4.10.tgz#676d81472df8d600b91a9c4dd25b826ea3adde06"
integrity sha512-vTr37tf6T0FEZOngCI9vJBxvxfmMgpsRP8+HmncVswgxIk3RbRWYF2Th1enemMe/X+lohWqhreTTy1RPQ6dzeA==
dependencies:
"@budibase/backend-core" "1.4.3"
"@budibase/types" "1.4.3"
"@budibase/backend-core" "1.4.10"
"@budibase/types" "1.4.10"
"@koa/router" "8.0.8"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@1.4.3", "@budibase/types@^1.4.3":
version "1.4.3"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.3.tgz#cc765bf2882af8f82bc1d8d2dff2a99e79cabc52"
integrity sha512-/V7zUOlTDCCp6aRLtH2ZrHBweHEgpaIJcXJJIePugSc3n2cFCoD/W0MCMWdvrT1x3ocLzU1P5TpwQJ5fyVH4Kg==
"@budibase/types@1.4.10", "@budibase/types@^1.4.10":
version "1.4.10"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.4.10.tgz#6c1ba3859f3d9452f21cea3bffa51541d76afaa0"
integrity sha512-MtHT1GHEMV+fE2Kd64Y21Ut9+HPhE1ScyGTMeNciFEFhSODOy7VEoRXcbEZSk39N5vj3w8lfXGRYNb7zTzrUZw==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"