From 14f410dc571a609ce8099db3d16cc8ac3976cd71 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 8 Feb 2021 10:01:38 +0000 Subject: [PATCH 1/3] Remove empty field in saving row action to make it more clear that it's optional --- .../PropertyControls/EventsEditor/actions/SaveFields.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte index a27acab956..c8e3d5b4d5 100644 --- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte +++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte @@ -32,7 +32,7 @@ // this statement initialises fields from parameters.fields $: fields = fields || - Object.keys(parameterFields || { "": "" }).map(name => ({ + Object.keys(parameterFields || {}).map(name => ({ name, value: (parameterFields && From 7e140e9e5d78eab7e5c031ad5eae26d5965c291b Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 9 Feb 2021 09:28:37 +0000 Subject: [PATCH 2/3] Update docker-compose.yaml --- hosting/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/docker-compose.yaml b/hosting/docker-compose.yaml index bab7f61df1..e8408d9a7d 100644 --- a/hosting/docker-compose.yaml +++ b/hosting/docker-compose.yaml @@ -84,7 +84,7 @@ services: #- "4369:4369" #- "9100:9100" volumes: - - couchdb_data:/couchdb + - couchdb_data:/opt/couchdb/data couch-init: image: curlimages/curl From 465a240e879aae9f59504608cfe353bfd4a8b534 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 9 Feb 2021 10:49:22 +0000 Subject: [PATCH 3/3] Use real component name in deletion confirmation modal --- .../design/NavigationPanel/ComponentDropdownMenu.svelte | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte b/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte index a027beab18..750ccef872 100644 --- a/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte +++ b/packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte @@ -13,9 +13,8 @@ let dropdown let anchor - $: noChildrenAllowed = - !component || - !store.actions.components.getDefinition(component._component)?.hasChildren + $: definition = store.actions.components.getDefinition(component?._component) + $: noChildrenAllowed = !component || !definition?.hasChildren $: noPaste = !$store.componentToPaste const lastPartOfName = c => (c ? last(c._component.split("/")) : "") @@ -130,7 +129,7 @@