New: Reactive search button on Wanted pages

(cherry picked from commit e8c3aa20bd92701a16dcd97c5e103b79b3683105)

Closes #10750
pull/10743/head
Stevie Robinson 3 months ago committed by Bogdan
parent 7ebd341cd6
commit 8b0b7c1cb0

@ -153,12 +153,15 @@ class CutoffUnmet extends Component {
<PageToolbar> <PageToolbar>
<PageToolbarSection> <PageToolbarSection>
<PageToolbarButton <PageToolbarButton
label={translate('SearchSelected')} label={itemsSelected ? translate('SearchSelected') : translate('SearchAll')}
iconName={icons.SEARCH} iconName={icons.SEARCH}
isDisabled={!itemsSelected || isSearchingForCutoffUnmetMovies} isDisabled={isSearchingForCutoffUnmetMovies}
onPress={this.onSearchSelectedPress} isSpinning={isSearchingForCutoffUnmetMovies}
onPress={itemsSelected ? this.onSearchSelectedPress : this.onSearchAllCutoffUnmetPress}
/> />
<PageToolbarSeparator />
<PageToolbarButton <PageToolbarButton
label={isShowingMonitored ? translate('UnmonitorSelected') : translate('MonitorSelected')} label={isShowingMonitored ? translate('UnmonitorSelected') : translate('MonitorSelected')}
iconName={icons.MONITORED} iconName={icons.MONITORED}
@ -166,18 +169,6 @@ class CutoffUnmet extends Component {
isSpinning={isSaving} isSpinning={isSaving}
onPress={this.onToggleSelectedPress} onPress={this.onToggleSelectedPress}
/> />
<PageToolbarSeparator />
<PageToolbarButton
label={translate('SearchAll')}
iconName={icons.SEARCH}
isDisabled={!items.length}
isSpinning={isSearchingForCutoffUnmetMovies}
onPress={this.onSearchAllCutoffUnmetPress}
/>
<PageToolbarSeparator />
</PageToolbarSection> </PageToolbarSection>
<PageToolbarSection alignContent={align.RIGHT}> <PageToolbarSection alignContent={align.RIGHT}>

@ -18,9 +18,10 @@ function createMapStateToProps() {
return createSelector( return createSelector(
(state) => state.wanted.cutoffUnmet, (state) => state.wanted.cutoffUnmet,
createCommandExecutingSelector(commandNames.CUTOFF_UNMET_MOVIES_SEARCH), createCommandExecutingSelector(commandNames.CUTOFF_UNMET_MOVIES_SEARCH),
(cutoffUnmet, isSearchingForCutoffUnmetMovies) => { createCommandExecutingSelector(commandNames.MOVIE_SEARCH),
(cutoffUnmet, isSearchingForCutoffUnmetMovies, isSearchingForSelectedCutoffUnmetMovies) => {
return { return {
isSearchingForCutoffUnmetMovies, isSearchingForCutoffUnmetMovies: isSearchingForCutoffUnmetMovies || isSearchingForSelectedCutoffUnmetMovies,
isSaving: cutoffUnmet.items.filter((m) => m.isSaving).length > 1, isSaving: cutoffUnmet.items.filter((m) => m.isSaving).length > 1,
...cutoffUnmet ...cutoffUnmet
}; };

@ -159,12 +159,15 @@ class Missing extends Component {
<PageToolbar> <PageToolbar>
<PageToolbarSection> <PageToolbarSection>
<PageToolbarButton <PageToolbarButton
label={translate('SearchSelected')} label={itemsSelected ? translate('SearchSelected') : translate('SearchAll')}
iconName={icons.SEARCH} iconName={icons.SEARCH}
isDisabled={!itemsSelected || isSearchingForMissingMovies} isSpinning={isSearchingForMissingMovies}
onPress={this.onSearchSelectedPress} isDisabled={isSearchingForMissingMovies}
onPress={itemsSelected ? this.onSearchSelectedPress : this.onSearchAllMissingPress}
/> />
<PageToolbarSeparator />
<PageToolbarButton <PageToolbarButton
label={isShowingMonitored ? translate('UnmonitorSelected') : translate('MonitorSelected')} label={isShowingMonitored ? translate('UnmonitorSelected') : translate('MonitorSelected')}
iconName={icons.MONITORED} iconName={icons.MONITORED}
@ -175,16 +178,6 @@ class Missing extends Component {
<PageToolbarSeparator /> <PageToolbarSeparator />
<PageToolbarButton
label={translate('SearchAll')}
iconName={icons.SEARCH}
isDisabled={!items.length}
isSpinning={isSearchingForMissingMovies}
onPress={this.onSearchAllMissingPress}
/>
<PageToolbarSeparator />
<PageToolbarButton <PageToolbarButton
label={translate('ManualImport')} label={translate('ManualImport')}
iconName={icons.INTERACTIVE} iconName={icons.INTERACTIVE}

@ -17,9 +17,10 @@ function createMapStateToProps() {
return createSelector( return createSelector(
(state) => state.wanted.missing, (state) => state.wanted.missing,
createCommandExecutingSelector(commandNames.MISSING_MOVIES_SEARCH), createCommandExecutingSelector(commandNames.MISSING_MOVIES_SEARCH),
(missing, isSearchingForMissingMovies) => { createCommandExecutingSelector(commandNames.MOVIE_SEARCH),
(missing, isSearchingForMissingMovies, isSearchingForSelectedMissingMovies) => {
return { return {
isSearchingForMissingMovies, isSearchingForMissingMovies: isSearchingForMissingMovies || isSearchingForSelectedMissingMovies,
isSaving: missing.items.filter((m) => m.isSaving).length > 1, isSaving: missing.items.filter((m) => m.isSaving).length > 1,
...missing ...missing
}; };

Loading…
Cancel
Save