Merge branch 'form-builder' into relationship-one-to-many

This commit is contained in:
Keviin Åberg Kultalahti 2021-02-09 12:40:52 +01:00
commit cd14b7b4e4
3 changed files with 5 additions and 6 deletions

View File

@ -84,7 +84,7 @@ services:
#- "4369:4369" #- "4369:4369"
#- "9100:9100" #- "9100:9100"
volumes: volumes:
- couchdb_data:/couchdb - couchdb_data:/opt/couchdb/data
couch-init: couch-init:
image: curlimages/curl image: curlimages/curl

View File

@ -13,9 +13,8 @@
let dropdown let dropdown
let anchor let anchor
$: noChildrenAllowed = $: definition = store.actions.components.getDefinition(component?._component)
!component || $: noChildrenAllowed = !component || !definition?.hasChildren
!store.actions.components.getDefinition(component._component)?.hasChildren
$: noPaste = !$store.componentToPaste $: noPaste = !$store.componentToPaste
const lastPartOfName = c => (c ? last(c._component.split("/")) : "") const lastPartOfName = c => (c ? last(c._component.split("/")) : "")
@ -130,7 +129,7 @@
<ConfirmDialog <ConfirmDialog
bind:this={confirmDeleteDialog} bind:this={confirmDeleteDialog}
title="Confirm Deletion" title="Confirm Deletion"
body={`Are you sure you wish to delete this '${lastPartOfName(component)}' component?`} body={`Are you sure you wish to delete this '${definition?.name}' component?`}
okText="Delete Component" okText="Delete Component"
onOk={deleteComponent} /> onOk={deleteComponent} />

View File

@ -32,7 +32,7 @@
// this statement initialises fields from parameters.fields // this statement initialises fields from parameters.fields
$: fields = $: fields =
fields || fields ||
Object.keys(parameterFields || { "": "" }).map(name => ({ Object.keys(parameterFields || {}).map(name => ({
name, name,
value: value:
(parameterFields && (parameterFields &&