@@ -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/**
@@ -358,6 +360,7 @@ function ScheduledTaskEnvironmentList({
358360 return {
359361 environment,
360362 connected,
363+ timeZone : data ?. timeZone ,
361364 tasks : data ?. tasks . filter ( ( task ) =>
362365 matchesScheduledTaskScope ( scope , environment . environmentId , task . projectId ) ,
363366 ) ,
@@ -404,7 +407,7 @@ function ScheduledTaskEnvironmentList({
404407
405408 return (
406409 < SettingsGroup >
407- { populated . map ( ( { environment, tasks } ) => {
410+ { populated . map ( ( { environment, tasks, timeZone } ) => {
408411 const { primary, secondary } = settingsScopeEnvironmentLabels ( environment , environments ) ;
409412 const transport = environmentTransportLabel ( environment ) ;
410413 return (
@@ -434,6 +437,7 @@ function ScheduledTaskEnvironmentList({
434437 key = { task . id }
435438 environmentId = { environment . environmentId }
436439 task = { task }
440+ timeZone = { timeZone }
437441 onEdit = { ( ) => onEdit ( environment . environmentId , task ) }
438442 />
439443 ) ) }
@@ -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
@@ -964,6 +971,7 @@ function ScheduledTaskEditorDialog({
964971 draft . editingId !== null &&
965972 tasksQuery . data !== null &&
966973 ! tasksQuery . data . tasks . some ( ( entry ) => entry . id === draft . editingId ) ;
974+ const runAtZone = scheduleTimeZoneLabel ( tasksQuery . data ?. timeZone ) ;
967975 const liveTask = tasksQuery . data
968976 ? ( tasksQuery . data . tasks . find ( ( entry ) => entry . id === draft . editingId ) ?? null )
969977 : task ;
@@ -1478,6 +1486,9 @@ function ScheduledTaskEditorDialog({
14781486 setDraft ( ( current ) => ( { ...current , timeOfDay : event . target . value } ) )
14791487 }
14801488 />
1489+ { runAtZone === null ? null : (
1490+ < span className = "text-xs text-muted-foreground" > { runAtZone } </ span >
1491+ ) }
14811492 < span className = "text-xs text-muted-foreground" > on</ span >
14821493 </ div >
14831494 < ToggleGroup
0 commit comments