Browse Source

rename record

pull/4023/head
Martin McKeaveney 6 years ago
parent
commit
72ce6833c0
  1. 2
      packages/builder/src/builderStore/store/backend.js
  2. 2
      packages/builder/src/database/FieldView.svelte
  3. 4
      packages/builder/src/database/ModelView.svelte
  4. 2
      packages/core/src/templateApi/fields.js

2
packages/builder/src/builderStore/store/backend.js

@ -244,7 +244,7 @@ export const deleteCurrentNode = store => () => {
export const saveField = store => field => {
store.update(state => {
state.currentNode.fields = state.currentNode.fields.filter(f => f.name !== field.name)
state.currentNode.fields = state.currentNode.fields.filter(f => f.id !== field.id)
templateApi(state.hierarchy).addField(state.currentNode, field)
return state

2
packages/builder/src/database/FieldView.svelte

@ -59,7 +59,7 @@
errors = validate.field(allFields)(clonedField)
if (errors.length > 0) return
field.typeOptions = cloneDeep(clonedField.typeOptions)
onFinished({ ...clonedField, ...field })
onFinished({ ...field, ...clonedField })
}
</script>

4
packages/builder/src/database/ModelView.svelte

@ -38,8 +38,8 @@
$: models = $store.hierarchy.children
$: parent = record && record.parent()
$: isChildModel = parent.name !== "root"
$: modelExistsInHierarchy = getNode(
$: isChildModel = parent && parent.name !== "root"
$: modelExistsInHierarchy = $store.currentNode && getNode(
$store.hierarchy,
$store.currentNode.nodeId
)

2
packages/core/src/templateApi/fields.js

@ -9,6 +9,7 @@ import {
import { all, getDefaultOptions } from "../types"
import { applyRuleSet, makerule } from "../common/validationCommon"
import { BadRequestError } from "../common/errors"
import { generate } from "shortid"
export const fieldErrors = {
AddFieldValidationFailed: "Add field validation: ",
@ -17,6 +18,7 @@ export const fieldErrors = {
export const allowedTypes = () => keys(all)
export const getNewField = type => ({
id: generate(),
name: "", // how field is referenced internally
type,
typeOptions: getDefaultOptions(type),

Loading…
Cancel
Save