From da8e8a12de1dea167e3965a9dc3f52dcb3cf8434 Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Mon, 12 May 2025 22:50:21 +0300
Subject: [PATCH] New: Include year in interactive searches title

Fixes #11070
---
 frontend/src/Movie/Details/MovieDetails.tsx              | 1 -
 frontend/src/Movie/MovieSearchCell.tsx                   | 6 +-----
 .../src/Movie/Search/MovieInteractiveSearchModal.tsx     | 9 +++++----
 .../Movie/Search/MovieInteractiveSearchModalContent.tsx  | 8 ++++++--
 frontend/src/Wanted/CutoffUnmet/CutoffUnmetRow.js        | 1 -
 frontend/src/Wanted/Missing/MissingRow.js                | 1 -
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/frontend/src/Movie/Details/MovieDetails.tsx b/frontend/src/Movie/Details/MovieDetails.tsx
index d30df91fea..e4aec44d34 100644
--- a/frontend/src/Movie/Details/MovieDetails.tsx
+++ b/frontend/src/Movie/Details/MovieDetails.tsx
@@ -968,7 +968,6 @@ function MovieDetails({ movieId }: MovieDetailsProps) {
         <MovieInteractiveSearchModal
           isOpen={isInteractiveSearchModalOpen}
           movieId={id}
-          movieTitle={title}
           onModalClose={handleInteractiveSearchModalClose}
         />
       </PageContentBody>
diff --git a/frontend/src/Movie/MovieSearchCell.tsx b/frontend/src/Movie/MovieSearchCell.tsx
index cc7f07152a..c2cc5c0ef8 100644
--- a/frontend/src/Movie/MovieSearchCell.tsx
+++ b/frontend/src/Movie/MovieSearchCell.tsx
@@ -14,12 +14,9 @@ import styles from './MovieSearchCell.css';
 
 interface MovieSearchCellProps {
   movieId: number;
-  movieTitle: string;
 }
 
-function MovieSearchCell(props: MovieSearchCellProps) {
-  const { movieId, movieTitle } = props;
-
+function MovieSearchCell({ movieId }: MovieSearchCellProps) {
   const executingCommands = useSelector(createExecutingCommandsSelector());
   const isSearching = executingCommands.some(({ name, body }) => {
     const { movieIds = [] } = body;
@@ -61,7 +58,6 @@ function MovieSearchCell(props: MovieSearchCellProps) {
       <MovieInteractiveSearchModal
         isOpen={isInteractiveSearchModalOpen}
         movieId={movieId}
-        movieTitle={movieTitle}
         onModalClose={setInteractiveSearchModalClosed}
       />
     </TableRowCell>
diff --git a/frontend/src/Movie/Search/MovieInteractiveSearchModal.tsx b/frontend/src/Movie/Search/MovieInteractiveSearchModal.tsx
index ea3d8def1c..ba05754eee 100644
--- a/frontend/src/Movie/Search/MovieInteractiveSearchModal.tsx
+++ b/frontend/src/Movie/Search/MovieInteractiveSearchModal.tsx
@@ -17,9 +17,11 @@ interface MovieInteractiveSearchModalProps
   isOpen: boolean;
 }
 
-function MovieInteractiveSearchModal(props: MovieInteractiveSearchModalProps) {
-  const { isOpen, movieId, movieTitle, onModalClose } = props;
-
+function MovieInteractiveSearchModal({
+  isOpen,
+  movieId,
+  onModalClose,
+}: MovieInteractiveSearchModalProps) {
   const dispatch = useDispatch();
 
   const handleModalClose = useCallback(() => {
@@ -41,7 +43,6 @@ function MovieInteractiveSearchModal(props: MovieInteractiveSearchModalProps) {
     >
       <MovieInteractiveSearchModalContent
         movieId={movieId}
-        movieTitle={movieTitle}
         onModalClose={handleModalClose}
       />
     </Modal>
diff --git a/frontend/src/Movie/Search/MovieInteractiveSearchModalContent.tsx b/frontend/src/Movie/Search/MovieInteractiveSearchModalContent.tsx
index cf79ac5769..397b8659d2 100644
--- a/frontend/src/Movie/Search/MovieInteractiveSearchModalContent.tsx
+++ b/frontend/src/Movie/Search/MovieInteractiveSearchModalContent.tsx
@@ -7,6 +7,8 @@ import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
 import { scrollDirections } from 'Helpers/Props';
 import InteractiveSearch from 'InteractiveSearch/InteractiveSearch';
+import Movie from 'Movie/Movie';
+import useMovie from 'Movie/useMovie';
 import { clearMovieBlocklist } from 'Store/Actions/movieBlocklistActions';
 import { clearMovieHistory } from 'Store/Actions/movieHistoryActions';
 import {
@@ -17,17 +19,17 @@ import translate from 'Utilities/String/translate';
 
 export interface MovieInteractiveSearchModalContentProps {
   movieId: number;
-  movieTitle?: string;
   onModalClose(): void;
 }
 
 function MovieInteractiveSearchModalContent({
   movieId,
-  movieTitle,
   onModalClose,
 }: MovieInteractiveSearchModalContentProps) {
   const dispatch = useDispatch();
 
+  const { title, year } = useMovie(movieId) as Movie;
+
   useEffect(() => {
     return () => {
       dispatch(cancelFetchReleases());
@@ -38,6 +40,8 @@ function MovieInteractiveSearchModalContent({
     };
   }, [dispatch]);
 
+  const movieTitle = `${title}${year > 0 ? ` (${year})` : ''}`;
+
   return (
     <ModalContent onModalClose={onModalClose}>
       <ModalHeader>
diff --git a/frontend/src/Wanted/CutoffUnmet/CutoffUnmetRow.js b/frontend/src/Wanted/CutoffUnmet/CutoffUnmetRow.js
index 43c9ab9fbc..99673c5039 100644
--- a/frontend/src/Wanted/CutoffUnmet/CutoffUnmetRow.js
+++ b/frontend/src/Wanted/CutoffUnmet/CutoffUnmetRow.js
@@ -141,7 +141,6 @@ function CutoffUnmetRow(props) {
               <MovieSearchCell
                 key={name}
                 movieId={id}
-                movieTitle={title}
                 movieEntity={movieEntities.WANTED_CUTOFF_UNMET}
               />
             );
diff --git a/frontend/src/Wanted/Missing/MissingRow.js b/frontend/src/Wanted/Missing/MissingRow.js
index 323af1c649..ffdd7161f0 100644
--- a/frontend/src/Wanted/Missing/MissingRow.js
+++ b/frontend/src/Wanted/Missing/MissingRow.js
@@ -131,7 +131,6 @@ function MissingRow(props) {
               <MovieSearchCell
                 key={name}
                 movieId={id}
-                movieTitle={title}
                 movieEntity={movieEntities.WANTED_MISSING}
               />
             );