Merge pull request #876 from fractal-analytics-platform/pagination

Added paginator to admin tasks and jobs pages

Author: zonia3000

CHANGELOG.md

@@ -17,6 +17,8 @@
 * Added support for oneOf and discriminator (\#867);
 * Added resource filter on admin task and task-group pages (\#867);
 * Handled `FRACTAL_DEFAULT_GROUP_NAME` environment variable, to specify if a default group is used (\#870);
+* Renamed "Restart workflow" to "Reset workflow" (\#876);
+* Added paginator to admin tasks and jobs pages (\#876);
 
 # 1.20.0
 

playwright.config.js

@@ -88,7 +88,7 @@ export default defineConfig({
 
 	webServer: [
 		{
-			command: './tests/start-test-server.sh --branch main',
+			command: './tests/start-test-server.sh --branch pagination',
 			port: 8000,
 			waitForPort: true,
 			stdout: 'pipe',

src/lib/components/v2/jobs/JobsList.svelte

@@ -139,6 +139,9 @@
 	 * @param {Array<import('fractal-components/types/api').ApplyWorkflowV2>} jobs
 	 */
 	function getSortedJobs(jobs) {
+		if (admin) {
+			return jobs;
+		}
 		const sortedRows = [...jobs];
 		const sortColumns = columns.filter(
 			(c) => c.direction !== undefined && c.priority !== undefined && c.field
@@ -413,12 +416,14 @@
 						{#if column.field}
 							<th onclick={() => updateSortField(column)} style="cursor: pointer">
 								{column.label}
-								{#if column.direction === 'asc'}
-									↑
-								{:else if column.direction === 'desc'}
-									↓
-								{:else}
-									⇅
+								{#if !admin}
+									{#if column.direction === 'asc'}
+										↑
+									{:else if column.direction === 'desc'}
+										↓
+									{:else}
+										⇅
+									{/if}
 								{/if}
 							</th>
 						{:else}
@@ -480,23 +485,29 @@
 				<td>
 					<button
 						class="btn btn-info"
+						aria-label="Info"
 						onclick={(event) => {
 							event.preventDefault();
 							jobInfoModal.show(row);
 						}}
 					>
 						<i class="bi-info-circle"></i>
-						Info
+						{#if !admin}
+							Info
+						{/if}
 					</button>
 					<button
 						class="btn btn-light"
+						aria-label="Logs"
 						onclick={(event) => {
 							event.preventDefault();
 							jobLogsModal.show(row, admin);
 						}}
 					>
 						<i class="bi-list-columns-reverse"></i>
-						Logs
+						{#if !admin}
+							Logs
+						{/if}
 					</button>
 					{#if (admin && row.id) || (row.project_id !== null && row.user_email === currentUserEmail)}
 						<a

src/lib/components/v2/workflow/RunWorkflowModal.svelte

@@ -526,7 +526,7 @@
 			{:else if mode === 'continue'}
 				Continue workflow
 			{:else}
-				Restart workflow
+				Reset workflow
 			{/if}
 		</h5>
 	{/snippet}
@@ -535,10 +535,10 @@
 		<form id="runWorkflowForm">
 			{#if mode === 'restart'}
 				<div class="alert alert-warning">
-					<strong>WARNING</strong>: Restarting a workflow will create a new dataset and optionally
-					delete the old dataset with its image list, filters & history. It does not remove the
-					existing Zarr data though. Either remove it yourself before rerunning or set the overwrite
-					option to True in the corresponding tasks.
+					<strong>WARNING</strong>: Restarting a workflow will reset your dataset and its processing
+					history. It deletes the existing dataset and creates a new one. Thus, you should only
+					restart a workflow if you don't need access anymore to the dataset and its processing
+					history. Be aware that resetting the dataset will not remove the on-disk Zarr data though.
 				</div>
 			{/if}
 			{#if mode === 'restart'}
@@ -600,7 +600,7 @@
 						name="firstTaskIndex"
 						id="firstTaskIndex"
 						class="form-select"
-						disabled={checkingConfiguration}
+						disabled={checkingConfiguration || mode === 'restart'}
 						bind:value={firstTaskIndex}
 						onchange={firstTaskIndexChanged}
 						class:is-invalid={mode === 'continue' && firstTaskIndex === undefined}