Skip to content

Automate browser based workflows with AI

Fix bulk operations: defer selection clear, add concurrency control and summary toast (#SKY-8451) (#5148)

Shuchang Zhengbf01aba0b7b4
diff --git a/skyvern-frontend/src/routes/schedules/SchedulesPage.tsx b/skyvern-frontend/src/routes/schedules/SchedulesPage.tsx
index b9a3893d3..5769f7088 100644
--- a/skyvern-frontend/src/routes/schedules/SchedulesPage.tsx
+++ b/skyvern-frontend/src/routes/schedules/SchedulesPage.tsx
@@ -48,9 +48,13 @@ import {
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
+import { useQueryClient } from "@tanstack/react-query";
import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import { TableSearchInput } from "@/components/TableSearchInput";
+import { getClient } from "@/api/AxiosClient";
+import { useCredentialGetter } from "@/hooks/useCredentialGetter";
+import { toast } from "@/components/ui/use-toast";
import { useOrganizationSchedulesQuery } from "./useOrganizationSchedulesQuery";
import {
useDeleteOrgScheduleMutation,
@@ -63,6 +67,32 @@ import { basicLocalTimeFormat, basicTimeFormat } from "@/util/timeFormat";
import type { OrganizationScheduleItem } from "@/routes/workflows/types/scheduleTypes";
import { CreateOrgScheduleDialog } from "./CreateOrgScheduleDialog";
+const BULK_CONCURRENCY_LIMIT = 5;
+
+async function runWithConcurrency<T>(
+ tasks: Array<() => Promise<T>>,
+ limit: number,
+): Promise<PromiseSettledResult<T>[]> {
+ const results: Array<PromiseSettledResult<T>> = new Array(tasks.length);
+ let nextIndex = 0;
+
+ async function worker() {
+ while (nextIndex < tasks.length) {
+ const index = nextIndex++;
+ try {
+ results[index] = { status: "fulfilled", value: await tasks[index]!() };
+ } catch (reason) {
+ results[index] = { status: "rejected", reason };
+ }
+ }
+ }
+
+ await Promise.all(
+ Array.from({ length: Math.min(limit, tasks.length) }, () => worker()),
+ );
+ return results;
+}
+
type ScheduleStatus = "active" | "paused";
const STATUS_OPTIONS: Array<{ label: string; value: ScheduleStatus }> = [
@@ -111,12 +141,16 @@ function SchedulesPage() {
const [statusFilters, setStatusFilters] = useState<ScheduleStatus[]>([]);
const [selected, setSelected] = useState<Set<string>>(new Set());
const lastSelectedIndex = useRef<number | null>(null);
+ const [isBulkOperating, setIsBulkOperating] = useState(false);
const [deleteDialog, setDeleteDialog] = useState<{
open: boolean;
schedule: OrganizationScheduleItem | null;
}>({ open: false, schedule: null });
const [createDialogOpen, setCreateDialogOpen] = useState(false);
+ const credentialGetter = useCredentialGetter();
+ const queryClient = useQueryClient();
+
const statusFilter =
statusFilters.length === 1 ? statusFilters[0] : undefined;
@@ -207,28 +241,109 @@ function SchedulesPage() {
selected.has(s.workflow_schedule_id),
);
+ async function runBulkOperation(
+ items: OrganizationScheduleItem[],
+ makeTask: (
+ client: Awaited<ReturnType<typeof getClient>>,
+ item: OrganizationScheduleItem,
+ ) => Promise<void>,
+ successLabel: string,
+ failureLabel: string,
+ ) {
+ if (items.length === 0) return;
+ setIsBulkOperating(true);
+ try {
+ const client = await getClient(credentialGetter);
+ const results = await runWithConcurrency(
+ items.map((item) => () => makeTask(client, item)),
+ BULK_CONCURRENCY_LIMIT,
+ );
+ const succeeded = results.filter((r) => r.status === "fulfilled").length;
+ const failed = results.filter((r) => r.status === "rejected").length;
+ if (failed === 0) {
+ toast({
+ title: `${succeeded} schedule${succeeded !== 1 ? "s" : ""} ${successLabel} successfully.`,
+ variant: "success",
+ });
+ setSelected(new Set());
+ } else if (succeeded === 0) {
+ toast({
+ title: `Failed to ${failureLabel} ${failed} schedule${failed !== 1 ? "s" : ""}.`,
+ variant: "destructive",
+ });
+ } else {
+ toast({
+ title: `${succeeded}/${items.length} schedules ${successLabel} successfully. ${failed} failed.`,
+ variant: "destructive",
+ });
+ // Keep only failed items selected so the user can retry
+ const failedIds = new Set<string>();
+ results.forEach((result, i) => {
+ if (result.status === "rejected") {
+ failedIds.add(items[i]!.workflow_schedule_id);
+ }
+ });
+ setSelected(failedIds);
+ }
+ queryClient.invalidateQueries({ queryKey: ["organizationSchedules"] });
+ queryClient.invalidateQueries({ queryKey: ["scheduleDetail"] });
+ } finally {
+ setIsBulkOperating(false);
+ }
+ }
+
function handleBulkActivate() {
- selectedSchedules
- .filter((s) => !s.enabled)
- .forEach((s) => enableMutation.mutate(s));
- setSelected(new Set());
+ const toActivate = selectedSchedules.filter((s) => !s.enabled);
+ void runBulkOperation(
+ toActivate,
+ (client, item) =>
+ client.post(
+ `/workflows/${item.workflow_permanent_id}/schedules/${item.workflow_schedule_id}/enable`,
+ ),
+ "activated",
+ "activate",
+ );
}
function handleBulkPause() {
- selectedSchedules
- .filter((s) => s.enabled)
- .forEach((s) => disableMutation.mutate(s));
- setSelected(new Set());
+ const toPause = selectedSchedules.filter((s) => s.enabled);
+ void runBulkOperation(
+ toPause,
+ (client, item) =>
+ client.post(
+ `/workflows/${item.workflow_permanent_id}/schedules/${item.workflow_schedule_id}/disable`,
+ ),
+ "paused",
+ "pause",
+ );
}
function handleBulkDuplicate() {
- selectedSchedules.forEach((s) => duplicateMutation.mutate(s));
- setSelected(new Set());
+ void runBulkOperation(
+ selectedSchedules,
+ (client, item) =>
+ client.post(`/workflows/${item.workflow_permanent_id}/schedules`, {
+ cron_expression: item.cron_expression,
+ timezone: item.timezone,
+ enabled: item.enabled,
+ parameters: item.parameters,
+ name: `${item.name ?? item.workflow_title} (copy)`,
+ }),
+ "duplicated",
+ "duplicate",
+ );
}
function handleBulkDelete() {
- selectedSchedules.forEach((s) => deleteMutation.mutate(s));
- setSelected(new Set());
+ void runBulkOperation(
+ selectedSchedules,
+ (client, item) =>
+ client.delete(
+ `/workflows/${item.workflow_permanent_id}/schedules/${item.workflow_schedule_id}`,
+ ),
+ "deleted",
+ "delete",
+ );
}
const showCheckbox = schedules.length > 1;
@@ -520,13 +635,14 @@ function SchedulesPage() {
{selected.size > 0 && (
<div className="fixed inset-x-0 bottom-6 mx-auto flex w-fit items-center gap-3 rounded-lg border border-slate-700 bg-slate-900 px-6 py-3 shadow-xl">
<span className="text-sm text-slate-300">
- {selected.size} selected
+ {isBulkOperating ? "Processing…" : `${selected.size} selected`}
</span>
<div className="h-6 w-px bg-slate-700" />
<Button
size="sm"
className="bg-green-900 text-green-50 hover:bg-green-800"
onClick={handleBulkActivate}
+ disabled={isBulkOperating}
>
<PlayIcon className="mr-1.5 size-3.5" />
Activate
@@ -535,6 +651,7 @@ function SchedulesPage() {
size="sm"
className="bg-amber-800 text-amber-50 hover:bg-amber-700"
onClick={handleBulkPause}
+ disabled={isBulkOperating}
>
<PauseIcon className="mr-1.5 size-3.5" />
Pause
@@ -543,6 +660,7 @@ function SchedulesPage() {
size="sm"
className="bg-blue-800 text-blue-50 hover:bg-blue-700"
onClick={handleBulkDuplicate}
+ disabled={isBulkOperating}
>
<CopyIcon className="mr-1.5 size-3.5" />
Duplicate
@@ -551,6 +669,7 @@ function SchedulesPage() {
size="sm"
className="bg-red-900 text-red-50 hover:bg-red-800"
onClick={handleBulkDelete}
+ disabled={isBulkOperating}
>
<TrashIcon className="mr-1.5 size-3.5" />
Delete
diff --git a/skyvern-frontend/src/routes/workflows/workflowRun/WorkflowRunCode.tsx b/skyvern-frontend/src/routes/workflows/workflowRun/WorkflowRunCode.tsx
index ee67a23fc..f43ff6cd1 100644
--- a/skyvern-frontend/src/routes/workflows/workflowRun/WorkflowRunCode.tsx
+++ b/skyvern-frontend/src/routes/workflows/workflowRun/WorkflowRunCode.tsx
@@ -287,21 +287,21 @@ function WorkflowRunCode(props?: Props) {
const generatedByThisRun = versions.filter(
(v) => v.run_id != null && v.run_id === workflowRunId,
);
- const generatedVersion =
- generatedByThisRun.length > 0
- ? Math.max(...generatedByThisRun.map((v) => v.version))
- : currentVersion;
- const earliestGeneratedVersion =
- generatedByThisRun.length > 0
- ? Math.min(...generatedByThisRun.map((v) => v.version))
- : null;
- const usedVersion =
- earliestGeneratedVersion != null
- ? versions.find(
- (v) =>
- v.version < earliestGeneratedVersion && v.run_id !== workflowRunId,
- )?.version ?? null
- : null;
+ const didGenerate = generatedByThisRun.length > 0;
+ const generatedVersion = didGenerate
+ ? Math.max(...generatedByThisRun.map((v) => v.version))
+ : null;
+ const earliestGeneratedVersion = didGenerate
+ ? Math.min(...generatedByThisRun.map((v) => v.version))
+ : null;
+ // "Used" = the version that existed before this run created new ones,
+ // OR the currentVersion if the run didn't generate anything (just used cache)
+ const usedVersion = didGenerate
+ ? versions.find(
+ (v) =>
+ v.version < earliestGeneratedVersion! && v.run_id !== workflowRunId,
+ )?.version ?? null
+ : currentVersion;
// Edit button shown when not in edit mode and there's a script to edit
const editButton =
@@ -342,7 +342,7 @@ function WorkflowRunCode(props?: Props) {
) : null;
// Version selector — "Used → Generated" chips instead of dropdown
- const activeChipVersion = selectedVersion ?? generatedVersion;
+ const activeChipVersion = selectedVersion ?? generatedVersion ?? usedVersion;
const versionSelector = !versionsFetched ? null : (
<div className="flex items-center gap-1">
@@ -356,12 +356,12 @@ function WorkflowRunCode(props?: Props) {
? "border-blue-500 bg-blue-500/20 text-blue-300"
: "border-slate-700 text-slate-400 hover:border-slate-500",
)}
- onClick={() => setSelectedVersion(usedVersion)}
+ onClick={() => setSelectedVersion(didGenerate ? usedVersion : null)}
disabled={isEditing}
>
Used: #{usedVersion}
</button>
- <span className="text-xs text-slate-600">→</span>
+ {didGenerate && <span className="text-xs text-slate-600">→</span>}
</>
)}
{generatedVersion != null && (
diff --git a/tests/unit/test_schedule_orphan_cleanup.py b/tests/unit/test_schedule_orphan_cleanup.py
index 048cd3f12..1fa5d7c0a 100644
--- a/tests/unit/test_schedule_orphan_cleanup.py
+++ b/tests/unit/test_schedule_orphan_cleanup.py
@@ -1,5 +1,7 @@
"""Tests for orphan prevention and schedule cascade deletion (SKY-8186)."""
+import importlib.util
+from types import SimpleNamespace
from unittest.mock import AsyncMock
import pytest
@@ -7,6 +9,12 @@ from sqlalchemy.dialects import postgresql
from skyvern.forge.sdk.db.agent_db import AgentDB
from skyvern.forge.sdk.workflow.service import WorkflowService
+from tests.unit.worker_activity_import_helpers import import_cron_worker_activities
+
+_skip_no_workers = pytest.mark.skipif(
+ not importlib.util.find_spec("workers"),
+ reason="workers package not available (cloud-only)",
+)
class _FakeResult:
@@ -189,6 +197,55 @@ async def test_delete_workflow_by_id_remains_version_scoped(
mock_atomic_delete.assert_not_awaited()
+@_skip_no_workers
+async def test_orphan_schedule_cleanup_soft_deletes_found_schedules(monkeypatch: pytest.MonkeyPatch) -> None:
+ cron_activities = import_cron_worker_activities(monkeypatch)
+ fake_db = SimpleNamespace(
+ soft_delete_orphaned_schedules=AsyncMock(return_value=[("wfs_1", "wpid_1"), ("wfs_2", "wpid_2")]),
+ )
+ monkeypatch.setattr(cron_activities.app, "DATABASE", fake_db)
+
+ result = await cron_activities.orphan_schedule_cleanup_activity()
+
+ assert result == {
+ "orphaned_schedules_found": 2,
+ "schedules_soft_deleted": 2,
+ }
+ fake_db.soft_delete_orphaned_schedules.assert_awaited_once_with()
+
+
+@_skip_no_workers
+async def test_orphan_schedule_cleanup_returns_early_when_no_orphans(monkeypatch: pytest.MonkeyPatch) -> None:
+ cron_activities = import_cron_worker_activities(monkeypatch)
+ fake_db = SimpleNamespace(
+ soft_delete_orphaned_schedules=AsyncMock(return_value=[]),
+ )
+ monkeypatch.setattr(cron_activities.app, "DATABASE", fake_db)
+
+ result = await cron_activities.orphan_schedule_cleanup_activity()
+
+ assert result == {
+ "orphaned_schedules_found": 0,
+ "schedules_soft_deleted": 0,
+ }
+ fake_db.soft_delete_orphaned_schedules.assert_awaited_once_with()
+
+
+@_skip_no_workers
+async def test_orphan_schedule_cleanup_reraises_failures(monkeypatch: pytest.MonkeyPatch) -> None:
+ cron_activities = import_cron_worker_activities(monkeypatch)
+ fake_db = SimpleNamespace(
+ soft_delete_orphaned_schedules=AsyncMock(side_effect=RuntimeError("db unavailable")),
+ )
+ monkeypatch.setattr(cron_activities.app, "DATABASE", fake_db)
+
+ with pytest.raises(RuntimeError, match="db unavailable"):
+ await cron_activities.orphan_schedule_cleanup_activity()
+
+
@pytest.mark.asyncio
async def test_soft_delete_orphaned_schedules_uses_single_returning_update() -> None:
db = object.__new__(AgentDB)