Removed not active tasks from available versions

zonia3000 · zonia3000 · commit f0623134bbb5 · 2024-12-12T14:58:06.000+01:00
diff --git a/__tests__/v2/VersionUpdate.test.js b/__tests__/v2/VersionUpdate.test.js
@@ -55,7 +55,8 @@ const taskGroups = [
 				args_schema_parallel: null,
 				taskgroupv2_id: 1
 			}
-		]
+		],
+		active: true
 	},
 	{
 		id: 2,
@@ -70,7 +71,8 @@ const taskGroups = [
 				args_schema_parallel: null,
 				taskgroupv2_id: 2
 			}
-		]
+		],
+		active: true
 	},
 	{
 		id: 3,
@@ -85,7 +87,8 @@ const taskGroups = [
 				args_schema_parallel: null,
 				taskgroupv2_id: 3
 			}
-		]
+		],
+		active: true
 	},
 	{
 		id: 4,
@@ -100,7 +103,8 @@ const taskGroups = [
 				args_schema_parallel: {},
 				taskgroupv2_id: 4
 			}
-		]
+		],
+		active: true
 	},
 	{
 		id: 5,
@@ -115,7 +119,8 @@ const taskGroups = [
 				args_schema_parallel: {},
 				taskgroupv2_id: 5
 			}
-		]
+		],
+		active: true
 	},
 	{
 		id: 6,
@@ -130,7 +135,8 @@ const taskGroups = [
 				args_schema_parallel: {},
 				taskgroupv2_id: 6
 			}
-		]
+		],
+		active: true
 	},
 	{
 		id: 7,
@@ -145,7 +151,8 @@ const taskGroups = [
 				args_schema_parallel: {},
 				taskgroupv2_id: 7
 			}
-		]
+		],
+		active: true
 	},
 	{
 		id: 8,
@@ -160,7 +167,8 @@ const taskGroups = [
 				args_schema_parallel: null,
 				taskgroupv2_id: 8
 			}
-		]
+		],
+		active: true
 	}
 ];
 
diff --git a/__tests__/v2/version-checker.test.js b/__tests__/v2/version-checker.test.js
@@ -47,7 +47,8 @@ describe('Version checker', () => {
 						taskgroupv2_id: 1
 					}
 				],
-				pkg_name: 'group1'
+				pkg_name: 'group1',
+				active: true
 			},
 			{
 				id: 2,
@@ -61,7 +62,8 @@ describe('Version checker', () => {
 						taskgroupv2_id: 2
 					}
 				],
-				pkg_name: 'group1'
+				pkg_name: 'group1',
+				active: true
 			},
 			{
 				id: 3,
@@ -75,7 +77,8 @@ describe('Version checker', () => {
 						taskgroupv2_id: 3
 					}
 				],
-				pkg_name: 'group2'
+				pkg_name: 'group2',
+				active: true
 			}
 		];
 
@@ -131,7 +134,8 @@ describe('Version checker', () => {
 						taskgroupv2_id: 1
 					}
 				],
-				pkg_name: 'group1'
+				pkg_name: 'group1',
+				active: true
 			},
 			{
 				id: 2,
@@ -145,7 +149,8 @@ describe('Version checker', () => {
 						taskgroupv2_id: 2
 					}
 				],
-				pkg_name: 'group1'
+				pkg_name: 'group1',
+				active: true
 			},
 			{
 				id: 3,
@@ -159,7 +164,8 @@ describe('Version checker', () => {
 						taskgroupv2_id: 3
 					}
 				],
-				pkg_name: 'group1'
+				pkg_name: 'group1',
+				active: true
 			}
 		];
 
@@ -208,7 +214,8 @@ describe('Version checker', () => {
 						taskgroupv2_id: 1
 					}
 				],
-				pkg_name: 'group1'
+				pkg_name: 'group1',
+				active: true
 			},
 			{
 				id: 2,
@@ -222,7 +229,8 @@ describe('Version checker', () => {
 						taskgroupv2_id: 2
 					}
 				],
-				pkg_name: 'group1'
+				pkg_name: 'group1',
+				active: true
 			}
 		];
 
@@ -280,7 +288,8 @@ describe('Version checker', () => {
 						taskgroupv2_id: 1
 					}
 				],
-				pkg_name: 'group1'
+				pkg_name: 'group1',
+				active: true
 			},
 			{
 				id: 2,
@@ -295,7 +304,8 @@ describe('Version checker', () => {
 						taskgroupv2_id: 2
 					}
 				],
-				pkg_name: 'group1'
+				pkg_name: 'group1',
+				active: true
 			},
 			{
 				id: 3,
@@ -310,7 +320,8 @@ describe('Version checker', () => {
 						taskgroupv2_id: 3
 					}
 				],
-				pkg_name: 'group1'
+				pkg_name: 'group1',
+				active: true
 			}
 		];
 
diff --git a/src/lib/components/v2/workflow/version-checker.js b/src/lib/components/v2/workflow/version-checker.js
@@ -49,7 +49,12 @@ export async function getAllNewVersions(tasks) {
 	const updateCandidates = enrichedTasks.reduce(function (map, task) {
 		map[task.id] = taskGroups
 			.flatMap((tg) =>
-				tg.task_list.map((t) => ({ ...t, version: tg.version, pkg_name: tg.pkg_name }))
+				tg.task_list.map((t) => ({
+					...t,
+					version: tg.version,
+					pkg_name: tg.pkg_name,
+					active: tg.active
+				}))
 			)
 			.filter((t) => {
 				return (
@@ -60,7 +65,8 @@ export async function getAllNewVersions(tasks) {
 					t.name === task.name &&
 					t.type === task.type &&
 					t.pkg_name === task.pkg_name &&
-					greatestVersionAsc(t.version, task.version) === 1
+					greatestVersionAsc(t.version, task.version) === 1 &&
+					t.active
 				);
 			})
 			.sort((t1, t2) => greatestVersionDesc(t1.version, t2.version));
diff --git a/tests/v2/task_version_update.spec.js b/tests/v2/task_version_update.spec.js
@@ -74,6 +74,19 @@ test('Task version update [v2]', async ({ page, workflow }) => {
 				required: ['p2']
 			}
 		});
+		// test for type mismatch: from parallel to non_parallel
+		await createFakeTask(page, {
+			name: parallelTask,
+			type: 'non_parallel',
+			version: '0.0.4',
+			args_schema_non_parallel: {
+				properties: {
+					p2: { type: 'string', title: 'p2' }
+				},
+				type: 'object',
+				required: ['p2']
+			}
+		});
 		compoundTask = await createFakeTask(page, {
 			type: 'compound',
 			version: '0.0.1',
@@ -115,6 +128,12 @@ test('Task version update [v2]', async ({ page, workflow }) => {
 		await workflow.openWorkflowPage();
 	});
 
+	await test.step('Verify that parallelTask 0.0.4 (type mismatch) can be selected', async () => {
+		await workflow.addTask(parallelTask, '0.0.4');
+		await workflow.selectTask(parallelTask);
+		await workflow.removeCurrentTask();
+	});
+
 	await test.step('Add tasks and select non parallel v1 task', async () => {
 		await workflow.addTask(nonParallelTask, '0.0.1');
 		await workflow.addTask(parallelTask, '0.0.1');
@@ -208,6 +227,7 @@ test('Task version update [v2]', async ({ page, workflow }) => {
 			.selectOption('0.0.3');
 		await expect(page.getByText('The arguments are valid')).toBeVisible();
 		await page.getByRole('button', { name: 'Update' }).click();
+		// Task version 0.0.4 is ignored, since it has a different type
 		await expect(page.getByText('No new versions available')).toBeVisible();
 		// Verify that the arguments are preserved after the update
 		await page.getByRole('button', { name: 'Arguments', exact: true }).click();
@@ -249,12 +269,14 @@ test('Task version update [v2]', async ({ page, workflow }) => {
 		await workflow.removeCurrentTask();
 		await workflow.selectTask(parallelTask);
 		await workflow.removeCurrentTask();
-		await deleteTask(page, nonParallelTask); // 0.0.1
 		await deleteTask(page, nonParallelTask); // 0.0.2
-		await deleteTask(page, parallelTask); // 0.0.1
+		await deleteTask(page, nonParallelTask); // 0.0.1
+		await deleteTask(page, parallelTask); // 0.0.4
+		await deleteTask(page, parallelTask); // 0.0.3
 		await deleteTask(page, parallelTask); // 0.0.2
-		await deleteTask(page, compoundTask); // 0.0.1
+		await deleteTask(page, parallelTask); // 0.0.1
 		await deleteTask(page, compoundTask); // 0.0.2
+		await deleteTask(page, compoundTask); // 0.0.1
 	});
 });
 
diff --git a/tests/v2/update_version_deactivated_task.spec.js b/tests/v2/update_version_deactivated_task.spec.js
@@ -32,6 +32,17 @@ test('Update version of deactivated task', async ({ page, workflow }) => {
 				type: 'object'
 			}
 		});
+		await createFakeTask(page, {
+			name: taskName,
+			type: 'non_parallel',
+			version: '0.0.3',
+			args_schema_non_parallel: {
+				properties: {
+					p1: { type: 'string' }
+				},
+				type: 'object'
+			}
+		});
 	});
 
 	await test.step('Open workflow page', async () => {
@@ -42,7 +53,7 @@ test('Update version of deactivated task', async ({ page, workflow }) => {
 		await workflow.addTask(taskName, '0.0.1');
 	});
 
-	await test.step('Deactivate the task', async () => {
+	await test.step('Deactivate the task 0.0.1', async () => {
 		await page.goto('/v2/tasks/management');
 		await waitPageLoading(page);
 		await page.getByRole('row', { name: taskName }).getByRole('combobox').selectOption('0.0.1');
@@ -55,7 +66,28 @@ test('Update version of deactivated task', async ({ page, workflow }) => {
 		await modal.getByRole('button', { name: 'Confirm' }).click();
 	});
 
-	await test.step('Verify that task has been deactivated', async () => {
+	await test.step('Verify that task 0.0.1 has been deactivated', async () => {
+		await page.waitForURL(/\/v2\/tasks\/activities\?activity_id=\d+/);
+		await waitPageLoading(page);
+		await expect(page.getByRole('row')).toHaveCount(2);
+		await expect(page.getByRole('row', { name: taskName })).toContainText('deactivate');
+		await expect(page.getByRole('row', { name: taskName })).toContainText('OK');
+	});
+
+	await test.step('Deactivate the task 0.0.3', async () => {
+		await page.goto('/v2/tasks/management');
+		await waitPageLoading(page);
+		await page.getByRole('row', { name: taskName }).getByRole('combobox').selectOption('0.0.3');
+		await page.getByRole('row', { name: taskName }).getByRole('button', { name: 'Manage' }).click();
+		const modal = page.locator('.modal.show');
+		await modal.waitFor();
+		await expect(modal.getByText('The task group is currently active')).toBeVisible();
+		await modal.getByText('active').click();
+		await modal.getByRole('button', { name: 'Deactivate task group' }).click();
+		await modal.getByRole('button', { name: 'Confirm' }).click();
+	});
+
+	await test.step('Verify that task 0.0.3 has been deactivated', async () => {
 		await page.waitForURL(/\/v2\/tasks\/activities\?activity_id=\d+/);
 		await waitPageLoading(page);
 		await expect(page.getByRole('row')).toHaveCount(2);
@@ -73,11 +105,13 @@ test('Update version of deactivated task', async ({ page, workflow }) => {
 			.getByRole('combobox', { name: /New versions of this task exist/ })
 			.selectOption('0.0.2');
 		await page.getByRole('button', { name: 'Update' }).click();
+		// Tasks 0.0.3 should be ignored since it is not active
 		await expect(page.getByText('No new versions available')).toBeVisible();
 	});
 
 	await test.step('Cleanup test tasks', async () => {
 		await workflow.removeCurrentTask();
+		await deleteTask(page, taskName); // 0.0.3
 		await deleteTask(page, taskName); // 0.0.2
 		await deleteTask(page, taskName); // 0.0.1
 	});

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ const taskGroups = [`
`55`	`55`	`args_schema_parallel: null,`
`56`	`56`	`taskgroupv2_id: 1`
`57`	`57`	`}`
`58`		`- ]`
	`58`	`+ ],`
	`59`	`+ active: true`
`59`	`60`	`},`
`60`	`61`	`{`
`61`	`62`	`id: 2,`
`@@ -70,7 +71,8 @@ const taskGroups = [`
`70`	`71`	`args_schema_parallel: null,`
`71`	`72`	`taskgroupv2_id: 2`
`72`	`73`	`}`
`73`		`- ]`
	`74`	`+ ],`
	`75`	`+ active: true`
`74`	`76`	`},`
`75`	`77`	`{`
`76`	`78`	`id: 3,`
`@@ -85,7 +87,8 @@ const taskGroups = [`
`85`	`87`	`args_schema_parallel: null,`
`86`	`88`	`taskgroupv2_id: 3`
`87`	`89`	`}`
`88`		`- ]`
	`90`	`+ ],`
	`91`	`+ active: true`
`89`	`92`	`},`
`90`	`93`	`{`
`91`	`94`	`id: 4,`
`@@ -100,7 +103,8 @@ const taskGroups = [`
`100`	`103`	`args_schema_parallel: {},`
`101`	`104`	`taskgroupv2_id: 4`
`102`	`105`	`}`
`103`		`- ]`
	`106`	`+ ],`
	`107`	`+ active: true`
`104`	`108`	`},`
`105`	`109`	`{`
`106`	`110`	`id: 5,`
`@@ -115,7 +119,8 @@ const taskGroups = [`
`115`	`119`	`args_schema_parallel: {},`
`116`	`120`	`taskgroupv2_id: 5`
`117`	`121`	`}`
`118`		`- ]`
	`122`	`+ ],`
	`123`	`+ active: true`
`119`	`124`	`},`
`120`	`125`	`{`
`121`	`126`	`id: 6,`
`@@ -130,7 +135,8 @@ const taskGroups = [`
`130`	`135`	`args_schema_parallel: {},`
`131`	`136`	`taskgroupv2_id: 6`
`132`	`137`	`}`
`133`		`- ]`
	`138`	`+ ],`
	`139`	`+ active: true`
`134`	`140`	`},`
`135`	`141`	`{`
`136`	`142`	`id: 7,`
`@@ -145,7 +151,8 @@ const taskGroups = [`
`145`	`151`	`args_schema_parallel: {},`
`146`	`152`	`taskgroupv2_id: 7`
`147`	`153`	`}`
`148`		`- ]`
	`154`	`+ ],`
	`155`	`+ active: true`
`149`	`156`	`},`
`150`	`157`	`{`
`151`	`158`	`id: 8,`
`@@ -160,7 +167,8 @@ const taskGroups = [`
`160`	`167`	`args_schema_parallel: null,`
`161`	`168`	`taskgroupv2_id: 8`
`162`	`169`	`}`
`163`		`- ]`
	`170`	`+ ],`
	`171`	`+ active: true`
`164`	`172`	`}`
`165`	`173`	`];`
`166`	`174`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ describe('Version checker', () => {`
`47`	`47`	`taskgroupv2_id: 1`
`48`	`48`	`}`
`49`	`49`	`],`
`50`		`- pkg_name: 'group1'`
	`50`	`+ pkg_name: 'group1',`
	`51`	`+ active: true`
`51`	`52`	`},`
`52`	`53`	`{`
`53`	`54`	`id: 2,`
`@@ -61,7 +62,8 @@ describe('Version checker', () => {`
`61`	`62`	`taskgroupv2_id: 2`
`62`	`63`	`}`
`63`	`64`	`],`
`64`		`- pkg_name: 'group1'`
	`65`	`+ pkg_name: 'group1',`
	`66`	`+ active: true`
`65`	`67`	`},`
`66`	`68`	`{`
`67`	`69`	`id: 3,`
`@@ -75,7 +77,8 @@ describe('Version checker', () => {`
`75`	`77`	`taskgroupv2_id: 3`
`76`	`78`	`}`
`77`	`79`	`],`
`78`		`- pkg_name: 'group2'`
	`80`	`+ pkg_name: 'group2',`
	`81`	`+ active: true`
`79`	`82`	`}`
`80`	`83`	`];`
`81`	`84`
`@@ -131,7 +134,8 @@ describe('Version checker', () => {`
`131`	`134`	`taskgroupv2_id: 1`
`132`	`135`	`}`
`133`	`136`	`],`
`134`		`- pkg_name: 'group1'`
	`137`	`+ pkg_name: 'group1',`
	`138`	`+ active: true`
`135`	`139`	`},`
`136`	`140`	`{`
`137`	`141`	`id: 2,`
`@@ -145,7 +149,8 @@ describe('Version checker', () => {`
`145`	`149`	`taskgroupv2_id: 2`
`146`	`150`	`}`
`147`	`151`	`],`
`148`		`- pkg_name: 'group1'`
	`152`	`+ pkg_name: 'group1',`
	`153`	`+ active: true`
`149`	`154`	`},`
`150`	`155`	`{`
`151`	`156`	`id: 3,`
`@@ -159,7 +164,8 @@ describe('Version checker', () => {`
`159`	`164`	`taskgroupv2_id: 3`
`160`	`165`	`}`
`161`	`166`	`],`
`162`		`- pkg_name: 'group1'`
	`167`	`+ pkg_name: 'group1',`
	`168`	`+ active: true`
`163`	`169`	`}`
`164`	`170`	`];`
`165`	`171`
`@@ -208,7 +214,8 @@ describe('Version checker', () => {`
`208`	`214`	`taskgroupv2_id: 1`
`209`	`215`	`}`
`210`	`216`	`],`
`211`		`- pkg_name: 'group1'`
	`217`	`+ pkg_name: 'group1',`
	`218`	`+ active: true`
`212`	`219`	`},`
`213`	`220`	`{`
`214`	`221`	`id: 2,`
`@@ -222,7 +229,8 @@ describe('Version checker', () => {`
`222`	`229`	`taskgroupv2_id: 2`
`223`	`230`	`}`
`224`	`231`	`],`
`225`		`- pkg_name: 'group1'`
	`232`	`+ pkg_name: 'group1',`
	`233`	`+ active: true`
`226`	`234`	`}`
`227`	`235`	`];`
`228`	`236`
`@@ -280,7 +288,8 @@ describe('Version checker', () => {`
`280`	`288`	`taskgroupv2_id: 1`
`281`	`289`	`}`
`282`	`290`	`],`
`283`		`- pkg_name: 'group1'`
	`291`	`+ pkg_name: 'group1',`
	`292`	`+ active: true`
`284`	`293`	`},`
`285`	`294`	`{`
`286`	`295`	`id: 2,`
`@@ -295,7 +304,8 @@ describe('Version checker', () => {`
`295`	`304`	`taskgroupv2_id: 2`
`296`	`305`	`}`
`297`	`306`	`],`
`298`		`- pkg_name: 'group1'`
	`307`	`+ pkg_name: 'group1',`
	`308`	`+ active: true`
`299`	`309`	`},`
`300`	`310`	`{`
`301`	`311`	`id: 3,`
`@@ -310,7 +320,8 @@ describe('Version checker', () => {`
`310`	`320`	`taskgroupv2_id: 3`
`311`	`321`	`}`
`312`	`322`	`],`
`313`		`- pkg_name: 'group1'`
	`323`	`+ pkg_name: 'group1',`
	`324`	`+ active: true`
`314`	`325`	`}`
`315`	`326`	`];`
`316`	`327`