Skip to content

Fixed relative date filter initalization #12811

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.

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
merged 1 commit into from
Jun 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,18 @@ import { useUpsertObjectFilterDropdownCurrentFilter } from '@/object-record/obje
import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-record/object-filter-dropdown/states/fieldMetadataItemUsedInDropdownComponentSelector';
import { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState';
import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
import { getRelativeDateDisplayValue } from '@/object-record/object-filter-dropdown/utils/getRelativeDateDisplayValue';
import { useCreateEmptyRecordFilterFromFieldMetadataItem } from '@/object-record/record-filter/hooks/useCreateEmptyRecordFilterFromFieldMetadataItem';
import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand';
import { getDateFilterDisplayValue } from '@/object-record/record-filter/utils/getDateFilterDisplayValue';
import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
import { computeVariableDateViewFilterValue } from '@/views/view-filter-value/utils/computeVariableDateViewFilterValue';
import {
VariableDateViewFilterValueDirection,
VariableDateViewFilterValueUnit,
} from '@/views/view-filter-value/utils/resolveDateViewFilterValue';
import { isDefined } from 'twenty-shared/utils';

export const useApplyObjectFilterDropdownOperand = () => {
Expand Down Expand Up @@ -87,6 +93,20 @@ export const useApplyObjectFilterDropdownOperand = () => {
);

recordFilterToUpsert.displayValue = displayValue;
} else if (newOperand === RecordFilterOperand.IsRelative) {
const defaultRelativeDate = {
direction: 'THIS' as VariableDateViewFilterValueDirection,
amount: 1,
unit: 'DAY' as VariableDateViewFilterValueUnit,
};
Comment on lines +97 to +101
Copy link
Contributor

Choose a reason for hiding this comment

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

style: Consider extracting defaultRelativeDate as a constant since it represents default configuration values


recordFilterToUpsert.value = computeVariableDateViewFilterValue(
defaultRelativeDate.direction,
defaultRelativeDate.amount,
defaultRelativeDate.unit,
);
recordFilterToUpsert.displayValue =
getRelativeDateDisplayValue(defaultRelativeDate);
} else {
recordFilterToUpsert.value = '';
recordFilterToUpsert.displayValue = '';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,14 @@ export const getRelativeDateDisplayValue = (

const directionStr = capitalize(direction.toLowerCase());
const amountStr = direction === 'THIS' ? '' : amount;
const unitStr = amount
? amount > 1
? plural(unit.toLowerCase())
: unit.toLowerCase()
: undefined;
const unitStr =
direction === 'THIS'
? unit.toLowerCase()
: amount
? amount > 1
? plural(unit.toLowerCase())
: unit.toLowerCase()
: undefined;

return [directionStr, amountStr, unitStr]
.filter((item) => item !== undefined)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,14 @@ export const computeVariableDateViewFilterValue = (
direction: VariableDateViewFilterValueDirection,
amount: number | undefined,
unit: VariableDateViewFilterValueUnit,
) => `${direction}_${amount?.toString()}_${unit}`;
) => {
if (direction === 'THIS') {
return `THIS_1_${unit}`;
} else if (amount === undefined || amount <= 0) {
throw new Error(
'Amount must be defined and greater than 0 for relative date filters',
);
}
Comment on lines +13 to +17
Copy link
Contributor

Choose a reason for hiding this comment

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

style: Good validation, but error message could be more user-friendly. Consider extracting to a constant and making it less technical.


return `${direction}_${amount.toString()}_${unit}`;
Copy link
Contributor

Choose a reason for hiding this comment

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

style: toString() call unnecessary since template literals automatically convert to string. Remove for cleaner code.

Suggested change
return `${direction}_${amount.toString()}_${unit}`;
return `${direction}_${amount}_${unit}`;

};