@os1-platform/dispatch-mobile 2.1.5 → 2.1.7

package/src/ui/screens/DropCashScreen.tsx

@@ -13,6 +13,9 @@ import { 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';
 
 // OLD CODE
 // function getTotalExpected(nextStates: any[]): ETAmount {
@@ -51,6 +54,9 @@ const DropCashScreen = ({
 
   useEffect(() => {
     (async () => {
+      //fire sentry event
+      fireEventWithScreenName({severityLevel:SeverityLevelValue.LOG, eventName:SentryEventNameSdkConstants.RETURN_CASH_ET_OPENED, screenName:ScreenNameSdkConstants.RETURN_CASH_ET_SCREEN});
+      //      
       onTaskStart(
         nextState,
         route.params[RouteParams.ROOT_META_DATA].customEventsData

package/src/ui/screens/FormsScreen.tsx

@@ -14,6 +14,8 @@ import callbackHandler from '../../manager/sdk/callbacksHandler';
 import { DispatchExecutor as dispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import { AjvError } from '@rjsf/core';
 import Helper from '../../utils/helper';
+import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
+import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
 
 const FormsScreen = ({
   route,
@@ -38,6 +40,7 @@ const FormsScreen = ({
 
   useEffect(() => {
     (async () => {
+      fireEventWithScreenName({severityLevel:SeverityLevelValue.LOG, eventName:SentryEventNameSdkConstants.FORM_ET_OPENED, screenName:ScreenNameSdkConstants.FORM_ET_SCREEN});      
       onTaskStart(
         route.params[RouteParams.NEXT_STATES],
         route.params[RouteParams.ROOT_META_DATA].customEventsData

package/src/ui/screens/GeofenceScreen.tsx

@@ -7,6 +7,8 @@ import type { BaseETProps } from '../../models/DispatchModels';
 import DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';
 import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
+import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
+import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
 
 const GeofenceScreen = ({
   route,
@@ -20,7 +22,15 @@ const GeofenceScreen = ({
   const nextState = route.params[RouteParams.NEXT_STATES];
   const { taskMeta, mergedObjectiveId, input, wfMeta } =
     getDataFromNextState(nextState);
-  useEffect(() => {
+  
+    useEffect(() => {
+      (async () => {
+        //fire sentry event
+        fireEventWithScreenName({severityLevel:SeverityLevelValue.LOG, eventName:SentryEventNameSdkConstants.VERIFY_LOCATION_ET_OPENED, screenName:ScreenNameSdkConstants.VERIFY_LOCATION_ET_SCREEN});
+      })();
+    }, []);
+  
+    useEffect(() => {
     onTaskStart(
       nextState,
       route.params[RouteParams.ROOT_META_DATA].customEventsData

package/src/ui/screens/ImageCaptureScreen.tsx

@@ -8,6 +8,8 @@ import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
 import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import Helper from '../../utils/helper';
+import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
+import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
 
 
 const ImageCaptureScreen = ({
@@ -30,6 +32,9 @@ const ImageCaptureScreen = ({
 
   useEffect(() => {
     (async () => {
+      //fire sentry event
+      fireEventWithScreenName({severityLevel:SeverityLevelValue.LOG, eventName:SentryEventNameSdkConstants.CAPTURE_IMAGE_ET_OPENED, screenName:ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN});
+      //      
       onTaskStart(
         route.params[RouteParams.NEXT_STATES],
         route.params[RouteParams.ROOT_META_DATA].customEventsData

package/src/ui/screens/PaymentScreen.tsx

@@ -21,6 +21,8 @@ import { useEffect } from 'react';
 import { IDispatch } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import { GO_BACK_EVENT_CODE } from '../../constants/constants';
 import Helper from '../../utils/helper';
+import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
+import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
 
 const PaymentScreen = ({
   navigation,
@@ -45,6 +47,9 @@ const PaymentScreen = ({
 
   useEffect(() => {
     (async () => {
+      //fire sentry event
+      fireEventWithScreenName({severityLevel:SeverityLevelValue.LOG, eventName:SentryEventNameSdkConstants.COLLECT_CASH_ET_OPENED, screenName:ScreenNameSdkConstants.COLLECT_CASH_ET_SCREEN});
+      //      
       onTaskStart(
         route.params[RouteParams.NEXT_STATES],
         route.params[RouteParams.ROOT_META_DATA].customEventsData

package/src/ui/screens/PickupScreen.tsx

@@ -10,6 +10,8 @@ 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';
 
 const PickupScreen = ({
   route,
@@ -21,7 +23,6 @@ const PickupScreen = ({
   baseETProps: BaseETProps;
 }) => {
   const helperInstance = Helper.getInstance();
-
   const nextState = route.params[RouteParams.NEXT_STATES];
   const { taskMeta, mergedObjectiveId, input, wfMeta, taskName } =
     getDataFromNextState(nextState);
@@ -31,8 +32,13 @@ 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});
+      //      
       onTaskStart(
         nextState,
         route.params[RouteParams.ROOT_META_DATA].customEventsData

package/src/ui/screens/ValidateOTPScreen.tsx

@@ -6,6 +6,8 @@ import DispatchStateContainer from '../../manager/dispatch/DispatchStateContaine
 import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import ValidateOTPET from '../../components/executiontasks/validateOTP/ValidateOTPET';
 import { handleDynamicValues, onTaskStart } from '../../utils/ExecTaskUtils';
+import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
+import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
 
 const ValidateOTPScreen = ({
   route,
@@ -37,6 +39,14 @@ const ValidateOTPScreen = ({
     }
   }, []);
 
+  useEffect(() => {
+    (async () => {
+      //fire sentry event
+      fireEventWithScreenName({severityLevel:SeverityLevelValue.LOG, eventName:SentryEventNameSdkConstants.VERIFY_OTP_ET_OPENED, screenName:ScreenNameSdkConstants.VERIFY_OTP_ET_SCREEN});
+    })();
+  }, []);
+
+
   return (
     <ValidateOTPET
       {..._input}

package/src/utils/ExecTaskUtils.ts

@@ -9,6 +9,7 @@ import dispatchEvent from '../events/EventDispatcher';
 import type { startEvent } from '../models/DispatchModels';
 import { JSONPath } from 'jsonpath-plus';
 import { IDispatch } from '@os1-platform/platform-coreos-execution-engine-sdk';
+import { last } from 'lodash';
 
 export async function getBaseETResponse(
   entityCode: string,
@@ -18,14 +19,20 @@ export async function getBaseETResponse(
   mergedObjectiveIds: Array<string>,
   taskId: ExecutionTaskID
 ): Promise<BaseETResponse> {
-  // let location = LocationManager.getInstance().getLastLocation();
+ let lastLocation = LocationManager.getInstance().getLastLocation();
+ console.log("getBaseETResponse:lastLocation:",JSON.stringify(lastLocation))
+
   let cache = DispatchSdkCache.getInstance();
   const sdkConfig = (await cache.getObjectFromCache(
     DispatchSdkCache.KEYS.SDK_CONFIG
   )) as DispatchSDKConfig;
-  /* const startTime = await cache.getObjectFromCache(
+  const startTime = await cache.getObjectFromCache(
     DispatchSdkCache.KEYS.TASK_START_TIME
-  ); */
+  );
+  const startLocation = await cache.getObjectFromCache(
+    DispatchSdkCache.KEYS.TASK_START_LOCATION
+  );
+  console.log("getBaseETResponse:startLocation:",startLocation);
   let baseResponse: BaseETResponse = {
     entityCode: entityCode,
     success: success,
@@ -33,19 +40,29 @@ export async function getBaseETResponse(
     reasonCode: reasonCode,
     id: taskId,
     meta: {
-      /* location: {
-        latitude: location.latitude,
-        longitude: location.longitude,
-      },*/
+      startLocation:{
+        latitude:startLocation.latitude,
+        longitude:startLocation.longitude
+      },
+      endLocation:{
+        latitude:lastLocation.latitude,
+        longitude:lastLocation.longitude
+      },
+      // location: {
+      //   latitude: location.latitude,
+      //   longitude: location.longitude,
+      // },
       userDetails: {
         id: sdkConfig?.userID ?? '',
         name: sdkConfig?.userName ?? '',
       },
-      /*startTime: startTime ? parseInt(startTime) : Date.now(),
-      endTime: Date.now(), */
+      startTime: startTime ? parseInt(startTime) : Date.now(),
+      endTime: Date.now(),
     },
     mergedObjectiveIds,
   };
+  console.log("getBaseETResponse:baseResponse:",JSON.stringify(baseResponse));
+
   return baseResponse;
 }
 
@@ -129,8 +146,17 @@ export function onTaskStart(
   const keys = DispatchSdkCache.KEYS;
   const cache = DispatchSdkCache.getInstance();
   (async () => {
-    // await cache.setKeyInCache(keys.TASK_START_TIME, Date.now().toString());
+    let lastLocation = LocationManager.getInstance().getLastLocation();
+    let location = {
+      latitude: lastLocation.latitude,
+      longitude: lastLocation.longitude,
+    }
+    console.log("onTaskStart:lastLocation:",location)
+    await cache.setKeyInCache(keys.TASK_START_TIME, Date.now().toString());
     await cache.setKeyInCache(keys.CURRENT_WORKING_TASK_ID, eventData.taskId);
+    await cache.setObjectInCache(keys.TASK_START_LOCATION, location);
+
+
   })();
   if (triggerEvent) {
     const customEtName = eventData.taskName;

package/src/utils/Logger.ts

@@ -1,7 +1,6 @@
 import DispatchSdkCache from '../manager/sdk/DispatchSdkCache';
 import type { DispatchSDKConfig } from '../models/sdk';
 import * as Sentry from '@sentry/react-native';
-import { Severity } from '@sentry/react-native';
 import crashlytics from '@react-native-firebase/crashlytics';
 
 export const enum LOG_TYPE {
@@ -43,7 +42,7 @@ class Logger {
       logType === LOG_TYPE.APP_WARNING
     ) {
       crashlytics().recordError(new Error(message), TAG);
-      this.sendSentryException(new Error(message), TAG, logType);
+      //this.sendSentryException(new Error(message), TAG, logType);
     }
   }
 
@@ -54,57 +53,57 @@ class Logger {
     return Logger.instance;
   }
 
-  public sendSentryException(exception: any, logTag: string, logType: string) {
-    (async () => {
-      try {
-        Sentry.captureException(
-          exception,
-          await this.getUserConfig(Severity.Error, logType, logTag)
-        );
-      } catch (error: any) {}
-    })();
-  }
+  // public sendSentryException(exception: any, logTag: string, logType: string) {
+  //   // (async () => {
+  //   //   try {
+  //   //     Sentry.captureException(
+  //   //       exception,
+  //   //       await this.getUserConfig(Severity.Error, logType, logTag)
+  //   //     );
+  //   //   } catch (error: any) {}
+  //   // })();
+  // }
 
-  public sendSentryMessage(message: string, logTag: string, logType: string) {
-    (async () => {
-      try {
-        Sentry.captureMessage(
-          message,
-          await this.getUserConfig(Severity.Warning, logType, logTag)
-        );
-      } catch (error: any) {}
-    })();
-  }
+  // public sendSentryMessage(message: string, logTag: string, logType: string) {
+  //   // (async () => {
+  //   //   try {
+  //   //     Sentry.captureMessage(
+  //   //       message,
+  //   //       await this.getUserConfig(Severity.Warning, logType, logTag)
+  //   //     );
+  //   //   } catch (error: any) {}
+  //   // })();
+  // }
 
-  private async getUserConfig(
-    logLevel: Severity,
-    logType: string,
-    logTag: string
-  ) {
-    try {
-      const config = (await DispatchSdkCache.getInstance().getObjectFromCache(
-        DispatchSdkCache.KEYS.SDK_CONFIG
-      )) as DispatchSDKConfig;
-      const dspId = await DispatchSdkCache.getInstance().getKeyFromCache(
-        DispatchSdkCache.KEYS.DISPATCH_ID
-      );
-      return {
-        user: {
-          id: config?.userID,
-          username: config?.userName,
-        },
-        tags: {
-          dispatchId: dspId,
-          errorTime: Date.now(),
-          logType: logType,
-          logTag: logTag,
-        },
-        level: logLevel,
-      };
-    } catch (error: any) {
-      return undefined;
-    }
-  }
+  // private async getUserConfig(
+  //   logLevel: Severity,
+  //   logType: string,
+  //   logTag: string
+  // ) {
+  //   try {
+  //     const config = (await DispatchSdkCache.getInstance().getObjectFromCache(
+  //       DispatchSdkCache.KEYS.SDK_CONFIG
+  //     )) as DispatchSDKConfig;
+  //     const dspId = await DispatchSdkCache.getInstance().getKeyFromCache(
+  //       DispatchSdkCache.KEYS.DISPATCH_ID
+  //     );
+  //     return {
+  //       user: {
+  //         id: config?.userID,
+  //         username: config?.userName,
+  //       },
+  //       tags: {
+  //         dispatchId: dspId,
+  //         errorTime: Date.now(),
+  //         logType: logType,
+  //         logTag: logTag,
+  //       },
+  //       level: logLevel,
+  //     };
+  //   } catch (error: any) {
+  //     return undefined;
+  //   }
+  // }
 }
 
 export default Logger;

package/src/utils/SyncManagerUtils.ts

@@ -14,6 +14,7 @@ import type {
   ExecEngineSyncType,
 } from '../manager/syncmanager/DBConfig';
 import Storage from './storage';
+import LocationManager from '../manager/location/LocationManager';
 
 const keys = DispatchSdkCache.KEYS;
 const cache = DispatchSdkCache.getInstance();
@@ -135,8 +136,23 @@ export async function insertDocumentInDB(
   // objRef: string,
   base64Image: string | null,
   imageDesc: string,
-  filePath: string | null
+  filePath: string | null,
+  dateTime: string | null,
+  lat: string,
+  lng: string,
+  accuracy: string
 ): Promise<number | undefined> {
+  let geoTimeStamp = {
+    dateTime: dateTime,
+    lat: lat,
+    lng: lng,
+    accuracy: accuracy,
+  };
+  let geoTimeStampStr = JSON.stringify(geoTimeStamp);
+  console.log('geoTimeStampStr:', geoTimeStampStr);
+  console.log('insertDocumentInDB1:', fmsFolderName);
+
+  let processedFilePath = '';
   try {
     const dspID = await cache.getKeyFromCache(keys.DISPATCH_ID);
     let response = await DocumentSyncManager.getInstance().insertDocument(
@@ -149,7 +165,9 @@ export async function insertDocumentInDB(
       // objRef,
       filePath,
       'image',
-      fileName
+      fileName,
+      geoTimeStampStr,
+      processedFilePath
     );
     AppSyncManager.getInstance().startSDKSyncManager();
     return response.insertId;

package/src/utils/utils.ts

@@ -28,3 +28,26 @@ export function isTokenExpired(accessToken: string) {
   let decodedData: any = jwtDecode(accessToken);
   return !(decodedData && decodedData.exp * 1000 > Date.now());
 }
+
+export function flattenObject(obj: Record<string, any>, prefix = ''): string {
+  return JSON.stringify(obj);
+  // return Object.keys(obj).reduce((acc, key) => {
+  //     const flatKey = prefix ? `${prefix}.${key}` : key;
+  //     if (typeof obj[key] === 'object' && !Array.isArray(obj[key])) {
+  //         return acc ?? '' + flattenObject(obj[key], flatKey);
+  //     } else {
+  //         return acc ?? '' + `${flatKey}: ${JSON.stringify(obj[key])}\n`;
+  //     }
+  // }, '');
+}
+
+
+export function createObjectWithoutNullValues<T extends { [key: string]: any }>(obj: T): Partial<T> {
+  const newObj: Partial<T> = {};
+  for (const key in obj) {
+      if (Object.prototype.hasOwnProperty.call(obj, key) && obj[key] !== null && obj[key] !== 'request' && obj[key] !== 'headers') {
+          newObj[key] = obj[key];
+      }
+  }
+  return newObj;
+}