@os1-platform/dispatch-mobile 3.1.5 → 3.1.7

package/src/ui/screens/DeliverScreen.tsx

@@ -15,6 +15,7 @@ import Helper from '../../utils/helper';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
 import { PROGRESS_GROUP } from '../../utils/Constants';
+import Logger from '../../utils/Logger';
 
 const DeliverScreen = ({
   navigation,
@@ -58,24 +59,27 @@ const DeliverScreen = ({
       const splitArr = mergedObjectiveId[0]?.split('#');
       const isSelfLoopTrue: boolean = await helperInstance.isSelfLoopExistOnET(splitArr[1], taskName)
       setSelfLoop(isSelfLoopTrue);
-      console.log('isSelfLoopTrue code execution successful!');
     } catch (error) {
-      console.log('isSelfLoopTrue code execution error', error);
+      Logger.getInstance().logCora("Error", `Deliver Screen getSelfLoopBool: ${error}`);
     }
   }
 
   const getMergedReturnPackageCount = async () => {
-    let progressGroup = null;
     try {
-      progressGroup = await Storage.getInstance().getSharedItem(PROGRESS_GROUP, false);
-    } catch (error) {
-      progressGroup = null;
+      let progressGroup = null;
+      try {
+        progressGroup = await Storage.getInstance().getSharedItem(PROGRESS_GROUP, false);
+      } catch (error) {
+        progressGroup = null;
+      }
+      const count = await DispatchExecutor.getShipmentsCountForDeliverET(
+        mergedObjectiveId, progressGroup
+      );
+      setReturnPackageCount(count.totalCount);
+      setShipCount(count.shipCount);
+    } catch (error: any) {
+      Logger.getInstance().logCora("Error", `DeliverScreen getMergedReturnPackageCount: ${error}`);
     }
-    const count = await DispatchExecutor.getShipmentsCountForDeliverET(
-      mergedObjectiveId, progressGroup
-    );
-    setReturnPackageCount(count.totalCount);
-    setShipCount(count.shipCount);
   };
 
   useEffect(() => {
@@ -89,6 +93,7 @@ const DeliverScreen = ({
   const [sResponse, setResponse] = useState<any>();
   const submitOutput = useCallback(
     async (deliverOutput: any) => {
+      Logger.getInstance().logCora("Info", `DeliverScreen submitOutput: ${JSON.stringify(deliverOutput)}`);
       await DispatchStateContainer.getInstance().navigateToNextTask(
         navigation,
         route,

package/src/ui/screens/DropCashScreen.tsx

@@ -9,15 +9,14 @@ import type { ETAmount } from '../../components/executiontasks/payments/init/Ini
 import { View } from 'react-native';
 import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
 import { getBaseETResponse, onTaskStart } from '../../utils/ExecTaskUtils';
-
 import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import { GO_BACK_EVENT_CODE } from '../../constants/constants';
 import Helper from '../../utils/helper';
-//{ fireEventWithScreenName } from 'src/analytics/sentry/SentryAnalyticsUtils';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
 import ProgressDialog from '../../components/widgets/ProgressDialog';
 import { getEventCodeByET } from '../../manager/dispatchCodes/EventCodeContainer';
+import Logger from '../../utils/Logger';
 
 // OLD CODE
 // function getTotalExpected(nextStates: any[]): ETAmount {
@@ -72,9 +71,7 @@ const DropCashScreen = ({
 
   useEffect(() => {
     (async () => {
-      console.log("expectedAmount:", expectedAmount);
       if (expectedAmount.value === 0) {
-        // setLoading(true);
         let dropCashETOutput = {
           amount: {
             value: expectedAmount.value,
@@ -102,7 +99,6 @@ const DropCashScreen = ({
             return dropCashETOutput;
           });
         }
-        // setLoading(false);
       }
     })();
   }, [expectedAmount.value])
@@ -110,9 +106,13 @@ const DropCashScreen = ({
 
 
   const getTotalExpected = async () => {
-    const totalAmountArr: any[] = await DispatchExecutor.getTotalAmountMWI(mergedObjectiveId);
-    let finalValue = totalAmountArr.map(Number).reduce((sum, num) => sum + num, 0).toFixed(2);
-    setExpectedAmount({ ...expectedAmount, value: Number(finalValue) });
+    try {
+      const totalAmountArr: any[] = await DispatchExecutor.getTotalAmountMWI(mergedObjectiveId);
+      let finalValue = totalAmountArr.map(Number).reduce((sum, num) => sum + num, 0).toFixed(2);
+      setExpectedAmount({ ...expectedAmount, value: Number(finalValue) });
+    } catch (error: any) {
+      Logger.getInstance().logCora("Error", `Error in getTotalExpected: ${error}`);
+    }
   };
 
   const getSelfLoopBool = async () => {
@@ -120,9 +120,8 @@ const DropCashScreen = ({
       const splitArr = mergedObjectiveId[0]?.split('#');
       const isSelfLoopTrue: boolean = await helperInstance.isSelfLoopExistOnET(splitArr[1], taskName)
       setSelfLoop(isSelfLoopTrue);
-      console.log('isSelfLoopTrue code execution successful!');
     } catch (error) {
-      console.log('isSelfLoopTrue code execution error', error);
+      Logger.getInstance().logCora("Error", `Error in getSelfLoopBool: ${error}`);
     }
   }
 
@@ -130,6 +129,7 @@ const DropCashScreen = ({
   const [sResponse, setResponse] = useState<any>();
   const submitOutput = useCallback(
     async (etOutput: any) => {
+      Logger.getInstance().logCora("Info", `DropCashScreen submitOutput: ${JSON.stringify(etOutput)}`);
       await DispatchStateContainer.getInstance().navigateToNextTask(
         navigation,
         route,

package/src/ui/screens/ImageCaptureScreen.tsx

@@ -10,6 +10,7 @@ import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine
 import Helper from '../../utils/helper';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
+import Logger from '../../utils/Logger';
 
 
 const ImageCaptureScreen = ({
@@ -49,9 +50,8 @@ const ImageCaptureScreen = ({
       const splitArr = mergedObjectiveId[0]?.split('#');
       const isSelfLoopTrue: boolean = await helperInstance.isSelfLoopExistOnET(splitArr[1], taskName)
       setSelfLoop(isSelfLoopTrue);
-      console.log('isSelfLoopTrue code execution successful!');
     } catch (error) {
-      console.log('isSelfLoopTrue code execution error', error);
+      Logger.getInstance().logCora("Error", `ImageCaptureScreen getSelfLoopBool: ${error}`);
     }
   }
 

package/src/ui/screens/PickupScreen.tsx

@@ -3,15 +3,14 @@ import withBaseDispatchScreen from './WithBaseDispatchScreen';
 import type { BaseETProps } from '../../models/DispatchModels';
 import { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';
 import DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';
-
 import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
-
 import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import SLPickupET from '../../components/executiontasks/pickup/SLPickupET';
 import Helper from '../../utils/helper';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
+import Logger from '../../utils/Logger';
 
 const PickupScreen = ({
   route,
@@ -32,12 +31,12 @@ const PickupScreen = ({
   const [items, setItems] = useState([]);
   const [isSelfLoopTrue, setSelfLoop] = useState(false);
 
-  
+
 
   useEffect(() => {
     (async () => {
       //fire sentry event
-      fireEventWithScreenName({severityLevel:SeverityLevelValue.LOG, eventName:SentryEventNameSdkConstants.PICKUP_ET_OPENED, screenName:ScreenNameSdkConstants.PICKUP_ET_SCREEN});
+      fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.PICKUP_ET_OPENED, screenName: ScreenNameSdkConstants.PICKUP_ET_SCREEN });
       //      
       onTaskStart(
         nextState,
@@ -59,18 +58,11 @@ const PickupScreen = ({
   const getSelfLoopBool = async () => {
     try {
       const splitArr = mergedObjectiveId[0]?.split('#');
-      console.log("aks::workflowId", JSON.stringify(splitArr))
-      //
       const workflowId = splitArr[1];
-      console.log("aks::workflowId", workflowId)
-      //
       const isSelfLoopTrue: boolean = await helperInstance.isSelfLoopExistOnET(workflowId, taskName)
-      console.log("aks::isSelfLoopTrue", isSelfLoopTrue)
-      //
       setSelfLoop(isSelfLoopTrue);
-      console.log('isSelfLoopTrue code execution successful!');
     } catch (error) {
-      console.log('isSelfLoopTrue code execution error', error);
+      Logger.getInstance().logCora("Error", `PickupScreen getSelfLoopBool: ${error}`);
     }
   }
 
@@ -101,6 +93,7 @@ const PickupScreen = ({
       taskMeta={taskMeta}
       isSelfLoop={isSelfLoopTrue}
       onSubmitET={async (pickupOutput) => {
+        Logger.getInstance().logCora("Info", `PickupScreen onSubmitET: ${JSON.stringify(pickupOutput)}`);
         await DispatchStateContainer.getInstance().navigateToNextTask(
           navigation,
           route,

package/src/ui/screens/StartWorkFlowScreen.tsx

@@ -225,9 +225,9 @@ const StartWorkFlowScreen = ({
           );
         }
       } catch (error: any) {
+        Logger.getInstance().logCora("Error", `StartWorkFlowScreen Catch: ${error}`);
         baseETProps.showProgress(false);
         navigateWithError(error?.code ?? ErrorCodes.UNEXPECTED_ERROR, error.message);
-        Logger.getInstance().logEvent(TAG, error.message, LOG_TYPE.SDK_ERROR);
       }
     })();
   }, []);

package/src/utils/Constants.ts

@@ -1,5 +1,4 @@
-import { Platform } from "react-native";
 
 const KEY_STORAGE_PREFIX = '@Dsp_Executor_';
 export const PROGRESS_GROUP = KEY_STORAGE_PREFIX + 'progressGroup';
-export const EXPIRY_TIME = Platform.OS === 'android' ? 216000 : 60000;
+export const EXPIRY_TIME = 21600; // 6 hours

package/src/utils/Logger.ts

@@ -20,18 +20,20 @@ export const enum LOG_TYPE {
 class Logger {
   private static instance: Logger;
   private enableLogs: boolean = false;
+  private enableLogsLocal: string = "true";
 
-  setLogging(enabled: boolean, sdkConfig: DispatchSDKConfig) {
+  async setLogging(enabled: boolean, sdkConfig: DispatchSDKConfig) {
     this.enableLogs = enabled;
     crashlytics().setUserId(sdkConfig.userID).then().catch();
-    crashlytics()
-      .setAttributes({
-        userId: sdkConfig.userID,
-        userName: sdkConfig.userName,
-        tenantId: sdkConfig.tenantID,
-      })
-      .then()
-      .catch();
+    crashlytics().setAttributes({
+      userId: sdkConfig.userID,
+      userName: sdkConfig.userName,
+      tenantId: sdkConfig.tenantID,
+    }).then().catch();
+    let result = await SdkUtils.getRemoteConfig(EXPIRY_TIME);
+    if (result?.enableLogging?._value && result?.enableLogging?._value === "true") {
+      this.enableLogsLocal = result?.enableLogging?._value;
+    }
   }
 
   logEvent(TAG: string, message: string, logType: LOG_TYPE) {
@@ -44,26 +46,32 @@ class Logger {
     ) {
       crashlytics().recordError(new Error(message), TAG);
     }
-
   }
 
   async log(Tag: string, msg: string) {
-    if(Tag == TAG_VERIFY_OTP){
+    if (Tag == TAG_VERIFY_OTP) {
       try {
-        let result = await SdkUtils.getRemoteConfig(EXPIRY_TIME);
-        if (result?.enableLogging?._value && result?.enableLogging?._value === "true") {
-          console.log("====================================");
-          console.log("Logging to Coralogix: ",Tag,msg);
-          console.log("====================================");
+        if (this.enableLogsLocal === "true") {
           CoralogixRum.log(CoralogixLogSeverity.Info, Tag, msg);
         }
-      } catch (error:any) {
-        this.logEvent("DispatchSDK:RemoteConfigError:", error.message, LOG_TYPE.SDK_ERROR);
+      } catch (error: any) {
         return;
       }
     }
   }
 
+  async logCora(Tag: string, msg: string) {
+    try {
+      console.debug("logCora", `${Tag} - ${msg}`);
+      if (this.enableLogsLocal === "true") {
+        const finalTag = "DispatchSDK-" + Tag;
+        CoralogixRum.log(CoralogixLogSeverity.Info, finalTag, msg);
+      }
+    } catch (error: any) {
+      return;
+    }
+  }
+
   public static getInstance(): Logger {
     if (!Logger.instance) {
       Logger.instance = new Logger();

package/src/utils/SdkUtils.ts

@@ -44,6 +44,7 @@ export default class SdkUtils {
             toggleInAppUpdateiOS: false,
             toggleInAppUpdate: false,
             enableLogging: true,
+            enableHyperlocalLogging: true,
             enableLoggingTenantIds: '',
             enableLoggingUserIds: '',
           })