Merge pull request #2360 from Civolilah/bugfix/date-filtering

[Bugfix] Date Range Picker Filtering | Invoices
invoiceninja · Feb 12, 2025 · fb751a8 · fb751a8
2 parents 124f8d2 + a9aa059
commit fb751a8
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/components/DataTable.tsx b/src/components/DataTable.tsx
@@ -392,21 +392,19 @@ export function DataTable<T extends object>(props: Props<T>) {
 
   const handleDateRangeColumnClick = (columnId: string) => {
     const columnOfCurrentQueryParameter = dateRangeColumns.find(
-      (dateRangeColumn) => dateRangeQueryParameter === dateRangeColumn.column
+      (dateRangeColumn) =>
+        dateRangeQueryParameter === dateRangeColumn.queryParameterKey
     )?.column;
 
     const queryParameterOfCurrentColumn = dateRangeColumns.find(
       (dateRangeColumn) => columnId === dateRangeColumn.column
     )?.queryParameterKey;
 
-
     if (
       columnOfCurrentQueryParameter !== columnId &&
-      typeof columnOfCurrentQueryParameter !== 'undefined'
+      queryParameterOfCurrentColumn
     ) {
-      if (queryParameterOfCurrentColumn) {
-        setDateRangeQueryParameter(queryParameterOfCurrentColumn);
-      }
+      setDateRangeQueryParameter(queryParameterOfCurrentColumn);
     }
   };