From 9fbc1df74c5f7dea1aebc8f0b8bb17c515554734 Mon Sep 17 00:00:00 2001 From: Qstick Date: Thu, 3 Dec 2020 22:34:42 -0500 Subject: [PATCH] Fixed: Persist SearchOnAdd setting value in local cache --- .../AddNewMovie/AddNewMovieModalContent.js | 23 ++++--------------- .../AddNewMovieModalContentConnector.js | 8 ++++--- ...ddNewDiscoverMovieModalContentConnector.js | 8 ++++--- frontend/src/Store/Actions/addMovieActions.js | 1 + .../src/Store/Actions/discoverMovieActions.js | 4 ++-- 5 files changed, 18 insertions(+), 26 deletions(-) diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js index 9f02cb2a3..9a4f41248 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContent.js @@ -17,30 +17,15 @@ import styles from './AddNewMovieModalContent.css'; class AddNewMovieModalContent extends Component { - // - // Lifecycle - - constructor(props, context) { - super(props, context); - - this.state = { - searchForMovie: false - }; - } - // // Listeners - onSearchForMissingMovieChange = ({ value }) => { - this.setState({ searchForMovie: value }); - } - onQualityProfileIdChange = ({ value }) => { this.props.onInputChange({ name: 'qualityProfileId', value: parseInt(value) }); } onAddMoviePress = () => { - this.props.onAddMoviePress(this.state.searchForMovie); + this.props.onAddMoviePress(); } // @@ -57,6 +42,7 @@ class AddNewMovieModalContent extends Component { monitor, qualityProfileId, minimumAvailability, + searchForMovie, folder, tags, isSmallScreen, @@ -175,8 +161,8 @@ class AddNewMovieModalContent extends Component { containerClassName={styles.searchForMissingMovieContainer} className={styles.searchForMissingMovieInput} name="searchForMovie" - value={this.state.searchForMovie} - onChange={this.onSearchForMissingMovieChange} + onChange={onInputChange} + {...searchForMovie} /> @@ -205,6 +191,7 @@ AddNewMovieModalContent.propTypes = { monitor: PropTypes.object.isRequired, qualityProfileId: PropTypes.object, minimumAvailability: PropTypes.object.isRequired, + searchForMovie: PropTypes.object.isRequired, folder: PropTypes.string.isRequired, tags: PropTypes.object.isRequired, isSmallScreen: PropTypes.bool.isRequired, diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js index 166bbaecf..6c004fb84 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieModalContentConnector.js @@ -53,13 +53,14 @@ class AddNewMovieModalContentConnector extends Component { this.props.setAddMovieDefault({ [name]: value }); } - onAddMoviePress = (searchForMovie) => { + onAddMoviePress = () => { const { tmdbId, rootFolderPath, monitor, qualityProfileId, minimumAvailability, + searchForMovie, tags } = this.props; @@ -69,8 +70,8 @@ class AddNewMovieModalContentConnector extends Component { monitor: monitor.value, qualityProfileId: qualityProfileId.value, minimumAvailability: minimumAvailability.value, - tags: tags.value, - searchForMovie + searchForMovie: searchForMovie.value, + tags: tags.value }); } @@ -94,6 +95,7 @@ AddNewMovieModalContentConnector.propTypes = { monitor: PropTypes.object.isRequired, qualityProfileId: PropTypes.object, minimumAvailability: PropTypes.object.isRequired, + searchForMovie: PropTypes.object.isRequired, tags: PropTypes.object.isRequired, onModalClose: PropTypes.func.isRequired, setAddMovieDefault: PropTypes.func.isRequired, diff --git a/frontend/src/DiscoverMovie/AddNewDiscoverMovieModalContentConnector.js b/frontend/src/DiscoverMovie/AddNewDiscoverMovieModalContentConnector.js index dd3987aec..3bd48abda 100644 --- a/frontend/src/DiscoverMovie/AddNewDiscoverMovieModalContentConnector.js +++ b/frontend/src/DiscoverMovie/AddNewDiscoverMovieModalContentConnector.js @@ -53,13 +53,14 @@ class AddNewDiscoverMovieModalContentConnector extends Component { this.props.setAddMovieDefault({ [name]: value }); } - onAddMoviePress = (searchForMovie) => { + onAddMoviePress = () => { const { tmdbId, rootFolderPath, monitor, qualityProfileId, minimumAvailability, + searchForMovie, tags } = this.props; @@ -69,8 +70,8 @@ class AddNewDiscoverMovieModalContentConnector extends Component { monitor: monitor.value, qualityProfileId: qualityProfileId.value, minimumAvailability: minimumAvailability.value, - tags: tags.value, - searchForMovie + searchForMovie: searchForMovie.value, + tags: tags.value }); this.props.onModalClose(true); @@ -96,6 +97,7 @@ AddNewDiscoverMovieModalContentConnector.propTypes = { monitor: PropTypes.object.isRequired, qualityProfileId: PropTypes.object, minimumAvailability: PropTypes.object.isRequired, + searchForMovie: PropTypes.object.isRequired, tags: PropTypes.object.isRequired, onModalClose: PropTypes.func.isRequired, setAddMovieDefault: PropTypes.func.isRequired, diff --git a/frontend/src/Store/Actions/addMovieActions.js b/frontend/src/Store/Actions/addMovieActions.js index 4d624df86..a4ac3fecb 100644 --- a/frontend/src/Store/Actions/addMovieActions.js +++ b/frontend/src/Store/Actions/addMovieActions.js @@ -33,6 +33,7 @@ export const defaultState = { monitor: 'true', qualityProfileId: 0, minimumAvailability: 'announced', + searchForMovie: true, tags: [] } }; diff --git a/frontend/src/Store/Actions/discoverMovieActions.js b/frontend/src/Store/Actions/discoverMovieActions.js index ab4529351..8b01e3af5 100644 --- a/frontend/src/Store/Actions/discoverMovieActions.js +++ b/frontend/src/Store/Actions/discoverMovieActions.js @@ -49,8 +49,8 @@ export const defaultState = { monitor: 'true', qualityProfileId: 0, minimumAvailability: 'announced', - tags: [], - searchForMovie: false + searchForMovie: true, + tags: [] }, posterOptions: {