@bjsdistribution/dms-client-return 0.0.84 → 0.0.85

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.84",
+  "version": "0.0.85",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -59,7 +59,7 @@
     "testEnvironment": "jest-environment-jsdom-sixteen"
   },
   "devDependencies": {
-    "@bjsdistribution/dms-component-library": "0.1.58",
+    "@bjsdistribution/dms-component-library": "0.1.78",
     "@size-limit/preset-small-lib": "^11.0.1",
     "@tippyjs/react": "^4.2.6",
     "@types/react": "^18.2.47",

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

@@ -26,6 +26,8 @@ import {
   useGsitOrderId,
   useOrderProductId,
   useLiveRecalling,
+  useGlobalStateHitOrder,
+  useAtom,
 } from './store';
 import { OrdersType } from './types';
 import { useLocation } from 'react-router-dom';
@@ -36,6 +38,7 @@ import DetailsFilters from './details-filters/DetailsFilters';
 import { useSubContracterData, useVisibilityData } from '../store';
 import Notification from './notification';
 import Order from './order-resources/expanded-content';
+import { setResourcesCall } from './order-actions/store';
 
 interface ApiResponse {
   message: string;
@@ -71,6 +74,7 @@ function OrderView() {
   const systemLogsData = useSystemLogs();
   const [, setVisibilityData] = useVisibilityData();
   const [, setSubContracterData] = useSubContracterData();
+  const [recallOrders] = useGlobalStateHitOrder();
 
   // query param
   const location = useLocation();
@@ -167,10 +171,10 @@ function OrderView() {
   });
   useEffect(() => {
     if (orderId) {
-      orderUpdate(true);
+      orderUpdate(recallOrders);
       liveRecalling ? setLivePerformAction(false) : setLivePerformAction(true);
     }
-  }, [orderId, liveRecalling]);
+  }, [orderId, liveRecalling, recallOrders]);
 
   useEffect(() => {
     setLoading(staticDataLoading);
@@ -222,6 +226,8 @@ function OrderView() {
     };
   }, [statusDataLoading, fetchedStatusData]);
 
+  const [getResources] = useAtom(setResourcesCall);
+
   useEffect(() => {
     setLoading(depotDataLoading);
     if (fetchedDepotData && fetchedDepotData.data) {
@@ -255,6 +261,19 @@ function OrderView() {
     performAction: false,
   });
 
+  useEffect(() => {
+    if (orderId) {
+      if (getResources) {
+        setActions(false);
+        setTimeout(() => {
+          setActions(true);
+        }, 200);
+      } else {
+        setActions(true);
+      }
+    }
+  }, [orderId, setActions, getResources]);
+
   useEffect(() => {
     if (orderId) {
       setActions(true);

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

@@ -9,6 +9,7 @@ import { useApiHook } from '@bjsdistribution/dms-component-library';
 import {
   useCurrentAction,
   useCustomerInfo,
+  useGlobalStateHitOrder,
   useLiveRecalling,
   useOrderDetails,
   useOrderId,
@@ -19,8 +20,7 @@ import {
   useErrorConfirmOrder,
   useOrderDetailsConfirmOrder,
 } from '../../store';
-import { ApiResponse, OrdersType } from '../../../types';
-import { useLoading } from '../../../../order-daily-overview/store/store';
+import { ApiResponse } from '../../../types';
 import { notification } from 'antd';
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
 import useUpdateOrder from '../../../hooks/useUpdateOrder';
@@ -35,14 +35,14 @@ function ConfirmOrder() {
     orderDetailsConfirmOrder,
     setOrderDetailsConfirmOrder,
   ] = useOrderDetailsConfirmOrder();
-  const [, setLoading] = useLoading();
   const [customerInfo] = useCustomerInfo();
   const infoText = `${customerInfo?.recipient_name}, ${customerInfo?.postcode}`;
   const [deliveryDate, setDeliveryDate] = useConfirmOrderDate();
-  const [liveRecalling, setRecalling] = useLiveRecalling();
+  const [, setRecalling] = useLiveRecalling();
   const [orderId] = useOrderId();
   const [errorState] = useErrorConfirmOrder();
   const updateOrder = useUpdateOrder();
+  const [, setRecallOrders] = useGlobalStateHitOrder();
 
   const onClose = () => {
     setCurrentAction(undefined);
@@ -69,30 +69,6 @@ function ConfirmOrder() {
     performAction: false,
   });
 
-  const { data: fetchedData, loading, setShouldPerformAction } = useApiHook<{
-    data: OrdersType[];
-  }>({
-    endpoint: `orders/${orderId}`,
-    method: 'GET',
-    performAction: false,
-  });
-
-  useEffect(() => {
-    setLoading(loading);
-    if (fetchedData && fetchedData.data) {
-      const requiredData = fetchedData?.data;
-      setOrderDetails(requiredData[0]);
-      setPrevOrderDetails(requiredData[0]);
-      setCurrentAction(undefined);
-    }
-    if (
-      (fetchedData && fetchedData?.data === null) ||
-      fetchedData?.data?.length === 0
-    ) {
-      setCurrentAction(undefined);
-    }
-  }, [loading, liveRecalling]);
-
   useEffect(() => {
     if (response) {
       //@ts-ignore
@@ -102,14 +78,11 @@ function ConfirmOrder() {
           // @ts-ignore
           description: response?.message || 'Order confirmed successfully',
         });
-        setShouldPerformAction(true);
         setRecalling(true);
         setTimeout(() => {
           setRecalling(false);
         }, 2000);
       } else {
-        setShouldPerformAction(false);
-
         notification.error({
           message: 'Error',
           description:
@@ -128,6 +101,7 @@ function ConfirmOrder() {
 
   const ConfirmOrder = async () => {
     setRecalling(false);
+    setRecallOrders(false);
 
     const keysToRemovefromOrders = [
       'order_locked',
@@ -159,6 +133,7 @@ function ConfirmOrder() {
       if (response && response?.data?.length > 0) {
         setOrderDetails(response?.data[0]);
         setPrevOrderDetails(response?.data[0]);
+        setRecallOrders(true);
       } else {
         setOrderDetails(prevOrderDetails);
       }

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

@@ -4,13 +4,21 @@ import {
 } from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
-import { useCurrentAction, useOrderDetails } from '../../../store';
+import {
+  useCurrentAction,
+  useGlobalStateHitAuditLog,
+  useGlobalStateHitOrder,
+  useOrderDetails,
+} from '../../../store';
 import useUpdateOrder from '../../../hooks/useUpdateOrder';
 
 function OrderLock() {
   const [, setCurrentAction] = useCurrentAction();
   const [orderDetails, setOrderdetails] = useOrderDetails();
   const lockOrder = useUpdateOrder();
+  const [, setRecallOrders] = useGlobalStateHitOrder();
+  const [, setRecallAuditLog] = useGlobalStateHitAuditLog();
+
   const title =
     orderDetails?.order_locked === true ? 'Unlocking Order' : 'Locking Order';
   const action = orderDetails?.order_locked === true ? 'Unlock' : 'Lock';
@@ -20,12 +28,16 @@ function OrderLock() {
   };
 
   const onComplete = async () => {
+    setRecallOrders(false);
     const isLocked =
       orderDetails?.order_locked === null ? false : orderDetails?.order_locked;
     const payload = [{ id: orderDetails?.id, order_locked: !isLocked }];
     const response = await lockOrder(payload);
     if (response.data) {
       setOrderdetails(response.data[0]);
+      setOrderdetails(response?.data[0]);
+      setRecallAuditLog(true);
+      setRecallOrders(true);
     }
     onClose();
   };

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import OrderActionModal from '../../../../../common/modals/order-action-modal/OrderActionModal';
 import styled from 'styled-components';
 import SplitOrderTable from './SplitOrderTable';
@@ -37,28 +37,23 @@ function SplitOrder() {
   const onSubmitSplitOrder = () => {
     if (orderId) {
       setPerformAction(true);
-      //@ts-ignore
-      if (response?.data && response?.code === 200) {
-        notification.success({
-          message: 'Success',
-          description:
-            //@ts-ignore
-            response?.message || 'Sucess',
-        });
-      } else {
-        // alert(response?.error_traceback);
-        notification.error({
-          message: 'Error',
-          description:
-            //@ts-ignore
-            response?.message ||
-            'An error has occurred. Please try again later.',
-        });
-      }
-      setSelectedSplit([]);
     }
   };
 
+  useEffect(() => {
+    //@ts-ignore
+    if (response?.code === 200) {
+      notification.success({
+        message: 'Success',
+        description:
+          //@ts-ignore
+          response?.message || 'Sucess',
+      });
+      setCurrentAction(undefined);
+      setSelectedSplit([]);
+    }
+  }, [response]);
+
   const isSubmitDisabled = () => {
     if (seledtedSplitOrder?.length > 0) {
       return !seledtedSplitOrder;

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

@@ -11,6 +11,7 @@ import {
   useUpdateApiCall,
   useLiveRecalling,
   useGlobalStateHitAuditLog,
+  useGlobalStateHitOrder,
 } from '../../../store';
 import useUpdateOrder from '../../../hooks/useUpdateOrder';
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
@@ -25,6 +26,8 @@ function OrderDetailsFooter() {
   const [, setCallApi] = useUpdateApiCall(); //single detail
   const [, setRecalling] = useLiveRecalling();
   const [, setRecallAuditLog] = useGlobalStateHitAuditLog();
+  const [, setRecallOrders] = useGlobalStateHitOrder();
+
   const errorFound = () => {
     const isError =
       errorState?.w3wError.length > 0 ||
@@ -77,9 +80,12 @@ function OrderDetailsFooter() {
   };
 
   const onSave = async () => {
+    setRecallAuditLog(false);
+    setRecallOrders(false);
     const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
     const response = await updateOrder([payload]);
     setCallApi(false);
+    setRecallOrders(true);
     // setLogsCallAPi(prev => !prev);
     if (response && response?.data?.length > 0) {
       setOrderDetails(response?.data[0]);

package/src/components/order-view/order-details/expanded-content/orders-section/Depot.tsx

@@ -21,7 +21,7 @@ function DepotDropdown() {
   return (
     <FormContainer>
       <Label label="Depot" htmlFor="depotDropdown" />
-      <SelectDropdown
+      <StyledSelectDropdown
         placeholder="Select Depot"
         inputId="depotDropdown"
         openMenuOnFocus={false}
@@ -33,7 +33,7 @@ function DepotDropdown() {
         styles={{
           ...dropdownStyles,
 
-          control: styles => ({
+          control: (styles: any) => ({
             ...styles,
             borderRadius: '25px',
             cursor: 'pointer',
@@ -50,5 +50,7 @@ const FormContainer = styled.div`
   gap: 6px;
   flex: 1;
 `;
-
+export const StyledSelectDropdown = styled(SelectDropdown)`
+  min-width: 160px;
+`;
 export default DepotDropdown;

package/src/components/order-view/order-details/expanded-content/orders-section/ScheduleAfter.tsx

@@ -52,7 +52,8 @@ function ScheduleAfter() {
         onChange={onChange}
         value={scheduleDate === null ? scheduleDate : dayjs(scheduleDate)}
         format="DD/MM/YY"
-        style={{ borderRadius: '25px' }}
+        disabledDate={current => current && current < dayjs().startOf('day')}
+        allowClear={false}
       />
     </MainContainer>
   );

package/src/components/order-view/order-details/expanded-content/orders-section/VehicleType.tsx

@@ -1,8 +1,9 @@
-import { Label, SelectDropdown } from '@bjsdistribution/dms-component-library';
+import { Label } from '@bjsdistribution/dms-component-library';
 import React from 'react';
 import styled from 'styled-components';
 import { vehicleTypeOptions } from '../../helper';
 import { useOrderDetails } from '../../../store';
+import { StyledSelectDropdown } from './Depot';
 
 function VehicleTypeDropdown() {
   const [orderDetails, setOrderDetails] = useOrderDetails();
@@ -18,7 +19,7 @@ function VehicleTypeDropdown() {
   return (
     <FormContainer>
       <Label label="Vehicle Type" htmlFor="vehicleType" />
-      <SelectDropdown
+      <StyledSelectDropdown
         placeholder="Select vehicle type"
         options={vehicleTypeOptions}
         inputId="vehicleType"

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

@@ -477,6 +477,13 @@ export function useGlobalStateHitAuditLog() {
   return useAtom(globalStateHitAuditLog);
 }
 
+const globalOrderGetApi = atom<boolean>(true);
+
+export function useGlobalStateHitOrder() {
+  return useAtom(globalOrderGetApi);
+}
+
+
 // Popup state Manage
 const initialState = null;