opensource
/
dify
mirror of https://github.com/langgenius/dify.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(workflow): integrate timezone display into execution time format for better readability

This commit is contained in:
lyzno1 2025-10-13 17:07:33 +08:00
parent 62efdd7f7a
commit 99d9657af8
No known key found for this signature in database
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/app/components/workflow/nodes/trigger-schedule/components/next-execution-times.tsx
View File

@ -2,7 +2,6 @@ import React from 'react'
import { useTranslation } from 'react-i18next'
import type { ScheduleTriggerNodeType } from '../types'
import { getFormattedExecutionTimes } from '../utils/execution-time-calculator'
import TimezoneLabel from '@/app/components/base/timezone-label'
type NextExecutionTimesProps = {
data: ScheduleTriggerNodeType
@ -32,8 +31,6 @@ const NextExecutionTimes = ({ data }: NextExecutionTimesProps) => {
</span>
<span className="pl-2 pr-3 font-mono font-normal leading-[150%] tracking-wider text-text-secondary">
{time}
{' '}
<TimezoneLabel timezone={data.timezone} inline className="text-xs" />
</span>
</div>
))}

13
web/app/components/workflow/nodes/trigger-schedule/utils/execution-time-calculator.ts
View File

@ -1,5 +1,6 @@
import type { ScheduleTriggerNodeType } from '../types'
import { isValidCronExpression, parseCronExpression } from './cron-parser'
import { convertTimezoneToOffsetStr } from '@/app/components/base/date-and-time-picker/utils/dayjs'
// Get current time completely in user timezone, no browser timezone involved
const getUserTimezoneCurrentTime = (timezone: string): Date => {
@ -15,7 +16,7 @@ const getUserTimezoneCurrentTime = (timezone: string): Date => {
}
// Format date that is already in user timezone, no timezone conversion
const formatUserTimezoneDate = (date: Date, includeWeekday: boolean = true): string => {
const formatUserTimezoneDate = (date: Date, timezone: string, includeWeekday: boolean = true): string => {
const dateOptions: Intl.DateTimeFormatOptions = {
year: 'numeric',
month: 'long',
@ -23,7 +24,7 @@ const formatUserTimezoneDate = (date: Date, includeWeekday: boolean = true): str
}
if (includeWeekday)
dateOptions.weekday = 'short'
dateOptions.weekday = 'long' // Changed from 'short' to 'long' for full weekday name
const timeOptions: Intl.DateTimeFormatOptions = {
hour: 'numeric',
@ -31,7 +32,9 @@ const formatUserTimezoneDate = (date: Date, includeWeekday: boolean = true): str
hour12: true,
}
return `${date.toLocaleDateString('en-US', dateOptions)} ${date.toLocaleTimeString('en-US', timeOptions)}`
const timezoneOffset = convertTimezoneToOffsetStr(timezone)
return `${date.toLocaleDateString('en-US', dateOptions)}, ${date.toLocaleTimeString('en-US', timeOptions)} (${timezoneOffset})`
}
// Helper function to get default datetime - consistent with base DatePicker
@ -230,8 +233,8 @@ export const getNextExecutionTimes = (data: ScheduleTriggerNodeType, count: numb
return times
}
export const formatExecutionTime = (date: Date, _timezone: string, includeWeekday: boolean = true): string => {
return formatUserTimezoneDate(date, includeWeekday)
export const formatExecutionTime = (date: Date, timezone: string, includeWeekday: boolean = true): string => {
return formatUserTimezoneDate(date, timezone, includeWeekday)
}
export const getFormattedExecutionTimes = (data: ScheduleTriggerNodeType, count: number = 5): string[] => {