Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
Fix pagination: disable Next correctly for workflows and run history (#3293)
dvloper-bogdand2c71a954292
diff --git a/skyvern-frontend/src/hooks/useRunsQuery.ts b/skyvern-frontend/src/hooks/useRunsQuery.tsindex 2f2cff99d..2e4dc6fcf 100644--- a/skyvern-frontend/src/hooks/useRunsQuery.ts+++ b/skyvern-frontend/src/hooks/useRunsQuery.ts@@ -11,17 +11,19 @@ type UseQueryOptions = Omit<type Props = {page?: number;+ pageSize?: number;statusFilters?: Array<Status>;} & UseQueryOptions;-function useRunsQuery({ page = 1, statusFilters }: Props) {+function useRunsQuery({ page = 1, pageSize = 10, statusFilters }: Props) {const credentialGetter = useCredentialGetter();return useQuery<Array<Task | WorkflowRunApiResponse>>({- queryKey: ["runs", { statusFilters }, page],+ queryKey: ["runs", { statusFilters }, page, pageSize],queryFn: async () => {const client = await getClient(credentialGetter);const params = new URLSearchParams();params.append("page", String(page));+ params.append("page_size", String(pageSize));if (statusFilters) {statusFilters.forEach((status) => {params.append("status", status);diff --git a/skyvern-frontend/src/routes/history/RunHistory.tsx b/skyvern-frontend/src/routes/history/RunHistory.tsxindex c103d75a8..013c99ca3 100644--- a/skyvern-frontend/src/routes/history/RunHistory.tsx+++ b/skyvern-frontend/src/routes/history/RunHistory.tsx@@ -21,20 +21,53 @@ import {import { useRunsQuery } from "@/hooks/useRunsQuery";import { basicLocalTimeFormat, basicTimeFormat } from "@/util/timeFormat";import { cn } from "@/util/utils";+import { useQuery } from "@tanstack/react-query";import { useState } from "react";import { useNavigate, useSearchParams } from "react-router-dom";+import { getClient } from "@/api/AxiosClient";+import { useCredentialGetter } from "@/hooks/useCredentialGetter";function isTask(run: Task | WorkflowRunApiResponse): run is Task {return "task_id" in run;}function RunHistory() {+ const credentialGetter = useCredentialGetter();const [searchParams, setSearchParams] = useSearchParams();const page = searchParams.get("page") ? Number(searchParams.get("page")) : 1;+ const itemsPerPage = searchParams.get("page_size")+ ? Number(searchParams.get("page_size"))+ : 5;const [statusFilters, setStatusFilters] = useState<Array<Status>>([]);- const { data: runs, isFetching } = useRunsQuery({ page, statusFilters });+ const { data: runs, isFetching } = useRunsQuery({+ page,+ pageSize: itemsPerPage,+ statusFilters,+ });const navigate = useNavigate();+ const { data: nextPageRuns } = useQuery<Array<Task | WorkflowRunApiResponse>>(+ {+ queryKey: ["runs", { statusFilters }, page + 1, itemsPerPage],+ queryFn: async () => {+ const client = await getClient(credentialGetter);+ const params = new URLSearchParams();+ params.append("page", String(page + 1));+ params.append("page_size", String(itemsPerPage));+ if (statusFilters) {+ statusFilters.forEach((status) => {+ params.append("status", status);+ });+ }+ return client.get("/runs", { params }).then((res) => res.data);+ },+ enabled: runs && runs.length === itemsPerPage,+ },+ );++ const isNextDisabled =+ isFetching || !nextPageRuns || nextPageRuns.length === 0;+function handleNavigate(event: React.MouseEvent, path: string) {if (event.ctrlKey || event.metaKey) {window.open(@@ -46,6 +79,22 @@ function RunHistory() {navigate(path);}}++ function setParamPatch(patch: Record<string, string>) {+ const params = new URLSearchParams(searchParams);+ Object.entries(patch).forEach(([k, v]) => params.set(k, v));+ setSearchParams(params, { replace: true });+ }++ function handlePreviousPage() {+ if (page === 1) return;+ setParamPatch({ page: String(page - 1) });+ }++ function handleNextPage() {+ if (isNextDisabled) return;+ setParamPatch({ page: String(page + 1) });+ }return (<div className="space-y-4"><div className="flex justify-between">@@ -151,35 +200,50 @@ function RunHistory() {)}</TableBody></Table>- <Pagination className="pt-2">- <PaginationContent>- <PaginationItem>- <PaginationPrevious- className={cn({ "cursor-not-allowed": page === 1 })}- onClick={() => {- if (page === 1) {- return;- }- const params = new URLSearchParams();- params.set("page", String(Math.max(1, page - 1)));- setSearchParams(params, { replace: true });- }}- />- </PaginationItem>- <PaginationItem>- <PaginationLink>{page}</PaginationLink>- </PaginationItem>- <PaginationItem>- <PaginationNext- onClick={() => {- const params = new URLSearchParams();- params.set("page", String(page + 1));- setSearchParams(params, { replace: true });- }}- />- </PaginationItem>- </PaginationContent>- </Pagination>+ <div className="relative px-3 py-3">+ <div className="absolute left-3 top-1/2 flex -translate-y-1/2 items-center gap-2 text-sm">+ <span className="text-slate-400">Items per page</span>+ <select+ className="h-9 rounded-md border border-slate-300 bg-background px-3"+ value={itemsPerPage}+ onChange={(e) => {+ const next = Number(e.target.value);+ const params = new URLSearchParams(searchParams);+ params.set("page_size", String(next));+ params.set("page", "1");+ setSearchParams(params, { replace: true });+ }}+ >+ <option value={5}>5</option>+ <option value={10}>10</option>+ <option value={20}>20</option>+ <option value={50}>50</option>+ </select>+ </div>+ <Pagination className="pt-0">+ <PaginationContent>+ <PaginationItem>+ <PaginationPrevious+ className={cn({+ "cursor-not-allowed opacity-50": page === 1,+ })}+ onClick={handlePreviousPage}+ />+ </PaginationItem>+ <PaginationItem>+ <PaginationLink>{page}</PaginationLink>+ </PaginationItem>+ <PaginationItem>+ <PaginationNext+ className={cn({+ "cursor-not-allowed opacity-50": isNextDisabled,+ })}+ onClick={handleNextPage}+ />+ </PaginationItem>+ </PaginationContent>+ </Pagination>+ </div></div></div>);diff --git a/skyvern-frontend/src/routes/workflows/Workflows.tsx b/skyvern-frontend/src/routes/workflows/Workflows.tsxindex 1d8061296..977d68eb8 100644--- a/skyvern-frontend/src/routes/workflows/Workflows.tsx+++ b/skyvern-frontend/src/routes/workflows/Workflows.tsx@@ -49,10 +49,7 @@ import { WorkflowTemplates } from "../discover/WorkflowTemplates";const emptyWorkflowRequest: WorkflowCreateYAMLRequest = {title: "New Workflow",description: "",- workflow_definition: {- blocks: [],- parameters: [],- },+ workflow_definition: { blocks: [], parameters: [] },};function Workflows() {@@ -63,13 +60,19 @@ function Workflows() {const [search, setSearch] = useState("");const [debouncedSearch] = useDebounce(search, 500);const page = searchParams.get("page") ? Number(searchParams.get("page")) : 1;+ const itemsPerPage = searchParams.get("page_size")+ ? Number(searchParams.get("page_size"))+ : 5;- const { data: workflows, isLoading } = useQuery<Array<WorkflowApiResponse>>({- queryKey: ["workflows", debouncedSearch, page],+ const { data: workflows = [], isLoading } = useQuery<+ Array<WorkflowApiResponse>+ >({+ queryKey: ["workflows", debouncedSearch, page, itemsPerPage],queryFn: async () => {const client = await getClient(credentialGetter);const params = new URLSearchParams();params.append("page", String(page));+ params.append("page_size", String(itemsPerPage));params.append("only_workflows", "true");params.append("title", debouncedSearch);return client@@ -80,6 +83,27 @@ function Workflows() {},});+ const { data: nextPageWorkflows } = useQuery<Array<WorkflowApiResponse>>({+ queryKey: ["workflows", debouncedSearch, page + 1, itemsPerPage],+ queryFn: async () => {+ const client = await getClient(credentialGetter);+ const params = new URLSearchParams();+ params.append("page", String(page + 1));+ params.append("page_size", String(itemsPerPage));+ params.append("only_workflows", "true");+ params.append("title", debouncedSearch);+ return client+ .get(`/workflows`, {+ params,+ })+ .then((response) => response.data);+ },+ enabled: workflows.length === itemsPerPage,+ });++ const isNextDisabled =+ isLoading || !nextPageWorkflows || nextPageWorkflows.length === 0;+function handleRowClick(event: React.MouseEvent<HTMLTableCellElement>,workflowPermanentId: string,@@ -110,6 +134,22 @@ function Workflows() {navigate(path);}+ function setParamPatch(patch: Record<string, string>) {+ const params = new URLSearchParams(searchParams);+ Object.entries(patch).forEach(([k, v]) => params.set(k, v));+ setSearchParams(params, { replace: true });+ }++ function handlePreviousPage() {+ if (page === 1) return;+ setParamPatch({ page: String(page - 1) });+ }++ function handleNextPage() {+ if (isNextDisabled) return;+ setParamPatch({ page: String(page + 1) });+ }+return (<div className="space-y-10"><div className="flex h-32 justify-between gap-6">@@ -151,6 +191,7 @@ function Workflows() {value={search}onChange={(event) => {setSearch(event.target.value);+ setParamPatch({ page: "1" });}}placeholder="Search by title..."className="w-48 pl-9 lg:w-72"@@ -274,35 +315,50 @@ function Workflows() {)}</TableBody></Table>- <Pagination className="pt-2">- <PaginationContent>- <PaginationItem>- <PaginationPrevious- className={cn({ "cursor-not-allowed": page === 1 })}- onClick={() => {- if (page === 1) {- return;- }- const params = new URLSearchParams();- params.set("page", String(Math.max(1, page - 1)));- setSearchParams(params, { replace: true });- }}- />- </PaginationItem>- <PaginationItem>- <PaginationLink>{page}</PaginationLink>- </PaginationItem>- <PaginationItem>- <PaginationNext- onClick={() => {- const params = new URLSearchParams();- params.set("page", String(page + 1));- setSearchParams(params, { replace: true });- }}- />- </PaginationItem>- </PaginationContent>- </Pagination>+ <div className="relative px-3 py-3">+ <div className="absolute left-3 top-1/2 flex -translate-y-1/2 items-center gap-2 text-sm">+ <span className="text-slate-400">Items per page</span>+ <select+ className="h-9 rounded-md border border-slate-300 bg-background px-3"+ value={itemsPerPage}+ onChange={(e) => {+ const next = Number(e.target.value);+ const params = new URLSearchParams(searchParams);+ params.set("page_size", String(next));+ params.set("page", "1");+ setSearchParams(params, { replace: true });+ }}+ >+ <option value={5}>5</option>+ <option value={10}>10</option>+ <option value={20}>20</option>+ <option value={50}>50</option>+ </select>+ </div>+ <Pagination className="pt-0">+ <PaginationContent>+ <PaginationItem>+ <PaginationPrevious+ className={cn({+ "cursor-not-allowed opacity-50": page === 1,+ })}+ onClick={handlePreviousPage}+ />+ </PaginationItem>+ <PaginationItem>+ <PaginationLink>{page}</PaginationLink>+ </PaginationItem>+ <PaginationItem>+ <PaginationNext+ className={cn({+ "cursor-not-allowed opacity-50": isNextDisabled,+ })}+ onClick={handleNextPage}+ />+ </PaginationItem>+ </PaginationContent>+ </Pagination>+ </div></div><WorkflowTemplates /></div>