From 7005ab67b71dcb79056c2d8a440330b5998d6a2a Mon Sep 17 00:00:00 2001
From: AmirReza Jamali <amir7jamali.ar@yahoo.com>
Date: Sat, 22 Nov 2025 15:22:44 +0330
Subject: [PATCH] feat(customers): Add filtering functionality to customer list
 table

- Create new CustomerListFilters component with status, role, and type filter options
- Integrate filter modal into customer list table with open/close functionality
- Add filter form handling with react-hook-form for managing filter state
- Implement search functionality triggered by filter form submission
- Add EmptyListWrapper component to display message when no customers found
- Replace inline create button with reusable ListHeader component
- Add clearable select fields for better filter UX
- Update customer table to safely handle optional customer properties
- Add new CustomerStatus and CustomerType enums to support filtering options
- Improve table organization with proper imports and component structure
---
 .../Tables/customers/CustomerListFilters.tsx  |  90 +++++++
 src/components/Tables/customers/index.tsx     | 232 ++++++++++--------
 .../customers/useCustomerListPresenter.ts     |  51 +++-
 src/constants/enums.ts                        |  10 +
 4 files changed, 278 insertions(+), 105 deletions(-)
 create mode 100644 src/components/Tables/customers/CustomerListFilters.tsx

diff --git a/src/components/Tables/customers/CustomerListFilters.tsx b/src/components/Tables/customers/CustomerListFilters.tsx
new file mode 100644
index 0000000..1f75d5b
--- /dev/null
+++ b/src/components/Tables/customers/CustomerListFilters.tsx
@@ -0,0 +1,90 @@
+import { Select } from "@/components/FormElements/select";
+import { AdminRoles, CustomerStatus, CustomerType } from "@/constants/enums";
+import { getEnumAsArray } from "@/utils/shared";
+import {
+  FieldValues,
+  UseFormHandleSubmit,
+  UseFormRegister,
+  UseFormSetValue,
+  UseFormWatch,
+} from "react-hook-form";
+
+interface CustomerListFiltersProps {
+  filterRegister: UseFormRegister<FieldValues>;
+  setIsFilterModalOpen: (isOpen: boolean) => void;
+  isMutating: number;
+  handleFilterSubmit: UseFormHandleSubmit<FieldValues>;
+  search: (data: any) => void;
+  watch: UseFormWatch<FieldValues>;
+  setValue: UseFormSetValue<any>;
+}
+
+const CustomerListFilters = ({
+  filterRegister,
+  setIsFilterModalOpen,
+  isMutating,
+  handleFilterSubmit,
+  search,
+  watch,
+  setValue,
+}: CustomerListFiltersProps) => {
+  return (
+    <form
+      className="grid !min-w-full grid-cols-1 gap-4 xl:grid-cols-2"
+      onSubmit={handleFilterSubmit(search)}
+    >
+      <Select
+        {...filterRegister("status")}
+        items={getEnumAsArray(CustomerStatus)}
+        label="status"
+        name="status"
+        placeholder="Status"
+        clearable
+        value={watch("status")}
+        onClear={() => setValue("status", undefined)}
+      />
+      <Select
+        {...filterRegister("role")}
+        items={getEnumAsArray(AdminRoles)}
+        label="role"
+        name="role"
+        placeholder="Role"
+        clearable
+        value={watch("role")}
+        onClear={() => setValue("role", undefined)}
+      />
+      <Select
+        {...filterRegister("type")}
+        items={getEnumAsArray(CustomerType)}
+        label="type"
+        name="type"
+        placeholder="Type"
+        clearable
+        value={watch("type")}
+        onClear={() => setValue("type", undefined)}
+      />
+
+      <div className="flex gap-4 col-span-2">
+        <button
+          type="submit"
+          className="mt-6 flex w-fit justify-center rounded-lg bg-primary p-[13px] font-medium capitalize text-white hover:bg-opacity-90"
+        >
+          {isMutating ? (
+            <div className="h-5 w-5 animate-spin rounded-full border-b-2 border-gray-1"></div>
+          ) : (
+            <span>Search</span>
+          )}
+        </button>
+        <button
+          type="button"
+          className="mt-6 flex w-fit justify-center rounded-lg bg-error p-[13px] font-medium capitalize text-white hover:bg-opacity-90"
+          onClick={() => setIsFilterModalOpen(false)}
+        >
+          Close
+        </button>
+      </div>
+    </form>
+  );
+};
+
+export default CustomerListFilters;
diff --git a/src/components/Tables/customers/index.tsx b/src/components/Tables/customers/index.tsx
index 057de63..a02eacd 100644
--- a/src/components/Tables/customers/index.tsx
+++ b/src/components/Tables/customers/index.tsx
@@ -1,6 +1,11 @@
 "use client";
 import { ExclamationIcon, PencilSquareIcon, TrashIcon } from "@/assets/icons";
+import EmptyListWrapper from "@/components/HOC/EmptyListWrapper";
+import { Building } from "@/components/Layouts/sidebar/icons";
 import ConfirmationModal from "@/components/ui/ConfirmationModal";
+import ListHeader from "@/components/ui/ListHeader";
+import Modal from "@/components/ui/modal";
+import Status from "@/components/ui/Status";
 import {
   Table,
   TableBody,
@@ -9,18 +14,14 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
-import { _TooltipDefaultParams } from "@/constants/tooltip";
-import Link from "next/link";
-import useCustomerListPresenter from "./useCustomerListPresenter";
-
-import { Building } from "@/components/Layouts/sidebar/icons";
-import Modal from "@/components/ui/modal";
-import Status from "@/components/ui/Status";
 import TableSkeleton from "@/components/ui/TableSkeleton";
+import { _TooltipDefaultParams } from "@/constants/tooltip";
 import { unixToDate } from "@/utils/shared";
 import { toast } from "react-toastify";
 import { Tooltip } from "react-tooltip";
 import AssignToCompanyModalContent from "./AssignToCompanyModalContent";
+import CustomerListFilters from "./CustomerListFilters";
+import useCustomerListPresenter from "./useCustomerListPresenter";
 
 const CustomersTable = () => {
   const {
@@ -39,12 +40,21 @@ const CustomersTable = () => {
     setCurrentCustomer,
     isAssignCompanyModalOpen,
     setIsAssignCompanyModalOpen,
+    isFilterModalOpen,
+    setIsFilterModalOpen,
+    filterRegister,
+    handleFilterSubmit,
+    search,
+    watch,
+    setFilterValue,
+    isMutating,
   } = useCustomerListPresenter();
   return (
     <div className="flex flex-col rounded-[10px] bg-white px-7.5 pb-4 pt-7.5 shadow-1 dark:bg-gray-dark dark:shadow-card">
-      <button className="mb-5 flex w-fit justify-center self-end rounded-lg bg-primary p-[13px] font-medium text-white hover:bg-opacity-90">
-        <Link href={`${pathName}/create`}>Create Customer </Link>
-      </button>
+      <ListHeader
+        onFilter={() => setIsFilterModalOpen(true)}
+        createButtonText="Create Customer"
+      />
       <Table>
         <TableHeader>
           <TableRow>
@@ -61,99 +71,121 @@ const CustomersTable = () => {
         </TableHeader>
         {isPending && <TableSkeleton column={columns.length} />}
         <TableBody>
-          {allCustomers.map((customer, index) => (
-            <TableRow key={customer.id}>
-              <TableCell colSpan={100}>{index + 1}</TableCell>
-              <TableCell colSpan={100}>{customer.full_name}</TableCell>
-              <TableCell colSpan={100}>{customer.email}</TableCell>
-              <TableCell colSpan={100}>
-                {unixToDate({ unix: customer.created_at, hasTime: true })}
-              </TableCell>
+          <EmptyListWrapper
+            list={allCustomers ?? []}
+            columns={columns}
+            emptyMessage="No Customers were found"
+          >
+            {allCustomers?.map((customer, index) => (
+              <TableRow key={customer?.id ?? index}>
+                <TableCell colSpan={100}>{index + 1}</TableCell>
+                <TableCell colSpan={100}>{customer?.full_name}</TableCell>
+                <TableCell colSpan={100}>{customer?.email}</TableCell>
+                <TableCell colSpan={100}>
+                  {unixToDate({ unix: customer?.created_at, hasTime: true })}
+                </TableCell>
 
-              <TableCell colSpan={100} className="uppercase">
-                {customer.type}
-              </TableCell>
-              <TableCell colSpan={100}>
-                <Status status={customer.status}>{customer.status}</Status>
-              </TableCell>
-              <TableCell colSpan={100}>
-                {customer.companies?.length ? (
-                  customer.companies.map((c) => (
-                    <span key={c.id}>{c.name}, </span>
-                  ))
-                ) : (
-                  <span>None</span>
-                )}
-              </TableCell>
-              <TableCell colSpan={100} className="uppercase">
-                {customer.role ?? "-"}
-              </TableCell>
-              <TableCell className="text-start xl:pr-7.5">
-                <div className="flex items-center justify-start gap-x-3.5">
-                  <button
-                    data-tooltip-id="delete"
-                    data-tooltip-content="Delete"
-                    data-tooltip-place="top"
-                    className="hover:text-red-500"
-                    onClick={() => {
-                      setCurrentCustomer(customer);
-                      setIsModalOpen(true);
-                    }}
-                  >
-                    <Tooltip {..._TooltipDefaultParams({ id: "delete" })} />
-                    <span className="sr-only">Delete Company </span>
-                    <TrashIcon />
-                  </button>
-                  <button
-                    data-tooltip-id="edit"
-                    data-tooltip-content="Edit"
-                    data-tooltip-place="top"
-                    className="hover:text-primary"
-                    onClick={() =>
-                      router.push(`${pathName}/edit/${customer.id}`)
-                    }
-                  >
-                    <Tooltip {..._TooltipDefaultParams({ id: "edit" })} />
-                    <span className="sr-only">Edit Company </span>
-                    <PencilSquareIcon />
-                  </button>
-                  <button
-                    data-tooltip-id="assign-company"
-                    data-tooltip-content="Assign to company"
-                    data-tooltip-place="top"
-                    className="hover:text-green-dark"
-                    onClick={() => {
-                      setCurrentCustomer(customer);
-                      setIsAssignCompanyModalOpen(true);
-                      setSelectedCompanies({
-                        company_ids: [customer?.companies?.[0]?.id ?? ""],
-                      });
-                    }}
-                  >
-                    <Tooltip
-                      {..._TooltipDefaultParams({ id: "assign-company" })}
-                    />
-                    <span className="sr-only">Assign To Company </span>
-                    <Building />
-                  </button>
-                  <button
-                    data-tooltip-id="feedback"
-                    data-tooltip-content="Feedback"
-                    data-tooltip-place="top"
-                    className="text-gray-40 rounded-full bg-gray-dark bg-opacity-5 hover:text-green-dark dark:bg-gray dark:bg-opacity-5"
-                    onClick={() => {
-                      router.push(`${pathName}/feedback/${customer.id}`);
-                    }}
-                  >
-                    <Tooltip {..._TooltipDefaultParams({ id: "feedback" })} />
-                    <ExclamationIcon />
-                  </button>
-                </div>
-              </TableCell>
-            </TableRow>
-          ))}
+                <TableCell colSpan={100} className="uppercase">
+                  {customer?.type}
+                </TableCell>
+                <TableCell colSpan={100}>
+                  <Status status={customer?.status}>{customer?.status}</Status>
+                </TableCell>
+                <TableCell colSpan={100}>
+                  {customer?.companies?.length ? (
+                    customer?.companies.map((c) => (
+                      <span key={c.id}>{c.name}, </span>
+                    ))
+                  ) : (
+                    <span>None</span>
+                  )}
+                </TableCell>
+                <TableCell colSpan={100} className="uppercase">
+                  {customer?.role ?? "-"}
+                </TableCell>
+                <TableCell className="text-start xl:pr-7.5">
+                  <div className="flex items-center justify-start gap-x-3.5">
+                    <button
+                      data-tooltip-id="delete"
+                      data-tooltip-content="Delete"
+                      data-tooltip-place="top"
+                      className="hover:text-red-500"
+                      onClick={() => {
+                        setCurrentCustomer(customer);
+                        setIsModalOpen(true);
+                      }}
+                    >
+                      <Tooltip {..._TooltipDefaultParams({ id: "delete" })} />
+                      <span className="sr-only">Delete Company </span>
+                      <TrashIcon />
+                    </button>
+                    <button
+                      data-tooltip-id="edit"
+                      data-tooltip-content="Edit"
+                      data-tooltip-place="top"
+                      className="hover:text-primary"
+                      onClick={() =>
+                        router.push(`${pathName}/edit/${customer.id}`)
+                      }
+                    >
+                      <Tooltip {..._TooltipDefaultParams({ id: "edit" })} />
+                      <span className="sr-only">Edit Company </span>
+                      <PencilSquareIcon />
+                    </button>
+                    <button
+                      data-tooltip-id="assign-company"
+                      data-tooltip-content="Assign to company"
+                      data-tooltip-place="top"
+                      className="hover:text-green-dark"
+                      onClick={() => {
+                        setCurrentCustomer(customer);
+                        setIsAssignCompanyModalOpen(true);
+                        setSelectedCompanies({
+                          company_ids: [customer?.companies?.[0]?.id ?? ""],
+                        });
+                      }}
+                    >
+                      <Tooltip
+                        {..._TooltipDefaultParams({ id: "assign-company" })}
+                      />
+                      <span className="sr-only">Assign To Company </span>
+                      <Building />
+                    </button>
+                    <button
+                      data-tooltip-id="feedback"
+                      data-tooltip-content="Feedback"
+                      data-tooltip-place="top"
+                      className="text-gray-40 rounded-full bg-gray-dark bg-opacity-5 hover:text-green-dark dark:bg-gray dark:bg-opacity-5"
+                      onClick={() => {
+                        router.push(`${pathName}/feedback/${customer.id}`);
+                      }}
+                    >
+                      <Tooltip {..._TooltipDefaultParams({ id: "feedback" })} />
+                      <ExclamationIcon />
+                    </button>
+                  </div>
+                </TableCell>
+              </TableRow>
+            ))}
+          </EmptyListWrapper>
         </TableBody>
       </Table>
+      <Modal
+        isOpen={isFilterModalOpen}
+        onClose={() => setIsFilterModalOpen(false)}
+        classNames="w-full xl:w-1/2"
+        showButtons={false}
+      >
+        <CustomerListFilters
+          setValue={setFilterValue}
+          filterRegister={filterRegister}
+          handleFilterSubmit={handleFilterSubmit}
+          isMutating={isMutating as number}
+          search={search}
+          setIsFilterModalOpen={setIsFilterModalOpen}
+          watch={watch}
+        />
+      </Modal>
       <div className="w-1/12">
         <Modal
           onConfirm={() => {
diff --git a/src/components/Tables/customers/useCustomerListPresenter.ts b/src/components/Tables/customers/useCustomerListPresenter.ts
index 6ed13c7..b61058b 100644
--- a/src/components/Tables/customers/useCustomerListPresenter.ts
+++ b/src/components/Tables/customers/useCustomerListPresenter.ts
@@ -6,12 +6,16 @@ import {
   useDeleteCustomerQuery,
 } from "@/hooks/queries";
 import { TAssignCustomerToCompanyCredentials, TCustomer } from "@/lib/api";
-import { usePathname, useRouter } from "next/navigation";
-import { useState } from "react";
+import { deleteEmptyKeys } from "@/utils/shared";
+import { useIsMutating } from "@tanstack/react-query";
+import { usePathname, useRouter, useSearchParams } from "next/navigation";
+import { useEffect, useState } from "react";
+import { useForm } from "react-hook-form";
 
 const useCustomerListPresenter = () => {
   const [isAssignCompanyModalOpen, setIsAssignCompanyModalOpen] =
     useState(false);
+  const [isFilterModalOpen, setIsFilterModalOpen] = useState(false);
   const [selectedCompanies, setSelectedCompanies] = useState<
     TAssignCustomerToCompanyCredentials | undefined
   >();
@@ -21,10 +25,30 @@ const useCustomerListPresenter = () => {
 
   const [isModalOpen, setIsModalOpen] = useState(false);
   const pathName = usePathname();
-  const [params, setParams] = useState<Record<string, any>>({
-    sort: "created_at",
-  });
+  const searchParams = useSearchParams();
+  const [params, setParams] = useState<Record<string, any>>({});
   const router = useRouter();
+  const isMutating = useIsMutating();
+
+  const {
+    register: filterRegister,
+    handleSubmit: handleFilterSubmit,
+    reset: filterFormReset,
+    watch,
+    setValue: setFilterValue,
+  } = useForm();
+
+  useEffect(() => {
+    const newParams: Record<string, any> = {
+      sort: "created_at",
+    };
+    for (const [key, value] of searchParams.entries()) {
+      newParams[key] = value;
+    }
+    setParams(newParams);
+    filterFormReset(newParams);
+  }, [searchParams, filterFormReset]);
+
   const { data, isPending } = useCustomersInfiniteQuery(params);
   const { mutate: deleteCustomer } = useDeleteCustomerQuery(() =>
     setIsModalOpen(false),
@@ -35,6 +59,15 @@ const useCustomerListPresenter = () => {
       setIsAssignCompanyModalOpen(false);
     },
   );
+
+  const search = (data: any) => {
+    const newParams = { ...params, ...data };
+    const cleanedParams = deleteEmptyKeys(newParams);
+    const queryString = new URLSearchParams(cleanedParams).toString();
+    router.push(`${pathName}?${queryString}`);
+    setIsFilterModalOpen(false);
+  };
+
   const columns = [
     "row",
     "full name",
@@ -69,6 +102,14 @@ const useCustomerListPresenter = () => {
     router,
     isModalOpen,
     setIsModalOpen,
+    isFilterModalOpen,
+    setIsFilterModalOpen,
+    filterRegister,
+    handleFilterSubmit,
+    search,
+    watch,
+    setFilterValue,
+    isMutating,
   };
 };
 
diff --git a/src/constants/enums.ts b/src/constants/enums.ts
index e6760d9..2f30f33 100644
--- a/src/constants/enums.ts
+++ b/src/constants/enums.ts
@@ -39,3 +39,13 @@ export enum AdminRoles {
   ADMIN = "admin",
   ANALYST = "analyst",
 }
+export enum CustomerStatus {
+  ACTIVE = "active",
+  INACTIVE = "inactive",
+  SUSPENDED = "suspended",
+}
+export enum CustomerType {
+  INDIVIDUAL = "individual",
+  COMPANY = "company",
+  GOVERNMENT = "government",
+}