Merge pull request #803 from fractal-analytics-platform/api-task-group-ordering

Dropped semver and used API task-groups ordering

Author: zonia3000

CHANGELOG.md

@@ -1,5 +1,10 @@
 *Note: Numbers like (\#123) point to closed Pull Requests on the fractal-web repository.*
 
+# Unreleased
+
+* Dropped semver and used API task-groups ordering (\#803);
+* Parsed timestamps in `admin/accounting` (\#803);
+
 # 1.18.2
 
 * Retrieved image status from `__wftask_dataset_image_status__` attribute (\#801);

__tests__/v2/AddWorkflowTaskModal.test.js

@@ -1,94 +1,67 @@
 import { it, describe, expect } from 'vitest';
 import {
 	buildTaskTableRows,
-	buildWorkflowTaskTableRows,
-	removeIdenticalTaskGroups
+	buildWorkflowTaskTableRows
 } from '../../src/lib/tasks/task_group_utilities.js';
 
 describe('task_group_utilities', () => {
 	it('buildTaskTableRows', async () => {
 		const taskGroups = [
-			{ id: 1, pkg_name: 'name', task_list: [{ id: 2 }, { id: 1 }], version: '1.0.0' },
-			{ id: 2, pkg_name: 'name', task_list: [{ id: 3 }, { id: 4 }], version: '1.2.0' },
-			// groups with empty task_list should be ignored
-			{ id: 2, pkg_name: 'name', task_list: [], version: '1.2.1' }
+			[
+				'name',
+				[
+					{ id: 2, pkg_name: 'name', task_list: [{ id: 3 }, { id: 4 }], version: '1.2.0' },
+					{ id: 1, pkg_name: 'name', task_list: [{ id: 2 }, { id: 1 }], version: '1.0.0' }
+				]
+			]
 		];
 		const result = buildTaskTableRows(taskGroups, 'pkg_name');
 		// selects the latest version
 		expect(result[0].selectedVersion).eq('1.2.0');
 		// 1.2.1 should be ignored since it is empty
 		expect(Object.keys(result[0].groups)).toHaveLength(2);
-		// check that tasks are sorted by id
-		expect(result[0].groups['1.0.0'].task_list[0].id).eq(1);
-		expect(result[0].groups['1.0.0'].task_list[1].id).eq(2);
-		expect(result[0].groups['1.2.0'].task_list[0].id).eq(3);
-		expect(result[0].groups['1.2.0'].task_list[1].id).eq(4);
-	});
-
-	it('removeIdenticalTaskGroups', () => {
-		const user = {
-			id: 1,
-			group_ids_names: [
-				[11, 'All'],
-				[22, 'older team'],
-				[33, 'recent team']
-			]
-		};
-
-		const taskGroups = [
-			{ pkg_name: 'mypkg', version: '1.1.1', user_id: 1, user_group_id: null, task_list: [] },
-			{ pkg_name: 'mypkg', version: '1.1.1', user_id: 2, user_group_id: 11, task_list: [] },
-			{ pkg_name: 'mypkg', version: '1.1.1', user_id: 2, user_group_id: 22, task_list: [] },
-			{ pkg_name: 'mypkg', version: '1.1.1', user_id: 2, user_group_id: 33, task_list: [] },
-			{ pkg_name: 'mypkg', version: '2.2.2', user_id: 2, user_group_id: 11, task_list: [] },
-			{ pkg_name: 'mypkg', version: '2.2.2', user_id: 2, user_group_id: 22, task_list: [] },
-			{ pkg_name: 'mypkg', version: '2.2.2', user_id: 2, user_group_id: 33, task_list: [] },
-			{ pkg_name: 'mypkg', version: '3.3.3', user_id: 2, user_group_id: 33, task_list: [] },
-			{ pkg_name: 'mypkg', version: '3.3.3', user_id: 2, user_group_id: 22, task_list: [] },
-			{ pkg_name: 'mypkg', version: null, user_id: 1, user_group_id: 11, task_list: [] },
-			{ pkg_name: 'mypkg', version: null, user_id: 2, user_group_id: 11, task_list: [] }
-		];
-
-		const filteredTaskGroups = removeIdenticalTaskGroups(taskGroups, user);
-
-		expect(filteredTaskGroups).toHaveLength(4);
-		expect(filteredTaskGroups[0].version).eq('1.1.1');
-		expect(filteredTaskGroups[1].version).eq('2.2.2');
-		expect(filteredTaskGroups[2].version).eq('3.3.3');
-		expect(filteredTaskGroups[3].version).eq(null);
+		expect(result[0].groups[0].id).eq(2);
+		expect(result[0].groups[1].id).eq(1);
 	});
 
 	it('buildWorkflowTaskTableRows groups by pkg_name', async () => {
 		const taskGroups = [
-			{ id: 3, pkg_name: 'p2', task_list: [{ id: 6 }, { id: 5 }], version: '3.0.0' },
-			{
-				id: 1,
-				pkg_name: 'p1',
-				task_list: [
-					{ id: 2, name: 'p1t2' },
-					{ id: 1, name: 'p1t1' }
-				],
-				version: '1.0.0'
-			},
-			{
-				id: 2,
-				pkg_name: 'p1',
-				task_list: [
-					{ id: 4, name: 'p1t2' },
-					{ id: 3, name: 'p1t1' }
-				],
-				version: '1.2.0'
-			}
+			[
+				'p1',
+				[
+					{
+						id: 2,
+						pkg_name: 'p1',
+						task_list: [
+							{ id: 3, name: 'p1t1' },
+							{ id: 4, name: 'p1t2' }
+						],
+						version: '1.2.0'
+					},
+					{
+						id: 1,
+						pkg_name: 'p1',
+						task_list: [
+							{ id: 1, name: 'p1t1' },
+							{ id: 2, name: 'p1t2' }
+						],
+						version: '1.0.0'
+					}
+				]
+			],
+			['p2', [{ id: 3, pkg_name: 'p2', task_list: [{ id: 6 }, { id: 5 }], version: '3.0.0' }]]
 		];
 
-		const result = buildWorkflowTaskTableRows(taskGroups, 'pkg_name');
-		expect(result[0].groupTitle).eq('p1');
-		expect(result[1].groupTitle).eq('p2');
+		const result = buildWorkflowTaskTableRows(taskGroups);
+		expect(result[0].pkg_name).eq('p1');
+		expect(result[1].pkg_name).eq('p2');
 		expect(result[0].tasks).toHaveLength(2);
 		expect(result[1].tasks).toHaveLength(1);
 		expect(result[0].tasks[0].selectedVersion).eq('1.2.0');
-		expect(result[0].tasks[0].taskVersions['1.2.0'].task_name).eq('p1t1');
+		expect(result[0].tasks[0].taskVersions[0].task_name).eq('p1t1');
+		expect(result[0].tasks[0].taskVersions[1].task_name).eq('p1t1');
 		expect(result[0].tasks[1].selectedVersion).eq('1.2.0');
-		expect(result[0].tasks[1].taskVersions['1.2.0'].task_name).eq('p1t2');
+		expect(result[0].tasks[1].taskVersions[0].task_name).eq('p1t2');
+		expect(result[0].tasks[1].taskVersions[1].task_name).eq('p1t2');
 	});
 });