Commit dd99815

and

authored

Fix timezone conversion in datetime trigger parameters (#54593)

* onChange utc conversio bug * isValid * lint * revert & workaround * fix cmt lint * add back support for sec/ms --------- Co-authored-by: AhnSteve

1 parent 316ded5 commit dd99815Copy full SHA for dd99815

File tree

+10

-14

lines changed

airflow-core/src/airflow/ui/src/components
- DateTimeInput.tsx
- FlexibleForm
  - FieldDateTime.tsx

+10

-14

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,11 @@ type Props = {`
`32`	`32`	`export const DateTimeInput = forwardRef<HTMLInputElement, Props>(({ onChange, value, ...rest }, ref) => {`
`33`	`33`	`const { selectedTimezone } = useTimezone();`
`34`	`34`
`35`		`- // Make the value timezone-aware`
`36`		`- const date = dayjs(value).tz(selectedTimezone).format("YYYY-MM-DDTHH:mm:ss.SSS");`
	`35`	`+ // Convert UTC value to local time for display`
	`36`	`+ const displayValue =`
	`37`	`+ Boolean(value) && dayjs(value).isValid()`
	`38`	`+ ? dayjs(value).tz(selectedTimezone).format("YYYY-MM-DDTHH:mm:ss.SSS")`
	`39`	`+ : "";`
`37`	`40`
`38`	`41`	`return (`
`39`	`42`	`<Input`
`@@ -42,7 +45,6 @@ export const DateTimeInput = forwardRef(({ onChange, va`
`42`	`45`	`...event,`
`43`	`46`	`target: {`
`44`	`47`	`...event.target,`
`45`		`- // Return a timezone-aware ISO string`
`46`	`48`	`value: dayjs(event.target.value).isValid()`
`47`	`49`	`? dayjs(event.target.value).tz(selectedTimezone, true).toISOString()`
`48`	`50`	`: "",`
`@@ -51,7 +53,7 @@ export const DateTimeInput = forwardRef(({ onChange, va`
`51`	`53`	`}`
`52`	`54`	`ref={ref}`
`53`	`55`	`type="datetime-local"`
`54`		`- value={date}`
	`56`	`+ value={displayValue}`
`55`	`57`	`{...rest}`
`56`	`58`	`/>`
`57`	`59`	`);`

Lines changed: 4 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,16 +32,10 @@ export const FieldDateTime = ({`
`32`	`32`	`const { disabled, paramsDict, setParamsDict } = useParamStore(namespace);`
`33`	`33`	`const param = paramsDict[name] ?? paramPlaceholder;`
`34`	`34`	`const handleChange = (value: string) => {`
	`35`	`+ // "undefined" values are removed from params, so we set it to null to avoid falling back to DAG defaults.`
`35`	`36`	`if (paramsDict[name]) {`
`36`		`- if (rest.type === "datetime-local") {`
`37`		`- // "undefined" values are removed from params, so we set it to null to avoid falling back to DAG defaults.`
`38`		`- // eslint-disable-next-line unicorn/no-null`
`39`		- paramsDict[name].value = value === "" ? null : `${value}:00+00:00`; // Need to suffix to make it UTC like
`40`		`- } else {`
`41`		`- // "undefined" values are removed from params, so we set it to null to avoid falling back to DAG defaults.`
`42`		`- // eslint-disable-next-line unicorn/no-null`
`43`		`- paramsDict[name].value = value === "" ? null : value;`
`44`		`- }`
	`37`	`+ // eslint-disable-next-line unicorn/no-null`
	`38`	`+ paramsDict[name].value = value === "" ? null : value;`
`45`	`39`	`}`
`46`	`40`
`47`	`41`	`setParamsDict(paramsDict);`
`@@ -56,7 +50,7 @@ export const FieldDateTime = ({`
`56`	`50`	name={`element_${name}`}
`57`	`51`	`onChange={(event) => handleChange(event.target.value)}`
`58`	`52`	`size="sm"`
`59`		`- value={((param.value ?? "") as string).slice(0, 16)}`
	`53`	`+ value={(param.value as string) \|\| ""}`
`60`	`54`	`/>`
`61`	`55`	`);`
`62`	`56`	`}`

Comments

(0)