github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-16 10:03:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Changed: Remove Language Profiles (#870)

Browse source 
* Changed: Remove Language Profiles

* fixup! Changed: Remove Language Profiles

* fixup! Changed: Remove Language Profiles

* Remove unused method in FileNameBuilder

* Fixed: Cleanup Int Converter Copy/Paste Issues and Grammar
This commit is contained in:
Qstick 2019-08-02 07:50:09 -04:00 • committed by GitHub
parent 8f791abbf6
commit 8b860bcb82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
227 changed files with 345 additions and 5873 deletions
Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/Activity/Blacklist/BlacklistRow.css
View file

@ -1,4 +1,3 @@
.language,
.quality {
composes: cell from '~Components/Table/Cells/TableRowCell.css';

16
frontend/src/Activity/Blacklist/BlacklistRow.js
View file

@ -5,7 +5,6 @@ import IconButton from 'Components/Link/IconButton';
import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
import TableRow from 'Components/Table/TableRow';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
import TrackLanguage from 'Album/TrackLanguage';
import TrackQuality from 'Album/TrackQuality';
import ArtistNameLink from 'Artist/ArtistNameLink';
import BlacklistDetailsModal from './BlacklistDetailsModal';
@ -42,7 +41,6 @@ class BlacklistRow extends Component {
const {
artist,
sourceTitle,
language,
quality,
date,
protocol,
@ -84,19 +82,6 @@ class BlacklistRow extends Component {
);
}
if (name === 'language') {
return (
<TableRowCell
key={name}
className={styles.language}
>
<TrackLanguage
language={language}
/>
</TableRowCell>
);
}
if (name === 'quality') {
return (
<TableRowCell
@ -172,7 +157,6 @@ BlacklistRow.propTypes = {
id: PropTypes.number.isRequired,
artist: PropTypes.object.isRequired,
sourceTitle: PropTypes.string.isRequired,
language: PropTypes.object.isRequired,
quality: PropTypes.object.isRequired,
date: PropTypes.string.isRequired,
protocol: PropTypes.string.isRequired,

16
frontend/src/Activity/History/HistoryRow.js
View file

@ -6,7 +6,6 @@ import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellCo
import TableRow from 'Components/Table/TableRow';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
import AlbumTitleLink from 'Album/AlbumTitleLink';
import TrackLanguage from 'Album/TrackLanguage';
import TrackQuality from 'Album/TrackQuality';
import ArtistNameLink from 'Artist/ArtistNameLink';
import HistoryEventTypeCell from './HistoryEventTypeCell';
@ -55,8 +54,6 @@ class HistoryRow extends Component {
artist,
album,
track,
language,
languageCutoffNotMet,
quality,
qualityCutoffNotMet,
eventType,
@ -128,17 +125,6 @@ class HistoryRow extends Component {
);
}
if (name === 'language') {
return (
<TableRowCell key={name}>
<TrackLanguage
language={language}
isCutoffMet={languageCutoffNotMet}
/>
</TableRowCell>
);
}
if (name === 'quality') {
return (
<TableRowCell key={name}>
@ -232,8 +218,6 @@ HistoryRow.propTypes = {
artist: PropTypes.object.isRequired,
album: PropTypes.object,
track: PropTypes.object,
language: PropTypes.object.isRequired,
languageCutoffNotMet: PropTypes.bool.isRequired,
quality: PropTypes.object.isRequired,
qualityCutoffNotMet: PropTypes.bool.isRequired,
eventType: PropTypes.string.isRequired,

13
frontend/src/Activity/Queue/QueueRow.js
View file

@ -12,7 +12,6 @@ import Icon from 'Components/Icon';
import Popover from 'Components/Tooltip/Popover';
import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
import AlbumTitleLink from 'Album/AlbumTitleLink';
import TrackLanguage from 'Album/TrackLanguage';
import TrackQuality from 'Album/TrackQuality';
import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal';
import ArtistNameLink from 'Artist/ArtistNameLink';
@ -73,7 +72,6 @@ class QueueRow extends Component {
errorMessage,
artist,
album,
language,
quality,
protocol,
indexer,
@ -185,16 +183,6 @@ class QueueRow extends Component {
);
}
if (name === 'language') {
return (
<TableRowCell key={name}>
<TrackLanguage
language={language}
/>
</TableRowCell>
);
}
if (name === 'quality') {
return (
<TableRowCell key={name}>
@ -364,7 +352,6 @@ QueueRow.propTypes = {
errorMessage: PropTypes.string,
artist: PropTypes.object,
album: PropTypes.object,
language: PropTypes.object.isRequired,
quality: PropTypes.object.isRequired,
protocol: PropTypes.string.isRequired,
indexer: PropTypes.string,

1
frontend/src/AddArtist/AddNewArtist/AddNewArtistModalContent.css
View file

@ -58,7 +58,6 @@
composes: button from '~Components/Link/SpinnerButton.css';
}
.hideLanguageProfile,
.hideMetadataProfile {
composes: group from '~Components/Form/FormGroup.css';

19
frontend/src/AddArtist/AddNewArtist/AddNewArtistModalContent.js
View file

@ -42,10 +42,6 @@ class AddNewArtistModalContent extends Component {
this.props.onInputChange({ name: 'qualityProfileId', value: parseInt(value) });
}
onLanguageProfileIdChange = ({ value }) => {
this.props.onInputChange({ name: 'languageProfileId', value: parseInt(value) });
}
onMetadataProfileIdChange = ({ value }) => {
this.props.onInputChange({ name: 'metadataProfileId', value: parseInt(value) });
}
@ -66,11 +62,9 @@ class AddNewArtistModalContent extends Component {
rootFolderPath,
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder,
tags,
showLanguageProfile,
showMetadataProfile,
isSmallScreen,
onModalClose,
@ -159,17 +153,6 @@ class AddNewArtistModalContent extends Component {
/>
</FormGroup>
<FormGroup className={showLanguageProfile ? undefined : styles.hideLanguageProfile}>
<FormLabel>Language Profile</FormLabel>
<FormInputGroup
type={inputTypes.LANGUAGE_PROFILE_SELECT}
name="languageProfileId"
onChange={this.onLanguageProfileIdChange}
{...languageProfileId}
/>
</FormGroup>
<FormGroup className={showMetadataProfile ? undefined : styles.hideMetadataProfile}>
<FormLabel>Metadata Profile</FormLabel>
@ -245,11 +228,9 @@ AddNewArtistModalContent.propTypes = {
rootFolderPath: PropTypes.object,
monitor: PropTypes.object.isRequired,
qualityProfileId: PropTypes.object,
languageProfileId: PropTypes.object,
metadataProfileId: PropTypes.object,
albumFolder: PropTypes.object.isRequired,
tags: PropTypes.object.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
isSmallScreen: PropTypes.bool.isRequired,
onModalClose: PropTypes.func.isRequired,

7
frontend/src/AddArtist/AddNewArtist/AddNewArtistModalContentConnector.js
View file

@ -10,10 +10,9 @@ import AddNewArtistModalContent from './AddNewArtistModalContent';
function createMapStateToProps() {
return createSelector(
(state) => state.addArtist,
(state) => state.settings.languageProfiles,
(state) => state.settings.metadataProfiles,
createDimensionsSelector(),
(addArtistState, languageProfiles, metadataProfiles, dimensions) => {
(addArtistState, metadataProfiles, dimensions) => {
const {
isAdding,
addError,
@ -29,7 +28,6 @@ function createMapStateToProps() {
return {
isAdding,
addError,
showLanguageProfile: languageProfiles.items.length > 1,
showMetadataProfile: metadataProfiles.items.length > 1,
isSmallScreen: dimensions.isSmallScreen,
validationErrors,
@ -60,7 +58,6 @@ class AddNewArtistModalContentConnector extends Component {
rootFolderPath,
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder,
tags
@ -71,7 +68,6 @@ class AddNewArtistModalContentConnector extends Component {
rootFolderPath: rootFolderPath.value,
monitor: monitor.value,
qualityProfileId: qualityProfileId.value,
languageProfileId: languageProfileId.value,
metadataProfileId: metadataProfileId.value,
albumFolder: albumFolder.value,
tags: tags.value,
@ -98,7 +94,6 @@ AddNewArtistModalContentConnector.propTypes = {
rootFolderPath: PropTypes.object,
monitor: PropTypes.object.isRequired,
qualityProfileId: PropTypes.object,
languageProfileId: PropTypes.object,
metadataProfileId: PropTypes.object,
albumFolder: PropTypes.object.isRequired,
tags: PropTypes.object.isRequired,

4
frontend/src/AddArtist/ImportArtist/Import/ImportArtist.js
View file

@ -87,7 +87,6 @@ class ImportArtist extends Component {
rootFoldersPopulated,
rootFoldersError,
unmappedFolders,
showLanguageProfile,
showMetadataProfile
} = this.props;
@ -130,7 +129,6 @@ class ImportArtist extends Component {
allUnselected={allUnselected}
selectedState={selectedState}
contentBody={contentBody}
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
scrollTop={this.state.scrollTop}
onSelectAllChange={this.onSelectAllChange}
@ -145,7 +143,6 @@ class ImportArtist extends Component {
!rootFoldersError && rootFoldersPopulated && !!unmappedFolders.length &&
<ImportArtistFooterConnector
selectedIds={this.getSelectedIds()}
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
onInputChange={this.onInputChange}
onImportPress={this.onImportPress}
@ -164,7 +161,6 @@ ImportArtist.propTypes = {
rootFoldersError: PropTypes.object,
unmappedFolders: PropTypes.arrayOf(PropTypes.object),
items: PropTypes.arrayOf(PropTypes.object),
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
onInputChange: PropTypes.func.isRequired,
onImportPress: PropTypes.func.isRequired

17
frontend/src/AddArtist/ImportArtist/Import/ImportArtistConnector.js
View file

@ -17,7 +17,6 @@ function createMapStateToProps() {
(state) => state.addArtist,
(state) => state.importArtist,
(state) => state.settings.qualityProfiles,
(state) => state.settings.languageProfiles,
(state) => state.settings.metadataProfiles,
(
match,
@ -25,7 +24,6 @@ function createMapStateToProps() {
addArtist,
importArtistState,
qualityProfiles,
languageProfiles,
metadataProfiles
) => {
const {
@ -43,12 +41,9 @@ function createMapStateToProps() {
rootFoldersPopulated,
rootFoldersError,
qualityProfiles: qualityProfiles.items,
languageProfiles: languageProfiles.items,
metadataProfiles: metadataProfiles.items,
showLanguageProfile: languageProfiles.items.length > 1,
showMetadataProfile: metadataProfiles.items.length > 1,
defaultQualityProfileId: addArtist.defaults.qualityProfileId,
defaultLanguageProfileId: addArtist.defaults.languageProfileId,
defaultMetadataProfileId: addArtist.defaults.metadataProfileId
};
@ -83,10 +78,8 @@ class ImportArtistConnector extends Component {
componentDidMount() {
const {
qualityProfiles,
languageProfiles,
metadataProfiles,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
dispatchFetchRootFolders,
dispatchSetAddArtistDefault
@ -107,14 +100,6 @@ class ImportArtistConnector extends Component {
setDefaultPayload.qualityProfileId = qualityProfiles[0].id;
}
if (
!defaultLanguageProfileId ||
!languageProfiles.some((p) => p.id === defaultLanguageProfileId)
) {
setDefaults = true;
setDefaultPayload.languageProfileId = languageProfiles[0].id;
}
if (
!defaultMetadataProfileId ||
!metadataProfiles.some((p) => p.id === defaultMetadataProfileId)
@ -172,10 +157,8 @@ ImportArtistConnector.propTypes = {
match: routeMatchShape.isRequired,
rootFoldersPopulated: PropTypes.bool.isRequired,
qualityProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
languageProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
metadataProfiles: PropTypes.arrayOf(PropTypes.object).isRequired,
defaultQualityProfileId: PropTypes.number.isRequired,
defaultLanguageProfileId: PropTypes.number.isRequired,
defaultMetadataProfileId: PropTypes.number.isRequired,
dispatchSetImportArtistValue: PropTypes.func.isRequired,
dispatchImportArtist: PropTypes.func.isRequired,

35
frontend/src/AddArtist/ImportArtist/Import/ImportArtistFooter.js
View file

@ -23,7 +23,6 @@ class ImportArtistFooter extends Component {
const {
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
defaultAlbumFolder
} = props;
@ -31,7 +30,6 @@ class ImportArtistFooter extends Component {
this.state = {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId,
languageProfileId: defaultLanguageProfileId,
metadataProfileId: defaultMetadataProfileId,
albumFolder: defaultAlbumFolder
};
@ -41,12 +39,10 @@ class ImportArtistFooter extends Component {
const {
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
defaultAlbumFolder,
isMonitorMixed,
isQualityProfileIdMixed,
isLanguageProfileIdMixed,
isMetadataProfileIdMixed,
isAlbumFolderMixed
} = this.props;
@ -54,7 +50,6 @@ class ImportArtistFooter extends Component {
const {
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder
} = this.state;
@ -73,12 +68,6 @@ class ImportArtistFooter extends Component {
newState.qualityProfileId = defaultQualityProfileId;
}
if (isLanguageProfileIdMixed && languageProfileId !== MIXED) {
newState.languageProfileId = MIXED;
} else if (!isLanguageProfileIdMixed && languageProfileId !== defaultLanguageProfileId) {
newState.languageProfileId = defaultLanguageProfileId;
}
if (isMetadataProfileIdMixed && metadataProfileId !== MIXED) {
newState.metadataProfileId = MIXED;
} else if (!isMetadataProfileIdMixed && metadataProfileId !== defaultMetadataProfileId) {
@ -114,10 +103,8 @@ class ImportArtistFooter extends Component {
isLookingUpArtist,
isMonitorMixed,
isQualityProfileIdMixed,
isLanguageProfileIdMixed,
isMetadataProfileIdMixed,
hasUnsearchedItems,
showLanguageProfile,
showMetadataProfile,
onImportPress,
onLookupPress,
@ -127,7 +114,6 @@ class ImportArtistFooter extends Component {
const {
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder
} = this.state;
@ -164,24 +150,6 @@ class ImportArtistFooter extends Component {
/>
</div>
{
showLanguageProfile &&
<div className={styles.inputContainer}>
<div className={styles.label}>
Language Profile
</div>
<FormInputGroup
type={inputTypes.LANGUAGE_PROFILE_SELECT}
name="languageProfileId"
value={languageProfileId}
isDisabled={!selectedCount}
includeMixed={isLanguageProfileIdMixed}
onChange={this.onInputChange}
/>
</div>
}
{
showMetadataProfile &&
<div className={styles.inputContainer}>
@ -276,16 +244,13 @@ ImportArtistFooter.propTypes = {
isLookingUpArtist: PropTypes.bool.isRequired,
defaultMonitor: PropTypes.string.isRequired,
defaultQualityProfileId: PropTypes.number,
defaultLanguageProfileId: PropTypes.number,
defaultMetadataProfileId: PropTypes.number,
defaultAlbumFolder: PropTypes.bool.isRequired,
isMonitorMixed: PropTypes.bool.isRequired,
isQualityProfileIdMixed: PropTypes.bool.isRequired,
isLanguageProfileIdMixed: PropTypes.bool.isRequired,
isMetadataProfileIdMixed: PropTypes.bool.isRequired,
isAlbumFolderMixed: PropTypes.bool.isRequired,
hasUnsearchedItems: PropTypes.bool.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
onInputChange: PropTypes.func.isRequired,
onImportPress: PropTypes.func.isRequired,

4
frontend/src/AddArtist/ImportArtist/Import/ImportArtistFooterConnector.js
View file

@ -19,7 +19,6 @@ function createMapStateToProps() {
const {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId,
languageProfileId: defaultLanguageProfileId,
metadataProfileId: defaultMetadataProfileId,
albumFolder: defaultAlbumFolder
} = addArtist.defaults;
@ -32,7 +31,6 @@ function createMapStateToProps() {
const isMonitorMixed = isMixed(items, selectedIds, defaultMonitor, 'monitor');
const isQualityProfileIdMixed = isMixed(items, selectedIds, defaultQualityProfileId, 'qualityProfileId');
const isLanguageProfileIdMixed = isMixed(items, selectedIds, defaultLanguageProfileId, 'languageProfileId');
const isMetadataProfileIdMixed = isMixed(items, selectedIds, defaultMetadataProfileId, 'metadataProfileId');
const isAlbumFolderMixed = isMixed(items, selectedIds, defaultAlbumFolder, 'albumFolder');
const hasUnsearchedItems = !isLookingUpArtist && items.some((item) => !item.isPopulated);
@ -43,12 +41,10 @@ function createMapStateToProps() {
isImporting,
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
defaultAlbumFolder,
isMonitorMixed,
isQualityProfileIdMixed,
isLanguageProfileIdMixed,
isMetadataProfileIdMixed,
isAlbumFolderMixed,
hasUnsearchedItems

1
frontend/src/AddArtist/ImportArtist/Import/ImportArtistHeader.css
View file

@ -12,7 +12,6 @@
}
.qualityProfile,
.languageProfile,
.metadataProfile {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';

12
frontend/src/AddArtist/ImportArtist/Import/ImportArtistHeader.js
View file

@ -12,7 +12,6 @@ import styles from './ImportArtistHeader.css';
function ImportArtistHeader(props) {
const {
showLanguageProfile,
showMetadataProfile,
allSelected,
allUnselected,
@ -60,16 +59,6 @@ function ImportArtistHeader(props) {
Quality Profile
</VirtualTableHeaderCell>
{
showLanguageProfile &&
<VirtualTableHeaderCell
className={styles.languageProfile}
name="languageProfileId"
>
Language Profile
</VirtualTableHeaderCell>
}
{
showMetadataProfile &&
<VirtualTableHeaderCell
@ -98,7 +87,6 @@ function ImportArtistHeader(props) {
}
ImportArtistHeader.propTypes = {
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
allSelected: PropTypes.bool.isRequired,
allUnselected: PropTypes.bool.isRequired,

2
frontend/src/AddArtist/ImportArtist/Import/ImportArtistRow.css
View file

@ -17,7 +17,6 @@
}
.qualityProfile,
.languageProfile,
.metadataProfile {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';
@ -39,7 +38,6 @@
min-width: 300px;
}
.hideLanguageProfile,
.hideMetadataProfile {
composes: cell from '~Components/Table/Cells/VirtualTableRowCell.css';

15
frontend/src/AddArtist/ImportArtist/Import/ImportArtistRow.js
View file

@ -14,12 +14,10 @@ function ImportArtistRow(props) {
id,
monitor,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder,
selectedArtist,
isExistingArtist,
showLanguageProfile,
showMetadataProfile,
isSelected,
onSelectedChange,
@ -58,17 +56,6 @@ function ImportArtistRow(props) {
/>
</VirtualTableRowCell>
<VirtualTableRowCell
className={showLanguageProfile ? styles.languageProfile : styles.hideLanguageProfile}
>
<FormInputGroup
type={inputTypes.LANGUAGE_PROFILE_SELECT}
name="languageProfileId"
value={languageProfileId}
onChange={onInputChange}
/>
</VirtualTableRowCell>
<VirtualTableRowCell
className={showMetadataProfile ? styles.metadataProfile : styles.hideMetadataProfile}
>
@ -104,13 +91,11 @@ ImportArtistRow.propTypes = {
id: PropTypes.string.isRequired,
monitor: PropTypes.string.isRequired,
qualityProfileId: PropTypes.number.isRequired,
languageProfileId: PropTypes.number.isRequired,
metadataProfileId: PropTypes.number.isRequired,
albumFolder: PropTypes.bool.isRequired,
selectedArtist: PropTypes.object,
isExistingArtist: PropTypes.bool.isRequired,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
isSelected: PropTypes.bool,
onSelectedChange: PropTypes.func.isRequired,

8
frontend/src/AddArtist/ImportArtist/Import/ImportArtistTable.js
View file

@ -15,7 +15,6 @@ class ImportArtistTable extends Component {
unmappedFolders,
defaultMonitor,
defaultQualityProfileId,
defaultLanguageProfileId,
defaultMetadataProfileId,
defaultAlbumFolder,
onArtistLookup,
@ -25,7 +24,6 @@ class ImportArtistTable extends Component {
const values = {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId,
languageProfileId: defaultLanguageProfileId,
metadataProfileId: defaultMetadataProfileId,
albumFolder: defaultAlbumFolder
};
@ -105,7 +103,6 @@ class ImportArtistTable extends Component {
rootFolderId,
items,
selectedState,
showLanguageProfile,
showMetadataProfile,
onSelectedChange
} = this.props;
@ -117,7 +114,6 @@ class ImportArtistTable extends Component {
key={key}
style={style}
rootFolderId={rootFolderId}
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
isSelected={selectedState[item.id]}
onSelectedChange={onSelectedChange}
@ -136,7 +132,6 @@ class ImportArtistTable extends Component {
allUnselected,
isSmallScreen,
contentBody,
showLanguageProfile,
showMetadataProfile,
scrollTop,
selectedState,
@ -159,7 +154,6 @@ class ImportArtistTable extends Component {
rowRenderer={this.rowRenderer}
header={
<ImportArtistHeader
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
allSelected={allSelected}
allUnselected={allUnselected}
@ -179,7 +173,6 @@ ImportArtistTable.propTypes = {
unmappedFolders: PropTypes.arrayOf(PropTypes.object),
defaultMonitor: PropTypes.string.isRequired,
defaultQualityProfileId: PropTypes.number,
defaultLanguageProfileId: PropTypes.number,
defaultMetadataProfileId: PropTypes.number,
defaultAlbumFolder: PropTypes.bool.isRequired,
allSelected: PropTypes.bool.isRequired,
@ -188,7 +181,6 @@ ImportArtistTable.propTypes = {
isSmallScreen: PropTypes.bool.isRequired,
allArtists: PropTypes.arrayOf(PropTypes.object),
contentBody: PropTypes.object.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
scrollTop: PropTypes.number.isRequired,
onSelectAllChange: PropTypes.func.isRequired,

1
frontend/src/AddArtist/ImportArtist/Import/ImportArtistTableConnector.js
View file

@ -14,7 +14,6 @@ function createMapStateToProps() {
return {
defaultMonitor: addArtist.defaults.monitor,
defaultQualityProfileId: addArtist.defaults.qualityProfileId,
defaultLanguageProfileId: addArtist.defaults.languageProfileId,
defaultMetadataProfileId: addArtist.defaults.metadataProfileId,
defaultAlbumFolder: addArtist.defaults.albumFolder,
items: importArtist.items,

1
frontend/src/Album/Details/TrackRow.css
View file

@ -22,7 +22,6 @@
width: 250px;
}
.language,
.duration,
.status {
composes: cell from '~Components/Table/Cells/TableRowCell.css';

14
frontend/src/Album/Details/TrackRow.js
View file

@ -4,7 +4,6 @@ import TableRow from 'Components/Table/TableRow';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
import formatTimeSpan from 'Utilities/Date/formatTimeSpan';
import EpisodeStatusConnector from 'Album/EpisodeStatusConnector';
import TrackFileLanguageConnector from 'TrackFile/TrackFileLanguageConnector';
import MediaInfoConnector from 'TrackFile/MediaInfoConnector';
import TrackActionsCell from './TrackActionsCell';
import * as mediaInfoTypes from 'TrackFile/mediaInfoTypes';
@ -127,19 +126,6 @@ class TrackRow extends Component {
);
}
if (name === 'language') {
return (
<TableRowCell
key={name}
className={styles.language}
>
<TrackFileLanguageConnector
episodeFileId={trackFileId}
/>
</TableRowCell>
);
}
if (name === 'audioInfo') {
return (
<TableRowCell

37
frontend/src/Album/TrackLanguage.js
View file

@ -1,37 +0,0 @@
import PropTypes from 'prop-types';
import React from 'react';
import Label from 'Components/Label';
import { kinds } from 'Helpers/Props';
function TrackLanguage(props) {
const {
className,
language,
isCutoffNotMet
} = props;
if (!language) {
return null;
}
return (
<Label
className={className}
kind={isCutoffNotMet ? kinds.INVERSE : kinds.DEFAULT}
>
{language.name}
</Label>
);
}
TrackLanguage.propTypes = {
className: PropTypes.string,
language: PropTypes.object,
isCutoffNotMet: PropTypes.bool
};
TrackLanguage.defaultProps = {
isCutoffNotMet: true
};
export default TrackLanguage;

17
frontend/src/Artist/Edit/EditArtistModalContent.js
View file

@ -59,7 +59,6 @@ class EditArtistModalContent extends Component {
artistName,
item,
isSaving,
showLanguageProfile,
showMetadataProfile,
originalPath,
onInputChange,
@ -72,7 +71,6 @@ class EditArtistModalContent extends Component {
monitored,
albumFolder,
qualityProfileId,
languageProfileId,
metadataProfileId,
path,
tags
@ -121,20 +119,6 @@ class EditArtistModalContent extends Component {
/>
</FormGroup>
{
showLanguageProfile &&
<FormGroup>
<FormLabel>Language Profile</FormLabel>
<FormInputGroup
type={inputTypes.LANGUAGE_PROFILE_SELECT}
name="languageProfileId"
{...languageProfileId}
onChange={onInputChange}
/>
</FormGroup>
}
{
showMetadataProfile &&
<FormGroup>
@ -214,7 +198,6 @@ EditArtistModalContent.propTypes = {
artistName: PropTypes.string.isRequired,
item: PropTypes.object.isRequired,
isSaving: PropTypes.bool.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
isPathChanging: PropTypes.bool.isRequired,
originalPath: PropTypes.string.isRequired,

5
frontend/src/Artist/Edit/EditArtistModalContentConnector.js
View file

@ -27,11 +27,10 @@ function createIsPathChangingSelector() {
function createMapStateToProps() {
return createSelector(
(state) => state.artist,
(state) => state.settings.languageProfiles,
(state) => state.settings.metadataProfiles,
createArtistSelector(),
createIsPathChangingSelector(),
(artistState, languageProfiles, metadataProfiles, artist, isPathChanging) => {
(artistState, metadataProfiles, artist, isPathChanging) => {
const {
isSaving,
saveError,
@ -42,7 +41,6 @@ function createMapStateToProps() {
'monitored',
'albumFolder',
'qualityProfileId',
'languageProfileId',
'metadataProfileId',
'path',
'tags'
@ -57,7 +55,6 @@ function createMapStateToProps() {
isPathChanging,
originalPath: artist.path,
item: settings.settings,
showLanguageProfile: languageProfiles.items.length > 1,
showMetadataProfile: metadataProfiles.items.length > 1,
...settings
};

13
frontend/src/Artist/Editor/ArtistEditor.js
View file

@ -19,7 +19,7 @@ import ArtistEditorRowConnector from './ArtistEditorRowConnector';
import ArtistEditorFooter from './ArtistEditorFooter';
import ArtistEditorFilterModalConnector from './ArtistEditorFilterModalConnector';
function getColumns(showLanguageProfile, showMetadataProfile) {
function getColumns(showMetadataProfile) {
return [
{
name: 'status',
@ -38,12 +38,6 @@ function getColumns(showLanguageProfile, showMetadataProfile) {
isSortable: true,
isVisible: true
},
{
name: 'languageProfileId',
label: 'Language Profile',
isSortable: true,
isVisible: showLanguageProfile
},
{
name: 'metadataProfileId',
label: 'Metadata Profile',
@ -86,7 +80,7 @@ class ArtistEditor extends Component {
selectedState: {},
isOrganizingArtistModalOpen: false,
isRetaggingArtistModalOpen: false,
columns: getColumns(props.showLanguageProfile, props.showMetadataProfile)
columns: getColumns(props.showMetadataProfile)
};
}
@ -177,7 +171,6 @@ class ArtistEditor extends Component {
deleteError,
isOrganizingArtist,
isRetaggingArtist,
showLanguageProfile,
showMetadataProfile,
onSortPress,
onFilterSelect
@ -266,7 +259,6 @@ class ArtistEditor extends Component {
deleteError={deleteError}
isOrganizingArtist={isOrganizingArtist}
isRetaggingArtist={isRetaggingArtist}
showLanguageProfile={showLanguageProfile}
showMetadataProfile={showMetadataProfile}
onSaveSelected={this.onSaveSelected}
onOrganizeArtistPress={this.onOrganizeArtistPress}
@ -307,7 +299,6 @@ ArtistEditor.propTypes = {
deleteError: PropTypes.object,
isOrganizingArtist: PropTypes.bool.isRequired,
isRetaggingArtist: PropTypes.bool.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
onSortPress: PropTypes.func.isRequired,
onFilterSelect: PropTypes.func.isRequired,

4
frontend/src/Artist/Editor/ArtistEditorConnector.js
View file

@ -12,16 +12,14 @@ import ArtistEditor from './ArtistEditor';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.languageProfiles,
(state) => state.settings.metadataProfiles,
createClientSideCollectionSelector('artist', 'artistEditor'),
createCommandExecutingSelector(commandNames.RENAME_ARTIST),
createCommandExecutingSelector(commandNames.RETAG_ARTIST),
(languageProfiles, metadataProfiles, artist, isOrganizingArtist, isRetaggingArtist) => {
(metadataProfiles, artist, isOrganizingArtist, isRetaggingArtist) => {
return {
isOrganizingArtist,
isRetaggingArtist,
showLanguageProfile: languageProfiles.items.length > 1,
showMetadataProfile: metadataProfiles.items.length > 1,
...artist
};

24
frontend/src/Artist/Editor/ArtistEditorFooter.js
View file

@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { kinds } from 'Helpers/Props';
import SelectInput from 'Components/Form/SelectInput';
import LanguageProfileSelectInputConnector from 'Components/Form/LanguageProfileSelectInputConnector';
import MetadataProfileSelectInputConnector from 'Components/Form/MetadataProfileSelectInputConnector';
import QualityProfileSelectInputConnector from 'Components/Form/QualityProfileSelectInputConnector';
import RootFolderSelectInputConnector from 'Components/Form/RootFolderSelectInputConnector';
@ -27,7 +26,6 @@ class ArtistEditorFooter extends Component {
this.state = {
monitored: NO_CHANGE,
qualityProfileId: NO_CHANGE,
languageProfileId: NO_CHANGE,
metadataProfileId: NO_CHANGE,
albumFolder: NO_CHANGE,
rootFolderPath: NO_CHANGE,
@ -49,7 +47,6 @@ class ArtistEditorFooter extends Component {
this.setState({
monitored: NO_CHANGE,
qualityProfileId: NO_CHANGE,
languageProfileId: NO_CHANGE,
metadataProfileId: NO_CHANGE,
albumFolder: NO_CHANGE,
rootFolderPath: NO_CHANGE,
@ -146,7 +143,6 @@ class ArtistEditorFooter extends Component {
isDeleting,
isOrganizingArtist,
isRetaggingArtist,
showLanguageProfile,
showMetadataProfile,
onOrganizeArtistPress,
onRetagArtistPress
@ -155,7 +151,6 @@ class ArtistEditorFooter extends Component {
const {
monitored,
qualityProfileId,
languageProfileId,
metadataProfileId,
albumFolder,
rootFolderPath,
@ -210,24 +205,6 @@ class ArtistEditorFooter extends Component {
/>
</div>
{
showLanguageProfile &&
<div className={styles.inputContainer}>
<ArtistEditorFooterLabel
label="Language Profile"
isSaving={isSaving && languageProfileId !== NO_CHANGE}
/>
<LanguageProfileSelectInputConnector
name="languageProfileId"
value={languageProfileId}
includeNoChange={true}
isDisabled={!selectedCount}
onChange={this.onInputChange}
/>
</div>
}
{
showMetadataProfile &&
<div className={styles.inputContainer}>
@ -363,7 +340,6 @@ ArtistEditorFooter.propTypes = {
deleteError: PropTypes.object,
isOrganizingArtist: PropTypes.bool.isRequired,
isRetaggingArtist: PropTypes.bool.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
onSaveSelected: PropTypes.func.isRequired,
onOrganizeArtistPress: PropTypes.func.isRequired,

9
frontend/src/Artist/Editor/ArtistEditorRow.js
View file

@ -31,7 +31,6 @@ class ArtistEditorRow extends Component {
artistName,
artistType,
monitored,
languageProfile,
metadataProfile,
qualityProfile,
albumFolder,
@ -67,13 +66,6 @@ class ArtistEditorRow extends Component {
{qualityProfile.name}
</TableRowCell>
{
_.find(columns, { name: 'languageProfileId' }).isVisible &&
<TableRowCell>
{languageProfile.name}
</TableRowCell>
}
{
_.find(columns, { name: 'metadataProfileId' }).isVisible &&
<TableRowCell>
@ -111,7 +103,6 @@ ArtistEditorRow.propTypes = {
artistName: PropTypes.string.isRequired,
artistType: PropTypes.string.isRequired,
monitored: PropTypes.bool.isRequired,
languageProfile: PropTypes.object.isRequired,
metadataProfile: PropTypes.object.isRequired,
qualityProfile: PropTypes.object.isRequired,
albumFolder: PropTypes.bool.isRequired,

5
frontend/src/Artist/Editor/ArtistEditorRowConnector.js
View file

@ -2,19 +2,16 @@ import PropTypes from 'prop-types';
import React from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import createLanguageProfileSelector from 'Store/Selectors/createLanguageProfileSelector';
import createMetadataProfileSelector from 'Store/Selectors/createMetadataProfileSelector';
import createQualityProfileSelector from 'Store/Selectors/createQualityProfileSelector';
import ArtistEditorRow from './ArtistEditorRow';
function createMapStateToProps() {
return createSelector(
createLanguageProfileSelector(),
createMetadataProfileSelector(),
createQualityProfileSelector(),
(languageProfile, metadataProfile, qualityProfile) => {
(metadataProfile, qualityProfile) => {
return {
languageProfile,
metadataProfile,
qualityProfile
};

5
frontend/src/Artist/History/ArtistHistoryModalContent.js
View file

@ -25,11 +25,6 @@ const columns = [
label: 'Source Title',
isVisible: true
},
{
name: 'language',
label: 'Language',
isVisible: true
},
{
name: 'quality',
label: 'Quality',

12
frontend/src/Artist/History/ArtistHistoryRow.js
View file

@ -8,7 +8,6 @@ import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellCo
import TableRow from 'Components/Table/TableRow';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
import Popover from 'Components/Tooltip/Popover';
import TrackLanguage from 'Album/TrackLanguage';
import TrackQuality from 'Album/TrackQuality';
import HistoryDetailsConnector from 'Activity/History/Details/HistoryDetailsConnector';
import HistoryEventTypeCell from 'Activity/History/HistoryEventTypeCell';
@ -73,8 +72,6 @@ class ArtistHistoryRow extends Component {
const {
eventType,
sourceTitle,
language,
languageCutoffNotMet,
quality,
qualityCutoffNotMet,
date,
@ -101,13 +98,6 @@ class ArtistHistoryRow extends Component {
{sourceTitle}
</TableRowCell>
<TableRowCell>
<TrackLanguage
language={language}
isCutoffNotMet={languageCutoffNotMet}
/>
</TableRowCell>
<TableRowCell>
<TrackQuality
quality={quality}
@ -167,8 +157,6 @@ ArtistHistoryRow.propTypes = {
id: PropTypes.number.isRequired,
eventType: PropTypes.string.isRequired,
sourceTitle: PropTypes.string.isRequired,
language: PropTypes.object.isRequired,
languageCutoffNotMet: PropTypes.bool.isRequired,
quality: PropTypes.object.isRequired,
qualityCutoffNotMet: PropTypes.bool.isRequired,
date: PropTypes.string.isRequired,

4
frontend/src/Artist/Index/ArtistIndexItemConnector.js
View file

@ -7,7 +7,6 @@ import { createSelector } from 'reselect';
import createArtistSelector from 'Store/Selectors/createArtistSelector';
import createExecutingCommandsSelector from 'Store/Selectors/createExecutingCommandsSelector';
import createArtistQualityProfileSelector from 'Store/Selectors/createArtistQualityProfileSelector';
import createArtistLanguageProfileSelector from 'Store/Selectors/createArtistLanguageProfileSelector';
import createArtistMetadataProfileSelector from 'Store/Selectors/createArtistMetadataProfileSelector';
import { executeCommand } from 'Store/Actions/commandActions';
import * as commandNames from 'Commands/commandNames';
@ -36,14 +35,12 @@ function createMapStateToProps() {
return createSelector(
createArtistSelector(),
createArtistQualityProfileSelector(),
createArtistLanguageProfileSelector(),
createArtistMetadataProfileSelector(),
selectShowSearchAction(),
createExecutingCommandsSelector(),
(
artist,
qualityProfile,
languageProfile,
metadataProfile,
showSearchAction,
executingCommands
@ -77,7 +74,6 @@ function createMapStateToProps() {
return {
...artist,
qualityProfile,
languageProfile,
metadataProfile,
latestAlbum,
showSearchAction,

1
frontend/src/Artist/Index/Banners/ArtistIndexBanners.js
View file

@ -234,7 +234,6 @@ class ArtistIndexBanners extends Component {
timeFormat={timeFormat}
style={style}
artistId={artist.id}
languageProfileId={artist.languageProfileId}
qualityProfileId={artist.qualityProfileId}
metadataProfileId={artist.metadataProfileId}
/>

9
frontend/src/Artist/Index/Menus/ArtistIndexSortMenu.js
View file

@ -55,15 +55,6 @@ function ArtistIndexSortMenu(props) {
Quality Profile
</SortMenuItem>
<SortMenuItem
name="languageProfileId"
sortKey={sortKey}
sortDirection={sortDirection}
onPress={onSortSelect}
>
Language Profile
</SortMenuItem>
<SortMenuItem
name="metadataProfileId"
sortKey={sortKey}

1
frontend/src/Artist/Index/Overview/ArtistIndexOverviews.js
View file

@ -200,7 +200,6 @@ class ArtistIndexOverviews extends Component {
isSmallScreen={isSmallScreen}
style={style}
artistId={artist.id}
languageProfileId={artist.languageProfileId}
qualityProfileId={artist.qualityProfileId}
metadataProfileId={artist.metadataProfileId}
/>

1
frontend/src/Artist/Index/Posters/ArtistIndexPosters.js
View file

@ -234,7 +234,6 @@ class ArtistIndexPosters extends Component {
timeFormat={timeFormat}
style={style}
artistId={artist.id}
languageProfileId={artist.languageProfileId}
qualityProfileId={artist.qualityProfileId}
metadataProfileId={artist.metadataProfileId}
/>

1
frontend/src/Artist/Index/Table/ArtistIndexHeader.css
View file

@ -25,7 +25,6 @@
}
.qualityProfileId,
.languageProfileId,
.metadataProfileId {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';

1
frontend/src/Artist/Index/Table/ArtistIndexRow.css
View file

@ -61,7 +61,6 @@
}
.qualityProfileId,
.languageProfileId,
.metadataProfileId {
composes: cell;

13
frontend/src/Artist/Index/Table/ArtistIndexRow.js
View file

@ -87,7 +87,6 @@ class ArtistIndexRow extends Component {
foreignArtistId,
artistType,
qualityProfile,
languageProfile,
metadataProfile,
nextAlbum,
lastAlbum,
@ -211,17 +210,6 @@ class ArtistIndexRow extends Component {
);
}
if (name === 'languageProfileId') {
return (
<VirtualTableRowCell
key={name}
className={styles[name]}
>
{languageProfile.name}
</VirtualTableRowCell>
);
}
if (name === 'metadataProfileId') {
return (
<VirtualTableRowCell
@ -462,7 +450,6 @@ ArtistIndexRow.propTypes = {
foreignArtistId: PropTypes.string.isRequired,
artistType: PropTypes.string,
qualityProfile: PropTypes.object.isRequired,
languageProfile: PropTypes.object.isRequired,
metadataProfile: PropTypes.object.isRequired,
nextAlbum: PropTypes.object,
lastAlbum: PropTypes.object,

1
frontend/src/Artist/Index/Table/ArtistIndexTable.js
View file

@ -56,7 +56,6 @@ class ArtistIndexTable extends Component {
style={style}
columns={columns}
artistId={artist.id}
languageProfileId={artist.languageProfileId}
qualityProfileId={artist.qualityProfileId}
metadataProfileId={artist.metadataProfileId}
showBanners={showBanners}

1
frontend/src/Artist/Index/Table/hasGrowableColumns.js
View file

@ -1,6 +1,5 @@
const growableColumns = [
'qualityProfileId',
'languageProfileId',
'path',
'tags'
];

2
frontend/src/Calendar/Legend/Legend.js
View file

@ -19,7 +19,7 @@ function Legend(props) {
name="Cutoff Not Met"
icon={icons.TRACK_FILE}
kind={kinds.WARNING}
tooltip="Quality or language cutoff has not been met"
tooltip="Quality cutoff has not been met"
/>
);
}

4
frontend/src/Components/Filter/Builder/FilterBuilderRow.js
View file

@ -7,7 +7,6 @@ import BoolFilterBuilderRowValue from './BoolFilterBuilderRowValue';
import DateFilterBuilderRowValue from './DateFilterBuilderRowValue';
import FilterBuilderRowValueConnector from './FilterBuilderRowValueConnector';
import IndexerFilterBuilderRowValueConnector from './IndexerFilterBuilderRowValueConnector';
import LanguageProfileFilterBuilderRowValueConnector from './LanguageProfileFilterBuilderRowValueConnector';
import MetadataProfileFilterBuilderRowValueConnector from './MetadataProfileFilterBuilderRowValueConnector';
import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue';
import QualityFilterBuilderRowValueConnector from './QualityFilterBuilderRowValueConnector';
@ -61,9 +60,6 @@ function getRowValueConnector(selectedFilterBuilderProp) {
case filterBuilderValueTypes.INDEXER:
return IndexerFilterBuilderRowValueConnector;
case filterBuilderValueTypes.LANGUAGE_PROFILE:
return LanguageProfileFilterBuilderRowValueConnector;
case filterBuilderValueTypes.METADATA_PROFILE:
return MetadataProfileFilterBuilderRowValueConnector;

28
frontend/src/Components/Filter/Builder/LanguageProfileFilterBuilderRowValueConnector.js
View file

@ -1,28 +0,0 @@
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import FilterBuilderRowValue from './FilterBuilderRowValue';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.languageProfiles,
(languageProfiles) => {
const tagList = languageProfiles.items.map((languageProfile) => {
const {
id,
name
} = languageProfile;
return {
id,
name
};
});
return {
tagList
};
}
);
}
export default connect(createMapStateToProps)(FilterBuilderRowValue);

4
frontend/src/Components/Form/FormInputGroup.js
View file

@ -14,7 +14,6 @@ import OAuthInputConnector from './OAuthInputConnector';
import PasswordInput from './PasswordInput';
import PathInputConnector from './PathInputConnector';
import QualityProfileSelectInputConnector from './QualityProfileSelectInputConnector';
import LanguageProfileSelectInputConnector from './LanguageProfileSelectInputConnector';
import MetadataProfileSelectInputConnector from './MetadataProfileSelectInputConnector';
import AlbumReleaseSelectInputConnector from './AlbumReleaseSelectInputConnector';
import RootFolderSelectInputConnector from './RootFolderSelectInputConnector';
@ -64,9 +63,6 @@ function getComponent(type) {
case inputTypes.QUALITY_PROFILE_SELECT:
return QualityProfileSelectInputConnector;
case inputTypes.LANGUAGE_PROFILE_SELECT:
return LanguageProfileSelectInputConnector;
case inputTypes.METADATA_PROFILE_SELECT:
return MetadataProfileSelectInputConnector;

98
frontend/src/Components/Form/LanguageProfileSelectInputConnector.js
View file

@ -1,98 +0,0 @@
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import sortByName from 'Utilities/Array/sortByName';
import SelectInput from './SelectInput';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.languageProfiles,
(state, { includeNoChange }) => includeNoChange,
(state, { includeMixed }) => includeMixed,
(languageProfiles, includeNoChange, includeMixed) => {
const values = _.map(languageProfiles.items.sort(sortByName), (languageProfile) => {
return {
key: languageProfile.id,
value: languageProfile.name
};
});
if (includeNoChange) {
values.unshift({
key: 'noChange',
value: 'No Change',
disabled: true
});
}
if (includeMixed) {
values.unshift({
key: 'mixed',
value: '(Mixed)',
disabled: true
});
}
return {
values
};
}
);
}
class LanguageProfileSelectInputConnector extends Component {
//
// Lifecycle
componentDidMount() {
const {
name,
value,
values
} = this.props;
if (!value || !_.some(values, (option) => parseInt(option.key) === value)) {
const firstValue = _.find(values, (option) => !isNaN(parseInt(option.key)));
if (firstValue) {
this.onChange({ name, value: firstValue.key });
}
}
}
//
// Listeners
onChange = ({ name, value }) => {
this.props.onChange({ name, value: parseInt(value) });
}
//
// Render
render() {
return (
<SelectInput
{...this.props}
onChange={this.onChange}
/>
);
}
}
LanguageProfileSelectInputConnector.propTypes = {
name: PropTypes.string.isRequired,
value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
values: PropTypes.arrayOf(PropTypes.object).isRequired,
includeNoChange: PropTypes.bool.isRequired,
onChange: PropTypes.func.isRequired
};
LanguageProfileSelectInputConnector.defaultProps = {
includeNoChange: false
};
export default connect(createMapStateToProps)(LanguageProfileSelectInputConnector);

4
frontend/src/Components/Page/ErrorPage.js
View file

@ -11,7 +11,6 @@ function ErrorPage(props) {
customFiltersError,
tagsError,
qualityProfilesError,
languageProfilesError,
metadataProfilesError,
uiSettingsError,
systemStatusError
@ -29,8 +28,6 @@ function ErrorPage(props) {
errorMessage = getErrorMessage(tagsError, 'Failed to load tags from API');
} else if (qualityProfilesError) {
errorMessage = getErrorMessage(qualityProfilesError, 'Failed to load quality profiles from API');
} else if (languageProfilesError) {
errorMessage = getErrorMessage(languageProfilesError, 'Failed to load language profiles from API');
} else if (metadataProfilesError) {
errorMessage = getErrorMessage(metadataProfilesError, 'Failed to load metadata profiles from API');
} else if (uiSettingsError) {
@ -59,7 +56,6 @@ ErrorPage.propTypes = {
customFiltersError: PropTypes.object,
tagsError: PropTypes.object,
qualityProfilesError: PropTypes.object,
languageProfilesError: PropTypes.object,
metadataProfilesError: PropTypes.object,
uiSettingsError: PropTypes.object,
systemStatusError: PropTypes.object

15
frontend/src/Components/Page/PageConnector.js
View file

@ -8,7 +8,7 @@ import { saveDimensions, setIsSidebarVisible } from 'Store/Actions/appActions';
import { fetchCustomFilters } from 'Store/Actions/customFilterActions';
import { fetchArtist } from 'Store/Actions/artistActions';
import { fetchTags } from 'Store/Actions/tagActions';
import { fetchQualityProfiles, fetchLanguageProfiles, fetchMetadataProfiles, fetchUISettings, fetchImportLists } from 'Store/Actions/settingsActions';
import { fetchQualityProfiles, fetchMetadataProfiles, fetchUISettings, fetchImportLists } from 'Store/Actions/settingsActions';
import { fetchStatus } from 'Store/Actions/systemActions';
import ErrorPage from './ErrorPage';
import LoadingPage from './LoadingPage';
@ -48,7 +48,6 @@ const selectIsPopulated = createSelector(
(state) => state.tags.isPopulated,
(state) => state.settings.ui.isPopulated,
(state) => state.settings.qualityProfiles.isPopulated,
(state) => state.settings.languageProfiles.isPopulated,
(state) => state.settings.metadataProfiles.isPopulated,
(state) => state.settings.importLists.isPopulated,
(state) => state.system.status.isPopulated,
@ -58,7 +57,6 @@ const selectIsPopulated = createSelector(
tagsIsPopulated,
uiSettingsIsPopulated,
qualityProfilesIsPopulated,
languageProfilesIsPopulated,
metadataProfilesIsPopulated,
importListsIsPopulated,
systemStatusIsPopulated
@ -69,7 +67,6 @@ const selectIsPopulated = createSelector(
tagsIsPopulated &&
uiSettingsIsPopulated &&
qualityProfilesIsPopulated &&
languageProfilesIsPopulated &&
metadataProfilesIsPopulated &&
importListsIsPopulated &&
systemStatusIsPopulated
@ -83,7 +80,6 @@ const selectErrors = createSelector(
(state) => state.tags.error,
(state) => state.settings.ui.error,
(state) => state.settings.qualityProfiles.error,
(state) => state.settings.languageProfiles.error,
(state) => state.settings.metadataProfiles.error,
(state) => state.settings.importLists.error,
(state) => state.system.status.error,
@ -93,7 +89,6 @@ const selectErrors = createSelector(
tagsError,
uiSettingsError,
qualityProfilesError,
languageProfilesError,
metadataProfilesError,
importListsError,
systemStatusError
@ -104,7 +99,6 @@ const selectErrors = createSelector(
tagsError ||
uiSettingsError ||
qualityProfilesError ||
languageProfilesError ||
metadataProfilesError ||
importListsError ||
systemStatusError
@ -117,7 +111,6 @@ const selectErrors = createSelector(
tagsError,
uiSettingsError,
qualityProfilesError,
languageProfilesError,
metadataProfilesError,
importListsError,
systemStatusError
@ -164,9 +157,6 @@ function createMapDispatchToProps(dispatch, props) {
dispatchFetchQualityProfiles() {
dispatch(fetchQualityProfiles());
},
dispatchFetchLanguageProfiles() {
dispatch(fetchLanguageProfiles());
},
dispatchFetchMetadataProfiles() {
dispatch(fetchMetadataProfiles());
},
@ -207,7 +197,6 @@ class PageConnector extends Component {
this.props.dispatchFetchCustomFilters();
this.props.dispatchFetchTags();
this.props.dispatchFetchQualityProfiles();
this.props.dispatchFetchLanguageProfiles();
this.props.dispatchFetchMetadataProfiles();
this.props.dispatchFetchImportLists();
this.props.dispatchFetchUISettings();
@ -232,7 +221,6 @@ class PageConnector extends Component {
dispatchFetchArtist,
dispatchFetchTags,
dispatchFetchQualityProfiles,
dispatchFetchLanguageProfiles,
dispatchFetchMetadataProfiles,
dispatchFetchImportLists,
dispatchFetchUISettings,
@ -272,7 +260,6 @@ PageConnector.propTypes = {
dispatchFetchCustomFilters: PropTypes.func.isRequired,
dispatchFetchTags: PropTypes.func.isRequired,
dispatchFetchQualityProfiles: PropTypes.func.isRequired,
dispatchFetchLanguageProfiles: PropTypes.func.isRequired,
dispatchFetchMetadataProfiles: PropTypes.func.isRequired,
dispatchFetchImportLists: PropTypes.func.isRequired,
dispatchFetchUISettings: PropTypes.func.isRequired,

1
frontend/src/Helpers/Props/filterBuilderValueTypes.js
View file

@ -3,7 +3,6 @@ export const BYTES = 'bytes';
export const DATE = 'date';
export const DEFAULT = 'default';
export const INDEXER = 'indexer';
export const LANGUAGE_PROFILE = 'languageProfile';
export const METADATA_PROFILE = 'metadataProfile';
export const PROTOCOL = 'protocol';
export const QUALITY = 'quality';

2
frontend/src/Helpers/Props/inputTypes.js
View file

@ -10,7 +10,6 @@ export const OAUTH = 'oauth';
export const PASSWORD = 'password';
export const PATH = 'path';
export const QUALITY_PROFILE_SELECT = 'qualityProfileSelect';
export const LANGUAGE_PROFILE_SELECT = 'languageProfileSelect';
export const METADATA_PROFILE_SELECT = 'metadataProfileSelect';
export const ALBUM_RELEASE_SELECT = 'albumReleaseSelect';
export const ROOT_FOLDER_SELECT = 'rootFolderSelect';
@ -33,7 +32,6 @@ export const all = [
PASSWORD,
PATH,
QUALITY_PROFILE_SELECT,
LANGUAGE_PROFILE_SELECT,
METADATA_PROFILE_SELECT,
ALBUM_RELEASE_SELECT,
ROOT_FOLDER_SELECT,

6
frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
View file

@ -56,12 +56,6 @@ const columns = [
isSortable: true,
isVisible: true
},
{
name: 'language',
label: 'Language',
isSortable: true,
isVisible: true
},
{
name: 'size',
label: 'Size',

7
frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js
View file

@ -127,7 +127,6 @@ class InteractiveImportModalContentConnector extends Component {
albumReleaseId,
tracks,
quality,
language,
disableReleaseSwitching
} = item;
@ -151,11 +150,6 @@ class InteractiveImportModalContentConnector extends Component {
return false;
}
if (!language) {
this.setState({ interactiveImportErrorMessage: 'Language must be chosen for each selected file' });
return false;
}
files.push({
path: item.path,
folderName: item.folderName,
@ -164,7 +158,6 @@ class InteractiveImportModalContentConnector extends Component {
albumReleaseId,
trackIds: _.map(tracks, 'id'),
quality,
language,
downloadId: this.props.downloadId,
disableReleaseSwitching
});

3
frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
View file

@ -4,8 +4,7 @@
word-break: break-all;
}
.quality,
.language {
.quality {
composes: cell from '~Components/Table/Cells/TableRowCell.css';
text-align: center;

57
frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
View file

@ -11,12 +11,10 @@ import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
import Popover from 'Components/Tooltip/Popover';
import Tooltip from 'Components/Tooltip/Tooltip';
import TrackQuality from 'Album/TrackQuality';
import TrackLanguage from 'Album/TrackLanguage';
import SelectArtistModal from 'InteractiveImport/Artist/SelectArtistModal';
import SelectAlbumModal from 'InteractiveImport/Album/SelectAlbumModal';
import SelectTrackModal from 'InteractiveImport/Track/SelectTrackModal';
import SelectQualityModal from 'InteractiveImport/Quality/SelectQualityModal';
import SelectLanguageModal from 'InteractiveImport/Language/SelectLanguageModal';
import InteractiveImportRowCellPlaceholder from './InteractiveImportRowCellPlaceholder';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import styles from './InteractiveImportRow.css';
@ -33,8 +31,7 @@ class InteractiveImportRow extends Component {
isSelectArtistModalOpen: false,
isSelectAlbumModalOpen: false,
isSelectTrackModalOpen: false,
isSelectQualityModalOpen: false,
isSelectLanguageModalOpen: false
isSelectQualityModalOpen: false
};
}
@ -44,16 +41,14 @@ class InteractiveImportRow extends Component {
artist,
album,
tracks,
quality,
language
quality
} = this.props;
if (
artist &&
album != null &&
tracks.length &&
quality &&
language
quality
) {
this.props.onSelectedChange({ id, value: true });
}
@ -66,7 +61,6 @@ class InteractiveImportRow extends Component {
album,
tracks,
quality,
language,
isSelected,
onValidRowChange
} = this.props;
@ -76,7 +70,6 @@ class InteractiveImportRow extends Component {
prevProps.album === album &&
!hasDifferentItems(prevProps.tracks, tracks) &&
prevProps.quality === quality &&
prevProps.language === language &&
prevProps.isSelected === isSelected
) {
return;
@ -86,8 +79,7 @@ class InteractiveImportRow extends Component {
artist &&
album &&
tracks.length &&
quality &&
language
quality
);
if (isSelected && !isValid) {
@ -130,10 +122,6 @@ class InteractiveImportRow extends Component {
this.setState({ isSelectQualityModalOpen: true });
}
onSelectLanguagePress = () => {
this.setState({ isSelectLanguageModalOpen: true });
}
onSelectArtistModalClose = (changed) => {
this.setState({ isSelectArtistModalOpen: false });
this.selectRowAfterChange(changed);
@ -154,11 +142,6 @@ class InteractiveImportRow extends Component {
this.selectRowAfterChange(changed);
}
onSelectLanguageModalClose = (changed) => {
this.setState({ isSelectLanguageModalOpen: false });
this.selectRowAfterChange(changed);
}
//
// Render
@ -172,7 +155,6 @@ class InteractiveImportRow extends Component {
albumReleaseId,
tracks,
quality,
language,
size,
rejections,
audioTags,
@ -186,8 +168,7 @@ class InteractiveImportRow extends Component {
isSelectArtistModalOpen,
isSelectAlbumModalOpen,
isSelectTrackModalOpen,
isSelectQualityModalOpen,
isSelectLanguageModalOpen
isSelectQualityModalOpen
} = this.state;
const artistName = artist ? artist.artistName : '';
@ -203,7 +184,6 @@ class InteractiveImportRow extends Component {
const showTrackNumbersPlaceholder = !isSaving && isSelected && !!album && !tracks.length;
const showTrackNumbersLoading = isSaving && !tracks.length;
const showQualityPlaceholder = isSelected && !quality;
const showLanguagePlaceholder = isSelected && !language;
const pathCellContents = (
<div>
@ -288,25 +268,6 @@ class InteractiveImportRow extends Component {
}
</TableRowCellButton>
<TableRowCellButton
className={styles.language}
title="Click to change language"
onPress={this.onSelectLanguagePress}
>
{
showLanguagePlaceholder &&
<InteractiveImportRowCellPlaceholder />
}
{
!showLanguagePlaceholder && !!language &&
<TrackLanguage
className={styles.label}
language={language}
/>
}
</TableRowCellButton>
<TableRowCell>
{formatBytes(size)}
</TableRowCell>
@ -376,13 +337,6 @@ class InteractiveImportRow extends Component {
real={quality ? quality.revision.real > 0 : false}
onModalClose={this.onSelectQualityModalClose}
/>
<SelectLanguageModal
isOpen={isSelectLanguageModalOpen}
id={id}
languageId={language ? language.id : 0}
onModalClose={this.onSelectLanguageModalClose}
/>
</TableRow>
);
}
@ -398,7 +352,6 @@ InteractiveImportRow.propTypes = {
albumReleaseId: PropTypes.number,
tracks: PropTypes.arrayOf(PropTypes.object).isRequired,
quality: PropTypes.object,
language: PropTypes.object,
size: PropTypes.number.isRequired,
rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
audioTags: PropTypes.object.isRequired,

37
frontend/src/InteractiveImport/Language/SelectLanguageModal.js
View file

@ -1,37 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import Modal from 'Components/Modal/Modal';
import SelectLanguageModalContentConnector from './SelectLanguageModalContentConnector';
class SelectLanguageModal extends Component {
//
// Render
render() {
const {
isOpen,
onModalClose,
...otherProps
} = this.props;
return (
<Modal
isOpen={isOpen}
onModalClose={onModalClose}
>
<SelectLanguageModalContentConnector
{...otherProps}
onModalClose={onModalClose}
/>
</Modal>
);
}
}
SelectLanguageModal.propTypes = {
isOpen: PropTypes.bool.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default SelectLanguageModal;

87
frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js
View file

@ -1,87 +0,0 @@
import PropTypes from 'prop-types';
import React from 'react';
import { inputTypes } from 'Helpers/Props';
import Button from 'Components/Link/Button';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import Form from 'Components/Form/Form';
import FormGroup from 'Components/Form/FormGroup';
import FormLabel from 'Components/Form/FormLabel';
import FormInputGroup from 'Components/Form/FormInputGroup';
import ModalContent from 'Components/Modal/ModalContent';
import ModalHeader from 'Components/Modal/ModalHeader';
import ModalBody from 'Components/Modal/ModalBody';
import ModalFooter from 'Components/Modal/ModalFooter';
function SelectLanguageModalContent(props) {
const {
languageId,
isFetching,
isPopulated,
error,
items,
onModalClose,
onLanguageSelect
} = props;
const languageOptions = items.map(({ language }) => {
return {
key: language.id,
value: language.name
};
});
return (
<ModalContent onModalClose={onModalClose}>
<ModalHeader>
Manual Import - Select Language
</ModalHeader>
<ModalBody>
{
isFetching &&
<LoadingIndicator />
}
{
!isFetching && !!error &&
<div>Unable to load languages</div>
}
{
isPopulated && !error &&
<Form>
<FormGroup>
<FormLabel>Language</FormLabel>
<FormInputGroup
type={inputTypes.SELECT}
name="language"
value={languageId}
values={languageOptions}
onChange={onLanguageSelect}
/>
</FormGroup>
</Form>
}
</ModalBody>
<ModalFooter>
<Button onPress={onModalClose}>
Cancel
</Button>
</ModalFooter>
</ModalContent>
);
}
SelectLanguageModalContent.propTypes = {
languageId: PropTypes.number.isRequired,
isFetching: PropTypes.bool.isRequired,
isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
onLanguageSelect: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default SelectLanguageModalContent;

87
frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js
View file

@ -1,87 +0,0 @@
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { fetchLanguageProfileSchema } from 'Store/Actions/settingsActions';
import { updateInteractiveImportItem } from 'Store/Actions/interactiveImportActions';
import SelectLanguageModalContent from './SelectLanguageModalContent';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.languageProfiles,
(languageProfiles) => {
const {
isSchemaFetching: isFetching,
isSchemaPopulated: isPopulated,
schemaError: error,
schema
} = languageProfiles;
return {
isFetching,
isPopulated,
error,
items: schema.languages ? [...schema.languages].reverse() : []
};
}
);
}
const mapDispatchToProps = {
fetchLanguageProfileSchema,
updateInteractiveImportItem
};
class SelectLanguageModalContentConnector extends Component {
//
// Lifecycle
componentDidMount = () => {
if (!this.props.isPopulated) {
this.props.fetchLanguageProfileSchema();
}
}
//
// Listeners
onLanguageSelect = ({ value }) => {
const languageId = parseInt(value);
const language = _.find(this.props.items,
(item) => item.language.id === languageId).language;
this.props.updateInteractiveImportItem({
id: this.props.id,
language
});
this.props.onModalClose(true);
}
//
// Render
render() {
return (
<SelectLanguageModalContent
{...this.props}
onLanguageSelect={this.onLanguageSelect}
/>
);
}
}
SelectLanguageModalContentConnector.propTypes = {
id: PropTypes.number.isRequired,
isFetching: PropTypes.bool.isRequired,
isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
fetchLanguageProfileSchema: PropTypes.func.isRequired,
updateInteractiveImportItem: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default connect(createMapStateToProps, mapDispatchToProps)(SelectLanguageModalContentConnector);

6
frontend/src/InteractiveSearch/InteractiveSearch.js
View file

@ -48,12 +48,6 @@ const columns = [
isSortable: true,
isVisible: true
},
{
name: 'languageWeight',
label: 'Language',
isSortable: true,
isVisible: true
},
{
name: 'qualityWeight',
label: 'Quality',

7
frontend/src/InteractiveSearch/InteractiveSearchRow.css
View file

@ -4,17 +4,12 @@
word-break: break-all;
}
.quality,
.language {
.quality {
composes: cell from '~Components/Table/Cells/TableRowCell.css';
text-align: center;
}
.language {
width: 100px;
}
.preferredWordScore {
composes: cell from '~Components/Table/Cells/TableRowCell.css';

7
frontend/src/InteractiveSearch/InteractiveSearchRow.js
View file

@ -11,7 +11,6 @@ import ConfirmModal from 'Components/Modal/ConfirmModal';
import TableRow from 'Components/Table/TableRow';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
import Popover from 'Components/Tooltip/Popover';
import TrackLanguage from 'Album/TrackLanguage';
import TrackQuality from 'Album/TrackQuality';
import ProtocolLabel from 'Activity/Queue/ProtocolLabel';
import Peers from './Peers';
@ -112,7 +111,6 @@ class InteractiveSearchRow extends Component {
seeders,
leechers,
quality,
language,
preferredWordScore,
rejections,
downloadAllowed,
@ -162,10 +160,6 @@ class InteractiveSearchRow extends Component {
}
</TableRowCell>
<TableRowCell className={styles.language}>
<TrackLanguage language={language} />
</TableRowCell>
<TableRowCell className={styles.quality}>
<TrackQuality quality={quality} />
</TableRowCell>
@ -245,7 +239,6 @@ InteractiveSearchRow.propTypes = {
seeders: PropTypes.number,
leechers: PropTypes.number,
quality: PropTypes.object.isRequired,
language: PropTypes.object.isRequired,
preferredWordScore: PropTypes.number.isRequired,
rejections: PropTypes.arrayOf(PropTypes.string).isRequired,
downloadAllowed: PropTypes.bool.isRequired,

1
frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.css
View file

@ -4,7 +4,6 @@
margin-right: auto;
}
.hideLanguageProfile,
.hideMetadataProfile {
composes: group from '~Components/Form/FormGroup.css';

15
frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js
View file

@ -62,7 +62,6 @@ function EditImportListModalContent(props) {
onSavePress,
onTestPress,
onDeleteImportListPress,
showLanguageProfile,
showMetadataProfile,
...otherProps
} = props;
@ -74,7 +73,6 @@ function EditImportListModalContent(props) {
shouldMonitor,
rootFolderPath,
qualityProfileId,
languageProfileId,
metadataProfileId,
tags,
fields
@ -174,18 +172,6 @@ function EditImportListModalContent(props) {
/>
</FormGroup>
<FormGroup className={showLanguageProfile ? undefined : styles.hideLanguageProfile}>
<FormLabel>Language Profile</FormLabel>
<FormInputGroup
type={inputTypes.LANGUAGE_PROFILE_SELECT}
name="languageProfileId"
helpText={'Language Profile list items should be added with'}
{...languageProfileId}
onChange={onInputChange}
/>
</FormGroup>
<FormGroup className={showMetadataProfile ? undefined : styles.hideMetadataProfile}>
<FormLabel>Metadata Profile</FormLabel>
@ -280,7 +266,6 @@ EditImportListModalContent.propTypes = {
isTesting: PropTypes.bool.isRequired,
saveError: PropTypes.object,
item: PropTypes.object.isRequired,
showLanguageProfile: PropTypes.bool.isRequired,
showMetadataProfile: PropTypes.bool.isRequired,
onInputChange: PropTypes.func.isRequired,
onFieldChange: PropTypes.func.isRequired,

4
frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContentConnector.js
View file

@ -9,13 +9,11 @@ import EditImportListModalContent from './EditImportListModalContent';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.advancedSettings,
(state) => state.settings.languageProfiles,
(state) => state.settings.metadataProfiles,
createProviderSettingsSelector('importLists'),
(advancedSettings, languageProfiles, metadataProfiles, importList) => {
(advancedSettings, metadataProfiles, importList) => {
return {
advancedSettings,
showLanguageProfile: languageProfiles.items.length > 1,
showMetadataProfile: metadataProfiles.items.length > 1,
...importList
};

27
frontend/src/Settings/Profiles/Language/EditLanguageProfileModal.js
View file

@ -1,27 +0,0 @@
import PropTypes from 'prop-types';
import React from 'react';
import { sizes } from 'Helpers/Props';
import Modal from 'Components/Modal/Modal';
import EditLanguageProfileModalContentConnector from './EditLanguageProfileModalContentConnector';
function EditLanguageProfileModal({ isOpen, onModalClose, ...otherProps }) {
return (
<Modal
size={sizes.MEDIUM}
isOpen={isOpen}
onModalClose={onModalClose}
>
<EditLanguageProfileModalContentConnector
{...otherProps}
onModalClose={onModalClose}
/>
</Modal>
);
}
EditLanguageProfileModal.propTypes = {
isOpen: PropTypes.bool.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default EditLanguageProfileModal;

43
frontend/src/Settings/Profiles/Language/EditLanguageProfileModalConnector.js
View file

@ -1,43 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { clearPendingChanges } from 'Store/Actions/baseActions';
import EditLanguageProfileModal from './EditLanguageProfileModal';
function mapStateToProps() {
return {};
}
const mapDispatchToProps = {
clearPendingChanges
};
class EditLanguageProfileModalConnector extends Component {
//
// Listeners
onModalClose = () => {
this.props.clearPendingChanges({ section: 'settings.languageProfiles' });
this.props.onModalClose();
}
//
// Render
render() {
return (
<EditLanguageProfileModal
{...this.props}
onModalClose={this.onModalClose}
/>
);
}
}
EditLanguageProfileModalConnector.propTypes = {
onModalClose: PropTypes.func.isRequired,
clearPendingChanges: PropTypes.func.isRequired
};
export default connect(mapStateToProps, mapDispatchToProps)(EditLanguageProfileModalConnector);

3
frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContent.css
View file

@ -1,3 +0,0 @@
.deleteButtonContainer {
margin-right: auto;
}

165
frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContent.js
View file

@ -1,165 +0,0 @@
import PropTypes from 'prop-types';
import React from 'react';
import { inputTypes, kinds } from 'Helpers/Props';
import Button from 'Components/Link/Button';
import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import ModalContent from 'Components/Modal/ModalContent';
import ModalHeader from 'Components/Modal/ModalHeader';
import ModalBody from 'Components/Modal/ModalBody';
import ModalFooter from 'Components/Modal/ModalFooter';
import Form from 'Components/Form/Form';
import FormGroup from 'Components/Form/FormGroup';
import FormLabel from 'Components/Form/FormLabel';
import FormInputGroup from 'Components/Form/FormInputGroup';
import LanguageProfileItems from './LanguageProfileItems';
import styles from './EditLanguageProfileModalContent.css';
function EditLanguageProfileModalContent(props) {
const {
isFetching,
error,
isSaving,
saveError,
languages,
item,
isInUse,
onInputChange,
onCutoffChange,
onSavePress,
onModalClose,
onDeleteLanguageProfilePress,
...otherProps
} = props;
const {
id,
name,
upgradeAllowed,
cutoff,
languages: itemLanguages
} = item;
return (
<ModalContent onModalClose={onModalClose}>
<ModalHeader>
{id ? 'Edit Language Profile' : 'Add Language Profile'}
</ModalHeader>
<ModalBody>
{
isFetching &&
<LoadingIndicator />
}
{
!isFetching && !!error &&
<div>Unable to add a new language profile, please try again.</div>
}
{
!isFetching && !error &&
<Form {...otherProps}>
<FormGroup>
<FormLabel>Name</FormLabel>
<FormInputGroup
type={inputTypes.TEXT}
name="name"
{...name}
onChange={onInputChange}
/>
</FormGroup>
<FormGroup>
<FormLabel>
Upgrades Allowed
</FormLabel>
<FormInputGroup
type={inputTypes.CHECK}
name="upgradeAllowed"
{...upgradeAllowed}
helpText="If disabled languages will not be upgraded"
onChange={onInputChange}
/>
</FormGroup>
{
upgradeAllowed.value &&
<FormGroup>
<FormLabel>Upgrade Until</FormLabel>
<FormInputGroup
type={inputTypes.SELECT}
name="cutoff"
{...cutoff}
value={cutoff ? cutoff.value.id : 0}
values={languages}
helpText="Once this language is reached Lidarr will no longer download albums"
onChange={onCutoffChange}
/>
</FormGroup>
}
<LanguageProfileItems
languageProfileItems={itemLanguages.value}
errors={itemLanguages.errors}
warnings={itemLanguages.warnings}
{...otherProps}
/>
</Form>
}
</ModalBody>
<ModalFooter>
{
id &&
<div
className={styles.deleteButtonContainer}
title={isInUse ? 'Can\'t delete a language profile that is attached to an artist or import list' : undefined}
>
<Button
kind={kinds.DANGER}
isDisabled={isInUse}
onPress={onDeleteLanguageProfilePress}
>
Delete
</Button>
</div>
}
<Button
onPress={onModalClose}
>
Cancel
</Button>
<SpinnerErrorButton
isSpinning={isSaving}
error={saveError}
onPress={onSavePress}
>
Save
</SpinnerErrorButton>
</ModalFooter>
</ModalContent>
);
}
EditLanguageProfileModalContent.propTypes = {
isFetching: PropTypes.bool.isRequired,
error: PropTypes.object,
isSaving: PropTypes.bool.isRequired,
saveError: PropTypes.object,
languages: PropTypes.arrayOf(PropTypes.object).isRequired,
item: PropTypes.object.isRequired,
isInUse: PropTypes.bool.isRequired,
onInputChange: PropTypes.func.isRequired,
onCutoffChange: PropTypes.func.isRequired,
onSavePress: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired,
onDeleteLanguageProfilePress: PropTypes.func
};
export default EditLanguageProfileModalContent;

189
frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContentConnector.js
View file

@ -1,189 +0,0 @@
import _ from 'lodash';
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import createProfileInUseSelector from 'Store/Selectors/createProfileInUseSelector';
import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
import { fetchLanguageProfileSchema, setLanguageProfileValue, saveLanguageProfile } from 'Store/Actions/settingsActions';
import EditLanguageProfileModalContent from './EditLanguageProfileModalContent';
function createLanguagesSelector() {
return createSelector(
createProviderSettingsSelector('languageProfiles'),
(languageProfile) => {
const languages = languageProfile.item.languages;
if (!languages || !languages.value) {
return [];
}
return _.reduceRight(languages.value, (result, { allowed, language }) => {
if (allowed) {
result.push({
key: language.id,
value: language.name
});
}
return result;
}, []);
}
);
}
function createMapStateToProps() {
return createSelector(
createProviderSettingsSelector('languageProfiles'),
createLanguagesSelector(),
createProfileInUseSelector('languageProfileId'),
(languageProfile, languages, isInUse) => {
return {
languages,
...languageProfile,
isInUse
};
}
);
}
const mapDispatchToProps = {
fetchLanguageProfileSchema,
setLanguageProfileValue,
saveLanguageProfile
};
class EditLanguageProfileModalContentConnector extends Component {
//
// Lifecycle
constructor(props, context) {
super(props, context);
this.state = {
dragIndex: null,
dropIndex: null
};
}
componentDidMount() {
if (!this.props.id && !this.props.isPopulated) {
this.props.fetchLanguageProfileSchema();
}
}
componentDidUpdate(prevProps, prevState) {
if (prevProps.isSaving && !this.props.isSaving && !this.props.saveError) {
this.props.onModalClose();
}
}
//
// Listeners
onInputChange = ({ name, value }) => {
this.props.setLanguageProfileValue({ name, value });
}
onCutoffChange = ({ name, value }) => {
const id = parseInt(value);
const item = _.find(this.props.item.languages.value, (i) => i.language.id === id);
this.props.setLanguageProfileValue({ name, value: item.language });
}
onSavePress = () => {
this.props.saveLanguageProfile({ id: this.props.id });
}
onLanguageProfileItemAllowedChange = (id, allowed) => {
const languageProfile = _.cloneDeep(this.props.item);
const item = _.find(languageProfile.languages.value, (i) => i.language.id === id);
item.allowed = allowed;
this.props.setLanguageProfileValue({
name: 'languages',
value: languageProfile.languages.value
});
const cutoff = languageProfile.cutoff.value;
// If the cutoff isn't allowed anymore or there isn't a cutoff set one
if (!cutoff || !_.find(languageProfile.languages.value, (i) => i.language.id === cutoff.id).allowed) {
const firstAllowed = _.find(languageProfile.languages.value, { allowed: true });
this.props.setLanguageProfileValue({ name: 'cutoff', value: firstAllowed ? firstAllowed.language : null });
}
}
onLanguageProfileItemDragMove = (dragIndex, dropIndex) => {
if (this.state.dragIndex !== dragIndex || this.state.dropIndex !== dropIndex) {
this.setState({
dragIndex,
dropIndex
});
}
}
onLanguageProfileItemDragEnd = ({ id }, didDrop) => {
const {
dragIndex,
dropIndex
} = this.state;
if (didDrop && dropIndex !== null) {
const languageProfile = _.cloneDeep(this.props.item);
const languages = languageProfile.languages.value.splice(dragIndex, 1);
languageProfile.languages.value.splice(dropIndex, 0, languages[0]);
this.props.setLanguageProfileValue({
name: 'languages',
value: languageProfile.languages.value
});
}
this.setState({
dragIndex: null,
dropIndex: null
});
}
//
// Render
render() {
if (_.isEmpty(this.props.item.languages) && !this.props.isFetching) {
return null;
}
return (
<EditLanguageProfileModalContent
{...this.state}
{...this.props}
onSavePress={this.onSavePress}
onInputChange={this.onInputChange}
onCutoffChange={this.onCutoffChange}
onLanguageProfileItemAllowedChange={this.onLanguageProfileItemAllowedChange}
onLanguageProfileItemDragMove={this.onLanguageProfileItemDragMove}
onLanguageProfileItemDragEnd={this.onLanguageProfileItemDragEnd}
/>
);
}
}
EditLanguageProfileModalContentConnector.propTypes = {
id: PropTypes.number,
isFetching: PropTypes.bool.isRequired,
isPopulated: PropTypes.bool.isRequired,
isSaving: PropTypes.bool.isRequired,
saveError: PropTypes.object,
item: PropTypes.object.isRequired,
setLanguageProfileValue: PropTypes.func.isRequired,
fetchLanguageProfileSchema: PropTypes.func.isRequired,
saveLanguageProfile: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};
export default connect(createMapStateToProps, mapDispatchToProps)(EditLanguageProfileModalContentConnector);

31
frontend/src/Settings/Profiles/Language/LanguageProfile.css
View file

@ -1,31 +0,0 @@
.languageProfile {
composes: card from '~Components/Card.css';
width: 300px;
}
.nameContainer {
display: flex;
justify-content: space-between;
}
.name {
@add-mixin truncate;
margin-bottom: 20px;
font-weight: 300;
font-size: 24px;
}
.cloneButton {
composes: button from '~Components/Link/IconButton.css';
height: 36px;
}
.languages {
display: flex;
flex-wrap: wrap;
margin-top: 5px;
pointer-events: all;
}

147
frontend/src/Settings/Profiles/Language/LanguageProfile.js
View file

@ -1,147 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { icons, kinds } from 'Helpers/Props';
import Card from 'Components/Card';
import Label from 'Components/Label';
import IconButton from 'Components/Link/IconButton';
import ConfirmModal from 'Components/Modal/ConfirmModal';
import EditLanguageProfileModalConnector from './EditLanguageProfileModalConnector';
import styles from './LanguageProfile.css';
class LanguageProfile extends Component {
//
// Lifecycle
constructor(props, context) {
super(props, context);
this.state = {
isEditLanguageProfileModalOpen: false,
isDeleteLanguageProfileModalOpen: false
};
}
//
// Listeners
onEditLanguageProfilePress = () => {
this.setState({ isEditLanguageProfileModalOpen: true });
}
onEditLanguageProfileModalClose = () => {
this.setState({ isEditLanguageProfileModalOpen: false });
}
onDeleteLanguageProfilePress = () => {
this.setState({
isEditLanguageProfileModalOpen: false,
isDeleteLanguageProfileModalOpen: true
});
}
onDeleteLanguageProfileModalClose = () => {
this.setState({ isDeleteLanguageProfileModalOpen: false });
}
onConfirmDeleteLanguageProfile = () => {
this.props.onConfirmDeleteLanguageProfile(this.props.id);
}
onCloneLanguageProfilePress = () => {
const {
id,
onCloneLanguageProfilePress
} = this.props;
onCloneLanguageProfilePress(id);
}
//
// Render
render() {
const {
id,
name,
upgradeAllowed,
cutoff,
languages,
isDeleting
} = this.props;
return (
<Card
className={styles.languageProfile}
overlayContent={true}
onPress={this.onEditLanguageProfilePress}
>
<div className={styles.nameContainer}>
<div className={styles.name}>
{name}
</div>
<IconButton
className={styles.cloneButton}
title="Clone Profile"
name={icons.CLONE}
onPress={this.onCloneLanguageProfilePress}
/>
</div>
<div className={styles.languages}>
{
languages.map((item) => {
if (!item.allowed) {
return null;
}
const isCutoff = upgradeAllowed && item.language.id === cutoff.id;
return (
<Label
key={item.language.id}
kind={isCutoff ? kinds.INFO : kinds.default}
title={isCutoff ? 'Upgrade until this language is met or exceeded' : null}
>
{item.language.name}
</Label>
);
})
}
</div>
<EditLanguageProfileModalConnector
id={id}
isOpen={this.state.isEditLanguageProfileModalOpen}
onModalClose={this.onEditLanguageProfileModalClose}
onDeleteLanguageProfilePress={this.onDeleteLanguageProfilePress}
/>
<ConfirmModal
isOpen={this.state.isDeleteLanguageProfileModalOpen}
kind={kinds.DANGER}
title="Delete Language Profile"
message={`Are you sure you want to delete the language profile '${name}'?`}
confirmLabel="Delete"
isSpinning={isDeleting}
onConfirm={this.onConfirmDeleteLanguageProfile}
onCancel={this.onDeleteLanguageProfileModalClose}
/>
</Card>
);
}
}
LanguageProfile.propTypes = {
id: PropTypes.number.isRequired,
name: PropTypes.string.isRequired,
upgradeAllowed: PropTypes.bool.isRequired,
cutoff: PropTypes.object.isRequired,
languages: PropTypes.arrayOf(PropTypes.object).isRequired,
isDeleting: PropTypes.bool.isRequired,
onConfirmDeleteLanguageProfile: PropTypes.func.isRequired,
onCloneLanguageProfilePress: PropTypes.func.isRequired
};
export default LanguageProfile;

44
frontend/src/Settings/Profiles/Language/LanguageProfileItem.css
View file

@ -1,44 +0,0 @@
.languageProfileItem {
display: flex;
align-items: stretch;
width: 100%;
border: 1px solid #aaa;
border-radius: 4px;
background: #fafafa;
}
.checkContainer {
position: relative;
margin-right: 4px;
margin-bottom: 7px;
margin-left: 8px;
}
.languageName {
display: flex;
flex-grow: 1;
margin-bottom: 0;
margin-left: 2px;
font-weight: normal;
line-height: 36px;
cursor: pointer;
}
.dragHandle {
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
margin-left: auto;
width: $dragHandleWidth;
text-align: center;
cursor: grab;
}
.dragIcon {
top: 0;
}
.isDragging {
opacity: 0.25;
}

83
frontend/src/Settings/Profiles/Language/LanguageProfileItem.js
View file

@ -1,83 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import classNames from 'classnames';
import { icons } from 'Helpers/Props';
import Icon from 'Components/Icon';
import CheckInput from 'Components/Form/CheckInput';
import styles from './LanguageProfileItem.css';
class LanguageProfileItem extends Component {
//
// Listeners
onAllowedChange = ({ value }) => {
const {
languageId,
onLanguageProfileItemAllowedChange
} = this.props;
onLanguageProfileItemAllowedChange(languageId, value);
}
//
// Render
render() {
const {
name,
allowed,
isDragging,
connectDragSource
} = this.props;
return (
<div
className={classNames(
styles.languageProfileItem,
isDragging && styles.isDragging,
)}
>
<label
className={styles.languageName}
>
<CheckInput
containerClassName={styles.checkContainer}
name={name}
value={allowed}
onChange={this.onAllowedChange}
/>
{name}
</label>
{
connectDragSource(
<div className={styles.dragHandle}>
<Icon
className={styles.dragIcon}
name={icons.REORDER}
/>
</div>
)
}
</div>
);
}
}
LanguageProfileItem.propTypes = {
languageId: PropTypes.number.isRequired,
name: PropTypes.string.isRequired,
allowed: PropTypes.bool.isRequired,
sortIndex: PropTypes.number.isRequired,
isDragging: PropTypes.bool.isRequired,
connectDragSource: PropTypes.func,
onLanguageProfileItemAllowedChange: PropTypes.func
};
LanguageProfileItem.defaultProps = {
// The drag preview will not connect the drag handle.
connectDragSource: (node) => node
};
export default LanguageProfileItem;

4
frontend/src/Settings/Profiles/Language/LanguageProfileItemDragPreview.css
View file

@ -1,4 +0,0 @@
.dragPreview {
width: 380px;
opacity: 0.75;
}

90
frontend/src/Settings/Profiles/Language/LanguageProfileItemDragPreview.js
View file

@ -1,90 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { DragLayer } from 'react-dnd';
import dimensions from 'Styles/Variables/dimensions.js';
import { QUALITY_PROFILE_ITEM } from 'Helpers/dragTypes';
import DragPreviewLayer from 'Components/DragPreviewLayer';
import LanguageProfileItem from './LanguageProfileItem';
import styles from './LanguageProfileItemDragPreview.css';
const formGroupSmallWidth = parseInt(dimensions.formGroupSmallWidth);
const formLabelLargeWidth = parseInt(dimensions.formLabelLargeWidth);
const formLabelRightMarginWidth = parseInt(dimensions.formLabelRightMarginWidth);
const dragHandleWidth = parseInt(dimensions.dragHandleWidth);
function collectDragLayer(monitor) {
return {
item: monitor.getItem(),
itemType: monitor.getItemType(),
currentOffset: monitor.getSourceClientOffset()
};
}
class LanguageProfileItemDragPreview extends Component {
//
// Render
render() {
const {
item,
itemType,
currentOffset
} = this.props;
if (!currentOffset || itemType !== QUALITY_PROFILE_ITEM) {
return null;
}
// The offset is shifted because the drag handle is on the right edge of the
// list item and the preview is wider than the drag handle.
const { x, y } = currentOffset;
const handleOffset = formGroupSmallWidth - formLabelLargeWidth - formLabelRightMarginWidth - dragHandleWidth;
const transform = `translate3d(${x - handleOffset}px, ${y}px, 0)`;
const style = {
position: 'absolute',
WebkitTransform: transform,
msTransform: transform,
transform
};
const {
languageId,
name,
allowed,
sortIndex
} = item;
return (
<DragPreviewLayer>
<div
className={styles.dragPreview}
style={style}
>
<LanguageProfileItem
languageId={languageId}
name={name}
allowed={allowed}
sortIndex={sortIndex}
isDragging={false}
/>
</div>
</DragPreviewLayer>
);
}
}
LanguageProfileItemDragPreview.propTypes = {
item: PropTypes.object,
itemType: PropTypes.string,
currentOffset: PropTypes.shape({
x: PropTypes.number.isRequired,
y: PropTypes.number.isRequired
})
};
/* eslint-disable new-cap */
export default DragLayer(collectDragLayer)(LanguageProfileItemDragPreview);
/* eslint-enable new-cap */

18
frontend/src/Settings/Profiles/Language/LanguageProfileItemDragSource.css
View file

@ -1,18 +0,0 @@
.languageProfileItemDragSource {
padding: 4px 0;
}
.languageProfileItemPlaceholder {
width: 100%;
height: 36px;
border: 1px dotted #aaa;
border-radius: 4px;
}
.languageProfileItemPlaceholderBefore {
margin-bottom: 8px;
}
.languageProfileItemPlaceholderAfter {
margin-top: 8px;
}

159
frontend/src/Settings/Profiles/Language/LanguageProfileItemDragSource.js
View file

@ -1,159 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { findDOMNode } from 'react-dom';
import { DragSource, DropTarget } from 'react-dnd';
import classNames from 'classnames';
import { QUALITY_PROFILE_ITEM } from 'Helpers/dragTypes';
import LanguageProfileItem from './LanguageProfileItem';
import styles from './LanguageProfileItemDragSource.css';
const languageProfileItemDragSource = {
beginDrag({ languageId, name, allowed, sortIndex }) {
return {
languageId,
name,
allowed,
sortIndex
};
},
endDrag(props, monitor, component) {
props.onLanguageProfileItemDragEnd(monitor.getItem(), monitor.didDrop());
}
};
const languageProfileItemDropTarget = {
hover(props, monitor, component) {
const dragIndex = monitor.getItem().sortIndex;
const hoverIndex = props.sortIndex;
const hoverBoundingRect = findDOMNode(component).getBoundingClientRect();
const hoverMiddleY = (hoverBoundingRect.bottom - hoverBoundingRect.top) / 2;
const clientOffset = monitor.getClientOffset();
const hoverClientY = clientOffset.y - hoverBoundingRect.top;
// Moving up, only trigger if drag position is above 50%
if (dragIndex < hoverIndex && hoverClientY > hoverMiddleY) {
return;
}
// Moving down, only trigger if drag position is below 50%
if (dragIndex > hoverIndex && hoverClientY < hoverMiddleY) {
return;
}
props.onLanguageProfileItemDragMove(dragIndex, hoverIndex);
}
};
function collectDragSource(connect, monitor) {
return {
connectDragSource: connect.dragSource(),
isDragging: monitor.isDragging()
};
}
function collectDropTarget(connect, monitor) {
return {
connectDropTarget: connect.dropTarget(),
isOver: monitor.isOver()
};
}
class LanguageProfileItemDragSource extends Component {
//
// Render
render() {
const {
languageId,
name,
allowed,
sortIndex,
isDragging,
isDraggingUp,
isDraggingDown,
isOver,
connectDragSource,
connectDropTarget,
onLanguageProfileItemAllowedChange
} = this.props;
const isBefore = !isDragging && isDraggingUp && isOver;
const isAfter = !isDragging && isDraggingDown && isOver;
// if (isDragging && !isOver) {
// return null;
// }
return connectDropTarget(
<div
className={classNames(
styles.languageProfileItemDragSource,
isBefore && styles.isDraggingUp,
isAfter && styles.isDraggingDown
)}
>
{
isBefore &&
<div
className={classNames(
styles.languageProfileItemPlaceholder,
styles.languageProfileItemPlaceholderBefore
)}
/>
}
<LanguageProfileItem
languageId={languageId}
name={name}
allowed={allowed}
sortIndex={sortIndex}
isDragging={isDragging}
isOver={isOver}
connectDragSource={connectDragSource}
onLanguageProfileItemAllowedChange={onLanguageProfileItemAllowedChange}
/>
{
isAfter &&
<div
className={classNames(
styles.languageProfileItemPlaceholder,
styles.languageProfileItemPlaceholderAfter
)}
/>
}
</div>
);
}
}
LanguageProfileItemDragSource.propTypes = {
languageId: PropTypes.number.isRequired,
name: PropTypes.string.isRequired,
allowed: PropTypes.bool.isRequired,
sortIndex: PropTypes.number.isRequired,
isDragging: PropTypes.bool,
isDraggingUp: PropTypes.bool,
isDraggingDown: PropTypes.bool,
isOver: PropTypes.bool,
connectDragSource: PropTypes.func,
connectDropTarget: PropTypes.func,
onLanguageProfileItemAllowedChange: PropTypes.func.isRequired,
onLanguageProfileItemDragMove: PropTypes.func.isRequired,
onLanguageProfileItemDragEnd: PropTypes.func.isRequired
};
/* eslint-disable new-cap */
export default DropTarget(
QUALITY_PROFILE_ITEM,
languageProfileItemDropTarget,
collectDropTarget
)(DragSource(
QUALITY_PROFILE_ITEM,
languageProfileItemDragSource,
collectDragSource
)(LanguageProfileItemDragSource));
/* eslint-enable new-cap */

6
frontend/src/Settings/Profiles/Language/LanguageProfileItems.css
View file

@ -1,6 +0,0 @@
.languages {
margin-top: 10px;
/* TODO: This should consider the number of languages in the list */
min-height: 550px;
user-select: none;
}

103
frontend/src/Settings/Profiles/Language/LanguageProfileItems.js
View file

@ -1,103 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import FormGroup from 'Components/Form/FormGroup';
import FormLabel from 'Components/Form/FormLabel';
import FormInputHelpText from 'Components/Form/FormInputHelpText';
import LanguageProfileItemDragSource from './LanguageProfileItemDragSource';
import LanguageProfileItemDragPreview from './LanguageProfileItemDragPreview';
import styles from './LanguageProfileItems.css';
class LanguageProfileItems extends Component {
//
// Render
render() {
const {
dragIndex,
dropIndex,
languageProfileItems,
errors,
warnings,
...otherProps
} = this.props;
const isDragging = dropIndex !== null;
const isDraggingUp = isDragging && dropIndex > dragIndex;
const isDraggingDown = isDragging && dropIndex < dragIndex;
return (
<FormGroup>
<FormLabel>Languages</FormLabel>
<div>
<FormInputHelpText
text="Languages higher in the list are more preferred. Only checked languages are wanted"
/>
{
errors.map((error, index) => {
return (
<FormInputHelpText
key={index}
text={error.message}
isError={true}
isCheckInput={false}
/>
);
})
}
{
warnings.map((warning, index) => {
return (
<FormInputHelpText
key={index}
text={warning.message}
isWarning={true}
isCheckInput={false}
/>
);
})
}
<div className={styles.languages}>
{
languageProfileItems.map(({ allowed, language }, index) => {
return (
<LanguageProfileItemDragSource
key={language.id}
languageId={language.id}
name={language.name}
allowed={allowed}
sortIndex={index}
isDragging={isDragging}
isDraggingUp={isDraggingUp}
isDraggingDown={isDraggingDown}
{...otherProps}
/>
);
}).reverse()
}
<LanguageProfileItemDragPreview />
</div>
</div>
</FormGroup>
);
}
}
LanguageProfileItems.propTypes = {
dragIndex: PropTypes.number,
dropIndex: PropTypes.number,
languageProfileItems: PropTypes.arrayOf(PropTypes.object).isRequired,
errors: PropTypes.arrayOf(PropTypes.object),
warnings: PropTypes.arrayOf(PropTypes.object)
};
LanguageProfileItems.defaultProps = {
errors: [],
warnings: []
};
export default LanguageProfileItems;

31
frontend/src/Settings/Profiles/Language/LanguageProfileNameConnector.js
View file

@ -1,31 +0,0 @@
import PropTypes from 'prop-types';
import React from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import createLanguageProfileSelector from 'Store/Selectors/createLanguageProfileSelector';
function createMapStateToProps() {
return createSelector(
createLanguageProfileSelector(),
(languageProfile) => {
return {
name: languageProfile.name
};
}
);
}
function LanguageProfileNameConnector({ name, ...otherProps }) {
return (
<span>
{name}
</span>
);
}
LanguageProfileNameConnector.propTypes = {
languageProfileId: PropTypes.number.isRequired,
name: PropTypes.string.isRequired
};
export default connect(createMapStateToProps)(LanguageProfileNameConnector);

21
frontend/src/Settings/Profiles/Language/LanguageProfiles.css
View file

@ -1,21 +0,0 @@
.languageProfiles {
display: flex;
flex-wrap: wrap;
}
.addLanguageProfile {
composes: languageProfile from '~./LanguageProfile.css';
background-color: $cardAlternateBackgroundColor;
color: $gray;
text-align: center;
font-size: 45px;
}
.center {
display: inline-block;
padding: 5px 20px 0;
border: 1px solid $borderColor;
border-radius: 4px;
background-color: $white;
}

107
frontend/src/Settings/Profiles/Language/LanguageProfiles.js
View file

@ -1,107 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import sortByName from 'Utilities/Array/sortByName';
import { icons } from 'Helpers/Props';
import FieldSet from 'Components/FieldSet';
import Card from 'Components/Card';
import Icon from 'Components/Icon';
import PageSectionContent from 'Components/Page/PageSectionContent';
import LanguageProfile from './LanguageProfile';
import EditLanguageProfileModalConnector from './EditLanguageProfileModalConnector';
import styles from './LanguageProfiles.css';
class LanguageProfiles extends Component {
//
// Lifecycle
constructor(props, context) {
super(props, context);
this.state = {
isLanguageProfileModalOpen: false
};
}
//
// Listeners
onCloneLanguageProfilePress = (id) => {
this.props.onCloneLanguageProfilePress(id);
this.setState({ isLanguageProfileModalOpen: true });
}
onEditLanguageProfilePress = () => {
this.setState({ isLanguageProfileModalOpen: true });
}
onModalClose = () => {
this.setState({ isLanguageProfileModalOpen: false });
}
//
// Render
render() {
const {
items,
isDeleting,
onConfirmDeleteLanguageProfile,
...otherProps
} = this.props;
return (
<FieldSet legend="Language Profiles">
<PageSectionContent
errorMessage="Unable to load Language Profiles"
{...otherProps}
>
<div className={styles.languageProfiles}>
{
items.sort(sortByName).map((item) => {
return (
<LanguageProfile
key={item.id}
{...item}
isDeleting={isDeleting}
onConfirmDeleteLanguageProfile={onConfirmDeleteLanguageProfile}
onCloneLanguageProfilePress={this.onCloneLanguageProfilePress}
/>
);
})
}
<Card
className={styles.addLanguageProfile}
onPress={this.onEditLanguageProfilePress}
>
<div className={styles.center}>
<Icon
name={icons.ADD}
size={45}
/>
</div>
</Card>
</div>
<EditLanguageProfileModalConnector
isOpen={this.state.isLanguageProfileModalOpen}
onModalClose={this.onModalClose}
/>
</PageSectionContent>
</FieldSet>
);
}
}
LanguageProfiles.propTypes = {
advancedSettings: PropTypes.bool.isRequired,
isFetching: PropTypes.bool.isRequired,
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
isDeleting: PropTypes.bool.isRequired,
onConfirmDeleteLanguageProfile: PropTypes.func.isRequired,
onCloneLanguageProfilePress: PropTypes.func.isRequired
};
export default LanguageProfiles;

67
frontend/src/Settings/Profiles/Language/LanguageProfilesConnector.js
View file

@ -1,67 +0,0 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { fetchLanguageProfiles, deleteLanguageProfile, cloneLanguageProfile } from 'Store/Actions/settingsActions';
import LanguageProfiles from './LanguageProfiles';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.advancedSettings,
(state) => state.settings.languageProfiles,
(advancedSettings, languageProfiles) => {
return {
advancedSettings,
...languageProfiles
};
}
);
}
const mapDispatchToProps = {
dispatchFetchLanguageProfiles: fetchLanguageProfiles,
dispatchDeleteLanguageProfile: deleteLanguageProfile,
dispatchCloneLanguageProfile: cloneLanguageProfile
};
class LanguageProfilesConnector extends Component {
//
// Lifecycle
componentDidMount() {
this.props.dispatchFetchLanguageProfiles();
}
//
// Listeners
onConfirmDeleteLanguageProfile = (id) => {
this.props.dispatchDeleteLanguageProfile({ id });
}
onCloneLanguageProfilePress = (id) => {
this.props.dispatchCloneLanguageProfile({ id });
}
//
// Render
render() {
return (
<LanguageProfiles
onConfirmDeleteLanguageProfile={this.onConfirmDeleteLanguageProfile}
onCloneLanguageProfilePress={this.onCloneLanguageProfilePress}
{...this.props}
/>
);
}
}
LanguageProfilesConnector.propTypes = {
dispatchFetchLanguageProfiles: PropTypes.func.isRequired,
dispatchDeleteLanguageProfile: PropTypes.func.isRequired,
dispatchCloneLanguageProfile: PropTypes.func.isRequired
};
export default connect(createMapStateToProps, mapDispatchToProps)(LanguageProfilesConnector);

2
frontend/src/Settings/Profiles/Profiles.js
View file

@ -5,7 +5,6 @@ import PageContent from 'Components/Page/PageContent';
import PageContentBodyConnector from 'Components/Page/PageContentBodyConnector';
import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
import QualityProfilesConnector from './Quality/QualityProfilesConnector';
import LanguageProfilesConnector from './Language/LanguageProfilesConnector';
import MetadataProfilesConnector from './Metadata/MetadataProfilesConnector';
import DelayProfilesConnector from './Delay/DelayProfilesConnector';
import ReleaseProfilesConnector from './Release/ReleaseProfilesConnector';
@ -24,7 +23,6 @@ class Profiles extends Component {
<PageContentBodyConnector>
<QualityProfilesConnector />
<LanguageProfilesConnector />
<MetadataProfilesConnector />
<DelayProfilesConnector />
<ReleaseProfilesConnector />

2
frontend/src/Settings/Settings.js
View file

@ -32,7 +32,7 @@ function Settings() {
</Link>
<div className={styles.summary}>
Quality, Language, Metadata, Delay, and Release profiles
Quality, Metadata, Delay, and Release profiles
</div>
<Link

97
frontend/src/Store/Actions/Settings/languageProfiles.js
View file

@ -1,97 +0,0 @@
import { createAction } from 'redux-actions';
import { createThunk } from 'Store/thunks';
import getSectionState from 'Utilities/State/getSectionState';
import updateSectionState from 'Utilities/State/updateSectionState';
import createSetSettingValueReducer from 'Store/Actions/Creators/Reducers/createSetSettingValueReducer';
import createFetchHandler from 'Store/Actions/Creators/createFetchHandler';
import createFetchSchemaHandler from 'Store/Actions/Creators/createFetchSchemaHandler';
import createSaveProviderHandler from 'Store/Actions/Creators/createSaveProviderHandler';
import createRemoveItemHandler from 'Store/Actions/Creators/createRemoveItemHandler';
//
// Variables
const section = 'settings.languageProfiles';
//
// Actions Types
export const FETCH_LANGUAGE_PROFILES = 'settings/languageProfiles/fetchLanguageProfiles';
export const FETCH_LANGUAGE_PROFILE_SCHEMA = 'settings/languageProfiles/fetchLanguageProfileSchema';
export const SAVE_LANGUAGE_PROFILE = 'settings/languageProfiles/saveLanguageProfile';
export const DELETE_LANGUAGE_PROFILE = 'settings/languageProfiles/deleteLanguageProfile';
export const SET_LANGUAGE_PROFILE_VALUE = 'settings/languageProfiles/setLanguageProfileValue';
export const CLONE_LANGUAGE_PROFILE = 'settings/languageProfiles/cloneLanguageProfile';
//
// Action Creators
export const fetchLanguageProfiles = createThunk(FETCH_LANGUAGE_PROFILES);
export const fetchLanguageProfileSchema = createThunk(FETCH_LANGUAGE_PROFILE_SCHEMA);
export const saveLanguageProfile = createThunk(SAVE_LANGUAGE_PROFILE);
export const deleteLanguageProfile = createThunk(DELETE_LANGUAGE_PROFILE);
export const setLanguageProfileValue = createAction(SET_LANGUAGE_PROFILE_VALUE, (payload) => {
return {
section,
...payload
};
});
export const cloneLanguageProfile = createAction(CLONE_LANGUAGE_PROFILE);
//
// Details
export default {
//
// State
defaultState: {
isFetching: false,
isPopulated: false,
error: null,
isDeleting: false,
deleteError: null,
isSchemaFetching: false,
isSchemaPopulated: false,
schemaError: null,
schema: {},
isSaving: false,
saveError: null,
items: [],
pendingChanges: {}
},
//
// Action Handlers
actionHandlers: {
[FETCH_LANGUAGE_PROFILES]: createFetchHandler(section, '/languageprofile'),
[FETCH_LANGUAGE_PROFILE_SCHEMA]: createFetchSchemaHandler(section, '/languageprofile/schema'),
[SAVE_LANGUAGE_PROFILE]: createSaveProviderHandler(section, '/languageprofile'),
[DELETE_LANGUAGE_PROFILE]: createRemoveItemHandler(section, '/languageprofile')
},
//
// Reducers
reducers: {
[SET_LANGUAGE_PROFILE_VALUE]: createSetSettingValueReducer(section),
[CLONE_LANGUAGE_PROFILE]: function(state, { payload }) {
const id = payload.id;
const newState = getSectionState(state, section);
const item = newState.items.find((i) => i.id === id);
const pendingChanges = { ...item, id: 0 };
delete pendingChanges.id;
pendingChanges.name = `${pendingChanges.name} - Copy`;
newState.pendingChanges = pendingChanges;
return updateSectionState(state, section, newState);
}
}
};

5
frontend/src/Store/Actions/actionTypes.js
View file

@ -14,8 +14,3 @@ export const SET_IS_SIDEBAR_VISIBLE = 'SET_IS_SIDEBAR_VISIBLE';
export const FETCH_GENERAL_SETTINGS = 'settings/general/fetchGeneralSettings';
export const SET_GENERAL_SETTINGS_VALUE = 'settings/general/setGeneralSettingsValue';
export const SAVE_GENERAL_SETTINGS = 'settings/general/saveGeneralSettings';
//
// Languages
export const FETCH_LANGUAGES = 'FETCH_LANGUAGES';

1
frontend/src/Store/Actions/addArtistActions.js
View file

@ -33,7 +33,6 @@ export const defaultState = {
rootFolderPath: '',
monitor: monitorOptions[0].key,
qualityProfileId: 0,
languageProfileId: 0,
metadataProfileId: 0,
albumFolder: true,
tags: []

6
frontend/src/Store/Actions/albumStudioActions.js
View file

@ -52,12 +52,6 @@ export const defaultState = {
type: filterBuilderTypes.EXACT,
valueType: filterBuilderValueTypes.QUALITY_PROFILE
},
{
name: 'languageProfileId',
label: 'Language Profile',
type: filterBuilderTypes.EXACT,
valueType: filterBuilderValueTypes.LANGUAGE_PROFILE
},
{
name: 'metadataProfileId',
label: 'Metadata Profile',

6
frontend/src/Store/Actions/artistEditorActions.js
View file

@ -49,12 +49,6 @@ export const defaultState = {
type: filterBuilderTypes.EXACT,
valueType: filterBuilderValueTypes.QUALITY_PROFILE
},
{
name: 'languageProfileId',
label: 'Language Profile',
type: filterBuilderTypes.EXACT,
valueType: filterBuilderValueTypes.LANGUAGE_PROFILE
},
{
name: 'metadataProfileId',
label: 'Metadata Profile',

12
frontend/src/Store/Actions/artistIndexActions.js
View file

@ -85,12 +85,6 @@ export const defaultState = {
isSortable: true,
isVisible: true
},
{
name: 'languageProfileId',
label: 'Language Profile',
isSortable: true,
isVisible: false
},
{
name: 'metadataProfileId',
label: 'Metadata Profile',
@ -250,12 +244,6 @@ export const defaultState = {
type: filterBuilderTypes.EXACT,
valueType: filterBuilderValueTypes.QUALITY_PROFILE
},
{
name: 'languageProfileId',
label: 'Language Profile',
type: filterBuilderTypes.EXACT,
valueType: filterBuilderValueTypes.LANGUAGE_PROFILE
},
{
name: 'metadataProfileId',
label: 'Metadata Profile',

5
frontend/src/Store/Actions/blacklistActions.js
View file

@ -38,11 +38,6 @@ export const defaultState = {
isSortable: true,
isVisible: true
},
{
name: 'language',
label: 'Language',
isVisible: false
},
{
name: 'quality',
label: 'Quality',

5
frontend/src/Store/Actions/historyActions.js
View file

@ -50,11 +50,6 @@ export const defaultState = {
label: 'Track Title',
isVisible: true
},
{
name: 'language',
label: 'Language',
isVisible: false
},
{
name: 'quality',
label: 'Quality',

6
frontend/src/Store/Actions/queueActions.js
View file

@ -80,12 +80,6 @@ export const defaultState = {
isSortable: true,
isVisible: false
},
{
name: 'language',
label: 'Language',
isSortable: true,
isVisible: false
},
{
name: 'quality',
label: 'Quality',

5
frontend/src/Store/Actions/settingsActions.js
View file

@ -7,7 +7,6 @@ import downloadClientOptions from './Settings/downloadClientOptions';
import general from './Settings/general';
import indexerOptions from './Settings/indexerOptions';
import indexers from './Settings/indexers';
import languageProfiles from './Settings/languageProfiles';
import importLists from './Settings/importLists';
import importListExclusions from './Settings/importListExclusions';
import metadataProfiles from './Settings/metadataProfiles';
@ -31,7 +30,6 @@ export * from './Settings/importLists';
export * from './Settings/importListExclusions';
export * from './Settings/indexerOptions';
export * from './Settings/indexers';
export * from './Settings/languageProfiles';
export * from './Settings/metadataProfiles';
export * from './Settings/mediaManagement';
export * from './Settings/metadata';
@ -62,7 +60,6 @@ export const defaultState = {
general: general.defaultState,
indexerOptions: indexerOptions.defaultState,
indexers: indexers.defaultState,
languageProfiles: languageProfiles.defaultState,
importLists: importLists.defaultState,
importListExclusions: importListExclusions.defaultState,
metadataProfiles: metadataProfiles.defaultState,
@ -103,7 +100,6 @@ export const actionHandlers = handleThunks({
...general.actionHandlers,
...indexerOptions.actionHandlers,
...indexers.actionHandlers,
...languageProfiles.actionHandlers,
...importLists.actionHandlers,
...importListExclusions.actionHandlers,
...metadataProfiles.actionHandlers,
@ -135,7 +131,6 @@ export const reducers = createHandleActions({
...general.reducers,
...indexerOptions.reducers,
...indexers.reducers,
...languageProfiles.reducers,
...importLists.reducers,
...importListExclusions.reducers,
...metadataProfiles.reducers,

5
frontend/src/Store/Actions/trackActions.js
View file

@ -55,11 +55,6 @@ export const defaultState = {
label: 'Duration',
isVisible: true
},
{
name: 'language',
label: 'Language',
isVisible: false
},
{
name: 'audioInfo',
label: 'Audio Info',

9
frontend/src/Store/Actions/trackFileActions.js
View file

@ -139,7 +139,6 @@ export const actionHandlers = handleThunks({
[UPDATE_TRACK_FILES]: function(getState, payload, dispatch) {
const {
trackFileIds,
language,
quality
} = payload;
@ -149,10 +148,6 @@ export const actionHandlers = handleThunks({
trackFileIds
};
if (language) {
data.language = language;
}
if (quality) {
data.quality = quality;
}
@ -169,10 +164,6 @@ export const actionHandlers = handleThunks({
...trackFileIds.map((id) => {
const props = {};
if (language) {
props.language = language;
}
if (quality) {
props.quality = quality;
}

5
frontend/src/Store/Actions/wantedActions.js
View file

@ -125,11 +125,6 @@ export const defaultState = {
isSortable: true,
isVisible: true
},
{
name: 'language',
label: 'Language',
isVisible: false
},
// {
// name: 'status',
// label: 'Status',

16
frontend/src/Store/Selectors/createArtistLanguageProfileSelector.js
View file

@ -1,16 +0,0 @@
import { createSelector } from 'reselect';
import createArtistSelector from './createArtistSelector';
function createArtistLanguageProfileSelector() {
return createSelector(
(state) => state.settings.languageProfiles.items,
createArtistSelector(),
(languageProfiles, artist = {}) => {
return languageProfiles.find((profile) => {
return profile.id === artist.languageProfileId;
});
}
);
}
export default createArtistLanguageProfileSelector;

15
frontend/src/Store/Selectors/createLanguageProfileSelector.js
View file

@ -1,15 +0,0 @@
import { createSelector } from 'reselect';
function createLanguageProfileSelector() {
return createSelector(
(state, { languageProfileId }) => languageProfileId,
(state) => state.settings.languageProfiles.items,
(languageProfileId, languageProfiles) => {
return languageProfiles.find((profile) => {
return profile.id === languageProfileId;
});
}
);
}
export default createLanguageProfileSelector;

37
frontend/src/TrackFile/Editor/TrackFileEditorModalContent.js
View file

@ -32,11 +32,6 @@ const columns = [
label: 'Relative Path',
isVisible: true
},
{
name: 'language',
label: 'Language',
isVisible: true
},
{
name: 'quality',
label: 'Quality',
@ -112,16 +107,6 @@ class TrackFileEditorModalContent extends Component {
this.setState({ isConfirmDeleteModalOpen: false });
}
onLanguageChange = ({ value }) => {
const selectedIds = this.getSelectedIds();
if (!selectedIds.length) {
return;
}
this.props.onLanguageChange(selectedIds, parseInt(value));
}
onQualityChange = ({ value }) => {
const selectedIds = this.getSelectedIds();
@ -142,7 +127,6 @@ class TrackFileEditorModalContent extends Component {
isPopulated,
error,
items,
languages,
qualities,
onModalClose
} = this.props;
@ -154,15 +138,6 @@ class TrackFileEditorModalContent extends Component {
isConfirmDeleteModalOpen
} = this.state;
const languageOptions = _.reduceRight(languages, (acc, language) => {
acc.push({
key: language.id,
value: language.name
});
return acc;
}, [{ key: 'selectLanguage', value: 'Select Language', disabled: true }]);
const qualityOptions = _.reduceRight(qualities, (acc, quality) => {
acc.push({
key: quality.id,
@ -240,16 +215,6 @@ class TrackFileEditorModalContent extends Component {
Delete
</SpinnerButton>
<div className={styles.selectInput}>
<SelectInput
name="language"
value="selectLanguage"
values={languageOptions}
isDisabled={!hasSelectedFiles}
onChange={this.onLanguageChange}
/>
</div>
<div className={styles.selectInput}>
<SelectInput
name="quality"
@ -288,10 +253,8 @@ TrackFileEditorModalContent.propTypes = {
isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
languages: PropTypes.arrayOf(PropTypes.object).isRequired,
qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
onDeletePress: PropTypes.func.isRequired,
onLanguageChange: PropTypes.func.isRequired,
onQualityChange: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};

31
frontend/src/TrackFile/Editor/TrackFileEditorModalContentConnector.js
View file

@ -8,30 +8,25 @@ import getQualities from 'Utilities/Quality/getQualities';
import createArtistSelector from 'Store/Selectors/createArtistSelector';
import { deleteTrackFiles, updateTrackFiles } from 'Store/Actions/trackFileActions';
import { fetchTracks, clearTracks } from 'Store/Actions/trackActions';
import { fetchLanguageProfileSchema, fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
import { fetchQualityProfileSchema } from 'Store/Actions/settingsActions';
import TrackFileEditorModalContent from './TrackFileEditorModalContent';
function createSchemaSelector() {
return createSelector(
(state) => state.settings.languageProfiles,
(state) => state.settings.qualityProfiles,
(languageProfiles, qualityProfiles) => {
const languages = _.map(languageProfiles.schema.languages, 'language');
(qualityProfiles) => {
const qualities = getQualities(qualityProfiles.schema.items);
let error = null;
if (languageProfiles.schemaError) {
error = 'Unable to load languages';
} else if (qualityProfiles.schemaError) {
if (qualityProfiles.schemaError) {
error = 'Unable to load qualities';
}
return {
isFetching: languageProfiles.isSchemaFetching || qualityProfiles.isSchemaFetching,
isPopulated: languageProfiles.isSchemaPopulated && qualityProfiles.isSchemaPopulated,
isFetching: qualityProfiles.isSchemaFetching,
isPopulated: qualityProfiles.isSchemaPopulated,
error,
languages,
qualities
};
}
@ -71,7 +66,6 @@ function createMapStateToProps() {
return {
relativePath: trackFile.relativePath,
language: trackFile.language,
quality: trackFile.quality,
...track
};
@ -98,10 +92,6 @@ function createMapDispatchToProps(dispatch, props) {
dispatch(fetchTracks(updateProps));
},
dispatchFetchLanguageProfileSchema(name, path) {
dispatch(fetchLanguageProfileSchema());
},
dispatchFetchQualityProfileSchema(name, path) {
dispatch(fetchQualityProfileSchema());
},
@ -127,7 +117,6 @@ class TrackFileEditorModalContentConnector extends Component {
this.props.dispatchFetchTracks({ artistId, albumId });
this.props.dispatchFetchLanguageProfileSchema();
this.props.dispatchFetchQualityProfileSchema();
}
@ -138,12 +127,6 @@ class TrackFileEditorModalContentConnector extends Component {
//
// Listeners
onLanguageChange = (trackFileIds, languageId) => {
const language = _.find(this.props.languages, { id: languageId });
this.props.dispatchUpdateTrackFiles({ trackFileIds, language });
}
onQualityChange = (trackFileIds, qualityId) => {
const quality = {
quality: _.find(this.props.qualities, { id: qualityId }),
@ -161,7 +144,6 @@ class TrackFileEditorModalContentConnector extends Component {
render() {
const {
dispatchFetchLanguageProfileSchema,
dispatchFetchQualityProfileSchema,
dispatchUpdateTrackFiles,
dispatchFetchTracks,
@ -172,7 +154,6 @@ class TrackFileEditorModalContentConnector extends Component {
return (
<TrackFileEditorModalContent
{...otherProps}
onLanguageChange={this.onLanguageChange}
onQualityChange={this.onQualityChange}
/>
);
@ -182,11 +163,9 @@ class TrackFileEditorModalContentConnector extends Component {
TrackFileEditorModalContentConnector.propTypes = {
artistId: PropTypes.number.isRequired,
albumId: PropTypes.number,
languages: PropTypes.arrayOf(PropTypes.object).isRequired,
qualities: PropTypes.arrayOf(PropTypes.object).isRequired,
dispatchFetchTracks: PropTypes.func.isRequired,
dispatchClearTracks: PropTypes.func.isRequired,
dispatchFetchLanguageProfileSchema: PropTypes.func.isRequired,
dispatchFetchQualityProfileSchema: PropTypes.func.isRequired,
dispatchUpdateTrackFiles: PropTypes.func.isRequired
};

9
frontend/src/TrackFile/Editor/TrackFileEditorRow.js
View file

@ -1,7 +1,6 @@
import PropTypes from 'prop-types';
import React from 'react';
import padNumber from 'Utilities/Number/padNumber';
import Label from 'Components/Label';
import TableRow from 'Components/Table/TableRow';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
@ -12,7 +11,6 @@ function TrackFileEditorRow(props) {
id,
trackNumber,
relativePath,
language,
quality,
isSelected,
onSelectedChange
@ -34,12 +32,6 @@ function TrackFileEditorRow(props) {
{relativePath}
</TableRowCell>
<TableRowCell>
<Label>
{language.name}
</Label>
</TableRowCell>
<TableRowCell>
<TrackQuality
quality={quality}
@ -53,7 +45,6 @@ TrackFileEditorRow.propTypes = {
id: PropTypes.number.isRequired,
trackNumber: PropTypes.string.isRequired,
relativePath: PropTypes.string.isRequired,
language: PropTypes.object.isRequired,
quality: PropTypes.object.isRequired,
isSelected: PropTypes.bool,
onSelectedChange: PropTypes.func.isRequired

Some files were not shown because too many files have changed in this diff Show more