-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add Confimration Modal and Service and update form blocking to use modal
- Loading branch information
Showing
11 changed files
with
237 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
airbyte-webapp/src/components/ConfirmationModal/ConfirmationModal.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
import React from "react"; | ||
import styled from "styled-components"; | ||
import { FormattedMessage } from "react-intl"; | ||
|
||
import Modal from "components/Modal"; | ||
import { Button } from "components/base/Button"; | ||
|
||
const Content = styled.div` | ||
width: 585px; | ||
font-size: 14px; | ||
line-height: 28px; | ||
padding: 25px; | ||
white-space: pre-line; | ||
`; | ||
|
||
const ButtonContent = styled.div` | ||
padding-top: 28px; | ||
display: flex; | ||
justify-content: flex-end; | ||
`; | ||
|
||
const ButtonWithMargin = styled(Button)` | ||
margin-right: 12px; | ||
`; | ||
|
||
interface Props { | ||
onClose: () => void; | ||
title: React.ReactNode; | ||
text: React.ReactNode; | ||
submitButtonText: React.ReactNode; | ||
onSubmit: () => void; | ||
} | ||
|
||
const ConfirmationModal: React.FC<Props> = ({ onClose, title, text, onSubmit, submitButtonText }) => ( | ||
<Modal onClose={onClose} title={title}> | ||
<Content> | ||
{text} | ||
<ButtonContent> | ||
<ButtonWithMargin onClick={onClose} type="button" secondary> | ||
<FormattedMessage id="form.cancel" /> | ||
</ButtonWithMargin> | ||
<Button type="button" danger onClick={onSubmit} data-id="delete"> | ||
{submitButtonText} | ||
</Button> | ||
</ButtonContent> | ||
</Content> | ||
</Modal> | ||
); | ||
|
||
export default ConfirmationModal; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
import ConfirmationModal from "./ConfirmationModal"; | ||
|
||
export default ConfirmationModal; | ||
export { ConfirmationModal }; |
This file was deleted.
Oops, something went wrong.
74 changes: 74 additions & 0 deletions
74
airbyte-webapp/src/hooks/services/ConfirmationModal/ConfirmationModalService.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
import React, { useContext, useEffect, useMemo } from "react"; | ||
|
||
import ConfirmationModalComponent from "components/ConfirmationModal"; | ||
|
||
import useTypesafeReducer from "hooks/useTypesafeReducer"; | ||
|
||
import { ConfirmationModal, ConfirmationModalServiceApi, ConfirmationModalState } from "./types"; | ||
import { actions, initialState, confirmationModalServiceReducer } from "./reducer"; | ||
|
||
const confirmationModalServiceContext = React.createContext<ConfirmationModalServiceApi | undefined>(undefined); | ||
|
||
export const useConfirmationModalService: ( | ||
confirmationModal?: ConfirmationModal, | ||
dependencies?: [] | ||
) => { | ||
openConfirmationModal: (confirmationModal: ConfirmationModal) => void; | ||
closeConfirmationModal: () => void; | ||
} = (confirmationModal, dependencies) => { | ||
const confirmationModalService = useContext(confirmationModalServiceContext); | ||
if (!confirmationModalService) { | ||
throw new Error("useConfirmationModalService must be used within a ConfirmationModalService."); | ||
} | ||
|
||
useEffect(() => { | ||
if (confirmationModal) { | ||
confirmationModalService.openConfirmationModal(confirmationModal); | ||
} | ||
return () => { | ||
if (confirmationModal) { | ||
confirmationModalService.closeConfirmationModal(); | ||
} | ||
}; | ||
// eslint-disable-next-line | ||
}, [confirmationModal, confirmationModalService, ...(dependencies ?? [])]); | ||
|
||
return { | ||
openConfirmationModal: confirmationModalService.openConfirmationModal, | ||
closeConfirmationModal: confirmationModalService.closeConfirmationModal, | ||
}; | ||
}; | ||
|
||
const ConfirmationModalService = ({ children }: { children: React.ReactNode }) => { | ||
const [state, { openConfirmationModal, closeConfirmationModal }] = useTypesafeReducer< | ||
ConfirmationModalState, | ||
typeof actions | ||
>(confirmationModalServiceReducer, initialState, actions); | ||
|
||
const confirmationModalService: ConfirmationModalServiceApi = useMemo( | ||
() => ({ | ||
openConfirmationModal, | ||
closeConfirmationModal, | ||
}), | ||
[closeConfirmationModal, openConfirmationModal] | ||
); | ||
|
||
return ( | ||
<> | ||
<confirmationModalServiceContext.Provider value={confirmationModalService}> | ||
{children} | ||
</confirmationModalServiceContext.Provider> | ||
{state.isOpen && state.confirmationModal ? ( | ||
<ConfirmationModalComponent | ||
onClose={closeConfirmationModal} | ||
title={state.confirmationModal.title} | ||
text={state.confirmationModal.text} | ||
onSubmit={state.confirmationModal.onSubmit} | ||
submitButtonText={state.confirmationModal.submitButtonText} | ||
/> | ||
) : null} | ||
</> | ||
); | ||
}; | ||
|
||
export default React.memo(ConfirmationModalService); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
import ConfirmationModalService from "./ConfirmationModalService"; | ||
|
||
export default ConfirmationModalService; | ||
export { ConfirmationModalService }; |
31 changes: 31 additions & 0 deletions
31
airbyte-webapp/src/hooks/services/ConfirmationModal/reducer.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import { ActionType, createAction, createReducer } from "typesafe-actions"; | ||
|
||
import { ConfirmationModal, ConfirmationModalState } from "./types"; | ||
|
||
export const actions = { | ||
openConfirmationModal: createAction("OPEN_CONFIRMATION_MODAL")<ConfirmationModal>(), | ||
closeConfirmationModal: createAction("CLOSE_CONFIRMATION_MODAL")(), | ||
}; | ||
|
||
type Actions = ActionType<typeof actions>; | ||
|
||
export const initialState: ConfirmationModalState = { | ||
isOpen: false, | ||
confirmationModal: null, | ||
}; | ||
|
||
export const confirmationModalServiceReducer = createReducer<ConfirmationModalState, Actions>(initialState) | ||
.handleAction(actions.openConfirmationModal, (state, action): ConfirmationModalState => { | ||
return { | ||
...state, | ||
isOpen: true, | ||
confirmationModal: action.payload, | ||
}; | ||
}) | ||
.handleAction(actions.closeConfirmationModal, (state): ConfirmationModalState => { | ||
return { | ||
...state, | ||
isOpen: false, | ||
confirmationModal: null, | ||
}; | ||
}); |
18 changes: 18 additions & 0 deletions
18
airbyte-webapp/src/hooks/services/ConfirmationModal/types.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
import React from "react"; | ||
|
||
export interface ConfirmationModal { | ||
submitButtonText: React.ReactNode; | ||
title: React.ReactNode; | ||
text: React.ReactNode; | ||
onSubmit: () => Promise<void>; | ||
} | ||
|
||
export interface ConfirmationModalServiceApi { | ||
openConfirmationModal: (confirmationModal: ConfirmationModal) => void; | ||
closeConfirmationModal: () => void; | ||
} | ||
|
||
export interface ConfirmationModalState { | ||
isOpen: boolean; | ||
confirmationModal: ConfirmationModal | null; | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
import type { Transition } from "history"; | ||
|
||
import { useCallback, useMemo } from "react"; | ||
import { createGlobalState } from "react-use"; | ||
|
||
import { useBlocker } from "./router/useBlocker"; | ||
import { useConfirmationModalService } from "./services/ConfirmationModal/ConfirmationModalService"; | ||
import { ConfirmationModal } from "./services/ConfirmationModal/types"; | ||
|
||
export const useBlockingFormsById = createGlobalState<Record<string, boolean>>({}); | ||
|
||
const useFormNavigationBlocking = () => { | ||
const [blockingFormsById, setBlockingFormsById] = useBlockingFormsById(); | ||
const { openConfirmationModal, closeConfirmationModal } = useConfirmationModalService(); | ||
|
||
const blocker = useCallback( | ||
(tx: Transition) => { | ||
const modalData: ConfirmationModal = { | ||
title: "Discard changes", | ||
text: "There are unsaved changes. Are you sure you want to discard your changes?", | ||
submitButtonText: "Discard changes", | ||
onSubmit: async () => { | ||
setBlockingFormsById({}); | ||
closeConfirmationModal(); | ||
tx.retry(); | ||
}, | ||
}; | ||
|
||
openConfirmationModal(modalData); | ||
}, | ||
[closeConfirmationModal, openConfirmationModal, setBlockingFormsById] | ||
); | ||
|
||
const isFormBlocking = useMemo( | ||
() => Object.values(blockingFormsById ?? {}).reduce((acc, value) => acc || value, false), | ||
[blockingFormsById] | ||
); | ||
|
||
useBlocker(blocker, isFormBlocking); | ||
}; | ||
|
||
export default useFormNavigationBlocking; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters