Fixed date filter

Author: lucasbordeau

packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx

@@ -5,17 +5,25 @@ import { selectedOperandInDropdownComponentState } from '@/object-record/object-
 import { getRelativeDateDisplayValue } from '@/object-record/object-filter-dropdown/utils/getRelativeDateDisplayValue';
 import { DateTimePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
+import { UserContext } from '@/users/contexts/UserContext';
 import { computeVariableDateViewFilterValue } from '@/views/view-filter-value/utils/computeVariableDateViewFilterValue';
-import { useState } from 'react';
+import { useContext, useState } from 'react';
+import { useRecoilValue } from 'recoil';
 import {
   ViewFilterOperand,
   type VariableDateViewFilterValueDirection,
   type VariableDateViewFilterValueUnit,
 } from 'twenty-shared/types';
 import { isDefined, resolveDateViewFilterValue } from 'twenty-shared/utils';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { formatDateString } from '~/utils/string/formatDateString';
+import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
 
 export const ObjectFilterDropdownDateInput = () => {
+  const { dateFormat, timeFormat, timeZone } = useContext(UserContext);
+  const dateLocale = useRecoilValue(dateLocaleState);
+
   const fieldMetadataItemUsedInDropdown = useRecoilComponentValue(
     fieldMetadataItemUsedInDropdownComponentSelector,
   );
@@ -46,10 +54,26 @@ export const ObjectFilterDropdownDateInput = () => {
     setInternalDate(newDate);
 
     const newFilterValue = newDate?.toISOString() ?? '';
+
+    const formattedDateTime = formatDateTimeString({
+      value: newDate?.toISOString(),
+      timeZone,
+      dateFormat,
+      timeFormat,
+      localeCatalog: dateLocale.localeCatalog,
+    });
+
+    const formattedDate = formatDateString({
+      value: newDate?.toISOString(),
+      timeZone,
+      dateFormat,
+      localeCatalog: dateLocale.localeCatalog,
+    });
+
     const newDisplayValue = isDefined(newDate)
       ? isDateTimeInput
-        ? newDate.toLocaleString()
-        : newDate.toLocaleDateString()
+        ? formattedDateTime
+        : formattedDate
       : '';
 
     applyObjectFilterDropdownFilterValue(newFilterValue, newDisplayValue);

packages/twenty-shared/src/utils/filter/turnRecordFilterIntoGqlOperationFilter.ts

@@ -223,20 +223,28 @@ export const turnRecordFilterIntoRecordGqlOperationFilter = ({
           const isValid = resolvedFilterValue instanceof Date;
           const date = isValid ? resolvedFilterValue : now;
 
-          return {
-            and: [
-              {
-                [correspondingFieldMetadataItem.name]: {
-                  lte: endOfDay(date).toISOString(),
-                } as DateFilter,
-              },
-              {
-                [correspondingFieldMetadataItem.name]: {
-                  gte: startOfDay(date).toISOString(),
-                } as DateFilter,
-              },
-            ],
-          };
+          if (filterType === 'DATE') {
+            return {
+              [correspondingFieldMetadataItem.name]: {
+                eq: date.toISOString(),
+              } as DateFilter,
+            };
+          } else {
+            return {
+              and: [
+                {
+                  [correspondingFieldMetadataItem.name]: {
+                    lte: endOfDay(date).toISOString(),
+                  } as DateFilter,
+                },
+                {
+                  [correspondingFieldMetadataItem.name]: {
+                    gte: startOfDay(date).toISOString(),
+                  } as DateFilter,
+                },
+              ],
+            };
+          }
         }
         case RecordFilterOperand.IS_IN_PAST:
           return {
@@ -251,20 +259,28 @@ export const turnRecordFilterIntoRecordGqlOperationFilter = ({
             } as DateFilter,
           };
         case RecordFilterOperand.IS_TODAY: {
-          return {
-            and: [
-              {
-                [correspondingFieldMetadataItem.name]: {
-                  lte: endOfDay(now).toISOString(),
-                } as DateFilter,
-              },
-              {
-                [correspondingFieldMetadataItem.name]: {
-                  gte: startOfDay(now).toISOString(),
-                } as DateFilter,
-              },
-            ],
-          };
+          if (filterType === 'DATE') {
+            return {
+              [correspondingFieldMetadataItem.name]: {
+                eq: now.toISOString(),
+              } as DateFilter,
+            };
+          } else {
+            return {
+              and: [
+                {
+                  [correspondingFieldMetadataItem.name]: {
+                    lte: endOfDay(now).toISOString(),
+                  } as DateFilter,
+                },
+                {
+                  [correspondingFieldMetadataItem.name]: {
+                    gte: startOfDay(now).toISOString(),
+                  } as DateFilter,
+                },
+              ],
+            };
+          }
         }
         default:
           throw new Error(