From e45f0ad5fc86116b2023e56f3f2014fd601525c2 Mon Sep 17 00:00:00 2001 From: Qstick Date: Fri, 4 Sep 2020 22:09:26 -0400 Subject: [PATCH] Fixed: Don't Fail if User Tries Adding Existing Movie from Discovery --- .../src/Store/Actions/discoverMovieActions.js | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/frontend/src/Store/Actions/discoverMovieActions.js b/frontend/src/Store/Actions/discoverMovieActions.js index eae089019..524f1a486 100644 --- a/frontend/src/Store/Actions/discoverMovieActions.js +++ b/frontend/src/Store/Actions/discoverMovieActions.js @@ -521,11 +521,13 @@ export const actionHandlers = handleThunks({ // Make sure we have a selected movie and // the same movie hasn't been added yet. if (selectedMovie && !acc.some((a) => a.tmdbId === selectedMovie.tmdbId)) { - const newMovie = getNewMovie(_.cloneDeep(selectedMovie), addOptions); - newMovie.id = 0; + if (!selectedMovie.isExisting) { + const newMovie = getNewMovie(_.cloneDeep(selectedMovie), addOptions); + newMovie.id = 0; - addedIds.push(id); - acc.push(newMovie); + addedIds.push(id); + acc.push(newMovie); + } } return acc; @@ -548,24 +550,19 @@ export const actionHandlers = handleThunks({ ...data.map((movie) => updateItem({ section: 'movies', ...movie })), - ...addedIds.map((id) => removeItem({ section, id })) + ...addedIds.map((id) => (items.find((i) => i.id === id).lists.length === 0 ? removeItem({ section, id }) : updateItem({ section, id, isExisting: true }))) + ])); }); promise.fail((xhr) => { - dispatch(batchActions( + dispatch( set({ section, - isImporting: false, - isImported: true - }), - - addedIds.map((id) => updateItem({ - section, - id, - importError: xhr - })) - )); + isAdding: false, + isAdded: true + }) + ); }); },