Fixed: Batch Monitor/Unmonitor on Wanted Pages

This commit is contained in:
Qstick 2017-10-28 21:44:06 -04:00
parent b99b23b4bb
commit 9f079fb8ba
12 changed files with 43 additions and 43 deletions

View file

@ -109,7 +109,7 @@ class CutoffUnmet extends Component {
columns,
totalRecords,
isSearchingForAlbums,
isSearchingForCutoffUnmetEpisodes,
isSearchingForCutoffUnmetAlbums,
isSaving,
filterKey,
filterValue,
@ -150,7 +150,7 @@ class CutoffUnmet extends Component {
<PageToolbarButton
label="Search All"
iconName={icons.SEARCH}
isSpinning={isSearchingForCutoffUnmetEpisodes}
isSpinning={isSearchingForCutoffUnmetAlbums}
onPress={this.onSearchAllCutoffUnmetPress}
/>
@ -272,7 +272,7 @@ CutoffUnmet.propTypes = {
columns: PropTypes.arrayOf(PropTypes.object).isRequired,
totalRecords: PropTypes.number,
isSearchingForAlbums: PropTypes.bool.isRequired,
isSearchingForCutoffUnmetEpisodes: PropTypes.bool.isRequired,
isSearchingForCutoffUnmetAlbums: PropTypes.bool.isRequired,
isSaving: PropTypes.bool.isRequired,
filterKey: PropTypes.string,
filterValue: PropTypes.oneOfType([PropTypes.bool, PropTypes.number, PropTypes.string]),

View file

@ -19,12 +19,12 @@ function createMapStateToProps() {
(state) => state.wanted.cutoffUnmet,
createCommandsSelector(),
(cutoffUnmet, commands) => {
const isSearchingForAlbums = _.some(commands, { name: commandNames.EPISODE_SEARCH });
const isSearchingForCutoffUnmetEpisodes = _.some(commands, { name: commandNames.CUTOFF_UNMET_EPISODE_SEARCH });
const isSearchingForAlbums = _.some(commands, { name: commandNames.ALBUM_SEARCH });
const isSearchingForCutoffUnmetAlbums = _.some(commands, { name: commandNames.CUTOFF_UNMET_ALBUM_SEARCH });
return {
isSearchingForAlbums,
isSearchingForCutoffUnmetEpisodes,
isSearchingForCutoffUnmetAlbums,
isSaving: _.some(cutoffUnmet.items, { isSaving: true }),
...cutoffUnmet
};
@ -119,7 +119,7 @@ class CutoffUnmetConnector extends Component {
onSearchSelectedPress = (selected) => {
this.props.executeCommand({
name: commandNames.EPISODE_SEARCH,
name: commandNames.ALBUM_SEARCH,
albumIds: selected
});
}
@ -130,7 +130,7 @@ class CutoffUnmetConnector extends Component {
filterValue
} = this.props;
this.props.batchToggleCutoffUnmetEpisodes({
this.props.batchToggleCutoffUnmetAlbums({
albumIds: selected,
monitored: filterKey !== 'monitored' || !filterValue
});
@ -138,7 +138,7 @@ class CutoffUnmetConnector extends Component {
onSearchAllCutoffUnmetPress = () => {
this.props.executeCommand({
name: commandNames.CUTOFF_UNMET_EPISODE_SEARCH
name: commandNames.CUTOFF_UNMET_ALBUM_SEARCH
});
}
@ -178,7 +178,7 @@ CutoffUnmetConnector.propTypes = {
setCutoffUnmetSort: PropTypes.func.isRequired,
setCutoffUnmetFilter: PropTypes.func.isRequired,
setCutoffUnmetTableOption: PropTypes.func.isRequired,
batchToggleCutoffUnmetEpisodes: PropTypes.func.isRequired,
batchToggleCutoffUnmetAlbums: PropTypes.func.isRequired,
clearCutoffUnmet: PropTypes.func.isRequired,
executeCommand: PropTypes.func.isRequired,
fetchQueueDetails: PropTypes.func.isRequired,

View file

@ -18,7 +18,7 @@ function createMapStateToProps() {
(state) => state.wanted.missing,
createCommandsSelector(),
(missing, commands) => {
const isSearchingForAlbums = _.some(commands, { name: commandNames.EPISODE_SEARCH });
const isSearchingForAlbums = _.some(commands, { name: commandNames.ALBUM_SEARCH });
const isSearchingForMissingAlbums = _.some(commands, { name: commandNames.MISSING_ALBUM_SEARCH });
return {
@ -109,7 +109,7 @@ class MissingConnector extends Component {
onSearchSelectedPress = (selected) => {
this.props.executeCommand({
name: commandNames.EPISODE_SEARCH,
name: commandNames.ALBUM_SEARCH,
albumIds: selected
});
}
@ -120,7 +120,7 @@ class MissingConnector extends Component {
filterValue
} = this.props;
this.props.batchToggleMissingEpisodes({
this.props.batchToggleMissingAlbums({
albumIds: selected,
monitored: filterKey !== 'monitored' || !filterValue
});
@ -169,7 +169,7 @@ MissingConnector.propTypes = {
setMissingFilter: PropTypes.func.isRequired,
setMissingTableOption: PropTypes.func.isRequired,
clearMissing: PropTypes.func.isRequired,
batchToggleMissingEpisodes: PropTypes.func.isRequired,
batchToggleMissingAlbums: PropTypes.func.isRequired,
executeCommand: PropTypes.func.isRequired,
fetchQueueDetails: PropTypes.func.isRequired,
clearQueueDetails: PropTypes.func.isRequired