@os1-platform/dispatch-mobile 2.1.13 → 2.1.14

package/src/components/executiontasks/scan/ScanET.tsx

@@ -168,14 +168,14 @@ const ScanET = (props: ScannerInput) => {
         //   shipmentCountLoaded: true,
         // }));
       }
-    } catch (error) {}
+    } catch (error) { }
   };
 
   const fetchPreviousScannedData = async () => {
     try {
       const scanOutput = (await getScanMappedOutput()) || {};
       setMergedScanETOutput(scanOutput[prefixedMergedObjectiveId] || {});
-    } catch (error) {}
+    } catch (error) { }
   };
 
   const fetchERC = async () => {
@@ -187,7 +187,7 @@ const ScanET = (props: ScannerInput) => {
         );
         setEventCodeItems(response);
         setSelectedEventCode(response[0]);
-      } catch (error) {}
+      } catch (error) { }
     }
   };
 
@@ -240,7 +240,7 @@ const ScanET = (props: ScannerInput) => {
                 else setShowUnscannedShipmentModal(true);
               }
               const cta = 'Back Arrow';
-              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SCAN_ET_SCREEN, cta: cta });    
+              fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SCAN_ET_SCREEN, cta: cta });
 
             }}
             name="arrow-back"
@@ -589,7 +589,7 @@ const ScanET = (props: ScannerInput) => {
             });
             setShowScanList(!showScanList);
             const cta = 'View Summary';
-            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SCAN_ET_SCREEN, cta: cta }); 
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SCAN_ET_SCREEN, cta: cta });
           }}
         >
           {`View Summary`}
@@ -702,11 +702,12 @@ const ScanET = (props: ScannerInput) => {
               labelStyle={CommonStyles.nextButtonLabel}
               style={{ ...CommonStyles.nextButton, marginTop: 20 }}
               uppercase={false}
-              onPress={() => {setShowUnscannedShipmentModal(false)
+              onPress={() => {
+                setShowUnscannedShipmentModal(false)
                 const cta = 'Continue Scanning';
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SCAN_ET_SCREEN, cta: cta });    
-  
-   
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SCAN_ET_SCREEN, cta: cta });
+
+
               }}
             >
               Continue Scanning
@@ -726,28 +727,27 @@ const ScanET = (props: ScannerInput) => {
                   message: '',
                   type: SnackBarType.SUCCESS,
                 });
-
                 // Trigger Scan Removal Event
                 await resetObjective(props);
 
                 // Clear Scan
                 await Promise.all([
                   clearScanOutput(prefixedMergedObjectiveId),
-                  DispatchExecutor.removeShipment(prefixedMergedObjectiveId),
+                  DispatchExecutor.removeShipment(prefixedMergedObjectiveId, undefined, true),
                 ]);
 
                 props.navigation.goBack();
                 const cta = 'Exit Scan Flow';
-                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SCAN_ET_SCREEN, cta: cta });    
-  
-   
+                fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SCAN_ET_SCREEN, cta: cta });
+
+
               }}
             >
               <Text style={CommonStyles.cancelButtonLabel}>Exit Scan Flow</Text>
             </TouchableOpacity>
           </View>
         </Modal>
-      </Portal>
+      </Portal >
     );
   };
 
@@ -762,9 +762,9 @@ const ScanET = (props: ScannerInput) => {
         }}
       >
         {isMultiObjectiveEnable ||
-        props.scanMode === 'SINGLE' ||
-        props.validation.selectedIndex === 0 ||
-        props.scanCountLimit ? (
+          props.scanMode === 'SINGLE' ||
+          props.validation.selectedIndex === 0 ||
+          props.scanCountLimit ? (
           <Text>{`${shipmentCount.scannedCount}/${shipmentCount.totalCount} shipments scanned.`}</Text>
         ) : props.validation.selectedIndex === 1 ||
           props.validation.selectedIndex === 2 ? (
@@ -801,10 +801,10 @@ const ScanET = (props: ScannerInput) => {
           <View style={{ flex: 1 }}>
             {props.ercSelector && (
               <View style={{ marginHorizontal: 16, marginBottom: 30 }}>
-                <View style={{ marginBottom: 16 }}>
+                <View style={{ marginBottom: 16, zIndex: 10000 }}>
                   <ERDropDown
                     title={'Event'}
-                    style={{ height: 50 }}
+                    style={{ height: 50, zIndex: 10000 }}
                     selectedReason={selectedEventCode}
                     items={eventCodeItems ?? []}
                     onItemChange={(eventItem: ercItem | null) => {
@@ -812,10 +812,10 @@ const ScanET = (props: ScannerInput) => {
                     }}
                   />
                 </View>
-                <View style={{ marginVertical: 16 }}>
+                <View style={{ marginVertical: 16, zIndex: -1 }}>
                   <ERDropDown
                     title={'Reason'}
-                    style={{ height: 50 }}
+                    style={{ height: 50, zIndex: -1 }}
                     selectedReason={selectedReason}
                     disabled={
                       !reasonItems || !reasonItems?.length ? true : false
@@ -912,7 +912,7 @@ const ScanET = (props: ScannerInput) => {
                         });
                         setScannedInput(scanText);
                         const cta = 'Apply';
-                        fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SCAN_ET_SCREEN, cta: cta });          
+                        fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SCAN_ET_SCREEN, cta: cta });
                       }}
                     >
                       <Text

package/src/components/executiontasks/scan/interfaces.ts

@@ -68,6 +68,8 @@ export interface DisplaySummary {
   orderId?: string;
   prefixedMergedObjectiveId: string;
   lastStatus: IDispatchExecutor.ExecutionStatus;
+  eCode?: string;
+  rCode?: string;
 }
 
 export type ListItem = DisplaySummary & {

package/src/components/executiontasks/scan/sub_components/SummaryPage.tsx

@@ -17,7 +17,6 @@ import { TouchableOpacity } from 'react-native';
 import ERDropDown, { ercItem } from './ERDropDown';
 import { getErcDropDownItems } from './DropDownUtils';
 import { ERCode, ScannerInput, ScannerOutput } from '../ScanSchema';
-import SdkColors, { ColorTheme } from '../../../../styles/SdkColors';
 import {
   BaseDataProvider,
   DataProvider,
@@ -30,6 +29,7 @@ import Card from '../../../widgets/Card';
 import {
   addScans,
   filterERCItems,
+  getEventType,
   getScanData,
   getTabCount,
   removeScan,
@@ -94,23 +94,33 @@ const SummaryPage = (props: SummaryPageProps) => {
 
   // START: Modal Handling for Summary Page
 
-  const [showUnscannedShipmentModal, setShowUnscannedShipmentModal] =
-    useState(false);
-  const [showERCModal, setShowERCModal] = useState(false);
+  const [showUnscannedShipmentModal, setShowUnscannedShipmentModal] = useState(false);
   const [showRemoveShipmentModal, setShowRemoveShipmentModal] = useState(false);
 
+  //states for ERC Selectors
+  const [showEditModal, setShowEditModal] = useState(false);
+  const [showERCModal, setShowERCModal] = useState(false);
   const [selectedEventCode, setSelectedEventCode] = useState<ercItem>();
   const [selectedReason, setSelectedReason] = useState<ercItem>(); // reason code from ercSelector
   const [reasonItems, setReasonItems] = useState<ercItem[]>(); // list of reason codes
+  const [editedEventItems, setEditedEventItems] = useState<ercItem[]>(); // list of reason codes
   const [editedReasonItems, setEditedReasonItems] = useState<ercItem[]>(); // list of reason codes
+  const [editedEventCode, setEditedEventCode] = useState<ercItem>();
+  const [editedReason, setEditedReason] = useState<ercItem>(); // reason code from ercSelector
+
   let { scannedCount, totalCount } = props.shipmentCount;
+
+  // effect for even code selector
   useEffect(() => {
     props.ercSelector &&
       (async () => {
         setSelectedEventCode(props.eventCodeItems[0]);
         setEditedEventCode(props.eventCodeItems[0]);
+        setEditedEventItems(props.eventCodeItems)
       })();
   }, [props.eventCodeItems]);
+
+  //effect for reason code selector
   useEffect(() => {
     selectedEventCode?.code &&
       (async () => {
@@ -129,6 +139,27 @@ const SummaryPage = (props: SummaryPageProps) => {
       })();
   }, [selectedEventCode?.code]);
 
+  useEffect(() => {
+    editedEventCode?.code &&
+      (async () => {
+        let response = await getErcDropDownItems(
+          'REASON',
+          props.ercSelector || [],
+          editedEventCode?.code
+        );
+        if (response.length) {
+          // setReasonItems(response);
+          setEditedReasonItems(response);
+          setEditedReason(response[0]);
+        } else {
+          // setReasonItems([]);
+          setEditedReasonItems([]);
+          setEditedReason(undefined);
+        }
+      })();
+  }, [editedEventCode?.code]);
+
+  //Proceed button for ET next flow
   const renderActionButtons = () => {
     return (
       <View
@@ -145,7 +176,7 @@ const SummaryPage = (props: SummaryPageProps) => {
               props.handleSubmitET(PROCEED_STATUS.DELIVER_NOW, tabs[1].count);
             }
             const cta = 'Proceed';
-            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SUMMARY_PAGE_SCREEN, cta: cta });   
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SUMMARY_PAGE_SCREEN, cta: cta });
 
           }}
         >
@@ -172,10 +203,7 @@ const SummaryPage = (props: SummaryPageProps) => {
   const [scanList, setScanList] = useState<DisplaySummary[]>([]);
   const [isLoading, setIsLoading] = useState(false);
   const [isLoadingMore, setIsLoadingMore] = useState(false);
-  const [showEditModal, setShowEditModal] = useState(false);
   const [selectedEditItem, setSelectedEditItem] = useState<ListItem>();
-  const [editedEventCode, setEditedEventCode] = useState<ercItem>();
-  const [editedReason, setEditedReason] = useState<ercItem>(); // reason code from ercSelector
   const [selectedItems, setSelectedItems] = useState<{
     [id: string]: ListItem;
   }>({});
@@ -250,6 +278,7 @@ const SummaryPage = (props: SummaryPageProps) => {
     }
   };
 
+  //effect for all the tabs and their counts
   useEffect(() => {
     (async () => {
       const count = await getTabCount(props.scanProps);
@@ -285,25 +314,7 @@ const SummaryPage = (props: SummaryPageProps) => {
     })();
   }, [isRemoved, activeTab, searchQuery]);
 
-  useEffect(() => {
-    editedEventCode?.code &&
-      (async () => {
-        let response = await getErcDropDownItems(
-          'REASON',
-          props.ercSelector || [],
-          editedEventCode?.code
-        );
-        if (response.length) {
-          // setReasonItems(response);
-          setEditedReasonItems(response);
-          setEditedReason(response[0]);
-        } else {
-          // setReasonItems([]);
-          setEditedReasonItems([]);
-          setEditedReason(undefined);
-        }
-      })();
-  }, [editedEventCode?.code]);
+
 
   // Triggered when the user reaches the end of the list
   const onEndReached = async () => {
@@ -324,10 +335,10 @@ const SummaryPage = (props: SummaryPageProps) => {
         renderChildren={() => {
           return (
             <View style={{ marginHorizontal: 16, marginBottom: 20 }}>
-              <View style={{ marginBottom: 16 }}>
+              <View style={{ marginBottom: 16, zIndex: 10000 }}>
                 <ERDropDown
                   title={'Event'}
-                  style={{ height: 50 }}
+                  style={{ height: 50, zIndex: 10000 }}
                   selectedReason={editedEventCode}
                   items={props.eventCodeItems}
                   onItemChange={(eventItem: ercItem | null) => {
@@ -335,10 +346,10 @@ const SummaryPage = (props: SummaryPageProps) => {
                   }}
                 />
               </View>
-              <View style={{ marginVertical: 20 }}>
+              <View style={{ marginVertical: 20, zIndex: -1 }}>
                 <ERDropDown
                   title={'Reason'}
-                  style={{ height: 50 }}
+                  style={{ height: 50, zIndex: -1 }}
                   selectedReason={editedReason}
                   disabled={
                     !editedReasonItems || !editedReasonItems?.length
@@ -419,6 +430,8 @@ const SummaryPage = (props: SummaryPageProps) => {
                         prefixedMergedObjectiveId:
                           scan.prefixedMergedObjectiveId,
                         lastStatus: scan.lastStatus,
+                        eCode: editedEventCode.code,
+                        rCode: editedReason?.code || '--'
                       };
                       setDataProvider((dataProvider) => {
                         if (dataProvider)
@@ -551,7 +564,7 @@ const SummaryPage = (props: SummaryPageProps) => {
             setSelectedEditItem(undefined);
             setShowEditModal(false);
             const cta = 'Update';
-            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SUMMARY_PAGE_SCREEN, cta: cta });   
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SUMMARY_PAGE_SCREEN, cta: cta });
 
             return;
           },
@@ -563,7 +576,7 @@ const SummaryPage = (props: SummaryPageProps) => {
             setShowEditModal(false);
             setSelectedEditItem(undefined);
             const cta = 'Cancel';
-            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SUMMARY_PAGE_SCREEN, cta: cta });   
+            fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.BUTTON_CLICKED, screenName: ScreenNameSdkConstants.SUMMARY_PAGE_SCREEN, cta: cta });
 
           },
         }}
@@ -592,38 +605,38 @@ const SummaryPage = (props: SummaryPageProps) => {
           styles: modalStyles.secondaryButtonStyles,
           onPress: () => setShowUnscannedShipmentModal(false),
         }}
-        // OLD CODE: When you wanted to update Undelivered shipments with a particular ERC got removed after: https://dev.azure.com/DelhiveryPlatform/Solutions/_workitems/edit/15669
-        // secondaryButton={{
-        //   label: `Mark as Undelivered`,
-        //   styles: modalStyles.secondaryButtonStyles,
-        //   onPress: () => {
-        //     setShowUnscannedShipmentModal(false);
-        //     setShowERCModal(true);
-        //   },
-        // }}
-        // renderAdditionalButtons={() => {
-        //   return (
-        //     <TouchableOpacity
-        //       style={{
-        //         marginBottom: 16,
-        //         height: 40,
-        //         borderRadius: 6,
-        //         justifyContent: 'center',
-        //         alignItems: 'center',
-        //       }}
-        //       onPress={() => setShowUnscannedShipmentModal(false)}
-        //     >
-        //       <Text
-        //         style={[
-        //           CommonStyles.cancelButtonLabel,
-        //           { color: SdkColors[ColorTheme.LIGHT].primaryButton },
-        //         ]}
-        //       >
-        //         Continue Scanning
-        //       </Text>
-        //     </TouchableOpacity>
-        //   );
-        // }}
+      // OLD CODE: When you wanted to update Undelivered shipments with a particular ERC got removed after: https://dev.azure.com/DelhiveryPlatform/Solutions/_workitems/edit/15669
+      // secondaryButton={{
+      //   label: `Mark as Undelivered`,
+      //   styles: modalStyles.secondaryButtonStyles,
+      //   onPress: () => {
+      //     setShowUnscannedShipmentModal(false);
+      //     setShowERCModal(true);
+      //   },
+      // }}
+      // renderAdditionalButtons={() => {
+      //   return (
+      //     <TouchableOpacity
+      //       style={{
+      //         marginBottom: 16,
+      //         height: 40,
+      //         borderRadius: 6,
+      //         justifyContent: 'center',
+      //         alignItems: 'center',
+      //       }}
+      //       onPress={() => setShowUnscannedShipmentModal(false)}
+      //     >
+      //       <Text
+      //         style={[
+      //           CommonStyles.cancelButtonLabel,
+      //           { color: SdkColors[ColorTheme.LIGHT].primaryButton },
+      //         ]}
+      //       >
+      //         Continue Scanning
+      //       </Text>
+      //     </TouchableOpacity>
+      //   );
+      // }}
       />
     );
   };
@@ -640,10 +653,10 @@ const SummaryPage = (props: SummaryPageProps) => {
         renderChildren={() => {
           return (
             <View style={{ marginHorizontal: 16, marginBottom: 20 }}>
-              <View style={{ marginBottom: 16 }}>
+              <View style={{ marginBottom: 16, zIndex: 10000 }}>
                 <ERDropDown
                   title={'Event'}
-                  style={{ height: 50 }}
+                  style={{ height: 50, zIndex: 10000 }}
                   selectedReason={selectedEventCode}
                   items={filterERCItems(props.eventCodeItems, 'FAILURE')}
                   onItemChange={(eventItem: ercItem | null) => {
@@ -651,10 +664,10 @@ const SummaryPage = (props: SummaryPageProps) => {
                   }}
                 />
               </View>
-              <View style={{ marginVertical: 20 }}>
+              <View style={{ marginVertical: 20, zIndex: -1 }}>
                 <ERDropDown
                   title={'Reason'}
-                  style={{ height: 50 }}
+                  style={{ height: 50, zIndex: -1 }}
                   selectedReason={selectedReason}
                   disabled={!reasonItems || !reasonItems?.length ? true : false}
                   items={reasonItems ?? []}
@@ -696,13 +709,11 @@ const SummaryPage = (props: SummaryPageProps) => {
         contentContainerStyle={{ marginStart: 40, marginEnd: 40 }}
         title={{ label: 'Remove Shipment' }}
         subTitle={{
-          label: `${
-            Object.keys(selectedItems).length > 1
-              ? `Are you sure you want to remove the ${
-                  Object.keys(selectedItems).length
-                } shipments?`
-              : 'Are you sure you want to remove this shipment?'
-          }`,
+          label: `${Object.keys(selectedItems).length > 1
+            ? `Are you sure you want to remove the ${Object.keys(selectedItems).length
+            } shipments?`
+            : 'Are you sure you want to remove this shipment?'
+            }`,
           styles: modalStyles.subTitleStyles,
         }}
         primaryButton={{
@@ -752,9 +763,9 @@ const SummaryPage = (props: SummaryPageProps) => {
 
                     if (
                       item.prefixedMergedObjectiveId !==
-                        prefixedMergedObjectiveId ||
+                      prefixedMergedObjectiveId ||
                       item.lastStatus ===
-                        IDispatchExecutor.ExecutionStatus.COMPLETED_FAILURE
+                      IDispatchExecutor.ExecutionStatus.COMPLETED_FAILURE
                     ) {
                       itemsRemoved.push(item.scanId);
                     } else {
@@ -912,6 +923,22 @@ const SummaryPage = (props: SummaryPageProps) => {
               });
             } else {
               setSelectedItems({});
+              if (editedEventItems && scan.eCode && scan.eventCode) {
+                let eventErc: ercItem = {
+                  code: scan.eCode,
+                  text: scan.eventCode,
+                  success: getEventType(editedEventItems, scan.eCode)
+                }
+                setEditedEventCode(eventErc);
+                if (editedReasonItems && scan.rCode && scan.reasonCode) {
+                  let resonErc: ercItem = {
+                    code: scan.rCode,
+                    text: scan.reasonCode,
+                    success: getEventType(editedReasonItems, scan.rCode)
+                  }
+                  setEditedReason(resonErc);
+                }
+              }
               setShowEditModal(true);
               setSelectedEditItem({ ...props, index });
             }
@@ -1112,8 +1139,8 @@ const SummaryPage = (props: SummaryPageProps) => {
         <View style={styles.bottomView}>{renderActionButtons()}</View>
       ) : null}
       {selectedItems &&
-      Object.keys(selectedItems).length &&
-      activeTab !== SummaryPageTabs.PENDING ? (
+        Object.keys(selectedItems).length &&
+        activeTab !== SummaryPageTabs.PENDING ? (
         <View style={styles.removeBtnContainer}>
           <View
             style={{

package/src/components/executiontasks/scan/utils.ts

@@ -562,6 +562,8 @@ const modifyDisplayScanData = async (
         reasonCode: reasonCode || '--',
         prefixedMergedObjectiveId: scan.originalMergedObjId,
         lastStatus: scan.lastStatus,
+        eCode: scan.eventCode,
+        rCode: scan.reasonCode
       };
     })
   );
@@ -755,7 +757,8 @@ export async function removeScan(
 
   const result = await DispatchExecutor.removeShipment(
     prefixedMergedObjectiveId,
-    scans
+    scans,
+    false
   );
 
   // Decrease count on remove