1
0
mirror of https://github.com/Sonarr/Sonarr.git synced 2026-04-20 21:54:58 -04:00

New: Remember add import list exclusion when removing series

Closes #4984
This commit is contained in:
Mark McDowall
2022-12-31 22:17:50 -08:00
parent 2fc76a9ac5
commit d8f6eaebdc
5 changed files with 91 additions and 74 deletions
@@ -1,6 +1,7 @@
import _ from 'lodash';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { setDeleteOption } from 'Store/Actions/seriesActions';
import { bulkDeleteSeries } from 'Store/Actions/seriesEditorActions';
import createAllSeriesSelector from 'Store/Selectors/createAllSeriesSelector';
import DeleteSeriesModalContent from './DeleteSeriesModalContent';
@@ -8,8 +9,9 @@ import DeleteSeriesModalContent from './DeleteSeriesModalContent';
function createMapStateToProps() {
return createSelector(
(state, { seriesIds }) => seriesIds,
(state) => state.series.deleteOptions,
createAllSeriesSelector(),
(seriesIds, allSeries) => {
(seriesIds, deleteOptions, allSeries) => {
const selectedSeries = _.intersectionWith(allSeries, seriesIds, (s, id) => {
return s.id === id;
});
@@ -23,7 +25,8 @@ function createMapStateToProps() {
});
return {
series
series,
deleteOptions
};
}
);
@@ -31,12 +34,22 @@ function createMapStateToProps() {
function createMapDispatchToProps(dispatch, props) {
return {
setDeleteOption(option) {
dispatch(
setDeleteOption({
[option.name]: option.value
})
);
},
onDeleteSelectedPress(deleteFiles, addImportListExclusion) {
dispatch(bulkDeleteSeries({
seriesIds: props.seriesIds,
deleteFiles,
addImportListExclusion
}));
dispatch(
bulkDeleteSeries({
seriesIds: props.seriesIds,
deleteFiles,
addImportListExclusion
})
);
props.onModalClose();
}