Set default starting task when continuing a workflow execution

Author: zonia3000

CHANGELOG.md

@@ -19,6 +19,7 @@
     * supported editing of single dataset images (\#457);
     * used switches to represent boolean flags (\#457);
     * implemented continue/restart workflow (\#465);
+    * set default first task when continuing a workflow (\#466);
 
 # 0.10.2
 

__tests__/job_utilities.test.js

@@ -2,7 +2,8 @@ import { it, expect } from 'vitest';
 import {
 	extractJobErrorParts,
 	extractRelevantJobError,
-	generateNewUniqueDatasetName
+	generateNewUniqueDatasetName,
+	getFirstTaskIndexForContinuingWorkflow
 } from '$lib/common/job_utilities.js';
 
 const completeTracebackError = `TASK ERROR:Task id: 15 (Create OME-Zarr structure), e.workflow_task_order=0
@@ -237,6 +238,19 @@ it('generates new unique dataset name', () => {
 	);
 });
 
+it('get first task index for continuing workflow', () => {
+	expect(testGetFirstTaskIndexForContinuingWorkflow([null, null, null, null])).toEqual(0);
+	expect(testGetFirstTaskIndexForContinuingWorkflow(['done', 'done', null, null])).toEqual(2);
+	expect(testGetFirstTaskIndexForContinuingWorkflow(['done', 'failed', 'done', null])).toEqual(1);
+	expect(testGetFirstTaskIndexForContinuingWorkflow(['done', null, 'done', null])).toEqual(1);
+	expect(testGetFirstTaskIndexForContinuingWorkflow(['done', 'done', 'done', 'done'])).toEqual(
+		undefined
+	);
+	expect(testGetFirstTaskIndexForContinuingWorkflow(['submitted', 'failed', null, null])).toEqual(
+		undefined
+	);
+});
+
 /**
  * @param {string[]} names
  */
@@ -245,3 +259,20 @@ function getMockedDatasets(names) {
 		return { id: index + 1, name };
 	});
 }
+
+/**
+ * @param {Array<string|null>} values
+ * @returns {number|undefined}
+ */
+function testGetFirstTaskIndexForContinuingWorkflow(values) {
+	const workflowTasks = values.map((_, i) => {
+		return {
+			id: i + 1,
+			order: i
+		};
+	});
+	const statuses = Object.fromEntries(
+		values.map((v, i) => [i + 1, v]).filter((e) => e[1] !== null)
+	);
+	return getFirstTaskIndexForContinuingWorkflow(workflowTasks, statuses);
+}

src/lib/common/job_utilities.js

@@ -133,3 +133,16 @@ export function generateNewUniqueDatasetName(datasets, selectedDatasetName) {
 	} while (datasets.filter((d) => d.name === newDatasetName).length > 0);
 	return newDatasetName;
 }
+
+/**
+ * @param {Array<import("$lib/types-v2").WorkflowTaskV2>} workflowTasks
+ * @param {{[key: number]: import('$lib/types').JobStatus}} statuses
+ * @returns {number|undefined}
+ */
+export function getFirstTaskIndexForContinuingWorkflow(workflowTasks, statuses) {
+	if (workflowTasks.find((wft) => statuses[wft.id] === 'submitted')) {
+		// we can't re-submit while something is running
+		return undefined;
+	}
+	return workflowTasks.find((wft) => !(wft.id in statuses) || statuses[wft.id] === 'failed')?.order;
+}

src/lib/components/v2/projects/datasets/DatasetFiltersModal.svelte

@@ -49,7 +49,7 @@
 				const result = await response.json();
 				if (!response.ok) {
 					console.log('Dataset update failed', result);
-					throw new AlertError(await response.json());
+					throw new AlertError(result);
 				}
 				updateDatasetCallback(result);
 			},

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

@@ -2,7 +2,7 @@
 	import { page } from '$app/stores';
 	import { replaceEmptyStrings } from '$lib/common/component_utilities';
 	import { AlertError } from '$lib/common/errors';
-	import { generateNewUniqueDatasetName } from '$lib/common/job_utilities';
+	import { generateNewUniqueDatasetName, getFirstTaskIndexForContinuingWorkflow } from '$lib/common/job_utilities';
 	import Modal from '$lib/components/common/Modal.svelte';
 
 	/** @type {import('$lib/types-v2').DatasetV2[]} */
@@ -15,6 +15,8 @@
 	export let onJobSubmitted;
 	/** @type {(updatedDatasets: import('$lib/types-v2').DatasetV2[], newSelectedDatasetId: number) => void} */
 	export let onDatasetsUpdated;
+	/** @type {{[key: number]: import('$lib/types').JobStatus}} */
+	export let statuses;
 
 	/** @type {Modal} */
 	let modal;
@@ -48,7 +50,7 @@
 		if ((mode === 'run' || mode === 'restart') && workflow.task_list.length > 0) {
 			firstTaskIndex = 0;
 		} else {
-			firstTaskIndex = undefined;
+			firstTaskIndex = getFirstTaskIndexForContinuingWorkflow(workflow.task_list, statuses);
 		}
 		lastTaskIndex = undefined;
 		modal.show();
@@ -261,7 +263,7 @@
 						class:is-invalid={newDatasetName === selectedDataset?.name}
 					/>
 					<span class="invalid-feedback">
-						The new dataset name must be different than the original dataset name
+						The new dataset name must be different from the original dataset name
 					</span>
 				</div>
 			{/if}

src/routes/v2/projects/[projectId]/workflows/[workflowId]/+page.svelte

@@ -1099,6 +1099,7 @@
 	{datasets}
 	{selectedDatasetId}
 	{onJobSubmitted}
+	{statuses}
 	onDatasetsUpdated={(updatedDatasets, newSelectedDatasetId) => {
 		datasets = updatedDatasets;
 		selectedDatasetId = newSelectedDatasetId;

tests/v2/run_mock_tasks.spec.js

@@ -232,10 +232,7 @@ test('Collect and run mock tasks [v2]', async ({ page, workflow, request }) => {
 			modal
 				.getByRole('combobox', { name: 'First task (Optional)' })
 				.getByRole('option', { selected: true })
-		).toHaveText('Select first task');
-		await modal
-			.getByRole('combobox', { name: 'First task (Optional)' })
-			.selectOption('generic_task');
+		).toHaveText('generic_task');
 		await modal.getByRole('button', { name: 'Run', exact: true }).click();
 		await modal.getByRole('button', { name: 'Confirm' }).click();
 		await waitModalClosed(page);