From c51ae9081f15a2242feb8278e6bd694a4e1ae4bb Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Thu, 3 Oct 2024 13:48:09 +0530 Subject: [PATCH] 0.7 --- src/Components/DataTable/NormalTable.jsx | 2 +- .../IO_Management/CreateIO/Investors.jsx | 45 +++++++++++++++++-- .../InvestorDetails/InvestorDetails.jsx | 21 ++++----- src/Services/investor.details.service.js | 4 +- 4 files changed, 56 insertions(+), 16 deletions(-) diff --git a/src/Components/DataTable/NormalTable.jsx b/src/Components/DataTable/NormalTable.jsx index d1dd2c1..aafab00 100644 --- a/src/Components/DataTable/NormalTable.jsx +++ b/src/Components/DataTable/NormalTable.jsx @@ -75,7 +75,7 @@ const NormalTable = ({ textTransform={"none"} > { }); }, 300); + + // Table filter const filteredData = IODetails?.investors?.filter((item) => { const name = item.firstName; @@ -132,6 +136,22 @@ const Investors = ({ data }) => { return nameMatches; }); + + const customHeaders = [ + { label: "Client ID", key: "clientReference_id" }, + { label: "First Name", key: "firstName" }, // Nested property + { label: "Last Name", key: "lastName" }, // Nested property + { label: "Investment amount", key: "InvestedAmount_USD" }, // Nested property + { label: "Percentage", key: "Investor_Holidings" }, // Nested property + { label: "Market Value", key: "Market_Value" }, // Nested property + { label: "Return on Investment", key: "Return_On_Investment" }, // Nested property + { label: "Distribution", key: "Distribution_Amt" }, // Simple property + { label: "Distribution Percent", key: "Distribution_Per" }, // Simple property // Simple property + { label: "Total Return", key: "Total_Return" }, // Simple property + { label: "Total return on Investment", key: "Total_Return_On_Investment" }, + ]; + + const extractedArray = filteredData?.map((item, index) => ({ id: item?.id, "Client ID": ( @@ -430,6 +450,9 @@ const Investors = ({ data }) => { setIsRefetchLoading(false); }; + + + return ( @@ -439,7 +462,7 @@ const Investors = ({ data }) => { pb={3} spacing="24px" > - + { value={searchTerm} onChange={(e) => setSearchTerm(e.target.value)} /> + + { cursor={"pointer"} /> - + { } = useGetInvestorsQuery({ page: debouncedSearchTerm ? undefined : currentPage, // Omit pagination for search size: debouncedSearchTerm ? undefined : pageSize, // Omit pagination for search - searchTerm: debouncedSearchTerm, + search: debouncedSearchTerm, }, { skip: debouncedSearchTerm === "" && searchTerm !== "", // Skip if search is empty and it's not the initial request @@ -335,7 +335,7 @@ const InvestorDetails = () => { /> - + */} - + */} @@ -386,10 +386,10 @@ const InvestorDetails = () => { fontSize={"xs"} cursor={"pointer"} > - - + @@ -400,9 +400,10 @@ const InvestorDetails = () => { fontSize={"xs"} cursor={"pointer"} > - + diff --git a/src/Services/investor.details.service.js b/src/Services/investor.details.service.js index f30d04e..f1ed90e 100644 --- a/src/Services/investor.details.service.js +++ b/src/Services/investor.details.service.js @@ -13,9 +13,9 @@ export const investorDetails = createApi({ endpoints: (builder) => ({ getInvestors: builder.query({ - query: ({ page, size, searchTerm }) => { + query: ({ page, size, search }) => { // Start with the base URL, including searchTerm - let baseURL = `/investorDetails/admin/?search_data=${searchTerm || ""}`; + let baseURL = `/investorDetails/admin/?search=${search || ""}`; // Conditionally append page and size parameters if they are defined if (page !== undefined && size !== undefined) {