Update sorting function to account for ownerName, if provided

Author: rkpasia

__tests__/component_utilities.test.js

@@ -0,0 +1,44 @@
+import { it, expect } from 'vitest';
+import { orderTasksByOwnerThenByNameThenByVersion } from '$lib/common/component_utilities.js';
+
+it('should order tasks by owner, then by name, then by version', () => {
+	const tasks = [
+		{ name: 'task1', owner: 'owner1', version: '0.0.1' },
+		{ name: 'task2', owner: 'owner1', version: '0.0.1' },
+		{ name: 'task3', owner: 'owner1', version: '0.0.2' },
+		{ name: 'task4', owner: 'owner2', version: '0.0.1' },
+		{ name: 'task5', owner: 'owner2', version: '0.0.2' },
+		{ name: 'task6', owner: 'owner2', version: '0.0.2' },
+		{ name: 'task7', owner: 'owner3', version: '0.0.1' },
+		{ name: 'task8', owner: 'owner3', version: '0.0.2' },
+		{ name: 'task9', owner: 'owner3', version: '0.0.2' }
+	];
+
+	const sortedTasks = orderTasksByOwnerThenByNameThenByVersion(tasks);
+
+	expect(sortedTasks).toEqual([
+		{ name: 'task1', owner: 'owner1', version: '0.0.1' },
+		{ name: 'task2', owner: 'owner1', version: '0.0.1' },
+		{ name: 'task3', owner: 'owner1', version: '0.0.2' },
+		{ name: 'task4', owner: 'owner2', version: '0.0.1' },
+		{ name: 'task5', owner: 'owner2', version: '0.0.2' },
+		{ name: 'task6', owner: 'owner2', version: '0.0.2' },
+		{ name: 'task7', owner: 'owner3', version: '0.0.1' },
+		{ name: 'task8', owner: 'owner3', version: '0.0.2' },
+		{ name: 'task9', owner: 'owner3', version: '0.0.2' }
+	]);
+
+	const sortedTasks2 = orderTasksByOwnerThenByNameThenByVersion(tasks, 'owner2');
+
+	expect(sortedTasks2).toEqual([
+		{ name: 'task4', owner: 'owner2', version: '0.0.1' },
+		{ name: 'task5', owner: 'owner2', version: '0.0.2' },
+		{ name: 'task6', owner: 'owner2', version: '0.0.2' },
+		{ name: 'task1', owner: 'owner1', version: '0.0.1' },
+		{ name: 'task2', owner: 'owner1', version: '0.0.1' },
+		{ name: 'task3', owner: 'owner1', version: '0.0.2' },
+		{ name: 'task7', owner: 'owner3', version: '0.0.1' },
+		{ name: 'task8', owner: 'owner3', version: '0.0.2' },
+		{ name: 'task9', owner: 'owner3', version: '0.0.2' }
+	]);
+});

src/lib/common/component_utilities.js

@@ -39,9 +39,21 @@ function compareTaskNameAndVersion(t1, t2) {
 	return greatestVersionAsc(t1, t2);
 }
 
-export function orderTasksByOwnerThenByNameThenByVersion(tasks) {
+export function orderTasksByOwnerThenByNameThenByVersion(tasks, ownerName = null) {
 	// Sort tasks by owner, by name and by version
 	return tasks.sort((t1, t2) => {
+		// If ownerName is not null, filter tasks by owner
+		if (ownerName !== null) {
+			// If t1 owner is same as ownerName, t1 should go before t2
+			if (t1.owner === ownerName) {
+				if (t2.owner !== ownerName) return -1;
+				// Both owners are same, sort by name and version
+				return compareTaskNameAndVersion(t1, t2);
+			} else {
+				// t1 owner is not same as ownerName, t2 should go before t1
+				if (t2.owner === ownerName) return 1;
+			}
+		}
 		if (t1.owner === null) {
 			// If t1 owner is null, t1 should go before t2 if t2 owner is null
 			// Should check if t2 owner is null too