CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-08-15 10:01:34 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:Budibase/budibase into develop

Browse source
This commit is contained in:
mike12345567 2023-03-08 13:52:55 +00:00
commit f421b93826
20 changed files with 157 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hosting/docker-compose.dev.yaml
View file

@ -6,8 +6,7 @@ services:
minio-service:
container_name: budi-minio-dev
restart: on-failure
# Last version that supports the "fs" backend
image: minio/minio:RELEASE.2022-10-24T18-35-07Z
image: minio/minio
volumes:
- minio_data:/data
ports:
@ -69,4 +68,4 @@ volumes:
minio_data:
driver: local
redis_data:
driver: local
driver: local

3
hosting/docker-compose.yaml
View file

@ -59,8 +59,7 @@ services:
minio-service:
restart: unless-stopped
# Last version that supports the "fs" backend
image: minio/minio:RELEASE.2022-10-24T18-35-07Z
image: minio/minio
volumes:
- minio_data:/data
environment:

2
lerna.json
View file

@ -1,5 +1,5 @@
{
"version": "2.4.6-alpha.0",
"version": "2.4.7",
"npmClient": "yarn",
"packages": [
"packages/*"

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

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "2.4.6-alpha.0",
"version": "2.4.7",
"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.4.6-alpha.0",
"@budibase/types": "^2.4.7",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-cloudfront-sign": "2.2.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": "2.4.6-alpha.0",
"version": "2.4.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": "2.4.6-alpha.0",
"@budibase/string-templates": "^2.4.7",
"@spectrum-css/accordion": "3.0.24",
"@spectrum-css/actionbutton": "1.0.1",
"@spectrum-css/actiongroup": "1.0.1",

10
packages/builder/package.json
View file

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

7
packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
View file

@ -73,14 +73,14 @@
<Tabs noHorizPadding selected="Input">
<Tab title="Input">
<TextArea
minHeight="80px"
minHeight="160px"
disabled
value={textArea(filteredResults?.[idx]?.inputs, "No input")}
/>
</Tab>
<Tab title="Output">
<TextArea
minHeight="100px"
minHeight="160px"
disabled
value={textArea(filteredResults?.[idx]?.outputs, "No output")}
/>
@ -98,8 +98,9 @@
<style>
.container {
padding: 0 30px 0 30px;
padding: 0 30px 30px 30px;
height: 100%;
overflow: auto;
}
.tabs {

8
packages/cli/package.json
View file

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "2.4.6-alpha.0",
"version": "2.4.7",
"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.4.6-alpha.0",
"@budibase/string-templates": "2.4.6-alpha.0",
"@budibase/types": "2.4.6-alpha.0",
"@budibase/backend-core": "^2.4.7",
"@budibase/string-templates": "^2.4.7",
"@budibase/types": "^2.4.7",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

8
packages/client/package.json
View file

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

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

@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
"version": "2.4.6-alpha.0",
"version": "2.4.7",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "2.4.6-alpha.0",
"@budibase/bbui": "^2.4.7",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

2
packages/sdk/package.json
View file

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

12
packages/server/package.json
View file

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "2.4.6-alpha.0",
"version": "2.4.7",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -43,11 +43,11 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "2.4.6-alpha.0",
"@budibase/client": "2.4.6-alpha.0",
"@budibase/pro": "2.4.6-alpha.0",
"@budibase/string-templates": "2.4.6-alpha.0",
"@budibase/types": "2.4.6-alpha.0",
"@budibase/backend-core": "^2.4.7",
"@budibase/client": "^2.4.7",
"@budibase/pro": "2.4.6",
"@budibase/string-templates": "^2.4.7",
"@budibase/types": "^2.4.7",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

8
packages/server/src/automations/automationUtils.ts
View file

@ -52,14 +52,18 @@ export function cleanInputValues(inputs: Record<string, any>, schema: any) {
}
}
}
//Check if input field should be a relationship and cast to array
//Check if input field for Update Row should be a relationship and cast to array
for (let key in inputs.row) {
if (
inputs.schema?.[key]?.type === "link" &&
inputs.row[key] &&
typeof inputs.row[key] === "string"
) {
inputs.row[key] = JSON.parse(inputs.row[key])
try {
inputs.row[key] = JSON.parse(inputs.row[key])
} catch (e) {
//Link is not an array or object, so continue
}
}
}
return inputs

68
packages/server/src/automations/unitTests/automationUtils.spec.ts
View file

@ -62,4 +62,72 @@ describe("automationUtils", () => {
).toThrow()
})
})
describe("cleanInputValues", () => {
it("should handle array relationship fields from read binding", () => {
const schema = {
relationship: {
type: "link",
constraints: {
type: "array",
presence: false,
},
fieldName: "Users",
name: "relationship",
relationshipType: "many-to-many",
tableId: "ta_users",
sortable: false,
},
}
expect(
automationUtils.cleanInputValues(
{
row: {
relationship: `[{"_id": "ro_ta_users_us_3"}]`,
},
schema,
},
schema
)
).toEqual({
row: {
relationship: [{ _id: "ro_ta_users_us_3" }],
},
schema,
})
})
it("should handle single string relationship field", () => {
const schema = {
relationship: {
type: "link",
constraints: {
type: "array",
presence: false,
},
fieldName: "Users",
name: "relationship",
relationshipType: "many-to-many",
tableId: "ta_users",
sortable: false,
},
}
expect(
automationUtils.cleanInputValues(
{
row: {
relationship: `ro_ta_users_us_3`,
},
schema,
},
schema
)
).toEqual({
row: {
relationship: "ro_ta_users_us_3",
},
schema,
})
})
})
})

35
packages/server/yarn.lock
View file

@ -1278,14 +1278,14 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.4.6-alpha.0":
version "2.4.6-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.6-alpha.0.tgz#9c44f638621e87aa4cddb034d9333eab71b8ab3b"
integrity sha512-DJY65pqBVd7ndTJa2mz43E33rBkODzESQbUcHYGZAVKCnYhfo5vuHI2/iI9FpfjOPDyVVXyxaUfe6dQj2WHEkw==
"@budibase/backend-core@2.4.6":
version "2.4.6"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.6.tgz#19717251ec11a391b18987aa732cf0ec2351f774"
integrity sha512-oTuW5B6GG6//vXohOAQ7Go2npv98VT8YuvOF0iQC4OeFGNpguu4azDG0I/6dCDNfR006HlR3lgO+0IvW3IXDTA==
dependencies:
"@budibase/nano" "10.1.2"
"@budibase/pouchdb-replication-stream" "1.2.10"
"@budibase/types" "2.4.6-alpha.0"
"@budibase/types" "^2.4.6"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0"
@ -1417,14 +1417,14 @@
pouchdb-promise "^6.0.4"
through2 "^2.0.0"
"@budibase/pro@2.4.6-alpha.0":
version "2.4.6-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.6-alpha.0.tgz#190f05762a4bd78b9032ebe0e489f00229cae371"
integrity sha512-ED3RxOt5Z7omM9lH1G5ujDEK+j8RLfrul0byxIMk+Qdvglw4gx4gHcsQ+F+8KNgmrcoJNTycqjHxsjV9KfM0gQ==
"@budibase/pro@2.4.6":
version "2.4.6"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.6.tgz#2e8f4c186e99a7f846fd38b8bf519b46761675d8"
integrity sha512-fkGf5m7YGXp6QA4eDl15fflnojFj8zd+cvIHIya8ymmxvonUglxZPwa6eYzj/CDurg5tifE1s9vvqoLJ9NjrnA==
dependencies:
"@budibase/backend-core" "2.4.6-alpha.0"
"@budibase/backend-core" "2.4.6"
"@budibase/string-templates" "2.3.20"
"@budibase/types" "2.4.6-alpha.0"
"@budibase/types" "2.4.6"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -1463,10 +1463,15 @@
lodash "^4.17.20"
vm2 "^3.9.4"
"@budibase/types@2.4.6-alpha.0":
version "2.4.6-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.6-alpha.0.tgz#774b0c8cd7ad5e00164345a995296090a193b828"
integrity sha512-Y3/dcp6KozrtxIe4QyxWxwdqeQP1sVfZjPS5oii/UbxtT2FTglxRQOwRZ5dD5ADKketvhyML6weJDMJ8ioFzOg==
"@budibase/types@2.4.6":
version "2.4.6"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.6.tgz#1c528c4d7ca0ed81447a292a2b5569eab55b7f6a"
integrity sha512-2Y1OnrSbqDTKmyyhaHMgrQaIrkj+eNk52AuNa8mMF5ToVEmKs5W6ZJcoMVM07GgMRTf1OZUjXspm9Y5XMDOHTQ==
"@budibase/types@^2.4.6":
version "2.4.7"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.7.tgz#1a51eed655bd3093a910c7f5c7f6a711a371a597"
integrity sha512-0ffCiLASHjb1pwa9b4B3zUXWxvJ4njrXMBYpCsQLIDc1xut59/zMFsMYTjPBFW8HrR/Z/5zlXpfEnnTyZP1s8Q==
"@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": "2.4.6-alpha.0",
"version": "2.4.7",
"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": "2.4.6-alpha.0",
"version": "2.4.7",
"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": "2.4.6-alpha.0",
"version": "2.4.7",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -36,10 +36,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "2.4.6-alpha.0",
"@budibase/pro": "2.4.6-alpha.0",
"@budibase/string-templates": "2.4.6-alpha.0",
"@budibase/types": "2.4.6-alpha.0",
"@budibase/backend-core": "^2.4.7",
"@budibase/pro": "2.4.6",
"@budibase/string-templates": "^2.4.7",
"@budibase/types": "^2.4.7",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

35
packages/worker/yarn.lock
View file

@ -475,14 +475,14 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.4.6-alpha.0":
version "2.4.6-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.6-alpha.0.tgz#9c44f638621e87aa4cddb034d9333eab71b8ab3b"
integrity sha512-DJY65pqBVd7ndTJa2mz43E33rBkODzESQbUcHYGZAVKCnYhfo5vuHI2/iI9FpfjOPDyVVXyxaUfe6dQj2WHEkw==
"@budibase/backend-core@2.4.6":
version "2.4.6"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.6.tgz#19717251ec11a391b18987aa732cf0ec2351f774"
integrity sha512-oTuW5B6GG6//vXohOAQ7Go2npv98VT8YuvOF0iQC4OeFGNpguu4azDG0I/6dCDNfR006HlR3lgO+0IvW3IXDTA==
dependencies:
"@budibase/nano" "10.1.2"
"@budibase/pouchdb-replication-stream" "1.2.10"
"@budibase/types" "2.4.6-alpha.0"
"@budibase/types" "^2.4.6"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-cloudfront-sign "2.2.0"
@ -564,14 +564,14 @@
pouchdb-promise "^6.0.4"
through2 "^2.0.0"
"@budibase/pro@2.4.6-alpha.0":
version "2.4.6-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.6-alpha.0.tgz#190f05762a4bd78b9032ebe0e489f00229cae371"
integrity sha512-ED3RxOt5Z7omM9lH1G5ujDEK+j8RLfrul0byxIMk+Qdvglw4gx4gHcsQ+F+8KNgmrcoJNTycqjHxsjV9KfM0gQ==
"@budibase/pro@2.4.6":
version "2.4.6"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.6.tgz#2e8f4c186e99a7f846fd38b8bf519b46761675d8"
integrity sha512-fkGf5m7YGXp6QA4eDl15fflnojFj8zd+cvIHIya8ymmxvonUglxZPwa6eYzj/CDurg5tifE1s9vvqoLJ9NjrnA==
dependencies:
"@budibase/backend-core" "2.4.6-alpha.0"
"@budibase/backend-core" "2.4.6"
"@budibase/string-templates" "2.3.20"
"@budibase/types" "2.4.6-alpha.0"
"@budibase/types" "2.4.6"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -592,10 +592,15 @@
lodash "^4.17.20"
vm2 "^3.9.4"
"@budibase/types@2.4.6-alpha.0":
version "2.4.6-alpha.0"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.6-alpha.0.tgz#774b0c8cd7ad5e00164345a995296090a193b828"
integrity sha512-Y3/dcp6KozrtxIe4QyxWxwdqeQP1sVfZjPS5oii/UbxtT2FTglxRQOwRZ5dD5ADKketvhyML6weJDMJ8ioFzOg==
"@budibase/types@2.4.6":
version "2.4.6"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.6.tgz#1c528c4d7ca0ed81447a292a2b5569eab55b7f6a"
integrity sha512-2Y1OnrSbqDTKmyyhaHMgrQaIrkj+eNk52AuNa8mMF5ToVEmKs5W6ZJcoMVM07GgMRTf1OZUjXspm9Y5XMDOHTQ==
"@budibase/types@^2.4.6":
version "2.4.7"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.7.tgz#1a51eed655bd3093a910c7f5c7f6a711a371a597"
integrity sha512-0ffCiLASHjb1pwa9b4B3zUXWxvJ4njrXMBYpCsQLIDc1xut59/zMFsMYTjPBFW8HrR/Z/5zlXpfEnnTyZP1s8Q==
"@cspotcode/source-map-support@^0.8.0":
version "0.8.1"

4
scripts/install-minio.sh
View file

@ -2,9 +2,9 @@
if [[ $TARGETARCH == arm* ]] ;
then
echo "INSTALLING ARM64 MINIO"
wget https://dl.min.io/server/minio/release/linux-arm64/archive/minio.RELEASE.2022-10-24T18-35-07Z
wget https://dl.min.io/server/minio/release/linux-arm64/minio
else
echo "INSTALLING AMD64 MINIO"
wget https://dl.min.io/server/minio/release/linux-amd64/minio.RELEASE.2022-10-24T18-35-07Z
wget https://dl.min.io/server/minio/release/linux-amd64/minio
fi
chmod +x minio