From 4a05e67ff0e5d3b7a4b690b00dc796d0469b9840 Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Sat, 4 Oct 2025 14:12:20 +0530
Subject: [PATCH] Adding dropdown in ExpenseFilter.

---
 .../Expenses/ExpenseFilterPanel.jsx           | 22 ++++++++++++-------
 src/components/Expenses/ExpenseSchema.js      |  2 ++
 src/hooks/useExpense.js                       |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/components/Expenses/ExpenseFilterPanel.jsx b/src/components/Expenses/ExpenseFilterPanel.jsx
index 7a47ec6d..92baab2a 100644
--- a/src/components/Expenses/ExpenseFilterPanel.jsx
+++ b/src/components/Expenses/ExpenseFilterPanel.jsx
@@ -46,6 +46,7 @@ const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
       projectIds: project ? [project] : defaultFilter.projectIds || [],
       createdByIds: defaultFilter.createdByIds || [],
       paidById: defaultFilter.paidById || [],
+      ExpenseTypeIds: defaultFilter.ExpenseTypeIds || [],
       isTransactionDate: defaultFilter.isTransactionDate ?? true,
       startDate: defaultFilter.startDate,
       endDate: defaultFilter.endDate,
@@ -106,8 +107,8 @@ const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
         ...dynamicDefaultFilter,
         startDate: dynamicDefaultFilter.startDate
           ? moment
-              .utc(dynamicDefaultFilter.startDate, "DD-MM-YYYY")
-              .toISOString()
+            .utc(dynamicDefaultFilter.startDate, "DD-MM-YYYY")
+            .toISOString()
           : undefined,
         endDate: dynamicDefaultFilter.endDate
           ? moment.utc(dynamicDefaultFilter.endDate, "DD-MM-YYYY").toISOString()
@@ -143,18 +144,16 @@ const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
               <div className="d-inline-flex border rounded-pill mb-1 overflow-hidden shadow-none">
                 <button
                   type="button"
-                  className={`btn px-2 py-1 rounded-0 text-tiny ${
-                    isTransactionDate ? "active btn-primary text-white" : ""
-                  }`}
+                  className={`btn px-2 py-1 rounded-0 text-tiny ${isTransactionDate ? "active btn-primary text-white" : ""
+                    }`}
                   onClick={() => setValue("isTransactionDate", true)}
                 >
                   Transaction Date
                 </button>
                 <button
                   type="button"
-                  className={`btn px-2 py-1 rounded-0 text-tiny ${
-                    !isTransactionDate ? "active btn-primary text-white" : ""
-                  }`}
+                  className={`btn px-2 py-1 rounded-0 text-tiny ${!isTransactionDate ? "active btn-primary text-white" : ""
+                    }`}
                   onClick={() => setValue("isTransactionDate", false)}
                 >
                   Submitted Date
@@ -194,6 +193,13 @@ const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
               labelKey={(item) => item.name}
               valueKey="id"
             />
+            <SelectMultiple
+              name="ExpenseTypeIds"
+              label="Category :"
+              options={data.expensesType}
+              labelKey={(item) => item.name}
+              valueKey="id"
+            />
 
             <div className="mb-3">
               <label className="form-label">Status :</label>
diff --git a/src/components/Expenses/ExpenseSchema.js b/src/components/Expenses/ExpenseSchema.js
index 786aa5b9..cf070989 100644
--- a/src/components/Expenses/ExpenseSchema.js
+++ b/src/components/Expenses/ExpenseSchema.js
@@ -159,6 +159,7 @@ export const SearchSchema = z.object({
   statusIds: z.array(z.string()).optional(),
   createdByIds: z.array(z.string()).optional(),
   paidById: z.array(z.string()).optional(),
+  ExpenseTypeIds: z.array(z.string()).optional(),
   startDate: z.string().optional(),
   endDate: z.string().optional(),
   isTransactionDate: z.boolean().default(true),
@@ -169,6 +170,7 @@ export const defaultFilter = {
   statusIds: [],
   createdByIds: [],
   paidById: [],
+  ExpenseTypeIds: [],
   isTransactionDate: true,
   startDate: null,
   endDate: null,
diff --git a/src/hooks/useExpense.js b/src/hooks/useExpense.js
index 41976103..0d4b3c77 100644
--- a/src/hooks/useExpense.js
+++ b/src/hooks/useExpense.js
@@ -10,7 +10,7 @@ import moment from "moment";
 const cleanFilter = (filter) => {
   const cleaned = { ...filter };
 
-  ["projectIds", "statusIds", "createdByIds", "paidById"].forEach((key) => {
+  ["projectIds", "statusIds", "createdByIds", "paidById","ExpenseTypeIds"].forEach((key) => {
     if (Array.isArray(cleaned[key]) && cleaned[key].length === 0) {
       delete cleaned[key];
     }