@os1-platform/dispatch-mobile 1.3.11 → 2.0.1

package/lib/module/ui/screens/DropCashScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useEffect","useState","withBaseDispatchScreen","SLDropCash","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","View","CancelOrderDialog","onTaskStart","getTotalExpected","nextStates","totalAmount","s","nextState","data","input","expectedAmount","value","minorUnit","currencyCode","DropCashScreen","_ref","route","navigation","baseETProps","params","NEXT_STATES","showAlert","setShowAlert","sResponse","setResponse","submitOutput","etOutput","getInstance","navigateToNextTask","success","DELIVER_CASH","createElement","style","flex","_extends","taskMeta","JSON","parse","onSubmitET","_prevState","visible","onSubmit"],"sources":["DropCashScreen.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useState } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { SLDropCash } from '../../components/executiontasks/ExecutionTasksIndex';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams } from '../uiConfig/RouteParams';\nimport type { ETAmount } from '../../components/executiontasks/payments/init/InitPaymentSchema';\nimport { View } from 'react-native';\nimport CancelOrderDialog from '../../components/widgets/CancelOrderDialog';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nfunction getTotalExpected(nextStates: any[]): ETAmount {\n  let totalAmount = 0;\n  for (const s of nextStates) {\n    totalAmount += s.nextState.data.input.expectedAmount.value;\n  }\n  return {\n    value: totalAmount,\n    minorUnit: nextStates[0].nextState.data.input.expectedAmount.minorUnit,\n    currencyCode:\n      nextStates[0].nextState.data.input.expectedAmount.currencyCode,\n  };\n}\n\nconst DropCashScreen = ({\n  route,\n  navigation,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  useEffect(() => {\n    onTaskStart(route.params[RouteParams.NEXT_STATES]);\n  }, []);\n  const [showAlert, setShowAlert] = useState(false);\n  const [sResponse, setResponse] = useState<any>();\n  const submitOutput = useCallback(\n    async (etOutput: any) => {\n      await DispatchStateContainer.getInstance().navigateToNextTask(\n        navigation,\n        route,\n        etOutput,\n        etOutput.success,\n        EntityCode.DELIVER_CASH,\n        ExecutionTaskID.DELIVER_CASH,\n        baseETProps,\n        false\n      );\n    },\n    [baseETProps, navigation, route]\n  );\n  return (\n    <View style={{ flex: 1 }}>\n      <SLDropCash\n        {...route.params[RouteParams.NEXT_STATES][0].nextState.data.input}\n        expectedAmount={getTotalExpected(route.params[RouteParams.NEXT_STATES])}\n        navigation={navigation}\n        taskMeta={JSON.parse(\n          route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta ||\n            '{}'\n        )}\n        onSubmitET={async (etOutput) => {\n          if (etOutput.success) {\n            await submitOutput(etOutput);\n          } else {\n            setResponse((_prevState: any) => {\n              setShowAlert(true);\n              return etOutput;\n            });\n          }\n        }}\n      />\n      <CancelOrderDialog\n        visible={showAlert}\n        onSubmit={async (value) => {\n          if (value) {\n            setShowAlert(false);\n            await submitOutput(sResponse);\n          } else {\n            setShowAlert(false);\n          }\n        }}\n      />\n    </View>\n  );\n};\nexport default withBaseDispatchScreen(DropCashScreen);\n"],"mappings":"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"}
+{"version":3,"names":["React","useCallback","useEffect","useState","withBaseDispatchScreen","SLDropCash","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","getDataFromNextState","View","CancelOrderDialog","onTaskStart","DispatchExecutor","DropCashScreen","_ref","route","navigation","baseETProps","nextState","params","NEXT_STATES","taskMeta","mergedObjectiveId","input","wfMeta","expectedAmount","setExpectedAmount","value","minorUnit","currencyCode","getTotalExpected","totalAmount","getTotalAmountMWI","ROOT_META_DATA","customEventsData","showAlert","setShowAlert","sResponse","setResponse","submitOutput","etOutput","getInstance","navigateToNextTask","success","DELIVER_CASH","createElement","style","flex","_extends","onSubmitET","_prevState","visible","onSubmit"],"sources":["DropCashScreen.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useState } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { SLDropCash } from '../../components/executiontasks/ExecutionTasksIndex';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';\nimport type { ETAmount } from '../../components/executiontasks/payments/init/InitPaymentSchema';\nimport { View } from 'react-native';\nimport CancelOrderDialog from '../../components/widgets/CancelOrderDialog';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nimport { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';\n\n// OLD CODE\n// function getTotalExpected(nextStates: any[]): ETAmount {\n//   let totalAmount = 0;\n//   for (const s of nextStates) {\n//     totalAmount += s.nextState.data.input.expectedAmount.value;\n//   }\n//   return {\n//     value: totalAmount,\n//     minorUnit: nextStates[0].nextState.data.input.expectedAmount.minorUnit,\n//     currencyCode:\n//       nextStates[0].nextState.data.input.expectedAmount.currencyCode,\n//   };\n// }\n\nconst DropCashScreen = ({\n  route,\n  navigation,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  const nextState = route.params[RouteParams.NEXT_STATES];\n  const { taskMeta, mergedObjectiveId, input, wfMeta } =\n    getDataFromNextState(nextState);\n\n  const [expectedAmount, setExpectedAmount] = useState<ETAmount>({\n    value: 0,\n    minorUnit: input.expectedAmount.minorUnit,\n    currencyCode: input.expectedAmount.currencyCode,\n  });\n\n  const getTotalExpected = async () => {\n    const totalAmount: number = await DispatchExecutor.getTotalAmountMWI(\n      mergedObjectiveId\n    );\n    setExpectedAmount({ ...expectedAmount, value: totalAmount });\n  };\n\n  useEffect(() => {\n    onTaskStart(\n      nextState,\n      route.params[RouteParams.ROOT_META_DATA].customEventsData\n    );\n    getTotalExpected();\n  }, []);\n\n  const [showAlert, setShowAlert] = useState(false);\n  const [sResponse, setResponse] = useState<any>();\n  const submitOutput = useCallback(\n    async (etOutput: any) => {\n      await DispatchStateContainer.getInstance().navigateToNextTask(\n        navigation,\n        route,\n        etOutput,\n        etOutput.success,\n        EntityCode.DELIVER_CASH,\n        ExecutionTaskID.DELIVER_CASH,\n        baseETProps,\n        false\n      );\n    },\n    [baseETProps, navigation, route]\n  );\n  return (\n    <View style={{ flex: 1 }}>\n      <SLDropCash\n        {...input}\n        expectedAmount={expectedAmount}\n        navigation={navigation}\n        mergedObjectiveId={mergedObjectiveId}\n        taskMeta={taskMeta}\n        onSubmitET={async (etOutput) => {\n          if (etOutput.success) {\n            await submitOutput(etOutput);\n          } else {\n            setResponse((_prevState: any) => {\n              setShowAlert(true);\n              return etOutput;\n            });\n          }\n        }}\n      />\n      <CancelOrderDialog\n        visible={showAlert}\n        onSubmit={async (value) => {\n          if (value) {\n            setShowAlert(false);\n            await submitOutput(sResponse);\n          } else {\n            setShowAlert(false);\n          }\n        }}\n      />\n    </View>\n  );\n};\nexport default withBaseDispatchScreen(DropCashScreen);\n"],"mappings":"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"}

package/lib/module/ui/screens/ETScreensIndex.js

@@ -11,9 +11,8 @@ import PaymentScreen from './PaymentScreen';
 import DisplayScreen from './DisplayScreen';
 import CompleteObjectiveScreen from './CompleteObjectiveScreen';
 import DropCashScreen from './DropCashScreen';
-import RTScanScreen from './RTScanScreen';
 import ScanScreen from './ScanScreen';
 import HttpRequestScreen from './HttpRequestScreen';
 import ValidateOTPScreen from './ValidateOTPScreen';
-export { CancellationScreen, DeliverScreen, DoodleScreen, ImageCaptureScreen, FormsScreen, PickupScreen, StartWorkFlowScreen, CaptureInputScreen, GeofenceScreen, PaymentScreen, DisplayScreen, CompleteObjectiveScreen, DropCashScreen, RTScanScreen, ScanScreen, HttpRequestScreen, ValidateOTPScreen };
+export { CancellationScreen, DeliverScreen, DoodleScreen, ImageCaptureScreen, FormsScreen, PickupScreen, StartWorkFlowScreen, CaptureInputScreen, GeofenceScreen, PaymentScreen, DisplayScreen, CompleteObjectiveScreen, DropCashScreen, ScanScreen, HttpRequestScreen, ValidateOTPScreen };
 //# sourceMappingURL=ETScreensIndex.js.map

package/lib/module/ui/screens/ETScreensIndex.js.map

@@ -1 +1 @@
-{"version":3,"names":["CancellationScreen","DeliverScreen","DoodleScreen","ImageCaptureScreen","FormsScreen","PickupScreen","StartWorkFlowScreen","CaptureInputScreen","GeofenceScreen","PaymentScreen","DisplayScreen","CompleteObjectiveScreen","DropCashScreen","RTScanScreen","ScanScreen","HttpRequestScreen","ValidateOTPScreen"],"sources":["ETScreensIndex.ts"],"sourcesContent":["import CancellationScreen from './CancellationScreen';\nimport DeliverScreen from './DeliverScreen';\nimport DoodleScreen from './DoodleScreen';\nimport ImageCaptureScreen from './ImageCaptureScreen';\nimport FormsScreen from './FormsScreen';\nimport PickupScreen from './PickupScreen';\nimport StartWorkFlowScreen from './StartWorkFlowScreen';\nimport CaptureInputScreen from './CaptureInputScreen';\nimport GeofenceScreen from './GeofenceScreen';\nimport PaymentScreen from './PaymentScreen';\nimport DisplayScreen from './DisplayScreen';\nimport CompleteObjectiveScreen from './CompleteObjectiveScreen';\nimport DropCashScreen from './DropCashScreen';\nimport RTScanScreen from './RTScanScreen';\nimport ScanScreen from './ScanScreen';\nimport HttpRequestScreen from './HttpRequestScreen';\nimport ValidateOTPScreen from './ValidateOTPScreen';\n\nexport {\n  CancellationScreen,\n  DeliverScreen,\n  DoodleScreen,\n  ImageCaptureScreen,\n  FormsScreen,\n  PickupScreen,\n  StartWorkFlowScreen,\n  CaptureInputScreen,\n  GeofenceScreen,\n  PaymentScreen,\n  DisplayScreen,\n  CompleteObjectiveScreen,\n  DropCashScreen,\n  RTScanScreen,\n  ScanScreen,\n  HttpRequestScreen,\n  ValidateOTPScreen,\n};\n"],"mappings":"AAAA,OAAOA,kBAAkB,MAAM,sBAAsB;AACrD,OAAOC,aAAa,MAAM,iBAAiB;AAC3C,OAAOC,YAAY,MAAM,gBAAgB;AACzC,OAAOC,kBAAkB,MAAM,sBAAsB;AACrD,OAAOC,WAAW,MAAM,eAAe;AACvC,OAAOC,YAAY,MAAM,gBAAgB;AACzC,OAAOC,mBAAmB,MAAM,uBAAuB;AACvD,OAAOC,kBAAkB,MAAM,sBAAsB;AACrD,OAAOC,cAAc,MAAM,kBAAkB;AAC7C,OAAOC,aAAa,MAAM,iBAAiB;AAC3C,OAAOC,aAAa,MAAM,iBAAiB;AAC3C,OAAOC,uBAAuB,MAAM,2BAA2B;AAC/D,OAAOC,cAAc,MAAM,kBAAkB;AAC7C,OAAOC,YAAY,MAAM,gBAAgB;AACzC,OAAOC,UAAU,MAAM,cAAc;AACrC,OAAOC,iBAAiB,MAAM,qBAAqB;AACnD,OAAOC,iBAAiB,MAAM,qBAAqB;AAEnD,SACEhB,kBAAkB,EAClBC,aAAa,EACbC,YAAY,EACZC,kBAAkB,EAClBC,WAAW,EACXC,YAAY,EACZC,mBAAmB,EACnBC,kBAAkB,EAClBC,cAAc,EACdC,aAAa,EACbC,aAAa,EACbC,uBAAuB,EACvBC,cAAc,EACdC,YAAY,EACZC,UAAU,EACVC,iBAAiB,EACjBC,iBAAiB"}
+{"version":3,"names":["CancellationScreen","DeliverScreen","DoodleScreen","ImageCaptureScreen","FormsScreen","PickupScreen","StartWorkFlowScreen","CaptureInputScreen","GeofenceScreen","PaymentScreen","DisplayScreen","CompleteObjectiveScreen","DropCashScreen","ScanScreen","HttpRequestScreen","ValidateOTPScreen"],"sources":["ETScreensIndex.ts"],"sourcesContent":["import CancellationScreen from './CancellationScreen';\nimport DeliverScreen from './DeliverScreen';\nimport DoodleScreen from './DoodleScreen';\nimport ImageCaptureScreen from './ImageCaptureScreen';\nimport FormsScreen from './FormsScreen';\nimport PickupScreen from './PickupScreen';\nimport StartWorkFlowScreen from './StartWorkFlowScreen';\nimport CaptureInputScreen from './CaptureInputScreen';\nimport GeofenceScreen from './GeofenceScreen';\nimport PaymentScreen from './PaymentScreen';\nimport DisplayScreen from './DisplayScreen';\nimport CompleteObjectiveScreen from './CompleteObjectiveScreen';\nimport DropCashScreen from './DropCashScreen';\nimport ScanScreen from './ScanScreen';\nimport HttpRequestScreen from './HttpRequestScreen';\nimport ValidateOTPScreen from './ValidateOTPScreen';\n\nexport {\n  CancellationScreen,\n  DeliverScreen,\n  DoodleScreen,\n  ImageCaptureScreen,\n  FormsScreen,\n  PickupScreen,\n  StartWorkFlowScreen,\n  CaptureInputScreen,\n  GeofenceScreen,\n  PaymentScreen,\n  DisplayScreen,\n  CompleteObjectiveScreen,\n  DropCashScreen,\n  ScanScreen,\n  HttpRequestScreen,\n  ValidateOTPScreen,\n};\n"],"mappings":"AAAA,OAAOA,kBAAkB,MAAM,sBAAsB;AACrD,OAAOC,aAAa,MAAM,iBAAiB;AAC3C,OAAOC,YAAY,MAAM,gBAAgB;AACzC,OAAOC,kBAAkB,MAAM,sBAAsB;AACrD,OAAOC,WAAW,MAAM,eAAe;AACvC,OAAOC,YAAY,MAAM,gBAAgB;AACzC,OAAOC,mBAAmB,MAAM,uBAAuB;AACvD,OAAOC,kBAAkB,MAAM,sBAAsB;AACrD,OAAOC,cAAc,MAAM,kBAAkB;AAC7C,OAAOC,aAAa,MAAM,iBAAiB;AAC3C,OAAOC,aAAa,MAAM,iBAAiB;AAC3C,OAAOC,uBAAuB,MAAM,2BAA2B;AAC/D,OAAOC,cAAc,MAAM,kBAAkB;AAC7C,OAAOC,UAAU,MAAM,cAAc;AACrC,OAAOC,iBAAiB,MAAM,qBAAqB;AACnD,OAAOC,iBAAiB,MAAM,qBAAqB;AAEnD,SACEf,kBAAkB,EAClBC,aAAa,EACbC,YAAY,EACZC,kBAAkB,EAClBC,WAAW,EACXC,YAAY,EACZC,mBAAmB,EACnBC,kBAAkB,EAClBC,cAAc,EACdC,aAAa,EACbC,aAAa,EACbC,uBAAuB,EACvBC,cAAc,EACdC,UAAU,EACVC,iBAAiB,EACjBC,iBAAiB"}

package/lib/module/ui/screens/FormsScreen.js

@@ -2,55 +2,122 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 import React, { useEffect, useState } from 'react';
 import withBaseDispatchScreen from './WithBaseDispatchScreen';
 import { FormGenerator } from '../../components/executiontasks/ExecutionTasksIndex';
-import { showToast } from '../../components/widgets/Toaster';
 import { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';
 import DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';
-import { RouteParams } from '../uiConfig/RouteParams';
+import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import { handleDynamicValues, onTaskStart } from '../../utils/ExecTaskUtils';
+import { View } from 'react-native';
+import SnackBarCustom, { SnackBarType } from '../../components/widgets/SnackBarCustom';
+import callbackHandler from '../../manager/sdk/callbacksHandler';
+import { DispatchExecutor as dispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 const FormsScreen = _ref => {
   let {
     route,
     navigation,
     baseETProps
   } = _ref;
-  const firstInput = route.params[RouteParams.NEXT_STATES][0].nextState.data.input;
-  const [_input, setInputs] = useState({
-    ...firstInput
+  const [snackBar, setSnackBar] = useState({
+    show: false,
+    type: SnackBarType.SUCCESS,
+    message: ''
   });
+  const nextState = route.params[RouteParams.NEXT_STATES];
+  const {
+    taskMeta,
+    mergedObjectiveId,
+    input,
+    wfMeta
+  } = getDataFromNextState(nextState);
+  const [_input, setInputs] = useState(input);
   useEffect(() => {
-    onTaskStart(route.params[RouteParams.NEXT_STATES]);
-    if (route.params[RouteParams.ROOT_META_DATA]) {
-      let jsonSchemaProperties = _input.jsonSchema.properties;
-      jsonSchemaProperties = handleDynamicValues(jsonSchemaProperties, route.params[RouteParams.ROOT_META_DATA]);
+    (async () => {
+      onTaskStart(route.params[RouteParams.NEXT_STATES], route.params[RouteParams.ROOT_META_DATA].customEventsData);
+      if (route.params[RouteParams.ROOT_META_DATA]) {
+        var _phoneNumbers$value;
+        //Call objectiveDetails fn and fetch sds ids
+        const {
+          contact
+        } = await dispatchExecutor.getObjectiveTaskDetails(mergedObjectiveId[0], route.params[RouteParams.ROOT_META_DATA].statusFilter);
 
-      // _input.jsonSchema.properties = jsonSchemaProperties;
-      setInputs(prev => ({
-        ...prev,
-        jsonSchema: {
-          ...prev.jsonschema,
-          properties: jsonSchemaProperties
+        // run callback to get corresponding phone numbers
+        const phoneNumbers = await callbackHandler.getPhoneNumbers(contact);
+        if (phoneNumbers && (_phoneNumbers$value = phoneNumbers.value) !== null && _phoneNumbers$value !== void 0 && _phoneNumbers$value.length) {
+          route.params[RouteParams.ROOT_META_DATA].meta[phoneNumbers.key] = phoneNumbers.value;
         }
-      }));
-    }
+        let jsonSchemaProperties = JSON.parse(JSON.stringify(_input.jsonSchema.properties));
+        jsonSchemaProperties = handleDynamicValues(jsonSchemaProperties, route.params[RouteParams.ROOT_META_DATA]);
+        setInputs(prev => {
+          const dynamicInput = {
+            ...prev,
+            jsonSchema: {
+              ...prev.jsonSchema,
+              properties: jsonSchemaProperties
+            }
+          };
+          return dynamicInput;
+        });
+      }
+    })();
   }, []);
-  return /*#__PURE__*/React.createElement(FormGenerator, _extends({}, _input, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormGenerator, _extends({}, _input, {
     navigation: navigation,
-    taskMeta: JSON.parse(route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta || '{}'),
+    mergedObjectiveId: mergedObjectiveId,
+    taskMeta: taskMeta,
     onError: error => {
-      let errorMessage = '';
-      if (Array.isArray(error)) {
-        error.forEach(e => {
-          errorMessage += `${e.message}\n`;
-        });
-      } else {
-        errorMessage = error.message;
-      }
-      showToast(errorMessage);
+      const errorMessage = transformErrorMessage(error);
+      setSnackBar({
+        show: true,
+        type: SnackBarType.FAILURE,
+        message: errorMessage
+      });
     },
     onSubmitET: async result => {
       await DispatchStateContainer.getInstance().navigateToNextTask(navigation, route, result, result.success, EntityCode.FORMS, ExecutionTaskID.FORMS, baseETProps, false);
     }
-  }));
+  })), /*#__PURE__*/React.createElement(View, {
+    style: {
+      justifyContent: 'flex-end'
+    }
+  }, /*#__PURE__*/React.createElement(SnackBarCustom, {
+    type: snackBar.type,
+    message: `${snackBar.message}`,
+    visible: snackBar.show,
+    onDismiss: () => {
+      setSnackBar({
+        show: false,
+        message: '',
+        type: SnackBarType.SUCCESS
+      });
+    },
+    customBottom: 20
+  })));
 };
 export default withBaseDispatchScreen(FormsScreen);
+const transformErrorMessage = error => {
+  let errorMessage = '';
+  if (Array.isArray(error)) {
+    if (error.length === 1) {
+      const e = error[0];
+      if (e.name === 'required') {
+        errorMessage = `${convertToPascalCaseWithSpace(e.property)} is required`;
+      } else errorMessage = `${e.property} ${e.message}`;
+    } else {
+      errorMessage = 'Form Validation Failed';
+    }
+  } else {
+    errorMessage = `${error.property} ${error.message}`;
+  }
+  return errorMessage;
+};
+function convertToPascalCaseWithSpace(inputString) {
+  // Capitalize the first letter of each word while preserving spaces
+  return inputString.split(/[^a-zA-Z0-9]+/).filter(word => word.length > 0).map((word, index) => capitalizeWord(word, index === 0)).join(' ');
+}
+function capitalizeWord(word, isFirstWord) {
+  if (isFirstWord) {
+    return word.charAt(0).toUpperCase() + word.slice(1);
+  } else {
+    return word;
+  }
+}
 //# sourceMappingURL=FormsScreen.js.map

package/lib/module/ui/screens/FormsScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useState","withBaseDispatchScreen","FormGenerator","showToast","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","handleDynamicValues","onTaskStart","FormsScreen","_ref","route","navigation","baseETProps","firstInput","params","NEXT_STATES","nextState","data","input","_input","setInputs","ROOT_META_DATA","jsonSchemaProperties","jsonSchema","properties","prev","jsonschema","createElement","_extends","taskMeta","JSON","parse","onError","error","errorMessage","Array","isArray","forEach","e","message","onSubmitET","result","getInstance","navigateToNextTask","success","FORMS"],"sources":["FormsScreen.tsx"],"sourcesContent":["import React, { useEffect, useState } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport { FormGenerator } from '../../components/executiontasks/ExecutionTasksIndex';\nimport { showToast } from '../../components/widgets/Toaster';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams } from '../uiConfig/RouteParams';\nimport { handleDynamicValues, onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst FormsScreen = ({\n  route,\n  navigation,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  const firstInput =\n    route.params[RouteParams.NEXT_STATES][0].nextState.data.input;\n  const [_input, setInputs] = useState({ ...firstInput });\n  useEffect(() => {\n    onTaskStart(route.params[RouteParams.NEXT_STATES]);\n    if (route.params[RouteParams.ROOT_META_DATA]) {\n      let jsonSchemaProperties = _input.jsonSchema.properties;\n      jsonSchemaProperties = handleDynamicValues(\n        jsonSchemaProperties,\n        route.params[RouteParams.ROOT_META_DATA]\n      );\n\n      // _input.jsonSchema.properties = jsonSchemaProperties;\n      setInputs((prev: any) => ({\n        ...prev,\n        jsonSchema: { ...prev.jsonschema, properties: jsonSchemaProperties },\n      }));\n    }\n  }, []);\n\n  return (\n    <FormGenerator\n      {..._input}\n      navigation={navigation}\n      taskMeta={JSON.parse(\n        route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta || '{}'\n      )}\n      onError={(error: any) => {\n        let errorMessage = '';\n        if (Array.isArray(error)) {\n          error.forEach((e) => {\n            errorMessage += `${e.message}\\n`;\n          });\n        } else {\n          errorMessage = error.message;\n        }\n        showToast(errorMessage);\n      }}\n      onSubmitET={async (result) => {\n        await DispatchStateContainer.getInstance().navigateToNextTask(\n          navigation,\n          route,\n          result,\n          result.success,\n          EntityCode.FORMS,\n          ExecutionTaskID.FORMS,\n          baseETProps,\n          false\n        );\n      }}\n    />\n  );\n};\nexport default withBaseDispatchScreen(FormsScreen);\n"],"mappings":";AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAClD,OAAOC,sBAAsB,MAAM,0BAA0B;AAC7D,SAASC,aAAa,QAAQ,qDAAqD;AACnF,SAASC,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAE7E,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,WAAW,QAAQ,yBAAyB;AACrD,SAASC,mBAAmB,EAAEC,WAAW,QAAQ,2BAA2B;AAE5E,MAAMC,WAAW,GAAGC,IAAA,IAQd;EAAA,IARe;IACnBC,KAAK;IACLC,UAAU;IACVC;EAKF,CAAC,GAAAH,IAAA;EACC,MAAMI,UAAU,GACdH,KAAK,CAACI,MAAM,CAACT,WAAW,CAACU,WAAW,CAAC,CAAC,CAAC,CAAC,CAACC,SAAS,CAACC,IAAI,CAACC,KAAK;EAC/D,MAAM,CAACC,MAAM,EAAEC,SAAS,CAAC,GAAGtB,QAAQ,CAAC;IAAE,GAAGe;EAAW,CAAC,CAAC;EACvDhB,SAAS,CAAC,MAAM;IACdU,WAAW,CAACG,KAAK,CAACI,MAAM,CAACT,WAAW,CAACU,WAAW,CAAC,CAAC;IAClD,IAAIL,KAAK,CAACI,MAAM,CAACT,WAAW,CAACgB,cAAc,CAAC,EAAE;MAC5C,IAAIC,oBAAoB,GAAGH,MAAM,CAACI,UAAU,CAACC,UAAU;MACvDF,oBAAoB,GAAGhB,mBAAmB,CACxCgB,oBAAoB,EACpBZ,KAAK,CAACI,MAAM,CAACT,WAAW,CAACgB,cAAc,CAAC,CACzC;;MAED;MACAD,SAAS,CAAEK,IAAS,KAAM;QACxB,GAAGA,IAAI;QACPF,UAAU,EAAE;UAAE,GAAGE,IAAI,CAACC,UAAU;UAAEF,UAAU,EAAEF;QAAqB;MACrE,CAAC,CAAC,CAAC;IACL;EACF,CAAC,EAAE,EAAE,CAAC;EAEN,oBACE1B,KAAA,CAAA+B,aAAA,CAAC3B,aAAa,EAAA4B,QAAA,KACRT,MAAM;IACVR,UAAU,EAAEA,UAAW;IACvBkB,QAAQ,EAAEC,IAAI,CAACC,KAAK,CAClBrB,KAAK,CAACI,MAAM,CAACT,WAAW,CAACU,WAAW,CAAC,CAAC,CAAC,CAAC,CAACC,SAAS,CAACC,IAAI,CAACY,QAAQ,IAAI,IAAI,CACxE;IACFG,OAAO,EAAGC,KAAU,IAAK;MACvB,IAAIC,YAAY,GAAG,EAAE;MACrB,IAAIC,KAAK,CAACC,OAAO,CAACH,KAAK,CAAC,EAAE;QACxBA,KAAK,CAACI,OAAO,CAAEC,CAAC,IAAK;UACnBJ,YAAY,IAAK,GAAEI,CAAC,CAACC,OAAQ,IAAG;QAClC,CAAC,CAAC;MACJ,CAAC,MAAM;QACLL,YAAY,GAAGD,KAAK,CAACM,OAAO;MAC9B;MACAtC,SAAS,CAACiC,YAAY,CAAC;IACzB,CAAE;IACFM,UAAU,EAAE,MAAOC,MAAM,IAAK;MAC5B,MAAMrC,sBAAsB,CAACsC,WAAW,EAAE,CAACC,kBAAkB,CAC3DhC,UAAU,EACVD,KAAK,EACL+B,MAAM,EACNA,MAAM,CAACG,OAAO,EACd1C,UAAU,CAAC2C,KAAK,EAChB1C,eAAe,CAAC0C,KAAK,EACrBjC,WAAW,EACX,KAAK,CACN;IACH;EAAE,GACF;AAEN,CAAC;AACD,eAAeb,sBAAsB,CAACS,WAAW,CAAC"}
+{"version":3,"names":["React","useEffect","useState","withBaseDispatchScreen","FormGenerator","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","getDataFromNextState","handleDynamicValues","onTaskStart","View","SnackBarCustom","SnackBarType","callbackHandler","DispatchExecutor","dispatchExecutor","FormsScreen","_ref","route","navigation","baseETProps","snackBar","setSnackBar","show","type","SUCCESS","message","nextState","params","NEXT_STATES","taskMeta","mergedObjectiveId","input","wfMeta","_input","setInputs","ROOT_META_DATA","customEventsData","_phoneNumbers$value","contact","getObjectiveTaskDetails","statusFilter","phoneNumbers","getPhoneNumbers","value","length","meta","key","jsonSchemaProperties","JSON","parse","stringify","jsonSchema","properties","prev","dynamicInput","createElement","Fragment","_extends","onError","error","errorMessage","transformErrorMessage","FAILURE","onSubmitET","result","getInstance","navigateToNextTask","success","FORMS","style","justifyContent","visible","onDismiss","customBottom","Array","isArray","e","name","convertToPascalCaseWithSpace","property","inputString","split","filter","word","map","index","capitalizeWord","join","isFirstWord","charAt","toUpperCase","slice"],"sources":["FormsScreen.tsx"],"sourcesContent":["import React, { useEffect, useState } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport { FormGenerator } from '../../components/executiontasks/ExecutionTasksIndex';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';\nimport { handleDynamicValues, onTaskStart } from '../../utils/ExecTaskUtils';\nimport { View } from 'react-native';\nimport SnackBarCustom, {\n  SnackBarType,\n} from '../../components/widgets/SnackBarCustom';\nimport callbackHandler from '../../manager/sdk/callbacksHandler';\nimport { DispatchExecutor as dispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';\nimport { AjvError } from '@rjsf/core';\n\nconst FormsScreen = ({\n  route,\n  navigation,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  const [snackBar, setSnackBar] = useState({\n    show: false,\n    type: SnackBarType.SUCCESS,\n    message: '',\n  });\n  const nextState = route.params[RouteParams.NEXT_STATES];\n  const { taskMeta, mergedObjectiveId, input, wfMeta } =\n    getDataFromNextState(nextState);\n  const [_input, setInputs] = useState(input);\n  useEffect(() => {\n    (async () => {\n      onTaskStart(\n        route.params[RouteParams.NEXT_STATES],\n        route.params[RouteParams.ROOT_META_DATA].customEventsData\n      );\n\n      if (route.params[RouteParams.ROOT_META_DATA]) {\n        //Call objectiveDetails fn and fetch sds ids\n        const { contact } = await dispatchExecutor.getObjectiveTaskDetails(\n          mergedObjectiveId[0],\n          route.params[RouteParams.ROOT_META_DATA].statusFilter\n        );\n\n        // run callback to get corresponding phone numbers\n        const phoneNumbers = await callbackHandler.getPhoneNumbers(contact);\n\n        if (phoneNumbers && phoneNumbers.value?.length) {\n          route.params[RouteParams.ROOT_META_DATA].meta[phoneNumbers.key] =\n            phoneNumbers.value;\n        }\n\n        let jsonSchemaProperties = JSON.parse(\n          JSON.stringify(_input.jsonSchema.properties)\n        );\n\n        jsonSchemaProperties = handleDynamicValues(\n          jsonSchemaProperties,\n          route.params[RouteParams.ROOT_META_DATA]\n        );\n\n        setInputs((prev: any) => {\n          const dynamicInput = {\n            ...prev,\n            jsonSchema: {\n              ...prev.jsonSchema,\n              properties: jsonSchemaProperties,\n            },\n          };\n          return dynamicInput;\n        });\n      }\n    })();\n  }, []);\n\n  return (\n    <>\n      <FormGenerator\n        {..._input}\n        navigation={navigation}\n        mergedObjectiveId={mergedObjectiveId}\n        taskMeta={taskMeta}\n        onError={(error: AjvError[] | AjvError) => {\n          const errorMessage = transformErrorMessage(error);\n\n          setSnackBar({\n            show: true,\n            type: SnackBarType.FAILURE,\n            message: errorMessage,\n          });\n        }}\n        onSubmitET={async (result) => {\n          await DispatchStateContainer.getInstance().navigateToNextTask(\n            navigation,\n            route,\n            result,\n            result.success,\n            EntityCode.FORMS,\n            ExecutionTaskID.FORMS,\n            baseETProps,\n            false\n          );\n        }}\n      />\n      <View style={{ justifyContent: 'flex-end' }}>\n        <SnackBarCustom\n          type={snackBar.type}\n          message={`${snackBar.message}`}\n          visible={snackBar.show}\n          onDismiss={() => {\n            setSnackBar({\n              show: false,\n              message: '',\n              type: SnackBarType.SUCCESS,\n            });\n          }}\n          customBottom={20}\n        />\n      </View>\n    </>\n  );\n};\nexport default withBaseDispatchScreen(FormsScreen);\n\nconst transformErrorMessage = (error: AjvError[] | AjvError): string => {\n  let errorMessage = '';\n  if (Array.isArray(error)) {\n    if (error.length === 1) {\n      const e = error[0];\n      if (e.name === 'required') {\n        errorMessage = `${convertToPascalCaseWithSpace(\n          e.property\n        )} is required`;\n      } else errorMessage = `${e.property} ${e.message}`;\n    } else {\n      errorMessage = 'Form Validation Failed';\n    }\n  } else {\n    errorMessage = `${error.property} ${error.message}`;\n  }\n\n  return errorMessage;\n};\n\nfunction convertToPascalCaseWithSpace(inputString: string): string {\n  // Capitalize the first letter of each word while preserving spaces\n  return inputString\n    .split(/[^a-zA-Z0-9]+/)\n    .filter((word) => word.length > 0)\n    .map((word, index) => capitalizeWord(word, index === 0))\n    .join(' ');\n}\n\nfunction capitalizeWord(word: string, isFirstWord: boolean): string {\n  if (isFirstWord) {\n    return word.charAt(0).toUpperCase() + word.slice(1);\n  } else {\n    return word;\n  }\n}\n"],"mappings":"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"}

package/lib/module/ui/screens/GeofenceScreen.js

@@ -5,7 +5,7 @@ import { VerifyLocationET } from '../../components/executiontasks/ExecutionTasks
 import { showToast } from '../../components/widgets/Toaster';
 import { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';
 import DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';
-import { RouteParams } from '../uiConfig/RouteParams';
+import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
 const GeofenceScreen = _ref => {
   let {
@@ -13,10 +13,18 @@ const GeofenceScreen = _ref => {
     navigation,
     baseETProps
   } = _ref;
+  const nextState = route.params[RouteParams.NEXT_STATES];
+  const {
+    taskMeta,
+    mergedObjectiveId,
+    input,
+    wfMeta
+  } = getDataFromNextState(nextState);
   useEffect(() => {
-    onTaskStart(route.params[RouteParams.NEXT_STATES]);
+    onTaskStart(nextState, route.params[RouteParams.ROOT_META_DATA].customEventsData);
   }, []);
-  return /*#__PURE__*/React.createElement(VerifyLocationET, _extends({}, route.params[RouteParams.NEXT_STATES][0].nextState.data.input, {
+  return /*#__PURE__*/React.createElement(VerifyLocationET, _extends({}, input, {
+    mergedObjectiveId: mergedObjectiveId,
     onSubmitET: async resp => {
       try {
         await DispatchStateContainer.getInstance().navigateToNextTask(navigation, route, resp, resp.success, EntityCode.VERIFY_LOCATION, ExecutionTaskID.VERIFY_LOCATION, baseETProps, false);

package/lib/module/ui/screens/GeofenceScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["withBaseDispatchScreen","React","useEffect","VerifyLocationET","showToast","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","onTaskStart","GeofenceScreen","_ref","route","navigation","baseETProps","params","NEXT_STATES","createElement","_extends","nextState","data","input","onSubmitET","resp","getInstance","navigateToNextTask","success","VERIFY_LOCATION","error","showProgress","message"],"sources":["GeofenceScreen.tsx"],"sourcesContent":["import withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport React, { useEffect } from 'react';\nimport { VerifyLocationET } from '../../components/executiontasks/ExecutionTasksIndex';\nimport { showToast } from '../../components/widgets/Toaster';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams } from '../uiConfig/RouteParams';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst GeofenceScreen = ({\n  route,\n  navigation,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  useEffect(() => {\n    onTaskStart(route.params[RouteParams.NEXT_STATES]);\n  }, []);\n  return (\n    <VerifyLocationET\n      {...route.params[RouteParams.NEXT_STATES][0].nextState.data.input}\n      onSubmitET={async (resp) => {\n        try {\n          await DispatchStateContainer.getInstance().navigateToNextTask(\n            navigation,\n            route,\n            resp,\n            resp.success,\n            EntityCode.VERIFY_LOCATION,\n            ExecutionTaskID.VERIFY_LOCATION,\n            baseETProps,\n            false\n          );\n        } catch (error: any) {\n          baseETProps.showProgress(false);\n          showToast('Error ' + error.message);\n        }\n      }}\n    />\n  );\n};\n\nexport default withBaseDispatchScreen(GeofenceScreen);\n"],"mappings":";AAAA,OAAOA,sBAAsB,MAAM,0BAA0B;AAC7D,OAAOC,KAAK,IAAIC,SAAS,QAAQ,OAAO;AACxC,SAASC,gBAAgB,QAAQ,qDAAqD;AACtF,SAASC,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAE7E,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,WAAW,QAAQ,yBAAyB;AACrD,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,MAAMC,cAAc,GAAGC,IAAA,IAQjB;EAAA,IARkB;IACtBC,KAAK;IACLC,UAAU;IACVC;EAKF,CAAC,GAAAH,IAAA;EACCT,SAAS,CAAC,MAAM;IACdO,WAAW,CAACG,KAAK,CAACG,MAAM,CAACP,WAAW,CAACQ,WAAW,CAAC,CAAC;EACpD,CAAC,EAAE,EAAE,CAAC;EACN,oBACEf,KAAA,CAAAgB,aAAA,CAACd,gBAAgB,EAAAe,QAAA,KACXN,KAAK,CAACG,MAAM,CAACP,WAAW,CAACQ,WAAW,CAAC,CAAC,CAAC,CAAC,CAACG,SAAS,CAACC,IAAI,CAACC,KAAK;IACjEC,UAAU,EAAE,MAAOC,IAAI,IAAK;MAC1B,IAAI;QACF,MAAMhB,sBAAsB,CAACiB,WAAW,EAAE,CAACC,kBAAkB,CAC3DZ,UAAU,EACVD,KAAK,EACLW,IAAI,EACJA,IAAI,CAACG,OAAO,EACZrB,UAAU,CAACsB,eAAe,EAC1BrB,eAAe,CAACqB,eAAe,EAC/Bb,WAAW,EACX,KAAK,CACN;MACH,CAAC,CAAC,OAAOc,KAAU,EAAE;QACnBd,WAAW,CAACe,YAAY,CAAC,KAAK,CAAC;QAC/BzB,SAAS,CAAC,QAAQ,GAAGwB,KAAK,CAACE,OAAO,CAAC;MACrC;IACF;EAAE,GACF;AAEN,CAAC;AAED,eAAe9B,sBAAsB,CAACU,cAAc,CAAC"}
+{"version":3,"names":["withBaseDispatchScreen","React","useEffect","VerifyLocationET","showToast","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","getDataFromNextState","onTaskStart","GeofenceScreen","_ref","route","navigation","baseETProps","nextState","params","NEXT_STATES","taskMeta","mergedObjectiveId","input","wfMeta","ROOT_META_DATA","customEventsData","createElement","_extends","onSubmitET","resp","getInstance","navigateToNextTask","success","VERIFY_LOCATION","error","showProgress","message"],"sources":["GeofenceScreen.tsx"],"sourcesContent":["import withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport React, { useEffect } from 'react';\nimport { VerifyLocationET } from '../../components/executiontasks/ExecutionTasksIndex';\nimport { showToast } from '../../components/widgets/Toaster';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst GeofenceScreen = ({\n  route,\n  navigation,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  const nextState = route.params[RouteParams.NEXT_STATES];\n  const { taskMeta, mergedObjectiveId, input, wfMeta } =\n    getDataFromNextState(nextState);\n  useEffect(() => {\n    onTaskStart(\n      nextState,\n      route.params[RouteParams.ROOT_META_DATA].customEventsData\n    );\n  }, []);\n  return (\n    <VerifyLocationET\n      {...input}\n      mergedObjectiveId={mergedObjectiveId}\n      onSubmitET={async (resp) => {\n        try {\n          await DispatchStateContainer.getInstance().navigateToNextTask(\n            navigation,\n            route,\n            resp,\n            resp.success,\n            EntityCode.VERIFY_LOCATION,\n            ExecutionTaskID.VERIFY_LOCATION,\n            baseETProps,\n            false\n          );\n        } catch (error: any) {\n          baseETProps.showProgress(false);\n          showToast('Error ' + error.message);\n        }\n      }}\n    />\n  );\n};\n\nexport default withBaseDispatchScreen(GeofenceScreen);\n"],"mappings":";AAAA,OAAOA,sBAAsB,MAAM,0BAA0B;AAC7D,OAAOC,KAAK,IAAIC,SAAS,QAAQ,OAAO;AACxC,SAASC,gBAAgB,QAAQ,qDAAqD;AACtF,SAASC,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAE7E,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,WAAW,EAAEC,oBAAoB,QAAQ,yBAAyB;AAC3E,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,MAAMC,cAAc,GAAGC,IAAA,IAQjB;EAAA,IARkB;IACtBC,KAAK;IACLC,UAAU;IACVC;EAKF,CAAC,GAAAH,IAAA;EACC,MAAMI,SAAS,GAAGH,KAAK,CAACI,MAAM,CAACT,WAAW,CAACU,WAAW,CAAC;EACvD,MAAM;IAAEC,QAAQ;IAAEC,iBAAiB;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAClDb,oBAAoB,CAACO,SAAS,CAAC;EACjCd,SAAS,CAAC,MAAM;IACdQ,WAAW,CACTM,SAAS,EACTH,KAAK,CAACI,MAAM,CAACT,WAAW,CAACe,cAAc,CAAC,CAACC,gBAC3C,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EACN,oBACEvB,KAAA,CAAAwB,aAAA,CAACtB,gBAAgB,EAAAuB,QAAA,KACXL,KAAK;IACTD,iBAAiB,EAAEA,iBAAkB;IACrCO,UAAU,EAAE,MAAOC,IAAI,IAAK;MAC1B,IAAI;QACF,MAAMrB,sBAAsB,CAACsB,WAAW,CAAC,CAAC,CAACC,kBAAkB,CAC3DhB,UAAU,EACVD,KAAK,EACLe,IAAI,EACJA,IAAI,CAACG,OAAO,EACZ1B,UAAU,CAAC2B,eAAe,EAC1B1B,eAAe,CAAC0B,eAAe,EAC/BjB,WAAW,EACX,KACF,CAAC;MACH,CAAC,CAAC,OAAOkB,KAAU,EAAE;QACnBlB,WAAW,CAACmB,YAAY,CAAC,KAAK,CAAC;QAC/B9B,SAAS,CAAC,QAAQ,GAAG6B,KAAK,CAACE,OAAO,CAAC;MACrC;IACF;EAAE,EACH,CAAC;AAEN,CAAC;AAED,eAAenC,sBAAsB,CAACW,cAAc,CAAC"}

package/lib/module/ui/screens/HttpRequestScreen.js

@@ -1,7 +1,7 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import WithBaseDispatchScreen from './WithBaseDispatchScreen';
 import { HttpRequestET } from '../../components/executiontasks/ExecutionTasksIndex';
-import { RouteParams } from '../uiConfig/RouteParams';
+import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';
 import { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';
 import { useEffect } from 'react';
@@ -12,10 +12,18 @@ const HttpRequestScreen = _ref => {
     navigation,
     baseETProps
   } = _ref;
+  const nextState = route.params[RouteParams.NEXT_STATES];
+  const {
+    taskMeta,
+    mergedObjectiveId,
+    input,
+    wfMeta
+  } = getDataFromNextState(nextState);
   useEffect(() => {
-    onTaskStart(route.params[RouteParams.NEXT_STATES]);
+    onTaskStart(route.params[RouteParams.NEXT_STATES], route.params[RouteParams.ROOT_META_DATA].customEventsData);
   }, []);
-  return /*#__PURE__*/React.createElement(HttpRequestET, _extends({}, route.params[RouteParams.NEXT_STATES][0].nextState.data.input, {
+  return /*#__PURE__*/React.createElement(HttpRequestET, _extends({}, input, {
+    mergedObjectiveId: mergedObjectiveId,
     onSubmitET: async response => {
       await DispatchStateContainer.getInstance().navigateToNextTask(navigation, route, response, response.success, EntityCode.HTTP_REQUEST_ET, ExecutionTaskID.HTTP_REQUEST_ET, baseETProps, false);
     }

package/lib/module/ui/screens/HttpRequestScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["WithBaseDispatchScreen","HttpRequestET","RouteParams","DispatchStateContainer","EntityCode","ExecutionTaskID","useEffect","onTaskStart","HttpRequestScreen","_ref","route","navigation","baseETProps","params","NEXT_STATES","React","createElement","_extends","nextState","data","input","onSubmitET","response","getInstance","navigateToNextTask","success","HTTP_REQUEST_ET"],"sources":["HttpRequestScreen.tsx"],"sourcesContent":["import WithBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { HttpRequestET } from '../../components/executiontasks/ExecutionTasksIndex';\nimport { RouteParams } from '../uiConfig/RouteParams';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport { useEffect } from 'react';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst HttpRequestScreen = ({\n  route,\n  navigation,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  useEffect(() => {\n    onTaskStart(route.params[RouteParams.NEXT_STATES]);\n  }, []);\n  return (\n    <HttpRequestET\n      {...route.params[RouteParams.NEXT_STATES][0].nextState.data.input}\n      onSubmitET={async (response) => {\n        await DispatchStateContainer.getInstance().navigateToNextTask(\n          navigation,\n          route,\n          response,\n          response.success,\n          EntityCode.HTTP_REQUEST_ET,\n          ExecutionTaskID.HTTP_REQUEST_ET,\n          baseETProps,\n          false\n        );\n      }}\n    />\n  );\n};\nexport default WithBaseDispatchScreen(HttpRequestScreen);\n"],"mappings":";AAAA,OAAOA,sBAAsB,MAAM,0BAA0B;AAE7D,SAASC,aAAa,QAAQ,qDAAqD;AACnF,SAASC,WAAW,QAAQ,yBAAyB;AACrD,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAC7E,SAASC,SAAS,QAAQ,OAAO;AACjC,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,MAAMC,iBAAiB,GAAGC,IAAA,IAQpB;EAAA,IARqB;IACzBC,KAAK;IACLC,UAAU;IACVC;EAKF,CAAC,GAAAH,IAAA;EACCH,SAAS,CAAC,MAAM;IACdC,WAAW,CAACG,KAAK,CAACG,MAAM,CAACX,WAAW,CAACY,WAAW,CAAC,CAAC;EACpD,CAAC,EAAE,EAAE,CAAC;EACN,oBACEC,KAAA,CAAAC,aAAA,CAACf,aAAa,EAAAgB,QAAA,KACRP,KAAK,CAACG,MAAM,CAACX,WAAW,CAACY,WAAW,CAAC,CAAC,CAAC,CAAC,CAACI,SAAS,CAACC,IAAI,CAACC,KAAK;IACjEC,UAAU,EAAE,MAAOC,QAAQ,IAAK;MAC9B,MAAMnB,sBAAsB,CAACoB,WAAW,EAAE,CAACC,kBAAkB,CAC3Db,UAAU,EACVD,KAAK,EACLY,QAAQ,EACRA,QAAQ,CAACG,OAAO,EAChBrB,UAAU,CAACsB,eAAe,EAC1BrB,eAAe,CAACqB,eAAe,EAC/Bd,WAAW,EACX,KAAK,CACN;IACH;EAAE,GACF;AAEN,CAAC;AACD,eAAeZ,sBAAsB,CAACQ,iBAAiB,CAAC"}
+{"version":3,"names":["WithBaseDispatchScreen","HttpRequestET","RouteParams","getDataFromNextState","DispatchStateContainer","EntityCode","ExecutionTaskID","useEffect","onTaskStart","HttpRequestScreen","_ref","route","navigation","baseETProps","nextState","params","NEXT_STATES","taskMeta","mergedObjectiveId","input","wfMeta","ROOT_META_DATA","customEventsData","React","createElement","_extends","onSubmitET","response","getInstance","navigateToNextTask","success","HTTP_REQUEST_ET"],"sources":["HttpRequestScreen.tsx"],"sourcesContent":["import WithBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { HttpRequestET } from '../../components/executiontasks/ExecutionTasksIndex';\nimport { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport { useEffect } from 'react';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst HttpRequestScreen = ({\n  route,\n  navigation,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  const nextState = route.params[RouteParams.NEXT_STATES];\n  const { taskMeta, mergedObjectiveId, input, wfMeta } =\n    getDataFromNextState(nextState);\n  useEffect(() => {\n    onTaskStart(\n      route.params[RouteParams.NEXT_STATES],\n      route.params[RouteParams.ROOT_META_DATA].customEventsData\n    );\n  }, []);\n  return (\n    <HttpRequestET\n      {...input}\n      mergedObjectiveId={mergedObjectiveId}\n      onSubmitET={async (response) => {\n        await DispatchStateContainer.getInstance().navigateToNextTask(\n          navigation,\n          route,\n          response,\n          response.success,\n          EntityCode.HTTP_REQUEST_ET,\n          ExecutionTaskID.HTTP_REQUEST_ET,\n          baseETProps,\n          false\n        );\n      }}\n    />\n  );\n};\nexport default WithBaseDispatchScreen(HttpRequestScreen);\n"],"mappings":";AAAA,OAAOA,sBAAsB,MAAM,0BAA0B;AAE7D,SAASC,aAAa,QAAQ,qDAAqD;AACnF,SAASC,WAAW,EAAEC,oBAAoB,QAAQ,yBAAyB;AAC3E,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAC7E,SAASC,SAAS,QAAQ,OAAO;AACjC,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,MAAMC,iBAAiB,GAAGC,IAAA,IAQpB;EAAA,IARqB;IACzBC,KAAK;IACLC,UAAU;IACVC;EAKF,CAAC,GAAAH,IAAA;EACC,MAAMI,SAAS,GAAGH,KAAK,CAACI,MAAM,CAACb,WAAW,CAACc,WAAW,CAAC;EACvD,MAAM;IAAEC,QAAQ;IAAEC,iBAAiB;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAClDjB,oBAAoB,CAACW,SAAS,CAAC;EACjCP,SAAS,CAAC,MAAM;IACdC,WAAW,CACTG,KAAK,CAACI,MAAM,CAACb,WAAW,CAACc,WAAW,CAAC,EACrCL,KAAK,CAACI,MAAM,CAACb,WAAW,CAACmB,cAAc,CAAC,CAACC,gBAC3C,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EACN,oBACEC,KAAA,CAAAC,aAAA,CAACvB,aAAa,EAAAwB,QAAA,KACRN,KAAK;IACTD,iBAAiB,EAAEA,iBAAkB;IACrCQ,UAAU,EAAE,MAAOC,QAAQ,IAAK;MAC9B,MAAMvB,sBAAsB,CAACwB,WAAW,CAAC,CAAC,CAACC,kBAAkB,CAC3DjB,UAAU,EACVD,KAAK,EACLgB,QAAQ,EACRA,QAAQ,CAACG,OAAO,EAChBzB,UAAU,CAAC0B,eAAe,EAC1BzB,eAAe,CAACyB,eAAe,EAC/BlB,WAAW,EACX,KACF,CAAC;IACH;EAAE,EACH,CAAC;AAEN,CAAC;AACD,eAAeb,sBAAsB,CAACS,iBAAiB,CAAC"}

package/lib/module/ui/screens/ImageCaptureScreen.js

@@ -4,40 +4,48 @@ import ImageCapture from '../../components/executiontasks/imageCapture/ImageCapt
 import { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';
 import withBaseDispatchScreen from './WithBaseDispatchScreen';
 import DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';
-import { RouteParams } from '../uiConfig/RouteParams';
-import { getJobIDs, getObjectiveRefs } from '../../components/executiontasks/doodle/DoodleUtils';
+import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
+import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 const ImageCaptureScreen = _ref => {
   let {
     route,
     navigation,
     baseETProps
   } = _ref;
-  const firstInput = route.params[RouteParams.NEXT_STATES][0].nextState.data.input;
+  const nextState = route.params[RouteParams.NEXT_STATES];
+  const {
+    taskMeta,
+    mergedObjectiveId,
+    input,
+    wfMeta
+  } = getDataFromNextState(nextState);
+  const firstInput = input;
   const [inputs, setInputs] = useState(firstInput);
+  const [captureCount, setCaptureCount] = useState(0);
+  const getMergedCaptureCount = async () => {
+    const count = await DispatchExecutor.getScannedShipmentsCount(mergedObjectiveId);
+    setCaptureCount(count.totalCount);
+  };
   useEffect(() => {
-    onTaskStart(route.params[RouteParams.NEXT_STATES]);
-    let _captureCountLimit = 0;
-    for (let nextStateData of route.params[RouteParams.NEXT_STATES]) {
-      const _input = nextStateData.nextState.data.input;
-      /**
-       * Combining all the required data, incase the objectives are merged
-       */
-      if (_input.captureCountLimit) {
-        _captureCountLimit += _input.captureCountLimit;
-      }
-    }
-    _captureCountLimit = _captureCountLimit < route.params[RouteParams.NEXT_STATES].length ? route.params[RouteParams.NEXT_STATES].length : _captureCountLimit;
+    onTaskStart(route.params[RouteParams.NEXT_STATES], route.params[RouteParams.ROOT_META_DATA].customEventsData);
+    getMergedCaptureCount();
+  }, []);
+  useEffect(() => {
+    let _captureCountLimit = captureCount * input.captureCountLimit;
     setInputs(prev => ({
       ...prev,
       captureCountLimit: _captureCountLimit
     }));
-  }, []);
+  }, [captureCount]);
   return /*#__PURE__*/React.createElement(ImageCapture, _extends({}, inputs, {
+    captureCount: captureCount,
     navigation: navigation,
-    taskMeta: JSON.parse(route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta || '{}'),
-    jobIds: getJobIDs(route.params[RouteParams.NEXT_STATES]),
-    objRefs: getObjectiveRefs(route.params[RouteParams.NEXT_STATES]),
+    taskMeta: taskMeta,
+    mergedObjectiveId: mergedObjectiveId
+    // jobIds={getJobIDs(route.params[RouteParams.NEXT_STATES])}
+    // objRefs={getObjectiveRefs(route.params[RouteParams.NEXT_STATES])}
+    ,
     onSubmitET: async imageDataList => {
       await DispatchStateContainer.getInstance().navigateToNextTask(navigation, route, imageDataList, imageDataList.success, EntityCode.IMAGE_CAPTURE, ExecutionTaskID.IMAGE_CAPTURE, baseETProps, false);
     }

package/lib/module/ui/screens/ImageCaptureScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useState","ImageCapture","EntityCode","ExecutionTaskID","withBaseDispatchScreen","DispatchStateContainer","RouteParams","getJobIDs","getObjectiveRefs","onTaskStart","ImageCaptureScreen","_ref","route","navigation","baseETProps","firstInput","params","NEXT_STATES","nextState","data","input","inputs","setInputs","_captureCountLimit","nextStateData","_input","captureCountLimit","length","prev","createElement","_extends","taskMeta","JSON","parse","jobIds","objRefs","onSubmitET","imageDataList","getInstance","navigateToNextTask","success","IMAGE_CAPTURE"],"sources":["ImageCaptureScreen.tsx"],"sourcesContent":["import React, { useEffect, useState } from 'react';\nimport ImageCapture from '../../components/executiontasks/imageCapture/ImageCapture';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams } from '../uiConfig/RouteParams';\nimport {\n  getJobIDs,\n  getObjectiveRefs,\n} from '../../components/executiontasks/doodle/DoodleUtils';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst ImageCaptureScreen = ({\n  route,\n  navigation,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  const firstInput =\n    route.params[RouteParams.NEXT_STATES][0].nextState.data.input;\n  const [inputs, setInputs] = useState(firstInput);\n\n  useEffect(() => {\n    onTaskStart(route.params[RouteParams.NEXT_STATES]);\n    let _captureCountLimit = 0;\n\n    for (let nextStateData of route.params[RouteParams.NEXT_STATES]) {\n      const _input = nextStateData.nextState.data.input;\n      /**\n       * Combining all the required data, incase the objectives are merged\n       */\n      if (_input.captureCountLimit) {\n        _captureCountLimit += _input.captureCountLimit;\n      }\n    }\n    _captureCountLimit =\n      _captureCountLimit < route.params[RouteParams.NEXT_STATES].length\n        ? route.params[RouteParams.NEXT_STATES].length\n        : _captureCountLimit;\n\n    setInputs((prev: any) => ({\n      ...prev,\n      captureCountLimit: _captureCountLimit,\n    }));\n  }, []);\n\n  return (\n    <ImageCapture\n      {...inputs}\n      navigation={navigation}\n      taskMeta={JSON.parse(\n        route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta || '{}'\n      )}\n      jobIds={getJobIDs(route.params[RouteParams.NEXT_STATES])}\n      objRefs={getObjectiveRefs(route.params[RouteParams.NEXT_STATES])}\n      onSubmitET={async (imageDataList) => {\n        await DispatchStateContainer.getInstance().navigateToNextTask(\n          navigation,\n          route,\n          imageDataList,\n          imageDataList.success,\n          EntityCode.IMAGE_CAPTURE,\n          ExecutionTaskID.IMAGE_CAPTURE,\n          baseETProps,\n          false\n        );\n      }}\n    />\n  );\n};\n\nexport default withBaseDispatchScreen(ImageCaptureScreen);\n"],"mappings":";AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAClD,OAAOC,YAAY,MAAM,2DAA2D;AACpF,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAE7E,OAAOC,sBAAsB,MAAM,0BAA0B;AAC7D,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,WAAW,QAAQ,yBAAyB;AACrD,SACEC,SAAS,EACTC,gBAAgB,QACX,oDAAoD;AAC3D,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,MAAMC,kBAAkB,GAAGC,IAAA,IAQrB;EAAA,IARsB;IAC1BC,KAAK;IACLC,UAAU;IACVC;EAKF,CAAC,GAAAH,IAAA;EACC,MAAMI,UAAU,GACdH,KAAK,CAACI,MAAM,CAACV,WAAW,CAACW,WAAW,CAAC,CAAC,CAAC,CAAC,CAACC,SAAS,CAACC,IAAI,CAACC,KAAK;EAC/D,MAAM,CAACC,MAAM,EAAEC,SAAS,CAAC,GAAGtB,QAAQ,CAACe,UAAU,CAAC;EAEhDhB,SAAS,CAAC,MAAM;IACdU,WAAW,CAACG,KAAK,CAACI,MAAM,CAACV,WAAW,CAACW,WAAW,CAAC,CAAC;IAClD,IAAIM,kBAAkB,GAAG,CAAC;IAE1B,KAAK,IAAIC,aAAa,IAAIZ,KAAK,CAACI,MAAM,CAACV,WAAW,CAACW,WAAW,CAAC,EAAE;MAC/D,MAAMQ,MAAM,GAAGD,aAAa,CAACN,SAAS,CAACC,IAAI,CAACC,KAAK;MACjD;AACN;AACA;MACM,IAAIK,MAAM,CAACC,iBAAiB,EAAE;QAC5BH,kBAAkB,IAAIE,MAAM,CAACC,iBAAiB;MAChD;IACF;IACAH,kBAAkB,GAChBA,kBAAkB,GAAGX,KAAK,CAACI,MAAM,CAACV,WAAW,CAACW,WAAW,CAAC,CAACU,MAAM,GAC7Df,KAAK,CAACI,MAAM,CAACV,WAAW,CAACW,WAAW,CAAC,CAACU,MAAM,GAC5CJ,kBAAkB;IAExBD,SAAS,CAAEM,IAAS,KAAM;MACxB,GAAGA,IAAI;MACPF,iBAAiB,EAAEH;IACrB,CAAC,CAAC,CAAC;EACL,CAAC,EAAE,EAAE,CAAC;EAEN,oBACEzB,KAAA,CAAA+B,aAAA,CAAC5B,YAAY,EAAA6B,QAAA,KACPT,MAAM;IACVR,UAAU,EAAEA,UAAW;IACvBkB,QAAQ,EAAEC,IAAI,CAACC,KAAK,CAClBrB,KAAK,CAACI,MAAM,CAACV,WAAW,CAACW,WAAW,CAAC,CAAC,CAAC,CAAC,CAACC,SAAS,CAACC,IAAI,CAACY,QAAQ,IAAI,IAAI,CACxE;IACFG,MAAM,EAAE3B,SAAS,CAACK,KAAK,CAACI,MAAM,CAACV,WAAW,CAACW,WAAW,CAAC,CAAE;IACzDkB,OAAO,EAAE3B,gBAAgB,CAACI,KAAK,CAACI,MAAM,CAACV,WAAW,CAACW,WAAW,CAAC,CAAE;IACjEmB,UAAU,EAAE,MAAOC,aAAa,IAAK;MACnC,MAAMhC,sBAAsB,CAACiC,WAAW,EAAE,CAACC,kBAAkB,CAC3D1B,UAAU,EACVD,KAAK,EACLyB,aAAa,EACbA,aAAa,CAACG,OAAO,EACrBtC,UAAU,CAACuC,aAAa,EACxBtC,eAAe,CAACsC,aAAa,EAC7B3B,WAAW,EACX,KAAK,CACN;IACH;EAAE,GACF;AAEN,CAAC;AAED,eAAeV,sBAAsB,CAACM,kBAAkB,CAAC"}
+{"version":3,"names":["React","useEffect","useState","ImageCapture","EntityCode","ExecutionTaskID","withBaseDispatchScreen","DispatchStateContainer","RouteParams","getDataFromNextState","onTaskStart","DispatchExecutor","ImageCaptureScreen","_ref","route","navigation","baseETProps","nextState","params","NEXT_STATES","taskMeta","mergedObjectiveId","input","wfMeta","firstInput","inputs","setInputs","captureCount","setCaptureCount","getMergedCaptureCount","count","getScannedShipmentsCount","totalCount","ROOT_META_DATA","customEventsData","_captureCountLimit","captureCountLimit","prev","createElement","_extends","onSubmitET","imageDataList","getInstance","navigateToNextTask","success","IMAGE_CAPTURE"],"sources":["ImageCaptureScreen.tsx"],"sourcesContent":["import React, { useEffect, useState } from 'react';\nimport ImageCapture from '../../components/executiontasks/imageCapture/ImageCapture';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nimport { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';\n\nconst ImageCaptureScreen = ({\n  route,\n  navigation,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  const nextState = route.params[RouteParams.NEXT_STATES];\n  const { taskMeta, mergedObjectiveId, input, wfMeta } =\n    getDataFromNextState(nextState);\n  const firstInput = input;\n  const [inputs, setInputs] = useState(firstInput);\n  const [captureCount, setCaptureCount] = useState(0);\n\n  const getMergedCaptureCount = async () => {\n    const count = await DispatchExecutor.getScannedShipmentsCount(\n      mergedObjectiveId\n    );\n    setCaptureCount(count.totalCount);\n  };\n\n  useEffect(() => {\n    onTaskStart(\n      route.params[RouteParams.NEXT_STATES],\n      route.params[RouteParams.ROOT_META_DATA].customEventsData\n    );\n    getMergedCaptureCount();\n  }, []);\n\n  useEffect(() => {\n    let _captureCountLimit = captureCount * input.captureCountLimit;\n\n    setInputs((prev: any) => ({\n      ...prev,\n      captureCountLimit: _captureCountLimit,\n    }));\n  }, [captureCount]);\n\n  return (\n    <ImageCapture\n      {...inputs}\n      captureCount={captureCount}\n      navigation={navigation}\n      taskMeta={taskMeta}\n      mergedObjectiveId={mergedObjectiveId}\n      // jobIds={getJobIDs(route.params[RouteParams.NEXT_STATES])}\n      // objRefs={getObjectiveRefs(route.params[RouteParams.NEXT_STATES])}\n      onSubmitET={async (imageDataList) => {\n        await DispatchStateContainer.getInstance().navigateToNextTask(\n          navigation,\n          route,\n          imageDataList,\n          imageDataList.success,\n          EntityCode.IMAGE_CAPTURE,\n          ExecutionTaskID.IMAGE_CAPTURE,\n          baseETProps,\n          false\n        );\n      }}\n    />\n  );\n};\n\nexport default withBaseDispatchScreen(ImageCaptureScreen);\n"],"mappings":";AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAClD,OAAOC,YAAY,MAAM,2DAA2D;AACpF,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAE7E,OAAOC,sBAAsB,MAAM,0BAA0B;AAC7D,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,WAAW,EAAEC,oBAAoB,QAAQ,yBAAyB;AAC3E,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,SAASC,gBAAgB,QAAQ,oDAAoD;AAErF,MAAMC,kBAAkB,GAAGC,IAAA,IAQrB;EAAA,IARsB;IAC1BC,KAAK;IACLC,UAAU;IACVC;EAKF,CAAC,GAAAH,IAAA;EACC,MAAMI,SAAS,GAAGH,KAAK,CAACI,MAAM,CAACV,WAAW,CAACW,WAAW,CAAC;EACvD,MAAM;IAAEC,QAAQ;IAAEC,iBAAiB;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAClDd,oBAAoB,CAACQ,SAAS,CAAC;EACjC,MAAMO,UAAU,GAAGF,KAAK;EACxB,MAAM,CAACG,MAAM,EAAEC,SAAS,CAAC,GAAGxB,QAAQ,CAACsB,UAAU,CAAC;EAChD,MAAM,CAACG,YAAY,EAAEC,eAAe,CAAC,GAAG1B,QAAQ,CAAC,CAAC,CAAC;EAEnD,MAAM2B,qBAAqB,GAAG,MAAAA,CAAA,KAAY;IACxC,MAAMC,KAAK,GAAG,MAAMnB,gBAAgB,CAACoB,wBAAwB,CAC3DV,iBACF,CAAC;IACDO,eAAe,CAACE,KAAK,CAACE,UAAU,CAAC;EACnC,CAAC;EAED/B,SAAS,CAAC,MAAM;IACdS,WAAW,CACTI,KAAK,CAACI,MAAM,CAACV,WAAW,CAACW,WAAW,CAAC,EACrCL,KAAK,CAACI,MAAM,CAACV,WAAW,CAACyB,cAAc,CAAC,CAACC,gBAC3C,CAAC;IACDL,qBAAqB,CAAC,CAAC;EACzB,CAAC,EAAE,EAAE,CAAC;EAEN5B,SAAS,CAAC,MAAM;IACd,IAAIkC,kBAAkB,GAAGR,YAAY,GAAGL,KAAK,CAACc,iBAAiB;IAE/DV,SAAS,CAAEW,IAAS,KAAM;MACxB,GAAGA,IAAI;MACPD,iBAAiB,EAAED;IACrB,CAAC,CAAC,CAAC;EACL,CAAC,EAAE,CAACR,YAAY,CAAC,CAAC;EAElB,oBACE3B,KAAA,CAAAsC,aAAA,CAACnC,YAAY,EAAAoC,QAAA,KACPd,MAAM;IACVE,YAAY,EAAEA,YAAa;IAC3BZ,UAAU,EAAEA,UAAW;IACvBK,QAAQ,EAAEA,QAAS;IACnBC,iBAAiB,EAAEA;IACnB;IACA;IAAA;IACAmB,UAAU,EAAE,MAAOC,aAAa,IAAK;MACnC,MAAMlC,sBAAsB,CAACmC,WAAW,CAAC,CAAC,CAACC,kBAAkB,CAC3D5B,UAAU,EACVD,KAAK,EACL2B,aAAa,EACbA,aAAa,CAACG,OAAO,EACrBxC,UAAU,CAACyC,aAAa,EACxBxC,eAAe,CAACwC,aAAa,EAC7B7B,WAAW,EACX,KACF,CAAC;IACH;EAAE,EACH,CAAC;AAEN,CAAC;AAED,eAAeV,sBAAsB,CAACM,kBAAkB,CAAC"}

package/lib/module/ui/screens/PaymentScreen.js

@@ -4,7 +4,7 @@ import withBaseDispatchScreen from './WithBaseDispatchScreen';
 import { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';
 import { CompletePaymentET, InitPaymentET, ProcessPaymentET } from '../../components/executiontasks/ExecutionTasksIndex';
 import DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';
-import { RouteParams } from '../uiConfig/RouteParams';
+import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import { View } from 'react-native';
 import { getBaseETResponse, getEntityCodeByET, onTaskStart } from '../../utils/ExecTaskUtils';
 import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
@@ -16,23 +16,32 @@ const PaymentScreen = _ref => {
     route,
     baseETProps
   } = _ref;
+  const nextState = route.params[RouteParams.NEXT_STATES];
+  const {
+    taskMeta,
+    mergedObjectiveId,
+    input,
+    wfMeta
+  } = getDataFromNextState(nextState);
   useEffect(() => {
-    onTaskStart(route.params[RouteParams.NEXT_STATES]);
+    onTaskStart(route.params[RouteParams.NEXT_STATES], route.params[RouteParams.ROOT_META_DATA].customEventsData);
   }, []);
-  let currentState = route.params[RouteParams.NEXT_STATES][0].nextState;
+  let currentState = route.params[RouteParams.NEXT_STATES];
   const [showAlert, setShowAlert] = useState(false);
   const [sResponse, setResponse] = useState();
+  const taskId = currentState.taskId;
   const submitOutput = useCallback(async etOutput => {
-    await DispatchStateContainer.getInstance().navigateToNextTask(navigation, route, etOutput, etOutput.success, getEntityCodeByET(currentState.taskId), currentState.taskId, baseETProps, false);
+    await DispatchStateContainer.getInstance().navigateToNextTask(navigation, route, etOutput, etOutput.success, getEntityCodeByET(currentState.taskId), taskId, baseETProps, false);
   }, [baseETProps, currentState.taskId, navigation, route]);
   if (currentState.taskId === ExecutionTaskID.INIT_PAYMENT) {
     return /*#__PURE__*/React.createElement(View, {
       style: {
         flex: 1
       }
-    }, /*#__PURE__*/React.createElement(InitPaymentET, _extends({}, route.params[RouteParams.NEXT_STATES][0].nextState.data.input, {
+    }, /*#__PURE__*/React.createElement(InitPaymentET, _extends({}, input, {
       navigation: navigation,
-      taskMeta: JSON.parse(route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta || '{}'),
+      taskMeta: taskMeta,
+      mergedObjectiveId: mergedObjectiveId,
       onSubmitET: async etOutput => {
         if (etOutput.success) {
           await submitOutput(etOutput);
@@ -56,14 +65,14 @@ const PaymentScreen = _ref => {
     }));
   } else if (currentState.taskId === ExecutionTaskID.PROCESS_PAYMENT) {
     var _input2;
-    let _input = route.params[RouteParams.NEXT_STATES][0].nextState.data.input;
+    let _input = input;
     if (((_input2 = _input) === null || _input2 === void 0 ? void 0 : _input2.paymentMode) === 'CASH') {
       useEffect(() => {
         let isMounted = true;
         (async () => {
           if (isMounted) {
             var _input$applicableReas;
-            const baseData = await getBaseETResponse(EntityCode.PROCESS_PAYMENT, true, getEventCodeByET(ExecutionTaskID.PROCESS_PAYMENT, true, (_input$applicableReas = _input.applicableReasons) === null || _input$applicableReas === void 0 ? void 0 : _input$applicableReas.success), '');
+            const baseData = await getBaseETResponse(EntityCode.PROCESS_PAYMENT, true, getEventCodeByET(ExecutionTaskID.PROCESS_PAYMENT, true, (_input$applicableReas = _input.applicableReasons) === null || _input$applicableReas === void 0 ? void 0 : _input$applicableReas.success), '', mergedObjectiveId, ExecutionTaskID.PROCESS_PAYMENT);
             _input = {
               paymentMode: _input.paymentMode,
               collectedAmount: _input.amount,
@@ -83,9 +92,10 @@ const PaymentScreen = _ref => {
       style: {
         flex: 1
       }
-    }, /*#__PURE__*/React.createElement(ProcessPaymentET, _extends({}, route.params[RouteParams.NEXT_STATES][0].nextState.data.input, {
+    }, /*#__PURE__*/React.createElement(ProcessPaymentET, _extends({}, input, {
       navigation: navigation,
-      taskMeta: JSON.parse(route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta || '{}'),
+      mergedObjectiveId: mergedObjectiveId,
+      taskMeta: taskMeta,
       onSubmitET: async etOutput => {
         if (etOutput.success) {
           await submitOutput(etOutput);
@@ -108,9 +118,10 @@ const PaymentScreen = _ref => {
       }
     }));
   } else {
-    return /*#__PURE__*/React.createElement(CompletePaymentET, _extends({}, route.params[RouteParams.NEXT_STATES][0].nextState.data.input, {
+    return /*#__PURE__*/React.createElement(CompletePaymentET, _extends({}, input, {
       navigation: navigation,
-      taskMeta: JSON.parse(route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta || '{}'),
+      taskMeta: taskMeta,
+      mergedObjectiveId: mergedObjectiveId,
       onSubmitET: async etOut => {
         await DispatchStateContainer.getInstance().navigateToNextTask(navigation, route, etOut, etOut.success, EntityCode.COMPLETE_PAYMENT, ExecutionTaskID.COMPLETE_PAYMENT, baseETProps, false);
       }