diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js
index c4dbaabbe..8e50ce306 100644
--- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js
+++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieConnector.js
@@ -6,7 +6,7 @@ import { clearAddMovie, lookupMovie } from 'Store/Actions/addMovieActions';
import { clearMovieFiles, fetchMovieFiles } from 'Store/Actions/movieFileActions';
import { clearQueueDetails, fetchQueueDetails } from 'Store/Actions/queueActions';
import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
-import { fetchImportExclusions } from 'Store/Actions/Settings/importExclusions';
+import { fetchImportListExclusions } from 'Store/Actions/Settings/importListExclusions';
import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
import selectUniqueIds from 'Utilities/Object/selectUniqueIds';
@@ -36,7 +36,7 @@ const mapDispatchToProps = {
lookupMovie,
clearAddMovie,
fetchRootFolders,
- fetchImportExclusions,
+ fetchImportListExclusions,
fetchQueueDetails,
clearQueueDetails,
fetchMovieFiles,
@@ -56,7 +56,7 @@ class AddNewMovieConnector extends Component {
componentDidMount() {
this.props.fetchRootFolders();
- this.props.fetchImportExclusions();
+ this.props.fetchImportListExclusions();
this.props.fetchQueueDetails();
}
@@ -131,7 +131,7 @@ AddNewMovieConnector.propTypes = {
lookupMovie: PropTypes.func.isRequired,
clearAddMovie: PropTypes.func.isRequired,
fetchRootFolders: PropTypes.func.isRequired,
- fetchImportExclusions: PropTypes.func.isRequired,
+ fetchImportListExclusions: PropTypes.func.isRequired,
fetchQueueDetails: PropTypes.func.isRequired,
clearQueueDetails: PropTypes.func.isRequired,
fetchMovieFiles: PropTypes.func.isRequired,
diff --git a/frontend/src/DiscoverMovie/DiscoverMovieConnector.js b/frontend/src/DiscoverMovie/DiscoverMovieConnector.js
index 90d0f6143..ba4f8cd4e 100644
--- a/frontend/src/DiscoverMovie/DiscoverMovieConnector.js
+++ b/frontend/src/DiscoverMovie/DiscoverMovieConnector.js
@@ -5,9 +5,9 @@ import { createSelector } from 'reselect';
import * as commandNames from 'Commands/commandNames';
import withScrollPosition from 'Components/withScrollPosition';
import { executeCommand } from 'Store/Actions/commandActions';
-import { addImportExclusions, addMovies, clearAddMovie, fetchDiscoverMovies, setListMovieFilter, setListMovieSort, setListMovieTableOption, setListMovieView } from 'Store/Actions/discoverMovieActions';
+import { addImportListExclusions, addMovies, clearAddMovie, fetchDiscoverMovies, setListMovieFilter, setListMovieSort, setListMovieTableOption, setListMovieView } from 'Store/Actions/discoverMovieActions';
import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
-import { fetchImportExclusions } from 'Store/Actions/Settings/importExclusions';
+import { fetchImportListExclusions } from 'Store/Actions/Settings/importListExclusions';
import scrollPositions from 'Store/scrollPositions';
import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
@@ -43,8 +43,8 @@ function createMapDispatchToProps(dispatch, props) {
dispatch(fetchRootFolders());
},
- dispatchFetchImportExclusions() {
- dispatch(fetchImportExclusions());
+ dispatchFetchImportListExclusions() {
+ dispatch(fetchImportListExclusions());
},
dispatchClearListMovie() {
@@ -75,8 +75,8 @@ function createMapDispatchToProps(dispatch, props) {
dispatch(addMovies({ ids, addOptions }));
},
- dispatchAddImportExclusions(exclusions) {
- dispatch(addImportExclusions(exclusions));
+ dispatchAddImportListExclusions(exclusions) {
+ dispatch(addImportListExclusions(exclusions));
},
onImportListSyncPress() {
@@ -96,7 +96,7 @@ class DiscoverMovieConnector extends Component {
componentDidMount() {
registerPagePopulator(this.repopulate);
this.props.dispatchFetchRootFolders();
- this.props.dispatchFetchImportExclusions();
+ this.props.dispatchFetchImportListExclusions();
this.props.dispatchFetchListMovies();
}
@@ -121,7 +121,7 @@ class DiscoverMovieConnector extends Component {
};
onExcludeMoviesPress =({ ids }) => {
- this.props.dispatchAddImportExclusions({ ids });
+ this.props.dispatchAddImportListExclusions({ ids });
};
//
@@ -144,13 +144,13 @@ class DiscoverMovieConnector extends Component {
DiscoverMovieConnector.propTypes = {
isSmallScreen: PropTypes.bool.isRequired,
view: PropTypes.string.isRequired,
- dispatchFetchImportExclusions: PropTypes.func.isRequired,
+ dispatchFetchImportListExclusions: PropTypes.func.isRequired,
dispatchFetchRootFolders: PropTypes.func.isRequired,
dispatchFetchListMovies: PropTypes.func.isRequired,
dispatchClearListMovie: PropTypes.func.isRequired,
dispatchSetListMovieView: PropTypes.func.isRequired,
dispatchAddMovies: PropTypes.func.isRequired,
- dispatchAddImportExclusions: PropTypes.func.isRequired
+ dispatchAddImportListExclusions: PropTypes.func.isRequired
};
export default withScrollPosition(
diff --git a/frontend/src/DiscoverMovie/DiscoverMovieFooterConnector.js b/frontend/src/DiscoverMovie/DiscoverMovieFooterConnector.js
index d2bf790b9..aec9e4485 100644
--- a/frontend/src/DiscoverMovie/DiscoverMovieFooterConnector.js
+++ b/frontend/src/DiscoverMovie/DiscoverMovieFooterConnector.js
@@ -8,9 +8,9 @@ import DiscoverMovieFooter from './DiscoverMovieFooter';
function createMapStateToProps() {
return createSelector(
(state) => state.discoverMovie,
- (state) => state.settings.importExclusions,
+ (state) => state.settings.importListExclusions,
(state, { selectedIds }) => selectedIds,
- (discoverMovie, importExclusions, selectedIds) => {
+ (discoverMovie, importListExclusions, selectedIds) => {
const {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId,
@@ -25,7 +25,7 @@ function createMapStateToProps() {
const {
isSaving
- } = importExclusions;
+ } = importListExclusions;
return {
selectedCount: selectedIds.length,
diff --git a/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModalContentConnector.js b/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModalContentConnector.js
index 256c1bb94..a33397877 100644
--- a/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModalContentConnector.js
+++ b/frontend/src/DiscoverMovie/Exclusion/ExcludeMovieModalContentConnector.js
@@ -1,11 +1,11 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
-import { addImportExclusions } from 'Store/Actions/discoverMovieActions';
+import { addImportListExclusions } from 'Store/Actions/discoverMovieActions';
import ExcludeMovieModalContent from './ExcludeMovieModalContent';
const mapDispatchToProps = {
- addImportExclusions
+ addImportListExclusions
};
class ExcludeMovieModalContentConnector extends Component {
@@ -14,7 +14,7 @@ class ExcludeMovieModalContentConnector extends Component {
// Listeners
onExcludePress = () => {
- this.props.addImportExclusions({ ids: [this.props.tmdbId] });
+ this.props.addImportListExclusions({ ids: [this.props.tmdbId] });
this.props.onModalClose(true);
};
@@ -37,7 +37,7 @@ ExcludeMovieModalContentConnector.propTypes = {
title: PropTypes.string.isRequired,
year: PropTypes.number.isRequired,
onModalClose: PropTypes.func.isRequired,
- addImportExclusions: PropTypes.func.isRequired
+ addImportListExclusions: PropTypes.func.isRequired
};
export default connect(undefined, mapDispatchToProps)(ExcludeMovieModalContentConnector);
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalConnector.js b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalConnector.js
index b4c26b24a..cd4338621 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalConnector.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalConnector.js
@@ -18,7 +18,7 @@ class EditImportListExclusionModalConnector extends Component {
// Listeners
onModalClose = () => {
- this.props.clearPendingChanges({ section: 'settings.importExclusions' });
+ this.props.clearPendingChanges({ section: 'settings.importListExclusions' });
this.props.onModalClose();
};
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js
index ffdd20700..a430df34b 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js
@@ -27,7 +27,7 @@ function EditImportListExclusionModalContent(props) {
onInputChange,
onSavePress,
onModalClose,
- onDeleteImportExclusionPress,
+ onDeleteImportListExclusionPress,
...otherProps
} = props;
@@ -107,7 +107,7 @@ function EditImportListExclusionModalContent(props) {
@@ -141,7 +141,7 @@ EditImportListExclusionModalContent.propTypes = {
onInputChange: PropTypes.func.isRequired,
onSavePress: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired,
- onDeleteImportExclusionPress: PropTypes.func
+ onDeleteImportListExclusionPress: PropTypes.func
};
export default EditImportListExclusionModalContent;
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContentConnector.js b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContentConnector.js
index ebccc321c..0e86d98fe 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContentConnector.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContentConnector.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
-import { saveImportExclusion, setImportExclusionValue } from 'Store/Actions/settingsActions';
+import { saveImportListExclusion, setImportListExclusionValue } from 'Store/Actions/settingsActions';
import selectSettings from 'Store/Selectors/selectSettings';
import EditImportListExclusionModalContent from './EditImportListExclusionModalContent';
@@ -12,11 +12,11 @@ const newImportListExclusion = {
movieYear: 0
};
-function createImportExclusionSelector() {
+function createImportListExclusionSelector() {
return createSelector(
(state, { id }) => id,
- (state) => state.settings.importExclusions,
- (id, importExclusions) => {
+ (state) => state.settings.importListExclusions,
+ (id, importListExclusions) => {
const {
isFetching,
error,
@@ -24,7 +24,7 @@ function createImportExclusionSelector() {
saveError,
pendingChanges,
items
- } = importExclusions;
+ } = importListExclusions;
const mapping = id ? items.find((i) => i.id === id) : newImportListExclusion;
const settings = selectSettings(mapping, pendingChanges, saveError);
@@ -44,21 +44,21 @@ function createImportExclusionSelector() {
function createMapStateToProps() {
return createSelector(
- createImportExclusionSelector(),
- (importExclusion) => {
+ createImportListExclusionSelector(),
+ (importListExclusion) => {
return {
- ...importExclusion
+ ...importListExclusion
};
}
);
}
const mapDispatchToProps = {
- setImportExclusionValue,
- saveImportExclusion
+ setImportListExclusionValue,
+ saveImportListExclusion
};
-class EditImportExclusionModalContentConnector extends Component {
+class EditImportListExclusionModalContentConnector extends Component {
//
// Lifecycle
@@ -66,7 +66,7 @@ class EditImportExclusionModalContentConnector extends Component {
componentDidMount() {
if (!this.props.id) {
Object.keys(newImportListExclusion).forEach((name) => {
- this.props.setImportExclusionValue({
+ this.props.setImportListExclusionValue({
name,
value: newImportListExclusion[name]
});
@@ -84,11 +84,11 @@ class EditImportExclusionModalContentConnector extends Component {
// Listeners
onInputChange = ({ name, value }) => {
- this.props.setImportExclusionValue({ name, value });
+ this.props.setImportListExclusionValue({ name, value });
};
onSavePress = () => {
- this.props.saveImportExclusion({ id: this.props.id });
+ this.props.saveImportListExclusion({ id: this.props.id });
};
//
@@ -105,14 +105,14 @@ class EditImportExclusionModalContentConnector extends Component {
}
}
-EditImportExclusionModalContentConnector.propTypes = {
+EditImportListExclusionModalContentConnector.propTypes = {
id: PropTypes.number,
isSaving: PropTypes.bool.isRequired,
saveError: PropTypes.object,
item: PropTypes.object.isRequired,
- setImportExclusionValue: PropTypes.func.isRequired,
- saveImportExclusion: PropTypes.func.isRequired,
+ setImportListExclusionValue: PropTypes.func.isRequired,
+ saveImportListExclusion: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
-export default connect(createMapStateToProps, mapDispatchToProps)(EditImportExclusionModalContentConnector);
+export default connect(createMapStateToProps, mapDispatchToProps)(EditImportListExclusionModalContentConnector);
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css
index 3a5c24b1b..571abb59b 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css
@@ -1,4 +1,4 @@
-.importExclusion {
+.importListExclusion {
display: flex;
align-items: stretch;
margin-bottom: 10px;
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css.d.ts b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css.d.ts
index 2bf6080a5..7a3245d59 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css.d.ts
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css.d.ts
@@ -2,7 +2,7 @@
// Please do not change this file!
interface CssExports {
'actions': string;
- 'importExclusion': string;
+ 'importListExclusion': string;
'movieTitle': string;
'movieYear': string;
'tmdbId': string;
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.js b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.js
index 512f348bc..632258cf2 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.js
@@ -18,35 +18,35 @@ class ImportListExclusion extends Component {
super(props, context);
this.state = {
- isEditImportExclusionModalOpen: false,
- isDeleteImportExclusionModalOpen: false
+ isEditImportListExclusionModalOpen: false,
+ isDeleteImportListExclusionModalOpen: false
};
}
//
// Listeners
- onEditImportExclusionPress = () => {
- this.setState({ isEditImportExclusionModalOpen: true });
+ onEditImportListExclusionPress = () => {
+ this.setState({ isEditImportListExclusionModalOpen: true });
};
- onEditImportExclusionModalClose = () => {
- this.setState({ isEditImportExclusionModalOpen: false });
+ onEditImportListExclusionModalClose = () => {
+ this.setState({ isEditImportListExclusionModalOpen: false });
};
- onDeleteImportExclusionPress = () => {
+ onDeleteImportListExclusionPress = () => {
this.setState({
- isEditImportExclusionModalOpen: false,
- isDeleteImportExclusionModalOpen: true
+ isEditImportListExclusionModalOpen: false,
+ isDeleteImportListExclusionModalOpen: true
});
};
- onDeleteImportExclusionModalClose = () => {
- this.setState({ isDeleteImportExclusionModalOpen: false });
+ onDeleteImportListExclusionModalClose = () => {
+ this.setState({ isDeleteImportListExclusionModalOpen: false });
};
- onConfirmDeleteImportExclusion = () => {
- this.props.onConfirmDeleteImportExclusion(this.props.id);
+ onConfirmDeleteImportListExclusion = () => {
+ this.props.onConfirmDeleteImportListExclusion(this.props.id);
};
//
@@ -63,7 +63,7 @@ class ImportListExclusion extends Component {
return (
{tmdbId}
@@ -72,7 +72,7 @@ class ImportListExclusion extends Component {
@@ -80,19 +80,19 @@ class ImportListExclusion extends Component {
);
@@ -104,7 +104,7 @@ ImportListExclusion.propTypes = {
movieTitle: PropTypes.string.isRequired,
tmdbId: PropTypes.number.isRequired,
movieYear: PropTypes.number.isRequired,
- onConfirmDeleteImportExclusion: PropTypes.func.isRequired
+ onConfirmDeleteImportListExclusion: PropTypes.func.isRequired
};
ImportListExclusion.defaultProps = {
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css
index 661d8d36d..8c397be9c 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css
@@ -13,7 +13,7 @@
flex: 0 0 70px;
}
-.addImportExclusion {
+.addImportListExclusion {
display: flex;
justify-content: flex-end;
padding-right: 10px;
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css.d.ts b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css.d.ts
index 54deeeee7..3603c0092 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css.d.ts
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css.d.ts
@@ -2,7 +2,7 @@
// Please do not change this file!
interface CssExports {
'addButton': string;
- 'addImportExclusion': string;
+ 'addImportListExclusion': string;
'importListExclusionsHeader': string;
'movieYear': string;
'title': string;
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.js b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.js
index f1ca666fe..159981af4 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.js
@@ -19,19 +19,19 @@ class ImportListExclusions extends Component {
super(props, context);
this.state = {
- isAddImportExclusionModalOpen: false
+ isAddImportListExclusionModalOpen: false
};
}
//
// Listeners
- onAddImportExclusionPress = () => {
- this.setState({ isAddImportExclusionModalOpen: true });
+ onAddImportListExclusionPress = () => {
+ this.setState({ isAddImportListExclusionModalOpen: true });
};
onModalClose = () => {
- this.setState({ isAddImportExclusionModalOpen: false });
+ this.setState({ isAddImportListExclusionModalOpen: false });
};
//
@@ -40,7 +40,7 @@ class ImportListExclusions extends Component {
render() {
const {
items,
- onConfirmDeleteImportExclusion,
+ onConfirmDeleteImportListExclusion,
...otherProps
} = this.props;
@@ -71,24 +71,24 @@ class ImportListExclusions extends Component {
{...item}
{...otherProps}
index={index}
- onConfirmDeleteImportExclusion={onConfirmDeleteImportExclusion}
+ onConfirmDeleteImportListExclusion={onConfirmDeleteImportListExclusion}
/>
);
})
}
-
+
@@ -102,7 +102,7 @@ ImportListExclusions.propTypes = {
isFetching: PropTypes.bool.isRequired,
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
- onConfirmDeleteImportExclusion: PropTypes.func.isRequired
+ onConfirmDeleteImportListExclusion: PropTypes.func.isRequired
};
export default ImportListExclusions;
diff --git a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionsConnector.js b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionsConnector.js
index ffb3d1f53..184788cec 100644
--- a/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionsConnector.js
+++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionsConnector.js
@@ -2,39 +2,39 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
-import { deleteImportExclusion, fetchImportExclusions } from 'Store/Actions/settingsActions';
+import { deleteImportListExclusion, fetchImportListExclusions } from 'Store/Actions/settingsActions';
import ImportListExclusions from './ImportListExclusions';
function createMapStateToProps() {
return createSelector(
- (state) => state.settings.importExclusions,
- (importExclusions) => {
+ (state) => state.settings.importListExclusions,
+ (importListExclusions) => {
return {
- ...importExclusions
+ ...importListExclusions
};
}
);
}
const mapDispatchToProps = {
- fetchImportExclusions,
- deleteImportExclusion
+ fetchImportListExclusions,
+ deleteImportListExclusion
};
-class ImportExclusionsConnector extends Component {
+class ImportListExclusionsConnector extends Component {
//
// Lifecycle
componentDidMount() {
- this.props.fetchImportExclusions();
+ this.props.fetchImportListExclusions();
}
//
// Listeners
- onConfirmDeleteImportExclusion = (id) => {
- this.props.deleteImportExclusion({ id });
+ onConfirmDeleteImportListExclusion = (id) => {
+ this.props.deleteImportListExclusion({ id });
};
//
@@ -45,15 +45,15 @@ class ImportExclusionsConnector extends Component {
);
}
}
-ImportExclusionsConnector.propTypes = {
- fetchImportExclusions: PropTypes.func.isRequired,
- deleteImportExclusion: PropTypes.func.isRequired
+ImportListExclusionsConnector.propTypes = {
+ fetchImportListExclusions: PropTypes.func.isRequired,
+ deleteImportListExclusion: PropTypes.func.isRequired
};
-export default connect(createMapStateToProps, mapDispatchToProps)(ImportExclusionsConnector);
+export default connect(createMapStateToProps, mapDispatchToProps)(ImportListExclusionsConnector);
diff --git a/frontend/src/Settings/ImportLists/ImportListSettings.js b/frontend/src/Settings/ImportLists/ImportListSettings.js
index 1c3478efe..4244ba083 100644
--- a/frontend/src/Settings/ImportLists/ImportListSettings.js
+++ b/frontend/src/Settings/ImportLists/ImportListSettings.js
@@ -60,7 +60,7 @@ class ImportListSettings extends Component {
render() {
const {
isTestingAll,
- dispatchTestAllImportList
+ dispatchTestAllImportLists
} = this.props;
const {
@@ -82,7 +82,7 @@ class ImportListSettings extends Component {
label={translate('TestAllLists')}
iconName={icons.TEST}
isSpinning={isTestingAll}
- onPress={dispatchTestAllImportList}
+ onPress={dispatchTestAllImportLists}
/>
-
+
{
listGroups[key].map((list) => {
return (
diff --git a/frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContentConnector.js b/frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContentConnector.js
index 0ef726f22..99e1fbead 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContentConnector.js
+++ b/frontend/src/Settings/ImportLists/ImportLists/AddImportListModalContentConnector.js
@@ -51,7 +51,7 @@ class AddImportListModalContentConnector extends Component {
onImportListSelect = ({ implementation, implementationName, name, minRefreshInterval }) => {
this.props.selectImportListSchema({ implementation, implementationName, presetName: name, minRefreshInterval });
- this.props.onModalClose({ importListSelected: true });
+ this.props.onModalClose({ listSelected: true });
};
//
diff --git a/frontend/src/Settings/ImportLists/ImportLists/ImportList.css b/frontend/src/Settings/ImportLists/ImportLists/ImportList.css
index d73c6a521..4796748f7 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/ImportList.css
+++ b/frontend/src/Settings/ImportLists/ImportLists/ImportList.css
@@ -1,4 +1,4 @@
-.importList {
+.list {
composes: card from '~Components/Card.css';
width: 290px;
diff --git a/frontend/src/Settings/ImportLists/ImportLists/ImportList.css.d.ts b/frontend/src/Settings/ImportLists/ImportLists/ImportList.css.d.ts
index 63c25fa0f..a0f1a4158 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/ImportList.css.d.ts
+++ b/frontend/src/Settings/ImportLists/ImportLists/ImportList.css.d.ts
@@ -2,7 +2,7 @@
// Please do not change this file!
interface CssExports {
'enabled': string;
- 'importList': string;
+ 'list': string;
'name': string;
}
export const cssExports: CssExports;
diff --git a/frontend/src/Settings/ImportLists/ImportLists/ImportList.js b/frontend/src/Settings/ImportLists/ImportLists/ImportList.js
index 414fd8213..bc5182393 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/ImportList.js
+++ b/frontend/src/Settings/ImportLists/ImportLists/ImportList.js
@@ -63,7 +63,7 @@ class ImportList extends Component {
return (
diff --git a/frontend/src/Settings/ImportLists/ImportLists/ImportLists.css b/frontend/src/Settings/ImportLists/ImportLists/ImportLists.css
index 30237985e..e704fc568 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/ImportLists.css
+++ b/frontend/src/Settings/ImportLists/ImportLists/ImportLists.css
@@ -1,10 +1,10 @@
-.importLists {
+.lists {
display: flex;
flex-wrap: wrap;
}
-.addImportList {
- composes: importList from '~./ImportList.css';
+.addList {
+ composes: list from '~./ImportList.css';
background-color: var(--cardAlternateBackgroundColor);
color: var(--gray);
diff --git a/frontend/src/Settings/ImportLists/ImportLists/ImportLists.css.d.ts b/frontend/src/Settings/ImportLists/ImportLists/ImportLists.css.d.ts
index 207dcd359..6f9717f8a 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/ImportLists.css.d.ts
+++ b/frontend/src/Settings/ImportLists/ImportLists/ImportLists.css.d.ts
@@ -1,9 +1,9 @@
// This file is automatically generated.
// Please do not change this file!
interface CssExports {
- 'addImportList': string;
+ 'addList': string;
'center': string;
- 'importLists': string;
+ 'lists': string;
}
export const cssExports: CssExports;
export default cssExports;
diff --git a/frontend/src/Settings/ImportLists/ImportLists/ImportLists.js b/frontend/src/Settings/ImportLists/ImportLists/ImportLists.js
index 941964c8f..11fcceb54 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/ImportLists.js
+++ b/frontend/src/Settings/ImportLists/ImportLists/ImportLists.js
@@ -32,10 +32,10 @@ class ImportLists extends Component {
this.setState({ isAddImportListModalOpen: true });
};
- onAddImportListModalClose = ({ importListSelected = false } = {}) => {
+ onAddImportListModalClose = ({ listSelected = false } = {}) => {
this.setState({
isAddImportListModalOpen: false,
- isEditImportListModalOpen: importListSelected
+ isEditImportListModalOpen: listSelected
});
};
@@ -64,7 +64,7 @@ class ImportLists extends Component {
errorMessage={translate('ImportListsLoadError')}
{...otherProps}
>
-
+
{
items.map((item) => {
return (
@@ -78,7 +78,7 @@ class ImportLists extends Component {
}
diff --git a/frontend/src/Store/Actions/Settings/importExclusions.js b/frontend/src/Store/Actions/Settings/importExclusions.js
deleted file mode 100644
index 17812fa8f..000000000
--- a/frontend/src/Store/Actions/Settings/importExclusions.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import { createAction } from 'redux-actions';
-import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
-import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler';
-import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler';
-import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
-import { createThunk } from 'Store/thunks';
-
-//
-// Variables
-
-const section = 'settings.importExclusions';
-
-//
-// Actions Types
-
-export const FETCH_IMPORT_EXCLUSIONS = 'settings/importExclusions/fetchImportExclusions';
-export const SAVE_IMPORT_EXCLUSION = 'settings/importExclusions/saveImportExclusion';
-export const DELETE_IMPORT_EXCLUSION = 'settings/importExclusions/deleteImportExclusion';
-export const SET_IMPORT_EXCLUSION_VALUE = 'settings/importExclusions/setImportExclusionValue';
-
-//
-// Action Creators
-
-export const fetchImportExclusions = createThunk(FETCH_IMPORT_EXCLUSIONS);
-
-export const saveImportExclusion = createThunk(SAVE_IMPORT_EXCLUSION);
-export const deleteImportExclusion = createThunk(DELETE_IMPORT_EXCLUSION);
-
-export const setImportExclusionValue = createAction(SET_IMPORT_EXCLUSION_VALUE, (payload) => {
- return {
- section,
- ...payload
- };
-});
-
-//
-// Details
-
-export default {
-
- //
- // State
-
- defaultState: {
- isFetching: false,
- isPopulated: false,
- error: null,
- items: [],
- isSaving: false,
- saveError: null,
- pendingChanges: {}
- },
-
- //
- // Action Handlers
-
- actionHandlers: {
- [FETCH_IMPORT_EXCLUSIONS]: createFetchHandler(section, '/exclusions'),
-
- [SAVE_IMPORT_EXCLUSION]: createSaveProviderHandler(section, '/exclusions'),
- [DELETE_IMPORT_EXCLUSION]: createRemoveItemHandler(section, '/exclusions')
- },
-
- //
- // Reducers
-
- reducers: {
- [SET_IMPORT_EXCLUSION_VALUE]: createSetSettingValueReducer(section)
- }
-
-};
diff --git a/frontend/src/Store/Actions/Settings/importListExclusions.js b/frontend/src/Store/Actions/Settings/importListExclusions.js
new file mode 100644
index 000000000..e02db83ab
--- /dev/null
+++ b/frontend/src/Store/Actions/Settings/importListExclusions.js
@@ -0,0 +1,71 @@
+import { createAction } from 'redux-actions';
+import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
+import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler';
+import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler';
+import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
+import { createThunk } from 'Store/thunks';
+
+//
+// Variables
+
+const section = 'settings.importListExclusions';
+
+//
+// Actions Types
+
+export const FETCH_IMPORT_LIST_EXCLUSIONS = 'settings/importListExclusions/fetchImportListExclusions';
+export const SAVE_IMPORT_LIST_EXCLUSION = 'settings/importListExclusions/saveImportListExclusion';
+export const DELETE_IMPORT_LIST_EXCLUSION = 'settings/importListExclusions/deleteImportListExclusion';
+export const SET_IMPORT_LIST_EXCLUSION_VALUE = 'settings/importListExclusions/setImportListExclusionValue';
+
+//
+// Action Creators
+
+export const fetchImportListExclusions = createThunk(FETCH_IMPORT_LIST_EXCLUSIONS);
+
+export const saveImportListExclusion = createThunk(SAVE_IMPORT_LIST_EXCLUSION);
+export const deleteImportListExclusion = createThunk(DELETE_IMPORT_LIST_EXCLUSION);
+
+export const setImportListExclusionValue = createAction(SET_IMPORT_LIST_EXCLUSION_VALUE, (payload) => {
+ return {
+ section,
+ ...payload
+ };
+});
+
+//
+// Details
+
+export default {
+
+ //
+ // State
+
+ defaultState: {
+ isFetching: false,
+ isPopulated: false,
+ error: null,
+ items: [],
+ isSaving: false,
+ saveError: null,
+ pendingChanges: {}
+ },
+
+ //
+ // Action Handlers
+
+ actionHandlers: {
+ [FETCH_IMPORT_LIST_EXCLUSIONS]: createFetchHandler(section, '/exclusions'),
+
+ [SAVE_IMPORT_LIST_EXCLUSION]: createSaveProviderHandler(section, '/exclusions'),
+ [DELETE_IMPORT_LIST_EXCLUSION]: createRemoveItemHandler(section, '/exclusions')
+ },
+
+ //
+ // Reducers
+
+ reducers: {
+ [SET_IMPORT_LIST_EXCLUSION_VALUE]: createSetSettingValueReducer(section)
+ }
+
+};
diff --git a/frontend/src/Store/Actions/Settings/importLists.js b/frontend/src/Store/Actions/Settings/importLists.js
index 2daccdde7..aaee9fa22 100644
--- a/frontend/src/Store/Actions/Settings/importLists.js
+++ b/frontend/src/Store/Actions/Settings/importLists.js
@@ -30,10 +30,10 @@ export const CANCEL_SAVE_IMPORT_LIST = 'settings/importLists/cancelSaveImportLis
export const DELETE_IMPORT_LIST = 'settings/importLists/deleteImportList';
export const TEST_IMPORT_LIST = 'settings/importLists/testImportList';
export const CANCEL_TEST_IMPORT_LIST = 'settings/importLists/cancelTestImportList';
-export const TEST_ALL_IMPORT_LIST = 'settings/importLists/testAllImportList';
+export const TEST_ALL_IMPORT_LISTS = 'settings/importLists/testAllImportLists';
-export const BULK_DELETE_IMPORT_LISTS = 'settings/importlists/bulkDeleteImportLists';
-export const BULK_EDIT_IMPORT_LISTS = 'settings/importlists/bulkEditImportLists';
+export const BULK_DELETE_IMPORT_LISTS = 'settings/importLists/bulkDeleteImportLists';
+export const BULK_EDIT_IMPORT_LISTS = 'settings/importLists/bulkEditImportLists';
//
// Action Creators
@@ -47,7 +47,7 @@ export const cancelSaveImportList = createThunk(CANCEL_SAVE_IMPORT_LIST);
export const deleteImportList = createThunk(DELETE_IMPORT_LIST);
export const testImportList = createThunk(TEST_IMPORT_LIST);
export const cancelTestImportList = createThunk(CANCEL_TEST_IMPORT_LIST);
-export const testAllImportList = createThunk(TEST_ALL_IMPORT_LIST);
+export const testAllImportLists = createThunk(TEST_ALL_IMPORT_LISTS);
export const bulkDeleteImportLists = createThunk(BULK_DELETE_IMPORT_LISTS);
export const bulkEditImportLists = createThunk(BULK_EDIT_IMPORT_LISTS);
@@ -105,7 +105,7 @@ export default {
[DELETE_IMPORT_LIST]: createRemoveItemHandler(section, '/importlist'),
[TEST_IMPORT_LIST]: createTestProviderHandler(section, '/importlist'),
[CANCEL_TEST_IMPORT_LIST]: createCancelTestProviderHandler(section),
- [TEST_ALL_IMPORT_LIST]: createTestAllProvidersHandler(section, '/importlist'),
+ [TEST_ALL_IMPORT_LISTS]: createTestAllProvidersHandler(section, '/importlist'),
[BULK_DELETE_IMPORT_LISTS]: createBulkRemoveItemHandler(section, '/importlist/bulk'),
[BULK_EDIT_IMPORT_LISTS]: createBulkEditItemHandler(section, '/importlist/bulk')
diff --git a/frontend/src/Store/Actions/discoverMovieActions.js b/frontend/src/Store/Actions/discoverMovieActions.js
index f113e3d9e..295af8d25 100644
--- a/frontend/src/Store/Actions/discoverMovieActions.js
+++ b/frontend/src/Store/Actions/discoverMovieActions.js
@@ -543,7 +543,7 @@ export const SET_LIST_MOVIE_TABLE_OPTION = 'discoverMovie/setListMovieTableOptio
export const SET_LIST_MOVIE_POSTER_OPTION = 'discoverMovie/setListMoviePosterOption';
export const SET_LIST_MOVIE_OVERVIEW_OPTION = 'discoverMovie/setListMovieOverviewOption';
-export const ADD_IMPORT_EXCLUSIONS = 'discoverMovie/addImportExclusions';
+export const ADD_IMPORT_LIST_EXCLUSIONS = 'discoverMovie/addImportListExclusions';
//
// Action Creators
@@ -563,7 +563,7 @@ export const setListMovieTableOption = createAction(SET_LIST_MOVIE_TABLE_OPTION)
export const setListMoviePosterOption = createAction(SET_LIST_MOVIE_POSTER_OPTION);
export const setListMovieOverviewOption = createAction(SET_LIST_MOVIE_OVERVIEW_OPTION);
-export const addImportExclusions = createThunk(ADD_IMPORT_EXCLUSIONS);
+export const addImportListExclusions = createThunk(ADD_IMPORT_LIST_EXCLUSIONS);
export const setAddMovieValue = createAction(SET_ADD_MOVIE_VALUE, (payload) => {
return {
@@ -726,7 +726,7 @@ export const actionHandlers = handleThunks({
});
},
- [ADD_IMPORT_EXCLUSIONS]: function(getState, payload, dispatch) {
+ [ADD_IMPORT_LIST_EXCLUSIONS]: function(getState, payload, dispatch) {
const ids = payload.ids;
const items = getState().discoverMovie.items;
@@ -754,7 +754,7 @@ export const actionHandlers = handleThunks({
promise.done((data) => {
dispatch(batchActions([
- ...data.map((item) => updateItem({ section: 'settings.importExclusions', ...item })),
+ ...data.map((item) => updateItem({ section: 'settings.importListExclusions', ...item })),
...data.map((item) => updateItem({ section, id: item.tmdbId, isExcluded: true })),
diff --git a/frontend/src/Store/Actions/settingsActions.js b/frontend/src/Store/Actions/settingsActions.js
index afa649271..72ac92a5d 100644
--- a/frontend/src/Store/Actions/settingsActions.js
+++ b/frontend/src/Store/Actions/settingsActions.js
@@ -9,7 +9,7 @@ import delayProfiles from './Settings/delayProfiles';
import downloadClientOptions from './Settings/downloadClientOptions';
import downloadClients from './Settings/downloadClients';
import general from './Settings/general';
-import importExclusions from './Settings/importExclusions';
+import importListExclusions from './Settings/importListExclusions';
import importListOptions from './Settings/importListOptions';
import importLists from './Settings/importLists';
import indexerFlags from './Settings/indexerFlags';
@@ -36,13 +36,13 @@ export * from './Settings/delayProfiles';
export * from './Settings/downloadClients';
export * from './Settings/downloadClientOptions';
export * from './Settings/general';
+export * from './Settings/importListOptions';
+export * from './Settings/importLists';
+export * from './Settings/importListExclusions';
export * from './Settings/indexerFlags';
export * from './Settings/indexerOptions';
export * from './Settings/indexers';
export * from './Settings/languages';
-export * from './Settings/importExclusions';
-export * from './Settings/importListOptions';
-export * from './Settings/importLists';
export * from './Settings/mediaManagement';
export * from './Settings/metadata';
export * from './Settings/metadataOptions';
@@ -51,8 +51,8 @@ export * from './Settings/namingExamples';
export * from './Settings/notifications';
export * from './Settings/qualityDefinitions';
export * from './Settings/qualityProfiles';
-export * from './Settings/remotePathMappings';
export * from './Settings/releaseProfiles';
+export * from './Settings/remotePathMappings';
export * from './Settings/ui';
//
@@ -73,13 +73,13 @@ export const defaultState = {
downloadClients: downloadClients.defaultState,
downloadClientOptions: downloadClientOptions.defaultState,
general: general.defaultState,
+ importLists: importLists.defaultState,
+ importListExclusions: importListExclusions.defaultState,
+ importListOptions: importListOptions.defaultState,
indexerFlags: indexerFlags.defaultState,
indexerOptions: indexerOptions.defaultState,
indexers: indexers.defaultState,
languages: languages.defaultState,
- importExclusions: importExclusions.defaultState,
- importListOptions: importListOptions.defaultState,
- importLists: importLists.defaultState,
mediaManagement: mediaManagement.defaultState,
metadata: metadata.defaultState,
metadataOptions: metadataOptions.defaultState,
@@ -88,8 +88,8 @@ export const defaultState = {
notifications: notifications.defaultState,
qualityDefinitions: qualityDefinitions.defaultState,
qualityProfiles: qualityProfiles.defaultState,
- remotePathMappings: remotePathMappings.defaultState,
releaseProfiles: releaseProfiles.defaultState,
+ remotePathMappings: remotePathMappings.defaultState,
ui: ui.defaultState
};
@@ -119,13 +119,13 @@ export const actionHandlers = handleThunks({
...downloadClients.actionHandlers,
...downloadClientOptions.actionHandlers,
...general.actionHandlers,
+ ...importLists.actionHandlers,
+ ...importListExclusions.actionHandlers,
+ ...importListOptions.actionHandlers,
...indexerFlags.actionHandlers,
...indexerOptions.actionHandlers,
...indexers.actionHandlers,
...languages.actionHandlers,
- ...importExclusions.actionHandlers,
- ...importListOptions.actionHandlers,
- ...importLists.actionHandlers,
...mediaManagement.actionHandlers,
...metadata.actionHandlers,
...metadataOptions.actionHandlers,
@@ -134,8 +134,8 @@ export const actionHandlers = handleThunks({
...notifications.actionHandlers,
...qualityDefinitions.actionHandlers,
...qualityProfiles.actionHandlers,
- ...remotePathMappings.actionHandlers,
...releaseProfiles.actionHandlers,
+ ...remotePathMappings.actionHandlers,
...ui.actionHandlers
});
@@ -156,13 +156,13 @@ export const reducers = createHandleActions({
...downloadClients.reducers,
...downloadClientOptions.reducers,
...general.reducers,
+ ...importLists.reducers,
+ ...importListExclusions.reducers,
+ ...importListOptions.reducers,
...indexerFlags.reducers,
...indexerOptions.reducers,
...indexers.reducers,
...languages.reducers,
- ...importExclusions.reducers,
- ...importListOptions.reducers,
- ...importLists.reducers,
...mediaManagement.reducers,
...metadata.reducers,
...metadataOptions.reducers,
@@ -171,8 +171,8 @@ export const reducers = createHandleActions({
...notifications.reducers,
...qualityDefinitions.reducers,
...qualityProfiles.reducers,
- ...remotePathMappings.reducers,
...releaseProfiles.reducers,
+ ...remotePathMappings.reducers,
...ui.reducers
}, defaultState, section);
diff --git a/frontend/src/Store/Selectors/createExclusionMovieSelector.js b/frontend/src/Store/Selectors/createExclusionMovieSelector.js
index 20365e9b5..0e5919071 100644
--- a/frontend/src/Store/Selectors/createExclusionMovieSelector.js
+++ b/frontend/src/Store/Selectors/createExclusionMovieSelector.js
@@ -4,9 +4,9 @@ import { createSelector } from 'reselect';
function createExclusionMovieSelector() {
return createSelector(
(state, { tmdbId }) => tmdbId,
- (state) => state.settings.importExclusions,
- (tmdbId, importExclusions) => {
- return _.some(importExclusions.items, { tmdbId });
+ (state) => state.settings.importListExclusions,
+ (tmdbId, importListExclusions) => {
+ return _.some(importListExclusions.items, { tmdbId });
}
);
}