From 48d1d47b67ded6b50114f1f6e32c6a2f6632713e Mon Sep 17 00:00:00 2001 From: Qstick <qstick@gmail.com> Date: Mon, 20 Dec 2021 20:13:25 -0600 Subject: [PATCH] Rename ImportExclusions to ImportListExclusions --- .../EditImportListExclusionModal.js} | 10 +++++----- .../EditImportListExclusionModalConnector.js} | 10 +++++----- .../EditImportListExclusionModalContent.css} | 0 .../EditImportListExclusionModalContent.js} | 8 ++++---- ...tImportListExclusionModalContentConnector.js} | 4 ++-- .../ImportListExclusion.css} | 0 .../ImportListExclusion.js} | 14 +++++++------- .../ImportListExclusions.css} | 0 .../ImportListExclusions.js} | 16 ++++++++-------- .../ImportListExclusionsConnector.js} | 4 ++-- .../Settings/ImportLists/ImportListSettings.js | 4 ++-- 11 files changed, 35 insertions(+), 35 deletions(-) rename frontend/src/Settings/ImportLists/{ImportExclusions/EditImportExclusionModal.js => ImportListExclusions/EditImportListExclusionModal.js} (56%) rename frontend/src/Settings/ImportLists/{ImportExclusions/EditImportExclusionModalConnector.js => ImportListExclusions/EditImportListExclusionModalConnector.js} (73%) rename frontend/src/Settings/ImportLists/{ImportExclusions/EditImportExclusionModalContent.css => ImportListExclusions/EditImportListExclusionModalContent.css} (100%) rename frontend/src/Settings/ImportLists/{ImportExclusions/EditImportExclusionModalContent.js => ImportListExclusions/EditImportListExclusionModalContent.js} (94%) rename frontend/src/Settings/ImportLists/{ImportExclusions/EditImportExclusionModalContentConnector.js => ImportListExclusions/EditImportListExclusionModalContentConnector.js} (95%) rename frontend/src/Settings/ImportLists/{ImportExclusions/ImportExclusion.css => ImportListExclusions/ImportListExclusion.css} (100%) rename frontend/src/Settings/ImportLists/{ImportExclusions/ImportExclusion.js => ImportListExclusions/ImportListExclusion.js} (89%) rename frontend/src/Settings/ImportLists/{ImportExclusions/ImportExclusions.css => ImportListExclusions/ImportListExclusions.css} (100%) rename frontend/src/Settings/ImportLists/{ImportExclusions/ImportExclusions.js => ImportListExclusions/ImportListExclusions.js} (85%) rename frontend/src/Settings/ImportLists/{ImportExclusions/ImportExclusionsConnector.js => ImportListExclusions/ImportListExclusionsConnector.js} (93%) diff --git a/frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModal.js b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModal.js similarity index 56% rename from frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModal.js rename to frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModal.js index 9d140de43..57a7b0e2d 100644 --- a/frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModal.js +++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModal.js @@ -2,16 +2,16 @@ import PropTypes from 'prop-types'; import React from 'react'; import Modal from 'Components/Modal/Modal'; import { sizes } from 'Helpers/Props'; -import EditImportExclusionModalContentConnector from './EditImportExclusionModalContentConnector'; +import EditImportListExclusionModalContentConnector from './EditImportListExclusionModalContentConnector'; -function EditImportExclusionModal({ isOpen, onModalClose, ...otherProps }) { +function EditImportListExclusionModal({ isOpen, onModalClose, ...otherProps }) { return ( <Modal size={sizes.MEDIUM} isOpen={isOpen} onModalClose={onModalClose} > - <EditImportExclusionModalContentConnector + <EditImportListExclusionModalContentConnector {...otherProps} onModalClose={onModalClose} /> @@ -19,9 +19,9 @@ function EditImportExclusionModal({ isOpen, onModalClose, ...otherProps }) { ); } -EditImportExclusionModal.propTypes = { +EditImportListExclusionModal.propTypes = { isOpen: PropTypes.bool.isRequired, onModalClose: PropTypes.func.isRequired }; -export default EditImportExclusionModal; +export default EditImportListExclusionModal; diff --git a/frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalConnector.js b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalConnector.js similarity index 73% rename from frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalConnector.js rename to frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalConnector.js index f7e6dee80..31a026b44 100644 --- a/frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalConnector.js +++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalConnector.js @@ -2,7 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import { connect } from 'react-redux'; import { clearPendingChanges } from 'Store/Actions/baseActions'; -import EditImportExclusionModal from './EditImportExclusionModal'; +import EditImportListExclusionModal from './EditImportListExclusionModal'; function mapStateToProps() { return {}; @@ -12,7 +12,7 @@ const mapDispatchToProps = { clearPendingChanges }; -class EditImportExclusionModalConnector extends Component { +class EditImportListExclusionModalConnector extends Component { // // Listeners @@ -27,7 +27,7 @@ class EditImportExclusionModalConnector extends Component { render() { return ( - <EditImportExclusionModal + <EditImportListExclusionModal {...this.props} onModalClose={this.onModalClose} /> @@ -35,9 +35,9 @@ class EditImportExclusionModalConnector extends Component { } } -EditImportExclusionModalConnector.propTypes = { +EditImportListExclusionModalConnector.propTypes = { onModalClose: PropTypes.func.isRequired, clearPendingChanges: PropTypes.func.isRequired }; -export default connect(mapStateToProps, mapDispatchToProps)(EditImportExclusionModalConnector); +export default connect(mapStateToProps, mapDispatchToProps)(EditImportListExclusionModalConnector); diff --git a/frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalContent.css b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.css similarity index 100% rename from frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalContent.css rename to frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.css diff --git a/frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalContent.js b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js similarity index 94% rename from frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalContent.js rename to frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js index a9213bd97..87fcad6e1 100644 --- a/frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalContent.js +++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js @@ -13,9 +13,9 @@ import ModalFooter from 'Components/Modal/ModalFooter'; import ModalHeader from 'Components/Modal/ModalHeader'; import { inputTypes, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; -import styles from './EditImportExclusionModalContent.css'; +import styles from './EditImportListExclusionModalContent.css'; -function EditImportExclusionModalContent(props) { +function EditImportListExclusionModalContent(props) { const { id, isFetching, @@ -130,7 +130,7 @@ function EditImportExclusionModalContent(props) { ); } -EditImportExclusionModalContent.propTypes = { +EditImportListExclusionModalContent.propTypes = { id: PropTypes.number, isFetching: PropTypes.bool.isRequired, error: PropTypes.object, @@ -143,4 +143,4 @@ EditImportExclusionModalContent.propTypes = { onDeleteImportExclusionPress: PropTypes.func }; -export default EditImportExclusionModalContent; +export default EditImportListExclusionModalContent; diff --git a/frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalContentConnector.js b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContentConnector.js similarity index 95% rename from frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalContentConnector.js rename to frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContentConnector.js index 70ea1d873..175a10abb 100644 --- a/frontend/src/Settings/ImportLists/ImportExclusions/EditImportExclusionModalContentConnector.js +++ b/frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContentConnector.js @@ -5,7 +5,7 @@ import { connect } from 'react-redux'; import { createSelector } from 'reselect'; import { saveImportExclusion, setImportExclusionValue } from 'Store/Actions/settingsActions'; import selectSettings from 'Store/Selectors/selectSettings'; -import EditImportExclusionModalContent from './EditImportExclusionModalContent'; +import EditImportListExclusionModalContent from './EditImportListExclusionModalContent'; const newImportExclusion = { movieTitle: '', @@ -97,7 +97,7 @@ class EditImportExclusionModalContentConnector extends Component { render() { return ( - <EditImportExclusionModalContent + <EditImportListExclusionModalContent {...this.props} onSavePress={this.onSavePress} onInputChange={this.onInputChange} diff --git a/frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusion.css b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css similarity index 100% rename from frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusion.css rename to frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.css diff --git a/frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusion.js b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.js similarity index 89% rename from frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusion.js rename to frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.js index c3a8ea79f..5e80981cd 100644 --- a/frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusion.js +++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusion.js @@ -6,10 +6,10 @@ import Link from 'Components/Link/Link'; import ConfirmModal from 'Components/Modal/ConfirmModal'; import { icons, kinds } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; -import EditImportExclusionModalConnector from './EditImportExclusionModalConnector'; -import styles from './ImportExclusion.css'; +import EditImportListExclusionModalConnector from './EditImportListExclusionModalConnector'; +import styles from './ImportListExclusion.css'; -class ImportExclusion extends Component { +class ImportListExclusion extends Component { // // Lifecycle @@ -78,7 +78,7 @@ class ImportExclusion extends Component { </Link> </div> - <EditImportExclusionModalConnector + <EditImportListExclusionModalConnector id={id} isOpen={this.state.isEditImportExclusionModalOpen} onModalClose={this.onEditImportExclusionModalClose} @@ -99,7 +99,7 @@ class ImportExclusion extends Component { } } -ImportExclusion.propTypes = { +ImportListExclusion.propTypes = { id: PropTypes.number.isRequired, movieTitle: PropTypes.string.isRequired, tmdbId: PropTypes.number.isRequired, @@ -107,9 +107,9 @@ ImportExclusion.propTypes = { onConfirmDeleteImportExclusion: PropTypes.func.isRequired }; -ImportExclusion.defaultProps = { +ImportListExclusion.defaultProps = { // The drag preview will not connect the drag handle. connectDragSource: (node) => node }; -export default ImportExclusion; +export default ImportListExclusion; diff --git a/frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusions.css b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css similarity index 100% rename from frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusions.css rename to frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.css diff --git a/frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusions.js b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.js similarity index 85% rename from frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusions.js rename to frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.js index d2ec7acfd..1d1f0ed54 100644 --- a/frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusions.js +++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusions.js @@ -6,11 +6,11 @@ import Link from 'Components/Link/Link'; import PageSectionContent from 'Components/Page/PageSectionContent'; import { icons } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; -import EditImportExclusionModalConnector from './EditImportExclusionModalConnector'; -import ImportExclusion from './ImportExclusion'; -import styles from './ImportExclusions.css'; +import EditImportListExclusionModalConnector from './EditImportListExclusionModalConnector'; +import ImportListExclusion from './ImportListExclusion'; +import styles from './ImportListExclusions.css'; -class ImportExclusions extends Component { +class ImportListExclusions extends Component { // // Lifecycle @@ -60,7 +60,7 @@ class ImportExclusions extends Component { { items.map((item, index) => { return ( - <ImportExclusion + <ImportListExclusion key={item.id} {...item} {...otherProps} @@ -81,7 +81,7 @@ class ImportExclusions extends Component { </Link> </div> - <EditImportExclusionModalConnector + <EditImportListExclusionModalConnector isOpen={this.state.isAddImportExclusionModalOpen} onModalClose={this.onModalClose} /> @@ -92,11 +92,11 @@ class ImportExclusions extends Component { } } -ImportExclusions.propTypes = { +ImportListExclusions.propTypes = { isFetching: PropTypes.bool.isRequired, error: PropTypes.object, items: PropTypes.arrayOf(PropTypes.object).isRequired, onConfirmDeleteImportExclusion: PropTypes.func.isRequired }; -export default ImportExclusions; +export default ImportListExclusions; diff --git a/frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusionsConnector.js b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionsConnector.js similarity index 93% rename from frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusionsConnector.js rename to frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionsConnector.js index 4cf7320a8..ebef09332 100644 --- a/frontend/src/Settings/ImportLists/ImportExclusions/ImportExclusionsConnector.js +++ b/frontend/src/Settings/ImportLists/ImportListExclusions/ImportListExclusionsConnector.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import { connect } from 'react-redux'; import { createSelector } from 'reselect'; import { deleteImportExclusion, fetchImportExclusions } from 'Store/Actions/settingsActions'; -import ImportExclusions from './ImportExclusions'; +import ImportListExclusions from './ImportListExclusions'; function createMapStateToProps() { return createSelector( @@ -42,7 +42,7 @@ class ImportExclusionsConnector extends Component { render() { return ( - <ImportExclusions + <ImportListExclusions {...this.state} {...this.props} onConfirmDeleteImportExclusion={this.onConfirmDeleteImportExclusion} diff --git a/frontend/src/Settings/ImportLists/ImportListSettings.js b/frontend/src/Settings/ImportLists/ImportListSettings.js index 62a96ecf9..74b3acfa4 100644 --- a/frontend/src/Settings/ImportLists/ImportListSettings.js +++ b/frontend/src/Settings/ImportLists/ImportListSettings.js @@ -7,7 +7,7 @@ import PageToolbarSeparator from 'Components/Page/Toolbar/PageToolbarSeparator'; import { icons } from 'Helpers/Props'; import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector'; import translate from 'Utilities/String/translate'; -import ImportExclusionsConnector from './ImportExclusions/ImportExclusionsConnector'; +import ImportListExclusionsConnector from './ImportListExclusions/ImportListExclusionsConnector'; import ImportListsConnector from './ImportLists/ImportListsConnector'; import ImportListOptionsConnector from './Options/ImportListOptionsConnector'; @@ -86,7 +86,7 @@ class ImportListSettings extends Component { onChildStateChange={this.onChildStateChange} /> - <ImportExclusionsConnector /> + <ImportListExclusionsConnector /> </PageContentBody> </PageContent>