@bjsdistribution/dms-client-return 0.0.57 → 0.0.59

package/package.json

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

package/src/OrderViewQueryHandler.tsx

@@ -0,0 +1,14 @@
+import React from 'react';
+import { useSearchParams } from 'react-router-dom';
+import OrderView from './components/order-view';
+import ReturnMainTable from './components/order-daily-overview';
+
+const OrderViewQueryHandler = () => {
+  const [searchParams] = useSearchParams(); // Access the query params
+  const orderId = searchParams.get('order'); // Get the 'order' param
+
+  // If 'order' query param is present, render OrderViewWrapper, otherwise redirect to home
+  return orderId ? <OrderView /> : <ReturnMainTable />;
+};
+
+export default OrderViewQueryHandler;

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) {
+    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-actions/actions/confirm-order/tables/NotesTable.tsx

@@ -56,7 +56,7 @@ function NotesTable() {
   });
   useEffect(() => {
     setNoteLoadingStore(true);
-    if (moduleIds) {
+    if (moduleIds && orderId) {
       setShouldPerformAction(true);
     }
     if (!NotesLoading && NotesData?.data) {

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

@@ -162,8 +162,8 @@ function useIsOnHoldOrder() {
   return useAtom(isOnHold);
 }
 //value
-const orderId = atom<any>([]);
-export const useOrderId = () => {
+const orderId = atom<any>(undefined);
+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>([]);
 
@@ -443,11 +439,6 @@ export function useApiCalling() {
   return useAtom(apiCalling);
 }
 
-const globalStateHitAuditLog = atom<boolean>(false);
-export function useGlobalStateHitAuditLog() {
-  return useAtom(globalStateHitAuditLog);
-}
-
 
 const liveRecalling = atom<boolean>(false);
 
@@ -463,10 +454,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;

package/src/index.tsx

@@ -1,13 +1,11 @@
 import React, { Suspense, useEffect } from 'react';
 import { Route, Routes, useSearchParams } from 'react-router-dom';
-import OrderView from './components/order-view';
 import ReturnTable from './components/order-daily-overview/return-order-table/ReturnTable';
 import ReturnAfterTable from './components/order-daily-overview/return-after-table/ReturnAfterTable';
 import {
   useSelectedAction,
   useSelectedClient,
 } from './components/order-daily-overview/store/store';
-import ReturnMainTable from './components/order-daily-overview';
 import { notification } from 'antd';
 import RouterHeader from './components/order-daily-overview/header/route-header/RouterHeader';
 import {
@@ -21,6 +19,8 @@ import {
 import { ApiResponse } from './components/types';
 import { useApiHook } from '@bjsdistribution/dms-component-library';
 import { useLocationOptions } from './components/order-view/store';
+import OrderViewQueryHandler from './OrderViewQueryHandler';
+import OrderView from './components/order-view';
 function ReturnClient() {
   notification.config({
     top: 80,
@@ -111,9 +111,10 @@ function ReturnClient() {
         <Routes>
           {/* for local */}
           {/* for dev */}
-          <Route path="" element={<ReturnMainTable />} />
+          <Route path="" element={<OrderViewQueryHandler />} />
           <Route path="overview" element={<ReturnAfterTable />} />
           <Route path="/:id" element={<OrderView />} />
+          
           <Route path="filter" element={<ReturnTable />} />
           {/* <Route
           path=""