The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fix live-query date filters throwing on DATE_TIME record values (#26321)
Thomas Trompette453f6d6367a9
diff --git a/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingDateFilter.test.ts b/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingDateFilter.test.tsindex 9b6f7c44efe..702ee26ef50 100644--- a/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingDateFilter.test.ts+++ b/packages/twenty-shared/src/utils/filter/utils/__tests__/isMatchingDateFilter.test.ts@@ -198,4 +198,70 @@ describe('isMatchingDateFilter', () => {).toBe(false);});});+ describe('Date object values', () => {+ const testDateObject = new Date(testDate);++ it('matches a gte filter', () => {+ expect(+ isMatchingDateFilter({+ dateFilter: { gte: '2023-12-18T12:15:29.810Z' },+ value: testDateObject,+ }),+ ).toBe(true);+ });++ it('matches an lt filter', () => {+ expect(+ isMatchingDateFilter({+ dateFilter: { lt: '2023-12-20T12:15:29.810Z' },+ value: testDateObject,+ }),+ ).toBe(true);++ expect(+ isMatchingDateFilter({+ dateFilter: { lt: '2023-12-18T12:15:29.810Z' },+ value: testDateObject,+ }),+ ).toBe(false);+ });++ it('matches an eq filter', () => {+ expect(+ isMatchingDateFilter({+ dateFilter: { eq: testDate },+ value: testDateObject,+ }),+ ).toBe(true);+ });++ it('matches an in filter', () => {+ expect(+ isMatchingDateFilter({+ dateFilter: { in: [testDate] },+ value: testDateObject,+ }),+ ).toBe(true);++ expect(+ isMatchingDateFilter({+ dateFilter: { in: ['2023-12-18T12:15:29.810Z'] },+ value: testDateObject,+ }),+ ).toBe(false);+ });++ it('matches the relative date range a view filter generates', () => {+ expect(+ isMatchingDateFilter({+ dateFilter: { gte: '2023-12-19T00:00:00.000Z' },+ value: testDateObject,+ }) &&+ isMatchingDateFilter({+ dateFilter: { lt: '2023-12-20T00:00:00.000Z' },+ value: testDateObject,+ }),+ ).toBe(true);+ });+ });});diff --git a/packages/twenty-shared/src/utils/filter/utils/isMatchingDateFilter.ts b/packages/twenty-shared/src/utils/filter/utils/isMatchingDateFilter.tsindex 823e4405f76..1879128185a 100644--- a/packages/twenty-shared/src/utils/filter/utils/isMatchingDateFilter.ts+++ b/packages/twenty-shared/src/utils/filter/utils/isMatchingDateFilter.ts@@ -7,21 +7,25 @@ export const isMatchingDateFilter = ({value,}: {dateFilter: DateFilter;- value: string | null | undefined;+ value: Date | string | null | undefined;}) => {if (!isDefined(value)) {return dateFilter.is === 'NULL';}+ const valueDate = value instanceof Date ? value : parseISO(value);+switch (true) {case dateFilter.eq !== undefined: {- return isEqual(parseISO(value), parseISO(dateFilter.eq));+ return isEqual(valueDate, parseISO(dateFilter.eq));}case dateFilter.neq !== undefined: {- return !isEqual(parseISO(value), parseISO(dateFilter.neq));+ return !isEqual(valueDate, parseISO(dateFilter.neq));}case dateFilter.in !== undefined: {- return dateFilter.in.includes(value);+ return dateFilter.in.some((filterValue) =>+ isEqual(valueDate, parseISO(filterValue)),+ );}case dateFilter.is !== undefined: {if (dateFilter.is === 'NULL') {@@ -31,24 +35,24 @@ export const isMatchingDateFilter = ({}}case dateFilter.gt !== undefined: {- return isAfter(parseISO(value), parseISO(dateFilter.gt));+ return isAfter(valueDate, parseISO(dateFilter.gt));}case dateFilter.gte !== undefined: {- const valueDate = parseISO(value);const filterDate = parseISO(dateFilter.gte);+return isAfter(valueDate, filterDate) || isEqual(valueDate, filterDate);}case dateFilter.lt !== undefined: {- return isBefore(parseISO(value), parseISO(dateFilter.lt));+ return isBefore(valueDate, parseISO(dateFilter.lt));}case dateFilter.lte !== undefined: {- const valueDate = parseISO(value);const filterDate = parseISO(dateFilter.lte);+return isBefore(valueDate, filterDate) || isEqual(valueDate, filterDate);}default: {throw new Error(- `Unexpected value for string filter : ${JSON.stringify(dateFilter)}`,+ `Unexpected value for date filter : ${JSON.stringify(dateFilter)}`,);}}