Used new pagination fields

Author: zonia3000

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

@@ -75,16 +75,16 @@ export type Image = {
 	types: { [key: string]: boolean };
 };
 
-export type Pagination = {
+export type Pagination<T> = {
 	total_count: number;
 	page_size: number;
 	current_page: number;
+	items: Array<T>;
 };
 
-export type ImagePage = Pagination & {
+export type ImagePage = Pagination<Image> & {
 	attributes: { [key: string]: Array<string | number | boolean> };
 	types: Array<string>;
-	images: Array<Image>;
 };
 
 export type TaskV2Type = 'non_parallel' | 'parallel' | 'compound';
@@ -276,15 +276,13 @@ export type TypeFiltersFlow = {
 	output_filters: Array<{ [key: string]: bool }>;
 };
 
-export type Accounting = Pagination & {
-	records: Array<{
-		id: number;
-		user_id: number;
-		timestamp: string;
-		num_tasks: number;
-		num_new_images: number;
-	}>;
-};
+export type Accounting = Pagination<{
+	id: number;
+	user_id: number;
+	timestamp: string;
+	num_tasks: number;
+	num_new_images: number;
+}>;
 
 export type HistoryItemV2 = {
 	id: number;

src/lib/components/admin/Accounting.svelte

@@ -49,7 +49,7 @@
 			return;
 		}
 		const header = ['id', 'user_id', 'user_email', 'timestamp', 'num_tasks', 'num_new_images'];
-		const rows = accounting.records.map((record) => [
+		const rows = accounting.items.map((record) => [
 			record.id,
 			record.user_id,
 			getUserById(record.user_id)?.email || '',
@@ -190,7 +190,7 @@
 			</tr>
 		</thead>
 		<tbody>
-			{#each accounting.records as row}
+			{#each accounting.items as row}
 				<tr>
 					<td>{row.id}</td>
 					<td>{getUserById(row.user_id)?.email || row.user_id}</td>

src/lib/components/jobs/ImagesStatusModal.svelte

@@ -24,7 +24,7 @@
 	/** @type {Modal} */
 	let modal;
 
-	/** @type {(import('fractal-components/types/api').Pagination & {images: string[]})|undefined} */
+	/** @type {(import('fractal-components/types/api').Pagination<string>)|undefined} */
 	let data = undefined;
 
 	let loadingLogs = false;
@@ -105,7 +105,7 @@
 			loadingLogs = false;
 			return;
 		}
-		const { log } = await response.json();
+		const log = await response.json();
 		if (status === 'failed') {
 			logParts = extractJobErrorParts(log, false, true);
 		} else {
@@ -144,10 +144,10 @@
 				</div>
 			</div>
 		{:else if data}
-			{#if data.images.length > 0}
+			{#if data.items.length > 0}
 				<table class="table table-striped">
 					<tbody>
-						{#each data.images as image}
+						{#each data.items as image}
 							<tr>
 								<td>{image}</td>
 								<td>

src/lib/components/v2/projects/datasets/DatasetImagesTable.svelte

@@ -403,7 +403,7 @@
 			reloadTypeFilters(imagePage);
 			// Go to first page if the search returns no values and we are not in the first page
 			// This happens when we are in a given page and we restrict the search setting more filters
-			if (imagePage.images.length === 0 && imagePage.current_page > 1) {
+			if (imagePage.items.length === 0 && imagePage.current_page > 1) {
 				imagePage.current_page = 1;
 				await searchImages();
 			}
@@ -475,7 +475,7 @@
 		);
 		if (response.ok) {
 			// If we are deleting the last image of the current page go to previous page
-			if (imagePage.images.length === 1 && imagePage.current_page > 1) {
+			if (imagePage.items.length === 1 && imagePage.current_page > 1) {
 				imagePage.current_page--;
 			}
 			await searchImages();
@@ -691,7 +691,7 @@
 					</tr>
 				</thead>
 				<tbody>
-					{#each imagePage.images as image}
+					{#each imagePage.items as image}
 						<tr>
 							<td>{getRelativePath(image.zarr_url)}</td>
 							{#each Object.keys(imagePage.attributes) as attribute}

src/routes/v2/projects/[projectId]/datasets/[datasetId]/+page.svelte

@@ -42,7 +42,7 @@
 			selectedPlate = '';
 			return;
 		}
-		let imageWithPlate = imagePage.images.find((i) => i.attributes['plate'] === selectedPlate);
+		let imageWithPlate = imagePage.items.find((i) => i.attributes['plate'] === selectedPlate);
 		if (!imageWithPlate) {
 			platePathLoading = true;
 			imageWithPlate = await loadImageForSelectedPlate();
@@ -82,13 +82,13 @@
 		}
 		/** @type {import('fractal-components/types/api').ImagePage}*/
 		const result = await response.json();
-		if (result.images.length === 0) {
+		if (result.items.length === 0) {
 			console.error(
 				`Unable to load image for plate ${selectedPlate}. Server replied with empty list`
 			);
 			return undefined;
 		}
-		return result.images[0];
+		return result.items[0];
 	}
 
 	async function handleExportDataset() {