@os1-platform/dispatch-mobile 2.1.0 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@os1-platform/dispatch-mobile",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Dispatch SDK React Native Package",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -59,7 +59,6 @@
     "@commitlint/config-conventional": "^11.0.0",
     "@expo-google-fonts/ibm-plex-sans": "*",
     "@foxtrotplatform/platform-coreos-mts-sdk": "file:foxtrotplatform-platform-coreos-mts-sdk-1.0.2.tgz",
-    "@os1-platform/platform-coreos-execution-engine-sdk": "1.0.4",
     "@react-native-async-storage/async-storage": "^1.15.14",
     "@react-native-community/datetimepicker": "^3.5.2",
     "@react-native-community/eslint-config": "^2.0.0",
@@ -104,7 +103,6 @@
     "expo-font": "~10.0.3",
     "expo-image-manipulator": "~10.1.2",
     "expo-image-picker": "~11.0.3",
-    "react-native-image-picker": "^7.0.2",
     "expo-location": "~13.0.4",
     "expo-sqlite": "~11.0.0",
     "graphql": "^16.2.0",
@@ -121,6 +119,7 @@
     "react-native-builder-bob": "^0.18.0",
     "react-native-dropdown-picker": "^5.4.0",
     "react-native-get-random-values": "^1.8.0",
+    "react-native-image-picker": "^7.0.2",
     "react-native-paper": "^4.9.2",
     "react-native-safe-area-context": "^3.3.2",
     "react-native-screens": "^3.9.0",
@@ -154,7 +153,6 @@
     "expo-font": "~11.0.1",
     "expo-image-manipulator": "~11.0.0",
     "expo-image-picker": "~14.1.0",
-    "react-native-image-picker": "^7.0.2",
     "expo-location": "~15.0.1",
     "expo-sqlite": "~11.0.0",
     "graphql": "^16.2.0",
@@ -162,6 +160,7 @@
     "react-native": "^0.69.5",
     "react-native-dropdown-picker": "^5.4.0",
     "react-native-get-random-values": "^1.8.0",
+    "react-native-image-picker": "^7.0.2",
     "react-native-paper": "^4.9.2",
     "react-native-safe-area-context": "^3.3.2",
     "react-native-screens": "^3.9.0",
@@ -260,6 +259,7 @@
     ]
   },
   "dependencies": {
+    "@os1-platform/platform-coreos-execution-engine-sdk": "1.0.4",
     "@rjsf/core": "^2.0.0",
     "apollo-link-timeout": "^4.0.0",
     "decompress": "^4.2.1",
@@ -272,7 +272,6 @@
     "react-native-svg": "^13.6.0",
     "recyclerlistview": "^4.2.0",
     "rjsf-native": "^1.0.14",
-    "toggle-switch-react-native": "^3.3.0",
-    "@os1-platform/platform-coreos-execution-engine-sdk": "1.0.4"
+    "toggle-switch-react-native": "^3.3.0"
   }
 }

package/src/components/executiontasks/deliver/DeliverETInput.ts

@@ -38,6 +38,7 @@ export type DeliverETInput = BaseETRequest & {
   confirmShipments?: boolean;
   onSubmitET(response: DeliverOutput): void;
   returnPackageCount?: number;
+  shipCount?: number;
   restrictCancel?: boolean;
   showDeliverModal: boolean;
   setShowDeliverModal: React.Dispatch<React.SetStateAction<boolean>>;

package/src/components/executiontasks/deliver/SLDeliverET.tsx

@@ -34,15 +34,15 @@ import { hasGoBackConnector } from '../../../components/utils';
 import { useFocusEffect } from '@react-navigation/native';
 import { getStr, getStrVal } from '../../../locale/util';
 import Str from '../../../locale/Str';
-import CircleMark from '../../../icons/circleMark.svg';	
-import { TouchableOpacity } from 'react-native';	
+import CircleMark from '../../../icons/circleMark.svg';
+import { TouchableOpacity } from 'react-native';
 import ModalWidget from '../../../components/widgets/ModalWidget';
 
 const ListItem = ({ lineItem }: { lineItem: LineItem }) => (
   <View style={{ justifyContent: 'center' }}>
-    <Text
-      style={DeliverPickupStyles.itemTextStyle}
-    >{`Order ID: ${lineItem.skuId}`}</Text>
+    <Text style={DeliverPickupStyles.itemTextStyle}>
+      {`Order ID: ${lineItem.skuId}`}
+    </Text>
   </View>
 );
 
@@ -56,7 +56,7 @@ const getMessage = (
 ) => {
   try {
     const msg = message || getStrVal(Str.DEFAULT_DELIVER_MESSAGE, Str.count, returnPackageCount && returnPackageCount >= 1 ? returnPackageCount : '');
-        return msg; 
+    return msg;
   } catch (error: any) {
     return message || '';
   }
@@ -112,10 +112,10 @@ const DeliverET = (props: DeliverETInput) => {
                 hasGoBackConnector(props.applicableReasons)
               )
                 setShowBackModal(true);
-                else {	
-                  setShowDeliverModal(false);	
-                  props.navigation.goBack();	
-                }
+              else {
+                setShowDeliverModal(false);
+                props.navigation.goBack();
+              }
             }}
             name="arrow-back"
             color={'black'}
@@ -153,56 +153,56 @@ const DeliverET = (props: DeliverETInput) => {
     );
   };
 
-  const renderGoBackModal = () => {	
-    return (	
-      <ModalWidget	
-        dismissable={true}	
-        showModal={goBack}	
-        title={{	
-          label: `Are you sure you want to exit ${DEFAULT_DELIVER_TITLE}?`,	
-        }}	
-        subTitle={{	
-          label: 'All progress will be lost',	
-          styles: {	
-            alignSelf: 'center',	
-          },	
-        }}	
-        primaryButton={{	
-          label: 'Exit',	
-          onPress: async () => {	
-            if (	
-              props.taskMeta?.enableGoBack &&	
-              hasGoBackConnector(props.applicableReasons)	
-            ) {	
-              props.onSubmitET({	
-                ...(await getBaseETResponse(	
-                  EntityCode.DELIVER,	
-                  false,	
-                  GO_BACK_EVENT_CODE,	
-                  '',	
-                  props.mergedObjectiveId,	
-                  ExecutionTaskID.DELIVER	
-                )),	
-              });	
-              setShowBackModal(false);	
-            } else {	
-              props.navigation.goBack();	
-            }	
-            setShowBackModal(false);	
-          },	
-          styles: styles.primaryButtonStyles,	
-        }}	
-        secondaryButton={{	
-          label: 'Cancel',	
-          onPress: () => {	
-            setGoBack(false);	
-            setShowDeliverModal(true);	
-          },	
-          styles: styles.secondaryButtonStyles,	
-        }}	
-      />	
-    );	
-  };	
+  const renderGoBackModal = () => {
+    return (
+      <ModalWidget
+        dismissable={true}
+        showModal={goBack}
+        title={{
+          label: `Are you sure you want to exit ${DEFAULT_DELIVER_TITLE}?`,
+        }}
+        subTitle={{
+          label: 'All progress will be lost',
+          styles: {
+            alignSelf: 'center',
+          },
+        }}
+        primaryButton={{
+          label: 'Exit',
+          onPress: async () => {
+            if (
+              props.taskMeta?.enableGoBack &&
+              hasGoBackConnector(props.applicableReasons)
+            ) {
+              props.onSubmitET({
+                ...(await getBaseETResponse(
+                  EntityCode.DELIVER,
+                  false,
+                  GO_BACK_EVENT_CODE,
+                  '',
+                  props.mergedObjectiveId,
+                  ExecutionTaskID.DELIVER
+                )),
+              });
+              setShowBackModal(false);
+            } else {
+              props.navigation.goBack();
+            }
+            setShowBackModal(false);
+          },
+          styles: styles.primaryButtonStyles,
+        }}
+        secondaryButton={{
+          label: 'Cancel',
+          onPress: () => {
+            setGoBack(false);
+            setShowDeliverModal(true);
+          },
+          styles: styles.secondaryButtonStyles,
+        }}
+      />
+    );
+  };
 
   if (props.confirmCustodyExchange) {
     return (
@@ -216,7 +216,7 @@ const DeliverET = (props: DeliverETInput) => {
                 props.taskMeta?.enableGoBack &&
                 hasGoBackConnector(props.applicableReasons)
               ) {
-                setShowDeliverModal(false);	
+                setShowDeliverModal(false);
                 setShowBackModal(true);
                 return true;
               } else {
@@ -235,8 +235,8 @@ const DeliverET = (props: DeliverETInput) => {
                     </Text>
                   </View>
                   <View style={styles.returnView}>
-                  <Text style={styles.subTitle}>{getStr(props.returnPackageCount ? props.returnPackageCount > 1 ? Str.Expected_Shipments : Str.Expected_Shipment : Str.Expected_Shipments)}</Text>
-                                      <Text style={styles.title}>{props.returnPackageCount}</Text>
+                    <Text style={styles.subTitle}>{getStr(props.returnPackageCount ? props.returnPackageCount > 1 ? Str.Expected_Shipments : Str.Expected_Shipment : Str.Expected_Shipments)}</Text>
+                    <Text style={styles.title}>{props.returnPackageCount}</Text>
                   </View>
                   {props.confirmShipments ? (
                     <View
@@ -250,14 +250,14 @@ const DeliverET = (props: DeliverETInput) => {
                           fontSize: 14,
                           lineHeight: 24,
                           fontFamily:
-                          Platform.OS === 'android'
-                            ? Fonts.IBMPlexSans_400Regular
+                            Platform.OS === 'android'
+                              ? Fonts.IBMPlexSans_400Regular
                               : 'IBMPlexSans-Regular',
                         }}
                         multiline={false}
                         autoComplete={'off'}
                         label={getStr(Number(pkgCount) > 1 ? Str.Shipments_handed_over : Str.Shipment_handed_over)}
-                                                value={pkgCount}
+                        value={pkgCount}
                         mode={'outlined'}
                         error={!isEmptyOrBlank(inputError)}
                         selectionColor={'#6200EE'}
@@ -346,15 +346,15 @@ const DeliverET = (props: DeliverETInput) => {
           >
             <View style={styles.modalView}>
               <View style={styles.modalStyle}>
-              <TouchableOpacity	
-                  onPress={() => {	
-                    setShowDeliverModal(false);	
-                    setGoBack(true);	
-                  }}	
-                  style={styles.crossIcon}	
-                  hitSlop={{ bottom: 10, top: 10, right: 10, left: 10 }}	
-                >	
-                  <CircleMark />	
+                <TouchableOpacity
+                  onPress={() => {
+                    setShowDeliverModal(false);
+                    setGoBack(true);
+                  }}
+                  style={styles.crossIcon}
+                  hitSlop={{ bottom: 10, top: 10, right: 10, left: 10 }}
+                >
+                  <CircleMark />
                 </TouchableOpacity>
                 <View style={styles.modalBody}>
                   <Text style={DeliverPickupStyles.titleText}>
@@ -363,6 +363,9 @@ const DeliverET = (props: DeliverETInput) => {
                   <Text style={DeliverPickupStyles.messageText}>
                     {getMessage(props.returnPackageCount, props.message)}
                   </Text>
+                  <Text style={DeliverPickupStyles.messageText}>
+                    {props?.shipCount ? getStrVal(Str.shipments, Str.count, props.shipCount) : ''}
+                  </Text>
 
                   {/* Removed showing the item when item.length === 1 */}
                   {/* {props.returnPackageCount === 1 && props.items.length ? (
@@ -460,8 +463,8 @@ const styles = StyleSheet.create({
     paddingHorizontal: 40,
     alignItems: 'center',
   },
-  crossIcon: {	
-    alignSelf: 'flex-end',	
+  crossIcon: {
+    alignSelf: 'flex-end',
   },
   bottomButtons: {
     marginTop: 12,
@@ -495,18 +498,18 @@ const styles = StyleSheet.create({
         ? Fonts.IBMPlexSans_600SemiBold
         : 'IBMPlexSans-SemiBold',
   },
-  primaryButtonStyles: {	
-    marginTop: 16,	
-    height: 40,	
-    borderRadius: 6,	
-    justifyContent: 'center',	
-    alignItems: 'center',	
-  },	
-  secondaryButtonStyles: {	
-    marginVertical: 16,	
-    height: 40,	
-    borderRadius: 6,	
-    justifyContent: 'center',	
-    alignItems: 'center',	
+  primaryButtonStyles: {
+    marginTop: 16,
+    height: 40,
+    borderRadius: 6,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  secondaryButtonStyles: {
+    marginVertical: 16,
+    height: 40,
+    borderRadius: 6,
+    justifyContent: 'center',
+    alignItems: 'center',
   },
 });

package/src/components/executiontasks/pickup/PickpSchema.ts

@@ -16,6 +16,7 @@ export interface PickupRemarks {
 export type PickupETInput = BaseETRequest & {
   items: LineItem[];
   pickupCount?: number;
+  shipCount?: number;
   confirmCustodyExchange?: boolean;
   onSubmitET(pickupRemark: PickupETOutput): void;
 };

package/src/components/executiontasks/pickup/SLPickupET.tsx

@@ -1,5 +1,5 @@
 import { BackHandler, StyleSheet, Text, View, Modal, Platform, TouchableOpacity } from 'react-native';
-import React, { useState, useLayoutEffect,useCallback } from 'react';
+import React, { useState, useLayoutEffect, useCallback } from 'react';
 import { Button, Portal, Provider } from 'react-native-paper';
 
 import {
@@ -26,14 +26,14 @@ import GoBackModal from '../../../components/widgets/GoBackModal';
 import { useFocusEffect } from '@react-navigation/native';
 import { getStrVal } from '../../../locale/util';
 import Str from '../../../locale/Str';
-import CircleMark from '../../../icons/circleMark.svg';	
+import CircleMark from '../../../icons/circleMark.svg';
 import ModalWidget from '../../../components/widgets/ModalWidget';
 
 const ListItem = ({ lineItem }: { lineItem: LineItem }) => (
   <View style={{ justifyContent: 'center' }}>
-    <Text
-      style={DeliverPickupStyles.itemTextStyle}
-    >{`Order ID: ${lineItem.skuId}`}</Text>
+    <Text style={DeliverPickupStyles.itemTextStyle}>
+      {`Order ID: ${lineItem.skuId}`}
+    </Text>
   </View>
 );
 
@@ -128,56 +128,56 @@ const SLPickupET = (props: PickupETInput) => {
     );
   };
 
-  const renderGoBackModal = () => {	
-    return (	
-      <ModalWidget	
-        dismissable={true}	
-        showModal={goBack}	
-        title={{	
-          label: `Are you sure you want to exit ${DEFAULT_PICKUP_TITLE}?`,	
-        }}	
-        subTitle={{	
-          label: 'All progress will be lost',	
-          styles: {	
-            alignSelf: 'center',	
-          },	
-        }}	
-        primaryButton={{	
-          label: 'Exit',	
-          onPress: async () => {	
-            if (	
-              props.taskMeta?.enableGoBack &&	
-              hasGoBackConnector(props.applicableReasons)	
-            ) {	
-              props.onSubmitET({	
-                ...(await getBaseETResponse(	
-                  EntityCode.PICKUP,	
-                  false,	
-                  GO_BACK_EVENT_CODE,	
-                  '',	
-                  props.mergedObjectiveId,	
-                  ExecutionTaskID.PICKUP	
-                )),	
-              });	
-              setShowBackModal(false);	
-            } else {	
-              props.navigation.goBack();	
-            }	
-            setShowBackModal(false);	
-          },	
-          styles: styles.primaryButtonStyles,	
-        }}	
-        secondaryButton={{	
-          label: 'Cancel',	
-          onPress: () => {	
-            setGoBack(false);	
-            setShowPickupModal(true);	
-          },	
-          styles: styles.secondaryButtonStyles,	
-        }}	
-      />	
-    );	
-  };	
+  const renderGoBackModal = () => {
+    return (
+      <ModalWidget
+        dismissable={true}
+        showModal={goBack}
+        title={{
+          label: `Are you sure you want to exit ${DEFAULT_PICKUP_TITLE}?`,
+        }}
+        subTitle={{
+          label: 'All progress will be lost',
+          styles: {
+            alignSelf: 'center',
+          },
+        }}
+        primaryButton={{
+          label: 'Exit',
+          onPress: async () => {
+            if (
+              props.taskMeta?.enableGoBack &&
+              hasGoBackConnector(props.applicableReasons)
+            ) {
+              props.onSubmitET({
+                ...(await getBaseETResponse(
+                  EntityCode.PICKUP,
+                  false,
+                  GO_BACK_EVENT_CODE,
+                  '',
+                  props.mergedObjectiveId,
+                  ExecutionTaskID.PICKUP
+                )),
+              });
+              setShowBackModal(false);
+            } else {
+              props.navigation.goBack();
+            }
+            setShowBackModal(false);
+          },
+          styles: styles.primaryButtonStyles,
+        }}
+        secondaryButton={{
+          label: 'Cancel',
+          onPress: () => {
+            setGoBack(false);
+            setShowPickupModal(true);
+          },
+          styles: styles.secondaryButtonStyles,
+        }}
+      />
+    );
+  };
 
   return (
     <Provider>
@@ -203,15 +203,15 @@ const SLPickupET = (props: PickupETInput) => {
         >
           <View style={styles.modalView}>
             <View style={styles.modalStyle}>
-            <TouchableOpacity	
-                onPress={() => {	
-                  setShowPickupModal(false);	
-                  setGoBack(true);	
-                }}	
-                style={styles.crossIcon}	
-                hitSlop={{ bottom: 10, top: 10, right: 10, left: 10 }}	
-              >	
-                <CircleMark />	
+              <TouchableOpacity
+                onPress={() => {
+                  setShowPickupModal(false);
+                  setGoBack(true);
+                }}
+                style={styles.crossIcon}
+                hitSlop={{ bottom: 10, top: 10, right: 10, left: 10 }}
+              >
+                <CircleMark />
               </TouchableOpacity>
               <View style={styles.modalBody}>
                 <Text style={DeliverPickupStyles.titleText}>
@@ -220,6 +220,9 @@ const SLPickupET = (props: PickupETInput) => {
                 <Text style={DeliverPickupStyles.messageText}>
                   {getMessage(props.pickupCount, props.message)}
                 </Text>
+                <Text style={DeliverPickupStyles.messageText}>
+                  {props?.shipCount ? getStrVal(Str.shipments, Str.count, props.shipCount) : ''}
+                </Text>
                 {/* Removed showing the item when item.length === 1 */}
                 {/* {props.pickupCount === 1 && props.items.length ? (
                   <View style={{ justifyContent: 'center' }}>
@@ -315,8 +318,8 @@ const styles = StyleSheet.create({
     paddingHorizontal: 40,
     alignItems: 'center',
   },
-  crossIcon: {	
-    alignSelf: 'flex-end',	
+  crossIcon: {
+    alignSelf: 'flex-end',
   },
   bottomButtons: {
     marginTop: 12,
@@ -350,18 +353,18 @@ const styles = StyleSheet.create({
         ? Fonts.IBMPlexSans_600SemiBold
         : 'IBMPlexSans-SemiBold',
   },
-  primaryButtonStyles: {	
-    marginTop: 16,	
-    height: 40,	
-    borderRadius: 6,	
-    justifyContent: 'center',	
-    alignItems: 'center',	
-  },	
-  secondaryButtonStyles: {	
-    marginVertical: 16,	
-    height: 40,	
-    borderRadius: 6,	
-    justifyContent: 'center',	
-    alignItems: 'center',	
+  primaryButtonStyles: {
+    marginTop: 16,
+    height: 40,
+    borderRadius: 6,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  secondaryButtonStyles: {
+    marginVertical: 16,
+    height: 40,
+    borderRadius: 6,
+    justifyContent: 'center',
+    alignItems: 'center',
   },
 });

package/src/locale/Str.ts

@@ -8,5 +8,6 @@ export default {
     Expected_Shipments: 'Expected_Shipments',
     Expected_Shipment: 'Expected_Shipment',
     Shipment_handed_over: 'Shipment_handed_over',
-    Shipments_handed_over: 'Shipments_handed_over'
+    Shipments_handed_over: 'Shipments_handed_over',
+    shipments: 'shipments'
 }

package/src/locale/i18n.ts

@@ -2,16 +2,21 @@ import { I18n } from "i18n-js";
 import en from './en.json';
 
 const i18n = new I18n({
-    ...en,   
+    ...en,
     en: {
         DEFAULT_PICKUP_MESSAGE: {
             one: "Confirm Pickup of 1 order",
             other: "Confirm Pickup of %{count} orders",
-     },
+        },
         DEFAULT_DELIVER_MESSAGE: {
             one: "Confirm Drop of 1 order",
             other: "Confirm Drop of %{count} orders"
-      },}
+        },
+        shipments: {
+            one: "(%{count} shipment)?",
+            other: "(%{count} shipments)?"
+        }
+    }
 });
 
 export default i18n;

package/src/manager/syncmanager/DBConfig.ts

@@ -4,6 +4,7 @@ export type ExecEngineSyncType = IDispatch.SyncType;
 export enum DispatchSyncType {
   DEFAULT = 'DEFAULT',
   DISPATCH_UPDATE = 'DISPATCH_UPDATE',
+  DISPATCH_SUB_STATUS_UPDATE = 'DISPATCH_SUB_STATUS_UPDATE',
 }
 
 export const DATABASE_NAME = 'DISPATCH_DB';

package/src/manager/syncmanager/events/ETEventsManager.ts

@@ -216,6 +216,17 @@ export default class ETEventsManager {
           },
         ];
       }
+      case DispatchSyncType.DISPATCH_SUB_STATUS_UPDATE: {
+        return [
+          {
+            data: {
+              action: DispatchSyncType.DISPATCH_SUB_STATUS_UPDATE,
+              payload: this.getDispatchUpdatePayload(_bulkEventData),
+            },
+            length: 1,
+          },
+        ];
+      }
       default: {
         return [
           {
@@ -297,6 +308,8 @@ export default class ETEventsManager {
     }
   }
 
+
+
   // NEW CODE
   async insertBulkEvent(_eventData: BulkEvent): Promise<void> {
     try {
@@ -312,7 +325,8 @@ export default class ETEventsManager {
         _eventData.syncType === SyncType.WORKFLOW ||
         _eventData.syncType === SyncType.CUSTODY_IN_SCAN ||
         _eventData.syncType === SyncType.CUSTODY_OUT_SCAN ||
-        _eventData.syncType === DispatchSyncType.DISPATCH_UPDATE
+        _eventData.syncType === DispatchSyncType.DISPATCH_UPDATE ||
+        _eventData.syncType === DispatchSyncType.DISPATCH_SUB_STATUS_UPDATE
       ) {
         output.forEach(
           (syncManagerPayload: SyncManagerPayload, index: number) => {

package/src/ui/screens/DeliverScreen.tsx

@@ -30,6 +30,7 @@ const DeliverScreen = ({
     getDataFromNextState(nextState);
 
   const [returnPackageCount, setReturnPackageCount] = useState(0);
+  const [shipCount, setShipCount] = useState(0);
   const [items, setItems] = useState([]);
 
   const getMergedReturnPackageCount = async () => {
@@ -37,6 +38,7 @@ const DeliverScreen = ({
       mergedObjectiveId
     );
     setReturnPackageCount(count.totalCount);
+    setShipCount(count.shipCount);
   };
   useEffect(() => {
     onTaskStart(
@@ -80,12 +82,13 @@ const DeliverScreen = ({
         taskMeta={taskMeta}
         mergedObjectiveId={mergedObjectiveId}
         returnPackageCount={returnPackageCount}
-        showDeliverModal={showDeliverModal}	
+        shipCount={shipCount}
+        showDeliverModal={showDeliverModal}
         setShowDeliverModal={setShowDeliverModal}
         onSubmitET={async (deliverOutput) => {
-          if (	
-            deliverOutput.success ||	
-            deliverOutput.eventCode == GO_BACK_EVENT_CODE	
+          if (
+            deliverOutput.success ||
+            deliverOutput.eventCode == GO_BACK_EVENT_CODE
           ) {
             await submitOutput(deliverOutput);
           } else {