fixed filter bug

src/features/api/requestApiSlice.ts

@@ -39,6 +39,10 @@ export const requestApiSlice = apiSlice.injectEndpoints({
                 body: initialReq,
             }),
             invalidatesTags: ["requests"],
+        }),
+        resendRequest: builder.query({
+            query: (reqId) => `requests/resent?id=${reqId}`,
+            providesTags: ['requests']
         })
     })
 })
@@ -46,4 +50,5 @@ export const requestApiSlice = apiSlice.injectEndpoints({
 export const {
     useAddNewRequestMutation,
     useGetRequestsQuery,
+    useResendRequestQuery
 } = requestApiSlice;
\ No newline at end of file

src/pages/RequestPage/RequestPage.tsx

@@ -8,9 +8,9 @@ import { useGetRequestsQuery } from '../../features/api/requestApiSlice';
 import { setCurrentPage, setTotalReqNumber } from '../../features/pagination/reqPagination';
 import { TableRef } from 'antd/es/table';
 import './RequestPage.css';
-
 dayjs.extend(isBetween);
-const dateFormat = 'DD/MM/YYYY';
+
+const dateFormat = 'YYYY-MM-DD';
 
 const RequestPage: React.FC = () => {
     const dispatch = useDispatch();
@@ -19,8 +19,8 @@ const RequestPage: React.FC = () => {
     const currentPage = useSelector((state: any) => state.reqPagination.currentPage);
     const REQ_NUMBER_PER_PAGE = useSelector((state: any) => state.reqPagination.REQ_NUMBER_PER_PAGE);
 
-    const [startDate, setStartDate] = useState<Dayjs | null>(null);
-    const [endDate, setEndDate] = useState<Dayjs | null>(null);
+    const [startDate, setStartDate] = useState<Dayjs>(dayjs('2024/01/01', dateFormat));
+    const [endDate, setEndDate] = useState<Dayjs>(dayjs('2024/12/31', dateFormat));
     const [data, setData] = useState<DataType[]>([]);
     const [method, setMethod] = useState('');
 
@@ -40,11 +40,11 @@ const RequestPage: React.FC = () => {
 
     const applyFilters = () => {
         let filtered = reqs.list;
-    
+        const adjustedStartDate = dayjs(startDate).subtract(1, 'day');
         if (startDate && endDate) {
             filtered = filtered.filter((req) => {
                 const sendDate = dayjs(req.sendDate, dateFormat);
-                return sendDate.isBetween(startDate, endDate, 'day', '[]');
+                return sendDate.isBetween(adjustedStartDate, endDate, 'second', '[]');
             });
         }
         
@@ -57,11 +57,11 @@ const RequestPage: React.FC = () => {
         dispatch(setTotalReqNumber(filtered.length));
     }
 
-    const onSelectStartDate = (date: Dayjs | null) => {
+    const onSelectStartDate = (date: Dayjs) => {
         setStartDate(date);
     }
 
-    const onSelectEndDate = (date: Dayjs | null) => {
+    const onSelectEndDate = (date: Dayjs) => {
         setEndDate(date);
     }
 
@@ -101,7 +101,6 @@ const RequestPage: React.FC = () => {
             ref={tableRef}
         />;
     } else if (isError) {   
-        console.log(error);
         table = <div>{error.toString()}</div>;
     }
 
@@ -124,7 +123,7 @@ const RequestPage: React.FC = () => {
                             format={dateFormat} 
                             defaultValue={startDate}
                             value={startDate}
-                            style={{ marginRight: 14 }} 
+                            style={{ marginRight: 14 }}
                         />
                         <DatePicker 
                             onChange={onSelectEndDate}