From 04f9102865de46e162d712632ca21b07e1b3a8b2 Mon Sep 17 00:00:00 2001 From: James Ritchie Date: Fri, 20 Jan 2023 11:44:15 -0800 Subject: [PATCH] Formatted the scheduled workflow info on the overview page --- .../app/components/triggers/Trigger.tsx | 45 ++++++++++++++----- .../orgs/$organizationSlug/__org/index.tsx | 2 +- 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/apps/webapp/app/components/triggers/Trigger.tsx b/apps/webapp/app/components/triggers/Trigger.tsx index 1ba71ff50..1b4611b2c 100644 --- a/apps/webapp/app/components/triggers/Trigger.tsx +++ b/apps/webapp/app/components/triggers/Trigger.tsx @@ -98,25 +98,46 @@ function RateOfScheduled({ source }: { source: ScheduleSourceRate }) { : source.rateOf.days; return ( - <> +
+ Runs + + Every {value} {unit} - +
); } function AtScheduled({ source }: { source: ScheduleSourceCron }) { return ( - <> - - {cronstrue.toString(source.cron, { - throwExceptionOnParseError: false, - verbose: false, - use24HourTimeFormat: true, - })} - {" - "}({source.cron}) - - +
+
+ + Runs + + + {cronstrue.toString(source.cron, { + throwExceptionOnParseError: false, + verbose: false, + use24HourTimeFormat: true, + })} + +
+
+ + Cron expression + + + {source.cron} + +
+
); } diff --git a/apps/webapp/app/routes/__app/orgs/$organizationSlug/__org/index.tsx b/apps/webapp/app/routes/__app/orgs/$organizationSlug/__org/index.tsx index bfcb501e9..c051854f1 100644 --- a/apps/webapp/app/routes/__app/orgs/$organizationSlug/__org/index.tsx +++ b/apps/webapp/app/routes/__app/orgs/$organizationSlug/__org/index.tsx @@ -97,7 +97,7 @@ function WorkflowList({
{workflow.status === "CREATED" && ( - + )}