@@ -78,6 +78,7 @@ import {
7878 type DraftState ,
7979 type ScheduleMode ,
8080 type WorkspaceMode ,
81+ scheduleTimeZoneLabel ,
8182} from "./scheduledTasksSettings.logic" ;
8283import { Label } from "../ui/label" ;
8384import { Menu , MenuTrigger , MenuPopup , MenuItem , MenuSeparator } from "../ui/menu" ;
@@ -178,7 +179,7 @@ function splitModelKey(value: string): ModelSelection | null {
178179 } ;
179180}
180181
181- export function scheduleLabel ( schedule : ScheduledTaskSchedule ) : string {
182+ export function scheduleLabel ( schedule : ScheduledTaskSchedule , timeZone ?: string ) : string {
182183 if ( schedule . type === "webhook" ) return "On webhook" ;
183184 if ( schedule . type === "interval" ) {
184185 const minutes = schedule . everyMs / 60_000 ;
@@ -193,7 +194,8 @@ export function scheduleLabel(schedule: ScheduledTaskSchedule): string {
193194 : weekdays . length === 5 && weekdays . every ( ( day ) => day >= 1 && day <= 5 )
194195 ? "Weekdays"
195196 : weekdays . map ( ( day ) => WEEKDAY_LABELS [ day ] ) . join ( ", " ) ;
196- return `${ days } at ${ schedule . timeOfDay } ` ;
197+ const zone = scheduleTimeZoneLabel ( timeZone ) ;
198+ return `${ days } at ${ schedule . timeOfDay } ${ zone === null ? "" : ` ${ zone } ` } ` ;
197199}
198200
199201/**
@@ -356,6 +358,7 @@ function ScheduledTaskEnvironmentList({
356358 return {
357359 environment,
358360 connected,
361+ timeZone : data ?. timeZone ,
359362 tasks : data ?. tasks . filter ( ( task ) =>
360363 matchesScheduledTaskScope ( scope , environment . environmentId , task . projectId ) ,
361364 ) ,
@@ -400,7 +403,7 @@ function ScheduledTaskEnvironmentList({
400403
401404 return (
402405 < SettingsGroup >
403- { populated . map ( ( { environment, tasks } ) => {
406+ { populated . map ( ( { environment, tasks, timeZone } ) => {
404407 const { primary, secondary } = settingsScopeEnvironmentLabels ( environment , environments ) ;
405408 const transport = environmentTransportLabel ( environment ) ;
406409 return (
@@ -430,6 +433,7 @@ function ScheduledTaskEnvironmentList({
430433 key = { task . id }
431434 environmentId = { environment . environmentId }
432435 task = { task }
436+ timeZone = { timeZone }
433437 onEdit = { ( ) => onEdit ( environment . environmentId , task ) }
434438 />
435439 ) ) }
@@ -546,6 +550,7 @@ function ScheduledTaskEnvironmentSection({
546550 key = { task . id }
547551 environmentId = { environment . environmentId }
548552 task = { task }
553+ timeZone = { tasksQuery . data ?. timeZone }
549554 onEdit = { ( ) => onEdit ( environment . environmentId , task ) }
550555 />
551556 ) )
@@ -559,10 +564,12 @@ function ScheduledTaskEnvironmentSection({
559564function ScheduledTaskRow ( {
560565 environmentId,
561566 task,
567+ timeZone,
562568 onEdit,
563569} : {
564570 readonly environmentId : EnvironmentId ;
565571 readonly task : ScheduledTask ;
572+ readonly timeZone : string | undefined ;
566573 readonly onEdit : ( ) => void ;
567574} ) {
568575 const canOperate = useAtomValue (
@@ -607,7 +614,7 @@ function ScheduledTaskRow({
607614 status = {
608615 < div className = "flex flex-wrap items-center gap-2" >
609616 < span >
610- { scheduleLabel ( task . schedule ) } ·{ " " }
617+ { scheduleLabel ( task . schedule , timeZone ) } ·{ " " }
611618 { ! task . enabled
612619 ? "Paused"
613620 : isWebhook
@@ -956,6 +963,7 @@ function ScheduledTaskEditorDialog({
956963 draft . editingId !== null &&
957964 tasksQuery . data !== null &&
958965 ! tasksQuery . data . tasks . some ( ( entry ) => entry . id === draft . editingId ) ;
966+ const runAtZone = scheduleTimeZoneLabel ( tasksQuery . data ?. timeZone ) ;
959967 const liveTask = tasksQuery . data
960968 ? ( tasksQuery . data . tasks . find ( ( entry ) => entry . id === draft . editingId ) ?? null )
961969 : task ;
@@ -1468,6 +1476,9 @@ function ScheduledTaskEditorDialog({
14681476 setDraft ( ( current ) => ( { ...current , timeOfDay : event . target . value } ) )
14691477 }
14701478 />
1479+ { runAtZone === null ? null : (
1480+ < span className = "text-xs text-muted-foreground" > { runAtZone } </ span >
1481+ ) }
14711482 < span className = "text-xs text-muted-foreground" > on</ span >
14721483 </ div >
14731484 < ToggleGroup
0 commit comments