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

merge

This commit is contained in:
Martin McKeaveney 2020-06-25 18:32:51 +01:00
parent a43e0a1131
commit b07f608ffe
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,13 +80,11 @@ export const getBackendUiStore = () => {
state.draftModel.schema = {} state.draftModel.schema = {}
} }
const id = uuid()
state.draftModel.schema = { state.draftModel.schema = {
...state.draftModel.schema, ...state.draftModel.schema,
[id]: field, [field.name]: field,
} }
state.selectedField = id state.selectedField = field.name
state.tabs.NAVIGATION_PANEL = "NAVIGATE" state.tabs.NAVIGATION_PANEL = "NAVIGATE"
return state return state

10
packages/builder/src/components/nav/ModelNavigator/EmptyModel.svelte
View File

@ -12,16 +12,12 @@
function createModel(model) { function createModel(model) {
const { schema, ...rest } = $backendUiStore.selectedModel const { schema, ...rest } = $backendUiStore.selectedModel
const newModel = { ...model, schema: {} } // const newModel = { ...model, schema: {} }
// TODO: could be better
for (let key in model.schema) {
newModel.schema[uuid()] = model.schema[key]
}
backendUiStore.actions.models.save({ backendUiStore.actions.models.save({
model: { model: {
...newModel, ...model,
schema: {},
...rest, ...rest,
}, },
}) })