@@ -80,6 +80,7 @@ import {
8080 type DraftState ,
8181 type ScheduleMode ,
8282 type WorkspaceMode ,
83+ scheduleTimeZoneLabel ,
8384} from "./scheduledTasksSettings.logic" ;
8485import { Label } from "../ui/label" ;
8586import { Menu , MenuTrigger , MenuPopup , MenuItem , MenuSeparator } from "../ui/menu" ;
@@ -179,7 +180,7 @@ function splitModelKey(value: string): ModelSelection | null {
179180 } ;
180181}
181182
182- export function scheduleLabel ( schedule : ScheduledTaskSchedule ) : string {
183+ export function scheduleLabel ( schedule : ScheduledTaskSchedule , timeZone ?: string ) : string {
183184 if ( schedule . type === "webhook" ) return "On webhook" ;
184185 if ( schedule . type === "interval" ) {
185186 const minutes = schedule . everyMs / 60_000 ;
@@ -194,7 +195,8 @@ export function scheduleLabel(schedule: ScheduledTaskSchedule): string {
194195 : weekdays . length === 5 && weekdays . every ( ( day ) => day >= 1 && day <= 5 )
195196 ? "Weekdays"
196197 : weekdays . map ( ( day ) => WEEKDAY_LABELS [ day ] ) . join ( ", " ) ;
197- return `${ days } at ${ schedule . timeOfDay } ` ;
198+ const zone = scheduleTimeZoneLabel ( timeZone ) ;
199+ return `${ days } at ${ schedule . timeOfDay } ${ zone === null ? "" : ` ${ zone } ` } ` ;
198200}
199201
200202/**
@@ -364,6 +366,7 @@ function ScheduledTaskEnvironmentList({
364366 return {
365367 environment,
366368 connected : index >= 0 ,
369+ timeZone : data ?. timeZone ,
367370 tasks : data ?. tasks . filter ( ( task ) =>
368371 matchesScheduledTaskScope ( scope , environment . environmentId , task . projectId ) ,
369372 ) ,
@@ -405,7 +408,7 @@ function ScheduledTaskEnvironmentList({
405408
406409 return (
407410 < SettingsGroup >
408- { populated . map ( ( { environment, tasks } ) => {
411+ { populated . map ( ( { environment, tasks, timeZone } ) => {
409412 const { primary, secondary } = settingsScopeEnvironmentLabels ( environment , environments ) ;
410413 const transport = environmentTransportLabel ( environment ) ;
411414 return (
@@ -435,6 +438,7 @@ function ScheduledTaskEnvironmentList({
435438 key = { task . id }
436439 environmentId = { environment . environmentId }
437440 task = { task }
441+ timeZone = { timeZone }
438442 onEdit = { ( ) => onEdit ( environment . environmentId , task ) }
439443 />
440444 ) ) }
@@ -550,6 +554,7 @@ function ScheduledTaskEnvironmentSection({
550554 key = { task . id }
551555 environmentId = { environment . environmentId }
552556 task = { task }
557+ timeZone = { tasksQuery . data ?. timeZone }
553558 onEdit = { ( ) => onEdit ( environment . environmentId , task ) }
554559 />
555560 ) )
@@ -563,10 +568,12 @@ function ScheduledTaskEnvironmentSection({
563568function ScheduledTaskRow ( {
564569 environmentId,
565570 task,
571+ timeZone,
566572 onEdit,
567573} : {
568574 readonly environmentId : EnvironmentId ;
569575 readonly task : ScheduledTask ;
576+ readonly timeZone : string | undefined ;
570577 readonly onEdit : ( ) => void ;
571578} ) {
572579 const canOperate = useAtomValue (
@@ -611,7 +618,7 @@ function ScheduledTaskRow({
611618 status = {
612619 < div className = "flex flex-wrap items-center gap-2" >
613620 < span >
614- { scheduleLabel ( task . schedule ) } ·{ " " }
621+ { scheduleLabel ( task . schedule , timeZone ) } ·{ " " }
615622 { ! task . enabled ? (
616623 "Paused"
617624 ) : isWebhook ? (
@@ -998,6 +1005,7 @@ function ScheduledTaskEditorForm({
9981005 draft . editingId !== null &&
9991006 tasksQuery . data !== null &&
10001007 ! tasksQuery . data . tasks . some ( ( entry ) => entry . id === draft . editingId ) ;
1008+ const runAtZone = scheduleTimeZoneLabel ( tasksQuery . data ?. timeZone ) ;
10011009 const liveTask = tasksQuery . data
10021010 ? ( tasksQuery . data . tasks . find ( ( entry ) => entry . id === draft . editingId ) ?? null )
10031011 : task ;
@@ -1501,6 +1509,9 @@ function ScheduledTaskEditorForm({
15011509 setDraft ( ( current ) => ( { ...current , timeOfDay : event . target . value } ) )
15021510 }
15031511 />
1512+ { runAtZone === null ? null : (
1513+ < span className = "text-xs text-muted-foreground" > { runAtZone } </ span >
1514+ ) }
15041515 < span className = "text-xs text-muted-foreground" > on</ span >
15051516 </ div >
15061517 < ToggleGroup
0 commit comments