Fix date type update (#9700)

This PR fixes a problem with how TypeORM handles date without time. 

A date without time that is stored in PostgreSQL database as `date` type
gets returned as an ISO string date with a timezone that can shift its
date part in an unwanted way.

In short DB stores `2025-01-01`, TypeORM query builder returns
`2024-12-31T23:00:00Z` which gets parsed as `2024-12-31` on the front
end field.

We don't want to handle timezone here because we are manipulating a date
without its time part, so this PR adds a step that counteracts what
TypeORM does and returns `2025-01-01T00:00:00.000Z` so that the front
can parse it correctly.

@Weiko We might want to check other places of the backend where date
types are returned by TypeORM, we might have the same problem, this PR
only fixes it for updateOne resolver return.

- Fixed date persist on frontend which was shifting the date to a
different day due to timezone issue
- Fixed date returned by the backend update logic, which was shifting
the date by the timezone offset (so this PR adds back the offset so that
it stays at 00:00:00Z time)
This commit is contained in:
Lucas Bordeau
2025-01-17 16:19:49 +01:00
committed by GitHub
parent b6b5fd1759
commit 6bd0244045
9 changed files with 97 additions and 33 deletions

View File

@ -270,7 +270,7 @@ const StyledButton = styled(MenuItemLeftContent)`
justify-content: start;
`;
type InternalDatePickerProps = {
type DateTimePickerProps = {
isRelative?: boolean;
hideHeaderInput?: boolean;
date: Date | null;
@ -283,7 +283,7 @@ type InternalDatePickerProps = {
start: Date;
end: Date;
};
onMouseSelect?: (date: Date | null) => void;
onClose?: (date: Date | null) => void;
onChange?: (date: Date | null) => void;
onRelativeDateChange?: (
relativeDate: {
@ -300,10 +300,10 @@ type InternalDatePickerProps = {
onClear?: () => void;
};
export const InternalDatePicker = ({
export const DateTimePicker = ({
date,
onChange,
onMouseSelect,
onClose,
clearable = true,
isDateTimeInput,
onClear,
@ -312,7 +312,7 @@ export const InternalDatePicker = ({
onRelativeDateChange,
highlightedDateRange,
hideHeaderInput,
}: InternalDatePickerProps) => {
}: DateTimePickerProps) => {
const internalDate = date ?? new Date();
const { timeZone } = useContext(UserContext);
@ -336,9 +336,9 @@ export const InternalDatePicker = ({
closeDropdown();
};
const handleMouseSelect = (newDate: Date) => {
const handleClose = (newDate: Date) => {
closeDropdowns();
onMouseSelect?.(newDate);
onClose?.(newDate);
};
const handleChangeMonth = (month: number) => {
@ -396,7 +396,7 @@ export const InternalDatePicker = ({
})
.toJSDate();
handleMouseSelect?.(dateParsed);
handleClose?.(dateParsed);
};
const dateWithoutTime = DateTime.fromJSDate(internalDate)

View File

@ -4,11 +4,11 @@ import { expect, userEvent, within } from '@storybook/test';
import { ComponentDecorator } from 'twenty-ui';
import { isDefined } from '~/utils/isDefined';
import { InternalDatePicker } from '../InternalDatePicker';
import { DateTimePicker } from '../InternalDatePicker';
const meta: Meta<typeof InternalDatePicker> = {
const meta: Meta<typeof DateTimePicker> = {
title: 'UI/Input/Internal/InternalDatePicker',
component: InternalDatePicker,
component: DateTimePicker,
decorators: [ComponentDecorator],
argTypes: {
date: { control: 'date' },
@ -17,7 +17,7 @@ const meta: Meta<typeof InternalDatePicker> = {
// eslint-disable-next-line react-hooks/rules-of-hooks
const [, updateArgs] = useArgs();
return (
<InternalDatePicker
<DateTimePicker
date={isDefined(date) ? new Date(date) : new Date()}
onChange={(newDate) => updateArgs({ date: newDate })}
/>
@ -27,7 +27,7 @@ const meta: Meta<typeof InternalDatePicker> = {
};
export default meta;
type Story = StoryObj<typeof InternalDatePicker>;
type Story = StoryObj<typeof DateTimePicker>;
export const Default: Story = {};