From e054dafd1846b359b07f1de553da96a6fa7f3d60 Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:18:57 +0530 Subject: [PATCH] investmentType table Api --- .../Master/InvestmentType/InvestmentType.jsx | 73 +++---------------- src/Services/investment.type.service.js | 17 +---- 2 files changed, 12 insertions(+), 78 deletions(-) diff --git a/src/Pages/Master/InvestmentType/InvestmentType.jsx b/src/Pages/Master/InvestmentType/InvestmentType.jsx index e54b72e..4be9a77 100644 --- a/src/Pages/Master/InvestmentType/InvestmentType.jsx +++ b/src/Pages/Master/InvestmentType/InvestmentType.jsx @@ -61,7 +61,7 @@ const InvestmentType = () => { error, } = useGetInvestmentTypesQuery({ page: 1, size: 10 }) - console.log(investmentTypes); + console.log(investmentTypes?.data?.rows); @@ -97,21 +97,12 @@ const InvestmentType = () => { }, 300); // ====================================================[Table Filter]================================================================ - const filteredData = investmentType.filter((item) => { + const filteredData = investmentTypes?.data?.rows?.filter((item) => { // Filter by name (case insensitive) - const name = item.investmentName; + const name = item.investmentTypeName; const searchLower = searchTerm.toLowerCase(); const nameMatches = name.toLowerCase().includes(searchLower); - // Filter by status - // const status = item.status; - // const statusLower = status ? "active" : "inactive"; - - // const statusMatches = - // statusFilter === "all" || - // (statusFilter === "active" && status === true) || - // (statusFilter === "inactive" && status === false); - return nameMatches; }); @@ -137,67 +128,23 @@ const InvestmentType = () => { fontWeight={"500"} className="d-flex align-items-center web-text-small" > - {item.investmentName} + {item.investmentTypeName} ), Description: ( - {item.description} + {item.note} ), Status: ( - // handleUpdateStatus(item.id)} - // isChecked={item.status} - // /> - + + + {item.isActive} + + ), - - // item?.status ? ( - // - // Passed - // - // ) : ( - // - // Not passes - // - // ), - - // "Created At": ( - // - // - // {formatDate(item.createdAt)} - // - // - // - // - // - // - // - // - // Edit - // - // - // View - // - // { - // setActionId(item?.id); - // setDeleteAlert(true); - // }} - // className="web-text-medium" - // > - // Delete - // - // - // - // - // - // ), Action: ( ({ getInvestmentTypes: builder.query({ query: ({ page, size }) => `/investmentType/admin?page=${page}&size=${size}`, }), - - - - - - getInvestmentTypeMasterActive: builder.query({ - query: () => "/investmentType/admin/active", - }), - getInvestmentTypeById: builder.query({ query: (id) => `/investmentType/admin/${id}`, }), @@ -29,8 +20,4 @@ export const investmentType = createApi({ }); // Export hooks for usage in functional components -export const { - useGetInvestmentTypeMasterQuery, - useGetInvestmentTypeByIdQuery, - useGetInvestmentTypeMasterActiveQuery, -} = investmentType; +export const { useGetInvestmentTypesQuery, useGetInvestmentTypeByIdQuery } = investmentType;