Skip to content
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

fix: enable date filter to contain maxYear for filters in custom object #954

Merged
merged 3 commits into from
Nov 25, 2024
Merged

fix: enable date filter to contain maxYear for filters in custom object #954

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c3aa43
fix: enable date filter to contain maxYear for filters in custom object
harshith-venkatesh-freshworks Nov 21, 2024
631e9bd
Merge branch 'next' into fix-filter-with-set-maxYear
harshith-venkatesh-freshworks Nov 21, 2024
0734b71
fix: set condition for maxYear and minYear for DATE props
harshith-venkatesh-freshworks Nov 21, 2024
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
14 changes: 11 additions & 3 deletions ...ayons-extended/custom-objects/src/components/filter/filter-condition/filter-condition.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ export class FilterCondition {

renderContent(condition) {
let props = {};
const dateProps = {
displayFormat: 'dd MMM yyyy',
readonly: true,
maxYear: 2080,
minYear: 1970,
};
switch (condition.type) {
case 'TEXT':
case 'NUMBER':
Expand Down Expand Up @@ -172,8 +178,7 @@ export class FilterCondition {
);
case 'DATE':
props = {
displayFormat: 'dd MMM yyyy',
readonly: true,
...dateProps,
value: this.value,
};
return (
Expand All @@ -186,7 +191,10 @@ export class FilterCondition {
></fw-date-condition>
);
case 'DATE_RANGE':
props = { displayFormat: 'dd MMM yyyy', readonly: true, mode: 'range' };
props = {
...dateProps,
mode: 'range',
};
if (this.value) {
const { from: fromDate, to: toDate } = this.value;
if (fromDate && toDate) {
Expand Down
Loading