forked from farhoodlabs/paperclip
8af38fb054
## Thinking Path > - Paperclip orchestrates AI agents through visible, governable task and routine workflows. > - Routines are the recurring-work surface where operators configure schedules, runs, and activity. > - PR #3569 moved routine operational tabs into the right-hand properties panel while also redesigning the routine trigger editor. > - The current product request is to remove that routine properties right-tab change for now and come back to it later. > - The cleanest way to do that is a direct revert of #3569 on top of current `master`, which already includes the #5703 revert. > - This pull request restores the pre-#3569 routine trigger/detail behavior and removes the right-tab properties-panel routine layout. > - The benefit is a simple, reviewable rollback with no schema or API changes. ## What Changed - Reverted #3569: `fix(ui): prevent lossy cron rewrites + redesign routine triggers tab`. - Restored the previous `RoutineDetail` inline tabs and trigger editing flow. - Restored the earlier `ScheduleEditor` implementation. - Removed the UI components and tests introduced by #3569: `ConfirmDialog`, `TriggerDialog`, `TriggerListCard`, and `ScheduleEditor.test.ts`. ## Verification - `git diff --check origin/master..HEAD` - `pnpm vitest run ui/src/pages/Routines.test.tsx ui/src/components/RoutineHistoryTab.test.tsx` - `pnpm --filter @paperclipai/ui typecheck` Notes: - `pnpm install --frozen-lockfile` was run in the clean worktree before verification. It completed with known workspace bin-link warnings for `paperclip-plugin-dev-server` because the plugin SDK `dist/dev-cli.js` has not been built in that fresh worktree. - `Routines.test.tsx` emitted existing Radix dialog accessibility warnings during the test run; the tests passed. ### Screenshots This is a direct revert of #3569. The visual state after this PR corresponds to the old screenshot from #3569, and the state being removed corresponds to the new/right-panel screenshots from #3569. | Before this revert | After this revert | | --- | --- | | <img width="1410" height="1325" alt="routine-triggers-before-this-revert" src="https://github.com/user-attachments/assets/d70dd35b-e72f-4fc6-bb21-be9b0d92b3b1" /> | <img width="721" height="707" alt="routine-triggers-after-this-revert" src="https://github.com/user-attachments/assets/260bb682-32cb-4dff-b038-d55e45824b04" /> | Right-hand properties panel state removed by this revert: <img width="1409" height="830" alt="routine-properties-panel-removed" src="https://github.com/user-attachments/assets/f1d42f07-7cd3-4614-8e93-5b585affd4bf" /> ## Risks - Low technical risk: this is a clean Git revert of a UI-only PR. - Product risk: #3569 also fixed lossy cron editing and added broader schedule presets, so this rollback intentionally removes those improvements along with the right-tab routine layout. - Follow-up risk: if we want only the schedule-editor fixes back later, they should be reintroduced separately from the routine properties-panel layout. > For core feature work, check [`ROADMAP.md`](ROADMAP.md) first and discuss it in `#dev` before opening the PR. Feature PRs that overlap with planned core work may need to be redirected — check the roadmap first. See `CONTRIBUTING.md`. ## Model Used - OpenAI Codex, GPT-5 coding agent, tool-enabled with local shell and GitHub CLI access. Context window size was not exposed in this session. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have run tests locally and they pass - [x] I have added or updated tests where applicable - [x] If this change affects the UI, I have included before/after screenshots - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] I will address all Greptile and reviewer comments before requesting merge Co-authored-by: Paperclip <noreply@paperclip.ing>
345 lines
11 KiB
TypeScript
345 lines
11 KiB
TypeScript
import { useCallback, useEffect, useMemo, useState } from "react";
|
|
import { Button } from "@/components/ui/button";
|
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
|
|
import { Input } from "@/components/ui/input";
|
|
import { ChevronDown, ChevronRight } from "lucide-react";
|
|
|
|
type SchedulePreset = "every_minute" | "every_hour" | "every_day" | "weekdays" | "weekly" | "monthly" | "custom";
|
|
|
|
const PRESETS: { value: SchedulePreset; label: string }[] = [
|
|
{ value: "every_minute", label: "Every minute" },
|
|
{ value: "every_hour", label: "Every hour" },
|
|
{ value: "every_day", label: "Every day" },
|
|
{ value: "weekdays", label: "Weekdays" },
|
|
{ value: "weekly", label: "Weekly" },
|
|
{ value: "monthly", label: "Monthly" },
|
|
{ value: "custom", label: "Custom (cron)" },
|
|
];
|
|
|
|
const HOURS = Array.from({ length: 24 }, (_, i) => ({
|
|
value: String(i),
|
|
label: i === 0 ? "12 AM" : i < 12 ? `${i} AM` : i === 12 ? "12 PM" : `${i - 12} PM`,
|
|
}));
|
|
|
|
const MINUTES = Array.from({ length: 12 }, (_, i) => ({
|
|
value: String(i * 5),
|
|
label: String(i * 5).padStart(2, "0"),
|
|
}));
|
|
|
|
const DAYS_OF_WEEK = [
|
|
{ value: "1", label: "Mon" },
|
|
{ value: "2", label: "Tue" },
|
|
{ value: "3", label: "Wed" },
|
|
{ value: "4", label: "Thu" },
|
|
{ value: "5", label: "Fri" },
|
|
{ value: "6", label: "Sat" },
|
|
{ value: "0", label: "Sun" },
|
|
];
|
|
|
|
const DAYS_OF_MONTH = Array.from({ length: 31 }, (_, i) => ({
|
|
value: String(i + 1),
|
|
label: String(i + 1),
|
|
}));
|
|
|
|
function parseCronToPreset(cron: string): {
|
|
preset: SchedulePreset;
|
|
hour: string;
|
|
minute: string;
|
|
dayOfWeek: string;
|
|
dayOfMonth: string;
|
|
} {
|
|
const defaults = { hour: "10", minute: "0", dayOfWeek: "1", dayOfMonth: "1" };
|
|
|
|
if (!cron || !cron.trim()) {
|
|
return { preset: "every_day", ...defaults };
|
|
}
|
|
|
|
const parts = cron.trim().split(/\s+/);
|
|
if (parts.length !== 5) {
|
|
return { preset: "custom", ...defaults };
|
|
}
|
|
|
|
const [min, hr, dom, , dow] = parts;
|
|
|
|
// Every minute: "* * * * *"
|
|
if (min === "*" && hr === "*" && dom === "*" && dow === "*") {
|
|
return { preset: "every_minute", ...defaults };
|
|
}
|
|
|
|
// Every hour: "0 * * * *"
|
|
if (hr === "*" && dom === "*" && dow === "*") {
|
|
return { preset: "every_hour", ...defaults, minute: min === "*" ? "0" : min };
|
|
}
|
|
|
|
// Every day: "M H * * *"
|
|
if (dom === "*" && dow === "*" && hr !== "*") {
|
|
return { preset: "every_day", ...defaults, hour: hr, minute: min === "*" ? "0" : min };
|
|
}
|
|
|
|
// Weekdays: "M H * * 1-5"
|
|
if (dom === "*" && dow === "1-5" && hr !== "*") {
|
|
return { preset: "weekdays", ...defaults, hour: hr, minute: min === "*" ? "0" : min };
|
|
}
|
|
|
|
// Weekly: "M H * * D" (single day)
|
|
if (dom === "*" && /^\d$/.test(dow) && hr !== "*") {
|
|
return { preset: "weekly", ...defaults, hour: hr, minute: min === "*" ? "0" : min, dayOfWeek: dow };
|
|
}
|
|
|
|
// Monthly: "M H D * *"
|
|
if (/^\d{1,2}$/.test(dom) && dow === "*" && hr !== "*") {
|
|
return { preset: "monthly", ...defaults, hour: hr, minute: min === "*" ? "0" : min, dayOfMonth: dom };
|
|
}
|
|
|
|
return { preset: "custom", ...defaults };
|
|
}
|
|
|
|
function buildCron(preset: SchedulePreset, hour: string, minute: string, dayOfWeek: string, dayOfMonth: string): string {
|
|
switch (preset) {
|
|
case "every_minute":
|
|
return "* * * * *";
|
|
case "every_hour":
|
|
return `${minute} * * * *`;
|
|
case "every_day":
|
|
return `${minute} ${hour} * * *`;
|
|
case "weekdays":
|
|
return `${minute} ${hour} * * 1-5`;
|
|
case "weekly":
|
|
return `${minute} ${hour} * * ${dayOfWeek}`;
|
|
case "monthly":
|
|
return `${minute} ${hour} ${dayOfMonth} * *`;
|
|
case "custom":
|
|
return "";
|
|
}
|
|
}
|
|
|
|
function describeSchedule(cron: string): string {
|
|
const { preset, hour, minute, dayOfWeek, dayOfMonth } = parseCronToPreset(cron);
|
|
const hourLabel = HOURS.find((h) => h.value === hour)?.label ?? `${hour}`;
|
|
const timeStr = `${hourLabel.replace(/ (AM|PM)$/, "")}:${minute.padStart(2, "0")} ${hourLabel.match(/(AM|PM)$/)?.[0] ?? ""}`;
|
|
|
|
switch (preset) {
|
|
case "every_minute":
|
|
return "Every minute";
|
|
case "every_hour":
|
|
return `Every hour at :${minute.padStart(2, "0")}`;
|
|
case "every_day":
|
|
return `Every day at ${timeStr}`;
|
|
case "weekdays":
|
|
return `Weekdays at ${timeStr}`;
|
|
case "weekly": {
|
|
const day = DAYS_OF_WEEK.find((d) => d.value === dayOfWeek)?.label ?? dayOfWeek;
|
|
return `Every ${day} at ${timeStr}`;
|
|
}
|
|
case "monthly":
|
|
return `Monthly on the ${dayOfMonth}${ordinalSuffix(Number(dayOfMonth))} at ${timeStr}`;
|
|
case "custom":
|
|
return cron || "No schedule set";
|
|
}
|
|
}
|
|
|
|
function ordinalSuffix(n: number): string {
|
|
const s = ["th", "st", "nd", "rd"];
|
|
const v = n % 100;
|
|
return s[(v - 20) % 10] || s[v] || s[0];
|
|
}
|
|
|
|
export { describeSchedule };
|
|
|
|
export function ScheduleEditor({
|
|
value,
|
|
onChange,
|
|
}: {
|
|
value: string;
|
|
onChange: (cron: string) => void;
|
|
}) {
|
|
const parsed = useMemo(() => parseCronToPreset(value), [value]);
|
|
const [preset, setPreset] = useState<SchedulePreset>(parsed.preset);
|
|
const [hour, setHour] = useState(parsed.hour);
|
|
const [minute, setMinute] = useState(parsed.minute);
|
|
const [dayOfWeek, setDayOfWeek] = useState(parsed.dayOfWeek);
|
|
const [dayOfMonth, setDayOfMonth] = useState(parsed.dayOfMonth);
|
|
const [customCron, setCustomCron] = useState(preset === "custom" ? value : "");
|
|
|
|
// Sync from external value changes
|
|
useEffect(() => {
|
|
const p = parseCronToPreset(value);
|
|
setPreset(p.preset);
|
|
setHour(p.hour);
|
|
setMinute(p.minute);
|
|
setDayOfWeek(p.dayOfWeek);
|
|
setDayOfMonth(p.dayOfMonth);
|
|
if (p.preset === "custom") setCustomCron(value);
|
|
}, [value]);
|
|
|
|
const emitChange = useCallback(
|
|
(p: SchedulePreset, h: string, m: string, dow: string, dom: string, custom: string) => {
|
|
if (p === "custom") {
|
|
onChange(custom);
|
|
} else {
|
|
onChange(buildCron(p, h, m, dow, dom));
|
|
}
|
|
},
|
|
[onChange],
|
|
);
|
|
|
|
const handlePresetChange = (newPreset: SchedulePreset) => {
|
|
setPreset(newPreset);
|
|
if (newPreset === "custom") {
|
|
setCustomCron(value);
|
|
} else {
|
|
emitChange(newPreset, hour, minute, dayOfWeek, dayOfMonth, customCron);
|
|
}
|
|
};
|
|
|
|
return (
|
|
<div className="space-y-3">
|
|
<Select value={preset} onValueChange={(v) => handlePresetChange(v as SchedulePreset)}>
|
|
<SelectTrigger className="w-full">
|
|
<SelectValue placeholder="Choose frequency..." />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{PRESETS.map((p) => (
|
|
<SelectItem key={p.value} value={p.value}>
|
|
{p.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
|
|
{preset === "custom" ? (
|
|
<div className="space-y-1.5">
|
|
<Input
|
|
value={customCron}
|
|
onChange={(e) => {
|
|
setCustomCron(e.target.value);
|
|
emitChange("custom", hour, minute, dayOfWeek, dayOfMonth, e.target.value);
|
|
}}
|
|
placeholder="0 10 * * *"
|
|
className="font-mono text-sm"
|
|
/>
|
|
<p className="text-xs text-muted-foreground">
|
|
Five fields: minute hour day-of-month month day-of-week
|
|
</p>
|
|
</div>
|
|
) : (
|
|
<div className="flex flex-wrap items-center gap-2">
|
|
{preset !== "every_minute" && preset !== "every_hour" && (
|
|
<>
|
|
<span className="text-sm text-muted-foreground">at</span>
|
|
<Select
|
|
value={hour}
|
|
onValueChange={(h) => {
|
|
setHour(h);
|
|
emitChange(preset, h, minute, dayOfWeek, dayOfMonth, customCron);
|
|
}}
|
|
>
|
|
<SelectTrigger className="w-[120px]">
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{HOURS.map((h) => (
|
|
<SelectItem key={h.value} value={h.value}>
|
|
{h.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
<span className="text-sm text-muted-foreground">:</span>
|
|
<Select
|
|
value={minute}
|
|
onValueChange={(m) => {
|
|
setMinute(m);
|
|
emitChange(preset, hour, m, dayOfWeek, dayOfMonth, customCron);
|
|
}}
|
|
>
|
|
<SelectTrigger className="w-[80px]">
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{MINUTES.map((m) => (
|
|
<SelectItem key={m.value} value={m.value}>
|
|
{m.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</>
|
|
)}
|
|
|
|
{preset === "every_hour" && (
|
|
<>
|
|
<span className="text-sm text-muted-foreground">at minute</span>
|
|
<Select
|
|
value={minute}
|
|
onValueChange={(m) => {
|
|
setMinute(m);
|
|
emitChange(preset, hour, m, dayOfWeek, dayOfMonth, customCron);
|
|
}}
|
|
>
|
|
<SelectTrigger className="w-[80px]">
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{MINUTES.map((m) => (
|
|
<SelectItem key={m.value} value={m.value}>
|
|
:{m.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</>
|
|
)}
|
|
|
|
{preset === "weekly" && (
|
|
<>
|
|
<span className="text-sm text-muted-foreground">on</span>
|
|
<div className="flex gap-1">
|
|
{DAYS_OF_WEEK.map((d) => (
|
|
<Button
|
|
key={d.value}
|
|
type="button"
|
|
variant={dayOfWeek === d.value ? "default" : "outline"}
|
|
size="sm"
|
|
className="h-7 px-2 text-xs"
|
|
onClick={() => {
|
|
setDayOfWeek(d.value);
|
|
emitChange(preset, hour, minute, d.value, dayOfMonth, customCron);
|
|
}}
|
|
>
|
|
{d.label}
|
|
</Button>
|
|
))}
|
|
</div>
|
|
</>
|
|
)}
|
|
|
|
{preset === "monthly" && (
|
|
<>
|
|
<span className="text-sm text-muted-foreground">on day</span>
|
|
<Select
|
|
value={dayOfMonth}
|
|
onValueChange={(dom) => {
|
|
setDayOfMonth(dom);
|
|
emitChange(preset, hour, minute, dayOfWeek, dom, customCron);
|
|
}}
|
|
>
|
|
<SelectTrigger className="w-[80px]">
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{DAYS_OF_MONTH.map((d) => (
|
|
<SelectItem key={d.value} value={d.value}>
|
|
{d.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</>
|
|
)}
|
|
</div>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|