From 5ff6d5d07b1d32c0698be44d32bd78a361b0a51d Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Fri, 18 Oct 2024 13:49:30 +0530 Subject: [PATCH] commit --- .../IO_Management/CreateIO/Investors.jsx | 4 ++- .../IO_Management/ViewIO/ViewIOTable.jsx | 35 +++++++++++++------ .../InvestorDetails/InvestorDetails.jsx | 4 +++ src/Services/io.service.js | 2 +- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/Pages/IO_Management/CreateIO/Investors.jsx b/src/Pages/IO_Management/CreateIO/Investors.jsx index 3395d8b..38cb41c 100644 --- a/src/Pages/IO_Management/CreateIO/Investors.jsx +++ b/src/Pages/IO_Management/CreateIO/Investors.jsx @@ -130,9 +130,11 @@ const Investors = ({ data }) => { // Table filter const filteredData = IODetails?.investors?.filter((item) => { + const clientId = item?.clientReference_id; const name = item.firstName; + const lastName = item?.lastName const searchLower = searchTerm.toLowerCase(); - const nameMatches = name.toLowerCase().includes(searchLower); + const nameMatches = name.toLowerCase().includes(searchLower) || lastName.toLowerCase().includes(searchLower) || clientId.toLowerCase().includes(searchLower); return nameMatches; }); diff --git a/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx index b2889c8..f49c62e 100644 --- a/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx +++ b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx @@ -61,8 +61,6 @@ const ViewIOTable = () => { const toast = useToast(); const { IODetails, setIODetails, slideFromRight } = useContext(GlobalStateContext); - const [searchTerm, setSearchTerm] = useState(""); - const [statusFilter, setStatusFilter] = useState("all"); // const [isLoading, setIsLoading] = useState(true); const [deleteAlert, setDeleteAlert] = useState(false); const [actionId, setActionId] = useState(false); @@ -74,11 +72,26 @@ const ViewIOTable = () => { // ===============================[ Paginations ] const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size); const [currentPage, setCurrentPage] = useState(TABLE_PAGINATION?.page); + const [searchTerm, setSearchTerm] = useState(""); + const [statusFilter, setStatusFilter] = useState(""); + const [debouncedSearchTerm, setDebouncedSearchTerm] = useState(""); + + // Debounce the search term to avoid making a request on every keystroke + useEffect(() => { + const handler = setTimeout(() => { + setDebouncedSearchTerm(searchTerm); + }, 500); // Adjust delay as needed + return () => { + clearTimeout(handler); + }; + }, [searchTerm]); // ===============================[ RTK Api calls ] ============================================= const { data, isLoading, error } = useGetIOsQuery({ page: currentPage, size: pageSize, + ioStatus_xid: statusFilter, + search: debouncedSearchTerm, }); console.log(data); @@ -114,7 +127,7 @@ const ViewIOTable = () => { return nameMatches && statusMatches; }); - const extractedArray = filteredData?.map((item, idx) => ({ + const extractedArray = data?.data?.rows?.map((item, idx) => ({ "Sr No.": ( { cursor={"pointer"} value={statusFilter} // Use the value prop here > - - - - - - - - + + + + + + + { const [searchTerm, setSearchTerm] = useState(""); const [debouncedSearchTerm, setDebouncedSearchTerm] = useState(""); + const [status, setStatus] = useState(""); + const [kyc, setKyc] = useState(""); + const [country, setCountry] = useState(""); + // Debounce the search term to avoid making a request on every keystroke useEffect(() => { const handler = setTimeout(() => { diff --git a/src/Services/io.service.js b/src/Services/io.service.js index c10edba..cd64730 100644 --- a/src/Services/io.service.js +++ b/src/Services/io.service.js @@ -28,7 +28,7 @@ export const ioService = createApi({ // =====[get] getIOs: builder.query({ - query: ({ page, size }) => `/io/admin?page=${page}&size=${size}`, + query: ({ page, size, ioStatus_xid, search }) => `/io/admin?page=${page}&size=${size}&ioStatus_xid=${ioStatus_xid}&search=${search}`, providesTags: ["getIO"], }),