Skip to content

Made the code more resilient to stale value prop in date filter #17038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucasbordeau merged 2 commits into from
Jan 9, 2026
Merged

Made the code more resilient to stale value prop in date filter #17038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5f294c
Made the code more resilient to stale value prop in filter
lucasbordeau Jan 9, 2026
bed0986
Fixed tests
lucasbordeau Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions packages/twenty-front/src/modules/views/utils/__tests__/areViewFiltersEqual.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type ViewFilter } from '@/views/types/ViewFilter';
import { ViewFilterOperand } from 'twenty-shared/types';
import { areViewFiltersEqual } from '@/views/utils/areViewFiltersEqual';
import { ViewFilterOperand } from 'twenty-shared/types';

describe('areViewFiltersEqual', () => {
const baseFilter: ViewFilter = {
Expand All @@ -21,13 +21,6 @@ describe('areViewFiltersEqual', () => {
expect(areViewFiltersEqual(filterA, filterB)).toBe(true);
});

it('should return false when displayValue is different', () => {
const filterA = { ...baseFilter };
const filterB = { ...baseFilter, displayValue: 'different' };

expect(areViewFiltersEqual(filterA, filterB)).toBe(false);
});

it('should return false when fieldMetadataId is different', () => {
const filterA = { ...baseFilter };
const filterB = { ...baseFilter, fieldMetadataId: 'field-2' };
Expand Down
1 change: 0 additions & 1 deletion packages/twenty-front/src/modules/views/utils/areViewFiltersEqual.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export const areViewFiltersEqual = (
'viewFilterGroupId',
'positionInViewFilterGroup',
'value',
'displayValue',
'operand',
'subFieldName',
];
Expand Down
267 changes: 149 additions & 118 deletions packages/twenty-shared/src/utils/filter/turnRecordFilterIntoGqlOperationFilter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,10 @@ export const turnRecordFilterIntoRecordGqlOperationFilter = ({
);
}
case 'DATE': {
if (recordFilter.operand === RecordFilterOperand.IS_RELATIVE) {
Copy link
Copy Markdown
Member

@Weiko Weiko Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems there is a few duplicated logic between date and datetime in this file, what do you think?

Copy link
Copy Markdown
Contributor Author

@lucasbordeau lucasbordeau Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll do it in a follow-up PR.

Copy link
Copy Markdown
Contributor Author

@lucasbordeau lucasbordeau Jan 9, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Weiko I did look at what could be refactored and there seems to be enough subtle differences between how plain date and date times are handled for each operator to justify this structure that looks like it could be refactored. I think it's not worth it. Charles mentioned earlier that we could split this big function into smaller functions for each field type though, which would be interesting to do.

const itsARelativeDateFilter =
recordFilter.operand === RecordFilterOperand.IS_RELATIVE;

if (itsARelativeDateFilter) {
const relativeDateFilterValue = resolveRelativeDateFilterStringified(
recordFilter.value,
);
Expand Down Expand Up @@ -204,62 +207,75 @@ export const turnRecordFilterIntoRecordGqlOperationFilter = ({
};
}

const nowAsPlainDate = Temporal.Now.plainDateISO(
filterValueDependencies.timeZone,
).toString();
const operandIsTakingNowAsReference =
recordFilter.operand === RecordFilterOperand.IS_TODAY ||
recordFilter.operand === RecordFilterOperand.IS_IN_PAST ||
recordFilter.operand === RecordFilterOperand.IS_IN_FUTURE;

const plainDateFilter = recordFilter.value;
if (operandIsTakingNowAsReference) {
const nowAsPlainDate = Temporal.Now.plainDateISO(
filterValueDependencies.timeZone,
).toString();

switch (recordFilter.operand) {
case RecordFilterOperand.IS_AFTER: {
return {
[correspondingFieldMetadataItem.name]: {
gte: plainDateFilter,
} as DateFilter,
};
}
case RecordFilterOperand.IS_BEFORE: {
return {
[correspondingFieldMetadataItem.name]: {
lt: plainDateFilter,
} as DateFilter,
};
switch (recordFilter.operand) {
case RecordFilterOperand.IS_IN_PAST:
return {
[correspondingFieldMetadataItem.name]: {
lt: nowAsPlainDate,
} as DateFilter,
};
case RecordFilterOperand.IS_IN_FUTURE:
return {
[correspondingFieldMetadataItem.name]: {
gte: nowAsPlainDate,
} as DateFilter,
};
case RecordFilterOperand.IS_TODAY: {
return {
[correspondingFieldMetadataItem.name]: {
eq: nowAsPlainDate,
} as DateFilter,
};
}
}
} else {
const plainDateFilter = recordFilter.value;

case RecordFilterOperand.IS: {
return {
[correspondingFieldMetadataItem.name]: {
eq: plainDateFilter,
} as DateFilter,
};
}
case RecordFilterOperand.IS_IN_PAST:
return {
[correspondingFieldMetadataItem.name]: {
lt: nowAsPlainDate,
} as DateFilter,
};
case RecordFilterOperand.IS_IN_FUTURE:
return {
[correspondingFieldMetadataItem.name]: {
gte: nowAsPlainDate,
} as DateFilter,
};
case RecordFilterOperand.IS_TODAY: {
return {
[correspondingFieldMetadataItem.name]: {
eq: nowAsPlainDate,
} as DateFilter,
};
switch (recordFilter.operand) {
case RecordFilterOperand.IS_AFTER: {
return {
[correspondingFieldMetadataItem.name]: {
gte: plainDateFilter,
} as DateFilter,
};
}
case RecordFilterOperand.IS_BEFORE: {
return {
[correspondingFieldMetadataItem.name]: {
lt: plainDateFilter,
} as DateFilter,
};
}

case RecordFilterOperand.IS: {
return {
[correspondingFieldMetadataItem.name]: {
eq: plainDateFilter,
} as DateFilter,
};
}
}
default:
throw new Error(
`Unknown operand ${recordFilter.operand} for ${filterType} filter`,
);
}

throw new Error(
`Unknown operand ${recordFilter.operand} for ${filterType} filter`,
);
}
case 'DATE_TIME': {
if (recordFilter.operand === RecordFilterOperand.IS_RELATIVE) {
const itsARelativeDateTimeFilter =
recordFilter.operand === RecordFilterOperand.IS_RELATIVE;

if (itsARelativeDateTimeFilter) {
const resolvedFilterValue = resolveDateTimeFilter(recordFilter);

const parsedRelativeDateFilterValue =
Expand Down Expand Up @@ -307,81 +323,96 @@ export const turnRecordFilterIntoRecordGqlOperationFilter = ({
};
}

if (!isNonEmptyString(recordFilter.value)) {
throw new Error(`Date filter is empty`);
}

const resolvedDateTime = Temporal.Instant.from(recordFilter.value);
const operandIsTakingNowAsReference =
recordFilter.operand === RecordFilterOperand.IS_TODAY ||
recordFilter.operand === RecordFilterOperand.IS_IN_PAST ||
recordFilter.operand === RecordFilterOperand.IS_IN_FUTURE;

const now = Temporal.Now.zonedDateTimeISO(
filterValueDependencies.timeZone,
);
if (operandIsTakingNowAsReference) {
const now = Temporal.Now.zonedDateTimeISO(
filterValueDependencies.timeZone,
);

switch (recordFilter.operand) {
case RecordFilterOperand.IS_AFTER: {
return {
[correspondingFieldMetadataItem.name]: {
gte: resolvedDateTime.toString(),
} as DateTimeFilter,
};
switch (recordFilter.operand) {
case RecordFilterOperand.IS_IN_PAST:
return {
[correspondingFieldMetadataItem.name]: {
lt: now.toInstant().round('minute').toString(),
} as DateTimeFilter,
};
case RecordFilterOperand.IS_IN_FUTURE:
return {
[correspondingFieldMetadataItem.name]: {
gt: now.toInstant().round('minute').toString(),
} as DateTimeFilter,
};
case RecordFilterOperand.IS_TODAY: {
return {
and: [
{
[correspondingFieldMetadataItem.name]: {
gte: getPeriodStart(now, 'DAY').toInstant().toString(),
} as DateTimeFilter,
},
{
[correspondingFieldMetadataItem.name]: {
lt: getNextPeriodStart(now, 'DAY').toInstant().toString(),
} as DateTimeFilter,
},
],
};
}
}
case RecordFilterOperand.IS_BEFORE: {
return {
[correspondingFieldMetadataItem.name]: {
lt: resolvedDateTime.toString(),
} as DateTimeFilter,
};
} else {
if (!isNonEmptyString(recordFilter.value)) {
throw new Error(`Date filter is empty`);
}
case RecordFilterOperand.IS: {
const start = resolvedDateTime
.toZonedDateTimeISO('UTC')
.with({ second: 0, millisecond: 0, microsecond: 0, nanosecond: 0 })
.toInstant();

const end = start.add({ minutes: 1 });
const resolvedDateTime = Temporal.Instant.from(recordFilter.value);

return {
and: [
{
[correspondingFieldMetadataItem.name]: {
lt: end.toString(),
} as DateTimeFilter,
},
{
[correspondingFieldMetadataItem.name]: {
gte: start.toString(),
} as DateTimeFilter,
},
],
};
}
case RecordFilterOperand.IS_IN_PAST:
return {
[correspondingFieldMetadataItem.name]: {
lt: now.toInstant().round('minute').toString(),
} as DateTimeFilter,
};
case RecordFilterOperand.IS_IN_FUTURE:
return {
[correspondingFieldMetadataItem.name]: {
gt: now.toInstant().round('minute').toString(),
} as DateTimeFilter,
};
case RecordFilterOperand.IS_TODAY: {
return {
and: [
{
[correspondingFieldMetadataItem.name]: {
gte: getPeriodStart(now, 'DAY').toInstant().toString(),
} as DateTimeFilter,
},
{
[correspondingFieldMetadataItem.name]: {
lt: getNextPeriodStart(now, 'DAY').toInstant().toString(),
} as DateTimeFilter,
},
],
};
switch (recordFilter.operand) {
case RecordFilterOperand.IS_AFTER: {
return {
[correspondingFieldMetadataItem.name]: {
gte: resolvedDateTime.toString(),
} as DateTimeFilter,
};
}
case RecordFilterOperand.IS_BEFORE: {
return {
[correspondingFieldMetadataItem.name]: {
lt: resolvedDateTime.toString(),
} as DateTimeFilter,
};
}
case RecordFilterOperand.IS: {
const start = resolvedDateTime
.toZonedDateTimeISO('UTC')
.with({
second: 0,
millisecond: 0,
microsecond: 0,
nanosecond: 0,
})
.toInstant();

const end = start.add({ minutes: 1 });

return {
and: [
{
[correspondingFieldMetadataItem.name]: {
lt: end.toString(),
} as DateTimeFilter,
},
{
[correspondingFieldMetadataItem.name]: {
gte: start.toString(),
} as DateTimeFilter,
},
],
};
}
}
}

Expand Down