@bjsdistribution/dms-client-return 0.1.19-dev → 0.1.21-dev

package/src/components/client-portal/ReturnRTFilters.tsx

@@ -10,15 +10,24 @@ import { ExportButton, useAxios } from '@bjsdistribution/dms-component-library';
 import { useParams } from 'react-router-dom';
 import { filtersReducerReturnAtom } from '../order-daily-overview/return-after-table/table-filters/ReturnFilterStore';
 import { notification } from 'antd';
-import { useSelectedClientPortOrders } from '../store';
+import {
+  useSelectedClientAfterOrders,
+  useSelectedClientPortOrders,
+} from '../store';
 
 const ReturnRTFilters = () => {
   const [returnData] = useReturnData();
   const [pendingState] = useAtom(filtersReducerAtom);
   const [state] = useAtom(filtersReducerReturnAtom);
   const [returnAfterOrder] = useReturnAfterOrderData();
-  const [selectedReturnOrder] = useSelectedClientPortOrders();
-
+  const [
+    selectedOrderIds,
+    setSelectedOrderIds,
+  ] = useSelectedClientAfterOrders();
+  const [
+    selectedPendingOrderIds,
+    setSelectedPendingOrderIds,
+  ] = useSelectedClientPortOrders();
   const { status } = useParams<{ status: any }>();
   const { 'x-filters': pendingFilters } = pendingState;
 
@@ -46,10 +55,13 @@ const ReturnRTFilters = () => {
       feature_name: 'return',
     };
   }
-  // console.log(selectedReturnOrder, 'selectedReturnOrder');
   //Export Manifest
-  const onlyIds = selectedReturnOrder?.map(item => item.id);
-  const isExportEnabled = onlyIds?.length > 0;
+  const isExportEnabled =
+    status === 'outstanding_return'
+      ? selectedPendingOrderIds?.length > 0
+      : status === 'scheduled_for_return' || status === 'return_completed'
+      ? selectedOrderIds?.length > 0
+      : false;
   const { fetchData: callExportApi } = useAxios<{
     data: any[];
     message: string;
@@ -58,12 +70,19 @@ const ReturnRTFilters = () => {
     method: 'POST',
   });
 
-  const handleExport = async () => {
+  const handleExportManifest = async () => {
     if (!isExportEnabled) return;
 
+    const exportOrderIds =
+      status === 'outstanding_return'
+        ? selectedPendingOrderIds
+        : status === 'scheduled_for_return' || status === 'return_completed'
+        ? selectedOrderIds
+        : [];
+
     try {
       const response = (await callExportApi({
-        payload: { order_ids: onlyIds },
+        payload: { order_ids: exportOrderIds },
       })) as {
         code: number | null;
         error?: string | null;
@@ -78,38 +97,16 @@ const ReturnRTFilters = () => {
           message: 'Success',
           description: response?.message || 'Export completed.',
         });
-
-        // setSelectedIds([]);
-        const resourceUrl = response.data.url;
-        const downloadResponse = await fetch(resourceUrl);
-
-        if (!downloadResponse.ok) {
-          throw new Error('Failed to fetch the export file.');
+        window.open(response?.data?.url, '_blank');
+
+        if (status === 'outstanding_return') {
+          setSelectedPendingOrderIds([]);
+        } else if (
+          status === 'scheduled_for_return' ||
+          status === 'return_completed'
+        ) {
+          setSelectedOrderIds([]);
         }
-
-        const blob = await downloadResponse.blob();
-
-        const urlObject = window.URL.createObjectURL(blob);
-        const link = document.createElement('a');
-        link.href = urlObject;
-
-        // You can customize the filename or extract it from headers
-        const contentDisposition = downloadResponse.headers.get(
-          'Content-Disposition'
-        );
-        const filenameMatch = contentDisposition?.match(/filename="?(.+)"?/);
-        const filename = filenameMatch?.[1] || 'download.csv';
-
-        link.download = filename;
-        document.body.appendChild(link);
-        link.click();
-        document.body.removeChild(link);
-        window.URL.revokeObjectURL(urlObject);
-
-        notification.success({
-          message: 'Downloaded',
-          description: 'File downloaded successfully.',
-        });
       } else {
         notification.error({
           message: 'No File URL',
@@ -122,13 +119,28 @@ const ReturnRTFilters = () => {
         message: 'Export Failed',
         description: 'Something went wrong during export.',
       });
+
+      if (status === 'outstanding_return') {
+        setSelectedPendingOrderIds([]);
+      } else if (
+        status === 'scheduled_for_return' ||
+        status === 'return_completed'
+      ) {
+        setSelectedOrderIds([]);
+      }
     }
   };
 
   return (
     <StyledBulkFilterCover className="dmsBulkFilter">
       <ExportButton moduleInfoModule={moduleInfo} />
-      <StyledBulkItem onClick={handleExport}>
+      <StyledBulkItem
+        onClick={handleExportManifest}
+        style={{
+          pointerEvents: isExportEnabled ? 'auto' : 'none',
+          opacity: isExportEnabled ? 1 : 0.5,
+        }}
+      >
         <Text>Export Manifest</Text>
       </StyledBulkItem>
     </StyledBulkFilterCover>
@@ -174,6 +186,11 @@ export const StyledBulkItem = styled.div`
       }
     }
   }
+  &:hover:not(:disabled) {
+    background: #f0f0f0;
+    cursor: pointer;
+  }
+
   @media screen and (max-width: 1030px) {
     padding: 6px 4px;
   }

package/src/components/client-portal/ReturnSearchBar.tsx

@@ -7,112 +7,52 @@ import React, { useEffect, useState } from 'react';
 import styled from 'styled-components';
 import {
   useAtom,
-  useClientPortal,
-  useEndDate,
+  useClientOutstandingReturnData,
   useSearchText,
-  useStartDate,
+  useStatsCPCount,
 } from '../store';
-import dayjs from 'dayjs';
 import { filtersReducerAtom } from '../order-daily-overview/header-filters/filterStore';
 import { ApiResponse } from '../types';
 import { javascriptStringDumpToJSON } from '../utils';
 import { UsePaginationData } from '../order-daily-overview/store/store';
 import { notification } from 'antd';
-import { useReturnData } from '../order-view/store';
-import { useParams } from 'react-router-dom';
+import { returnCountType } from './ReturnStatus';
+import { dateFilterCPReducer } from './DateFilterStore';
 
 function ReturnSearchBar() {
   const [searchText, setSearchText] = useState('');
   const [debouncedSearchText, setDebouncedSearchText] = useSearchText();
-  const [modifiedFilters, setModifiedFilters] = useState<any[]>([]);
-  const [, setReturnData] = useReturnData();
-  const { status } = useParams();
-  //condition on client view
-  const [clientPortal] = useClientPortal();
+  const [, setOutstandingData] = useClientOutstandingReturnData();
   const [, setPaginationObject] = UsePaginationData();
   const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     setSearchText(event.target.value);
   };
-  //CP
-  const [startDate] = useStartDate();
-  const [endDate] = useEndDate();
-  const [state] = useAtom(filtersReducerAtom);
-
-  const { 'x-pagination': pagination } = state;
-
-  useEffect(() => {
-    const isClientOutstanding = clientPortal && status === 'outstanding_return';
-    if (!isClientOutstanding) return;
-
-    setModifiedFilters([
-      { field: 'isdeleted', op: '=', value: 0 },
-      { field: 'product_return_action_id', op: '=', value: 'RTS' },
-    ]);
-  }, []);
-
-  useEffect(() => {
-    if (!clientPortal) return;
-
-    const stored = JSON.parse(localStorage.getItem('returnDate') || '{}');
-
-    const sDate = startDate?.isValid?.() ? startDate : dayjs(stored?.startDate);
-    const eDate = endDate?.isValid?.()
-      ? endDate
-      : stored?.endDate
-      ? dayjs(stored?.endDate)
-      : null;
-
-    if (!sDate?.isValid?.()) return;
-
-    let dateFilters = [];
-
-    if (eDate && eDate.isValid()) {
-      dateFilters = [
-        { field: 'created_at', op: '>=', value: sDate.format('YYYY-MM-DD') },
-        {
-          field: 'created_at',
-          op: '<=',
-          value: eDate.add(1, 'day').format('YYYY-MM-DD'),
-        },
-      ];
-    } else {
-      dateFilters = [
-        {
-          field: 'created_at',
-          op: '=',
-          value: sDate.format('YYYY-MM-DD'),
-        },
-      ];
-    }
-
-    const updatedFilters =
-      status === 'outstanding_return'
-        ? [
-            { field: 'isdeleted', op: '=', value: 0 },
-            { field: 'product_return_action_id', op: '=', value: 'RTS' },
-            ...dateFilters,
-          ]
-        : dateFilters;
-
-    setModifiedFilters(updatedFilters);
-  }, [startDate, endDate, status]);
-
-  const {
-    // loading,
-    paginationData,
-    fetchData: getPendingData,
-    // data: fetchedReturnOrderData,
-  } = useAxios<ApiResponse>({
+  const [state] = useAtom(dateFilterCPReducer);
+  const { 'x-filters': filters } = state;
+  const [statePagination] = useAtom(filtersReducerAtom);
+  const [, setCount] = useStatsCPCount();
+  const { 'x-pagination': pagination } = statePagination;
+
+  const baseFilters = [
+    { field: 'isdeleted', op: '=', value: 0 },
+    { field: 'product_return_action_id', op: '=', value: 'RTS' },
+  ];
+
+  const modifiedFilters = [...baseFilters, ...filters];
+  const { paginationData, fetchData: getPendingData } = useAxios<ApiResponse>({
     endpoint: '/v1/return/product/pending/',
     method: 'GET',
     filters: modifiedFilters,
     pagination: pagination,
   });
 
+  // Debouncing effect
   useEffect(() => {
-    if (debouncedSearchText.length > 1) {
+    const trimmedText = debouncedSearchText?.trim() || '';
+
+    if (trimmedText.length > 2) {
       getPendingData({
-        endPointQuery: `?search_term=${debouncedSearchText}`,
+        endPointQuery: `?search_term=${trimmedText}`,
       }).then((response: any) => {
         if (paginationData) {
           const formattedPagination = javascriptStringDumpToJSON(
@@ -123,22 +63,18 @@ function ReturnSearchBar() {
         }
 
         if (response?.data?.length > 0) {
-          setReturnData(response?.data);
+          setOutstandingData(response.data);
         } else {
-          setReturnData([]);
+          setOutstandingData([]);
         }
       });
-    } else if (
-      debouncedSearchText.length > 0 &&
-      debouncedSearchText.length <= 2
-    ) {
+    } else if (trimmedText.length > 0 && trimmedText.length <= 2) {
       notification.warning({
-        message: 'Search Phrase cannot be less than 3 characters',
+        message: 'Search phrase cannot be less than 2 characters',
       });
     }
-  }, [debouncedSearchText]);
+  }, [debouncedSearchText, JSON.stringify(modifiedFilters)]);
 
-  // Debouncing effect
   useEffect(() => {
     const handler = setTimeout(() => {
       setDebouncedSearchText(searchText);
@@ -149,14 +85,48 @@ function ReturnSearchBar() {
   }, [searchText]);
 
   useEffect(() => {
-    if (debouncedSearchText.length === 0) {
+    if (debouncedSearchText?.length === 0) {
       setSearchText('');
     }
   }, [debouncedSearchText]);
 
+  //
+  const { fetchData: fetchStatsData } = useAxios<{
+    data: returnCountType[];
+  }>({
+    endpoint: `v1/portal/return/stats/`,
+    method: 'GET',
+    pagination: { is_pagination: false },
+    filters: filters,
+  });
+
+  useEffect(() => {
+    const trimmedText = debouncedSearchText?.trim() || '';
+
+    if (trimmedText.length > 2) {
+      const fetchStats = async () => {
+        const response = await fetchStatsData({
+          endPointQuery: `?search_term=${trimmedText}&type=outstanding`,
+        });
+        //@ts-ignore
+        if (response?.data) {
+          //@ts-ignore
+          setCount(response?.data);
+        } else {
+          setCount(null);
+        }
+      };
+
+      fetchStats();
+    } else if (trimmedText.length > 0 && trimmedText.length <= 2) {
+      notification.warning({
+        message: 'Search phrase cannot be less than 3 characters',
+      });
+    }
+  }, [debouncedSearchText, JSON.stringify(modifiedFilters)]);
+
   const handleClear = () => {
     setSearchText('');
-    setDebouncedSearchText('');
   };
   return (
     <Search>

package/src/components/client-portal/ReturnStatus.tsx

@@ -3,19 +3,24 @@ import {
   device,
   useAxios,
 } from '@bjsdistribution/dms-component-library';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import styled from 'styled-components';
 import {
   useActiveCardId,
   useAtom,
   useClientPortal,
-  useEndDate,
-  useStartDate,
+  useSearchAfterText,
+  useSearchText,
+  useStatsCPCount,
 } from '../store';
 import { useNavigate, useParams } from 'react-router-dom';
-import { filtersReducerReturnAtom } from '../order-daily-overview/return-after-table/table-filters/ReturnFilterStore';
-import dayjs from 'dayjs';
-
+import { dateFilterCPReducer } from './DateFilterStore';
+// import dayjs from 'dayjs';
+export type returnCountType = {
+  outstanding_count: number | null;
+  scheduled_count: number;
+  completed_count: number;
+};
 const ReturnStatus = () => {
   //CP
   type returnCountType = {
@@ -24,64 +29,18 @@ const ReturnStatus = () => {
     completed_count: number;
   };
 
-  // const [count, setCount] = useState<returnCountType[] | undefined>();
   const [activeCardId, setActiveCardId] = useActiveCardId();
-  const [, dispatch] = useAtom(filtersReducerReturnAtom);
+  const [state, dispatch] = useAtom(dateFilterCPReducer);
+  const { 'x-filters': filters } = state;
   const { status } = useParams();
-  const [count, setCount] = useState<any>();
-  const [startDate] = useStartDate();
-  const [endDate] = useEndDate();
+  const navigate = useNavigate();
+  const [count, setCount] = useStatsCPCount();
   const [clientPortal] = useClientPortal();
-  const [modifiedFilters, setModifiedFilters] = useState<any[]>([]);
-
-  const getDateFilters = (
-    startDate: dayjs.Dayjs | null,
-    endDate: dayjs.Dayjs | null
-  ) => {
-    const stored = JSON.parse(localStorage.getItem('returnDate') || '{}');
-
-    const sDate = startDate?.isValid?.() ? startDate : dayjs(stored?.startDate);
-    const eDate = endDate?.isValid?.()
-      ? endDate
-      : stored?.endDate
-      ? dayjs(stored?.endDate)
-      : null;
-
-    if (!sDate?.isValid?.()) return [];
-
-    let dateFilters = [];
-
-    if (eDate && eDate.isValid()) {
-      dateFilters = [
-        { field: 'created_at', op: '>=', value: sDate.format('YYYY-MM-DD') },
-        {
-          field: 'created_at',
-          op: '<=',
-          value: eDate.add(1, 'day').format('YYYY-MM-DD'),
-        },
-      ];
-    } else {
-      dateFilters = [
-        {
-          field: 'created_at',
-          op: '=',
-          value: sDate.format('YYYY-MM-DD'),
-        },
-      ];
-    }
-
-    return dateFilters;
-  };
-
-  useEffect(() => {
-    if (!clientPortal) return;
-
-    const dateFilters = getDateFilters(startDate, endDate);
-    setModifiedFilters(dateFilters);
-  }, [startDate, endDate]);
-
-  //stats API
-
+  const [debouncedSearchText, setOutstandingSearch] = useSearchText();
+  const [
+    debouncedSearchAfterText,
+    setDebouncedSearchText,
+  ] = useSearchAfterText();
   const { data: statsData, loading: apiLoading, fetchData } = useAxios<{
     data: returnCountType[];
   }>({
@@ -89,12 +48,30 @@ const ReturnStatus = () => {
     method: 'GET',
     //@ts-ignore
     pagination: { is_pagination: false },
-    filters: modifiedFilters,
+    filters: filters,
   });
 
   useEffect(() => {
-    fetchData();
-  }, [startDate, endDate]);
+    if (
+      clientPortal &&
+      debouncedSearchText === '' &&
+      status == 'outstanding_return'
+    ) {
+      fetchData();
+    }
+  }, [debouncedSearchText, debouncedSearchAfterText, JSON.stringify(filters)]);
+
+  useEffect(() => {
+    if (
+      (clientPortal &&
+        debouncedSearchAfterText === '' &&
+        status == 'scheduled_for_return') ||
+      status == 'return_completed'
+    ) {
+      console.log('CALL');
+      fetchData();
+    }
+  }, [debouncedSearchAfterText, debouncedSearchText, JSON.stringify(filters)]);
 
   useEffect(() => {
     if (statsData && statsData?.data) {
@@ -108,31 +85,36 @@ const ReturnStatus = () => {
       id: 1,
       icon: 'outstanding_return',
       status: 'outstanding_return',
-      count: count?.outstanding_count || 0,
+      count: count?.outstanding_count,
       label: 'Outstanding Return',
     },
     {
       id: 2,
       icon: 'scheduled_for_return',
       status: 'scheduled_for_return',
-      count: count?.scheduled_count || 0,
+      count: count?.scheduled_count,
       label: 'Scheduled For Return',
     },
     {
       id: 3,
       icon: 'return_completed',
       status: 'return_completed',
-      count: count?.completed_count || 0,
+      count: count?.completed_count,
       label: 'Return Completed',
     },
   ];
-  const navigate = useNavigate();
+
   const handleCardClick = (item: any) => {
     if (activeCardId === item?.id) {
       return;
     }
     setActiveCardId(item?.id);
+    //for dev
     navigate(`/return/${item?.status}`);
+    //for local
+    //navigate(`/${item?.status}`);
+    setOutstandingSearch('');
+    setDebouncedSearchText('');
     if (item?.status == 'scheduled_for_return') {
       dispatch({
         type: 'SET_SCHEDULED_RETURN_FILTER',