tidy up
This commit is contained in:
parent
c543cb143a
commit
337d4019c1
|
@ -11,7 +11,6 @@
|
||||||
import DatePicker from "../common/DatePicker.svelte"
|
import DatePicker from "../common/DatePicker.svelte"
|
||||||
import {
|
import {
|
||||||
cloneDeep,
|
cloneDeep,
|
||||||
assign,
|
|
||||||
keys,
|
keys,
|
||||||
isNumber,
|
isNumber,
|
||||||
includes,
|
includes,
|
||||||
|
@ -60,7 +59,7 @@
|
||||||
errors = validate.field(allFields)(clonedField)
|
errors = validate.field(allFields)(clonedField)
|
||||||
if (errors.length > 0) return
|
if (errors.length > 0) return
|
||||||
field.typeOptions = cloneDeep(clonedField.typeOptions)
|
field.typeOptions = cloneDeep(clonedField.typeOptions)
|
||||||
onFinished(assign(field)(clonedField))
|
onFinished({ ...clonedField, ...field })
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,17 @@
|
||||||
import getIcon from "../common/icon"
|
import getIcon from "../common/icon"
|
||||||
import FieldView from "./FieldView.svelte"
|
import FieldView from "./FieldView.svelte"
|
||||||
import Modal from "../common/Modal.svelte"
|
import Modal from "../common/Modal.svelte"
|
||||||
import { map, join, filter, some, find, keys, isDate } from "lodash/fp"
|
import {
|
||||||
|
get,
|
||||||
|
compose,
|
||||||
|
map,
|
||||||
|
join,
|
||||||
|
filter,
|
||||||
|
some,
|
||||||
|
find,
|
||||||
|
keys,
|
||||||
|
isDate,
|
||||||
|
} from "lodash/fp"
|
||||||
import { store, backendUiStore } from "../builderStore"
|
import { store, backendUiStore } from "../builderStore"
|
||||||
import { common, hierarchy } from "../../../core/src"
|
import { common, hierarchy } from "../../../core/src"
|
||||||
import { getNode } from "../common/core"
|
import { getNode } from "../common/core"
|
||||||
|
@ -37,14 +47,12 @@
|
||||||
store.subscribe($store => {
|
store.subscribe($store => {
|
||||||
record = $store.currentNode
|
record = $store.currentNode
|
||||||
const flattened = hierarchy.getFlattenedHierarchy($store.hierarchy)
|
const flattened = hierarchy.getFlattenedHierarchy($store.hierarchy)
|
||||||
getIndexAllowedRecords = index =>
|
|
||||||
pipe(
|
getIndexAllowedRecords = compose(
|
||||||
index.allowedRecordNodeIds,
|
|
||||||
[
|
|
||||||
filter(id => some(n => n.nodeId === id)(flattened)),
|
|
||||||
map(id => find(n => n.nodeId === id)(flattened).name),
|
|
||||||
join(", "),
|
join(", "),
|
||||||
]
|
map(id => flattened.find(n => n.nodeId === id).name),
|
||||||
|
filter(id => flattened.some(n => n.nodeId === id)),
|
||||||
|
get("allowedRecordNodeIds")
|
||||||
)
|
)
|
||||||
|
|
||||||
newField = () => {
|
newField = () => {
|
||||||
|
|
Loading…
Reference in New Issue