From d86e94376586870a8b18dc0d08dca60ee86ee0fa Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 8 Nov 2023 10:27:15 +0000 Subject: [PATCH 1/2] Automation history issue fix --- .../FlowChart/FlowItemHeader.svelte | 68 +++++++++++-------- .../AutomationBuilder/TestDisplay.svelte | 1 + .../_components/HistoryDetailsPanel.svelte | 2 +- 3 files changed, 43 insertions(+), 28 deletions(-) diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte index 0c7ac3d27d..3c9e1a13b1 100644 --- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte +++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte @@ -13,13 +13,13 @@ export let idx export let addLooping export let deleteStep - + export let enableNaming = true let validRegex = /^[A-Za-z0-9_\s]+$/ let typing = false const dispatch = createEventDispatcher() - $: stepNames = $selectedAutomation.definition.stepNames + $: stepNames = $selectedAutomation?.definition.stepNames $: automationName = stepNames?.[block.id] || block?.name || "" $: automationNameError = getAutomationNameError(automationName) $: status = updateStatus(testResult, isTrigger) @@ -32,7 +32,7 @@ )?.[0] } } - $: loopBlock = $selectedAutomation.definition.steps.find( + $: loopBlock = $selectedAutomation?.definition.steps.find( x => x.blockToLoop === block?.id ) @@ -126,24 +126,33 @@ Step {idx} {/if} - { - automationName = e.target.value.trim() - }} - on:click={startTyping} - on:blur={async () => { - typing = false - if (automationNameError) { - automationName = stepNames[block.id] || block?.name - } else { - await saveName() - } - }} - /> + + {#if enableNaming} + { + automationName = e.target.value.trim() + }} + on:click={startTyping} + on:blur={async () => { + typing = false + if (automationNameError) { + automationName = stepNames[block.id] || block?.name + } else { + await saveName() + } + }} + /> + {:else} +
+ {automationName} +
+ {/if}
@@ -178,9 +187,11 @@ {/if} - - - + {#if !isHeaderTrigger} + + + + {/if} {/if} {#if !showTestStatus} {#if block.stepId !== ActionStepID.LOOP} (openBlocks[block.id] = !openBlocks[block.id])} isTrigger={idx === 0} diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte index 5b9c925130..cde76fa1c0 100644 --- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/HistoryDetailsPanel.svelte @@ -56,7 +56,7 @@ {/if} {#key history}
- +
{/key} From 555f8fc22ccdd77da0c44fbab58ad8725153d770 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 8 Nov 2023 11:29:28 +0000 Subject: [PATCH 2/2] Bump version to 2.13.4 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 25ec556c56..765395227c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.13.3", + "version": "2.13.4", "npmClient": "yarn", "packages": [ "packages/*"