Displayed profile name in users table

Author: zonia3000

CHANGELOG.md

@@ -6,7 +6,7 @@
 * Added more keywords to match SLURM errors (\#843).
 * Fixed bug in sandbox pages (\#839);
 * Displayed all kinds of recent task activities in tasks management page. (\#835);
-* Managed resources and profiles (\#845):
+* Managed resources and profiles (\#845, \#862):
     * Added new admin pages for resources and profiles;
     * Updated admin user pages to associate users with profiles;
     * Updated admin settings page;

src/lib/server/api/v2/admin_api.js

@@ -44,14 +44,32 @@ export async function getResource(fetch, resourceId) {
 	return await response.json();
 }
 
+/**
+ * @param {typeof fetch} fetch
+ * @returns {Promise<import('fractal-components/types/api').Profile[]>}
+ */
+export async function getProfiles(fetch) {
+	logger.debug(`Retrieving profiles`);
+	const response = await fetch(`${env.FRACTAL_SERVER_HOST}/admin/v2/profile/`, {
+		method: 'GET',
+		credentials: 'include'
+	});
+
+	if (!response.ok) {
+		await responseError(response);
+	}
+
+	return await response.json();
+}
+
 /**
  * @param {typeof fetch} fetch
  * @param {number} profileId
- * @returns {Promise<import('fractal-components/types/api').Resource>}
+ * @returns {Promise<import('fractal-components/types/api').Profile>}
  */
 export async function getProfile(fetch, profileId) {
 	logger.debug(`Retrieving profile ${profileId}`);
-	const response = await fetch(`${env.FRACTAL_SERVER_HOST}/admin/v2/profile/${profileId}`, {
+	const response = await fetch(`${env.FRACTAL_SERVER_HOST}/admin/v2/profile/${profileId}/`, {
 		method: 'GET',
 		credentials: 'include'
 	});

src/routes/v2/admin/users/+page.server.js

@@ -1,4 +1,5 @@
 import { listUsers } from '$lib/server/api/auth_api';
+import { getProfiles } from '$lib/server/api/v2/admin_api.js';
 import { getLogger } from '$lib/server/logger.js';
 
 const logger = getLogger('admin users page');
@@ -8,8 +9,10 @@ export async function load({ fetch }) {
 
 	// Load users from server
 	const users = await listUsers(fetch);
+	const profiles = await getProfiles(fetch);
 
 	return {
-		users
+		users,
+		profiles
 	};
 }

src/routes/v2/admin/users/+page.svelte

@@ -8,9 +8,15 @@
 
 	const currentUserId = $derived(page.data.userInfo?.id);
 	const currentUserEmail = $derived(page.data.userInfo?.email);
+	/** @type {Array<import('fractal-components/types/api').Profile>} */
+	const profiles = $derived(page.data.profiles);
 
 	/** @type {Array<import('fractal-components/types/api').User & {id: number}>} */
 	let users = $state([]);
+	/** @type {Record<string, import('fractal-components/types/api').Profile | undefined>} */
+	const userProfiles = $derived(
+		Object.fromEntries(users.map((u) => [u.id, profiles.find((p) => p.id === u.profile_id)]))
+	);
 
 	const deleteEnabled = false;
 
@@ -52,7 +58,7 @@
 				<th>Active</th>
 				<th>Superuser</th>
 				<th>Verified</th>
-				<th>Has Profile</th>
+				<th>Profile</th>
 				<th>Actions</th>
 			</tr>
 		</thead>
@@ -65,7 +71,18 @@
 						<td><BooleanIcon value={user.is_active} /></td>
 						<td><BooleanIcon value={user.is_superuser} /></td>
 						<td><BooleanIcon value={user.is_verified} /></td>
-						<td><BooleanIcon value={user.profile_id !== null} /></td>
+						<td>
+							{#if userProfiles[user.id]}
+								<a
+									href="/v2/admin/resources/{userProfiles[user.id]
+										?.resource_id}/profiles/{userProfiles[user.id]?.id}"
+								>
+									{userProfiles[user.id]?.name}
+								</a>
+							{:else}
+								-
+							{/if}
+						</td>
 						<td>
 							<a href="/v2/admin/users/{user.id}" class="btn btn-light">
 								<i class="bi-info-circle"></i> Info

tests/v2/users_crud.spec.js

@@ -120,6 +120,7 @@ test('Create and update a user', async ({ page }) => {
 		await verifyChecked(userRowCells, 2, true);
 		await verifyChecked(userRowCells, 3, false);
 		await verifyChecked(userRowCells, 4, false);
+		await expect(userRowCells[5]).toContainText('Local profile');
 	});
 
 	await test.step('Display the user info page', async () => {