Skip to content

Commit ba32aab

Browse files
shawk08033Shaun Hawkcursoragentmaria-rcksjuliusmarminge
authored
fix(scheduler): show short server timezone on fixed-time labels (#23111)
Co-authored-by: Shaun Hawk <[email protected]> Co-authored-by: Cursor <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 2c74ea6 commit ba32aab

11 files changed

Lines changed: 128 additions & 38 deletions

File tree

‎apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import {
3838
WEBHOOK_FILTER_OPS,
3939
type WebhookFilterDraft,
4040
} from "@t3tools/client-runtime/scheduled-task-webhook";
41+
import { scheduleTimeZoneLabel } from "@t3tools/client-runtime/scheduled-task-time-zone";
4142
import { useRef, useState, type ReactNode } from "react";
4243
import { useFocusEffect, useNavigation, usePreventRemove } from "@react-navigation/native";
4344
import type { NativeStackNavigationProp } from "@react-navigation/native-stack";
@@ -117,15 +118,16 @@ const THREAD_MODE_LABELS: Record<ScheduledTaskThreadMode, string> = {
117118
fresh_session: "One thread, fresh session",
118119
};
119120

120-
function describeSchedule(task: ScheduledTask): string {
121+
function describeSchedule(task: ScheduledTask, timeZone?: string): string {
121122
if (task.schedule.type === "webhook") return "On webhook";
122123
if (task.schedule.type === "once") {
123124
const runAt = new Date(task.schedule.runAt);
124125
return `Once, ${formatRunAtDate(runAt)} at ${formatRunAtTime(runAt)}`;
125126
}
126127
if (task.schedule.type === "interval") return formatScheduledTaskInterval(task.schedule.everyMs);
127128
const days = task.schedule.weekdays?.length ? repeatLabel(task.schedule.weekdays) : "Every day";
128-
return `${days} at ${formatTime(task.schedule.timeOfDay)}`;
129+
const zone = scheduleTimeZoneLabel(timeZone, task.nextRunAt);
130+
return `${days} at ${formatTime(task.schedule.timeOfDay)}${zone === undefined ? "" : ` ${zone}`}`;
129131
}
130132

131133
function formatTime(value: string): string {
@@ -684,6 +686,7 @@ function TaskForm({
684686
draft.task !== null &&
685687
tasks.data !== null &&
686688
!tasks.data.tasks.some((task) => task.id === draft.task?.id);
689+
const runAtZone = scheduleTimeZoneLabel(tasks.data?.timeZone);
687690
const environmentUnavailable = !availableTargets.some(
688691
(target) => target.environmentId === environmentId,
689692
);
@@ -1058,7 +1061,9 @@ function TaskForm({
10581061
<>
10591062
<Pressable
10601063
accessibilityRole="button"
1061-
accessibilityLabel={`Time, ${formatTime(draft.schedule.timeOfDay)}`}
1064+
accessibilityLabel={`Time, ${formatTime(draft.schedule.timeOfDay)}${
1065+
runAtZone ? ` ${runAtZone}` : ""
1066+
}`}
10621067
onPress={() => setTimePickerOpen((open) => !open)}
10631068
className="min-h-14 flex-row items-center gap-3 border-t border-border-subtle px-4 py-3 active:opacity-70"
10641069
>
@@ -1070,6 +1075,7 @@ function TaskForm({
10701075
className="min-w-0 flex-1 text-right text-foreground-muted"
10711076
>
10721077
{formatTime(draft.schedule.timeOfDay)}
1078+
{runAtZone ? ` ${runAtZone}` : ""}
10731079
</Text>
10741080
<SymbolView
10751081
name="chevron.right"
@@ -1495,7 +1501,7 @@ function EnvironmentTasks({
14951501
{task.title}
14961502
</Text>
14971503
<Text className="text-sm text-foreground-muted" numberOfLines={2}>
1498-
{describeSchedule(task)}
1504+
{describeSchedule(task, tasks.data?.timeZone)}
14991505
{!task.enabled
15001506
? " · Paused"
15011507
: task.nextRunAt

‎apps/server/src/scheduledTasks/ScheduledTaskService.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1237,7 +1237,10 @@ export const layer = Layer.effect(
12371237

12381238
const list: ScheduledTaskService["Service"]["list"] = () =>
12391239
listRows().pipe(
1240-
Effect.map((tasks) => ({ tasks })),
1240+
Effect.map((tasks) => ({
1241+
tasks,
1242+
timeZone: DateTime.zoneToString(DateTime.zoneMakeLocal()),
1243+
})),
12411244
Effect.mapError((cause) => taskError("Could not list schedule tasks.", { cause })),
12421245
);
12431246

‎apps/server/src/ws.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1557,6 +1557,7 @@ export const layerWsRpc = (
15571557
currentSession.scopes.includes(AuthOrchestrationOperateScope)
15581558
? result
15591559
: {
1560+
...result,
15601561
tasks: result.tasks.map(({ webhook: _webhook, ...task }) => task),
15611562
};
15621563
const authorizeEffect = <A, E, R>(

‎apps/web/src/components/chat/ThreadAutomationsPanel.tsx‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import {
1616

1717
import { ThreadDetailsSection } from "./ThreadDetailsSection";
1818
import { cn } from "../../lib/utils";
19-
import { ScheduledRelativeLabel, scheduleLabel } from "../settings/ScheduledTasksSettings";
19+
import { ScheduledRelativeLabel } from "../settings/ScheduledTasksSettings";
20+
import { scheduleLabel } from "../settings/scheduledTasksSettings.logic";
2021
import { useEnvironmentQuery } from "../../state/query";
2122
import { serverEnvironment } from "../../state/server";
2223
import { useAtomCommand } from "../../state/use-atom-command";
@@ -37,10 +38,10 @@ const STATUS_DOT_CLASS: Record<ScheduledTask["lastRunStatus"], string> = {
3738
failed: "bg-destructive",
3839
};
3940

40-
function taskScheduleLine(task: ScheduledTask) {
41+
function taskScheduleLine(task: ScheduledTask, timeZone: string | undefined) {
4142
return (
4243
<>
43-
{scheduleLabel(task.schedule)}
44+
{scheduleLabel(task.schedule, timeZone, task.nextRunAt)}
4445
{task.blockedByPolicy !== undefined ? (
4546
` · ${task.blockedByPolicy}`
4647
) : task.enabled && task.nextRunAt !== null ? (
@@ -179,11 +180,15 @@ export function ThreadAutomationsPanel(props: {
179180
<span className="block truncate text-sm font-medium text-foreground/80">
180181
{task.title}
181182
</span>
182-
<p className="truncate text-2xs text-muted-foreground">{taskScheduleLine(task)}</p>
183+
<p className="truncate text-2xs text-muted-foreground">
184+
{taskScheduleLine(task, tasksQuery.data?.timeZone)}
185+
</p>
183186
</TooltipTrigger>
184187
<TooltipPopup side="left">
185188
<p className="font-medium">{task.title}</p>
186-
<p className="text-muted-foreground">{taskScheduleLine(task)}</p>
189+
<p className="text-muted-foreground">
190+
{taskScheduleLine(task, tasksQuery.data?.timeZone)}
191+
</p>
187192
</TooltipPopup>
188193
</Tooltip>
189194
<Tooltip>

‎apps/web/src/components/settings/ScheduledTasksSettings.tsx‎

Lines changed: 19 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import type {
2121
ProjectId,
2222
ScheduledTask,
2323
ScheduledTaskId,
24-
ScheduledTaskSchedule,
2524
ScheduledTaskThreadMode,
2625
ScheduledTaskUpsertInput,
2726
ScheduledTaskWebhookDeliverySummary,
@@ -35,6 +34,7 @@ import {
3534
WEBHOOK_FILTER_OPS,
3635
type WebhookFilterDraft,
3736
} from "@t3tools/client-runtime/scheduled-task-webhook";
37+
import { scheduleTimeZoneLabel } from "@t3tools/client-runtime/scheduled-task-time-zone";
3838
import {
3939
MAX_WEBHOOK_DELIVERY_AGE_MINUTES,
4040
MAX_WEBHOOK_FILTERS,
@@ -104,7 +104,9 @@ import {
104104
defaultScheduledTaskProjectId,
105105
matchesScheduledTaskScope,
106106
scheduleFromDraft,
107+
scheduleLabel,
107108
scheduledTaskDefaultModel,
109+
WEEKDAY_LABELS,
108110
taskToDraft,
109111
unbindDraftFromThread,
110112
type DraftState,
@@ -151,7 +153,6 @@ import {
151153
} from "./settingsLayout";
152154

153155
const WEEKDAY_ORDER = [1, 2, 3, 4, 5, 6, 0] as const;
154-
const WEEKDAY_LABELS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"] as const;
155156
const WEEKDAY_SHORT = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"] as const;
156157

157158
// Thread ids are trimmed, so the leading space keeps this from matching one.
@@ -322,30 +323,6 @@ function splitModelKey(value: string): ModelSelection | null {
322323
};
323324
}
324325

325-
const ONCE_FORMATTER = new Intl.DateTimeFormat(undefined, {
326-
dateStyle: "medium",
327-
timeStyle: "short",
328-
});
329-
330-
export function scheduleLabel(schedule: ScheduledTaskSchedule): string {
331-
if (schedule.type === "webhook") return "On webhook";
332-
if (schedule.type === "once") return `Once, ${ONCE_FORMATTER.format(new Date(schedule.runAt))}`;
333-
if (schedule.type === "interval") {
334-
const minutes = schedule.everyMs / 60_000;
335-
return Number.isInteger(minutes)
336-
? `Every ${minutes} min`
337-
: `Every ${Math.round(schedule.everyMs / 1000)} sec`;
338-
}
339-
const weekdays = schedule.weekdays ?? [];
340-
const days =
341-
weekdays.length === 0
342-
? "Daily"
343-
: weekdays.length === 5 && weekdays.every((day) => day >= 1 && day <= 5)
344-
? "Weekdays"
345-
: weekdays.map((day) => WEEKDAY_LABELS[day]).join(", ");
346-
return `${days} at ${schedule.timeOfDay}`;
347-
}
348-
349326
/** formatRelativeTime handles only the past; upcoming runs need future labels. */
350327
function relativeLabel(value: string | null, nowMs: number): string {
351328
if (!value) return "Not scheduled";
@@ -552,6 +529,7 @@ function ScheduledTaskEnvironmentList({
552529
return {
553530
environment,
554531
connected: index >= 0,
532+
timeZone: data?.timeZone,
555533
tasks: data?.tasks.filter((task) =>
556534
matchesScheduledTaskScope(scope, environment.environmentId, task.projectId),
557535
),
@@ -586,7 +564,7 @@ function ScheduledTaskEnvironmentList({
586564

587565
return (
588566
<SettingsGroup>
589-
{populated.map(({ environment, tasks }) => {
567+
{populated.map(({ environment, tasks, timeZone }) => {
590568
const { primary, secondary } = settingsScopeEnvironmentLabels(environment, environments);
591569
return (
592570
<div key={environment.environmentId} className="divide-y divide-border/50">
@@ -610,6 +588,7 @@ function ScheduledTaskEnvironmentList({
610588
key={task.id}
611589
environmentId={environment.environmentId}
612590
task={task}
591+
timeZone={timeZone}
613592
onEdit={() => onEdit(environment.environmentId, task)}
614593
/>
615594
))}
@@ -734,6 +713,7 @@ function ScheduledTaskEnvironmentSection({
734713
key={task.id}
735714
environmentId={environment.environmentId}
736715
task={task}
716+
timeZone={tasksQuery.data?.timeZone}
737717
onEdit={() => onEdit(environment.environmentId, task)}
738718
/>
739719
))
@@ -747,10 +727,12 @@ function ScheduledTaskEnvironmentSection({
747727
function ScheduledTaskRow({
748728
environmentId,
749729
task,
730+
timeZone,
750731
onEdit,
751732
}: {
752733
readonly environmentId: EnvironmentId;
753734
readonly task: ScheduledTask;
735+
readonly timeZone: string | undefined;
754736
readonly onEdit: () => void;
755737
}) {
756738
const canOperate = useAtomValue(
@@ -795,7 +777,7 @@ function ScheduledTaskRow({
795777
status={
796778
<div className="flex flex-wrap items-center gap-2">
797779
<span>
798-
{scheduleLabel(task.schedule)} ·{" "}
780+
{scheduleLabel(task.schedule, timeZone, task.nextRunAt)} ·{" "}
799781
{task.blockedByPolicy !== undefined ? (
800782
task.blockedByPolicy
801783
) : !task.enabled ? (
@@ -1416,6 +1398,7 @@ function ScheduledTaskEditorForm({
14161398
draft.editingId !== null &&
14171399
tasksQuery.data !== null &&
14181400
!tasksQuery.data.tasks.some((entry) => entry.id === draft.editingId);
1401+
const runAtZone = scheduleTimeZoneLabel(tasksQuery.data?.timeZone);
14191402
const liveTask = tasksQuery.data
14201403
? (tasksQuery.data.tasks.find((entry) => entry.id === draft.editingId) ?? null)
14211404
: task;
@@ -2063,13 +2046,21 @@ function ScheduledTaskEditorForm({
20632046
<Input
20642047
type="time"
20652048
id="scheduled-task-time"
2049+
aria-describedby={
2050+
runAtZone === undefined ? undefined : "scheduled-task-time-zone"
2051+
}
20662052
nativeInput
20672053
className="w-32"
20682054
value={draft.timeOfDay}
20692055
onChange={(event) =>
20702056
setDraft((current) => ({ ...current, timeOfDay: event.target.value }))
20712057
}
20722058
/>
2059+
{runAtZone === undefined ? null : (
2060+
<span id="scheduled-task-time-zone" className="text-xs text-muted-foreground">
2061+
{runAtZone}
2062+
</span>
2063+
)}
20732064
<span className="text-xs text-muted-foreground">on</span>
20742065
</div>
20752066
<ToggleGroup

‎apps/web/src/components/settings/scheduledTasksSettings.logic.test.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import {
2222
defaultScheduledTaskProjectId,
2323
matchesScheduledTaskScope,
2424
scheduleFromDraft,
25+
scheduleLabel,
2526
taskToDraft,
2627
unbindDraftFromThread,
2728
} from "./scheduledTasksSettings.logic";
@@ -407,3 +408,12 @@ it("rejects dedupe templates without a request placeholder", () => {
407408
expect(scheduleFromDraft({ ...draft, replayKey: "literal" })).toBeNull();
408409
expect(scheduleFromDraft({ ...draft, coalesceKey: "{{body.bad" })).toBeNull();
409410
});
411+
412+
it("appends the server zone only to fixed-time schedule labels", () => {
413+
expect(scheduleLabel({ type: "fixed_time", timeOfDay: "16:31" }, "Etc/UTC")).toBe(
414+
"Daily at 16:31 UTC",
415+
);
416+
expect(scheduleLabel({ type: "fixed_time", timeOfDay: "09:00" })).toBe("Daily at 09:00");
417+
expect(scheduleLabel({ type: "interval", everyMs: 60_000 }, "Etc/UTC")).toBe("Every 1 min");
418+
expect(scheduleLabel({ type: "webhook", signature: null }, "Etc/UTC")).toBe("On webhook");
419+
});

‎apps/web/src/components/settings/scheduledTasksSettings.logic.ts‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
type ProjectId,
66
ScheduledTaskId,
77
type ScheduledTask,
8+
type ScheduledTaskSchedule,
89
type ScheduledTaskThreadMode,
910
type ScheduledTaskUpsertSchedule,
1011
scheduledTaskThreadMode,
@@ -22,6 +23,7 @@ import {
2223
webhookFilterDraftsChanged,
2324
type WebhookFilterDraft,
2425
} from "@t3tools/client-runtime/scheduled-task-webhook";
26+
import { scheduleTimeZoneLabel } from "@t3tools/client-runtime/scheduled-task-time-zone";
2527

2628
import {
2729
resolveProjectSettings,
@@ -31,6 +33,37 @@ import type { ProviderInstanceEntry } from "../../providerInstances";
3133

3234
import type { ResolvedSettingsScope } from "./settingsScope";
3335

36+
export const WEEKDAY_LABELS = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"] as const;
37+
38+
const ONCE_FORMATTER = new Intl.DateTimeFormat(undefined, {
39+
dateStyle: "medium",
40+
timeStyle: "short",
41+
});
42+
43+
export function scheduleLabel(
44+
schedule: ScheduledTaskSchedule,
45+
timeZone?: string,
46+
runAt?: string | null,
47+
): string {
48+
if (schedule.type === "webhook") return "On webhook";
49+
if (schedule.type === "once") return `Once, ${ONCE_FORMATTER.format(new Date(schedule.runAt))}`;
50+
if (schedule.type === "interval") {
51+
const minutes = schedule.everyMs / 60_000;
52+
return Number.isInteger(minutes)
53+
? `Every ${minutes} min`
54+
: `Every ${Math.round(schedule.everyMs / 1000)} sec`;
55+
}
56+
const weekdays = schedule.weekdays ?? [];
57+
const days =
58+
weekdays.length === 0
59+
? "Daily"
60+
: weekdays.length === 5 && weekdays.every((day) => day >= 1 && day <= 5)
61+
? "Weekdays"
62+
: weekdays.map((day) => WEEKDAY_LABELS[day]).join(", ");
63+
const zone = scheduleTimeZoneLabel(timeZone, runAt);
64+
return `${days} at ${schedule.timeOfDay}${zone === undefined ? "" : ` ${zone}`}`;
65+
}
66+
3467
export function matchesScheduledTaskScope(
3568
scope: ResolvedSettingsScope,
3669
environmentId: EnvironmentId,

‎packages/client-runtime/package.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@
8383
"types": "./src/scheduledTaskWebhook.ts",
8484
"default": "./src/scheduledTaskWebhook.ts"
8585
},
86+
"./scheduled-task-time-zone": {
87+
"types": "./src/scheduledTaskTimeZone.ts",
88+
"default": "./src/scheduledTaskTimeZone.ts"
89+
},
8690
"./connection": {
8791
"types": "./src/connection/index.ts",
8892
"default": "./src/connection/index.ts"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { expect, it } from "vite-plus/test";
2+
3+
import { scheduleTimeZoneLabel } from "./scheduledTaskTimeZone.ts";
4+
5+
it("uses short names instead of full IANA zones", () => {
6+
expect(scheduleTimeZoneLabel(undefined)).toBeUndefined();
7+
expect(scheduleTimeZoneLabel("Unsupported/Zone")).toBeUndefined();
8+
expect(scheduleTimeZoneLabel("Etc/UTC")).toBe("UTC");
9+
expect(scheduleTimeZoneLabel("America/Los_Angeles")).toMatch(/^(PT|Los Angeles Time)$/);
10+
expect(scheduleTimeZoneLabel("America/Los_Angeles", "2027-01-15T17:00:00Z")).toBe("PST");
11+
expect(scheduleTimeZoneLabel("America/Los_Angeles", "2027-07-15T16:00:00Z")).toBe("PDT");
12+
});
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import * as DateTime from "effect/DateTime";
2+
3+
/**
4+
* Short label for the server zone a fixed-time schedule runs in. With a run time it names
5+
* that instant's offset (PST/PDT); without one it uses the generic name (PT).
6+
*/
7+
export function scheduleTimeZoneLabel(
8+
timeZone: string | undefined,
9+
runAt?: string | null,
10+
): string | undefined {
11+
if (timeZone === undefined) return undefined;
12+
if (timeZone === "Etc/UTC" || timeZone === "UTC" || timeZone === "GMT") return "UTC";
13+
try {
14+
return new Intl.DateTimeFormat("en-US", {
15+
timeZone,
16+
timeZoneName: runAt ? "short" : "shortGeneric",
17+
})
18+
.formatToParts(runAt ? DateTime.toEpochMillis(DateTime.makeUnsafe(runAt)) : undefined)
19+
.find((part) => part.type === "timeZoneName")?.value;
20+
} catch {
21+
return undefined;
22+
}
23+
}

0 commit comments

Comments
 (0)