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/master' into feature/automation-row-ux-update

This commit is contained in:
Dean 2024-06-26 14:30:08 +01:00
parent 21c335caab e34406b90d
commit ca44220bd3
15 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/budibase_ci.yml vendored
View File

@ -233,10 +233,11 @@ jobs:
if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }} if: ${{ steps.get_pro_commits.outputs.base_commit_excluding_merges != '' }}
run: | run: |
cd packages/pro cd packages/pro
base_commit='${{ steps.get_pro_commits.outputs.base_commit }}'
base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}' base_commit_excluding_merges='${{ steps.get_pro_commits.outputs.base_commit_excluding_merges }}'
pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}' pro_commit='${{ steps.get_pro_commits.outputs.pro_commit }}'
any_commit=$(git log --no-merges $base_commit_excluding_merges...$pro_commit) any_commit=$(git log --no-merges $base_commit...$pro_commit)
if [ -n "$any_commit" ]; then if [ -n "$any_commit" ]; then
echo $any_commit echo $any_commit

2
examples/nextjs-api-sales/package.json
View File

@ -22,6 +22,6 @@
"@types/react": "17.0.39", "@types/react": "17.0.39",
"eslint": "8.10.0", "eslint": "8.10.0",
"eslint-config-next": "12.1.0", "eslint-config-next": "12.1.0",
"typescript": "5.2.2" "typescript": "5.5.2"
} }
} }

2
package.json
View File

@ -27,7 +27,7 @@
"proper-lockfile": "^4.1.2", "proper-lockfile": "^4.1.2",
"svelte": "^4.2.10", "svelte": "^4.2.10",
"svelte-eslint-parser": "^0.33.1", "svelte-eslint-parser": "^0.33.1",
"typescript": "5.2.2", "typescript": "5.5.2",
"typescript-eslint": "^7.3.1", "typescript-eslint": "^7.3.1",
"yargs": "^17.7.2" "yargs": "^17.7.2"
}, },

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

@ -16,7 +16,7 @@
"prepack": "cp package.json dist", "prepack": "cp package.json dist",
"build": "tsc -p tsconfig.build.json --paths null && node ./scripts/build.js", "build": "tsc -p tsconfig.build.json --paths null && node ./scripts/build.js",
"build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
"check:types": "tsc -p tsconfig.json --noEmit --paths null", "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
"test": "bash scripts/test.sh", "test": "bash scripts/test.sh",
"test:watch": "jest --watchAll" "test:watch": "jest --watchAll"
}, },
@ -79,7 +79,7 @@
"pouchdb-adapter-memory": "7.2.2", "pouchdb-adapter-memory": "7.2.2",
"testcontainers": "^10.7.2", "testcontainers": "^10.7.2",
"timekeeper": "2.2.0", "timekeeper": "2.2.0",
"typescript": "5.2.2" "typescript": "5.5.2"
}, },
"nx": { "nx": {
"targets": { "targets": {

4
packages/backend-core/src/sql/sql.ts
View File

@ -397,9 +397,9 @@ class InternalBuilder {
contains(filters.containsAny, true) contains(filters.containsAny, true)
} }
// when searching internal tables make sure long looking for rows
if (filters.documentType && !isExternalTable(table)) {
const tableRef = opts?.aliases?.[table._id!] || table._id const tableRef = opts?.aliases?.[table._id!] || table._id
// when searching internal tables make sure long looking for rows
if (filters.documentType && !isExternalTable(table) && tableRef) {
// has to be its own option, must always be AND onto the search // has to be its own option, must always be AND onto the search
query.andWhereLike( query.andWhereLike(
`${tableRef}._id`, `${tableRef}._id`,

4
packages/cli/package.json
View File

@ -11,7 +11,7 @@
"scripts": { "scripts": {
"tsc": "node ../../scripts/build.js", "tsc": "node ../../scripts/build.js",
"build": "yarn tsc", "build": "yarn tsc",
"check:types": "tsc -p tsconfig.json --noEmit --paths null", "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
"start": "ts-node ./src/index.ts" "start": "ts-node ./src/index.ts"
}, },
"dependencies": { "dependencies": {
@ -40,6 +40,6 @@
"@types/node-fetch": "2.6.4", "@types/node-fetch": "2.6.4",
"@types/pouchdb": "^6.4.0", "@types/pouchdb": "^6.4.0",
"ts-node": "10.8.1", "ts-node": "10.8.1",
"typescript": "5.2.2" "typescript": "5.5.2"
} }
} }

2
packages/pro

@ -1 +1 @@
Subproject commit 6c8d0174ca58c578a37022965ddb923fdbf8e32a Subproject commit e8f2c5a14780e1f61ec3896821ba5f93d486eb72

4
packages/server/package.json
View File

@ -12,7 +12,7 @@
"prebuild": "rimraf dist/", "prebuild": "rimraf dist/",
"build": "node ./scripts/build.js", "build": "node ./scripts/build.js",
"postbuild": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client && copyfiles -f ../../yarn.lock ./dist/", "postbuild": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client && copyfiles -f ../../yarn.lock ./dist/",
"check:types": "tsc -p tsconfig.json --noEmit --paths null", "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
"build:isolated-vm-lib:snippets": "esbuild --minify --bundle src/jsRunner/bundles/snippets.ts --outfile=src/jsRunner/bundles/snippets.ivm.bundle.js --platform=node --format=iife --global-name=snippets", "build:isolated-vm-lib:snippets": "esbuild --minify --bundle src/jsRunner/bundles/snippets.ts --outfile=src/jsRunner/bundles/snippets.ivm.bundle.js --platform=node --format=iife --global-name=snippets",
"build:isolated-vm-lib:string-templates": "esbuild --minify --bundle src/jsRunner/bundles/index-helpers.ts --outfile=src/jsRunner/bundles/index-helpers.ivm.bundle.js --platform=node --format=iife --external:handlebars --global-name=helpers", "build:isolated-vm-lib:string-templates": "esbuild --minify --bundle src/jsRunner/bundles/index-helpers.ts --outfile=src/jsRunner/bundles/index-helpers.ivm.bundle.js --platform=node --format=iife --external:handlebars --global-name=helpers",
"build:isolated-vm-lib:bson": "esbuild --minify --bundle src/jsRunner/bundles/bsonPackage.ts --outfile=src/jsRunner/bundles/bson.ivm.bundle.js --platform=node --format=iife --global-name=bson", "build:isolated-vm-lib:bson": "esbuild --minify --bundle src/jsRunner/bundles/bsonPackage.ts --outfile=src/jsRunner/bundles/bson.ivm.bundle.js --platform=node --format=iife --global-name=bson",
@ -152,7 +152,7 @@
"timekeeper": "2.2.0", "timekeeper": "2.2.0",
"ts-node": "10.8.1", "ts-node": "10.8.1",
"tsconfig-paths": "4.0.0", "tsconfig-paths": "4.0.0",
"typescript": "5.2.2", "typescript": "5.5.2",
"update-dotenv": "1.1.1", "update-dotenv": "1.1.1",
"yargs": "13.2.4" "yargs": "13.2.4"
}, },

1
packages/server/src/utilities/schema.ts
View File

@ -79,7 +79,6 @@ export function validate(rows: Rows, schema: TableSchema): ValidationResults {
} else if ( } else if (
// If there's no data for this field don't bother with further checks // If there's no data for this field don't bother with further checks
// If the field is already marked as invalid there's no need for further checks // If the field is already marked as invalid there's no need for further checks
results.schemaValidation[columnName] === false ||
columnData == null || columnData == null ||
isAutoColumn isAutoColumn
) { ) {

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

@ -11,7 +11,7 @@
"build": "node ../../scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly --paths null", "build": "node ../../scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly --paths null",
"build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput", "dev": "tsc -p tsconfig.json --watch --preserveWatchOutput",
"check:types": "tsc -p tsconfig.json --noEmit --paths null", "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
"test": "jest", "test": "jest",
"test:watch": "yarn test --watchAll" "test:watch": "yarn test --watchAll"
}, },
@ -21,7 +21,7 @@
}, },
"devDependencies": { "devDependencies": {
"rimraf": "3.0.2", "rimraf": "3.0.2",
"typescript": "5.2.2" "typescript": "5.5.2"
}, },
"nx": { "nx": {
"targets": { "targets": {

12
packages/shared-core/src/filters.ts
View File

@ -250,12 +250,16 @@ export const buildQuery = (filter: SearchFilter[]) => {
query.equal = query.equal || {} query.equal = query.equal || {}
query.equal[field] = true query.equal[field] = true
} else { } else {
query[queryOperator] = query[queryOperator] || {} query[queryOperator] = {
query[queryOperator]![field] = value ...query[queryOperator],
[field]: value,
}
} }
} else { } else {
query[queryOperator] = query[queryOperator] || {} query[queryOperator] = {
query[queryOperator]![field] = value ...query[queryOperator],
[field]: value,
}
} }
} }
}) })

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

@ -21,7 +21,7 @@
"scripts": { "scripts": {
"build": "tsc --emitDeclarationOnly && rollup -c", "build": "tsc --emitDeclarationOnly && rollup -c",
"dev": "rollup -cw", "dev": "rollup -cw",
"check:types": "tsc -p tsconfig.json --noEmit --paths null", "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
"test": "jest", "test": "jest",
"manifest": "ts-node ./scripts/gen-collection-info.ts" "manifest": "ts-node ./scripts/gen-collection-info.ts"
}, },
@ -45,6 +45,6 @@
"rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-terser": "^7.0.2", "rollup-plugin-terser": "^7.0.2",
"ts-jest": "29.1.1", "ts-jest": "29.1.1",
"typescript": "5.2.2" "typescript": "5.5.2"
} }
} }

4
packages/types/package.json
View File

@ -11,7 +11,7 @@
"build": "node ../../scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly", "build": "node ../../scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly",
"build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
"dev": "tsc -p tsconfig.json --watch --preserveWatchOutput", "dev": "tsc -p tsconfig.json --watch --preserveWatchOutput",
"check:types": "tsc -p tsconfig.json --noEmit --paths null" "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020"
}, },
"jest": {}, "jest": {},
"devDependencies": { "devDependencies": {
@ -20,7 +20,7 @@
"@types/pouchdb": "6.4.0", "@types/pouchdb": "6.4.0",
"@types/redlock": "4.0.7", "@types/redlock": "4.0.7",
"rimraf": "3.0.2", "rimraf": "3.0.2",
"typescript": "5.2.2" "typescript": "5.5.2"
}, },
"dependencies": { "dependencies": {
"scim-patch": "^0.8.1" "scim-patch": "^0.8.1"

4
packages/worker/package.json
View File

@ -15,7 +15,7 @@
"prebuild": "rimraf dist/", "prebuild": "rimraf dist/",
"build": "node ../../scripts/build.js", "build": "node ../../scripts/build.js",
"postbuild": "copyfiles -f ../../yarn.lock ./dist/", "postbuild": "copyfiles -f ../../yarn.lock ./dist/",
"check:types": "tsc -p tsconfig.json --noEmit --paths null", "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
"build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput", "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
"run:docker": "node dist/index.js", "run:docker": "node dist/index.js",
"debug": "yarn build && node --expose-gc --inspect=9223 dist/index.js", "debug": "yarn build && node --expose-gc --inspect=9223 dist/index.js",
@ -91,7 +91,7 @@
"rimraf": "3.0.2", "rimraf": "3.0.2",
"supertest": "6.3.3", "supertest": "6.3.3",
"timekeeper": "2.2.0", "timekeeper": "2.2.0",
"typescript": "5.2.2", "typescript": "5.5.2",
"update-dotenv": "1.1.1" "update-dotenv": "1.1.1"
}, },
"nx": { "nx": {

7
yarn.lock
View File

@ -21754,7 +21754,12 @@ typescript-eslint@^7.3.1:
"@typescript-eslint/eslint-plugin" "7.3.1" "@typescript-eslint/eslint-plugin" "7.3.1"
"@typescript-eslint/parser" "7.3.1" "@typescript-eslint/parser" "7.3.1"
typescript@5.2.2, "typescript@>=3 < 6": typescript@5.5.2:
version "5.5.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507"
integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==
"typescript@>=3 < 6":
version "5.2.2" version "5.2.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==