Merge pull request #954 from harshith-venkatesh-freshworks/fix-filter…

…-with-set-maxYear fix: enable date filter to contain maxYear for filters in custom object
freshworks · Nov 25, 2024 · 256b21e · 256b21e
2 parents 6e42dbc + 0734b71
commit 256b21e
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...ayons-extended/custom-objects/src/components/filter/filter-condition/filter-condition.tsx b/...ayons-extended/custom-objects/src/components/filter/filter-condition/filter-condition.tsx
@@ -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':
@@ -172,8 +178,7 @@ export class FilterCondition {
         );
       case 'DATE':
         props = {
-          displayFormat: 'dd MMM yyyy',
-          readonly: true,
+          ...dateProps,
           value: this.value,
         };
         return (
@@ -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) {