New: Add option to only monitor selected book when adding single book

This commit is contained in:
ta264
2021-11-14 21:28:58 +00:00
parent a1c2986af8
commit 33e5351add
8 changed files with 63 additions and 75 deletions

View File

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { addAuthor, setAddDefault } from 'Store/Actions/searchActions';
import { addAuthor, setAuthorAddDefault } from 'Store/Actions/searchActions';
import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
import selectSettings from 'Store/Selectors/selectSettings';
import AddNewAuthorModalContent from './AddNewAuthorModalContent';
@@ -16,14 +16,14 @@ function createMapStateToProps() {
const {
isAdding,
addError,
defaults
authorDefaults
} = searchState;
const {
settings,
validationErrors,
validationWarnings
} = selectSettings(defaults, {}, addError);
} = selectSettings(authorDefaults, {}, addError);
return {
isAdding,
@@ -39,7 +39,7 @@ function createMapStateToProps() {
}
const mapDispatchToProps = {
setAddDefault,
setAuthorAddDefault,
addAuthor
};
@@ -49,7 +49,7 @@ class AddNewAuthorModalContentConnector extends Component {
// Listeners
onInputChange = ({ name, value }) => {
this.props.setAddDefault({ [name]: value });
this.props.setAuthorAddDefault({ [name]: value });
}
onAddAuthorPress = (searchForMissingBooks) => {
@@ -95,7 +95,7 @@ AddNewAuthorModalContentConnector.propTypes = {
metadataProfileId: PropTypes.object,
tags: PropTypes.object.isRequired,
onModalClose: PropTypes.func.isRequired,
setAddDefault: PropTypes.func.isRequired,
setAuthorAddDefault: PropTypes.func.isRequired,
addAuthor: PropTypes.func.isRequired
};

View File

@@ -105,6 +105,7 @@ class AddNewBookModalContent extends Component {
<AddAuthorOptionsForm
authorName={authorName}
includeNoneMetadataProfile={true}
includeSpecificBookMonitor={true}
{...otherProps}
/>
}

View File

@@ -2,8 +2,7 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { metadataProfileNames } from 'Helpers/Props';
import { addBook, setAddDefault } from 'Store/Actions/searchActions';
import { addBook, setBookAddDefault } from 'Store/Actions/searchActions';
import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
import selectSettings from 'Store/Selectors/selectSettings';
import AddNewBookModalContent from './AddNewBookModalContent';
@@ -18,17 +17,14 @@ function createMapStateToProps() {
const {
isAdding,
addError,
defaults
bookDefaults
} = searchState;
const {
settings,
validationErrors,
validationWarnings
} = selectSettings(defaults, {}, addError);
// For adding single books, default to None profile
const noneProfile = metadataProfiles.items.find((item) => item.name === metadataProfileNames.NONE);
} = selectSettings(bookDefaults, {}, addError);
return {
isAdding,
@@ -37,7 +33,6 @@ function createMapStateToProps() {
isSmallScreen: dimensions.isSmallScreen,
validationErrors,
validationWarnings,
noneMetadataProfileId: noneProfile.id,
...settings
};
}
@@ -45,39 +40,17 @@ function createMapStateToProps() {
}
const mapDispatchToProps = {
setAddDefault,
setBookAddDefault,
addBook
};
class AddNewBookModalContentConnector extends Component {
//
// Lifecycle
constructor(props, context) {
super(props, context);
this.state = {
metadataProfileIdDefault: props.metadataProfileId.value
};
// select none as default
this.onInputChange({
name: 'metadataProfileId',
value: props.noneMetadataProfileId
});
}
componentWillUnmount() {
// reinstate standard default
this.props.setAddDefault({ metadataProfileId: this.state.metadataProfileIdDefault });
}
//
// Listeners
onInputChange = ({ name, value }) => {
this.props.setAddDefault({ [name]: value });
this.props.setBookAddDefault({ [name]: value });
}
onAddBookPress = (searchForNewBook) => {
@@ -122,10 +95,9 @@ AddNewBookModalContentConnector.propTypes = {
monitor: PropTypes.object.isRequired,
qualityProfileId: PropTypes.object,
metadataProfileId: PropTypes.object,
noneMetadataProfileId: PropTypes.number.isRequired,
tags: PropTypes.object.isRequired,
onModalClose: PropTypes.func.isRequired,
setAddDefault: PropTypes.func.isRequired,
setBookAddDefault: PropTypes.func.isRequired,
addBook: PropTypes.func.isRequired
};

View File

@@ -35,6 +35,7 @@ class AddAuthorOptionsForm extends Component {
qualityProfileId,
metadataProfileId,
includeNoneMetadataProfile,
includeSpecificBookMonitor,
showMetadataProfile,
tags,
onInputChange,
@@ -77,6 +78,7 @@ class AddAuthorOptionsForm extends Component {
type={inputTypes.MONITOR_BOOKS_SELECT}
name="monitor"
onChange={onInputChange}
includeSpecificBook={includeSpecificBookMonitor}
{...monitor}
/>
</FormGroup>
@@ -147,6 +149,7 @@ AddAuthorOptionsForm.propTypes = {
metadataProfileId: PropTypes.object,
showMetadataProfile: PropTypes.bool.isRequired,
includeNoneMetadataProfile: PropTypes.bool.isRequired,
includeSpecificBookMonitor: PropTypes.bool.isRequired,
tags: PropTypes.object.isRequired,
onInputChange: PropTypes.func.isRequired
};