Added manage buttons on admin task-groups page

zonia3000 · zonia3000 · commit 4950c4191148 · 2024-11-19T10:20:54.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
     * Removed usage of DB_ENGINE and SQLITE_PATH variables (\#643);
     * 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);
 
 # 1.10.1
 
diff --git a/playwright.config.js b/playwright.config.js
@@ -107,7 +107,7 @@ export default defineConfig({
 
 	webServer: [
 		{
-			command: './tests/start-test-server.sh 2.9.0a2',
+			command: './tests/start-test-server.sh 2.9.0a4',
 			port: 8000,
 			waitForPort: true,
 			stdout: 'pipe',
diff --git a/src/lib/components/v2/tasks/TaskGroupActivities.svelte b/src/lib/components/v2/tasks/TaskGroupActivities.svelte
@@ -154,7 +154,7 @@
 		if (activityId && !isNaN(Number(activityId))) {
 			task_group_activity_id = Number(activityId);
 		}
-		if (!admin) {
+		if (!admin || task_group_activity_id !== null) {
 			await searchActivities();
 		}
 		updateTasksCollectionTimeout = setTimeout(
diff --git a/src/lib/components/v2/tasks/TaskGroupManageModal.svelte b/src/lib/components/v2/tasks/TaskGroupManageModal.svelte
@@ -3,6 +3,9 @@
 	import { displayStandardErrorAlert, getAlertErrorFromResponse } from '$lib/common/errors';
 	import Modal from '../../common/Modal.svelte';
 
+	/** @type {boolean} */
+	export let admin;
+
 	/** @type {Modal} */
 	let modal;
 
@@ -36,7 +39,9 @@
 		headers.append('Content-Type', 'application/json');
 
 		const response = await fetch(
-			`/api/v2/task-group/${taskGroup?.id}/${active ? 'reactivate' : 'deactivate'}/`,
+			`/api/${admin ? 'admin/' : ''}v2/task-group/${taskGroup?.id}/${
+				active ? 'reactivate' : 'deactivate'
+			}/`,
 			{
 				method: 'POST',
 				credentials: 'include',
@@ -48,7 +53,8 @@
 
 		if (response.ok) {
 			const result = await response.json();
-			goto(`/v2/tasks/activities?activity_id=${result.id}`);
+			const page = admin ? `/v2/admin/task-groups/activities` : `/v2/tasks/activities`;
+			goto(`${page}?activity_id=${result.id}`);
 			modal.hide();
 		} else {
 			errorAlert = displayStandardErrorAlert(
diff --git a/src/lib/components/v2/tasks/TaskGroupsTable.svelte b/src/lib/components/v2/tasks/TaskGroupsTable.svelte
@@ -268,7 +268,7 @@
 	{updateEditedTaskGroup}
 	groupIdsNames={user.group_ids_names || []}
 />
-<TaskGroupManageModal bind:this={taskGroupManageModal} />
+<TaskGroupManageModal bind:this={taskGroupManageModal} admin={false} />
 <TaskInfoModal bind:this={taskInfoModal} />
 <TaskEditModal bind:this={taskEditModal} {updateEditedTask} />
 
diff --git a/src/routes/v2/admin/task-groups/+page.svelte b/src/routes/v2/admin/task-groups/+page.svelte
@@ -6,6 +6,7 @@
 	import Modal from '$lib/components/common/Modal.svelte';
 	import TimestampCell from '$lib/components/jobs/TimestampCell.svelte';
 	import TaskGroupEditModal from '$lib/components/v2/tasks/TaskGroupEditModal.svelte';
+	import TaskGroupManageModal from '$lib/components/v2/tasks/TaskGroupManageModal.svelte';
 
 	/** @type {Array<import('$lib/types').User>} */
 	const users = $page.data.users;
@@ -36,6 +37,8 @@
 
 	/** @type {import('$lib/components/v2/tasks/TaskGroupEditModal.svelte').default} */
 	let taskGroupEditModal;
+	/** @type {import('$lib/components/v2/tasks/TaskGroupManageModal.svelte').default} */
+	let taskGroupManageModal;
 
 	async function searchTaskGroups() {
 		searching = true;
@@ -267,7 +270,7 @@
 				<col width="90" />
 				<col width="90" />
 				<col width="90" />
-				<col width="270" />
+				<col width="400" />
 			</colgroup>
 			<thead>
 				<tr>
@@ -304,6 +307,10 @@
 								<i class="bi bi-pencil" />
 								Edit
 							</button>
+							<button class="btn btn-info" on:click={() => taskGroupManageModal.open(taskGroup)}>
+								<i class="bi bi-gear" />
+								Manage
+							</button>
 							<ConfirmActionButton
 								modalId="confirmTaskGroupDeleteModal{taskGroup.pkg_name}"
 								style={'danger'}
@@ -331,6 +338,7 @@
 	updateEditedTaskGroup={searchTaskGroups}
 	groupIdsNames={groups.map((g) => [g.id, g.name])}
 />
+<TaskGroupManageModal bind:this={taskGroupManageModal} admin={true} />
 
 <Modal id="taskInfoModal" bind:this={infoModal} size="xl" onClose={onInfoModalClose}>
 	<svelte:fragment slot="header">
diff --git a/tests/v2/admin_task_group_manage.spec.js b/tests/v2/admin_task_group_manage.spec.js
@@ -0,0 +1,59 @@
+import { expect, test } from '@playwright/test';
+import { waitPageLoading } from '../utils.js';
+import { createFakeTask, deleteTask } from './task_utils.js';
+
+test('Admin task group manage (deactivate / reactivate)', async ({ page }) => {
+	let taskName;
+	await test.step('Create test task group', async () => {
+		taskName = await createFakeTask(page, {
+			type: 'non_parallel'
+		});
+	});
+
+	await test.step('Open admin task-groups page', async () => {
+		await page.goto('/v2/admin/task-groups');
+		await waitPageLoading(page);
+		await page.getByRole('textbox', { name: 'Package name' }).fill(taskName);
+		await page.getByRole('button', { name: 'Search task groups' }).click();
+	});
+
+	await test.step('Deactivate the task', async () => {
+		await page.getByRole('row', { name: taskName }).getByRole('button', { name: 'Manage' }).click();
+		const modal = page.locator('.modal.show');
+		await modal.waitFor();
+		await expect(modal.getByText('The task group is currently active')).toBeVisible();
+		await modal.getByText('active').click();
+		await modal.getByRole('button', { name: 'Deactivate task group' }).click();
+		await modal.getByRole('button', { name: 'Confirm' }).click();
+	});
+
+	await test.step('Verify that page loads the proper activity', async () => {
+		await page.waitForURL(/\/v2\/admin\/task-groups\/activities\?activity_id=\d+/);
+		await waitPageLoading(page);
+		await expect(page.getByRole('row')).toHaveCount(2);
+		await expect(page.getByRole('row', { name: taskName })).toContainText('deactivate');
+	});
+
+	await test.step('Go back to previous page and reactivate the task', async () => {
+		await page.goBack();
+		await waitPageLoading(page);
+		await page.getByRole('textbox', { name: 'Package name' }).fill(taskName);
+		await page.getByRole('button', { name: 'Search task groups' }).click();
+		await page.getByRole('row', { name: taskName }).getByRole('button', { name: 'Manage' }).click();
+		const modal = page.locator('.modal.show');
+		await modal.waitFor();
+		await modal.getByText('active').click();
+		await modal.getByRole('button', { name: 'Reactivate task group' }).click();
+	});
+
+	await test.step('Verify that page loads the proper activity', async () => {
+		await page.waitForURL(/\/v2\/admin\/task-groups\/activities\?activity_id=\d+/);
+		await waitPageLoading(page);
+		await expect(page.getByRole('row')).toHaveCount(2);
+		await expect(page.getByRole('row', { name: taskName })).toContainText('reactivate');
+	});
+
+	await test.step('Cleanup', async () => {
+		await deleteTask(page, taskName);
+	});
+});
diff --git a/tests/v2/task_group_manage.spec.js b/tests/v2/task_group_manage.spec.js
@@ -1,11 +1,8 @@
-import { expect, test } from './workflow_fixture.js';
+import { expect, test } from '@playwright/test';
 import { waitPageLoading } from '../utils.js';
 import { createFakeTask, deleteTask } from './task_utils.js';
 
-test('Task group manage (deactivate / reactivate)', async ({ page, workflow }) => {
-	await page.waitForURL(workflow.url);
-	await waitPageLoading(page);
-
+test('Task group manage (deactivate / reactivate)', async ({ page }) => {
 	let taskName;
 	await test.step('Create test task group', async () => {
 		taskName = await createFakeTask(page, {

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ export default defineConfig({`
`107`	`107`
`108`	`108`	`webServer: [`
`109`	`109`	`{`
`110`		`- command: './tests/start-test-server.sh 2.9.0a2',`
	`110`	`+ command: './tests/start-test-server.sh 2.9.0a4',`
`111`	`111`	`port: 8000,`
`112`	`112`	`waitForPort: true,`
`113`	`113`	`stdout: 'pipe',`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@`
`154`	`154`	`if (activityId && !isNaN(Number(activityId))) {`
`155`	`155`	`task_group_activity_id = Number(activityId);`
`156`	`156`	`}`
`157`		`- if (!admin) {`
	`157`	`+ if (!admin \|\| task_group_activity_id !== null) {`
`158`	`158`	`await searchActivities();`
`159`	`159`	`}`
`160`	`160`	`updateTasksCollectionTimeout = setTimeout(`