mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-01-03 05:44:50 +00:00
Code Issues Releases Wiki Activity

New: Closing Move Movie modal without selecting will cancel save

Browse source 
Closes #8225

Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
Qstick 2023-04-30 19:13:36 -05:00
parent 80d7bdb834
commit a41999f9c2
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frontend/src/Movie/Edit/EditMovieModalContent.js
View file

@ -31,6 +31,10 @@ class EditMovieModalContent extends Component {
//
// Listeners
onCancelPress = () => {
this.setState({ isConfirmMoveModalOpen: false });
};
onSavePress = () => {
const {
isPathChanging,
@ -171,6 +175,7 @@ class EditMovieModalContent extends Component {
originalPath={originalPath}
destinationPath={path.value}
isOpen={this.state.isConfirmMoveModalOpen}
onModalClose={this.onCancelPress}
onSavePress={this.onSavePress}
onMoveMoviePress={this.onMoveMoviePress}
/>

5
frontend/src/Movie/Index/Select/Edit/EditMoviesModalContent.tsx
View file

@ -100,6 +100,10 @@ function EditMoviesModalContent(props: EditMoviesModalContentProps) {
}
}, [rootFolderPath, save]);
const onCancelPress = useCallback(() => {
setIsConfirmMoveModalOpen(false);
}, [setIsConfirmMoveModalOpen]);
const onDoNotMoveMoviePress = useCallback(() => {
setIsConfirmMoveModalOpen(false);
save(false);
@ -177,6 +181,7 @@ function EditMoviesModalContent(props: EditMoviesModalContentProps) {
<MoveMovieModal
isOpen={isConfirmMoveModalOpen}
destinationRootFolder={rootFolderPath}
onModalClose={onCancelPress}
onSavePress={onDoNotMoveMoviePress}
onMoveMoviePress={onMoveMoviePress}
/>

6
frontend/src/Movie/MoveMovie/MoveMovieModal.js
View file

@ -16,6 +16,7 @@ function MoveMovieModal(props) {
destinationPath,
destinationRootFolder,
isOpen,
onModalClose,
onSavePress,
onMoveMoviePress
} = props;
@ -34,11 +35,11 @@ function MoveMovieModal(props) {
isOpen={isOpen}
size={sizes.MEDIUM}
closeOnBackgroundClick={false}
onModalClose={onSavePress}
onModalClose={onModalClose}
>
<ModalContent
showCloseButton={true}
onModalClose={onSavePress}
onModalClose={onModalClose}
>
<ModalHeader>
{translate('MoveFiles')}
@ -84,6 +85,7 @@ MoveMovieModal.propTypes = {
destinationPath: PropTypes.string,
destinationRootFolder: PropTypes.string,
isOpen: PropTypes.bool.isRequired,
onModalClose: PropTypes.func.isRequired,
onSavePress: PropTypes.func.isRequired,
onMoveMoviePress: PropTypes.func.isRequired
};