fix: view event breadcrumb item

dhis2 · Feb 7, 2025 · 794a2a9 · 794a2a9
1 parent 16580f1
commit 794a2a9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/src/core_modules/capture-core/components/Breadcrumbs/EventBreadcrumb/EventBreadcrumb.js b/src/core_modules/capture-core/components/Breadcrumbs/EventBreadcrumb/EventBreadcrumb.js
@@ -19,6 +19,7 @@ type Props = {
     programId: string,
     userInteractionInProgress?: boolean,
     onBackToMainPage?: () => void,
+    onBackToViewEvent?: () => void,
 };
 
 const styles = {
@@ -33,6 +34,7 @@ const EventBreadcrumbPlain = ({
     page,
     programId,
     userInteractionInProgress,
+    onBackToViewEvent,
     onBackToMainPage,
     classes,
 }) => {
@@ -57,7 +59,7 @@ const EventBreadcrumbPlain = ({
         },
         {
             key: pageKeys.VIEW_EVENT,
-            onClick: () => handleNavigation(null, pageKeys.VIEW_EVENT),
+            onClick: () => handleNavigation(onBackToViewEvent, pageKeys.VIEW_EVENT),
             label: i18n.t('View event'),
             selected: page === pageKeys.VIEW_EVENT,
             condition: page === pageKeys.VIEW_EVENT || page === pageKeys.EDIT_EVENT,
@@ -72,6 +74,7 @@ const EventBreadcrumbPlain = ({
     ].filter(item => item.condition !== false)), [
         label,
         handleNavigation,
+        onBackToViewEvent,
         onBackToMainPage,
         page,
     ]);
@@ -94,8 +97,20 @@ const EventBreadcrumbPlain = ({
 
             <DiscardDialog
                 open={openWarning === pageKeys.MAIN_PAGE}
+                onDestroy={() => {
+                    setOpenWarning(null);
+                    onBackToMainPage && onBackToMainPage();
+                }}
+                onCancel={() => setOpenWarning(null)}
+                {...defaultDialogProps}
+            />
+            <DiscardDialog
+                open={openWarning === pageKeys.VIEW_EVENT}
+                onDestroy={() => {
+                    setOpenWarning(null);
+                    onBackToViewEvent && onBackToViewEvent();
+                }}
                 onCancel={() => setOpenWarning(null)}
-                onDestroy={onBackToMainPage}
                 {...defaultDialogProps}
             />
         </div>

diff --git a/...modules/capture-core/components/Pages/ViewEvent/ViewEventComponent/ViewEvent.component.js b/...modules/capture-core/components/Pages/ViewEvent/ViewEventComponent/ViewEvent.component.js
@@ -120,6 +120,7 @@ class ViewEventPlain extends Component<Props, State> {
                         <EventDetails
                             eventAccess={eventAccess}
                             programStage={programStage}
+                            onBackToViewEvent={onBackToViewEvent}
                             onBackToAllEvents={onBackToAllEvents}
                         />
                         <RightColumnWrapper

diff --git a/...modules/capture-core/components/Pages/ViewEvent/ViewEventComponent/ViewEvent.container.js b/...modules/capture-core/components/Pages/ViewEvent/ViewEventComponent/ViewEvent.container.js
@@ -2,9 +2,9 @@
 import { connect } from 'react-redux';
 import { dataEntryIds, dataEntryKeys } from 'capture-core/constants';
 import { rollbackAssignee, setAssignee, startGoBackToMainPage } from './viewEvent.actions';
+import { cancelEditEventDataEntry } from '../../../WidgetEventEdit/EditEventDataEntry/editEventDataEntry.actions';
 import { ViewEventComponent } from './ViewEvent.component';
 import { getDataEntryKey } from '../../../DataEntry/common/getDataEntryKey';
-
 import { withErrorMessageHandler } from '../../../../HOC/withErrorMessageHandler';
 import {
     makeAssignedUserContextSelector,
@@ -43,6 +43,9 @@ const mapDispatchToProps = (dispatch: ReduxDispatch) => ({
     onBackToAllEvents: () => {
         dispatch(startGoBackToMainPage());
     },
+    onBackToViewEvent: () => {
+        dispatch(cancelEditEventDataEntry());
+    },
     dispatch,
 });