@os1-platform/dispatch-mobile 1.3.11 → 2.0.1

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

@@ -4,7 +4,7 @@ import { getEventCodeByET } from '../../manager/dispatchCodes/EventCodeContainer
 import withBaseDispatchScreen from './WithBaseDispatchScreen';
 import { getBaseETResponse, getEntityCodeByET } from '../../utils/ExecTaskUtils';
 import ReasonCodeContainer from '../../manager/dispatchCodes/ReasonCodeContainer';
-import { RouteParams } from '../uiConfig/RouteParams';
+import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';
 const instance = DispatchStateContainer.getInstance();
 const CancellationScreen = _ref => {
@@ -13,6 +13,13 @@ const CancellationScreen = _ref => {
     navigation,
     baseETProps
   } = _ref;
+  const nextState = route.params[RouteParams.NEXT_STATES];
+  const {
+    taskMeta,
+    mergedObjectiveId,
+    input,
+    wfMeta
+  } = getDataFromNextState(nextState);
   const [reasons, setReasons] = useState([]);
   const [events, setEvents] = useState([]);
   useEffect(() => {
@@ -33,28 +40,52 @@ const CancellationScreen = _ref => {
       setEvents(e_values);
     }
   }, [route.params]);
-  return events.length || reasons.length ? /*#__PURE__*/React.createElement(CancelET, {
+  return events.length || reasons.length ? /*#__PURE__*/React.createElement(CancelET
+  // mergedObjectiveId={mergedObjectiveId}
+  , {
     cancelEvent: route.params[RouteParams.CANCEL_EVENT] || '',
     cancellationEvents: events,
     cancellationReasons: reasons,
     applicableCodes: route.params[RouteParams.APPLICABLE_CODES],
     eventRows: route.params[RouteParams.EVENT_CODES],
     onSubmitET: async (reason, eventCode, reasonsRow) => {
-      const isJobBasedOutput = route.params[RouteParams.IS_JOB_BASED_OUTPUT];
+      const isMergedObjBasedOutput = route.params[RouteParams.IS_MERGED_OBJ_BASED_OUTPUT];
       if (route.params[RouteParams.ET_SUCCESS]) {
         if (route.params[RouteParams.EVENT_CODES] && eventCode) {
-          if (isJobBasedOutput) route.params[RouteParams.ET_SUCCESS_RESPONSE].baseResponse.eventCode = eventCode;else route.params[RouteParams.ET_SUCCESS_RESPONSE].eventCode = eventCode;
+          // if (isJobBasedOutput)
+          //   route.params[
+          //     RouteParams.ET_SUCCESS_RESPONSE
+          //   ].baseResponse.eventCode = eventCode;
+          // else
+          route.params[RouteParams.ET_SUCCESS_RESPONSE].eventCode = eventCode;
         } else if (eventCode) {
-          if (isJobBasedOutput) route.params[RouteParams.ET_SUCCESS_RESPONSE].baseResponse.eventCode = eventCode;else route.params[RouteParams.ET_SUCCESS_RESPONSE].eventCode = eventCode;
+          // if (isJobBasedOutput)
+          //   route.params[
+          //     RouteParams.ET_SUCCESS_RESPONSE
+          //   ].baseResponse.eventCode = eventCode;
+          // else
+          route.params[RouteParams.ET_SUCCESS_RESPONSE].eventCode = eventCode;
         }
-        if (isJobBasedOutput) route.params[RouteParams.ET_SUCCESS_RESPONSE].baseResponse.reasonCode = ReasonCodeContainer.getReasonCodeFromText(reason, route.params[RouteParams.REASONS] ? route.params[RouteParams.REASONS] : reasonsRow);else route.params[RouteParams.ET_SUCCESS_RESPONSE].reasonCode = ReasonCodeContainer.getReasonCodeFromText(reason, route.params[RouteParams.REASONS] ? route.params[RouteParams.REASONS] : reasonsRow);
-        await instance.saveAndProceed(baseETProps, route.params[RouteParams.ET_SUCCESS_RESPONSE], route.params, navigation, route.params[RouteParams.IS_LAST_ET], isJobBasedOutput);
+
+        // if (isJobBasedOutput)
+        //   route.params[
+        //     RouteParams.ET_SUCCESS_RESPONSE
+        //   ].baseResponse.reasonCode =
+        //     ReasonCodeContainer.getReasonCodeFromText(
+        //       reason,
+        //       route.params[RouteParams.REASONS]
+        //         ? route.params[RouteParams.REASONS]
+        //         : reasonsRow
+        //     );
+        // else
+        route.params[RouteParams.ET_SUCCESS_RESPONSE].reasonCode = ReasonCodeContainer.getReasonCodeFromText(reason, route.params[RouteParams.REASONS] ? route.params[RouteParams.REASONS] : reasonsRow);
+        await instance.saveAndProceed(baseETProps, route.params[RouteParams.ET_SUCCESS_RESPONSE], route.params, navigation, route.params[RouteParams.IS_LAST_ET], isMergedObjBasedOutput);
       } else {
         let _eventCodeOutput = '';
         if (route.params[RouteParams.EVENT_CODES] && eventCode) {
           _eventCodeOutput = eventCode;
         } else if (eventCode) _eventCodeOutput = eventCode;
-        await instance.saveAndProceed(baseETProps, await getBaseETResponse(getEntityCodeByET(route.params[RouteParams.CURRENT_ET_NAME]), false, _eventCodeOutput ? _eventCodeOutput : getEventCodeByET(route.params[RouteParams.CURRENT_ET_NAME], false, route.params[RouteParams.EVENT_CODES] || []), ReasonCodeContainer.getReasonCodeFromText(reason, route.params[RouteParams.REASONS] ? route.params[RouteParams.REASONS] : reasonsRow)), route.params, navigation, route.params[RouteParams.IS_LAST_ET], isJobBasedOutput);
+        await instance.saveAndProceed(baseETProps, await getBaseETResponse(getEntityCodeByET(route.params[RouteParams.CURRENT_ET_NAME]), false, _eventCodeOutput ? _eventCodeOutput : getEventCodeByET(route.params[RouteParams.CURRENT_ET_NAME], false, route.params[RouteParams.EVENT_CODES] || []), ReasonCodeContainer.getReasonCodeFromText(reason, route.params[RouteParams.REASONS] ? route.params[RouteParams.REASONS] : reasonsRow), mergedObjectiveId, route.params[RouteParams.CURRENT_ET_NAME]), route.params, navigation, route.params[RouteParams.IS_LAST_ET], isMergedObjBasedOutput);
       }
     }
   }) : null;

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

@@ -1 +1 @@
-{"version":3,"names":["CancelET","React","useEffect","useState","getEventCodeByET","withBaseDispatchScreen","getBaseETResponse","getEntityCodeByET","ReasonCodeContainer","RouteParams","DispatchStateContainer","instance","getInstance","CancellationScreen","_ref","route","navigation","baseETProps","reasons","setReasons","events","setEvents","reasonCodes","params","REASONS","length","values","reasonCode","push","description","eventCodes","EVENT_CODES","e_values","eventCode","createElement","cancelEvent","CANCEL_EVENT","cancellationEvents","cancellationReasons","applicableCodes","APPLICABLE_CODES","eventRows","onSubmitET","reason","reasonsRow","isJobBasedOutput","IS_JOB_BASED_OUTPUT","ET_SUCCESS","ET_SUCCESS_RESPONSE","baseResponse","getReasonCodeFromText","saveAndProceed","IS_LAST_ET","_eventCodeOutput","CURRENT_ET_NAME"],"sources":["CancellationScreen.tsx"],"sourcesContent":["import CancelET from '../../components/executiontasks/cancellation/CancelET';\nimport React, { useEffect, useState } from 'react';\nimport { getEventCodeByET } from '../../manager/dispatchCodes/EventCodeContainer';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport {\n  getBaseETResponse,\n  getEntityCodeByET,\n} from '../../utils/ExecTaskUtils';\nimport ReasonCodeContainer from '../../manager/dispatchCodes/ReasonCodeContainer';\nimport type { EventsRow, ReasonsRow } from '../../manager/syncmanager/DBConfig';\nimport { RouteParams } from '../uiConfig/RouteParams';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\n\nconst instance = DispatchStateContainer.getInstance();\nconst CancellationScreen = ({\n  route,\n  navigation,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  const [reasons, setReasons] = useState<string[]>([]);\n  const [events, setEvents] = useState<string[]>([]);\n  useEffect(() => {\n    const reasonCodes = route.params[RouteParams.REASONS];\n    if (reasonCodes && reasonCodes.length) {\n      const values: string[] = [];\n      for (let reasonCode of reasonCodes as ReasonsRow[]) {\n        values.push(reasonCode.description);\n      }\n      setReasons(values);\n    }\n    const eventCodes = route.params[RouteParams.EVENT_CODES];\n\n    if (eventCodes && eventCodes.length) {\n      const e_values: string[] = [];\n      for (let eventCode of route.params[\n        RouteParams.EVENT_CODES\n      ] as EventsRow[]) {\n        e_values.push(eventCode.description);\n      }\n      setEvents(e_values);\n    }\n  }, [route.params]);\n\n  return events.length || reasons.length ? (\n    <CancelET\n      cancelEvent={route.params[RouteParams.CANCEL_EVENT] || ''}\n      cancellationEvents={events}\n      cancellationReasons={reasons}\n      applicableCodes={route.params[RouteParams.APPLICABLE_CODES]}\n      eventRows={route.params[RouteParams.EVENT_CODES]}\n      onSubmitET={async (reason, eventCode, reasonsRow) => {\n        const isJobBasedOutput = route.params[RouteParams.IS_JOB_BASED_OUTPUT];\n        if (route.params[RouteParams.ET_SUCCESS]) {\n          if (route.params[RouteParams.EVENT_CODES] && eventCode) {\n            if (isJobBasedOutput)\n              route.params[\n                RouteParams.ET_SUCCESS_RESPONSE\n              ].baseResponse.eventCode = eventCode;\n            else\n              route.params[RouteParams.ET_SUCCESS_RESPONSE].eventCode =\n                eventCode;\n          } else if (eventCode) {\n            if (isJobBasedOutput)\n              route.params[\n                RouteParams.ET_SUCCESS_RESPONSE\n              ].baseResponse.eventCode = eventCode;\n            else\n              route.params[RouteParams.ET_SUCCESS_RESPONSE].eventCode =\n                eventCode;\n          }\n\n          if (isJobBasedOutput)\n            route.params[\n              RouteParams.ET_SUCCESS_RESPONSE\n            ].baseResponse.reasonCode =\n              ReasonCodeContainer.getReasonCodeFromText(\n                reason,\n                route.params[RouteParams.REASONS]\n                  ? route.params[RouteParams.REASONS]\n                  : reasonsRow\n              );\n          else\n            route.params[RouteParams.ET_SUCCESS_RESPONSE].reasonCode =\n              ReasonCodeContainer.getReasonCodeFromText(\n                reason,\n                route.params[RouteParams.REASONS]\n                  ? route.params[RouteParams.REASONS]\n                  : reasonsRow\n              );\n\n          await instance.saveAndProceed(\n            baseETProps,\n            route.params[RouteParams.ET_SUCCESS_RESPONSE],\n            route.params,\n            navigation,\n            route.params[RouteParams.IS_LAST_ET],\n            isJobBasedOutput\n          );\n        } else {\n          let _eventCodeOutput = '';\n          if (route.params[RouteParams.EVENT_CODES] && eventCode) {\n            _eventCodeOutput = eventCode;\n          } else if (eventCode) _eventCodeOutput = eventCode;\n\n          await instance.saveAndProceed(\n            baseETProps,\n            await getBaseETResponse(\n              getEntityCodeByET(route.params[RouteParams.CURRENT_ET_NAME]),\n              false,\n              _eventCodeOutput\n                ? _eventCodeOutput\n                : getEventCodeByET(\n                    route.params[RouteParams.CURRENT_ET_NAME],\n                    false,\n                    route.params[RouteParams.EVENT_CODES] || []\n                  ),\n              ReasonCodeContainer.getReasonCodeFromText(\n                reason,\n                route.params[RouteParams.REASONS]\n                  ? route.params[RouteParams.REASONS]\n                  : reasonsRow\n              )\n            ),\n            route.params,\n            navigation,\n            route.params[RouteParams.IS_LAST_ET],\n            isJobBasedOutput\n          );\n        }\n      }}\n    />\n  ) : null;\n};\nexport default withBaseDispatchScreen(CancellationScreen);\n"],"mappings":"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"}
+{"version":3,"names":["CancelET","React","useEffect","useState","getEventCodeByET","withBaseDispatchScreen","getBaseETResponse","getEntityCodeByET","ReasonCodeContainer","RouteParams","getDataFromNextState","DispatchStateContainer","instance","getInstance","CancellationScreen","_ref","route","navigation","baseETProps","nextState","params","NEXT_STATES","taskMeta","mergedObjectiveId","input","wfMeta","reasons","setReasons","events","setEvents","reasonCodes","REASONS","length","values","reasonCode","push","description","eventCodes","EVENT_CODES","e_values","eventCode","createElement","cancelEvent","CANCEL_EVENT","cancellationEvents","cancellationReasons","applicableCodes","APPLICABLE_CODES","eventRows","onSubmitET","reason","reasonsRow","isMergedObjBasedOutput","IS_MERGED_OBJ_BASED_OUTPUT","ET_SUCCESS","ET_SUCCESS_RESPONSE","getReasonCodeFromText","saveAndProceed","IS_LAST_ET","_eventCodeOutput","CURRENT_ET_NAME"],"sources":["CancellationScreen.tsx"],"sourcesContent":["import CancelET from '../../components/executiontasks/cancellation/CancelET';\nimport React, { useEffect, useState } from 'react';\nimport { getEventCodeByET } from '../../manager/dispatchCodes/EventCodeContainer';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport {\n  getBaseETResponse,\n  getEntityCodeByET,\n} from '../../utils/ExecTaskUtils';\nimport ReasonCodeContainer from '../../manager/dispatchCodes/ReasonCodeContainer';\nimport type { EventsRow, ReasonsRow } from '../../manager/syncmanager/DBConfig';\nimport { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\n\nconst instance = DispatchStateContainer.getInstance();\nconst CancellationScreen = ({\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 [reasons, setReasons] = useState<string[]>([]);\n  const [events, setEvents] = useState<string[]>([]);\n  useEffect(() => {\n    const reasonCodes = route.params[RouteParams.REASONS];\n    if (reasonCodes && reasonCodes.length) {\n      const values: string[] = [];\n      for (let reasonCode of reasonCodes as ReasonsRow[]) {\n        values.push(reasonCode.description);\n      }\n      setReasons(values);\n    }\n    const eventCodes = route.params[RouteParams.EVENT_CODES];\n\n    if (eventCodes && eventCodes.length) {\n      const e_values: string[] = [];\n      for (let eventCode of route.params[\n        RouteParams.EVENT_CODES\n      ] as EventsRow[]) {\n        e_values.push(eventCode.description);\n      }\n      setEvents(e_values);\n    }\n  }, [route.params]);\n\n  return events.length || reasons.length ? (\n    <CancelET\n      // mergedObjectiveId={mergedObjectiveId}\n      cancelEvent={route.params[RouteParams.CANCEL_EVENT] || ''}\n      cancellationEvents={events}\n      cancellationReasons={reasons}\n      applicableCodes={route.params[RouteParams.APPLICABLE_CODES]}\n      eventRows={route.params[RouteParams.EVENT_CODES]}\n      onSubmitET={async (reason, eventCode, reasonsRow) => {\n        const isMergedObjBasedOutput =\n          route.params[RouteParams.IS_MERGED_OBJ_BASED_OUTPUT];\n        if (route.params[RouteParams.ET_SUCCESS]) {\n          if (route.params[RouteParams.EVENT_CODES] && eventCode) {\n            // if (isJobBasedOutput)\n            //   route.params[\n            //     RouteParams.ET_SUCCESS_RESPONSE\n            //   ].baseResponse.eventCode = eventCode;\n            // else\n            route.params[RouteParams.ET_SUCCESS_RESPONSE].eventCode = eventCode;\n          } else if (eventCode) {\n            // if (isJobBasedOutput)\n            //   route.params[\n            //     RouteParams.ET_SUCCESS_RESPONSE\n            //   ].baseResponse.eventCode = eventCode;\n            // else\n            route.params[RouteParams.ET_SUCCESS_RESPONSE].eventCode = eventCode;\n          }\n\n          // if (isJobBasedOutput)\n          //   route.params[\n          //     RouteParams.ET_SUCCESS_RESPONSE\n          //   ].baseResponse.reasonCode =\n          //     ReasonCodeContainer.getReasonCodeFromText(\n          //       reason,\n          //       route.params[RouteParams.REASONS]\n          //         ? route.params[RouteParams.REASONS]\n          //         : reasonsRow\n          //     );\n          // else\n          route.params[RouteParams.ET_SUCCESS_RESPONSE].reasonCode =\n            ReasonCodeContainer.getReasonCodeFromText(\n              reason,\n              route.params[RouteParams.REASONS]\n                ? route.params[RouteParams.REASONS]\n                : reasonsRow\n            );\n\n          await instance.saveAndProceed(\n            baseETProps,\n            route.params[RouteParams.ET_SUCCESS_RESPONSE],\n            route.params,\n            navigation,\n            route.params[RouteParams.IS_LAST_ET],\n            isMergedObjBasedOutput\n          );\n        } else {\n          let _eventCodeOutput = '';\n          if (route.params[RouteParams.EVENT_CODES] && eventCode) {\n            _eventCodeOutput = eventCode;\n          } else if (eventCode) _eventCodeOutput = eventCode;\n\n          await instance.saveAndProceed(\n            baseETProps,\n            await getBaseETResponse(\n              getEntityCodeByET(route.params[RouteParams.CURRENT_ET_NAME]),\n              false,\n              _eventCodeOutput\n                ? _eventCodeOutput\n                : getEventCodeByET(\n                    route.params[RouteParams.CURRENT_ET_NAME],\n                    false,\n                    route.params[RouteParams.EVENT_CODES] || []\n                  ),\n              ReasonCodeContainer.getReasonCodeFromText(\n                reason,\n                route.params[RouteParams.REASONS]\n                  ? route.params[RouteParams.REASONS]\n                  : reasonsRow\n              ),\n              mergedObjectiveId,\n              route.params[RouteParams.CURRENT_ET_NAME]\n            ),\n            route.params,\n            navigation,\n            route.params[RouteParams.IS_LAST_ET],\n            isMergedObjBasedOutput\n          );\n        }\n      }}\n    />\n  ) : null;\n};\nexport default withBaseDispatchScreen(CancellationScreen);\n"],"mappings":"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"}

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

@@ -4,7 +4,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import withBaseDispatchScreen from './WithBaseDispatchScreen';
 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 { View } from 'react-native';
 import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
@@ -14,8 +14,15 @@ const CaptureInputScreen = _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);
   }, []);
   const [showAlert, setShowAlert] = useState(false);
   const [sResponse, setResponse] = useState();
@@ -26,9 +33,10 @@ const CaptureInputScreen = _ref => {
     style: {
       flex: 1
     }
-  }, /*#__PURE__*/React.createElement(CaptureText, _extends({}, route.params[RouteParams.NEXT_STATES][0].nextState.data.input, {
+  }, /*#__PURE__*/React.createElement(CaptureText, _extends({}, input, {
     navigation: navigation,
-    taskMeta: JSON.parse(route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta || '{}'),
+    taskMeta: taskMeta,
+    mergedObjectiveId: mergedObjectiveId,
     onSubmitET: async etResponse => {
       if (etResponse.success) {
         await submitOutput(etResponse);

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

@@ -1 +1 @@
-{"version":3,"names":["CaptureText","React","useCallback","useEffect","useState","withBaseDispatchScreen","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","View","CancelOrderDialog","onTaskStart","CaptureInputScreen","_ref","route","navigation","baseETProps","params","NEXT_STATES","showAlert","setShowAlert","sResponse","setResponse","submitOutput","response","getInstance","navigateToNextTask","success","CAPTURE_INPUT","createElement","style","flex","_extends","nextState","data","input","taskMeta","JSON","parse","onSubmitET","etResponse","_prevState","visible","onSubmit","value"],"sources":["CaptureInputScreen.tsx"],"sourcesContent":["import { CaptureText } from '../../components/executiontasks/ExecutionTasksIndex';\nimport React, { useCallback, useEffect, useState } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams } from '../uiConfig/RouteParams';\nimport { View } from 'react-native';\nimport CancelOrderDialog from '../../components/widgets/CancelOrderDialog';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst CaptureInputScreen = ({\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 (response: any) => {\n      await DispatchStateContainer.getInstance().navigateToNextTask(\n        navigation,\n        route,\n        response,\n        response.success,\n        EntityCode.CAPTURE_INPUT,\n        ExecutionTaskID.CAPTURE_INPUT,\n        baseETProps,\n        false\n      );\n    },\n    [baseETProps, navigation, route]\n  );\n  return (\n    <View style={{ flex: 1 }}>\n      <CaptureText\n        {...route.params[RouteParams.NEXT_STATES][0].nextState.data.input}\n        navigation={navigation}\n        taskMeta={JSON.parse(\n          route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta ||\n            '{}'\n        )}\n        onSubmitET={async (etResponse) => {\n          if (etResponse.success) {\n            await submitOutput(etResponse);\n          } else {\n            setResponse((_prevState: any) => {\n              setShowAlert(true);\n              return etResponse;\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(CaptureInputScreen);\n"],"mappings":";AAAA,SAASA,WAAW,QAAQ,qDAAqD;AACjF,OAAOC,KAAK,IAAIC,WAAW,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC/D,OAAOC,sBAAsB,MAAM,0BAA0B;AAE7D,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAC7E,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,WAAW,QAAQ,yBAAyB;AACrD,SAASC,IAAI,QAAQ,cAAc;AACnC,OAAOC,iBAAiB,MAAM,4CAA4C;AAC1E,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,MAAMC,kBAAkB,GAAGC,IAAA,IAQrB;EAAA,IARsB;IAC1BC,KAAK;IACLC,UAAU;IACVC;EAKF,CAAC,GAAAH,IAAA;EACCX,SAAS,CAAC,MAAM;IACdS,WAAW,CAACG,KAAK,CAACG,MAAM,CAACT,WAAW,CAACU,WAAW,CAAC,CAAC;EACpD,CAAC,EAAE,EAAE,CAAC;EACN,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAGjB,QAAQ,CAAC,KAAK,CAAC;EACjD,MAAM,CAACkB,SAAS,EAAEC,WAAW,CAAC,GAAGnB,QAAQ,EAAO;EAChD,MAAMoB,YAAY,GAAGtB,WAAW,CAC9B,MAAOuB,QAAa,IAAK;IACvB,MAAMjB,sBAAsB,CAACkB,WAAW,EAAE,CAACC,kBAAkB,CAC3DX,UAAU,EACVD,KAAK,EACLU,QAAQ,EACRA,QAAQ,CAACG,OAAO,EAChBtB,UAAU,CAACuB,aAAa,EACxBtB,eAAe,CAACsB,aAAa,EAC7BZ,WAAW,EACX,KAAK,CACN;EACH,CAAC,EACD,CAACA,WAAW,EAAED,UAAU,EAAED,KAAK,CAAC,CACjC;EACD,oBACEd,KAAA,CAAA6B,aAAA,CAACpB,IAAI;IAACqB,KAAK,EAAE;MAAEC,IAAI,EAAE;IAAE;EAAE,gBACvB/B,KAAA,CAAA6B,aAAA,CAAC9B,WAAW,EAAAiC,QAAA,KACNlB,KAAK,CAACG,MAAM,CAACT,WAAW,CAACU,WAAW,CAAC,CAAC,CAAC,CAAC,CAACe,SAAS,CAACC,IAAI,CAACC,KAAK;IACjEpB,UAAU,EAAEA,UAAW;IACvBqB,QAAQ,EAAEC,IAAI,CAACC,KAAK,CAClBxB,KAAK,CAACG,MAAM,CAACT,WAAW,CAACU,WAAW,CAAC,CAAC,CAAC,CAAC,CAACe,SAAS,CAACC,IAAI,CAACE,QAAQ,IAC9D,IAAI,CACN;IACFG,UAAU,EAAE,MAAOC,UAAU,IAAK;MAChC,IAAIA,UAAU,CAACb,OAAO,EAAE;QACtB,MAAMJ,YAAY,CAACiB,UAAU,CAAC;MAChC,CAAC,MAAM;QACLlB,WAAW,CAAEmB,UAAe,IAAK;UAC/BrB,YAAY,CAAC,IAAI,CAAC;UAClB,OAAOoB,UAAU;QACnB,CAAC,CAAC;MACJ;IACF;EAAE,GACF,eACFxC,KAAA,CAAA6B,aAAA,CAACnB,iBAAiB;IAChBgC,OAAO,EAAEvB,SAAU;IACnBwB,QAAQ,EAAE,MAAOC,KAAK,IAAK;MACzB,IAAIA,KAAK,EAAE;QACTxB,YAAY,CAAC,KAAK,CAAC;QACnB,MAAMG,YAAY,CAACF,SAAS,CAAC;MAC/B,CAAC,MAAM;QACLD,YAAY,CAAC,KAAK,CAAC;MACrB;IACF;EAAE,EACF,CACG;AAEX,CAAC;AACD,eAAehB,sBAAsB,CAACQ,kBAAkB,CAAC"}
+{"version":3,"names":["CaptureText","React","useCallback","useEffect","useState","withBaseDispatchScreen","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","getDataFromNextState","View","CancelOrderDialog","onTaskStart","CaptureInputScreen","_ref","route","navigation","baseETProps","nextState","params","NEXT_STATES","taskMeta","mergedObjectiveId","input","wfMeta","ROOT_META_DATA","customEventsData","showAlert","setShowAlert","sResponse","setResponse","submitOutput","response","getInstance","navigateToNextTask","success","CAPTURE_INPUT","createElement","style","flex","_extends","onSubmitET","etResponse","_prevState","visible","onSubmit","value"],"sources":["CaptureInputScreen.tsx"],"sourcesContent":["import { CaptureText } from '../../components/executiontasks/ExecutionTasksIndex';\nimport React, { useCallback, useEffect, useState } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';\nimport { View } from 'react-native';\nimport CancelOrderDialog from '../../components/widgets/CancelOrderDialog';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst CaptureInputScreen = ({\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  const [showAlert, setShowAlert] = useState(false);\n  const [sResponse, setResponse] = useState<any>();\n  const submitOutput = useCallback(\n    async (response: any) => {\n      await DispatchStateContainer.getInstance().navigateToNextTask(\n        navigation,\n        route,\n        response,\n        response.success,\n        EntityCode.CAPTURE_INPUT,\n        ExecutionTaskID.CAPTURE_INPUT,\n        baseETProps,\n        false\n      );\n    },\n    [baseETProps, navigation, route]\n  );\n  return (\n    <View style={{ flex: 1 }}>\n      <CaptureText\n        {...input}\n        navigation={navigation}\n        taskMeta={taskMeta}\n        mergedObjectiveId={mergedObjectiveId}\n        onSubmitET={async (etResponse) => {\n          if (etResponse.success) {\n            await submitOutput(etResponse);\n          } else {\n            setResponse((_prevState: any) => {\n              setShowAlert(true);\n              return etResponse;\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(CaptureInputScreen);\n"],"mappings":";AAAA,SAASA,WAAW,QAAQ,qDAAqD;AACjF,OAAOC,KAAK,IAAIC,WAAW,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC/D,OAAOC,sBAAsB,MAAM,0BAA0B;AAE7D,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAC7E,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,WAAW,EAAEC,oBAAoB,QAAQ,yBAAyB;AAC3E,SAASC,IAAI,QAAQ,cAAc;AACnC,OAAOC,iBAAiB,MAAM,4CAA4C;AAC1E,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,MAAMC,kBAAkB,GAAGC,IAAA,IAQrB;EAAA,IARsB;IAC1BC,KAAK;IACLC,UAAU;IACVC;EAKF,CAAC,GAAAH,IAAA;EACC,MAAMI,SAAS,GAAGH,KAAK,CAACI,MAAM,CAACX,WAAW,CAACY,WAAW,CAAC;EACvD,MAAM;IAAEC,QAAQ;IAAEC,iBAAiB;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAClDf,oBAAoB,CAACS,SAAS,CAAC;EACjChB,SAAS,CAAC,MAAM;IACdU,WAAW,CACTM,SAAS,EACTH,KAAK,CAACI,MAAM,CAACX,WAAW,CAACiB,cAAc,CAAC,CAACC,gBAC3C,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EACN,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAGzB,QAAQ,CAAC,KAAK,CAAC;EACjD,MAAM,CAAC0B,SAAS,EAAEC,WAAW,CAAC,GAAG3B,QAAQ,CAAM,CAAC;EAChD,MAAM4B,YAAY,GAAG9B,WAAW,CAC9B,MAAO+B,QAAa,IAAK;IACvB,MAAMzB,sBAAsB,CAAC0B,WAAW,CAAC,CAAC,CAACC,kBAAkB,CAC3DlB,UAAU,EACVD,KAAK,EACLiB,QAAQ,EACRA,QAAQ,CAACG,OAAO,EAChB9B,UAAU,CAAC+B,aAAa,EACxB9B,eAAe,CAAC8B,aAAa,EAC7BnB,WAAW,EACX,KACF,CAAC;EACH,CAAC,EACD,CAACA,WAAW,EAAED,UAAU,EAAED,KAAK,CACjC,CAAC;EACD,oBACEf,KAAA,CAAAqC,aAAA,CAAC3B,IAAI;IAAC4B,KAAK,EAAE;MAAEC,IAAI,EAAE;IAAE;EAAE,gBACvBvC,KAAA,CAAAqC,aAAA,CAACtC,WAAW,EAAAyC,QAAA,KACNjB,KAAK;IACTP,UAAU,EAAEA,UAAW;IACvBK,QAAQ,EAAEA,QAAS;IACnBC,iBAAiB,EAAEA,iBAAkB;IACrCmB,UAAU,EAAE,MAAOC,UAAU,IAAK;MAChC,IAAIA,UAAU,CAACP,OAAO,EAAE;QACtB,MAAMJ,YAAY,CAACW,UAAU,CAAC;MAChC,CAAC,MAAM;QACLZ,WAAW,CAAEa,UAAe,IAAK;UAC/Bf,YAAY,CAAC,IAAI,CAAC;UAClB,OAAOc,UAAU;QACnB,CAAC,CAAC;MACJ;IACF;EAAE,EACH,CAAC,eACF1C,KAAA,CAAAqC,aAAA,CAAC1B,iBAAiB;IAChBiC,OAAO,EAAEjB,SAAU;IACnBkB,QAAQ,EAAE,MAAOC,KAAK,IAAK;MACzB,IAAIA,KAAK,EAAE;QACTlB,YAAY,CAAC,KAAK,CAAC;QACnB,MAAMG,YAAY,CAACF,SAAS,CAAC;MAC/B,CAAC,MAAM;QACLD,YAAY,CAAC,KAAK,CAAC;MACrB;IACF;EAAE,CACH,CACG,CAAC;AAEX,CAAC;AACD,eAAexB,sBAAsB,CAACS,kBAAkB,CAAC"}

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

@@ -7,22 +7,29 @@ import { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';
 import withBaseDispatchScreen from './WithBaseDispatchScreen';
 import Logger, { LOG_TYPE } from '../../utils/Logger';
 import { showToast } from '../../components/widgets/Toaster';
-import { RouteParams } from '../uiConfig/RouteParams';
+import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 const CompleteObjectiveScreen = _ref => {
   let {
     navigation,
     route,
     baseETProps
   } = _ref;
+  const nextState = route.params[RouteParams.NEXT_STATES];
+  const {
+    taskMeta,
+    mergedObjectiveId,
+    input,
+    wfMeta
+  } = getDataFromNextState(nextState);
   useEffect(() => {
     (async () => {
       try {
         baseETProps.showProgress(true);
         let etResponse;
-        let nextState = route.params[RouteParams.NEXT_STATES][0];
-        const entityCode = nextState.nextState.taskId === ExecutionTaskID.COMPLETED_SUCCESS ? EntityCode.COMPLETED_SUCCESS : EntityCode.COMPLETED_FAILURE;
-        etResponse = await getObjectiveCompleteResp(entityCode, true, getEventCodeByET(nextState.nextState.taskId, true), '');
-        await DispatchStateContainer.getInstance().navigateToNextTask(navigation, route, etResponse, etResponse.success, entityCode, nextState.nextState.taskId === ExecutionTaskID.COMPLETED_SUCCESS ? ExecutionTaskID.COMPLETED_SUCCESS : ExecutionTaskID.COMPLETED_FAILURE, baseETProps, true);
+        let nextState = route.params[RouteParams.NEXT_STATES];
+        const entityCode = nextState.taskId === ExecutionTaskID.COMPLETED_SUCCESS ? EntityCode.COMPLETED_SUCCESS : EntityCode.COMPLETED_FAILURE;
+        etResponse = await getObjectiveCompleteResp(entityCode, true, getEventCodeByET(nextState.taskId, true), '', mergedObjectiveId, nextState.taskId);
+        await DispatchStateContainer.getInstance().navigateToNextTask(navigation, route, etResponse, etResponse.success, entityCode, nextState.taskId === ExecutionTaskID.COMPLETED_SUCCESS ? ExecutionTaskID.COMPLETED_SUCCESS : ExecutionTaskID.COMPLETED_FAILURE, baseETProps, true);
       } catch (error) {
         baseETProps.showProgress(false);
         Logger.getInstance().logEvent('COMPLETE_OBJECTIVE', error.message, LOG_TYPE.SDK_ERROR);

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

@@ -1 +1 @@
-{"version":3,"names":["View","React","useEffect","DispatchStateContainer","getObjectiveCompleteResp","getEventCodeByET","EntityCode","ExecutionTaskID","withBaseDispatchScreen","Logger","LOG_TYPE","showToast","RouteParams","CompleteObjectiveScreen","_ref","navigation","route","baseETProps","showProgress","etResponse","nextState","params","NEXT_STATES","entityCode","taskId","COMPLETED_SUCCESS","COMPLETED_FAILURE","getInstance","navigateToNextTask","success","error","logEvent","message","SDK_ERROR","createElement"],"sources":["CompleteObjectiveScreen.tsx"],"sourcesContent":["import { View } from 'react-native';\nimport React, { useEffect } from 'react';\nimport type { BaseETProps, stateWithObjRef } from '../../models/DispatchModels';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { getObjectiveCompleteResp } from '../../utils/ExecTaskUtils';\nimport { getEventCodeByET } from '../../manager/dispatchCodes/EventCodeContainer';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport Logger, { LOG_TYPE } from '../../utils/Logger';\nimport { showToast } from '../../components/widgets/Toaster';\nimport { RouteParams } from '../uiConfig/RouteParams';\n\nconst CompleteObjectiveScreen = ({\n  navigation,\n  route,\n  baseETProps,\n}: {\n  route: any;\n  navigation: any;\n  baseETProps: BaseETProps;\n}) => {\n  useEffect(() => {\n    (async () => {\n      try {\n        baseETProps.showProgress(true);\n        let etResponse;\n        let nextState: stateWithObjRef = route.params[\n          RouteParams.NEXT_STATES\n        ][0] as stateWithObjRef;\n        const entityCode =\n          nextState.nextState.taskId === ExecutionTaskID.COMPLETED_SUCCESS\n            ? EntityCode.COMPLETED_SUCCESS\n            : EntityCode.COMPLETED_FAILURE;\n        etResponse = await getObjectiveCompleteResp(\n          entityCode,\n          true,\n          getEventCodeByET(nextState.nextState.taskId, true),\n          ''\n        );\n        await DispatchStateContainer.getInstance().navigateToNextTask(\n          navigation,\n          route,\n          etResponse,\n          etResponse.success,\n          entityCode,\n          nextState.nextState.taskId === ExecutionTaskID.COMPLETED_SUCCESS\n            ? ExecutionTaskID.COMPLETED_SUCCESS\n            : ExecutionTaskID.COMPLETED_FAILURE,\n          baseETProps,\n          true\n        );\n      } catch (error: any) {\n        baseETProps.showProgress(false);\n        Logger.getInstance().logEvent(\n          'COMPLETE_OBJECTIVE',\n          error.message,\n          LOG_TYPE.SDK_ERROR\n        );\n        showToast(error.message);\n      }\n    })();\n\n    return () => {\n      baseETProps.showProgress(false);\n    };\n  }, []);\n  return <View />;\n};\nexport default withBaseDispatchScreen(CompleteObjectiveScreen);\n"],"mappings":"AAAA,SAASA,IAAI,QAAQ,cAAc;AACnC,OAAOC,KAAK,IAAIC,SAAS,QAAQ,OAAO;AAExC,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,wBAAwB,QAAQ,2BAA2B;AACpE,SAASC,gBAAgB,QAAQ,gDAAgD;AACjF,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAC7E,OAAOC,sBAAsB,MAAM,0BAA0B;AAC7D,OAAOC,MAAM,IAAIC,QAAQ,QAAQ,oBAAoB;AACrD,SAASC,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,WAAW,QAAQ,yBAAyB;AAErD,MAAMC,uBAAuB,GAAGC,IAAA,IAQ1B;EAAA,IAR2B;IAC/BC,UAAU;IACVC,KAAK;IACLC;EAKF,CAAC,GAAAH,IAAA;EACCZ,SAAS,CAAC,MAAM;IACd,CAAC,YAAY;MACX,IAAI;QACFe,WAAW,CAACC,YAAY,CAAC,IAAI,CAAC;QAC9B,IAAIC,UAAU;QACd,IAAIC,SAA0B,GAAGJ,KAAK,CAACK,MAAM,CAC3CT,WAAW,CAACU,WAAW,CACxB,CAAC,CAAC,CAAoB;QACvB,MAAMC,UAAU,GACdH,SAAS,CAACA,SAAS,CAACI,MAAM,KAAKjB,eAAe,CAACkB,iBAAiB,GAC5DnB,UAAU,CAACmB,iBAAiB,GAC5BnB,UAAU,CAACoB,iBAAiB;QAClCP,UAAU,GAAG,MAAMf,wBAAwB,CACzCmB,UAAU,EACV,IAAI,EACJlB,gBAAgB,CAACe,SAAS,CAACA,SAAS,CAACI,MAAM,EAAE,IAAI,CAAC,EAClD,EAAE,CACH;QACD,MAAMrB,sBAAsB,CAACwB,WAAW,EAAE,CAACC,kBAAkB,CAC3Db,UAAU,EACVC,KAAK,EACLG,UAAU,EACVA,UAAU,CAACU,OAAO,EAClBN,UAAU,EACVH,SAAS,CAACA,SAAS,CAACI,MAAM,KAAKjB,eAAe,CAACkB,iBAAiB,GAC5DlB,eAAe,CAACkB,iBAAiB,GACjClB,eAAe,CAACmB,iBAAiB,EACrCT,WAAW,EACX,IAAI,CACL;MACH,CAAC,CAAC,OAAOa,KAAU,EAAE;QACnBb,WAAW,CAACC,YAAY,CAAC,KAAK,CAAC;QAC/BT,MAAM,CAACkB,WAAW,EAAE,CAACI,QAAQ,CAC3B,oBAAoB,EACpBD,KAAK,CAACE,OAAO,EACbtB,QAAQ,CAACuB,SAAS,CACnB;QACDtB,SAAS,CAACmB,KAAK,CAACE,OAAO,CAAC;MAC1B;IACF,CAAC,GAAG;IAEJ,OAAO,MAAM;MACXf,WAAW,CAACC,YAAY,CAAC,KAAK,CAAC;IACjC,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EACN,oBAAOjB,KAAA,CAAAiC,aAAA,CAAClC,IAAI,OAAG;AACjB,CAAC;AACD,eAAeQ,sBAAsB,CAACK,uBAAuB,CAAC"}
+{"version":3,"names":["View","React","useEffect","DispatchStateContainer","getObjectiveCompleteResp","getEventCodeByET","EntityCode","ExecutionTaskID","withBaseDispatchScreen","Logger","LOG_TYPE","showToast","RouteParams","getDataFromNextState","CompleteObjectiveScreen","_ref","navigation","route","baseETProps","nextState","params","NEXT_STATES","taskMeta","mergedObjectiveId","input","wfMeta","showProgress","etResponse","entityCode","taskId","COMPLETED_SUCCESS","COMPLETED_FAILURE","getInstance","navigateToNextTask","success","error","logEvent","message","SDK_ERROR","createElement"],"sources":["CompleteObjectiveScreen.tsx"],"sourcesContent":["import { View } from 'react-native';\nimport React, { useEffect } from 'react';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { getObjectiveCompleteResp } from '../../utils/ExecTaskUtils';\nimport { getEventCodeByET } from '../../manager/dispatchCodes/EventCodeContainer';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport Logger, { LOG_TYPE } from '../../utils/Logger';\nimport { showToast } from '../../components/widgets/Toaster';\nimport { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';\n\nconst CompleteObjectiveScreen = ({\n  navigation,\n  route,\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    (async () => {\n      try {\n        baseETProps.showProgress(true);\n        let etResponse;\n        let nextState = route.params[RouteParams.NEXT_STATES];\n        const entityCode =\n          nextState.taskId === ExecutionTaskID.COMPLETED_SUCCESS\n            ? EntityCode.COMPLETED_SUCCESS\n            : EntityCode.COMPLETED_FAILURE;\n        etResponse = await getObjectiveCompleteResp(\n          entityCode,\n          true,\n          getEventCodeByET(nextState.taskId, true),\n          '',\n          mergedObjectiveId,\n          nextState.taskId\n        );\n        await DispatchStateContainer.getInstance().navigateToNextTask(\n          navigation,\n          route,\n          etResponse,\n          etResponse.success,\n          entityCode,\n          nextState.taskId === ExecutionTaskID.COMPLETED_SUCCESS\n            ? ExecutionTaskID.COMPLETED_SUCCESS\n            : ExecutionTaskID.COMPLETED_FAILURE,\n          baseETProps,\n          true\n        );\n      } catch (error: any) {\n        baseETProps.showProgress(false);\n        Logger.getInstance().logEvent(\n          'COMPLETE_OBJECTIVE',\n          error.message,\n          LOG_TYPE.SDK_ERROR\n        );\n        showToast(error.message);\n      }\n    })();\n\n    return () => {\n      baseETProps.showProgress(false);\n    };\n  }, []);\n  return <View />;\n};\nexport default withBaseDispatchScreen(CompleteObjectiveScreen);\n"],"mappings":"AAAA,SAASA,IAAI,QAAQ,cAAc;AACnC,OAAOC,KAAK,IAAIC,SAAS,QAAQ,OAAO;AAExC,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,wBAAwB,QAAQ,2BAA2B;AACpE,SAASC,gBAAgB,QAAQ,gDAAgD;AACjF,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAC7E,OAAOC,sBAAsB,MAAM,0BAA0B;AAC7D,OAAOC,MAAM,IAAIC,QAAQ,QAAQ,oBAAoB;AACrD,SAASC,SAAS,QAAQ,kCAAkC;AAC5D,SAASC,WAAW,EAAEC,oBAAoB,QAAQ,yBAAyB;AAE3E,MAAMC,uBAAuB,GAAGC,IAAA,IAQ1B;EAAA,IAR2B;IAC/BC,UAAU;IACVC,KAAK;IACLC;EAKF,CAAC,GAAAH,IAAA;EACC,MAAMI,SAAS,GAAGF,KAAK,CAACG,MAAM,CAACR,WAAW,CAACS,WAAW,CAAC;EACvD,MAAM;IAAEC,QAAQ;IAAEC,iBAAiB;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAClDZ,oBAAoB,CAACM,SAAS,CAAC;EACjCjB,SAAS,CAAC,MAAM;IACd,CAAC,YAAY;MACX,IAAI;QACFgB,WAAW,CAACQ,YAAY,CAAC,IAAI,CAAC;QAC9B,IAAIC,UAAU;QACd,IAAIR,SAAS,GAAGF,KAAK,CAACG,MAAM,CAACR,WAAW,CAACS,WAAW,CAAC;QACrD,MAAMO,UAAU,GACdT,SAAS,CAACU,MAAM,KAAKtB,eAAe,CAACuB,iBAAiB,GAClDxB,UAAU,CAACwB,iBAAiB,GAC5BxB,UAAU,CAACyB,iBAAiB;QAClCJ,UAAU,GAAG,MAAMvB,wBAAwB,CACzCwB,UAAU,EACV,IAAI,EACJvB,gBAAgB,CAACc,SAAS,CAACU,MAAM,EAAE,IAAI,CAAC,EACxC,EAAE,EACFN,iBAAiB,EACjBJ,SAAS,CAACU,MACZ,CAAC;QACD,MAAM1B,sBAAsB,CAAC6B,WAAW,CAAC,CAAC,CAACC,kBAAkB,CAC3DjB,UAAU,EACVC,KAAK,EACLU,UAAU,EACVA,UAAU,CAACO,OAAO,EAClBN,UAAU,EACVT,SAAS,CAACU,MAAM,KAAKtB,eAAe,CAACuB,iBAAiB,GAClDvB,eAAe,CAACuB,iBAAiB,GACjCvB,eAAe,CAACwB,iBAAiB,EACrCb,WAAW,EACX,IACF,CAAC;MACH,CAAC,CAAC,OAAOiB,KAAU,EAAE;QACnBjB,WAAW,CAACQ,YAAY,CAAC,KAAK,CAAC;QAC/BjB,MAAM,CAACuB,WAAW,CAAC,CAAC,CAACI,QAAQ,CAC3B,oBAAoB,EACpBD,KAAK,CAACE,OAAO,EACb3B,QAAQ,CAAC4B,SACX,CAAC;QACD3B,SAAS,CAACwB,KAAK,CAACE,OAAO,CAAC;MAC1B;IACF,CAAC,EAAE,CAAC;IAEJ,OAAO,MAAM;MACXnB,WAAW,CAACQ,YAAY,CAAC,KAAK,CAAC;IACjC,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EACN,oBAAOzB,KAAA,CAAAsC,aAAA,CAACvC,IAAI,MAAE,CAAC;AACjB,CAAC;AACD,eAAeQ,sBAAsB,CAACM,uBAAuB,CAAC"}

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

@@ -4,19 +4,39 @@ import withBaseDispatchScreen from './WithBaseDispatchScreen';
 import { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';
 import DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';
 import SLDeliverET from '../../components/executiontasks/deliver/SLDeliverET';
-import { RouteParams } from '../uiConfig/RouteParams';
+import { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';
 import { View } from 'react-native';
 import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
+import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 const DeliverScreen = _ref => {
   let {
     navigation,
     route,
     baseETProps
   } = _ref;
+  const nextState = route.params[RouteParams.NEXT_STATES];
+  const {
+    taskMeta,
+    mergedObjectiveId,
+    input,
+    wfMeta
+  } = getDataFromNextState(nextState);
+  const [returnPackageCount, setReturnPackageCount] = useState(0);
+  const [items, setItems] = useState([]);
+  const getMergedReturnPackageCount = async () => {
+    const count = await DispatchExecutor.getScannedShipmentsCount(mergedObjectiveId);
+    setReturnPackageCount(count.totalCount);
+  };
   useEffect(() => {
-    onTaskStart(route.params[RouteParams.NEXT_STATES]);
+    onTaskStart(nextState, route.params[RouteParams.ROOT_META_DATA].customEventsData);
+    getMergedReturnPackageCount();
   }, []);
+  useEffect(() => {
+    if (returnPackageCount === 1) {
+      setItems(input.items);
+    }
+  }, [returnPackageCount]);
   const [showAlert, setShowAlert] = useState(false);
   const [sResponse, setResponse] = useState();
   const submitOutput = useCallback(async deliverOutput => {
@@ -26,10 +46,12 @@ const DeliverScreen = _ref => {
     style: {
       flex: 1
     }
-  }, /*#__PURE__*/React.createElement(SLDeliverET, _extends({}, route.params[RouteParams.NEXT_STATES][0].nextState.data.input, {
+  }, /*#__PURE__*/React.createElement(SLDeliverET, _extends({}, input, {
+    items: items,
     navigation: navigation,
-    taskMeta: JSON.parse(route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta || '{}'),
-    returnPackageCount: route.params[RouteParams.NEXT_STATES].length,
+    taskMeta: taskMeta,
+    mergedObjectiveId: mergedObjectiveId,
+    returnPackageCount: returnPackageCount,
     onSubmitET: async deliverOutput => {
       if (deliverOutput.success) {
         await submitOutput(deliverOutput);

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

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useEffect","useState","withBaseDispatchScreen","EntityCode","ExecutionTaskID","DispatchStateContainer","SLDeliverET","RouteParams","View","CancelOrderDialog","onTaskStart","DeliverScreen","_ref","navigation","route","baseETProps","params","NEXT_STATES","showAlert","setShowAlert","sResponse","setResponse","submitOutput","deliverOutput","getInstance","navigateToNextTask","success","DELIVER","createElement","style","flex","_extends","nextState","data","input","taskMeta","JSON","parse","returnPackageCount","length","onSubmitET","_prevState","visible","onSubmit","value"],"sources":["DeliverScreen.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useState } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport SLDeliverET from '../../components/executiontasks/deliver/SLDeliverET';\nimport { RouteParams } from '../uiConfig/RouteParams';\nimport { View } from 'react-native';\nimport CancelOrderDialog from '../../components/widgets/CancelOrderDialog';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst DeliverScreen = ({\n  navigation,\n  route,\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 (deliverOutput: any) => {\n      await DispatchStateContainer.getInstance().navigateToNextTask(\n        navigation,\n        route,\n        deliverOutput,\n        deliverOutput.success,\n        EntityCode.DELIVER,\n        ExecutionTaskID.DELIVER,\n        baseETProps,\n        false\n      );\n    },\n    [baseETProps, navigation, route]\n  );\n  return (\n    <View style={{ flex: 1 }}>\n      <SLDeliverET\n        {...route.params[RouteParams.NEXT_STATES][0].nextState.data.input}\n        navigation={navigation}\n        taskMeta={JSON.parse(\n          route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta ||\n            '{}'\n        )}\n        returnPackageCount={route.params[RouteParams.NEXT_STATES].length}\n        onSubmitET={async (deliverOutput) => {\n          if (deliverOutput.success) {\n            await submitOutput(deliverOutput);\n          } else {\n            setResponse((_prevState: any) => {\n              setShowAlert(true);\n              return deliverOutput;\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(DeliverScreen);\n"],"mappings":";AAAA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC/D,OAAOC,sBAAsB,MAAM,0BAA0B;AAE7D,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAC7E,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,OAAOC,WAAW,MAAM,qDAAqD;AAC7E,SAASC,WAAW,QAAQ,yBAAyB;AACrD,SAASC,IAAI,QAAQ,cAAc;AACnC,OAAOC,iBAAiB,MAAM,4CAA4C;AAC1E,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,MAAMC,aAAa,GAAGC,IAAA,IAQhB;EAAA,IARiB;IACrBC,UAAU;IACVC,KAAK;IACLC;EAKF,CAAC,GAAAH,IAAA;EACCZ,SAAS,CAAC,MAAM;IACdU,WAAW,CAACI,KAAK,CAACE,MAAM,CAACT,WAAW,CAACU,WAAW,CAAC,CAAC;EACpD,CAAC,EAAE,EAAE,CAAC;EACN,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAGlB,QAAQ,CAAC,KAAK,CAAC;EACjD,MAAM,CAACmB,SAAS,EAAEC,WAAW,CAAC,GAAGpB,QAAQ,EAAO;EAChD,MAAMqB,YAAY,GAAGvB,WAAW,CAC9B,MAAOwB,aAAkB,IAAK;IAC5B,MAAMlB,sBAAsB,CAACmB,WAAW,EAAE,CAACC,kBAAkB,CAC3DZ,UAAU,EACVC,KAAK,EACLS,aAAa,EACbA,aAAa,CAACG,OAAO,EACrBvB,UAAU,CAACwB,OAAO,EAClBvB,eAAe,CAACuB,OAAO,EACvBZ,WAAW,EACX,KAAK,CACN;EACH,CAAC,EACD,CAACA,WAAW,EAAEF,UAAU,EAAEC,KAAK,CAAC,CACjC;EACD,oBACEhB,KAAA,CAAA8B,aAAA,CAACpB,IAAI;IAACqB,KAAK,EAAE;MAAEC,IAAI,EAAE;IAAE;EAAE,gBACvBhC,KAAA,CAAA8B,aAAA,CAACtB,WAAW,EAAAyB,QAAA,KACNjB,KAAK,CAACE,MAAM,CAACT,WAAW,CAACU,WAAW,CAAC,CAAC,CAAC,CAAC,CAACe,SAAS,CAACC,IAAI,CAACC,KAAK;IACjErB,UAAU,EAAEA,UAAW;IACvBsB,QAAQ,EAAEC,IAAI,CAACC,KAAK,CAClBvB,KAAK,CAACE,MAAM,CAACT,WAAW,CAACU,WAAW,CAAC,CAAC,CAAC,CAAC,CAACe,SAAS,CAACC,IAAI,CAACE,QAAQ,IAC9D,IAAI,CACN;IACFG,kBAAkB,EAAExB,KAAK,CAACE,MAAM,CAACT,WAAW,CAACU,WAAW,CAAC,CAACsB,MAAO;IACjEC,UAAU,EAAE,MAAOjB,aAAa,IAAK;MACnC,IAAIA,aAAa,CAACG,OAAO,EAAE;QACzB,MAAMJ,YAAY,CAACC,aAAa,CAAC;MACnC,CAAC,MAAM;QACLF,WAAW,CAAEoB,UAAe,IAAK;UAC/BtB,YAAY,CAAC,IAAI,CAAC;UAClB,OAAOI,aAAa;QACtB,CAAC,CAAC;MACJ;IACF;EAAE,GACF,eACFzB,KAAA,CAAA8B,aAAA,CAACnB,iBAAiB;IAChBiC,OAAO,EAAExB,SAAU;IACnByB,QAAQ,EAAE,MAAOC,KAAK,IAAK;MACzB,IAAIA,KAAK,EAAE;QACTzB,YAAY,CAAC,KAAK,CAAC;QACnB,MAAMG,YAAY,CAACF,SAAS,CAAC;MAC/B,CAAC,MAAM;QACLD,YAAY,CAAC,KAAK,CAAC;MACrB;IACF;EAAE,EACF,CACG;AAEX,CAAC;AACD,eAAejB,sBAAsB,CAACS,aAAa,CAAC"}
+{"version":3,"names":["React","useCallback","useEffect","useState","withBaseDispatchScreen","EntityCode","ExecutionTaskID","DispatchStateContainer","SLDeliverET","RouteParams","getDataFromNextState","View","CancelOrderDialog","onTaskStart","DispatchExecutor","DeliverScreen","_ref","navigation","route","baseETProps","nextState","params","NEXT_STATES","taskMeta","mergedObjectiveId","input","wfMeta","returnPackageCount","setReturnPackageCount","items","setItems","getMergedReturnPackageCount","count","getScannedShipmentsCount","totalCount","ROOT_META_DATA","customEventsData","showAlert","setShowAlert","sResponse","setResponse","submitOutput","deliverOutput","getInstance","navigateToNextTask","success","DELIVER","createElement","style","flex","_extends","onSubmitET","_prevState","visible","onSubmit","value"],"sources":["DeliverScreen.tsx"],"sourcesContent":["import React, { useCallback, useEffect, useState } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport SLDeliverET from '../../components/executiontasks/deliver/SLDeliverET';\nimport { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';\nimport { View } from 'react-native';\nimport CancelOrderDialog from '../../components/widgets/CancelOrderDialog';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\nimport { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';\nimport Storage from '../../utils/storage';\nimport {\n  SCAN_MERGED_OBJ_ID_OUTPUT,\n  SHARED_PREFERENCE_SCAN_OUTPUT,\n} from '../../manager/syncmanager/constants';\n\nconst DeliverScreen = ({\n  navigation,\n  route,\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 [returnPackageCount, setReturnPackageCount] = useState(0);\n  const [items, setItems] = useState([]);\n\n  const getMergedReturnPackageCount = async () => {\n    const count = await DispatchExecutor.getScannedShipmentsCount(\n      mergedObjectiveId\n    );\n    setReturnPackageCount(count.totalCount);\n  };\n  useEffect(() => {\n    onTaskStart(\n      nextState,\n      route.params[RouteParams.ROOT_META_DATA].customEventsData\n    );\n    getMergedReturnPackageCount();\n  }, []);\n\n  useEffect(() => {\n    if (returnPackageCount === 1) {\n      setItems(input.items);\n    }\n  }, [returnPackageCount]);\n\n  const [showAlert, setShowAlert] = useState(false);\n  const [sResponse, setResponse] = useState<any>();\n  const submitOutput = useCallback(\n    async (deliverOutput: any) => {\n      await DispatchStateContainer.getInstance().navigateToNextTask(\n        navigation,\n        route,\n        deliverOutput,\n        deliverOutput.success,\n        EntityCode.DELIVER,\n        ExecutionTaskID.DELIVER,\n        baseETProps,\n        false\n      );\n    },\n    [baseETProps, navigation, route]\n  );\n\n  return (\n    <View style={{ flex: 1 }}>\n      <SLDeliverET\n        {...input}\n        items={items}\n        navigation={navigation}\n        taskMeta={taskMeta}\n        mergedObjectiveId={mergedObjectiveId}\n        returnPackageCount={returnPackageCount}\n        onSubmitET={async (deliverOutput) => {\n          if (deliverOutput.success) {\n            await submitOutput(deliverOutput);\n          } else {\n            setResponse((_prevState: any) => {\n              setShowAlert(true);\n              return deliverOutput;\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(DeliverScreen);\n"],"mappings":";AAAA,OAAOA,KAAK,IAAIC,WAAW,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC/D,OAAOC,sBAAsB,MAAM,0BAA0B;AAE7D,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAC7E,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,OAAOC,WAAW,MAAM,qDAAqD;AAC7E,SAASC,WAAW,EAAEC,oBAAoB,QAAQ,yBAAyB;AAC3E,SAASC,IAAI,QAAQ,cAAc;AACnC,OAAOC,iBAAiB,MAAM,4CAA4C;AAC1E,SAASC,WAAW,QAAQ,2BAA2B;AACvD,SAASC,gBAAgB,QAAQ,oDAAoD;AAOrF,MAAMC,aAAa,GAAGC,IAAA,IAQhB;EAAA,IARiB;IACrBC,UAAU;IACVC,KAAK;IACLC;EAKF,CAAC,GAAAH,IAAA;EACC,MAAMI,SAAS,GAAGF,KAAK,CAACG,MAAM,CAACZ,WAAW,CAACa,WAAW,CAAC;EACvD,MAAM;IAAEC,QAAQ;IAAEC,iBAAiB;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAClDhB,oBAAoB,CAACU,SAAS,CAAC;EAEjC,MAAM,CAACO,kBAAkB,EAAEC,qBAAqB,CAAC,GAAGzB,QAAQ,CAAC,CAAC,CAAC;EAC/D,MAAM,CAAC0B,KAAK,EAAEC,QAAQ,CAAC,GAAG3B,QAAQ,CAAC,EAAE,CAAC;EAEtC,MAAM4B,2BAA2B,GAAG,MAAAA,CAAA,KAAY;IAC9C,MAAMC,KAAK,GAAG,MAAMlB,gBAAgB,CAACmB,wBAAwB,CAC3DT,iBACF,CAAC;IACDI,qBAAqB,CAACI,KAAK,CAACE,UAAU,CAAC;EACzC,CAAC;EACDhC,SAAS,CAAC,MAAM;IACdW,WAAW,CACTO,SAAS,EACTF,KAAK,CAACG,MAAM,CAACZ,WAAW,CAAC0B,cAAc,CAAC,CAACC,gBAC3C,CAAC;IACDL,2BAA2B,CAAC,CAAC;EAC/B,CAAC,EAAE,EAAE,CAAC;EAEN7B,SAAS,CAAC,MAAM;IACd,IAAIyB,kBAAkB,KAAK,CAAC,EAAE;MAC5BG,QAAQ,CAACL,KAAK,CAACI,KAAK,CAAC;IACvB;EACF,CAAC,EAAE,CAACF,kBAAkB,CAAC,CAAC;EAExB,MAAM,CAACU,SAAS,EAAEC,YAAY,CAAC,GAAGnC,QAAQ,CAAC,KAAK,CAAC;EACjD,MAAM,CAACoC,SAAS,EAAEC,WAAW,CAAC,GAAGrC,QAAQ,CAAM,CAAC;EAChD,MAAMsC,YAAY,GAAGxC,WAAW,CAC9B,MAAOyC,aAAkB,IAAK;IAC5B,MAAMnC,sBAAsB,CAACoC,WAAW,CAAC,CAAC,CAACC,kBAAkB,CAC3D3B,UAAU,EACVC,KAAK,EACLwB,aAAa,EACbA,aAAa,CAACG,OAAO,EACrBxC,UAAU,CAACyC,OAAO,EAClBxC,eAAe,CAACwC,OAAO,EACvB3B,WAAW,EACX,KACF,CAAC;EACH,CAAC,EACD,CAACA,WAAW,EAAEF,UAAU,EAAEC,KAAK,CACjC,CAAC;EAED,oBACElB,KAAA,CAAA+C,aAAA,CAACpC,IAAI;IAACqC,KAAK,EAAE;MAAEC,IAAI,EAAE;IAAE;EAAE,gBACvBjD,KAAA,CAAA+C,aAAA,CAACvC,WAAW,EAAA0C,QAAA,KACNzB,KAAK;IACTI,KAAK,EAAEA,KAAM;IACbZ,UAAU,EAAEA,UAAW;IACvBM,QAAQ,EAAEA,QAAS;IACnBC,iBAAiB,EAAEA,iBAAkB;IACrCG,kBAAkB,EAAEA,kBAAmB;IACvCwB,UAAU,EAAE,MAAOT,aAAa,IAAK;MACnC,IAAIA,aAAa,CAACG,OAAO,EAAE;QACzB,MAAMJ,YAAY,CAACC,aAAa,CAAC;MACnC,CAAC,MAAM;QACLF,WAAW,CAAEY,UAAe,IAAK;UAC/Bd,YAAY,CAAC,IAAI,CAAC;UAClB,OAAOI,aAAa;QACtB,CAAC,CAAC;MACJ;IACF;EAAE,EACH,CAAC,eACF1C,KAAA,CAAA+C,aAAA,CAACnC,iBAAiB;IAChByC,OAAO,EAAEhB,SAAU;IACnBiB,QAAQ,EAAE,MAAOC,KAAK,IAAK;MACzB,IAAIA,KAAK,EAAE;QACTjB,YAAY,CAAC,KAAK,CAAC;QACnB,MAAMG,YAAY,CAACF,SAAS,CAAC;MAC/B,CAAC,MAAM;QACLD,YAAY,CAAC,KAAK,CAAC;MACrB;IACF;EAAE,CACH,CACG,CAAC;AAEX,CAAC;AACD,eAAelC,sBAAsB,CAACW,aAAa,CAAC"}

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

@@ -4,7 +4,7 @@ import withBaseDispatchScreen from './WithBaseDispatchScreen';
 import { DisplayModalET } from '../../components/executiontasks/ExecutionTasksIndex';
 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 DisplayScreen = _ref => {
   let {
@@ -12,10 +12,19 @@ const DisplayScreen = _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(DisplayModalET, _extends({}, route.params[RouteParams.NEXT_STATES][0].nextState.data.input, {
+  return /*#__PURE__*/React.createElement(DisplayModalET, _extends({}, input, {
+    mergedObjectiveId: mergedObjectiveId,
+    taskMeta: taskMeta,
     positiveBtn: 'Submit',
     showDialog: true,
     negativeBtn: 'Cancel',

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

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","withBaseDispatchScreen","DisplayModalET","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","onTaskStart","DisplayScreen","_ref","route","navigation","baseETProps","params","NEXT_STATES","createElement","_extends","nextState","data","input","positiveBtn","showDialog","negativeBtn","onSubmit","displayOutput","getInstance","navigateToNextTask","success","DISPLAY"],"sources":["DisplayScreen.tsx"],"sourcesContent":["import React, { useEffect } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport { DisplayModalET } from '../../components/executiontasks/ExecutionTasksIndex';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams } from '../uiConfig/RouteParams';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst DisplayScreen = ({\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    <DisplayModalET\n      {...route.params[RouteParams.NEXT_STATES][0].nextState.data.input}\n      positiveBtn={'Submit'}\n      showDialog={true}\n      negativeBtn={'Cancel'}\n      onSubmit={async (displayOutput) => {\n        await DispatchStateContainer.getInstance().navigateToNextTask(\n          navigation,\n          route,\n          displayOutput,\n          displayOutput.success,\n          EntityCode.DISPLAY,\n          ExecutionTaskID.DISPLAY,\n          baseETProps,\n          false\n        );\n      }}\n    />\n  );\n};\n\nexport default withBaseDispatchScreen(DisplayScreen);\n"],"mappings":";AAAA,OAAOA,KAAK,IAAIC,SAAS,QAAQ,OAAO;AACxC,OAAOC,sBAAsB,MAAM,0BAA0B;AAC7D,SAASC,cAAc,QAAQ,qDAAqD;AAEpF,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAC7E,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,WAAW,QAAQ,yBAAyB;AACrD,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,MAAMC,aAAa,GAAGC,IAAA,IAQhB;EAAA,IARiB;IACrBC,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,CAACb,cAAc,EAAAc,QAAA,KACTN,KAAK,CAACG,MAAM,CAACP,WAAW,CAACQ,WAAW,CAAC,CAAC,CAAC,CAAC,CAACG,SAAS,CAACC,IAAI,CAACC,KAAK;IACjEC,WAAW,EAAE,QAAS;IACtBC,UAAU,EAAE,IAAK;IACjBC,WAAW,EAAE,QAAS;IACtBC,QAAQ,EAAE,MAAOC,aAAa,IAAK;MACjC,MAAMnB,sBAAsB,CAACoB,WAAW,EAAE,CAACC,kBAAkB,CAC3Df,UAAU,EACVD,KAAK,EACLc,aAAa,EACbA,aAAa,CAACG,OAAO,EACrBxB,UAAU,CAACyB,OAAO,EAClBxB,eAAe,CAACwB,OAAO,EACvBhB,WAAW,EACX,KAAK,CACN;IACH;EAAE,GACF;AAEN,CAAC;AAED,eAAeX,sBAAsB,CAACO,aAAa,CAAC"}
+{"version":3,"names":["React","useEffect","withBaseDispatchScreen","DisplayModalET","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","getDataFromNextState","onTaskStart","DisplayScreen","_ref","route","navigation","baseETProps","nextState","params","NEXT_STATES","taskMeta","mergedObjectiveId","input","wfMeta","ROOT_META_DATA","customEventsData","createElement","_extends","positiveBtn","showDialog","negativeBtn","onSubmit","displayOutput","getInstance","navigateToNextTask","success","DISPLAY"],"sources":["DisplayScreen.tsx"],"sourcesContent":["import React, { useEffect } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport { DisplayModalET } from '../../components/executiontasks/ExecutionTasksIndex';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst DisplayScreen = ({\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    <DisplayModalET\n      {...input}\n      mergedObjectiveId={mergedObjectiveId}\n      taskMeta={taskMeta}\n      positiveBtn={'Submit'}\n      showDialog={true}\n      negativeBtn={'Cancel'}\n      onSubmit={async (displayOutput) => {\n        await DispatchStateContainer.getInstance().navigateToNextTask(\n          navigation,\n          route,\n          displayOutput,\n          displayOutput.success,\n          EntityCode.DISPLAY,\n          ExecutionTaskID.DISPLAY,\n          baseETProps,\n          false\n        );\n      }}\n    />\n  );\n};\n\nexport default withBaseDispatchScreen(DisplayScreen);\n"],"mappings":";AAAA,OAAOA,KAAK,IAAIC,SAAS,QAAQ,OAAO;AACxC,OAAOC,sBAAsB,MAAM,0BAA0B;AAC7D,SAASC,cAAc,QAAQ,qDAAqD;AAEpF,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAC7E,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,WAAW,EAAEC,oBAAoB,QAAQ,yBAAyB;AAC3E,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,MAAMC,aAAa,GAAGC,IAAA,IAQhB;EAAA,IARiB;IACrBC,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,CAACrB,cAAc,EAAAsB,QAAA,KACTL,KAAK;IACTD,iBAAiB,EAAEA,iBAAkB;IACrCD,QAAQ,EAAEA,QAAS;IACnBQ,WAAW,EAAE,QAAS;IACtBC,UAAU,EAAE,IAAK;IACjBC,WAAW,EAAE,QAAS;IACtBC,QAAQ,EAAE,MAAOC,aAAa,IAAK;MACjC,MAAMxB,sBAAsB,CAACyB,WAAW,CAAC,CAAC,CAACC,kBAAkB,CAC3DnB,UAAU,EACVD,KAAK,EACLkB,aAAa,EACbA,aAAa,CAACG,OAAO,EACrB7B,UAAU,CAAC8B,OAAO,EAClB7B,eAAe,CAAC6B,OAAO,EACvBpB,WAAW,EACX,KACF,CAAC;IACH;EAAE,EACH,CAAC;AAEN,CAAC;AAED,eAAeZ,sBAAsB,CAACQ,aAAa,CAAC"}

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

@@ -4,10 +4,9 @@ import React, { useCallback, useEffect, useState } from 'react';
 import withBaseDispatchScreen from './WithBaseDispatchScreen';
 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 { View } from 'react-native';
 import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
-import { getJobIDs, getObjectiveRefs } from '../../components/executiontasks/doodle/DoodleUtils';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
 const DoodleScreen = _ref => {
   let {
@@ -15,8 +14,15 @@ const DoodleScreen = _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);
   }, []);
   const [showAlert, setShowAlert] = useState(false);
   const [sResponse, setResponse] = useState();
@@ -27,11 +33,12 @@ const DoodleScreen = _ref => {
     style: {
       flex: 1
     }
-  }, /*#__PURE__*/React.createElement(SignatureET, _extends({}, route.params[RouteParams.NEXT_STATES][0].nextState.data.input, {
-    jobIDs: getJobIDs(route.params[RouteParams.NEXT_STATES]),
-    objRefs: getObjectiveRefs(route.params[RouteParams.NEXT_STATES]),
+  }, /*#__PURE__*/React.createElement(SignatureET, _extends({}, input, {
+    // jobIDs={getJobIDs(route.params[RouteParams.NEXT_STATES])}
+    // objRefs={getObjectiveRefs(route.params[RouteParams.NEXT_STATES])}
     navigation: navigation,
-    taskMeta: JSON.parse(route.params[RouteParams.NEXT_STATES][0].nextState.data.taskMeta || '{}'),
+    taskMeta: taskMeta,
+    mergedObjectiveId: mergedObjectiveId,
     onSubmitET: async base64Data => {
       if (base64Data.success) {
         await submitOutput(base64Data);

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

@@ -1 +1 @@
-{"version":3,"names":["SignatureET","React","useCallback","useEffect","useState","withBaseDispatchScreen","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","View","CancelOrderDialog","getJobIDs","getObjectiveRefs","onTaskStart","DoodleScreen","_ref","route","navigation","baseETProps","params","NEXT_STATES","showAlert","setShowAlert","sResponse","setResponse","submitOutput","base64Data","getInstance","navigateToNextTask","success","DOODLE","createElement","style","flex","_extends","nextState","data","input","jobIDs","objRefs","taskMeta","JSON","parse","onSubmitET","_prevState","label","visible","onSubmit","value"],"sources":["DoodleScreen.tsx"],"sourcesContent":["import SignatureET from '../../components/executiontasks/doodle/SignatureET';\nimport React, { useCallback, useEffect, useState } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams } from '../uiConfig/RouteParams';\nimport { View } from 'react-native';\nimport CancelOrderDialog from '../../components/widgets/CancelOrderDialog';\nimport {\n  getJobIDs,\n  getObjectiveRefs,\n} from '../../components/executiontasks/doodle/DoodleUtils';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst DoodleScreen = ({\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 (base64Data: any) => {\n      await DispatchStateContainer.getInstance().navigateToNextTask(\n        navigation,\n        route,\n        base64Data,\n        base64Data.success,\n        EntityCode.DOODLE,\n        ExecutionTaskID.DOODLE,\n        baseETProps,\n        false\n      );\n    },\n    [baseETProps, navigation, route]\n  );\n  return (\n    <View style={{ flex: 1 }}>\n      <SignatureET\n        {...route.params[RouteParams.NEXT_STATES][0].nextState.data.input}\n        jobIDs={getJobIDs(route.params[RouteParams.NEXT_STATES])}\n        objRefs={getObjectiveRefs(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 (base64Data) => {\n          if (base64Data.success) {\n            await submitOutput(base64Data);\n          } else {\n            setResponse((_prevState: any) => {\n              setShowAlert(true);\n              return base64Data;\n            });\n          }\n        }}\n      />\n      <CancelOrderDialog\n        label={'Cancel Signature'}\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};\n\nexport default withBaseDispatchScreen(DoodleScreen);\n"],"mappings":"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"}
+{"version":3,"names":["SignatureET","React","useCallback","useEffect","useState","withBaseDispatchScreen","EntityCode","ExecutionTaskID","DispatchStateContainer","RouteParams","getDataFromNextState","View","CancelOrderDialog","onTaskStart","DoodleScreen","_ref","route","navigation","baseETProps","nextState","params","NEXT_STATES","taskMeta","mergedObjectiveId","input","wfMeta","ROOT_META_DATA","customEventsData","showAlert","setShowAlert","sResponse","setResponse","submitOutput","base64Data","getInstance","navigateToNextTask","success","DOODLE","createElement","style","flex","_extends","onSubmitET","_prevState","label","visible","onSubmit","value"],"sources":["DoodleScreen.tsx"],"sourcesContent":["import SignatureET from '../../components/executiontasks/doodle/SignatureET';\nimport React, { useCallback, useEffect, useState } from 'react';\nimport withBaseDispatchScreen from './WithBaseDispatchScreen';\nimport type { BaseETProps } from '../../models/DispatchModels';\nimport { EntityCode, ExecutionTaskID } from '../../models/execTasks/ETConfig';\nimport DispatchStateContainer from '../../manager/dispatch/DispatchStateContainer';\nimport { RouteParams, getDataFromNextState } from '../uiConfig/RouteParams';\nimport { View } from 'react-native';\nimport CancelOrderDialog from '../../components/widgets/CancelOrderDialog';\nimport { onTaskStart } from '../../utils/ExecTaskUtils';\n\nconst DoodleScreen = ({\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  const [showAlert, setShowAlert] = useState(false);\n  const [sResponse, setResponse] = useState<any>();\n  const submitOutput = useCallback(\n    async (base64Data: any) => {\n      await DispatchStateContainer.getInstance().navigateToNextTask(\n        navigation,\n        route,\n        base64Data,\n        base64Data.success,\n        EntityCode.DOODLE,\n        ExecutionTaskID.DOODLE,\n        baseETProps,\n        false\n      );\n    },\n    [baseETProps, navigation, route]\n  );\n\n  return (\n    <View style={{ flex: 1 }}>\n      <SignatureET\n        {...input}\n        // jobIDs={getJobIDs(route.params[RouteParams.NEXT_STATES])}\n        // objRefs={getObjectiveRefs(route.params[RouteParams.NEXT_STATES])}\n        navigation={navigation}\n        taskMeta={taskMeta}\n        mergedObjectiveId={mergedObjectiveId}\n        onSubmitET={async (base64Data) => {\n          if (base64Data.success) {\n            await submitOutput(base64Data);\n          } else {\n            setResponse((_prevState: any) => {\n              setShowAlert(true);\n              return base64Data;\n            });\n          }\n        }}\n      />\n      <CancelOrderDialog\n        label={'Cancel Signature'}\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};\n\nexport default withBaseDispatchScreen(DoodleScreen);\n"],"mappings":";AAAA,OAAOA,WAAW,MAAM,oDAAoD;AAC5E,OAAOC,KAAK,IAAIC,WAAW,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AAC/D,OAAOC,sBAAsB,MAAM,0BAA0B;AAE7D,SAASC,UAAU,EAAEC,eAAe,QAAQ,iCAAiC;AAC7E,OAAOC,sBAAsB,MAAM,+CAA+C;AAClF,SAASC,WAAW,EAAEC,oBAAoB,QAAQ,yBAAyB;AAC3E,SAASC,IAAI,QAAQ,cAAc;AACnC,OAAOC,iBAAiB,MAAM,4CAA4C;AAC1E,SAASC,WAAW,QAAQ,2BAA2B;AAEvD,MAAMC,YAAY,GAAGC,IAAA,IAQf;EAAA,IARgB;IACpBC,KAAK;IACLC,UAAU;IACVC;EAKF,CAAC,GAAAH,IAAA;EACC,MAAMI,SAAS,GAAGH,KAAK,CAACI,MAAM,CAACX,WAAW,CAACY,WAAW,CAAC;EACvD,MAAM;IAAEC,QAAQ;IAAEC,iBAAiB;IAAEC,KAAK;IAAEC;EAAO,CAAC,GAClDf,oBAAoB,CAACS,SAAS,CAAC;EACjChB,SAAS,CAAC,MAAM;IACdU,WAAW,CACTM,SAAS,EACTH,KAAK,CAACI,MAAM,CAACX,WAAW,CAACiB,cAAc,CAAC,CAACC,gBAC3C,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;EACN,MAAM,CAACC,SAAS,EAAEC,YAAY,CAAC,GAAGzB,QAAQ,CAAC,KAAK,CAAC;EACjD,MAAM,CAAC0B,SAAS,EAAEC,WAAW,CAAC,GAAG3B,QAAQ,CAAM,CAAC;EAChD,MAAM4B,YAAY,GAAG9B,WAAW,CAC9B,MAAO+B,UAAe,IAAK;IACzB,MAAMzB,sBAAsB,CAAC0B,WAAW,CAAC,CAAC,CAACC,kBAAkB,CAC3DlB,UAAU,EACVD,KAAK,EACLiB,UAAU,EACVA,UAAU,CAACG,OAAO,EAClB9B,UAAU,CAAC+B,MAAM,EACjB9B,eAAe,CAAC8B,MAAM,EACtBnB,WAAW,EACX,KACF,CAAC;EACH,CAAC,EACD,CAACA,WAAW,EAAED,UAAU,EAAED,KAAK,CACjC,CAAC;EAED,oBACEf,KAAA,CAAAqC,aAAA,CAAC3B,IAAI;IAAC4B,KAAK,EAAE;MAAEC,IAAI,EAAE;IAAE;EAAE,gBACvBvC,KAAA,CAAAqC,aAAA,CAACtC,WAAW,EAAAyC,QAAA,KACNjB,KAAK;IACT;IACA;IACAP,UAAU,EAAEA,UAAW;IACvBK,QAAQ,EAAEA,QAAS;IACnBC,iBAAiB,EAAEA,iBAAkB;IACrCmB,UAAU,EAAE,MAAOT,UAAU,IAAK;MAChC,IAAIA,UAAU,CAACG,OAAO,EAAE;QACtB,MAAMJ,YAAY,CAACC,UAAU,CAAC;MAChC,CAAC,MAAM;QACLF,WAAW,CAAEY,UAAe,IAAK;UAC/Bd,YAAY,CAAC,IAAI,CAAC;UAClB,OAAOI,UAAU;QACnB,CAAC,CAAC;MACJ;IACF;EAAE,EACH,CAAC,eACFhC,KAAA,CAAAqC,aAAA,CAAC1B,iBAAiB;IAChBgC,KAAK,EAAE,kBAAmB;IAC1BC,OAAO,EAAEjB,SAAU;IACnBkB,QAAQ,EAAE,MAAOC,KAAK,IAAK;MACzB,IAAIA,KAAK,EAAE;QACTlB,YAAY,CAAC,KAAK,CAAC;QACnB,MAAMG,YAAY,CAACF,SAAS,CAAC;MAC/B,CAAC,MAAM;QACLD,YAAY,CAAC,KAAK,CAAC;MACrB;IACF;EAAE,CACH,CACG,CAAC;AAEX,CAAC;AAED,eAAexB,sBAAsB,CAACS,YAAY,CAAC"}

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

@@ -4,29 +4,54 @@ import withBaseDispatchScreen from './WithBaseDispatchScreen';
 import { SLDropCash } from '../../components/executiontasks/ExecutionTasksIndex';
 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 { View } from 'react-native';
 import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
-function getTotalExpected(nextStates) {
-  let totalAmount = 0;
-  for (const s of nextStates) {
-    totalAmount += s.nextState.data.input.expectedAmount.value;
-  }
-  return {
-    value: totalAmount,
-    minorUnit: nextStates[0].nextState.data.input.expectedAmount.minorUnit,
-    currencyCode: nextStates[0].nextState.data.input.expectedAmount.currencyCode
-  };
-}
+import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
+
+// OLD CODE
+// function getTotalExpected(nextStates: any[]): ETAmount {
+//   let totalAmount = 0;
+//   for (const s of nextStates) {
+//     totalAmount += s.nextState.data.input.expectedAmount.value;
+//   }
+//   return {
+//     value: totalAmount,
+//     minorUnit: nextStates[0].nextState.data.input.expectedAmount.minorUnit,
+//     currencyCode:
+//       nextStates[0].nextState.data.input.expectedAmount.currencyCode,
+//   };
+// }
+
 const DropCashScreen = _ref => {
   let {
     route,
     navigation,
     baseETProps
   } = _ref;
+  const nextState = route.params[RouteParams.NEXT_STATES];
+  const {
+    taskMeta,
+    mergedObjectiveId,
+    input,
+    wfMeta
+  } = getDataFromNextState(nextState);
+  const [expectedAmount, setExpectedAmount] = useState({
+    value: 0,
+    minorUnit: input.expectedAmount.minorUnit,
+    currencyCode: input.expectedAmount.currencyCode
+  });
+  const getTotalExpected = async () => {
+    const totalAmount = await DispatchExecutor.getTotalAmountMWI(mergedObjectiveId);
+    setExpectedAmount({
+      ...expectedAmount,
+      value: totalAmount
+    });
+  };
   useEffect(() => {
-    onTaskStart(route.params[RouteParams.NEXT_STATES]);
+    onTaskStart(nextState, route.params[RouteParams.ROOT_META_DATA].customEventsData);
+    getTotalExpected();
   }, []);
   const [showAlert, setShowAlert] = useState(false);
   const [sResponse, setResponse] = useState();
@@ -37,10 +62,11 @@ const DropCashScreen = _ref => {
     style: {
       flex: 1
     }
-  }, /*#__PURE__*/React.createElement(SLDropCash, _extends({}, route.params[RouteParams.NEXT_STATES][0].nextState.data.input, {
-    expectedAmount: getTotalExpected(route.params[RouteParams.NEXT_STATES]),
+  }, /*#__PURE__*/React.createElement(SLDropCash, _extends({}, input, {
+    expectedAmount: expectedAmount,
     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);