From 4bded669bf56fb38524130ee7429b33f99225e51 Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Tue, 1 Oct 2024 17:45:35 +0530
Subject: [PATCH] update

---
 src/Components/Pagination.jsx                 | 73 +++++++++++--------
 .../Master/InvestmentType/InvestmentType.jsx  |  2 +-
 src/Services/token.serivce.js                 | 15 ++--
 3 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/src/Components/Pagination.jsx b/src/Components/Pagination.jsx
index 6532b1f..0a82531 100644
--- a/src/Components/Pagination.jsx
+++ b/src/Components/Pagination.jsx
@@ -1,11 +1,17 @@
-import React, { useState } from 'react';
-import { Select, HStack, Text, Box, IconButton } from '@chakra-ui/react';
-import { ChevronLeftIcon, ChevronRightIcon } from '@chakra-ui/icons';
+import React, { useState } from "react";
+import { Select, HStack, Text, Box, IconButton } from "@chakra-ui/react";
+import { ChevronLeftIcon, ChevronRightIcon } from "@chakra-ui/icons";
 
-const Pagination = ({ pageSize, setPageSize, totalItems,isLoading, setCurrentPage, currentPage }) => {
+const Pagination = ({
+  pageSize,
+  setPageSize,
+  totalItems,
+  isLoading,
+  setCurrentPage,
+  currentPage,
+}) => {
   // const [] = useState(itemsPerPageOptions[0]);
 
-
   const totalPages = Math.ceil(totalItems / pageSize);
 
   const handlePageSizeChange = (e) => {
@@ -35,45 +41,54 @@ const Pagination = ({ pageSize, setPageSize, totalItems,isLoading, setCurrentPag
       {/* <Text className='web-text-small'>Tanami v0.1</Text> */}
 
       <HStack>
-      <Select
-        
-        className="pointer web-text-small"
-        width={"90px"}
-        rounded="sm"
-        size="sm"
-        value={pageSize}
-        onChange={handlePageSizeChange}
-      >
-        {[ 15, 20, 30]?.map((size) => (
-          <option key={size} value={size}>
-            {size}
-          </option>
-        ))}
-      </Select>
+        <Select
+          className="pointer web-text-small"
+          width={"90px"}
+          rounded="sm"
+          size="sm"
+          value={pageSize}
+          onChange={handlePageSizeChange}
+        >
+          {[15, 20, 30]?.map((size) => (
+            <option key={size} value={size}>
+              {size}
+            </option>
+          ))}
+        </Select>
         <IconButton
-        mt={1}
-          size={'sm'}
-          rounded="sm" 
+          mt={1}
+          size={"sm"}
+          rounded="sm"
           icon={<ChevronLeftIcon />}
           onClick={paginationPrev}
           className="link pointer"
           isDisabled={currentPage === 1}
+          aria-label="Previous Page"
         />
-        <Text w={"81px"} display={'flex'} justifyContent={'center'} className="web-text-medium" as={"span"}>
-          {isLoading ? "0": displayRange?.start} - {isLoading ? "00" :displayRange?.end} of {isLoading ? "00":totalItems}
+        <Text
+          w={"81px"}
+          display={"flex"}
+          justifyContent={"center"}
+          className="web-text-medium"
+          as={"span"}
+        >
+          {isLoading ? "0" : displayRange?.start} -{" "}
+          {isLoading ? "00" : displayRange?.end} of{" "}
+          {isLoading ? "00" : totalItems}
         </Text>
         <IconButton
-        mt={1}
+          mt={1}
           icon={<ChevronRightIcon />}
-          size={'sm'}
-          rounded="sm" 
+          size={"sm"}
+          rounded="sm"
           onClick={paginationNext}
           className="link pointer"
           isDisabled={currentPage === totalPages}
+           aria-label="Next Page"
         />
       </HStack>
     </HStack>
   );
 };
 
-export default Pagination;
\ No newline at end of file
+export default Pagination;
diff --git a/src/Pages/Master/InvestmentType/InvestmentType.jsx b/src/Pages/Master/InvestmentType/InvestmentType.jsx
index 7bc892b..6cc9b59 100644
--- a/src/Pages/Master/InvestmentType/InvestmentType.jsx
+++ b/src/Pages/Master/InvestmentType/InvestmentType.jsx
@@ -70,7 +70,7 @@ const InvestmentType = () => {
   //   toast({
   //     render: () => <ToastBox message={"Status changed succesfully.!"} />,
   //   });
-  // }, 300);
+  // }, 300); 
 
   // ===========================[Table Filter]=============================
 
diff --git a/src/Services/token.serivce.js b/src/Services/token.serivce.js
index f9bcb09..a543760 100644
--- a/src/Services/token.serivce.js
+++ b/src/Services/token.serivce.js
@@ -25,7 +25,7 @@ export const baseQuery = async (args, api, extraOptions) => {
     },
   })(args, api, extraOptions);
 
-  if (result.error && result.error.status === 401) {
+  if (result.error && result.error.status === 403) {
     // Handle token refresh
     const refreshToken = localStorage.getItem("refreshToken");
     if (refreshToken) {
@@ -43,15 +43,18 @@ export const baseQuery = async (args, api, extraOptions) => {
         );
 
         if (refreshResult.data) {
+          console.log('hit');
+          console.log(refreshResult?.data?.data?.access?.token);
+          
           // Save new tokens
-          localStorage.setItem("accessToken", refreshResult.data.access.token);
+          localStorage.setItem("accessToken", refreshResult?.data?.data?.access?.token);
           localStorage.setItem(
             "refreshToken",
-            refreshResult.data.refresh.token
+            refreshResult?.data?.data?.refresh?.token
           );
           localStorage.setItem(
             "refreshTokenExp",
-            refreshResult.data.refresh.expires
+            refreshResult.data?.data?.refresh.expires
           );
 
           // Retry the original request with the new token
@@ -65,7 +68,9 @@ export const baseQuery = async (args, api, extraOptions) => {
               return headers;
             },
           })(args, api, extraOptions);
-        }
+        }else{
+            console.log('refresh failed');
+          }
       } catch (err) {
         console.error("Failed to refresh token:", err);
         // Handle refresh failure (e.g., redirect to login)