From 8fa6e5ec6dfc6063494ca380114694a632639aea Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 9 Apr 2022 21:52:46 -0700 Subject: [PATCH] Fixed: Use Manage Episodes instead of Manual Import for title when managing episodes for a series --- .../Episode/SelectEpisodeModalContent.js | 4 +++- .../InteractiveImportSelectFolderModalContent.js | 4 +++- .../Interactive/InteractiveImportModalContent.js | 11 ++++++++++- .../Interactive/InteractiveImportRow.js | 10 +++++++++- .../src/InteractiveImport/InteractiveImportModal.js | 5 +++++ .../Language/SelectLanguageModalContent.js | 4 +++- .../Quality/SelectQualityModalContent.js | 4 +++- .../ReleaseGroup/SelectReleaseGroupModalContent.js | 4 +++- .../Season/SelectSeasonModalContent.js | 4 +++- .../Series/SelectSeriesModalContent.js | 4 +++- frontend/src/Series/Details/SeriesDetails.js | 1 + 11 files changed, 46 insertions(+), 9 deletions(-) diff --git a/frontend/src/InteractiveImport/Episode/SelectEpisodeModalContent.js b/frontend/src/InteractiveImport/Episode/SelectEpisodeModalContent.js index 2dd47e0c4..647799d93 100644 --- a/frontend/src/InteractiveImport/Episode/SelectEpisodeModalContent.js +++ b/frontend/src/InteractiveImport/Episode/SelectEpisodeModalContent.js @@ -96,6 +96,7 @@ class SelectEpisodeModalContent extends Component { isAnime, sortKey, sortDirection, + modalTitle, onSortPress, onModalClose } = this.props; @@ -121,7 +122,7 @@ class SelectEpisodeModalContent extends Component {
- Manual Import - Select Episode(s) + {modalTitle} - Select Episode(s)
@@ -235,6 +236,7 @@ SelectEpisodeModalContent.propTypes = { isAnime: PropTypes.bool.isRequired, sortKey: PropTypes.string, sortDirection: PropTypes.string, + modalTitle: PropTypes.string, onSortPress: PropTypes.func.isRequired, onEpisodesSelect: PropTypes.func.isRequired, onModalClose: PropTypes.func.isRequired diff --git a/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js b/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js index 0a7c9dbdd..dcbf5c7f7 100644 --- a/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js +++ b/frontend/src/InteractiveImport/Folder/InteractiveImportSelectFolderModalContent.js @@ -67,6 +67,7 @@ class InteractiveImportSelectFolderModalContent extends Component { const { recentFolders, onRemoveRecentFolderPress, + modalTitle, onModalClose } = this.props; @@ -75,7 +76,7 @@ class InteractiveImportSelectFolderModalContent extends Component { return ( - Manual Import - Select Folder + {modalTitle} - Select Folder @@ -159,6 +160,7 @@ class InteractiveImportSelectFolderModalContent extends Component { InteractiveImportSelectFolderModalContent.propTypes = { recentFolders: PropTypes.arrayOf(PropTypes.object).isRequired, + modalTitle: PropTypes.string.isRequired, onQuickImportPress: PropTypes.func.isRequired, onInteractiveImportPress: PropTypes.func.isRequired, onRemoveRecentFolderPress: PropTypes.func.isRequired, diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js index 4ac8b89c4..dd4d1ab49 100644 --- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js +++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js @@ -250,6 +250,7 @@ class InteractiveImportModalContent extends Component { importMode, interactiveImportErrorMessage, isDeleting, + modalTitle, onSortPress, onModalClose } = this.props; @@ -299,7 +300,7 @@ class InteractiveImportModalContent extends Component { return ( - Manual Import - {title || folder} + {modalTitle} - {title || folder} @@ -375,6 +376,7 @@ class InteractiveImportModalContent extends Component { allowSeriesChange={allowSeriesChange} autoSelectRow={autoSelectRow} columns={this.state.columns} + modalTitle={modalTitle} onSelectedChange={this.onSelectedChange} onValidRowChange={this.onValidRowChange} /> @@ -452,6 +454,7 @@ class InteractiveImportModalContent extends Component { @@ -459,6 +462,7 @@ class InteractiveImportModalContent extends Component { isOpen={selectModalOpen === SEASON} ids={selectedIds} seriesId={selectedItem && selectedItem.series && selectedItem.series.id} + modalTitle={modalTitle} onModalClose={this.onSelectModalClose} /> @@ -467,6 +471,7 @@ class InteractiveImportModalContent extends Component { ids={orderedSelectedIds} seriesId={selectedItem && selectedItem.series && selectedItem.series.id} seasonNumber={selectedItem && selectedItem.seasonNumber} + modalTitle={modalTitle} onModalClose={this.onSelectModalClose} /> @@ -474,6 +479,7 @@ class InteractiveImportModalContent extends Component { isOpen={selectModalOpen === RELEASE_GROUP} ids={selectedIds} releaseGroup="" + modalTitle={modalTitle} onModalClose={this.onSelectModalClose} /> @@ -481,6 +487,7 @@ class InteractiveImportModalContent extends Component { isOpen={selectModalOpen === LANGUAGE} ids={selectedIds} languageId={0} + modalTitle={modalTitle} onModalClose={this.onSelectModalClose} /> @@ -490,6 +497,7 @@ class InteractiveImportModalContent extends Component { qualityId={0} proper={false} real={false} + modalTitle={modalTitle} onModalClose={this.onSelectModalClose} /> @@ -528,6 +536,7 @@ InteractiveImportModalContent.propTypes = { interactiveImportErrorMessage: PropTypes.string, isDeleting: PropTypes.bool.isRequired, deleteError: PropTypes.object, + modalTitle: PropTypes.string.isRequired, onSortPress: PropTypes.func.isRequired, onFilterExistingFilesChange: PropTypes.func.isRequired, onImportModeChange: PropTypes.func.isRequired, diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js index 27233dad5..e463ac874 100644 --- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js +++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js @@ -215,7 +215,8 @@ class InteractiveImportRow extends Component { size, rejections, isReprocessing, - isSelected + isSelected, + modalTitle } = this.props; const { @@ -396,6 +397,7 @@ class InteractiveImportRow extends Component { @@ -403,6 +405,7 @@ class InteractiveImportRow extends Component { isOpen={isSelectSeasonModalOpen} ids={[id]} seriesId={series && series.id} + modalTitle={modalTitle} onModalClose={this.onSelectSeasonModalClose} /> @@ -413,6 +416,7 @@ class InteractiveImportRow extends Component { isAnime={isAnime} seasonNumber={seasonNumber} relativePath={relativePath} + modalTitle={modalTitle} onModalClose={this.onSelectEpisodeModalClose} /> @@ -420,6 +424,7 @@ class InteractiveImportRow extends Component { isOpen={isSelectReleaseGroupModalOpen} ids={[id]} releaseGroup={releaseGroup ?? ''} + modalTitle={modalTitle} onModalClose={this.onSelectReleaseGroupModalClose} /> @@ -429,6 +434,7 @@ class InteractiveImportRow extends Component { qualityId={quality ? quality.quality.id : 0} proper={quality ? quality.revision.version > 1 : false} real={quality ? quality.revision.real > 0 : false} + modalTitle={modalTitle} onModalClose={this.onSelectQualityModalClose} /> @@ -436,6 +442,7 @@ class InteractiveImportRow extends Component { isOpen={isSelectLanguageModalOpen} ids={[id]} languageId={language ? language.id : 0} + modalTitle={modalTitle} onModalClose={this.onSelectLanguageModalClose} /> @@ -460,6 +467,7 @@ InteractiveImportRow.propTypes = { episodeFileId: PropTypes.number, isReprocessing: PropTypes.bool, isSelected: PropTypes.bool, + modalTitle: PropTypes.string.isRequired, onSelectedChange: PropTypes.func.isRequired, onValidRowChange: PropTypes.func.isRequired }; diff --git a/frontend/src/InteractiveImport/InteractiveImportModal.js b/frontend/src/InteractiveImport/InteractiveImportModal.js index 9b9b16afe..c5b3e776b 100644 --- a/frontend/src/InteractiveImport/InteractiveImportModal.js +++ b/frontend/src/InteractiveImport/InteractiveImportModal.js @@ -75,7 +75,12 @@ InteractiveImportModal.propTypes = { isOpen: PropTypes.bool.isRequired, folder: PropTypes.string, downloadId: PropTypes.string, + modalTitle: PropTypes.string.isRequired, onModalClose: PropTypes.func.isRequired }; +InteractiveImportModal.defaultProps = { + modalTitle: 'Manual Import' +}; + export default InteractiveImportModal; diff --git a/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js b/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js index ff99ce6bf..54dc556c6 100644 --- a/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js +++ b/frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js @@ -19,6 +19,7 @@ function SelectLanguageModalContent(props) { isPopulated, error, items, + modalTitle, onModalClose, onLanguageSelect } = props; @@ -33,7 +34,7 @@ function SelectLanguageModalContent(props) { return ( - Manual Import - Select Language + {modalTitle} - Select Language @@ -80,6 +81,7 @@ SelectLanguageModalContent.propTypes = { isPopulated: PropTypes.bool.isRequired, error: PropTypes.object, items: PropTypes.arrayOf(PropTypes.object).isRequired, + modalTitle: PropTypes.string.isRequired, onLanguageSelect: PropTypes.func.isRequired, onModalClose: PropTypes.func.isRequired }; diff --git a/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js b/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js index 642e0433e..ad72c7b03 100644 --- a/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js +++ b/frontend/src/InteractiveImport/Quality/SelectQualityModalContent.js @@ -61,6 +61,7 @@ class SelectQualityModalContent extends Component { isPopulated, error, items, + modalTitle, onModalClose } = this.props; @@ -80,7 +81,7 @@ class SelectQualityModalContent extends Component { return ( - Manual Import - Select Quality + {modalTitle} - Select Quality @@ -159,6 +160,7 @@ SelectQualityModalContent.propTypes = { isPopulated: PropTypes.bool.isRequired, error: PropTypes.object, items: PropTypes.arrayOf(PropTypes.object).isRequired, + modalTitle: PropTypes.string.isRequired, onQualitySelect: PropTypes.func.isRequired, onModalClose: PropTypes.func.isRequired }; diff --git a/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.js b/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.js index 371b876a9..c270d1c73 100644 --- a/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.js +++ b/frontend/src/InteractiveImport/ReleaseGroup/SelectReleaseGroupModalContent.js @@ -45,6 +45,7 @@ class SelectReleaseGroupModalContent extends Component { render() { const { + modalTitle, onModalClose } = this.props; @@ -55,7 +56,7 @@ class SelectReleaseGroupModalContent extends Component { return ( - Manual Import - Set Release Group + {modalTitle} - Set Release Group - Manual Import - Select Season + {modalTitle} - Select Season @@ -51,6 +52,7 @@ class SelectSeasonModalContent extends Component { SelectSeasonModalContent.propTypes = { items: PropTypes.arrayOf(PropTypes.object).isRequired, + modalTitle: PropTypes.string.isRequired, onSeasonSelect: PropTypes.func.isRequired, onModalClose: PropTypes.func.isRequired }; diff --git a/frontend/src/InteractiveImport/Series/SelectSeriesModalContent.js b/frontend/src/InteractiveImport/Series/SelectSeriesModalContent.js index 170a426e7..8c726e902 100644 --- a/frontend/src/InteractiveImport/Series/SelectSeriesModalContent.js +++ b/frontend/src/InteractiveImport/Series/SelectSeriesModalContent.js @@ -37,6 +37,7 @@ class SelectSeriesModalContent extends Component { render() { const { items, + modalTitle, onSeriesSelect, onModalClose } = this.props; @@ -47,7 +48,7 @@ class SelectSeriesModalContent extends Component { return ( - Manual Import - Select Series + {modalTitle} - Select Series