From a41999f9c22cde5a4631d6b023a0dbb45d76a169 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sun, 30 Apr 2023 19:13:36 -0500
Subject: [PATCH] New: Closing Move Movie modal without selecting will cancel
 save

Closes #8225

Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
---
 frontend/src/Movie/Edit/EditMovieModalContent.js            | 5 +++++
 .../src/Movie/Index/Select/Edit/EditMoviesModalContent.tsx  | 5 +++++
 frontend/src/Movie/MoveMovie/MoveMovieModal.js              | 6 ++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Movie/Edit/EditMovieModalContent.js b/frontend/src/Movie/Edit/EditMovieModalContent.js
index e4aaedb0e..21194b9c7 100644
--- a/frontend/src/Movie/Edit/EditMovieModalContent.js
+++ b/frontend/src/Movie/Edit/EditMovieModalContent.js
@@ -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}
         />
diff --git a/frontend/src/Movie/Index/Select/Edit/EditMoviesModalContent.tsx b/frontend/src/Movie/Index/Select/Edit/EditMoviesModalContent.tsx
index 98bfbb5fc..a70db4b1c 100644
--- a/frontend/src/Movie/Index/Select/Edit/EditMoviesModalContent.tsx
+++ b/frontend/src/Movie/Index/Select/Edit/EditMoviesModalContent.tsx
@@ -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}
       />
diff --git a/frontend/src/Movie/MoveMovie/MoveMovieModal.js b/frontend/src/Movie/MoveMovie/MoveMovieModal.js
index a1eb72370..c395561bb 100644
--- a/frontend/src/Movie/MoveMovie/MoveMovieModal.js
+++ b/frontend/src/Movie/MoveMovie/MoveMovieModal.js
@@ -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
 };