Skip to content

Commit bfe96dd

Browse files
zonia3000zonia3000
committed
Renamed labels
1 parent 07b1b7b commit bfe96dd

File tree

7 files changed

+40
-39
lines changed

7 files changed

+40
-39
lines changed

‎src/lib/components/v2/workflow/ArgumentsSchema.svelte‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<div id="task-args-validation-errors" />
182182
{#if workflowTask.task_type === 'non_parallel' || workflowTask.task_type === 'compound'}
183183
{#if (hasNonParallelArgs && hasParallelArgs) || (workflowTask.task_type === 'compound' && !workflowTask.is_legacy_task && !workflowTask.task.args_schema_non_parallel)}
184-
<h5 class="ps-2 mt-3">Initialisation Parameters</h5>
184+
<h5 class="ps-2 mt-3">Initialisation Arguments</h5>
185185
{/if}
186186
{#if !workflowTask.is_legacy_task && workflowTask.task.args_schema_non_parallel && isSchemaValid}
187187
<div class="args-list">
@@ -208,7 +208,7 @@
208208
{/if}
209209
{#if workflowTask.task_type === 'parallel' || workflowTask.task_type === 'compound'}
210210
{#if (hasParallelArgs && hasNonParallelArgs) || (workflowTask.task_type === 'compound' && !argsSchemaParallel)}
211-
<h5 class="ps-2 mt-3">Compute Parameters</h5>
211+
<h5 class="ps-2 mt-3">Compute Arguments</h5>
212212
{/if}
213213
{#if argsSchemaParallel && isSchemaValid}
214214
<div class="args-list">

‎src/lib/components/v2/workflow/FormBaseEntry.svelte‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<input
1515
type="text"
1616
class="form-control"
17-
placeholder="Arg name"
17+
placeholder="Argument name"
1818
class:is-invalid={entry.error}
1919
bind:value={entry.key}
2020
on:input={triggerChanges}
@@ -24,7 +24,7 @@
2424
<input
2525
type="text"
2626
class="form-control"
27-
placeholder="Argument default value"
27+
placeholder="Argument value"
2828
class:is-invalid={entry.error}
2929
bind:value={entry.value}
3030
on:input={triggerChanges}
@@ -33,7 +33,7 @@
3333
<input
3434
type="number"
3535
class="form-control"
36-
placeholder="Argument default value"
36+
placeholder="Argument value"
3737
class:is-invalid={entry.error}
3838
bind:value={entry.value}
3939
on:input={triggerChanges}

‎src/lib/components/v2/workflow/FormEntry.svelte‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<input
3535
type="text"
3636
class="form-control"
37-
placeholder="Arg name"
37+
placeholder="Argument name"
3838
class:is-invalid={entry.error}
3939
bind:value={entry.key}
4040
data-bs-toggle="collapse"

‎tests/v2/import_export_args.spec.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ test('Import/export arguments [v2]', async ({ page, workflow }) => {
8181
await workflow.addUserTask(nonParallelTaskWithoutArgsSchema);
8282
await workflow.selectTask(nonParallelTaskWithoutArgsSchema);
8383
await page.getByRole('button', { name: 'Add property' }).click();
84-
await page.getByPlaceholder('Arg name').click();
85-
await page.getByPlaceholder('Arg name').fill('key_non_parallel');
86-
await page.getByPlaceholder('Argument default value').fill('value_non_parallel');
84+
await page.getByPlaceholder('Argument name').click();
85+
await page.getByPlaceholder('Argument name').fill('key_non_parallel');
86+
await page.getByPlaceholder('Argument value').fill('value_non_parallel');
8787
await page.getByRole('button', { name: 'Save changes' }).click();
8888

8989
const { file, data } = await exportArgs(page, nonParallelTaskWithoutArgsSchema);
@@ -99,9 +99,9 @@ test('Import/export arguments [v2]', async ({ page, workflow }) => {
9999
await workflow.addUserTask(parallelTaskWithoutArgsSchema);
100100
await workflow.selectTask(parallelTaskWithoutArgsSchema);
101101
await page.getByRole('button', { name: 'Add property' }).click();
102-
await page.getByPlaceholder('Arg name').click();
103-
await page.getByPlaceholder('Arg name').fill('key_parallel');
104-
await page.getByPlaceholder('Argument default value').fill('value_parallel');
102+
await page.getByPlaceholder('Argument name').click();
103+
await page.getByPlaceholder('Argument name').fill('key_parallel');
104+
await page.getByPlaceholder('Argument value').fill('value_parallel');
105105
await page.getByRole('button', { name: 'Save changes' }).click();
106106

107107
const { file, data } = await exportArgs(page, parallelTaskWithoutArgsSchema);
@@ -117,11 +117,11 @@ test('Import/export arguments [v2]', async ({ page, workflow }) => {
117117
await workflow.addUserTask(compoundTaskWithoutArgsSchema);
118118
await workflow.selectTask(compoundTaskWithoutArgsSchema);
119119
await page.getByRole('button', { name: 'Add property' }).first().click();
120-
await page.getByPlaceholder('Arg name').fill('key_non_parallel');
121-
await page.getByPlaceholder('Argument default value').fill('value_non_parallel');
120+
await page.getByPlaceholder('Argument name').fill('key_non_parallel');
121+
await page.getByPlaceholder('Argument value').fill('value_non_parallel');
122122
await page.getByRole('button', { name: 'Add property' }).nth(1).click();
123-
await page.getByPlaceholder('Arg name').nth(1).fill('key_parallel');
124-
await page.getByPlaceholder('Argument default value').nth(1).fill('value_parallel');
123+
await page.getByPlaceholder('Argument name').nth(1).fill('key_parallel');
124+
await page.getByPlaceholder('Argument value').nth(1).fill('value_parallel');
125125
await page.getByRole('button', { name: 'Save changes' }).click();
126126
await page.getByText('Arguments changes saved successfully').waitFor();
127127

‎tests/v2/task_version_update.spec.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ test('Task version update [v2]', async ({ page, workflow }) => {
171171
await page.getByRole('button', { name: 'Arguments', exact: true }).click();
172172
await page.getByRole('textbox', { name: 'p2' }).fill('test-value');
173173
await page.getByRole('button', { name: 'Save changes' }).click();
174+
await page.getByText('Arguments changes saved successfully').waitFor();
174175
await page.getByRole('button', { name: 'Version' }).click();
175176
await page
176177
.getByRole('combobox', { name: 'New versions of this task exist:' })

‎tests/v2/workflow_task_meta_properties.spec.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ test('Workflow task meta properties [v2]', async ({ page, workflow }) => {
2929
await test.step('Add non parallel properties', async () => {
3030
const addPropertyBtn = tab.getByRole('button', { name: 'Add property' }).nth(0);
3131
await addPropertyBtn.click();
32-
await tab.getByPlaceholder('Arg name').fill('k1');
33-
await tab.getByPlaceholder('Argument default value').fill('v1');
32+
await tab.getByPlaceholder('Argument name').fill('k1');
33+
await tab.getByPlaceholder('Argument value').fill('v1');
3434

3535
await addPropertyBtn.click();
36-
await tab.getByRole('textbox', { name: 'Arg name' }).nth(1).fill('k2');
36+
await tab.getByRole('textbox', { name: 'Argument name' }).nth(1).fill('k2');
3737
await tab.getByRole('combobox').nth(1).selectOption('Object');
3838
await tab.locator('.accordion-button').click();
3939
const objectContainer = tab.locator('.accordion-body');
4040

4141
await objectContainer.getByRole('button', { name: 'Add property' }).click();
42-
await objectContainer.getByPlaceholder('Arg name').fill('k3');
42+
await objectContainer.getByPlaceholder('Argument name').fill('k3');
4343
await objectContainer.getByRole('combobox').selectOption('Number');
4444
await objectContainer.getByRole('spinbutton').fill('42');
4545

@@ -50,7 +50,7 @@ test('Workflow task meta properties [v2]', async ({ page, workflow }) => {
5050
await test.step('Add parallel properties', async () => {
5151
const addPropertyBtn = tab.getByRole('button', { name: 'Add property' }).nth(2);
5252
await addPropertyBtn.click();
53-
await tab.getByPlaceholder('Arg name').nth(4).fill('k4');
53+
await tab.getByPlaceholder('Argument name').nth(4).fill('k4');
5454
await tab.getByRole('combobox').nth(3).selectOption('Array');
5555

5656
await tab.locator('.accordion-button').nth(1).click();
@@ -87,8 +87,8 @@ test('Workflow task meta properties [v2]', async ({ page, workflow }) => {
8787
await page.getByText('Meta', { exact: true }).click();
8888

8989
await expect(tab.getByLabel('Remove property')).toHaveCount(5);
90-
await expect(tab.getByRole('textbox', { name: 'Arg name' }).first()).toHaveValue('k1');
91-
await expect(tab.getByRole('textbox', { name: 'Argument default value' }).first()).toHaveValue(
90+
await expect(tab.getByRole('textbox', { name: 'Argument name' }).first()).toHaveValue('k1');
91+
await expect(tab.getByRole('textbox', { name: 'Argument value' }).first()).toHaveValue(
9292
'v1'
9393
);
9494
await tab.locator('.accordion-button').first().click();

‎tests/v2/workflow_task_without_schema.spec.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ test('Workflow task without JSON Schema [v2]', async ({ page, workflow }) => {
2727

2828
// String property
2929
await addPropertyBtn.click();
30-
await tab.getByRole('textbox', { name: 'Arg name' }).fill('k1');
31-
await tab.getByRole('textbox', { name: 'Argument default value' }).fill('foo');
30+
await tab.getByRole('textbox', { name: 'Argument name' }).fill('k1');
31+
await tab.getByRole('textbox', { name: 'Argument value' }).fill('foo');
3232

3333
// Number property
3434
await addPropertyBtn.click();
35-
await tab.getByRole('textbox', { name: 'Arg name' }).nth(1).fill('k2');
35+
await tab.getByRole('textbox', { name: 'Argument name' }).nth(1).fill('k2');
3636
await tab.getByRole('combobox').nth(1).selectOption('Number');
3737
await tab.getByRole('spinbutton').fill('42');
3838

3939
// Boolean property
4040
await addPropertyBtn.click();
41-
await tab.getByRole('textbox', { name: 'Arg name' }).nth(2).fill('k3');
41+
await tab.getByRole('textbox', { name: 'Argument name' }).nth(2).fill('k3');
4242
await tab.getByRole('combobox').nth(2).selectOption('Boolean');
4343
await expect(
4444
tab.getByRole('combobox').nth(2).getByRole('option', { selected: true })
@@ -54,40 +54,40 @@ test('Workflow task without JSON Schema [v2]', async ({ page, workflow }) => {
5454

5555
// Object property
5656
await addPropertyBtn.click();
57-
await tab.getByRole('textbox', { name: 'Arg name' }).nth(4).fill('k4');
57+
await tab.getByRole('textbox', { name: 'Argument name' }).nth(4).fill('k4');
5858
await tab.getByRole('combobox').nth(5).selectOption('Object');
5959
await tab.locator('.accordion-button').click();
6060
const objectContainer = tab.locator('.accordion-body');
6161

6262
// Add nested array
6363
objectContainer.getByRole('button', { name: 'Add property' }).click();
64-
await objectContainer.getByRole('textbox', { name: 'Arg name' }).fill('k5');
64+
await objectContainer.getByRole('textbox', { name: 'Argument name' }).fill('k5');
6565
await objectContainer.getByRole('combobox').selectOption('Array');
6666
await objectContainer.locator('.accordion-button').click();
6767
const arrayContainer = objectContainer.locator('.accordion-body');
6868

6969
// Add array string property
7070
arrayContainer.getByRole('button', { name: 'Add property' }).click();
71-
await expect(arrayContainer.getByRole('textbox', { name: 'Arg name' })).toHaveCount(0);
72-
await arrayContainer.getByRole('textbox', { name: 'Argument default value' }).fill('bar');
71+
await expect(arrayContainer.getByRole('textbox', { name: 'Argument name' })).toHaveCount(0);
72+
await arrayContainer.getByRole('textbox', { name: 'Argument value' }).fill('bar');
7373

7474
// Add nested object
7575
arrayContainer.getByRole('button', { name: 'Add property' }).click();
76-
await expect(arrayContainer.getByRole('textbox', { name: 'Arg name' })).toHaveCount(0);
76+
await expect(arrayContainer.getByRole('textbox', { name: 'Argument name' })).toHaveCount(0);
7777
await arrayContainer.getByRole('combobox').nth(1).selectOption('Object');
7878
await arrayContainer.locator('.accordion-button').click();
7979
const childObjectContainer = arrayContainer.locator('.accordion-body');
8080

8181
// Add child object property
8282
childObjectContainer.getByRole('button', { name: 'Add property' }).click();
83-
await childObjectContainer.getByRole('textbox', { name: 'Arg name' }).fill('k6');
84-
await childObjectContainer.getByRole('textbox', { name: 'Argument default value' }).fill('k6');
83+
await childObjectContainer.getByRole('textbox', { name: 'Argument name' }).fill('k6');
84+
await childObjectContainer.getByRole('textbox', { name: 'Argument value' }).fill('k6');
8585

8686
// Add duplicated child object property (invalid)
8787
childObjectContainer.getByRole('button', { name: 'Add property' }).click();
88-
await childObjectContainer.getByRole('textbox', { name: 'Arg name' }).nth(1).fill('k6');
88+
await childObjectContainer.getByRole('textbox', { name: 'Argument name' }).nth(1).fill('k6');
8989
await childObjectContainer
90-
.getByRole('textbox', { name: 'Argument default value' })
90+
.getByRole('textbox', { name: 'Argument value' })
9191
.nth(1)
9292
.fill('k6');
9393
});
@@ -115,8 +115,8 @@ test('Workflow task without JSON Schema [v2]', async ({ page, workflow }) => {
115115
await page.reload();
116116
await workflow.selectTask(taskName);
117117
await expect(tab.getByLabel('Remove property')).toHaveCount(8);
118-
await expect(tab.getByRole('textbox', { name: 'Arg name' }).first()).toHaveValue('k1');
119-
await expect(tab.getByRole('textbox', { name: 'Argument default value' }).first()).toHaveValue(
118+
await expect(tab.getByRole('textbox', { name: 'Argument name' }).first()).toHaveValue('k1');
119+
await expect(tab.getByRole('textbox', { name: 'Argument value' }).first()).toHaveValue(
120120
'foo'
121121
);
122122
await expect(
@@ -127,7 +127,7 @@ test('Workflow task without JSON Schema [v2]', async ({ page, workflow }) => {
127127
await objectContainer.locator('.accordion-button').first().click();
128128
const arrayContainer = objectContainer.locator('.accordion-body');
129129
await expect(
130-
arrayContainer.getByRole('textbox', { name: 'Argument default value' })
130+
arrayContainer.getByRole('textbox', { name: 'Argument value' })
131131
).toHaveValue('bar');
132132
});
133133

0 commit comments

Comments
 (0)