1
0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-11-24 08:42:19 +02:00

Fixed: Use Manage Episodes instead of Manual Import for title when managing episodes for a series

This commit is contained in:
Mark McDowall 2022-04-09 21:52:46 -07:00
parent d376ae2f9f
commit 8fa6e5ec6d
11 changed files with 46 additions and 9 deletions

View File

@ -96,6 +96,7 @@ class SelectEpisodeModalContent extends Component {
isAnime, isAnime,
sortKey, sortKey,
sortDirection, sortDirection,
modalTitle,
onSortPress, onSortPress,
onModalClose onModalClose
} = this.props; } = this.props;
@ -121,7 +122,7 @@ class SelectEpisodeModalContent extends Component {
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
<div className={styles.header}> <div className={styles.header}>
Manual Import - Select Episode(s) {modalTitle} - Select Episode(s)
</div> </div>
</ModalHeader> </ModalHeader>
@ -235,6 +236,7 @@ SelectEpisodeModalContent.propTypes = {
isAnime: PropTypes.bool.isRequired, isAnime: PropTypes.bool.isRequired,
sortKey: PropTypes.string, sortKey: PropTypes.string,
sortDirection: PropTypes.string, sortDirection: PropTypes.string,
modalTitle: PropTypes.string,
onSortPress: PropTypes.func.isRequired, onSortPress: PropTypes.func.isRequired,
onEpisodesSelect: PropTypes.func.isRequired, onEpisodesSelect: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired onModalClose: PropTypes.func.isRequired

View File

@ -67,6 +67,7 @@ class InteractiveImportSelectFolderModalContent extends Component {
const { const {
recentFolders, recentFolders,
onRemoveRecentFolderPress, onRemoveRecentFolderPress,
modalTitle,
onModalClose onModalClose
} = this.props; } = this.props;
@ -75,7 +76,7 @@ class InteractiveImportSelectFolderModalContent extends Component {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
Manual Import - Select Folder {modalTitle} - Select Folder
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>
@ -159,6 +160,7 @@ class InteractiveImportSelectFolderModalContent extends Component {
InteractiveImportSelectFolderModalContent.propTypes = { InteractiveImportSelectFolderModalContent.propTypes = {
recentFolders: PropTypes.arrayOf(PropTypes.object).isRequired, recentFolders: PropTypes.arrayOf(PropTypes.object).isRequired,
modalTitle: PropTypes.string.isRequired,
onQuickImportPress: PropTypes.func.isRequired, onQuickImportPress: PropTypes.func.isRequired,
onInteractiveImportPress: PropTypes.func.isRequired, onInteractiveImportPress: PropTypes.func.isRequired,
onRemoveRecentFolderPress: PropTypes.func.isRequired, onRemoveRecentFolderPress: PropTypes.func.isRequired,

View File

@ -250,6 +250,7 @@ class InteractiveImportModalContent extends Component {
importMode, importMode,
interactiveImportErrorMessage, interactiveImportErrorMessage,
isDeleting, isDeleting,
modalTitle,
onSortPress, onSortPress,
onModalClose onModalClose
} = this.props; } = this.props;
@ -299,7 +300,7 @@ class InteractiveImportModalContent extends Component {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
Manual Import - {title || folder} {modalTitle} - {title || folder}
</ModalHeader> </ModalHeader>
<ModalBody scrollDirection={scrollDirections.BOTH}> <ModalBody scrollDirection={scrollDirections.BOTH}>
@ -375,6 +376,7 @@ class InteractiveImportModalContent extends Component {
allowSeriesChange={allowSeriesChange} allowSeriesChange={allowSeriesChange}
autoSelectRow={autoSelectRow} autoSelectRow={autoSelectRow}
columns={this.state.columns} columns={this.state.columns}
modalTitle={modalTitle}
onSelectedChange={this.onSelectedChange} onSelectedChange={this.onSelectedChange}
onValidRowChange={this.onValidRowChange} onValidRowChange={this.onValidRowChange}
/> />
@ -452,6 +454,7 @@ class InteractiveImportModalContent extends Component {
<SelectSeriesModal <SelectSeriesModal
isOpen={selectModalOpen === SERIES} isOpen={selectModalOpen === SERIES}
ids={selectedIds} ids={selectedIds}
modalTitle={modalTitle}
onModalClose={this.onSelectModalClose} onModalClose={this.onSelectModalClose}
/> />
@ -459,6 +462,7 @@ class InteractiveImportModalContent extends Component {
isOpen={selectModalOpen === SEASON} isOpen={selectModalOpen === SEASON}
ids={selectedIds} ids={selectedIds}
seriesId={selectedItem && selectedItem.series && selectedItem.series.id} seriesId={selectedItem && selectedItem.series && selectedItem.series.id}
modalTitle={modalTitle}
onModalClose={this.onSelectModalClose} onModalClose={this.onSelectModalClose}
/> />
@ -467,6 +471,7 @@ class InteractiveImportModalContent extends Component {
ids={orderedSelectedIds} ids={orderedSelectedIds}
seriesId={selectedItem && selectedItem.series && selectedItem.series.id} seriesId={selectedItem && selectedItem.series && selectedItem.series.id}
seasonNumber={selectedItem && selectedItem.seasonNumber} seasonNumber={selectedItem && selectedItem.seasonNumber}
modalTitle={modalTitle}
onModalClose={this.onSelectModalClose} onModalClose={this.onSelectModalClose}
/> />
@ -474,6 +479,7 @@ class InteractiveImportModalContent extends Component {
isOpen={selectModalOpen === RELEASE_GROUP} isOpen={selectModalOpen === RELEASE_GROUP}
ids={selectedIds} ids={selectedIds}
releaseGroup="" releaseGroup=""
modalTitle={modalTitle}
onModalClose={this.onSelectModalClose} onModalClose={this.onSelectModalClose}
/> />
@ -481,6 +487,7 @@ class InteractiveImportModalContent extends Component {
isOpen={selectModalOpen === LANGUAGE} isOpen={selectModalOpen === LANGUAGE}
ids={selectedIds} ids={selectedIds}
languageId={0} languageId={0}
modalTitle={modalTitle}
onModalClose={this.onSelectModalClose} onModalClose={this.onSelectModalClose}
/> />
@ -490,6 +497,7 @@ class InteractiveImportModalContent extends Component {
qualityId={0} qualityId={0}
proper={false} proper={false}
real={false} real={false}
modalTitle={modalTitle}
onModalClose={this.onSelectModalClose} onModalClose={this.onSelectModalClose}
/> />
@ -528,6 +536,7 @@ InteractiveImportModalContent.propTypes = {
interactiveImportErrorMessage: PropTypes.string, interactiveImportErrorMessage: PropTypes.string,
isDeleting: PropTypes.bool.isRequired, isDeleting: PropTypes.bool.isRequired,
deleteError: PropTypes.object, deleteError: PropTypes.object,
modalTitle: PropTypes.string.isRequired,
onSortPress: PropTypes.func.isRequired, onSortPress: PropTypes.func.isRequired,
onFilterExistingFilesChange: PropTypes.func.isRequired, onFilterExistingFilesChange: PropTypes.func.isRequired,
onImportModeChange: PropTypes.func.isRequired, onImportModeChange: PropTypes.func.isRequired,

View File

@ -215,7 +215,8 @@ class InteractiveImportRow extends Component {
size, size,
rejections, rejections,
isReprocessing, isReprocessing,
isSelected isSelected,
modalTitle
} = this.props; } = this.props;
const { const {
@ -396,6 +397,7 @@ class InteractiveImportRow extends Component {
<SelectSeriesModal <SelectSeriesModal
isOpen={isSelectSeriesModalOpen} isOpen={isSelectSeriesModalOpen}
ids={[id]} ids={[id]}
modalTitle={modalTitle}
onModalClose={this.onSelectSeriesModalClose} onModalClose={this.onSelectSeriesModalClose}
/> />
@ -403,6 +405,7 @@ class InteractiveImportRow extends Component {
isOpen={isSelectSeasonModalOpen} isOpen={isSelectSeasonModalOpen}
ids={[id]} ids={[id]}
seriesId={series && series.id} seriesId={series && series.id}
modalTitle={modalTitle}
onModalClose={this.onSelectSeasonModalClose} onModalClose={this.onSelectSeasonModalClose}
/> />
@ -413,6 +416,7 @@ class InteractiveImportRow extends Component {
isAnime={isAnime} isAnime={isAnime}
seasonNumber={seasonNumber} seasonNumber={seasonNumber}
relativePath={relativePath} relativePath={relativePath}
modalTitle={modalTitle}
onModalClose={this.onSelectEpisodeModalClose} onModalClose={this.onSelectEpisodeModalClose}
/> />
@ -420,6 +424,7 @@ class InteractiveImportRow extends Component {
isOpen={isSelectReleaseGroupModalOpen} isOpen={isSelectReleaseGroupModalOpen}
ids={[id]} ids={[id]}
releaseGroup={releaseGroup ?? ''} releaseGroup={releaseGroup ?? ''}
modalTitle={modalTitle}
onModalClose={this.onSelectReleaseGroupModalClose} onModalClose={this.onSelectReleaseGroupModalClose}
/> />
@ -429,6 +434,7 @@ class InteractiveImportRow extends Component {
qualityId={quality ? quality.quality.id : 0} qualityId={quality ? quality.quality.id : 0}
proper={quality ? quality.revision.version > 1 : false} proper={quality ? quality.revision.version > 1 : false}
real={quality ? quality.revision.real > 0 : false} real={quality ? quality.revision.real > 0 : false}
modalTitle={modalTitle}
onModalClose={this.onSelectQualityModalClose} onModalClose={this.onSelectQualityModalClose}
/> />
@ -436,6 +442,7 @@ class InteractiveImportRow extends Component {
isOpen={isSelectLanguageModalOpen} isOpen={isSelectLanguageModalOpen}
ids={[id]} ids={[id]}
languageId={language ? language.id : 0} languageId={language ? language.id : 0}
modalTitle={modalTitle}
onModalClose={this.onSelectLanguageModalClose} onModalClose={this.onSelectLanguageModalClose}
/> />
</TableRow> </TableRow>
@ -460,6 +467,7 @@ InteractiveImportRow.propTypes = {
episodeFileId: PropTypes.number, episodeFileId: PropTypes.number,
isReprocessing: PropTypes.bool, isReprocessing: PropTypes.bool,
isSelected: PropTypes.bool, isSelected: PropTypes.bool,
modalTitle: PropTypes.string.isRequired,
onSelectedChange: PropTypes.func.isRequired, onSelectedChange: PropTypes.func.isRequired,
onValidRowChange: PropTypes.func.isRequired onValidRowChange: PropTypes.func.isRequired
}; };

View File

@ -75,7 +75,12 @@ InteractiveImportModal.propTypes = {
isOpen: PropTypes.bool.isRequired, isOpen: PropTypes.bool.isRequired,
folder: PropTypes.string, folder: PropTypes.string,
downloadId: PropTypes.string, downloadId: PropTypes.string,
modalTitle: PropTypes.string.isRequired,
onModalClose: PropTypes.func.isRequired onModalClose: PropTypes.func.isRequired
}; };
InteractiveImportModal.defaultProps = {
modalTitle: 'Manual Import'
};
export default InteractiveImportModal; export default InteractiveImportModal;

View File

@ -19,6 +19,7 @@ function SelectLanguageModalContent(props) {
isPopulated, isPopulated,
error, error,
items, items,
modalTitle,
onModalClose, onModalClose,
onLanguageSelect onLanguageSelect
} = props; } = props;
@ -33,7 +34,7 @@ function SelectLanguageModalContent(props) {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
Manual Import - Select Language {modalTitle} - Select Language
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>
@ -80,6 +81,7 @@ SelectLanguageModalContent.propTypes = {
isPopulated: PropTypes.bool.isRequired, isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object, error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired, items: PropTypes.arrayOf(PropTypes.object).isRequired,
modalTitle: PropTypes.string.isRequired,
onLanguageSelect: PropTypes.func.isRequired, onLanguageSelect: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired onModalClose: PropTypes.func.isRequired
}; };

View File

@ -61,6 +61,7 @@ class SelectQualityModalContent extends Component {
isPopulated, isPopulated,
error, error,
items, items,
modalTitle,
onModalClose onModalClose
} = this.props; } = this.props;
@ -80,7 +81,7 @@ class SelectQualityModalContent extends Component {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
Manual Import - Select Quality {modalTitle} - Select Quality
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>
@ -159,6 +160,7 @@ SelectQualityModalContent.propTypes = {
isPopulated: PropTypes.bool.isRequired, isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object, error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired, items: PropTypes.arrayOf(PropTypes.object).isRequired,
modalTitle: PropTypes.string.isRequired,
onQualitySelect: PropTypes.func.isRequired, onQualitySelect: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired onModalClose: PropTypes.func.isRequired
}; };

View File

@ -45,6 +45,7 @@ class SelectReleaseGroupModalContent extends Component {
render() { render() {
const { const {
modalTitle,
onModalClose onModalClose
} = this.props; } = this.props;
@ -55,7 +56,7 @@ class SelectReleaseGroupModalContent extends Component {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
Manual Import - Set Release Group {modalTitle} - Set Release Group
</ModalHeader> </ModalHeader>
<ModalBody <ModalBody
@ -96,6 +97,7 @@ class SelectReleaseGroupModalContent extends Component {
SelectReleaseGroupModalContent.propTypes = { SelectReleaseGroupModalContent.propTypes = {
releaseGroup: PropTypes.string.isRequired, releaseGroup: PropTypes.string.isRequired,
modalTitle: PropTypes.string.isRequired,
onReleaseGroupSelect: PropTypes.func.isRequired, onReleaseGroupSelect: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired onModalClose: PropTypes.func.isRequired
}; };

View File

@ -15,6 +15,7 @@ class SelectSeasonModalContent extends Component {
render() { render() {
const { const {
items, items,
modalTitle,
onSeasonSelect, onSeasonSelect,
onModalClose onModalClose
} = this.props; } = this.props;
@ -22,7 +23,7 @@ class SelectSeasonModalContent extends Component {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
Manual Import - Select Season {modalTitle} - Select Season
</ModalHeader> </ModalHeader>
<ModalBody> <ModalBody>
@ -51,6 +52,7 @@ class SelectSeasonModalContent extends Component {
SelectSeasonModalContent.propTypes = { SelectSeasonModalContent.propTypes = {
items: PropTypes.arrayOf(PropTypes.object).isRequired, items: PropTypes.arrayOf(PropTypes.object).isRequired,
modalTitle: PropTypes.string.isRequired,
onSeasonSelect: PropTypes.func.isRequired, onSeasonSelect: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired onModalClose: PropTypes.func.isRequired
}; };

View File

@ -37,6 +37,7 @@ class SelectSeriesModalContent extends Component {
render() { render() {
const { const {
items, items,
modalTitle,
onSeriesSelect, onSeriesSelect,
onModalClose onModalClose
} = this.props; } = this.props;
@ -47,7 +48,7 @@ class SelectSeriesModalContent extends Component {
return ( return (
<ModalContent onModalClose={onModalClose}> <ModalContent onModalClose={onModalClose}>
<ModalHeader> <ModalHeader>
Manual Import - Select Series {modalTitle} - Select Series
</ModalHeader> </ModalHeader>
<ModalBody <ModalBody
@ -96,6 +97,7 @@ class SelectSeriesModalContent extends Component {
SelectSeriesModalContent.propTypes = { SelectSeriesModalContent.propTypes = {
items: PropTypes.arrayOf(PropTypes.object).isRequired, items: PropTypes.arrayOf(PropTypes.object).isRequired,
modalTitle: PropTypes.string.isRequired,
onSeriesSelect: PropTypes.func.isRequired, onSeriesSelect: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired onModalClose: PropTypes.func.isRequired
}; };

View File

@ -650,6 +650,7 @@ class SeriesDetails extends Component {
autoSelectRow={false} autoSelectRow={false}
showDelete={true} showDelete={true}
showImportMode={false} showImportMode={false}
modalTitle={'Manage Episodes'}
onModalClose={this.onManageEpisodesModalClose} onModalClose={this.onManageEpisodesModalClose}
/> />