Merge pull request #473 from fractal-analytics-platform/fixed-meta-properties-update

Fixed issue in meta properties update

Author: zonia3000

CHANGELOG.md

@@ -1,5 +1,9 @@
 *Note: Numbers like (\#123) point to closed Pull Requests on the fractal-web repository.*
 
+# Unreleased
+
+* used payload containing all fields in meta properties PATCH endpoint (\#473).
+
 # 1.0.0
 
 * Supported fractal-server API V2:

playwright.config.js

@@ -47,7 +47,7 @@ export default defineConfig({
 
 	webServer: [
 		{
-			command: './tests/start-test-server.sh 2.0.0a10',
+			command: './tests/start-test-server.sh 2.0.0',
 			port: 8000,
 			waitForPort: true,
 			stdout: 'pipe',

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

@@ -8,41 +8,28 @@
 	// The form should be structured in multiple levels of depth, and support complex structure.
 	import { page } from '$app/stores';
 	import FormBuilder from '$lib/components/v2/workflow/FormBuilder.svelte';
-	import { getOnlyModifiedProperties } from '$lib/common/component_utilities';
 	import { displayStandardErrorAlert } from '$lib/common/errors';
 
 	/** @type {import('$lib/types-v2').WorkflowTaskV2} */
 	export let workflowTask;
 
 	let metaPropertiesNonParallel = {};
-	let originalMetaPropertiesNonParallel = {};
-
 	let metaPropertiesParallel = {};
-	let originalMetaPropertiesParallel = {};
 
 	$: {
 		metaPropertiesNonParallel = workflowTask.meta_non_parallel || {};
 		metaPropertiesParallel = workflowTask.meta_parallel || {};
-		updateOriginalMetaProperties();
 	}
 
 	async function updateMetaNonParallel() {
-		const modifiedProperties = getOnlyModifiedProperties(
-			originalMetaPropertiesNonParallel,
-			metaPropertiesNonParallel
-		);
 		await handleEntryUpdate({
-			meta_non_parallel: modifiedProperties
+			meta_non_parallel: metaPropertiesNonParallel
 		});
 	}
 
 	async function updateMetaParallel() {
-		const modifiedProperties = getOnlyModifiedProperties(
-			originalMetaPropertiesParallel,
-			metaPropertiesParallel
-		);
 		await handleEntryUpdate({
-			meta_parallel: modifiedProperties
+			meta_parallel: metaPropertiesParallel
 		});
 	}
 
@@ -71,21 +58,10 @@
 			workflowTask.meta_parallel = result.meta_parallel;
 			metaPropertiesNonParallel = result.meta_non_parallel || {};
 			metaPropertiesParallel = result.meta_parallel || {};
-			// Updating original properties again
-			updateOriginalMetaProperties();
 		} else {
 			displayStandardErrorAlert(result, 'metaPropertiesFormError');
 		}
 	}
-
-	function updateOriginalMetaProperties() {
-		for (let key in metaPropertiesNonParallel) {
-			originalMetaPropertiesNonParallel[key] = metaPropertiesNonParallel[key];
-		}
-		for (let key in metaPropertiesParallel) {
-			originalMetaPropertiesParallel[key] = metaPropertiesParallel[key];
-		}
-	}
 </script>
 
 <div>

tests/v1/collect_core_tasks.setup.js

@@ -17,6 +17,7 @@ test('Collect core tasks', async ({ page }) => {
 
 	await test.step('Start task collection', async () => {
 		await page.getByLabel('Package', { exact: true }).fill('fractal-tasks-core');
+		await page.getByRole('textbox', { name: 'Package Version' }).fill('0.14.3');
 
 		const collectBtn = page.getByRole('button', { name: /^Collect$/ });
 		await collectBtn.click();

tests/v2/workflow_task_meta_properties.spec.js

@@ -0,0 +1,52 @@
+import { test } from './workflow_fixture.js';
+import { waitPageLoading } from '../utils.js';
+import { createFakeTask, deleteTask } from './task_utils.js';
+
+test('Workflow task meta properties [v2]', async ({ page, workflow }) => {
+	await page.waitForURL(workflow.url);
+	await waitPageLoading(page);
+
+	let taskName;
+	await test.step('Create test tasks', async () => {
+		taskName = await createFakeTask(page, { type: 'non_parallel' });
+	});
+
+	await test.step('Open workflow page', async () => {
+		await workflow.openWorkflowPage();
+	});
+
+	await test.step('Add tasks to workflow', async () => {
+		await workflow.addUserTask(taskName);
+		await workflow.selectTask(taskName);
+	});
+
+	await test.step('Open Meta tab', async () => {
+		await page.getByText('Meta', { exact: true }).click();
+	});
+
+	await test.step('Add first property', async () => {
+		await page.getByRole('button', { name: 'Add property' }).click();
+		await page.getByPlaceholder('Arg name').fill('k1');
+		await page.getByPlaceholder('Argument default value').fill('v1');
+		await page.getByLabel('Save argument').click();
+	});
+
+	await test.step('Add second property', async () => {
+		await page.getByRole('button', { name: 'Add property' }).click();
+		await page.getByPlaceholder('Arg name').fill('k2');
+		await page.getByPlaceholder('Argument default value').fill('v2');
+		await page.getByLabel('Save argument').click();
+	});
+
+	await test.step('Verify that meta contains the 2 properties', async () => {
+		await page.getByText('k1').waitFor();
+		await page.getByText('k2').waitFor();
+		await page.getByText('v1').waitFor();
+		await page.getByText('v2').waitFor();
+	});
+
+	await test.step('Cleanup', async () => {
+		await workflow.removeCurrentTask();
+		await deleteTask(page, taskName);
+	});
+});