Skip to content

feat: add e2e tests for scheduled sessions and fix edit form workflow state #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tiwillia wants to merge 5 commits into
base: main
Choose a base branch
from
+521 −31
Open

feat: add e2e tests for scheduled sessions and fix edit form workflow state #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2234c6a
feat: add e2e tests for scheduled sessions UI
tiwillia Apr 6, 2026
39fc146
feat: add e2e tests for custom workflows in scheduled sessions
tiwillia Apr 6, 2026
47621c6
fix: initialize workflow state from initialData to fix edit form
tiwillia Apr 6, 2026
64eed9f
feat: restore OOTB workflow reverse-matching on edit with Radix Selec…
tiwillia Apr 6, 2026
fcd9d16
docs: add JSDoc to resolveSchedulePreset and resolveWorkflowState
tiwillia Apr 6, 2026
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
79 changes: 52 additions & 27 deletions ...rontend/src/app/projects/[name]/scheduled-sessions/_components/scheduled-session-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ type ScheduledSessionFormProps = {
initialData?: ScheduledSession;
};

/** Maps a cron string to a preset select value, falling back to "custom". */
function resolveSchedulePreset(schedule: string): { preset: string; customCron: string } {
const match = SCHEDULE_PRESETS.find((p) => p.value !== "custom" && p.value === schedule);
if (match) {
Expand All @@ -101,6 +102,7 @@ function resolveSchedulePreset(schedule: string): { preset: string; customCron:
return { preset: "custom", customCron: schedule };
}

/** Reverse-matches stored workflow fields against OOTB workflows, returning the select value and custom fields. */
function resolveWorkflowState(
activeWorkflow: WorkflowSelection | undefined,
ootbWorkflows: { id: string; gitUrl: string; branch: string; path?: string }[]
Expand All @@ -109,7 +111,8 @@ function resolveWorkflowState(
return { selectedWorkflow: "none", customGitUrl: "", customBranch: "main", customPath: "" };
}
const match = ootbWorkflows.find(
(w) => w.gitUrl === activeWorkflow.gitUrl && w.branch === activeWorkflow.branch
(w) => w.gitUrl === activeWorkflow.gitUrl
&& w.branch === activeWorkflow.branch
&& (w.path ?? "") === (activeWorkflow.path ?? "")
);
if (match) {
Expand All @@ -131,10 +134,22 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
? resolveSchedulePreset(initialData.schedule)
: { preset: "0 * * * *", customCron: "" };

const [selectedWorkflow, setSelectedWorkflow] = useState("none");
const [customGitUrl, setCustomGitUrl] = useState("");
const [customBranch, setCustomBranch] = useState("main");
const [customPath, setCustomPath] = useState("");
const initialWorkflow = isEdit && initialData?.sessionTemplate.activeWorkflow
? {
selectedWorkflow: "custom" as string,
customGitUrl: initialData.sessionTemplate.activeWorkflow.gitUrl,
customBranch: initialData.sessionTemplate.activeWorkflow.branch || "main",
customPath: initialData.sessionTemplate.activeWorkflow.path ?? "",
}
: { selectedWorkflow: "none", customGitUrl: "", customBranch: "main", customPath: "" };

const [selectedWorkflow, setSelectedWorkflow] = useState(initialWorkflow.selectedWorkflow);
const [customGitUrl, setCustomGitUrl] = useState(initialWorkflow.customGitUrl);
const [customBranch, setCustomBranch] = useState(initialWorkflow.customBranch);
const [customPath, setCustomPath] = useState(initialWorkflow.customPath);
const [workflowResolved, setWorkflowResolved] = useState(
!isEdit || !initialData?.sessionTemplate.activeWorkflow
);
const [repos, setRepos] = useState<SessionRepo[]>(
isEdit && initialData?.sessionTemplate.repos ? [...initialData.sessionTemplate.repos] : []
);
Expand Down Expand Up @@ -197,18 +212,24 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
}
}, [modelsData?.defaultModel, form, isEdit, initialData]);

// Resolve workflow state once OOTB workflows are loaded (edit mode)
const [workflowResolved, setWorkflowResolved] = useState(false);
// Resolve workflow state once OOTB workflows finish loading. The Skeleton
// guard on the Select (workflowsLoading || !workflowResolved) ensures Radix
// never sees a value change after mount — the Select only mounts after this
// effect has set the final selectedWorkflow value.
useEffect(() => {
if (isEdit && initialData && !workflowsLoading && !workflowResolved) {
const resolved = resolveWorkflowState(initialData.sessionTemplate.activeWorkflow, ootbWorkflows);
setSelectedWorkflow(resolved.selectedWorkflow);
setCustomGitUrl(resolved.customGitUrl);
setCustomBranch(resolved.customBranch);
setCustomPath(resolved.customPath);
setWorkflowResolved(true);
}
}, [isEdit, initialData, ootbWorkflows, workflowsLoading, workflowResolved]);
if (workflowResolved) return;
if (workflowsLoading) return;

const resolved = resolveWorkflowState(
initialData!.sessionTemplate.activeWorkflow,
ootbWorkflows
);
setSelectedWorkflow(resolved.selectedWorkflow);
setCustomGitUrl(resolved.customGitUrl);
setCustomBranch(resolved.customBranch);
setCustomPath(resolved.customPath);
setWorkflowResolved(true);
}, [workflowResolved, workflowsLoading, ootbWorkflows, initialData]);

const effectiveCron = schedulePreset === "custom" ? (customCron ?? "") : schedulePreset;
const nextRuns = useMemo(() => getNextRuns(effectiveCron, 3), [effectiveCron]);
Expand Down Expand Up @@ -345,7 +366,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
<FormItem>
<FormLabel>Name</FormLabel>
<FormControl>
<Input {...field} placeholder="Enter a display name..." maxLength={50} disabled={mutation.isPending} />
<Input {...field} placeholder="Enter a display name..." maxLength={50} disabled={mutation.isPending} data-testid="scheduled-session-name-input" />
</FormControl>
<p className="text-xs text-muted-foreground">{(field.value ?? "").length}/50 characters</p>
<FormMessage />
Expand All @@ -361,7 +382,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
<FormLabel>Schedule</FormLabel>
<Select onValueChange={field.onChange} value={field.value}>
<FormControl>
<SelectTrigger className="w-full">
<SelectTrigger className="w-full" data-testid="schedule-preset-select">
<SelectValue placeholder="Select a schedule" />
</SelectTrigger>
</FormControl>
Expand All @@ -384,7 +405,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
<FormItem>
<FormLabel>Cron Expression</FormLabel>
<FormControl>
<Input {...field} placeholder="*/15 * * * *" disabled={mutation.isPending} />
<Input {...field} placeholder="*/15 * * * *" disabled={mutation.isPending} data-testid="custom-cron-input" />
</FormControl>
<FormMessage />
</FormItem>
Expand All @@ -393,7 +414,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
)}

{effectiveCron && (
<div className="rounded-md border p-3 space-y-2">
<div className="rounded-md border p-3 space-y-2" data-testid="cron-preview">
<p className="text-sm font-medium">{cronDescription}</p>
{nextRuns.length > 0 && (
<div className="text-xs text-muted-foreground space-y-0.5">
Expand Down Expand Up @@ -458,7 +479,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
<FormItem>
<FormLabel>Initial Prompt</FormLabel>
<FormControl>
<Textarea {...field} placeholder="Enter the prompt for each scheduled session..." rows={4} disabled={mutation.isPending} />
<Textarea {...field} placeholder="Enter the prompt for each scheduled session..." rows={4} disabled={mutation.isPending} data-testid="initial-prompt-input" />
</FormControl>
<FormMessage />
</FormItem>
Expand All @@ -467,15 +488,15 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul

<div className="space-y-2">
<FormLabel>Workflow</FormLabel>
{workflowsLoading ? (
{(workflowsLoading || !workflowResolved) ? (
<Skeleton className="h-10 w-full" />
) : (
<Select
value={selectedWorkflow}
onValueChange={handleWorkflowChange}
disabled={mutation.isPending}
>
<SelectTrigger className="w-full">
<SelectTrigger className="w-full" data-testid="workflow-select">
<SelectValue placeholder="Select workflow..." />
</SelectTrigger>
<SelectContent>
Expand All @@ -492,7 +513,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
</SelectContent>
</Select>
)}
{selectedWorkflow === "custom" && (
{selectedWorkflow === "custom" && workflowResolved && (
<div className="grid grid-cols-1 sm:grid-cols-3 gap-3 pt-1">
<div className="sm:col-span-2 space-y-1">
<FormLabel className="text-xs">Git Repository URL *</FormLabel>
Expand All @@ -501,6 +522,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
onChange={(e) => setCustomGitUrl(e.target.value)}
placeholder="https://github.com/org/workflow-repo.git"
disabled={mutation.isPending}
data-testid="workflow-git-url"
/>
</div>
<div className="space-y-1">
Expand All @@ -510,6 +532,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
onChange={(e) => setCustomBranch(e.target.value)}
placeholder="main"
disabled={mutation.isPending}
data-testid="workflow-branch"
/>
</div>
<div className="sm:col-span-3 space-y-1">
Expand All @@ -519,6 +542,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
onChange={(e) => setCustomPath(e.target.value)}
placeholder="workflows/my-workflow"
disabled={mutation.isPending}
data-testid="workflow-path"
/>
</div>
</div>
Expand Down Expand Up @@ -553,7 +577,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
) : (
<Select onValueChange={(v) => handleRunnerTypeChange(v, field.onChange)} value={field.value}>
<FormControl>
<SelectTrigger className="w-full">
<SelectTrigger className="w-full" data-testid="runner-type-select">
<SelectValue placeholder="Select a runner type" />
</SelectTrigger>
</FormControl>
Expand All @@ -579,7 +603,7 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul
<FormLabel>Model</FormLabel>
<Select onValueChange={field.onChange} value={field.value} disabled={modelsLoading || (modelsError && models.length === 0)}>
<FormControl>
<SelectTrigger className="w-full">
<SelectTrigger className="w-full" data-testid="model-select">
<SelectValue placeholder={modelsLoading ? "Loading models..." : "Select a model"} />
</SelectTrigger>
</FormControl>
Expand Down Expand Up @@ -722,12 +746,13 @@ export function ScheduledSessionForm({ projectName, mode, initialData }: Schedul

{/* Actions */}
<div className="flex justify-end gap-3 pb-6">
<Button type="button" variant="outline" onClick={() => router.push(backUrl)} disabled={mutation.isPending}>
<Button type="button" variant="outline" onClick={() => router.push(backUrl)} disabled={mutation.isPending} data-testid="scheduled-session-cancel">
Cancel
</Button>
<Button
type="submit"
disabled={mutation.isPending || runnerTypesLoading || runnerTypesError || modelsLoading || (modelsError && models.length === 0)}
data-testid="scheduled-session-submit"
>
{mutation.isPending && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
{isEdit ? "Save Changes" : "Create Scheduled Session"}
Expand Down
8 changes: 4 additions & 4 deletions components/frontend/src/components/workspace-sections/scheduled-sessions-tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export function SchedulesSection({ projectName }: SchedulesSectionProps) {
<RefreshCw className={`w-4 h-4 mr-2 ${isFetching ? "animate-spin" : ""}`} />
Refresh
</Button>
<Button asChild>
<Button asChild data-testid="new-scheduled-session-btn">
<Link href={`/projects/${projectName}/scheduled-sessions/new`}>
<Plus className="w-4 h-4 mr-2" />
New Scheduled Session
Expand Down Expand Up @@ -139,7 +139,7 @@ export function SchedulesSection({ projectName }: SchedulesSectionProps) {
(triggerMutation.isPending && triggerMutation.variables?.name === ss.name);

return (
<TableRow key={ss.name}>
<TableRow key={ss.name} data-testid={`scheduled-session-row-${ss.name}`}>
<TableCell className="font-medium">
<Link
href={`/projects/${projectName}/scheduled-sessions/${ss.name}`}
Expand Down Expand Up @@ -184,7 +184,7 @@ export function SchedulesSection({ projectName }: SchedulesSectionProps) {
) : (
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" size="sm" className="h-8 w-8 p-0">
<Button variant="ghost" size="sm" className="h-8 w-8 p-0" data-testid={`scheduled-session-actions-${ss.name}`}>
<MoreVertical className="h-4 w-4" />
<span className="sr-only">Open menu</span>
</Button>
Expand All @@ -211,7 +211,7 @@ export function SchedulesSection({ projectName }: SchedulesSectionProps) {
Suspend
</DropdownMenuItem>
)}
<DropdownMenuItem onClick={() => handleDelete(ss.name)} className="text-red-600">
<DropdownMenuItem onClick={() => handleDelete(ss.name)} className="text-red-600" data-testid="scheduled-session-delete">
<Trash2 className="h-4 w-4 mr-2" />
Delete
</DropdownMenuItem>
Expand Down
Loading