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

Merge pull request #551 from Budibase/backendbugs 

renaming bug
This commit is contained in:
Martin McKeaveney 2020-08-21 10:18:05 +01:00 committed by GitHub
parent 841ee44835 6a22708bda
commit 1a45fd2110
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/builder/cypress/integration/createTable.spec.js
View File

@ -38,10 +38,10 @@ context('Create a Table', () => {
it('edits a record', () => { it('edits a record', () => {
cy.get("tbody .ri-more-line").click() cy.get("tbody .ri-more-line").click()
cy.get("[data-cy=edit-row]").click() cy.get("[data-cy=edit-row]").click()
cy.get(".actions input").type("updatedRecord") cy.get(".actions input").type("Updated")
cy.contains("Save").click() cy.contains("Save").click()
cy.contains('updatedRecord').should('have.text', 'updatedRecord') cy.contains('RoverUpdated').should('have.text', 'RoverUpdated')
}) })
it('deletes a record', () => { it('deletes a record', () => {
@ -49,7 +49,7 @@ context('Create a Table', () => {
cy.get("[data-cy=delete-row]").click() cy.get("[data-cy=delete-row]").click()
cy.get(".modal-actions").contains("Delete").click() cy.get(".modal-actions").contains("Delete").click()
cy.contains('updatedRecord').should('not.exist') cy.contains('RoverUpdated').should('not.exist')
}) })
it('deletes a column', () => { it('deletes a column', () => {

8
packages/builder/src/builderStore/store/backend.js
View File

@ -93,7 +93,13 @@ export const getBackendUiStore = () => {
saveField: ({ originalName, field }) => { saveField: ({ originalName, field }) => {
store.update(state => { store.update(state => {
// delete the original if renaming // delete the original if renaming
delete state.draftModel.schema[originalName] if (originalName) {
delete state.draftModel.schema[originalName]
state.draftModel._rename = {
old: originalName,
updated: field.name,
}
}
state.draftModel.schema[field.name] = cloneDeep(field) state.draftModel.schema[field.name] = cloneDeep(field)

6
packages/builder/src/components/database/DataTable/ModelDataTable.svelte
View File

@ -45,9 +45,9 @@
$: sort = $backendUiStore.sort $: sort = $backendUiStore.sort
$: sorted = sort ? fsort(data)[sort.direction](sort.column) : data $: sorted = sort ? fsort(data)[sort.direction](sort.column) : data
$: headers = Object.keys($backendUiStore.selectedModel.schema).filter( $: headers = Object.keys($backendUiStore.selectedModel.schema)
id => !INTERNAL_HEADERS.includes(id) .sort()
) .filter(id => !INTERNAL_HEADERS.includes(id))
$: schema = $backendUiStore.selectedModel.schema $: schema = $backendUiStore.selectedModel.schema
</script> </script>