fixed bug when using the CRON_TZ= cron expression (#707)

dagu-org · Nov 12, 2024 · 855e75d · 855e75d
1 parent 8dc577e
commit 855e75d
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/ui/src/models/index.ts b/ui/src/models/index.ts
@@ -153,6 +153,15 @@ export function getNextSchedule(data: WorkflowListItem): number {
   }
   const tz = getConfig().tz || moment.tz.guess();
   const datesToRun = schedules.map((s) => {
+    const cronTzMatch = s.Expression.match(/(?<=CRON_TZ=)[^\s]+/);
+    if (cronTzMatch) {
+      const cronTz = cronTzMatch[0]
+      const expressionTextWithOutCronTz = s.Expression.replace(`CRON_TZ=${cronTz}`, '')
+      return cronParser.parseExpression(expressionTextWithOutCronTz, {
+        currentDate: new Date(),
+        tz: cronTz,
+      }).next()
+    }
     const expression = tz
       ? cronParser.parseExpression(s.Expression, {
           currentDate: new Date(),