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

Merge pull request #13570 from Budibase/fix/isBetterSample-null-reference 

Fix some null reference on builder
This commit is contained in:
Adria Navarro 2024-04-26 16:25:20 +02:00 committed by GitHub
parent 9d2ea1c760 c133d329af
commit 2afb13db7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,13 +365,11 @@
function getAllowedTypes() { function getAllowedTypes() {
if (originalName) { if (originalName) {
const possibleTypes = ( const possibleTypes = SWITCHABLE_TYPES[field.type] || [
SWITCHABLE_TYPES[field.type] || [editableColumn.type] editableColumn.type,
).map(t => t.toLowerCase()) ]
return Object.entries(FIELDS) return Object.entries(FIELDS)
.filter(([fieldType]) => .filter(([_, field]) => possibleTypes.includes(field.type))
possibleTypes.includes(fieldType.toLowerCase())
)
.map(([_, fieldDefinition]) => fieldDefinition) .map(([_, fieldDefinition]) => fieldDefinition)
} }

4
packages/frontend-core/src/utils/rows.js
View File

@ -8,6 +8,10 @@ const isBetterSample = (newValue, oldValue) => {
return true return true
} }
if (oldValue != null && newValue == null) {
return false
}
// Don't change type // Don't change type
const oldType = typeof oldValue const oldType = typeof oldValue
const newType = typeof newValue const newType = typeof newValue