Skip to content

Commit 75080c1

Browse files
committed
improve schedule window display
1 parent b63e514 commit 75080c1

1 file changed

Lines changed: 13 additions & 8 deletions

File tree

  • apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.tasks.scheduled.$taskParam

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.tasks.scheduled.$taskParam/route.tsx

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,16 @@ function ScheduledTaskDetailSidebar({
879879
)}
880880
</Property.Value>
881881
</Property.Item>
882+
<Property.Item>
883+
<Property.Label>Window</Property.Label>
884+
<Property.Value>
885+
{firstSchedule ? (
886+
(firstSchedule.window ?? "Default (60 seconds)")
887+
) : (
888+
<span className="text-text-dimmed"></span>
889+
)}
890+
</Property.Value>
891+
</Property.Item>
882892
<Property.Item>
883893
<Property.Label>Created</Property.Label>
884894
<Property.Value>
@@ -889,7 +899,7 @@ function ScheduledTaskDetailSidebar({
889899
<Property.Label>Next run</Property.Label>
890900
<Property.Value>
891901
{firstSchedule ? (
892-
<RelativeDateTime date={firstSchedule.nextRun} />
902+
<RelativeDateTime date={firstSchedule.nextRunEffectiveAt} />
893903
) : (
894904
<span className="text-text-dimmed"></span>
895905
)}
@@ -974,7 +984,6 @@ type ScheduleRow = {
974984
cronDescription: string;
975985
window?: string;
976986
externalId: string | null;
977-
nextRun: Date;
978987
nextRunEffectiveAt: Date;
979988
lastRun: Date | undefined;
980989
active: boolean;
@@ -995,7 +1004,7 @@ function SchedulesMiniTable({
9951004
return (
9961005
<Table variant={variant} showTopBorder={showTopBorder}>
9971006
<TableBody>
998-
<TableBlankRow colSpan={9}>
1007+
<TableBlankRow colSpan={8}>
9991008
<Paragraph variant="small" className="flex items-center justify-center">
10001009
No schedules attached to this task yet.
10011010
</Paragraph>
@@ -1014,8 +1023,7 @@ function SchedulesMiniTable({
10141023
<TableHeaderCell>CRON</TableHeaderCell>
10151024
<TableHeaderCell>Window</TableHeaderCell>
10161025
<TableHeaderCell>External ID</TableHeaderCell>
1017-
<TableHeaderCell>Next CRON time</TableHeaderCell>
1018-
<TableHeaderCell>Next assigned time</TableHeaderCell>
1026+
<TableHeaderCell>Next run</TableHeaderCell>
10191027
<TableHeaderCell>Last run</TableHeaderCell>
10201028
<TableHeaderCell>Status</TableHeaderCell>
10211029
</TableRow>
@@ -1050,9 +1058,6 @@ function SchedulesMiniTable({
10501058
<span className="text-text-dimmed"></span>
10511059
)}
10521060
</TableCell>
1053-
<TableCell onClick={open}>
1054-
<RelativeDateTime date={schedule.nextRun} />
1055-
</TableCell>
10561061
<TableCell onClick={open}>
10571062
<RelativeDateTime date={schedule.nextRunEffectiveAt} />
10581063
</TableCell>

0 commit comments

Comments
 (0)