From 915242c1f389a94f53d7b293d489beba871b876d Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Fri, 11 Oct 2024 15:49:08 +0530 Subject: [PATCH] update --- src/Pages/Fawateer/SelectInvestorModal.jsx | 24 ++++++++-------------- src/Services/fawateer.request.service.js | 16 +++++++++++++++ 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/Pages/Fawateer/SelectInvestorModal.jsx b/src/Pages/Fawateer/SelectInvestorModal.jsx index 7d1384c..77751ae 100644 --- a/src/Pages/Fawateer/SelectInvestorModal.jsx +++ b/src/Pages/Fawateer/SelectInvestorModal.jsx @@ -21,6 +21,7 @@ import { useEffect, useState } from 'react'; import { TABLE_PAGINATION } from '../../Constants/Paginations'; import Pagination from '../../Components/Pagination'; import { AddIcon } from '@chakra-ui/icons'; +import { useGetFawateerInvestorsQuery } from '../../Services/fawateer.request.service'; const SelectInvestorModal = ({ isOpen, setValue, onClose, setId}) => { @@ -46,7 +47,7 @@ const SelectInvestorModal = ({ isOpen, setValue, onClose, setId}) => { data: investorDetails, isLoading: investorDetailsLoading, error, - } = useGetInvestorsQuery({ + } = useGetFawateerInvestorsQuery({ page: debouncedSearchTerm ? undefined : currentPage, // Omit pagination for search size: debouncedSearchTerm ? undefined : pageSize, // Omit pagination for search search: debouncedSearchTerm, @@ -65,14 +66,14 @@ const handleCheckboxChange = (id) => { setSelectorInvestor(investor) console.log(investor); setId(investor?.principal_xid) - // setValue("investorName",`${selectedInvestor?.principal?.firstName} ${selectedInvestor?.principal?.lastName}`) + // setValue("investorName",`${selectedInvestor?.firstName} ${selectedInvestor?.lastName}`) // setValue("clientId",selectedInvestor?.clientReference_id) return }; const handleAdd = () => { console.log(selectedInvestor); - setValue("investorName",`${selectedInvestor?.principal?.firstName} ${selectedInvestor?.principal?.lastName}`) + setValue("investorName",`${selectedInvestor?.firstName} ${selectedInvestor?.lastName}`) setValue("clientId",selectedInvestor?.clientReference_id) return onClose() } @@ -86,7 +87,7 @@ console.log(investor); "Client ID", "First Name", "Last Name", - "Country", + // "Country", "Phone Number", "E-mail ID", // "Type", @@ -119,35 +120,28 @@ console.log(investor); "First Name": ( - {item?.principal?.firstName} + {item?.firstName} ), "Last Name": ( - {item?.principal?.lastName} - - - ), - Country: ( - - - {item?.country?.countryName} + {item?.lastName} ), "Phone Number": ( - {item?.principal?.mobileNumber} + {item?.phoneNumber} ), "E-mail ID": ( - {item?.principal?.emailAddress} + {item?.emailAddress} ), diff --git a/src/Services/fawateer.request.service.js b/src/Services/fawateer.request.service.js index 62c65d2..9483863 100644 --- a/src/Services/fawateer.request.service.js +++ b/src/Services/fawateer.request.service.js @@ -24,6 +24,21 @@ export const fawateerRequest = createApi({ providesTags: ["getFawateerRequest"], }), + + getFawateerInvestors: builder.query({ + query: ({ page, size, search }) => { + let baseURL = `/fawateer/admin/investors?search=${search || ""}`; + if (page !== undefined && size !== undefined) { + baseURL += `&page=${page}&size=${size}`; // Only add pagination if both are defined + } + return baseURL; + }, + providesTags: ["getFawateerRequest"], + }), + + + + getFawateerForMakerRequest: builder.query({ query: ({ page, size, searchTerm }) => { let baseURL = `/fawateer/admin?search_data=${searchTerm || ""}`; @@ -68,4 +83,5 @@ export const { useApproveCommentMutation, useRejectCommentMutation, useGetFawateerForMakerRequestQuery, + useGetFawateerInvestorsQuery } = fawateerRequest;