Added last used timestamp filter to task-group admin page

Author: zonia3000

CHANGELOG.md

@@ -10,6 +10,7 @@
     * Displayed `timestamp_last_used` property in task-group info modal (\#643);
     * Viewer paths page improvements (\#643);
     * Added manage buttons on admin task-groups page (\#643);
+    * Added last used timestamp filter to task-group admin page (\#643);
 
 # 1.10.1
 

playwright.config.js

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

src/routes/v2/admin/task-groups/+page.svelte

@@ -1,5 +1,6 @@
 <script>
 	import { page } from '$app/stores';
+	import { getTimestamp } from '$lib/common/component_utilities';
 	import { displayStandardErrorAlert, getAlertErrorFromResponse } from '$lib/common/errors';
 	import BooleanIcon from '$lib/components/common/BooleanIcon.svelte';
 	import ConfirmActionButton from '$lib/components/common/ConfirmActionButton.svelte';
@@ -21,6 +22,10 @@
 	let privateGroup = null;
 	/** @type {boolean|null} */
 	let active = null;
+	let lastUsedDateMin;
+	let lastUsedTimeMin = '';
+	let lastUsedDateMax = '';
+	let lastUsedTimeMax = '';
 
 	let searched = false;
 	let searching = false;
@@ -65,6 +70,14 @@
 			if (active !== null) {
 				url.searchParams.append('active', active.toString());
 			}
+			const lasUsedTimestampMin = getTimestamp(lastUsedDateMin, lastUsedTimeMin);
+			if (lasUsedTimestampMin) {
+				url.searchParams.append('timestamp_last_used_min', lasUsedTimestampMin);
+			}
+			const lasUsedTimestampMax = getTimestamp(lastUsedDateMax, lastUsedTimeMax);
+			if (lasUsedTimestampMax) {
+				url.searchParams.append('timestamp_last_used_max', lasUsedTimestampMax);
+			}
 			const response = await fetch(url);
 			if (!response.ok) {
 				searchErrorAlert = displayStandardErrorAlert(
@@ -88,6 +101,10 @@
 		user_group_id = '';
 		pkg_name = '';
 		origin = '';
+		lastUsedDateMin = '';
+		lastUsedTimeMin = '';
+		lastUsedDateMax = '';
+		lastUsedTimeMax = '';
 		privateGroup = null;
 		active = null;
 		searched = false;
@@ -237,6 +254,48 @@
 				</div>
 			</div>
 		</div>
+
+		<div class="row mt-3">
+			<div class="col-md-3 col-lg-2 mt-2">Last used</div>
+			<div class="col-md-9 col-lg-10">
+				<div class="row row-cols-md-auto">
+					<div class="col-12 mt-1">
+						<div class="input-group">
+							<div class="input-group-text">Min</div>
+							<input
+								type="date"
+								class="form-control"
+								bind:value={lastUsedDateMin}
+								id="last_used_date_min"
+							/>
+							<input
+								type="time"
+								class="form-control"
+								bind:value={lastUsedTimeMin}
+								id="last_used_time_min"
+							/>
+						</div>
+					</div>
+					<div class="col-12 mt-1">
+						<div class="input-group">
+							<div class="input-group-text">Max</div>
+							<input
+								type="date"
+								class="form-control"
+								bind:value={lastUsedDateMax}
+								id="last_used_date_max"
+							/>
+							<input
+								type="time"
+								class="form-control"
+								bind:value={lastUsedTimeMax}
+								id="last_used_time_max"
+							/>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
 	</div>
 </div>
 
@@ -405,4 +464,8 @@
 	.row-grey {
 		background-color: #f2f2f2;
 	}
+
+	input[type='date'] {
+		min-width: 190px;
+	}
 </style>

tests/v2/admin_task_groups.spec.js

@@ -65,4 +65,20 @@ test('Task groups admin page [v2]', async ({ page, workflow }) => {
 		await waitModalClosed(page);
 		await expect(page.getByText('The query returned 0 matching results')).toBeVisible();
 	});
+
+	await test.step('Search by date', async () => {
+		await page.getByText('Reset').click();
+		await expect(page.getByText('The query returned 0 matching results')).not.toBeVisible();
+		await page.locator('#last_used_date_min').fill('2020-01-01');
+		await page.locator('#last_used_time_min').fill('10:00');
+		await page.locator('#last_used_date_max').fill('2020-01-03');
+		await page.locator('#last_used_time_max').fill('23:00');
+		await page.getByRole('button', { name: 'Search task groups' }).click();
+		await expect(page.getByText('The query returned 0 matching results')).toBeVisible();
+		await page.getByText('Reset').click();
+		await expect(page.locator('#last_used_date_min')).toHaveValue('');
+		await expect(page.locator('#last_used_time_min')).toHaveValue('');
+		await expect(page.locator('#last_used_date_max')).toHaveValue('');
+		await expect(page.locator('#last_used_time_max')).toHaveValue('');
+	});
 });