Improved arguments form titles

Author: zonia3000

src/lib/components/common/jschema/schema_management.js

@@ -541,6 +541,7 @@ export function stripSchemaProperties(schema, legacy = true) {
 	if (schema.required) {
 		schema.required = schema.required.filter((k) => !ignoreProperties.includes(k));
 	}
+	return schema;
 }
 
 /**

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

@@ -4,7 +4,10 @@
 	import { displayStandardErrorAlert } from '$lib/common/errors';
 	import FormBuilder from './FormBuilder.svelte';
 	import ImportExportArgs from './ImportExportArgs.svelte';
-	import { stripNullAndEmptyObjectsAndArrays } from '$lib/components/common/jschema/schema_management';
+	import {
+		stripNullAndEmptyObjectsAndArrays,
+		stripSchemaProperties
+	} from '$lib/components/common/jschema/schema_management';
 
 	const SUPPORTED_SCHEMA_VERSIONS = ['pydantic_v1'];
 
@@ -127,12 +130,27 @@
 	function argsSchemaVersionValid(argsSchemaVersion) {
 		return argsSchemaVersion && SUPPORTED_SCHEMA_VERSIONS.includes(argsSchemaVersion);
 	}
+
+	$: showNonParallelTitle =
+		!workflowTask.is_legacy_task &&
+		workflowTask.task.args_schema_non_parallel &&
+		Object.keys(
+			stripSchemaProperties(workflowTask.task.args_schema_non_parallel, workflowTask.is_legacy_task)
+				.properties
+		).length;
+
+	$: showParallelTitle =
+		argsSchemaParallel &&
+		Object.keys(stripSchemaProperties(argsSchemaParallel, workflowTask.is_legacy_task).properties)
+			.length;
 </script>
 
 <div id="workflow-arguments-schema-panel">
 	<div id="json-schema-validation-errors" />
 	{#if workflowTask.task_type === 'non_parallel' || workflowTask.task_type === 'compound'}
-		<h5 class="ps-2 mt-3">Args non parallel</h5>
+		{#if showNonParallelTitle}
+			<h5 class="ps-2 mt-3">Initialisation Parameters</h5>
+		{/if}
 		{#if !workflowTask.is_legacy_task && workflowTask.task.args_schema_non_parallel && isSchemaValid}
 			<div class="args-list">
 				<JSchema
@@ -153,17 +171,13 @@
 			</div>
 		{/if}
 	{/if}
-	{#if workflowTask.task_type === 'compound'}
+	{#if workflowTask.task_type === 'compound' && showParallelTitle}
 		<hr />
 	{/if}
 	{#if workflowTask.task_type === 'parallel' || workflowTask.task_type === 'compound'}
-		<h5 class="ps-2 mt-3">
-			{#if workflowTask.is_legacy_task}
-				Args (legacy task)
-			{:else}
-				Args parallel
-			{/if}
-		</h5>
+		{#if showParallelTitle}
+			<h5 class="ps-2 mt-3">Compute Parameters</h5>
+		{/if}
 		{#if argsSchemaParallel && isSchemaValid}
 			<div class="args-list">
 				<JSchema
@@ -184,6 +198,9 @@
 			</div>
 		{/if}
 	{/if}
+	{#if !showNonParallelTitle && !showParallelTitle}
+		<p class="mt-3 ps-3">No arguments</p>
+	{/if}
 	<div class="d-flex jschema-controls-bar p-3">
 		<ImportExportArgs
 			{workflowTask}

src/lib/components/v2/workflow/JSchema.svelte

@@ -150,9 +150,6 @@
 	<div id="json-schema">
 		{#key schemaManager}
 			<PropertiesBlock properties={parsedSchema.properties} required={parsedSchema.required} />
-			{#if Object.entries(parsedSchema.properties).length === 0}
-				<span class="ps-2">-</span>
-			{/if}
 		{/key}
 	</div>
 {:else if parsedSchema === undefined}

tests/v2/run_mock_tasks.spec.js

@@ -126,13 +126,6 @@ test('Collect and run mock tasks [v2]', async ({ page, workflow, request }) => {
 		).toHaveText(datasetName2);
 	});
 
-	await test.step('Select the first dataset', async () => {
-		await page
-			.getByRole('combobox', { name: 'Dataset', exact: true })
-			.first()
-			.selectOption(datasetName1);
-	});
-
 	await test.step('Add and select create_ome_zarr_compound', async () => {
 		await workflow.addCollectedTask('create_ome_zarr_compound');
 		await workflow.selectTask('create_ome_zarr_compound');
@@ -144,6 +137,13 @@ test('Collect and run mock tasks [v2]', async ({ page, workflow, request }) => {
 		await page.getByText('Arguments changes saved successfully').waitFor();
 	});
 
+	await test.step('Select the first dataset', async () => {
+		await page
+			.getByRole('combobox', { name: 'Dataset', exact: true })
+			.first()
+			.selectOption(datasetName1);
+	});
+
 	await test.step('Start the job', async () => {
 		await page.getByRole('button', { name: 'Run workflow' }).click();
 		const modal = page.locator('.modal.show');