Merge pull request #465 from fractal-analytics-platform/continue-restart-workflow

Implemented continue/restart workflow

Author: zonia3000

CHANGELOG.md

@@ -18,6 +18,7 @@
     * moved editing of dataset inside dataset page (\#452);
     * supported editing of single dataset images (\#457);
     * used switches to represent boolean flags (\#457);
+    * implemented continue/restart workflow (\#465);
 
 # 0.10.2
 

__tests__/job_utilities.test.js

@@ -1,5 +1,9 @@
 import { it, expect } from 'vitest';
-import { extractJobErrorParts, extractRelevantJobError } from '$lib/common/job_utilities.js';
+import {
+	extractJobErrorParts,
+	extractRelevantJobError,
+	generateNewUniqueDatasetName
+} from '$lib/common/job_utilities.js';
 
 const completeTracebackError = `TASK ERROR:Task id: 15 (Create OME-Zarr structure), e.workflow_task_order=0
 TRACEBACK:
@@ -223,3 +227,21 @@ it('handles null or undefined inputs', () => {
 	expect(extractRelevantJobError(null)).eq('');
 	expect(extractRelevantJobError()).eq('');
 });
+
+it('generates new unique dataset name', () => {
+	expect(generateNewUniqueDatasetName(getMockedDatasets(['a', 'b']), 'a')).toEqual('a_1');
+	expect(generateNewUniqueDatasetName(getMockedDatasets(['a', 'a_1', 'b']), 'a')).toEqual('a_2');
+	expect(generateNewUniqueDatasetName(getMockedDatasets(['a', 'a_1', 'b']), 'a_1')).toEqual('a_2');
+	expect(generateNewUniqueDatasetName(getMockedDatasets(['a', 'a_1', 'a_2', 'b']), 'a_1')).toEqual(
+		'a_3'
+	);
+});
+
+/**
+ * @param {string[]} names
+ */
+function getMockedDatasets(names) {
+	return names.map((name, index) => {
+		return { id: index + 1, name };
+	});
+}

src/lib/common/job_utilities.js

@@ -114,3 +114,22 @@ export function extractRelevantJobError(completeJobError, maxLines = undefined)
 	}
 	return relevantError;
 }
+
+/**
+ * @param {import("$lib/types-v2").DatasetV2[]} datasets
+ * @param {string} selectedDatasetName
+ * @returns {string}
+ */
+export function generateNewUniqueDatasetName(datasets, selectedDatasetName) {
+	let i = 1;
+	const match = selectedDatasetName.match(/^(.*)_(\d+)$/);
+	if (match) {
+		selectedDatasetName = match[1];
+	}
+	let newDatasetName;
+	do {
+		newDatasetName = `${selectedDatasetName}_${i}`;
+		i++;
+	} while (datasets.filter((d) => d.name === newDatasetName).length > 0);
+	return newDatasetName;
+}

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

@@ -38,7 +38,9 @@
 	});
 
 	export async function init() {
-		form.init(workflowTask.input_filters.attributes, workflowTask.input_filters.types);
+		if (!form.hasUnsavedChanges()) {
+			form.init(workflowTask.input_filters.attributes, workflowTask.input_filters.types);
+		}
 
 		if (selectedDatasetId === undefined) {
 			datasetAttributes = {};