@bjsdistribution/dms-client-return 0.1.28-prod → 0.1.29-prod

package/package.json

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

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

@@ -11,7 +11,9 @@ function AuditLogs() {
 }
 
 const Container = styled.div`
-  height: 550px; /* Set height to limit container size */
+  height: 500px;
+  min-height: 200px;
+  max-height: 500px;
   overflow: auto; /* Enable scrolling */
   scrollbar-width: thin;
 `;

package/src/components/order-view/order-actions/actions/force-debrief/ForceDebriefModal.tsx

@@ -267,7 +267,15 @@ function ForceDebriefModal(props: IProps) {
       orderDetails
     );
 
-    const serviceKeys = [
+    type ServiceKey =
+      | 'assemble'
+      | 'disassemble'
+      | 'unpack_items'
+      | 'collect_disposal'
+      | 'take_packaging_away'
+      | 'assembly_type';
+
+    const serviceKeys: ServiceKey[] = [
       'assemble',
       'disassemble',
       'unpack_items',
@@ -276,28 +284,21 @@ function ForceDebriefModal(props: IProps) {
       'assembly_type',
     ];
 
-    let orderServicesPayload: Record<string, any> = {};
-
-    const includesKey = serviceKeys.some(key => key in ordersApiPayload);
-
-    if (includesKey) {
-      for (const key of serviceKeys) {
-        orderServicesPayload[key as keyof typeof ordersApiPayload] =
-          key in ordersApiPayload
-            ? ordersApiPayload[key as keyof typeof ordersApiPayload]
-            : orderDetails[key as keyof OrdersType];
-        delete ordersApiPayload[key as keyof typeof ordersApiPayload];
-        if (
-          orderServicesPayload?.assemble === false &&
-          orderServicesPayload?.disassemble === false
-        ) {
-          orderServicesPayload.assembly_type = null;
-        }
+    for (const key of serviceKeys) {
+      if (key in ordersApiPayload) {
+        (ordersApiPayload as Record<ServiceKey, any>)[key] =
+          ordersApiPayload[key as keyof typeof ordersApiPayload];
+      } else if (key in orderDetails) {
+        (ordersApiPayload as Record<ServiceKey, any>)[key] =
+          orderDetails[key as keyof OrdersType];
       }
     }
 
-    if (Object.keys(orderServicesPayload).length > 0) {
-      ordersApiPayload.order_services = [orderServicesPayload];
+    if (
+      ordersApiPayload?.assemble === false &&
+      ordersApiPayload?.disassemble === false
+    ) {
+      ordersApiPayload.assembly_type = null;
     }
 
     try {

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

@@ -11,6 +11,8 @@ import {
   useGlobalStateHitAuditLog,
   useGlobalStateHitOrder,
   useLiveRecalling,
+  useOrderAlertsData,
+  useStatusDetails,
 } from '../../../store';
 // import useUpdateOrder from '../../../hooks/useUpdateOrder';
 import { compareOrderDetailsStates, filterObject } from '../../../utils';
@@ -28,6 +30,24 @@ function OrderDetailsFooter() {
   const [, setRecallOrders] = useGlobalStateHitOrder();
   const [isClientPortal] = useClientPortal();
   const [, setRecalling] = useLiveRecalling();
+  const [, setOrderAlertsData] = useOrderAlertsData();
+  const [, setOrderStatus] = useStatusDetails();
+
+  // call alerts api
+  const { fetchData: callOrderAlertsApi } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `v1/orders/alerts/?order_id=${orderDetails?.id}`,
+    method: 'GET',
+  });
+
+  //Order status api
+  const { fetchData: callOrderStatusApi } = useAxios<{
+    data: ApiResponse[];
+  }>({
+    endpoint: `/orders/get_live_status/${orderDetails?.id}`,
+    method: 'GET',
+  });
   //update order
   const { fetchData: callUpdateOrderAPI } = useAxios<{
     data: ApiResponse[];
@@ -38,12 +58,12 @@ function OrderDetailsFooter() {
 
   const errorFound = () => {
     const isError =
-      errorState.w3wError.length > 0 ||
-      errorState.emailError.length > 0 ||
-      errorState.homeContactError.length > 0 ||
-      errorState.workCOntanctError.length > 0 ||
-      errorState.mobileError.length > 0 ||
-      errorState.postCodeError.length > 0;
+      errorState?.w3wError?.length > 0 ||
+      errorState?.emailError?.length > 0 ||
+      errorState?.homeContactError?.length > 0 ||
+      errorState?.workCOntanctError?.length > 0 ||
+      errorState?.mobileError?.length > 0 ||
+      errorState?.postCodeError?.length > 0;
 
     return isError;
   };
@@ -76,7 +96,15 @@ function OrderDetailsFooter() {
     setRecalling(false);
     const payload = compareOrderDetailsStates(prevOrderDetails, orderDetails);
 
-    const serviceKeys = [
+    type ServiceKey =
+      | 'assemble'
+      | 'disassemble'
+      | 'unpack_items'
+      | 'collect_disposal'
+      | 'take_packaging_away'
+      | 'assembly_type';
+
+    const serviceKeys: ServiceKey[] = [
       'assemble',
       'disassemble',
       'unpack_items',
@@ -85,28 +113,18 @@ function OrderDetailsFooter() {
       'assembly_type',
     ];
 
-    let orderServicesPayload: Record<string, any> = {};
-
-    const includesKey = serviceKeys.some(key => key in payload);
-
-    if (includesKey) {
-      for (const key of serviceKeys) {
-        orderServicesPayload[key as keyof typeof payload] =
-          key in payload
-            ? payload[key as keyof typeof payload]
-            : orderDetails[key as keyof OrdersType];
-        delete payload[key as keyof typeof payload];
-        if (
-          orderServicesPayload?.assemble === false &&
-          orderServicesPayload?.disassemble === false
-        ) {
-          orderServicesPayload.assembly_type = null;
-        }
+    for (const key of serviceKeys) {
+      if (key in payload) {
+        (payload as Record<ServiceKey, any>)[key] =
+          payload[key as keyof typeof payload];
+      } else if (key in orderDetails) {
+        (payload as Record<ServiceKey, any>)[key] =
+          orderDetails[key as keyof OrdersType];
       }
     }
 
-    if (Object.keys(orderServicesPayload).length > 0) {
-      payload.order_services = [orderServicesPayload];
+    if (payload?.assemble === false && payload?.disassemble === false) {
+      payload.assembly_type = null;
     }
 
     let response = (await callUpdateOrderAPI({
@@ -133,8 +151,26 @@ function OrderDetailsFooter() {
     } else {
       setOrderDetails(prevOrderDetails);
     }
-  };
 
+    const alertsApiRes = (await callOrderAlertsApi()) as {
+      code: number | null;
+      error?: string | null | undefined;
+      [key: string]: any;
+    };
+    if (alertsApiRes?.code === 200 && alertsApiRes?.data) {
+      setOrderAlertsData(alertsApiRes?.data);
+    }
+
+    const orderStatusApiRes = (await callOrderStatusApi()) as {
+      code: number | null;
+      error?: string | null | undefined;
+      [key: string]: any;
+    };
+    if (orderStatusApiRes?.code === 200 && orderStatusApiRes?.data) {
+      setOrderStatus(orderStatusApiRes?.data);
+    }
+  };
+  //here changes needed
   return (
     <Container>
       <AllowTracking />

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

@@ -157,7 +157,7 @@ export interface OrdersType {
   vehicle_type: string | null;
   order_recipient: OrderRecipientType | null;
   order_services_detail: OrderServicesDetailType | null;
-  order_services: OrderServiceType[];
+  order_services?: OrderServiceType[];
   order_routes?: OrderRouteType | null;
   order_eta_updates: any[];
   order_delivery_declined_dates: any[];