@bjsdistribution/dms-client-return 0.0.58 → 0.0.60

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.58",
+  "version": "0.0.60",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/order-daily-overview/header-filters/SelectionFilter.tsx

@@ -168,7 +168,8 @@ function SelectionFilter() {
       if (!currentSearch.includes('filter')) {
         console.log('inside include');
         // for dev
-        navigate(`filter?${queryParams.toString()}`);
+        //navigate(`filter?${queryParams.toString()}`);
+        navigate(`/orders/view/return/filter?${queryParams.toString()}`);
 
         // for local
         //navigate(`/filter?${queryParams.toString()}`);
@@ -272,7 +273,7 @@ function SelectionFilter() {
   useEffect(() => {
     if (clearState) {
       dispatch({ type: 'CLEAR_CLIENT' });
-      window.location.href = '/order/return';
+      window.location.href = '/orders/view/return/';
     }
   }, [clearState]);
 

package/src/components/order-daily-overview/store/store.ts

@@ -41,7 +41,7 @@ export const useStatsLoading = () => {
   return useAtom(loading);
 };
 
-//this
+//order return page
 const loadingState = atom<boolean>(false);
 export const useLoading = () => {
   return useAtom(loadingState);

package/src/components/order-daily-overview/table/ReturnTable.tsx

@@ -138,7 +138,8 @@ const ReturnTable: React.FC = () => {
       customerId: customerId?.toString(),
     });
     //for dev
-    navigate(`filter?${queryParams.toString()}`);
+    //navigate(`filter?${queryParams.toString()}`);
+    navigate(`/orders/view/return/filter?${queryParams.toString()}`);
 
     //for local
     //navigate(`/filter?${queryParams.toString()}`);
@@ -167,7 +168,8 @@ const ReturnTable: React.FC = () => {
       type: RTS,
     });
     //for dev
-    navigate(`filter?${queryParams.toString()}`);
+    //navigate(`filter?${queryParams.toString()}`);
+    navigate(`/orders/view/return/filter?${queryParams.toString()}`);
 
     //for local
     //navigate(`/filter?${queryParams.toString()}`);
@@ -176,7 +178,7 @@ const ReturnTable: React.FC = () => {
   return (
     <>
       {statsLoading && <Loader />}
-      <StyledTableWrapper id="tableScrolling">
+      <StyledTableWrapper>
         <StyledTable>
           <thead>
             <tr>

package/src/components/order-view/hooks/useUpdateOrder.ts

@@ -1,10 +1,12 @@
 import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
 import { getCookie } from '../utils';
 import { notification } from 'antd';
+import { useUpdateApiCall } from '../store';
 
 function useUpdateOrder() {
   let controller: AbortController;
   const ssoToken = getCookie('id_token');
+  const [, setCallApi] = useUpdateApiCall(); //single detail
 
   const update = async (data: any) => {
     const endpoint = `${getBaseEndpoint()}/orders/update/`;
@@ -38,6 +40,7 @@ function useUpdateOrder() {
         message: 'Success',
         description: 'Order has been updated.',
       });
+      setCallApi(true);
       return json;
     } catch (err) {
       //   setLoading(false);

package/src/components/order-view/index.tsx

@@ -58,7 +58,6 @@ function OrderView() {
   const [, setDepotOptions] = useDepotOptions();
   const [, setCustomerInfo] = useCustomerInfo();
   const [, setLocationOptions] = useLocationOptions();
-
   const [orderResources, setOrderResources] = useOrderProductsResources();
   const [orderToolbox, setOrderToolbox] = useOrderProductsToolbox();
   const [GsitCUstomerId, setGsitCUstomerId] = useGsitCUstomerId();

package/src/components/order-view/modalsPopup/DeleteProduct.tsx

@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react';
 import { useDeleteProdsID, useProductDetails } from '../store';
+import { Empty, Skeleton } from 'antd';
 import {
   EmptyDataContainer,
   StyledTable,
   StyledTableWrapper,
-} from '../all-reminder/table-view/ReminderStyles';
-import { Empty, Skeleton } from 'antd';
+} from '../order-actions/actions/confirm-order/tables/ReminderStyles';
 
 const DeleteProduct = () => {
   const [productdata] = useProductDetails();

package/src/components/order-view/notes/AddNote.tsx

@@ -9,7 +9,7 @@ import styled from 'styled-components';
 import { getBaseEndpoint } from '@bjsdistribution/dms-component-library';
 import { getCookie } from '../utils';
 import { useLocation } from 'react-router-dom';
-import { usemoduleIds, UseNotesLoading, useOrderId } from '../store';
+import { useGlobalStateHitAuditLog, usemoduleIds, useOrderId } from '../store';
 import { notification } from 'antd';
 
 function AddNote() {
@@ -22,8 +22,8 @@ function AddNote() {
 
   const ssoToken = getCookie('id_token');
   const [moduleIds] = usemoduleIds();
+  const [, setRecallAuditLog] = useGlobalStateHitAuditLog();
 
-  const [NoteLoadingStore, setNoteLoadingStore] = UseNotesLoading();
 
   // Save New Note
 
@@ -34,6 +34,7 @@ function AddNote() {
   } | null>(null);
 
   const saveNote = async () => {
+    setRecallAuditLog(false);
     if (!noteText) return;
     const endpoint = `${getBaseEndpoint()}/audit_logs/orders/`;
     const payload = {
@@ -63,30 +64,23 @@ function AddNote() {
 
       // setNoteLoadingStore(false);
 
-      const { message, error }: any = response;
-      if (response) {
-        setNotificationData({
-          type: 'success',
+      if (response.ok) {
+        notification.success({
           message: 'Success',
-          description: message || 'Successfully Created Note.',
+          description: 'Note saved successfully.',
         });
-        setNoteLoadingStore(!NoteLoadingStore);
         setNoteText('');
-      } else if (error) {
-        // Error: Set error notification
-        setNotificationData({
-          type: 'error',
+        setRecallAuditLog(true);
+      } else {
+        notification.error({
           message: 'Error',
-          description: error || 'Something went wrong. Please try again.',
+          description: 'Failed to save note.',
         });
       }
     } catch (error) {
-      // console.error('Error saving note:', error);
-      // alert('Failed to save note');
       notification.error({
         message: 'Error',
-        description:
-          `${error}` || 'An error has occurred. Please try again later.',
+        description: 'Failed to save note due to an error.',
       });
     }
   };

package/src/components/order-view/notes/index.tsx

@@ -4,24 +4,27 @@ import AddNote from './AddNote';
 import AuditLogs from './logs';
 import { useApiHook } from '@bjsdistribution/dms-component-library';
 import {
-  SeteauditLogToggle,
+  useAuditLogLoadingState,
   // useCallAPi,
   usegetNotes,
+  useGlobalStateHitAuditLog,
   usemoduleIds,
-  UseNotesLoading,
   useOrderId,
 } from '../store';
-import { useLocation } from 'react-router-dom';
+// import { useLocation } from 'react-router-dom';
 function Notes() {
   const [moduleIds, setModuleIds] = usemoduleIds();
   const [orderId] = useOrderId();
-  const location = useLocation();
-  const pathname = location.pathname;
-  const orderIdLocaation = pathname.split('/')[1];
-  const [apiBaseLoading] = UseNotesLoading();
+  // const location = useLocation();
+  // const pathname = location.pathname;
+  // const orderIdLocaation = pathname.split('/')[1];
+
+  const[recallAuditLog]  = useGlobalStateHitAuditLog()
+
+  const [,setAuditLogLoading] = useAuditLogLoadingState()
+
   const [, setNotes] = usegetNotes();
   // const [loderStatus] = useCallAPi();
-  const [auditState] = SeteauditLogToggle();
 
   // Fetch module IDs
   const { data: fetchedData, loading: apiLoading } = useApiHook<{ data: any }>({
@@ -58,15 +61,14 @@ function Notes() {
   } = useApiHook<{ data: any }>({
     endpoint: `audit_logs/?module_id=${
       moduleIds?.parentId
-    }&module_object_id=${orderId || orderIdLocaation}`,
+    }&module_object_id=${orderId}`,
     method: 'GET',
     performAction: false,
   });
 
   useEffect(() => {
-    let combinedArray = [];
-
-    if (moduleIds && orderId) {
+    if (moduleIds && orderId ) {
+     
       setShouldPerformAction(true);
     }
     if (!NotesLoading && NotesData?.data) {
@@ -75,14 +77,21 @@ function Notes() {
         .map((item: any) => [item['ORDER-NOTE'], item['ORDER']])
         .flat()
         .filter(Boolean);
-      combinedArray = updatedData.flat();
+
+      // const orderData = NotesData?.data[0]?.ORDER || [];
+      // const orderNotesData = NotesData?.data[1]?.['ORDER-NOTE'] || [];
+      // const allNotes = [...orderData, ...orderNotesData];
+      const combinedArray = updatedData.flat();
       combinedArray.sort(
         (a: any, b: any) =>
           new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
       );
+      setNotes(combinedArray);
+      recallAuditLog ?   setShouldPerformAction(true) : setShouldPerformAction(false)
+     
     }
-    setNotes({ data: combinedArray, loading: NotesLoading });
-  }, [moduleIds, NotesLoading, auditState, apiBaseLoading]);
+    setAuditLogLoading(NotesLoading)
+  }, [moduleIds,orderId,NotesLoading,recallAuditLog]);
 
   return (
     <Container>

package/src/components/order-view/order-details/expanded-content/footer/index.tsx

@@ -9,7 +9,7 @@ import {
   errorAtom,
   useCustomerInfo,
   // useLogsCallAPi,
-  useApiCalling,
+  useUpdateApiCall,
   // UseNotesLoading,
 } from '../../../store';
 import useUpdateOrder from '../../../hooks/useUpdateOrder';
@@ -23,7 +23,7 @@ function OrderDetailsFooter() {
   const updateOrder = useUpdateOrder();
   const [errorState] = useAtom(errorAtom);
   // const [, setLogsCallAPi] = useLogsCallAPi();
-  const [, setCallApi] = useApiCalling(); //single detail
+  const [, setCallApi] = useUpdateApiCall(); //single detail
   // const [, setNoteLoadingStore] = UseNotesLoading();
 
   const errorFound = () => {
@@ -78,12 +78,10 @@ function OrderDetailsFooter() {
   };
 
   const onSave = async () => {
-    setCallApi(true);
     const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
     const response = await updateOrder([payload]);
-
+    setCallApi(false);
     // setLogsCallAPi(prev => !prev);
-
     if (response && response?.data?.length > 0) {
       setOrderDetails(response?.data[0]);
       setPrevOrderDetails(response?.data[0]);

package/src/components/order-view/products-info/expanded-content/index.tsx

@@ -81,7 +81,8 @@ function ExpandedContent() {
 
     //@ts-ignore
     if (response?.code === 200 && newId) {
-      navigate(`details/${newId}`);
+      // suggested by rahul
+      navigate(`${newId}`);
       setSelectedProducts([]);
     }
   }, [response, newId, navigate, setSelectedProducts]);

package/src/components/order-view/store.ts

@@ -163,7 +163,7 @@ function useIsOnHoldOrder() {
 }
 //value
 const orderId = atom<any>(undefined);
-export const useOrderId = () => {
+export const useOrderId = () => { //dddddddddddd
   return useAtom(orderId);
 };
 
@@ -366,10 +366,6 @@ export {
   useClientData,
 };
 
-const NotesLoading = atom<boolean>(true);
-export const UseNotesLoading = () => {
-  return useAtom(NotesLoading);
-};
 
 const notes = atom<any>([]);
 
@@ -437,15 +433,10 @@ const returnDataAtom = atom<any[]>([]);
 export function useReturnData() {
   return useAtom(returnDataAtom);
 }
-const apiCalling = atom<boolean>(false);
-
-export function useApiCalling() {
-  return useAtom(apiCalling);
-}
+const apiUpdateCalling = atom<boolean>(false);
 
-const globalStateHitAuditLog = atom<boolean>(false);
-export function useGlobalStateHitAuditLog() {
-  return useAtom(globalStateHitAuditLog);
+export function useUpdateApiCall() {
+  return useAtom(apiUpdateCalling);
 }
 
 
@@ -455,6 +446,14 @@ const liveRecalling = atom<boolean>(false);
 export function useLiveRecalling() {
   return useAtom(liveRecalling);
 }
+
+//delete products
+const onDeleteProduct = atom<boolean>(false);
+
+export function useDeleteRecall() {
+  return useAtom(onDeleteProduct);
+}
+
 export const selectedTabKeyAtom = atom<string>('1');
 export const letselectedProductIdAtom = atom<number | null>(null);
 
@@ -463,10 +462,19 @@ export const letselectedProductIdAtom = atom<number | null>(null);
 //   return useAtom(BulkUPdateDisabledState);
 // };
 
-const auditLogToggle = atom<boolean>(true);
-export const SeteauditLogToggle = () => {
-  return useAtom(auditLogToggle);
-};
+
+const auditLogLoadingState = atom<boolean>(true);
+export function useAuditLogLoadingState() {
+  return useAtom(auditLogLoadingState);
+}
+
+
+const globalStateHitAuditLog = atom<boolean>(false);
+export function useGlobalStateHitAuditLog() {
+  return useAtom(globalStateHitAuditLog);
+}
+
+
 
 // Popup state Manage
 const initialState = null;
@@ -482,12 +490,10 @@ const popupReducer = (state: any, action: any) => {
   } else if (action.type === 'addProduct') {
     state = 'addProduct';
     return { state };
-  }
-  else if (action.type === 'split-order') {
+  } else if (action.type === 'split-order') {
     state = 'split-order';
     return { state };
-  }  
-  else if (action.type === 'deleteProduct') {
+  } else if (action.type === 'deleteProduct') {
     state = 'deleteProduct';
     return { state };
   } else if (action.type === 'defectsModal') {

package/src/index.tsx

@@ -5,6 +5,7 @@ import ReturnAfterTable from './components/order-daily-overview/return-after-tab
 import {
   useSelectedAction,
   useSelectedClient,
+  useSelectedLocation,
 } from './components/order-daily-overview/store/store';
 import { notification } from 'antd';
 import RouterHeader from './components/order-daily-overview/header/route-header/RouterHeader';
@@ -36,6 +37,7 @@ function ReturnClient() {
   const [, setSelectedFilterValue] = useSelectedAction();
   const [, setSelectedClient] = useSelectedClient();
   const [searchParams] = useSearchParams();
+  const [, setSelectedLocationValue] = useSelectedLocation();
   const splitPath = (str: any) => {
     const parts = str?.split('/')?.filter((part: any) => part !== ''); // Filter out empty parts
     return parts;
@@ -47,6 +49,7 @@ function ReturnClient() {
       setLocationOptions([]);
       setSelectedClient(null);
       setSelectedFilterValue(null);
+      setSelectedLocationValue(null);
     }
   }, [location.pathname, searchParams]);
   // useEffect(() => {
@@ -114,7 +117,7 @@ function ReturnClient() {
           <Route path="" element={<OrderViewQueryHandler />} />
           <Route path="overview" element={<ReturnAfterTable />} />
           <Route path="/:id" element={<OrderView />} />
-          
+
           <Route path="filter" element={<ReturnTable />} />
           {/* <Route
           path=""
@@ -131,4 +134,4 @@ function ReturnClient() {
     </>
   );
 }
-export default ReturnClient;
+export default ReturnClient;