From 50c3b5877ed3adc63a4c7287819e1151f845a682 Mon Sep 17 00:00:00 2001 From: Abhishek P Anil Date: Tue, 30 Jan 2024 10:46:14 +0530 Subject: [PATCH 1/4] fix: added setshowdialog to quick create modal as prop --- .../QuickCreateOrganization/QuickCreateOrganization.jsx | 3 +++ .../Modal/QuickCreatePerson/QuickCreatePerson.jsx | 2 ++ .../Modal/QuickCreatePlace/QuickCreatePlace.jsx | 2 ++ src/pages/Dashboard/AddEvent/AddEvent.jsx | 8 +++++++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx b/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx index 21e9cb054..eff4ec7fe 100644 --- a/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx +++ b/src/components/Modal/QuickCreateOrganization/QuickCreateOrganization.jsx @@ -44,6 +44,7 @@ function QuickCreateOrganization(props) { saveAsDraftHandler, setLoaderModalOpen, loaderModalOpen, + setShowDialog, } = props; const [form] = Form.useForm(); const { t } = useTranslation(); @@ -180,6 +181,7 @@ function QuickCreateOrganization(props) { setKeyword(''); getSelectedOrganizer(response?.id); } + setShowDialog(true); resolve(response); }) .catch((error) => { @@ -212,6 +214,7 @@ function QuickCreateOrganization(props) { getSelectedOrganizer(response?.id); setOpen(false); } + setShowDialog(true); resolve(response); }) .catch((error) => { diff --git a/src/components/Modal/QuickCreatePerson/QuickCreatePerson.jsx b/src/components/Modal/QuickCreatePerson/QuickCreatePerson.jsx index 1cfaba66b..1f926393f 100644 --- a/src/components/Modal/QuickCreatePerson/QuickCreatePerson.jsx +++ b/src/components/Modal/QuickCreatePerson/QuickCreatePerson.jsx @@ -49,6 +49,7 @@ function QuickCreatePerson(props) { saveAsDraftHandler, setLoaderModalOpen, loaderModalOpen, + setShowDialog, } = props; const [form] = Form.useForm(); const { t } = useTranslation(); @@ -188,6 +189,7 @@ function QuickCreatePerson(props) { setKeyword(''); setOpen(false); getSelectedPerson(response?.id); + setShowDialog(true); resolve(response); }) .catch((error) => { diff --git a/src/components/Modal/QuickCreatePlace/QuickCreatePlace.jsx b/src/components/Modal/QuickCreatePlace/QuickCreatePlace.jsx index 15746d4a6..5f5f594a2 100644 --- a/src/components/Modal/QuickCreatePlace/QuickCreatePlace.jsx +++ b/src/components/Modal/QuickCreatePlace/QuickCreatePlace.jsx @@ -48,6 +48,7 @@ function QuickCreatePlace(props) { saveAsDraftHandler, setLoaderModalOpen, loaderModalOpen, + setShowDialog, } = props; const [form] = Form.useForm(); @@ -257,6 +258,7 @@ function QuickCreatePlace(props) { }); } setKeyword(''); + setShowDialog(true); getSelectedPlace(response?.id); setOpen(false); resolve(response); diff --git a/src/pages/Dashboard/AddEvent/AddEvent.jsx b/src/pages/Dashboard/AddEvent/AddEvent.jsx index 308192c22..3652013aa 100644 --- a/src/pages/Dashboard/AddEvent/AddEvent.jsx +++ b/src/pages/Dashboard/AddEvent/AddEvent.jsx @@ -2268,6 +2268,7 @@ function AddEvent() { saveAsDraftHandler={saveAsDraftHandler} setLoaderModalOpen={setLoaderModalOpen} loaderModalOpen={loaderModalOpen} + setShowDialog={setShowDialog} /> } label={t('dashboard.events.addEditEvent.tickets.free')} - onClick={() => setTicketType(offerTypes.FREE)} + onClick={() => { + setTicketType(offerTypes.FREE); + setShowDialog(true); + }} data-cy="button-select-ticket-free" /> Date: Tue, 30 Jan 2024 14:19:59 +0530 Subject: [PATCH 2/4] fix: handled go type navigation in usePrompt hook --- src/hooks/usePrompt.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/hooks/usePrompt.js b/src/hooks/usePrompt.js index adc864fcd..a61fae169 100644 --- a/src/hooks/usePrompt.js +++ b/src/hooks/usePrompt.js @@ -10,6 +10,14 @@ function useConfirmExit(confirmExit, when = true) { } const push = navigator.push; + const go = navigator.go; + + navigator.go = (...args) => { + const result = confirmExit(); + if (result !== false) { + go(...args); + } + }; navigator.push = (...args) => { const result = confirmExit(); @@ -18,6 +26,7 @@ function useConfirmExit(confirmExit, when = true) { } }; + console.log(navigator); return () => { navigator.push = push; }; From 7541790bcd70bae3e62d478666a45f13b864f148 Mon Sep 17 00:00:00 2001 From: syam babu Date: Tue, 30 Jan 2024 14:59:32 +0530 Subject: [PATCH 3/4] fix: cleanuo added --- src/hooks/usePrompt.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hooks/usePrompt.js b/src/hooks/usePrompt.js index a61fae169..d86a512c0 100644 --- a/src/hooks/usePrompt.js +++ b/src/hooks/usePrompt.js @@ -12,23 +12,23 @@ function useConfirmExit(confirmExit, when = true) { const push = navigator.push; const go = navigator.go; - navigator.go = (...args) => { + navigator.push = (...args) => { const result = confirmExit(); if (result !== false) { - go(...args); + push(...args); } }; - navigator.push = (...args) => { + navigator.go = (...args) => { const result = confirmExit(); if (result !== false) { - push(...args); + go(...args); } }; - console.log(navigator); return () => { navigator.push = push; + navigator.go = go; }; }, [navigator, confirmExit, when]); } From 303052bc45c049096665b8eddb53cc881e3087cd Mon Sep 17 00:00:00 2001 From: syam babu Date: Tue, 30 Jan 2024 15:17:13 +0530 Subject: [PATCH 4/4] fix: issue fixed. closes #646 --- src/hooks/usePrompt.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/hooks/usePrompt.js b/src/hooks/usePrompt.js index d86a512c0..52185c273 100644 --- a/src/hooks/usePrompt.js +++ b/src/hooks/usePrompt.js @@ -40,7 +40,6 @@ export function usePrompt(message, when) { return message; }; } - return () => { window.onbeforeunload = null; };