Test changes for non-converter tasks running on empty image

Author: zonia3000

src/lib/components/v2/tasks/AddSingleTask.svelte

@@ -96,7 +96,11 @@
 
 		const typesValid = typesEditor?.validate();
 
-		if (Object.keys($validationErrors).length > 0 || !typesValid || !taskGroupSelector?.validate()) {
+		if (
+			Object.keys($validationErrors).length > 0 ||
+			!typesValid ||
+			!taskGroupSelector?.validate()
+		) {
 			return;
 		}
 
@@ -115,11 +119,19 @@
 			docs_link
 		};
 
-		if (argsSchemaNonParallel && (taskType === 'non_parallel' || taskType === 'compound')) {
+		if (
+			argsSchemaNonParallel &&
+			(taskType === 'non_parallel' ||
+				taskType === 'compound' ||
+				taskType === 'converter_non_parallel')
+		) {
 			bodyData.args_schema_non_parallel = argsSchemaNonParallel;
 		}
 
-		if (argsSchemaParallel && (taskType === 'parallel' || taskType === 'compound')) {
+		if (
+			argsSchemaParallel &&
+			(taskType === 'parallel' || taskType === 'compound' || taskType === 'converter_compound')
+		) {
 			bodyData.args_schema_parallel = argsSchemaParallel;
 		}
 

src/routes/healthcheck/+page.svelte

@@ -116,6 +116,7 @@
 			headers,
 			body: normalizePayload({
 				name: '__TEST_ECHO_TASK__',
+				type: 'converter_non_parallel',
 				command_non_parallel: 'echo',
 				version: '9.9.9',
 				input_types: {},

tests/v2/accounting.spec.js

@@ -15,7 +15,7 @@ test('Display accounting page', async ({ page, workflow }) => {
 	await test.step('Go to workflow page and add generic_task', async () => {
 		await page.goto(workflow.url);
 		await waitPageLoading(page);
-		await workflow.addTask('generic_task');
+		await workflow.addTask('generic_task_converter');
 	});
 
 	await test.step('Start the job', async () => {

tests/v2/admin_jobs.spec.js

@@ -10,7 +10,7 @@ test('Execute a job and show it on the job tables [v2]', async ({ page, request
 	let taskName;
 	await test.step('Create test tasks', async () => {
 		taskName = await createFakeTask(page, {
-			type: 'non_parallel'
+			type: 'converter_non_parallel'
 		});
 	});
 
@@ -22,16 +22,15 @@ test('Execute a job and show it on the job tables [v2]', async ({ page, request
 	let jobId1;
 	await test.step('Create first job and wait its failure', async () => {
 		const job = await createJob(page, request, async function (workflow) {
-			await workflow.addTask('generic_task');
-			await workflow.selectTask('generic_task');
+			await workflow.addTask('generic_task_converter');
+			await workflow.selectTask('generic_task_converter');
 			await page.getByRole('switch').check();
 			await page.getByRole('button', { name: 'Save changes' }).click();
 			await page.getByText('Arguments changes saved successfully').waitFor();
 		});
 		workflow1 = job.workflow;
 		dataset1 = job.dataset;
 		jobId1 = job.jobId;
-		await waitTaskSubmitted(page);
 		await waitTaskFailure(page);
 		await workflow1.deleteProject();
 	});

tests/v2/task_utils.js

@@ -26,12 +26,14 @@ export async function createFakeTask(page, task) {
 			await page.getByRole('combobox', { name: 'Task type' }).selectOption('Parallel');
 		} else if (task.type === 'compound') {
 			await page.getByRole('combobox', { name: 'Task type' }).selectOption('Compound');
+		} else if (task.type === 'converter_non_parallel') {
+			await page.getByRole('combobox', { name: 'Task type' }).selectOption('Converter Non Parallel');
 		}
 
 		await page.getByRole('textbox', { name: 'Task name' }).fill(taskName);
 
 		const command = path.join(__dirname, '..', 'data', 'fake-task.sh');
-		if (task.type === 'non_parallel' || task.type === 'compound') {
+		if (task.type === 'non_parallel' || task.type === 'compound' || task.type === 'converter_non_parallel') {
 			await page
 				.getByRole('textbox', { name: 'Command non parallel' })
 				.fill(task.command_non_parallel || command);

tests/v2/tasks_filtering.spec.js

@@ -1,6 +1,8 @@
 import { expect, test } from './workflow_fixture.js';
 import { selectSlimSelect, waitPageLoading } from '../utils.js';
 
+const NUM_MOCK_TASKS = 19
+
 test('Tasks filtering', async ({ page, workflow }) => {
 	await page.waitForURL(workflow.url);
 	await waitPageLoading(page);
@@ -31,7 +33,7 @@ async function testFiltering(page) {
 	const rows = page.getByRole('row');
 
 	await selectSlimSelect(page, packageFilter, 'fractal-tasks-mock');
-	await expect(rows).toHaveCount(18);
+	await expect(rows).toHaveCount(NUM_MOCK_TASKS);
 	await selectSlimSelect(page, modalityFilter, 'HCS');
 	await expect(rows).toHaveCount(8);
 	await selectSlimSelect(page, categoryFilter, 'Conversion');
@@ -40,14 +42,14 @@ async function testFiltering(page) {
 
 	await deselect(modalityFilter);
 	await deselect(categoryFilter);
-	await expect(rows).toHaveCount(18);
+	await expect(rows).toHaveCount(NUM_MOCK_TASKS);
 
 	await selectSlimSelect(page, tagFilter, 'Deep Learning');
 	await expect(rows).toHaveCount(3);
 	await expect(page.getByRole('row', { name: 'cellpose_segmentation' })).toBeVisible();
 
 	await deselect(tagFilter);
-	await expect(rows).toHaveCount(18);
+	await expect(rows).toHaveCount(NUM_MOCK_TASKS);
 
 	await search(page, 'mip', 'MIP_compound'); // search by task_name
 	await search(page, 'deep', 'cellpose_segmentation'); // search by tag
@@ -74,5 +76,5 @@ async function search(page, query, expectedTaskName) {
 	await expect(page.getByRole('row')).toHaveCount(3);
 	await expect(page.getByRole('row', { name: expectedTaskName })).toBeVisible();
 	await page.getByPlaceholder('Search...').fill('');
-	await expect(page.getByRole('row')).toHaveCount(18);
+	await expect(page.getByRole('row')).toHaveCount(NUM_MOCK_TASKS);
 }

tests/v2/workflow_task_run_no_schema.spec.js

@@ -21,7 +21,7 @@ test('Workflow task runs on task without arguments', async ({ page, workflow })
 
 	await test.step('Create test tasks', async () => {
 		taskName = await createFakeTask(page, {
-			type: 'non_parallel',
+			type: 'converter_non_parallel',
 			version: '0.0.1',
 			command_non_parallel: 'echo'
 		});

tests/v2/workflow_task_run_schema_version_changes.spec.js

@@ -24,7 +24,7 @@ test('Workflow task runs display different versions of arguments schema', async
 
 	await test.step('Create test tasks', async () => {
 		taskName = await createFakeTask(page, {
-			type: 'non_parallel',
+			type: 'converter_non_parallel',
 			version: '0.0.1',
 			command_non_parallel: 'echo',
 			args_schema_non_parallel: {
@@ -36,7 +36,7 @@ test('Workflow task runs display different versions of arguments schema', async
 		});
 		await createFakeTask(page, {
 			name: taskName,
-			type: 'non_parallel',
+			type: 'converter_non_parallel',
 			version: '0.0.2',
 			command_non_parallel: 'echo',
 			args_schema_non_parallel: {