#1321 | Handle missing individualUUID prop on IndividualEncounterView

avniproject · May 3, 2024 · ec23e12 · ec23e12
1 parent f5d579d
commit ec23e12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/openchs-android/src/action/individual/IndividualGeneralHistoryActions.js b/packages/openchs-android/src/action/individual/IndividualGeneralHistoryActions.js
@@ -123,7 +123,7 @@ export class IndividualGeneralHistoryActions {
 
     static onRender(state, action, context) {
         const organisationConfigService = context.get(OrganisationConfigService);
-        if (organisationConfigService.isSaveDraftOn()) {
+        if (organisationConfigService.isSaveDraftOn() && !_.isNil(action.individualUUID)) {
             const newState = IndividualGeneralHistoryActions.clone(state);
             const individual = context.get(IndividualService).findByUUID(action.individualUUID);
             newState.draftEncounters = context.get(DraftEncounterService).listUnScheduledDrafts(individual).map(draft => draft.constructEncounter());

diff --git a/packages/openchs-android/src/views/individual/IndividualEncounterView.js b/packages/openchs-android/src/views/individual/IndividualEncounterView.js
@@ -125,7 +125,9 @@ class IndividualEncounterView extends AbstractComponent {
 
     onAppHeaderBack() {
         const onYesPress = () => {
-            this.dispatchAction(IGHActions.ON_RENDER, {individualUUID: this.props.individualUUID});
+            this.dispatchAction(IGHActions.ON_RENDER, {
+                individualUUID: this.props.individualUUID || this.props.encounter.individual.uuid
+            });
             CHSNavigator.navigateToFirstPage(this, [IndividualEncounterView]);
         }
         AvniAlert(this.I18n.t('backPressTitle'), this.I18n.t('backPressMessage'), onYesPress, this.I18n);