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

Merge branch 'master' of github.com:Budibase/budibase into fix/sqs-internal-columns

This commit is contained in:
mike12345567 2024-06-28 13:47:00 +01:00
parent 048d15956b 55440dca4a
commit fa10140ef7
3 changed files with 3 additions and 7 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.29.3", "version": "2.29.4",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

6
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
View File

@ -495,11 +495,7 @@
newError.name = `Column name cannot start with an underscore.` newError.name = `Column name cannot start with an underscore.`
} else if (fieldInfo.name && !fieldInfo.name.match(ValidColumnNameRegex)) { } else if (fieldInfo.name && !fieldInfo.name.match(ValidColumnNameRegex)) {
newError.name = `Illegal character; must be alpha-numeric.` newError.name = `Illegal character; must be alpha-numeric.`
} else if ( } else if (prohibited.some(name => fieldInfo?.name === name)) {
prohibited.some(
name => fieldInfo?.name?.toLowerCase() === name.toLowerCase()
)
) {
newError.name = `${prohibited.join( newError.name = `${prohibited.join(
", " ", "
)} are not allowed as column names - case insensitive.` )} are not allowed as column names - case insensitive.`

2
packages/frontend-core/src/components/grid/layout/NewRow.svelte
View File

@ -103,7 +103,7 @@
// If we don't have a next page then we're at the bottom and can scroll to // If we don't have a next page then we're at the bottom and can scroll to
// the max available offset // the max available offset
else { if (!$hasNextPage) {
scroll.update(state => ({ scroll.update(state => ({
...state, ...state,
top: $maxScrollTop, top: $maxScrollTop,