@os1-platform/dispatch-mobile 2.1.13 → 2.1.15

package/lib/commonjs/components/executiontasks/scan/sub_components/SummaryPage.js

@@ -61,22 +61,34 @@ const SummaryPage = props => {
   // START: Modal Handling for Summary Page
 
   const [showUnscannedShipmentModal, setShowUnscannedShipmentModal] = (0, _react.useState)(false);
-  const [showERCModal, setShowERCModal] = (0, _react.useState)(false);
   const [showRemoveShipmentModal, setShowRemoveShipmentModal] = (0, _react.useState)(false);
+
+  //states for ERC Selectors
+  const [showEditModal, setShowEditModal] = (0, _react.useState)(false);
+  const [showERCModal, setShowERCModal] = (0, _react.useState)(false);
   const [selectedEventCode, setSelectedEventCode] = (0, _react.useState)();
   const [selectedReason, setSelectedReason] = (0, _react.useState)(); // reason code from ercSelector
   const [reasonItems, setReasonItems] = (0, _react.useState)(); // list of reason codes
+  const [editedEventItems, setEditedEventItems] = (0, _react.useState)(); // list of reason codes
   const [editedReasonItems, setEditedReasonItems] = (0, _react.useState)(); // list of reason codes
+  const [editedEventCode, setEditedEventCode] = (0, _react.useState)();
+  const [editedReason, setEditedReason] = (0, _react.useState)(); // reason code from ercSelector
+
   let {
     scannedCount,
     totalCount
   } = props.shipmentCount;
+
+  // effect for even code selector
   (0, _react.useEffect)(() => {
     props.ercSelector && (async () => {
       setSelectedEventCode(props.eventCodeItems[0]);
       setEditedEventCode(props.eventCodeItems[0]);
+      setEditedEventItems(props.eventCodeItems);
     })();
   }, [props.eventCodeItems]);
+
+  //effect for reason code selector
   (0, _react.useEffect)(() => {
     (selectedEventCode === null || selectedEventCode === void 0 ? void 0 : selectedEventCode.code) && (async () => {
       let response = await (0, _DropDownUtils.getErcDropDownItems)('REASON', props.ercSelector || [], selectedEventCode === null || selectedEventCode === void 0 ? void 0 : selectedEventCode.code);
@@ -89,6 +101,22 @@ const SummaryPage = props => {
       }
     })();
   }, [selectedEventCode === null || selectedEventCode === void 0 ? void 0 : selectedEventCode.code]);
+  (0, _react.useEffect)(() => {
+    (editedEventCode === null || editedEventCode === void 0 ? void 0 : editedEventCode.code) && (async () => {
+      let response = await (0, _DropDownUtils.getErcDropDownItems)('REASON', props.ercSelector || [], editedEventCode === null || editedEventCode === void 0 ? void 0 : editedEventCode.code);
+      if (response.length) {
+        // setReasonItems(response);
+        setEditedReasonItems(response);
+        setEditedReason(response[0]);
+      } else {
+        // setReasonItems([]);
+        setEditedReasonItems([]);
+        setEditedReason(undefined);
+      }
+    })();
+  }, [editedEventCode === null || editedEventCode === void 0 ? void 0 : editedEventCode.code]);
+
+  //Proceed button for ET next flow
   const renderActionButtons = () => {
     return /*#__PURE__*/_react.default.createElement(_reactNative.View, {
       style: {
@@ -130,10 +158,7 @@ const SummaryPage = props => {
   const [scanList, setScanList] = (0, _react.useState)([]);
   const [isLoading, setIsLoading] = (0, _react.useState)(false);
   const [isLoadingMore, setIsLoadingMore] = (0, _react.useState)(false);
-  const [showEditModal, setShowEditModal] = (0, _react.useState)(false);
   const [selectedEditItem, setSelectedEditItem] = (0, _react.useState)();
-  const [editedEventCode, setEditedEventCode] = (0, _react.useState)();
-  const [editedReason, setEditedReason] = (0, _react.useState)(); // reason code from ercSelector
   const [selectedItems, setSelectedItems] = (0, _react.useState)({});
   const [searchText, setSearchText] = (0, _react.useState)('');
   const [searchQuery, setSearchQuery] = _react.default.useState('');
@@ -192,6 +217,8 @@ const SummaryPage = props => {
       props.scanProps.showProgress(false);
     }
   };
+
+  //effect for all the tabs and their counts
   (0, _react.useEffect)(() => {
     (async () => {
       const count = await (0, _utils.getTabCount)(props.scanProps);
@@ -220,20 +247,6 @@ const SummaryPage = props => {
       if (isRemoved) setIsRemoved(false);
     })();
   }, [isRemoved, activeTab, searchQuery]);
-  (0, _react.useEffect)(() => {
-    (editedEventCode === null || editedEventCode === void 0 ? void 0 : editedEventCode.code) && (async () => {
-      let response = await (0, _DropDownUtils.getErcDropDownItems)('REASON', props.ercSelector || [], editedEventCode === null || editedEventCode === void 0 ? void 0 : editedEventCode.code);
-      if (response.length) {
-        // setReasonItems(response);
-        setEditedReasonItems(response);
-        setEditedReason(response[0]);
-      } else {
-        // setReasonItems([]);
-        setEditedReasonItems([]);
-        setEditedReason(undefined);
-      }
-    })();
-  }, [editedEventCode === null || editedEventCode === void 0 ? void 0 : editedEventCode.code]);
 
   // Triggered when the user reaches the end of the list
   const onEndReached = async () => {
@@ -262,12 +275,14 @@ const SummaryPage = props => {
           }
         }, /*#__PURE__*/_react.default.createElement(_reactNative.View, {
           style: {
-            marginBottom: 16
+            marginBottom: 16,
+            zIndex: 10000
           }
         }, /*#__PURE__*/_react.default.createElement(_ERDropDown.default, {
           title: 'Event',
           style: {
-            height: 50
+            height: 50,
+            zIndex: 10000
           },
           selectedReason: editedEventCode,
           items: props.eventCodeItems,
@@ -276,12 +291,14 @@ const SummaryPage = props => {
           }
         })), /*#__PURE__*/_react.default.createElement(_reactNative.View, {
           style: {
-            marginVertical: 20
+            marginVertical: 20,
+            zIndex: -1
           }
         }, /*#__PURE__*/_react.default.createElement(_ERDropDown.default, {
           title: 'Reason',
           style: {
-            height: 50
+            height: 50,
+            zIndex: -1
           },
           selectedReason: editedReason,
           disabled: !editedReasonItems || !(editedReasonItems !== null && editedReasonItems !== void 0 && editedReasonItems.length) ? true : false,
@@ -340,7 +357,9 @@ const SummaryPage = props => {
                       eventCode: editedEventCode.text,
                       reasonCode: (editedReason === null || editedReason === void 0 ? void 0 : editedReason.text) || '--',
                       prefixedMergedObjectiveId: scan.prefixedMergedObjectiveId,
-                      lastStatus: scan.lastStatus
+                      lastStatus: scan.lastStatus,
+                      eCode: editedEventCode.code,
+                      rCode: (editedReason === null || editedReason === void 0 ? void 0 : editedReason.code) || '--'
                     };
                     setDataProvider(dataProvider => {
                       if (dataProvider) return dataProvider.cloneWithRows(updatedScanList);else return dataProvider;
@@ -556,12 +575,14 @@ const SummaryPage = props => {
           }
         }, /*#__PURE__*/_react.default.createElement(_reactNative.View, {
           style: {
-            marginBottom: 16
+            marginBottom: 16,
+            zIndex: 10000
           }
         }, /*#__PURE__*/_react.default.createElement(_ERDropDown.default, {
           title: 'Event',
           style: {
-            height: 50
+            height: 50,
+            zIndex: 10000
           },
           selectedReason: selectedEventCode,
           items: (0, _utils.filterERCItems)(props.eventCodeItems, 'FAILURE'),
@@ -570,12 +591,14 @@ const SummaryPage = props => {
           }
         })), /*#__PURE__*/_react.default.createElement(_reactNative.View, {
           style: {
-            marginVertical: 20
+            marginVertical: 20,
+            zIndex: -1
           }
         }, /*#__PURE__*/_react.default.createElement(_ERDropDown.default, {
           title: 'Reason',
           style: {
-            height: 50
+            height: 50,
+            zIndex: -1
           },
           selectedReason: selectedReason,
           disabled: !reasonItems || !(reasonItems !== null && reasonItems !== void 0 && reasonItems.length) ? true : false,
@@ -779,6 +802,22 @@ const SummaryPage = props => {
             });
           } else {
             setSelectedItems({});
+            if (editedEventItems && scan.eCode && scan.eventCode) {
+              let eventErc = {
+                code: scan.eCode,
+                text: scan.eventCode,
+                success: (0, _utils.getEventType)(editedEventItems, scan.eCode)
+              };
+              setEditedEventCode(eventErc);
+              if (editedReasonItems && scan.rCode && scan.reasonCode) {
+                let resonErc = {
+                  code: scan.rCode,
+                  text: scan.reasonCode,
+                  success: (0, _utils.getEventType)(editedReasonItems, scan.rCode)
+                };
+                setEditedReason(resonErc);
+              }
+            }
             setShowEditModal(true);
             setSelectedEditItem({
               ...props,