Skip to content

Commit a1e73f2

Browse files
committed
Escape entry name by concatenating with leading 'entry-' string
Closes #117
1 parent 8a0446e commit a1e73f2

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/lib/components/workflow/common/FormStructure.svelte

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
export let entryId = undefined
1414
export let isListEntry = false
1515
export let entryIndex = undefined
16+
// Set a random guid to the entry
17+
let entryEscapedName = 'entry-' + entryName
18+
// Generate a random string
1619
1720
// TODO: This is a temporary solution to the problem of having multiple entries with the same name
1821
if (entryId === undefined) {
@@ -100,11 +103,11 @@
100103
<div class="accordion">
101104
<div class="accordion-item">
102105
<div class="accordion-header">
103-
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#{entryId}">
106+
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#{entryEscapedName}">
104107
{!isListEntry? entryName : ''} (obj)
105108
</button>
106109
</div>
107-
<div id="{entryId}" class="accordion-collapse collapse">
110+
<div id="{entryEscapedName}" class="accordion-collapse collapse">
108111
<div class="accordion-body p-2">
109112
{#each Object.entries(entry) as [key, value]}
110113
<svelte:self entry={value} entryName={key} on:entryUpdated={handleEntryUpdate} on:entryInserted={handleNewEntryInserted}/>
@@ -132,11 +135,11 @@
132135
<div class="accordion">
133136
<div class="accordion-item">
134137
<div class="accordion-header">
135-
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#{entryName}">
138+
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#{entryEscapedName}">
136139
{!isListEntry ? entryName : ''} (list)
137140
</button>
138141
</div>
139-
<div id="{entryName}" class="accordion-collapse collapse">
142+
<div id="{entryEscapedName}" class="accordion-collapse collapse">
140143
<div class="accordion-body p-2">
141144
{#each entry as listItem, index}
142145
<svelte:self isListEntry={true} entry={listItem} entryIndex={index} entryId={entryName + '-' + index + '-' + 'list-item' } entryName={entryName + '-' + index + '-' + 'list-item' } on:entryUpdated={handleEntryUpdate} on:entryInserted={handleNewEntryInserted} />

0 commit comments

Comments
 (0)