Skip to content

Commit 6d6b74f

Browse files
committed
Enabled 'more' links for all the error types
1 parent 694c9f9 commit 6d6b74f

File tree

2 files changed

+30
-28
lines changed

2 files changed

+30
-28
lines changed

__tests__/VersionUpdate.test.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,11 @@ describe('VersionUpdate', () => {
7979

8080
await fireEvent.change(screen.getByRole('combobox'), { target: { value: '2.0.0' } });
8181

82-
const [moreLink, checkBtn, cancelBtn, updateBtnDisabled] = screen.getAllByRole('button');
83-
expect(moreLink.textContent).eq('more');
82+
const [moreLink1, moreLink2, moreLink3, checkBtn, cancelBtn, updateBtnDisabled] =
83+
screen.getAllByRole('button');
84+
expect(moreLink1.textContent).eq('more');
85+
expect(moreLink2.textContent).eq('more');
86+
expect(moreLink3.textContent).eq('more');
8487
expect(checkBtn.textContent).eq('Check');
8588
expect(cancelBtn.textContent).eq('Cancel');
8689
expect(updateBtnDisabled.textContent).eq('Update');
@@ -92,9 +95,9 @@ describe('VersionUpdate', () => {
9295

9396
const list = screen.getAllByRole('listitem');
9497
expect(list.length).eq(3);
95-
expect(list[0].textContent.trim()).eq("must have required property 'new_property'");
96-
expect(list[1].textContent.trim()).eq("must NOT have additional property 'extra_property'");
97-
expect(list[2].textContent.trim()).contain('/changed_property: must be boolean');
98+
expect(list[0].textContent).contain("must have required property 'new_property'");
99+
expect(list[1].textContent).contain("must NOT have additional property 'extra_property'");
100+
expect(list[2].textContent).contain('/changed_property: must be boolean');
98101

99102
await fireEvent.input(screen.getByRole('textbox'), {
100103
target: { value: '{"changed_property": true, "new_property": "test"}' }
@@ -140,8 +143,9 @@ describe('VersionUpdate', () => {
140143

141144
await fireEvent.change(screen.getByRole('combobox'), { target: { value: '2.0.0' } });
142145

143-
const [checkBtn, updateBtnDisabled] = screen.getAllByRole('button');
144-
expect(updateBtnDisabled.disabled).eq(true);
146+
const checkBtn = screen.getByRole('button', { name: 'Check' });
147+
const updateBtn = screen.getByRole('button', { name: 'Update' });
148+
expect(updateBtn.disabled).eq(true);
145149

146150
await fireEvent.input(screen.getByRole('textbox'), {
147151
target: { value: '}{' }

src/lib/components/workflow/VersionUpdate.svelte

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -210,30 +210,28 @@
210210
{/if}
211211
{#if error.keyword === 'additionalProperties'}
212212
must NOT have additional property '{error.params.additionalProperty}'
213-
{:else if error.keyword === 'required'}
214-
{error.message}
215213
{:else}
216214
{error.message}
217-
<small
218-
data-bs-toggle="collapse"
219-
data-bs-target="#collapse-{index}"
220-
aria-expanded="true"
221-
aria-controls="collapse-{index}"
222-
class="text-primary"
223-
role="button"
224-
>
225-
more
226-
</small>
227-
<div
228-
id="collapse-{index}"
229-
class="accordion-collapse collapse"
230-
data-bs-parent="#validation-errors"
231-
>
232-
<div class="accordion-body">
233-
<pre class="alert alert-warning mt-1">{JSON.stringify(error, null, 2)}</pre>
234-
</div>
235-
</div>
236215
{/if}
216+
<small
217+
data-bs-toggle="collapse"
218+
data-bs-target="#collapse-{index}"
219+
aria-expanded="true"
220+
aria-controls="collapse-{index}"
221+
class="text-primary"
222+
role="button"
223+
>
224+
more
225+
</small>
226+
<div
227+
id="collapse-{index}"
228+
class="accordion-collapse collapse"
229+
data-bs-parent="#validation-errors"
230+
>
231+
<div class="accordion-body">
232+
<pre class="alert alert-warning mt-1">{JSON.stringify(error, null, 2)}</pre>
233+
</div>
234+
</div>
237235
</li>
238236
{/each}
239237
</ul>

0 commit comments

Comments
 (0)