Adapted to new endpoints

Author: zonia3000

__tests__/v2/UserEditor.test.js

@@ -65,7 +65,7 @@ describe('UserEditor', () => {
 
 		render(UserEditor, {
 			props: {
-				runnerBackend: 'slurm',
+				runnerBackend: 'slurm_sudo',
 				user: selectedUser,
 				settings: { ...initialSettings },
 				saveUser: mockSaveUser
@@ -107,12 +107,12 @@ describe('UserEditor', () => {
 		);
 	});
 
-	it('Update settings with slurm runner backend - validation error', async () => {
+	it('Update settings with slurm_sudo runner backend - validation error', async () => {
 		const user = userEvent.setup();
 
 		render(UserEditor, {
 			props: {
-				runnerBackend: 'slurm',
+				runnerBackend: 'slurm_sudo',
 				user: selectedUser,
 				settings: { ...initialSettings },
 				saveUser: mockSaveUser

components/src/lib/types/api.d.ts

@@ -344,7 +344,6 @@ export type Resource = {
 	tasks_local_dir: string;
 	tasks_python_config: Record<string, any>;
 	tasks_pixi_config: Record<string, any>;
-	tasks_pip_cache_dir: string | null;
 };
 
 export type Profile = {

src/lib/components/v2/admin/UserEditor.svelte

@@ -294,6 +294,7 @@
 		if (autoselectProfile && resources.length > 0) {
 			selectedResourceId = resources[0].id;
 			selectedResource = resources[0];
+			await resourceChanged();
 		}
 		if (selectedResourceId) {
 			await loadProfiles(false);
@@ -314,11 +315,11 @@
 		if (!editableUser || editableUser.profile_id === null) {
 			return;
 		}
-		const response = await fetch(`/api/admin/v2/resource-of-profile/${editableUser.profile_id}`);
+		const response = await fetch(`/api/admin/v2/profile/${editableUser.profile_id}`);
 		if (response.ok) {
-			/** @type {import('fractal-components/types/api').Resource} */
-			const resource = await response.json();
-			selectedResourceId = resource.id;
+			/** @type {import('fractal-components/types/api').Profile} */
+			const profile = await response.json();
+			selectedResourceId = profile.resource_id;
 		} else {
 			profilesErrorAlert = displayStandardErrorAlert(
 				await getAlertErrorFromResponse(response),

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

@@ -46,19 +46,15 @@ export async function getResource(fetch, resourceId) {
 
 /**
  * @param {typeof fetch} fetch
- * @param {number} resourceId
  * @param {number} profileId
  * @returns {Promise<import('fractal-components/types/api').Resource>}
  */
-export async function getProfile(fetch, resourceId, profileId) {
-	logger.debug(`Retrieving profile ${profileId} of resource ${resourceId}`);
-	const response = await fetch(
-		`${env.FRACTAL_SERVER_HOST}/admin/v2/resource/${resourceId}/profile/${profileId}`,
-		{
-			method: 'GET',
-			credentials: 'include'
-		}
-	);
+export async function getProfile(fetch, profileId) {
+	logger.debug(`Retrieving profile ${profileId}`);
+	const response = await fetch(`${env.FRACTAL_SERVER_HOST}/admin/v2/profile/${profileId}`, {
+		method: 'GET',
+		credentials: 'include'
+	});
 
 	if (!response.ok) {
 		await responseError(response);

src/routes/v2/admin/resources/[resourceId]/edit/+page.svelte

@@ -1,6 +1,10 @@
 <script>
 	import { page } from '$app/state';
-	import { displayStandardErrorAlert, getAlertErrorFromResponse } from '$lib/common/errors';
+	import {
+		AlertError,
+		displayStandardErrorAlert,
+		getAlertErrorFromResponse
+	} from '$lib/common/errors';
 	import StandardDismissableAlert from '$lib/components/common/StandardDismissableAlert.svelte';
 	import { normalizePayload } from 'fractal-components';
 	import { onMount } from 'svelte';
@@ -74,6 +78,8 @@
 					'saveError'
 				);
 			}
+		} catch (err) {
+			saveErrorAlert = displayStandardErrorAlert(new AlertError(err), 'saveError');
 		} finally {
 			saving = false;
 		}

src/routes/v2/admin/resources/[resourceId]/profiles/+page.svelte

@@ -30,7 +30,7 @@
 	 * @param {number} id
 	 */
 	async function handleDeleteProfile(id) {
-		const response = await fetch(`/api/admin/v2/resource/${resource.id}/profile/${id}`, {
+		const response = await fetch(`/api/admin/v2/profile/${id}`, {
 			method: 'DELETE'
 		});
 

src/routes/v2/admin/resources/[resourceId]/profiles/[profileId]/+page.server.js

@@ -7,7 +7,7 @@ export async function load({ fetch, params }) {
 	logger.debug('Loading resource %d', params.resourceId);
 	const resource = await getResource(fetch, Number(params.resourceId));
 	logger.debug('Loading profile %d', params.profileId);
-	const profile = await getProfile(fetch, Number(params.resourceId), Number(params.profileId));
+	const profile = await getProfile(fetch, Number(params.profileId));
 	return {
 		resource,
 		profile

src/routes/v2/admin/resources/[resourceId]/profiles/[profileId]/edit/+page.server.js

@@ -7,7 +7,7 @@ export async function load({ fetch, params }) {
 	logger.debug('Loading resource %d', params.resourceId);
 	const resource = await getResource(fetch, Number(params.resourceId));
 	logger.debug('Loading profile %d', params.profileId);
-	const profile = await getProfile(fetch, Number(params.resourceId), Number(params.profileId));
+	const profile = await getProfile(fetch, Number(params.profileId));
 	return {
 		resource,
 		profile

src/routes/v2/admin/resources/[resourceId]/profiles/[profileId]/edit/+page.svelte

@@ -20,7 +20,7 @@
 		const headers = new Headers();
 		headers.set('Content-Type', 'application/json');
 
-		return await fetch(`/api/admin/v2/resource/${resource.id}/profile/${profile.id}`, {
+		return await fetch(`/api/admin/v2/profile/${profile.id}`, {
 			method: 'PUT',
 			credentials: 'include',
 			headers,

src/routes/v2/admin/users/[userId]/+page.server.js

@@ -1,5 +1,6 @@
 import { env } from '$env/dynamic/private';
 import { getUser, getUserSettings, listGroups } from '$lib/server/api/auth_api';
+import { getProfile } from '$lib/server/api/v2/admin_api';
 import { getLogger } from '$lib/server/logger.js';
 
 const logger = getLogger('admin user page');
@@ -8,11 +9,16 @@ export async function load({ fetch, params }) {
 	logger.debug('Loading user %d', params.userId);
 
 	const user = await getUser(fetch, params.userId);
+	let profile = undefined;
+	if (user.profile_id) {
+		profile = await getProfile(fetch, user.profile_id);
+	}
 	const settings = await getUserSettings(fetch, params.userId);
 	const groups = await listGroups(fetch);
 
 	return {
 		user,
+		profile,
 		settings,
 		groups,
 		runnerBackend: env.FRACTAL_RUNNER_BACKEND