Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ui/src/components/shared/data-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ interface BaseDataTableProps<TData, TValue> {
initialSorting?: SortingState;
/** Render a leading checkbox column. */
enableSelection?: boolean;
/** Optional row-level selection guard for pages with state-dependent bulk actions. */
canSelectRow?: (row: TData) => boolean;
/** Stable row id (e.g. file_id) so selection survives a data refetch. */
getRowId?: (row: TData) => string;
}
Expand All @@ -54,6 +56,7 @@ export function DataTable<TData, TValue>({
pageSize = 10,
initialSorting = [],
enableSelection = false,
canSelectRow,
getRowId,
rowSelection: controlledRowSelection,
onRowSelectionChange,
Expand Down Expand Up @@ -85,6 +88,7 @@ export function DataTable<TData, TValue>({
<Checkbox
checked={row.getIsSelected()}
onCheckedChange={(value) => row.toggleSelected(!!value)}
disabled={!row.getCanSelect()}
aria-label="Select row"
/>
),
Expand All @@ -103,7 +107,9 @@ export function DataTable<TData, TValue>({
onColumnFiltersChange: setColumnFilters,
onPaginationChange: setPagination,
onRowSelectionChange: setRowSelection,
enableRowSelection: enableSelection,
enableRowSelection: enableSelection
? (row) => (canSelectRow ? canSelectRow(row.original) : true)
: false,
getRowId,
// Keep the user on their current page when the rows change underneath them
// (e.g. deleting a row refetches the list). TanStack resets pageIndex to 0
Expand Down
43 changes: 41 additions & 2 deletions ui/src/pages/admin/jobs/list.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,16 @@ import { render, screen, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
import { MemoryRouter } from "react-router-dom";
import { beforeEach, describe, expect, it, vi } from "vitest";
import { getQueueInfo, listTasks } from "@/lib/api/jobs";
import { cancelTask, getQueueInfo, listTasks, type TaskState } from "@/lib/api/jobs";
import JobListPage from "./list";

vi.mock("sonner", () => ({
toast: {
success: vi.fn(),
error: vi.fn(),
},
}));

const permissions = vi.hoisted(() => ({ isAdmin: true }));

vi.mock("@/lib/permissions", () => ({
Expand All @@ -15,14 +22,18 @@ vi.mock("@/lib/permissions", () => ({
}));

vi.mock("@/lib/api/jobs", () => ({
cancelTask: vi.fn(),
getQueueInfo: vi.fn(),
isActiveState: (state: string) => ["QUEUED", "SERIALIZING", "CHUNKING", "INSERTING"].includes(state),
isTerminalState: (state: string) => ["COMPLETED", "FAILED", "CANCELLED"].includes(state),
listTasks: vi.fn(),
}));

const cancelTaskMock = vi.mocked(cancelTask);
const getQueueInfoMock = vi.mocked(getQueueInfo);
const listTasksMock = vi.mocked(listTasks);

const task = (task_id: string, state: "COMPLETED" | "FAILED", filename: string) => ({
const task = (task_id: string, state: TaskState, filename: string) => ({
task_id,
state,
details: {
Expand Down Expand Up @@ -54,6 +65,7 @@ describe("JobListPage filters", () => {
beforeEach(() => {
permissions.isAdmin = true;
vi.clearAllMocks();
cancelTaskMock.mockResolvedValue({ message: "Cancellation signal sent" });
getQueueInfoMock.mockResolvedValue({
workers: { total_slots: 4, pool_size: 2, max_per_actor: 2 },
tasks: {
Expand Down Expand Up @@ -90,6 +102,33 @@ describe("JobListPage filters", () => {
expect(await screen.findByText("failed.pdf")).not.toBeNull();
});

it("bulk-cancels only selected active jobs", async () => {
listTasksMock.mockResolvedValue({
tasks: [
task("queued-task", "QUEUED", "queued.pdf"),
task("completed-task", "COMPLETED", "completed.pdf"),
],
});

renderJobs();

expect(await screen.findByText("queued.pdf")).not.toBeNull();
expect(screen.getByText("completed.pdf")).not.toBeNull();

const rowCheckboxes = screen.getAllByRole("checkbox", { name: /select row/i });
expect(rowCheckboxes[0].hasAttribute("disabled")).toBe(false);
expect(rowCheckboxes[1].hasAttribute("disabled")).toBe(true);

await userEvent.click(screen.getByRole("checkbox", { name: /select visible rows/i }));
expect(screen.getByText("1 selected")).not.toBeNull();

await userEvent.click(screen.getByRole("button", { name: /cancel selected/i }));
await userEvent.click(screen.getByRole("button", { name: /confirm/i }));

await waitFor(() => expect(cancelTaskMock).toHaveBeenCalledWith("queued-task"));
expect(cancelTaskMock).not.toHaveBeenCalledWith("completed-task");
});

it("shows queue and worker pressure from the backend", async () => {
getQueueInfoMock.mockResolvedValue({
workers: { total_slots: 2, pool_size: 1, max_per_actor: 2 },
Expand Down
62 changes: 56 additions & 6 deletions ui/src/pages/admin/jobs/list.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
import { useEffect, useMemo, useState } from "react";
import { Link } from "react-router-dom";
import { useQuery } from "@tanstack/react-query";
import type { ColumnDef } from "@tanstack/react-table";
import { RefreshCw, Search } from "lucide-react";
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import type { ColumnDef, RowSelectionState } from "@tanstack/react-table";
import { Ban, RefreshCw, Search } from "lucide-react";
import { toast } from "sonner";
import { usePermissions } from "@/lib/permissions";

import { PageHeader } from "@/components/shared/page-header";
import { DataTable } from "@/components/shared/data-table";
import { StatusBadge } from "@/components/shared/status-badge";
import { ConfirmDialog } from "@/components/shared/confirm-dialog";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";
import { getQueueInfo, listTasks, type QueueInfo, type TaskListItem } from "@/lib/api/jobs";
import { cancelTask, getQueueInfo, isActiveState, listTasks, type QueueInfo, type TaskListItem } from "@/lib/api/jobs";

// OpenRag exposes per-file indexing tasks (TaskStateManager), not batch "jobs".
const STATUS_TABS = ["ALL", "ACTIVE", "COMPLETED", "FAILED", "CANCELLED"] as const;
Expand Down Expand Up @@ -91,9 +93,11 @@ const columns: ColumnDef<TaskListItem, unknown>[] = [

export default function JobListPage() {
const { isAdmin } = usePermissions();
const queryClient = useQueryClient();
const [statusTab, setStatusTab] = useState<string>("ALL");
const [search, setSearch] = useState("");
const [debouncedSearch, setDebouncedSearch] = useState("");
const [rowSelection, setRowSelection] = useState<RowSelectionState>({});
const [manualRefreshing, setManualRefreshing] = useState(false);

useEffect(() => {
Expand Down Expand Up @@ -126,19 +130,39 @@ export default function JobListPage() {
);
});
}, [tasks, debouncedSearch]);
const selectedActiveTasks = useMemo(
() => filteredTasks.filter((task) => rowSelection[task.task_id] && isActiveState(task.state)),
Comment thread
hedhoud marked this conversation as resolved.
Resolved
[filteredTasks, rowSelection],
);

const bulkCancelMutation = useMutation({
mutationFn: async (taskIds: string[]) => {
const results = await Promise.allSettled(taskIds.map((taskId) => cancelTask(taskId)));
Comment thread
hedhoud marked this conversation as resolved.
Resolved
const ok = results.filter((result) => result.status === "fulfilled").length;
return { ok, failed: results.length - ok };
},
onSuccess: ({ ok, failed }) => {
if (ok) toast.success(`${ok} task(s) cancelled`);
if (failed) toast.error(`${failed} task(s) failed to cancel`);
setRowSelection({});
queryClient.invalidateQueries({ queryKey: ["tasks"] });
},
onError: (error: Error) => toast.error(`Bulk cancel failed: ${error.message}`),
});

const handleStatusTabChange = (value: string) => {
setStatusTab(value);
setSearch("");
setDebouncedSearch("");
setRowSelection({});
};

return (
<div>
<PageHeader title="Jobs" description={isAdmin ? "Monitor indexing tasks" : "Monitor your indexing tasks"} />

<Tabs value={statusTab} onValueChange={handleStatusTabChange}>
<div className="mb-4 mt-0 flex items-center gap-2">
<div className="mb-4 mt-0 flex flex-wrap items-center gap-2">
<div className="relative max-w-sm">
<Search className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
<Input
Expand All @@ -152,6 +176,23 @@ export default function JobListPage() {
<p className="text-sm text-muted-foreground">
{filteredTasks.length} job{filteredTasks.length === 1 ? "" : "s"}
</p>
{selectedActiveTasks.length > 0 && (
<>
<ConfirmDialog
title="Cancel selected tasks?"
description={`Send a cancellation signal for ${selectedActiveTasks.length} active task(s)? Already-completed work is not rolled back.`}
onConfirm={() => bulkCancelMutation.mutate(selectedActiveTasks.map((task) => task.task_id))}
>
<Button variant="outline" size="sm" disabled={bulkCancelMutation.isPending}>
<Ban className="h-4 w-4" />
Cancel selected
</Button>
</ConfirmDialog>
<p className="text-sm text-muted-foreground">
{selectedActiveTasks.length} selected
</p>
</>
)}
{isAdmin && (
<QueuePressureSummary
queueInfo={queueInfoQuery.data}
Expand Down Expand Up @@ -195,7 +236,16 @@ export default function JobListPage() {
</div>
) : (
// Remounting resets pagination for a new tab/search context; sort state resets with it.
<DataTable key={`${statusTab}:${debouncedSearch}`} columns={columns} data={filteredTasks} />
<DataTable
key={`${statusTab}:${debouncedSearch}`}
columns={columns}
data={filteredTasks}
enableSelection
canSelectRow={(task) => isActiveState(task.state)}
getRowId={(task) => task.task_id}
rowSelection={rowSelection}
onRowSelectionChange={setRowSelection}
/>
)}
</TabsContent>
))}
Expand Down
Loading