@bjsdistribution/dms-client-return 0.1.16-prod → 0.1.17-prod

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

@@ -1,27 +1,21 @@
-import React from 'react';
+import React, { useState } from 'react';
 import styled from 'styled-components';
-import {
-  useAtom,
-  useReturnAfterOrderData,
-  useReturnData,
-} from '../order-view/store';
-import { filtersReducerAtom } from '../order-daily-overview/header-filters/filterStore';
-import { ExportButton, useAxios } from '@bjsdistribution/dms-component-library';
+import { useAtom } from '../order-view/store';
+import { 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 { filtersReducerReturnAtom } from '../order-daily-overview/return-after-table/table-filters/ReturnFilterStore';
+import { notification, Spin } from 'antd';
 import {
+  useClientOutstandingReturnData,
+  useReturnConfirmedOrderData,
   useSelectedClientAfterOrders,
   useSelectedClientPortOrders,
-  // useSelectedClientPortOrders,
 } from '../store';
+import { dateFilterCPReducer } from './DateFilterStore';
 
 const ReturnRTFilters = () => {
-  const [returnData] = useReturnData();
-  const [pendingState] = useAtom(filtersReducerAtom);
-  const [state] = useAtom(filtersReducerReturnAtom);
-  const [returnAfterOrder] = useReturnAfterOrderData();
-  // const [selectedReturnOrder] = useSelectedClientPortOrders();
+  const [outstandingReturnData] = useClientOutstandingReturnData();
+  const [returnConfirmedData] = useReturnConfirmedOrderData();
   const [
     selectedOrderIds,
     setSelectedOrderIds,
@@ -31,32 +25,102 @@ const ReturnRTFilters = () => {
     setSelectedPendingOrderIds,
   ] = useSelectedClientPortOrders();
   const { status } = useParams<{ status: any }>();
-  const { 'x-filters': pendingFilters } = pendingState;
-
-  let moduleInfo: any | null = null;
-  if (status === 'outstanding_return') {
-    moduleInfo = {
-      isExportedData: returnData?.length > 0,
-      moduleName: 'return',
-      filter: pendingFilters,
-      file_type: 'csv',
-      apiUrlEndPoint: `v1/return/product/pending/`,
-      reference: 'return_export',
-      feature_name: 'return',
-    };
-  } else if (['scheduled_for_return', 'return_completed'].includes(status)) {
-    const { 'x-filters': orderFilters } = state;
-
-    moduleInfo = {
-      isExportedData: returnAfterOrder?.length > 0,
-      moduleName: 'return',
-      filter: orderFilters,
-      file_type: 'csv',
-      apiUrlEndPoint: `v1/return/orders/`,
-      reference: 'return_overview_export',
-      feature_name: 'return',
-    };
-  }
+  const [spinLoading, setSpinLoading] = useState<boolean>(false);
+  const [state] = useAtom(dateFilterCPReducer);
+  const { 'x-filters': filters } = state;
+
+  //export csv
+  const { fetchData: callExportCSV } = useAxios<{
+    data: any[];
+    message: string;
+  }>({
+    endpoint: `/v1/export/generate/`,
+    method: 'POST',
+  });
+  const { fetchData: downloadFile } = useAxios({
+    endpoint: '/v1/export/download/',
+    method: 'POST',
+  });
+  const download: any = (response: any) => {
+    downloadFile({
+      endPointQuery: `${response?.data?.file_reference}`,
+    })
+      .then((response: any) => {
+        if (response?.data?.url) {
+          window.open(response?.data?.url, '_blank');
+        }
+        setSpinLoading(false);
+      })
+      .catch((err: any) => {
+        notification.error({
+          message: 'Failed to download file',
+          description: err,
+        });
+        setSpinLoading(false);
+      });
+  };
+
+  const handleExportCSV = () => {
+    let moduleInfo: any | null = null;
+    const url =
+      process.env.REACT_APP_API_PATH ||
+      'https://development.dmsbackend.bjshomedelivery.com';
+    if (status === 'outstanding_return') {
+      moduleInfo = {
+        isExportedData: outstandingReturnData?.length > 0,
+        file_type: 'csv',
+        moduleName: 'return',
+        filter: [
+          { field: 'isdeleted', op: '=', value: 0 },
+          { field: 'product_return_action_id', op: '=', value: 'RTS' },
+        ],
+        url: `${url}/v1/return/product/pending/`,
+        reference: 'return_outstanding_export',
+        feature_name: 'return',
+      };
+    } else if (['scheduled_for_return', 'return_completed'].includes(status)) {
+      moduleInfo = {
+        isExportedData: returnConfirmedData?.length > 0,
+        file_type: 'csv',
+        moduleName: 'return',
+        url: `${url}/v1/return/orders/`,
+
+        reference:
+          status === 'scheduled_for_return'
+            ? 'return_scheduled_export'
+            : 'return_completed_export',
+        feature_name: 'return',
+        filter: filters,
+      };
+    }
+
+    if (moduleInfo?.isExportedData) {
+      setSpinLoading(true);
+
+      callExportCSV({
+        payload: {
+          file_type: moduleInfo?.file_type,
+          url: moduleInfo?.url,
+          reference: moduleInfo?.reference,
+          feature_name: moduleInfo?.feature_name,
+          filter: moduleInfo?.filter,
+        },
+      })
+        .then((res: any) => {
+          setTimeout(() => download(res), 10000);
+        })
+        .catch(err => {
+          notification.error({
+            message: 'Failed to export csv',
+            description: err,
+          });
+          setSpinLoading(false);
+        });
+    } else {
+      notification.warning({ message: 'No data to Export' });
+    }
+  };
+
   //Export Manifest
   const isExportEnabled =
     status === 'outstanding_return'
@@ -135,7 +199,12 @@ const ReturnRTFilters = () => {
 
   return (
     <StyledBulkFilterCover className="dmsBulkFilter">
-      <ExportButton moduleInfoModule={moduleInfo} />
+      {/* <ExportButton moduleInfoModule={moduleInfo} /> */}
+      <ExportCSVButton type="left" onClick={handleExportCSV}>
+        <div className="label">
+          Export CSV <Spin spinning={spinLoading} />
+        </div>
+      </ExportCSVButton>
       <StyledBulkItem
         onClick={handleExportManifest}
         style={{
@@ -225,4 +294,32 @@ export const StyledBulkItem = styled.div`
     padding: 0;
   }
 `;
+
+export const ExportCSVButton = styled.div<{
+  type: 'left' | 'right' | 'middle';
+}>`
+  display: flex;
+  background: #fff;
+  min-height: 40px;
+  padding: 8px 12px;
+  align-items: center;
+  gap: 8px;
+  cursor: pointer;
+  border-radius: ${props =>
+    props?.type === 'left'
+      ? '50px 0px 0px 50px'
+      : props?.type === 'right'
+      ? ' 0px 50px 50px 0px'
+      : ''};
+  border-right: ${props => (props.type === 'right' ? '' : '1px solid #d0d5dd')};
+  .label {
+    color: #6a7378;
+    text-align: center;
+    font-family: Lato;
+    font-size: 14px;
+    font-style: normal;
+    font-weight: 500;
+    line-height: 18px;
+  }
+`;
 export default ReturnRTFilters;

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

@@ -8,163 +8,52 @@ import styled from 'styled-components';
 import {
   useAtom,
   useClientOutstandingReturnData,
-  useClientPortal,
-  useEndDate,
   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 { 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 [, setOutstandingData] = useClientOutstandingReturnData();
-  const { status } = useParams();
-  //condition on client view
-  const [clientPortal] = useClientPortal();
   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 [state] = useAtom(dateFilterCPReducer);
+  const { 'x-filters': filters } = state;
+  const [statePagination] = useAtom(filtersReducerAtom);
   const [, setCount] = useStatsCPCount();
-  const [modifiedStatsFilters, setModifiedStatsFilters] = useState<any[]>([]);
+  const { 'x-pagination': pagination } = statePagination;
 
-  const { 'x-pagination': pagination } = state;
+  const baseFilters = [
+    { field: 'isdeleted', op: '=', value: 0 },
+    { field: 'product_return_action_id', op: '=', value: 'RTS' },
+  ];
+  const cleanedFilters = filters.filter(f => f.field !== 'order_status');
 
-  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]);
-
-  //For stats
-
-  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);
-    setModifiedStatsFilters(dateFilters);
-  }, [startDate, endDate]);
-
-  const {
-    // loading,
-    paginationData,
-    fetchData: getPendingData,
-    // data: fetchedReturnOrderData,
-  } = useAxios<ApiResponse>({
+  const modifiedFilters = [...baseFilters, ...cleanedFilters];
+  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(
@@ -175,22 +64,18 @@ function ReturnSearchBar() {
         }
 
         if (response?.data?.length > 0) {
-          setOutstandingData(response?.data);
+          setOutstandingData(response.data);
         } else {
           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);
@@ -205,7 +90,6 @@ function ReturnSearchBar() {
       setSearchText('');
     }
   }, [debouncedSearchText]);
-
   //
   const { fetchData: fetchStatsData } = useAxios<{
     data: returnCountType[];
@@ -213,28 +97,33 @@ function ReturnSearchBar() {
     endpoint: `v1/portal/return/stats/`,
     method: 'GET',
     pagination: { is_pagination: false },
-    filters: modifiedStatsFilters,
+    filters: [...cleanedFilters],
   });
 
   useEffect(() => {
-    const isClientOutstanding = clientPortal && status === 'outstanding_return';
-    if (!isClientOutstanding || debouncedSearchText?.length < 3) return;
+    const trimmedText = debouncedSearchText?.trim() || '';
 
-    const fetchStats = async () => {
-      const response = await fetchStatsData({
-        endPointQuery: `?search_term=${debouncedSearchText}&type=outstanding`,
-      });
-      //@ts-ignore
-      if (response?.data) {
+    if (trimmedText.length > 2) {
+      const fetchStats = async () => {
+        const response = await fetchStatsData({
+          endPointQuery: `?search_term=${trimmedText}&type=outstanding`,
+        });
         //@ts-ignore
-        setCount(response?.data); // Set the count here
-      } else {
-        setCount(null); // fallback if no data
-      }
-    };
+        if (response?.data) {
+          //@ts-ignore
+          setCount(response?.data);
+        } else {
+          setCount(null);
+        }
+      };
 
-    fetchStats();
-  }, [debouncedSearchText, status, clientPortal]);
+      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('');

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

@@ -3,21 +3,19 @@ import {
   device,
   useAxios,
 } from '@bjsdistribution/dms-component-library';
-import React, { useEffect, useMemo, useRef } from 'react';
+import React, { useEffect } from 'react';
 import styled from 'styled-components';
 import {
   useActiveCardId,
   useAtom,
   useClientPortal,
-  useEndDate,
   useSearchAfterText,
   useSearchText,
-  useStartDate,
   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;
@@ -31,55 +29,21 @@ 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 navigate = useNavigate();
   const [count, setCount] = useStatsCPCount();
-  const [startDate] = useStartDate();
-  const [endDate] = useEndDate();
   const [clientPortal] = useClientPortal();
-  const [debouncedSearchText] = useSearchText();
-  const [debouncedSearchAfterText] = useSearchAfterText();
-
-  //stats API
-  const filters = useMemo(() => {
-    if (!clientPortal) return [];
-
-    const stored = JSON.parse(localStorage.getItem('returnDate') || '{}');
+  const [debouncedSearchText, setOutstandingSearch] = useSearchText();
 
-    const sDate = startDate?.isValid?.() ? startDate : dayjs(stored?.startDate);
-    const eDate = endDate?.isValid?.()
-      ? endDate
-      : stored?.endDate
-      ? dayjs(stored?.endDate)
-      : null;
+  const cleanedFilters = filters.filter(f => f.field !== 'order_status');
 
-    if (!sDate?.isValid?.()) return [];
-
-    let dateFilters: any[] = [];
-
-    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];
-  }, [startDate, endDate, status]);
+  const [
+    debouncedSearchAfterText,
+    setDebouncedSearchText,
+  ] = useSearchAfterText();
   const { data: statsData, loading: apiLoading, fetchData } = useAxios<{
     data: returnCountType[];
   }>({
@@ -87,31 +51,29 @@ const ReturnStatus = () => {
     method: 'GET',
     //@ts-ignore
     pagination: { is_pagination: false },
-    filters: filters,
+    filters: cleanedFilters,
   });
 
-  const prevSearchTextRef = useRef('');
-  const prevSearchAfterTextRef = useRef('');
-
   useEffect(() => {
-    const prev = prevSearchTextRef.current;
-    if (clientPortal && prev && debouncedSearchText === '') {
+    if (
+      clientPortal &&
+      debouncedSearchText === '' &&
+      status == 'outstanding_return'
+    ) {
       fetchData();
     }
-    prevSearchTextRef.current = debouncedSearchText;
-  }, [debouncedSearchText, startDate, endDate]);
+  }, [debouncedSearchText, debouncedSearchAfterText, JSON.stringify(filters)]);
 
   useEffect(() => {
-    const prev = prevSearchAfterTextRef.current;
-    if (clientPortal && prev && debouncedSearchAfterText === '') {
+    if (
+      (clientPortal &&
+        debouncedSearchAfterText === '' &&
+        status == 'scheduled_for_return') ||
+      status == 'return_completed'
+    ) {
       fetchData();
     }
-    prevSearchAfterTextRef.current = debouncedSearchAfterText;
-  }, [debouncedSearchAfterText, startDate, endDate]);
-
-  useEffect(() => {
-    fetchData();
-  }, [startDate, endDate]);
+  }, [debouncedSearchAfterText, debouncedSearchText, JSON.stringify(filters)]);
 
   useEffect(() => {
     if (statsData && statsData?.data) {
@@ -143,15 +105,17 @@ const ReturnStatus = () => {
       label: 'Return Completed',
     },
   ];
-  const navigate = useNavigate();
-  const [, setDebouncedSearchText] = useSearchAfterText();
 
   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({