Merge pull request #655 from fractal-analytics-platform/user-groups

User groups removal and user settings import

Author: zonia3000

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 # Unreleased
 
-* Alignment with fractal-server 2.9.0 (\#640, \#643, \#652):
+* Alignment with fractal-server 2.9.0 (\#640, \#643, \#652, \#655):
     * Updated task collections logic and created task-group activities pages for standard users and administrators (\#640);
     * Removed active checkbox from task group edit modal (\#640);
     * Added Manage button to deactivate and reactivate task groups (\#640);
@@ -13,6 +13,10 @@
     * Added last used timestamp filter to task-group admin page (\#643);
     * Used new `GET /auth/current-user/allowed-viewer-paths/` endpoint (\#652);
     * Added "Download token" button in "My profile" page (\#652);
+    * Implemented removal of users from group (\#655);
+    * Implemented import of user settings from another user (\#655);
+    * Used new set-groups endpoint (\#655);
+    * Sorted task-group activities by timestamp_started (more recent first) (\#655);
 
 # 1.10.1
 

__tests__/user_utilities.test.js

@@ -1,5 +1,9 @@
 import { it, expect } from 'vitest';
-import { sortUsers, sortGroupByNameAllFirstComparator } from '$lib/components/admin/user_utilities';
+import {
+	sortUsers,
+	sortGroupByNameAllFirstComparator,
+	sortUserToImportSettings
+} from '$lib/components/admin/user_utilities';
 
 it('should sort user by current superuser, then by superuser, then by email', () => {
 	let users = [
@@ -44,3 +48,27 @@ it('should sort groups by name, but keeping the All group first', () => {
 	expect(groups[1].name).eq('g2');
 	expect(groups[2].name).eq('g3');
 });
+
+it('should sort users to import settings', () => {
+	const users = [
+		{ id: 1, email: '[email protected]' }, // groups: 1
+		{ id: 2, email: '[email protected]' }, // groups: 1, 2, 4
+		{ id: 3, email: '[email protected]' }, // groups: 1, 3
+		{ id: 4, email: '[email protected]' }  // groups: 1, 4
+	];
+
+	const desiredGroups = [2, 3];
+	const allGroups = [
+		{ id: 1, name: 'All', user_ids: [1, 2, 3, 4] },
+		{ id: 2, name: 'g2', user_ids: [2] },
+		{ id: 3, name: 'g3', user_ids: [3] },
+		{ id: 4, name: 'g4', user_ids: [2, 4] }
+	];
+
+	const sortedUsers = sortUserToImportSettings(users, desiredGroups, allGroups);
+
+	expect(sortedUsers[0].email).eq('[email protected]');
+	expect(sortedUsers[1].email).eq('[email protected]');
+	expect(sortedUsers[2].email).eq('[email protected]');
+	expect(sortedUsers[3].email).eq('[email protected]');
+});

__tests__/v2/admin_group_edit_page.test.js

@@ -44,7 +44,7 @@ describe('Admin group edit page', () => {
 		fireEvent.drop(result.getByText(/drag the users here/i));
 
 		await result.findByText(/No more users available/);
-		expect(result.queryByRole('button', { name: '[email protected]' })).null;
+		expect(await result.findByLabelText('Remove user [email protected]')).not.null;
 	});
 
 	it('Error happens when user is dragged and dropped', async () => {
@@ -61,5 +61,6 @@ describe('Admin group edit page', () => {
 
 		await result.findByText(/An error happened/);
 		expect(result.queryByRole('button', { name: '[email protected]' })).not.null;
+		expect(result.queryByRole('button', { name: 'Remove user [email protected]' })).null;
 	});
 });

package-lock.json

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

playwright.config.js

@@ -38,3 +38,28 @@ export const sortGroupByNameAllFirstComparator = function (g1, g2) {
 		? 1
 		: g1.name.localeCompare(g2.name, undefined, { sensitivity: 'base' });
 };
+
+/**
+ * @param {Array<import('$lib/types').User & {id: number}>} users
+ * @param {number[]} desiredGroups
+ * @param {Array<import('$lib/types').Group & {user_ids: number[]}>} allGroups
+ * @returns
+ */
+export const sortUserToImportSettings = function (users, desiredGroups, allGroups) {
+	users.sort((u1, u2) => {
+		const u1Groups = allGroups.filter((g) => g.user_ids.includes(u1.id)).map((g) => g.id);
+		const u2Groups = allGroups.filter((g) => g.user_ids.includes(u2.id)).map((g) => g.id);
+		for (const u1g of u1Groups) {
+			if (desiredGroups.includes(u1g)) {
+				return -1;
+			}
+		}
+		for (const u2g of u2Groups) {
+			if (desiredGroups.includes(u2g)) {
+				return 1;
+			}
+		}
+		return 0;
+	});
+	return users;
+};