Series Type
@@ -308,16 +276,13 @@ ImportSeriesFooter.propTypes = {
isLookingUpSeries: PropTypes.bool.isRequired,
defaultMonitor: PropTypes.string.isRequired,
defaultQualityProfileId: PropTypes.number,
- defaultLanguageProfileId: PropTypes.number,
defaultSeriesType: PropTypes.string.isRequired,
defaultSeasonFolder: PropTypes.bool.isRequired,
isMonitorMixed: PropTypes.bool.isRequired,
isQualityProfileIdMixed: PropTypes.bool.isRequired,
- isLanguageProfileIdMixed: PropTypes.bool.isRequired,
isSeriesTypeMixed: PropTypes.bool.isRequired,
isSeasonFolderMixed: PropTypes.bool.isRequired,
hasUnsearchedItems: PropTypes.bool.isRequired,
- showLanguageProfile: PropTypes.bool.isRequired,
importError: PropTypes.object,
onInputChange: PropTypes.func.isRequired,
onImportPress: PropTypes.func.isRequired,
diff --git a/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesFooterConnector.js b/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesFooterConnector.js
index d43fc6553..12a90aae7 100644
--- a/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesFooterConnector.js
+++ b/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesFooterConnector.js
@@ -19,7 +19,6 @@ function createMapStateToProps() {
const {
monitor: defaultMonitor,
qualityProfileId: defaultQualityProfileId,
- languageProfileId: defaultLanguageProfileId,
seriesType: defaultSeriesType,
seasonFolder: defaultSeasonFolder
} = addSeries.defaults;
@@ -33,7 +32,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 isSeriesTypeMixed = isMixed(items, selectedIds, defaultSeriesType, 'seriesType');
const isSeasonFolderMixed = isMixed(items, selectedIds, defaultSeasonFolder, 'seasonFolder');
const hasUnsearchedItems = !isLookingUpSeries && items.some((item) => !item.isPopulated);
@@ -44,12 +42,10 @@ function createMapStateToProps() {
isImporting,
defaultMonitor,
defaultQualityProfileId,
- defaultLanguageProfileId,
defaultSeriesType,
defaultSeasonFolder,
isMonitorMixed,
isQualityProfileIdMixed,
- isLanguageProfileIdMixed,
isSeriesTypeMixed,
isSeasonFolderMixed,
importError,
diff --git a/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesHeader.css b/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesHeader.css
index 00284e107..df5214bdd 100644
--- a/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesHeader.css
+++ b/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesHeader.css
@@ -11,8 +11,7 @@
min-width: 185px;
}
-.qualityProfile,
-.languageProfile {
+.qualityProfile {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
flex: 0 1 250px;
diff --git a/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesHeader.js b/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesHeader.js
index d9af38560..d6ce86bad 100644
--- a/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesHeader.js
+++ b/frontend/src/AddSeries/ImportSeries/Import/ImportSeriesHeader.js
@@ -12,7 +12,6 @@ import styles from './ImportSeriesHeader.css';
function ImportSeriesHeader(props) {
const {
- showLanguageProfile,
allSelected,
allUnselected,
onSelectAllChange
@@ -59,16 +58,6 @@ function ImportSeriesHeader(props) {
Quality Profile
- {
- showLanguageProfile &&
-
- Language Profile
-
- }
-
-
-
-
-
}
- {
- showCutoffUnmetIcon &&
- !!episodeFile &&
- episodeFile.languageCutoffNotMet &&
- !episodeFile.qualityCutoffNotMet &&
-
- }
-
{
episodeNumber === 1 && seasonNumber > 0 &&
:
- null
- }
-
{
episodeNumber === 1 && seasonNumber > 0 ?
);
}
diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js
index f6d0a8b6d..516ddf193 100644
--- a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js
@@ -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 ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue';
import QualityFilterBuilderRowValueConnector from './QualityFilterBuilderRowValueConnector';
import QualityProfileFilterBuilderRowValueConnector from './QualityProfileFilterBuilderRowValueConnector';
@@ -61,9 +60,6 @@ function getRowValueConnector(selectedFilterBuilderProp) {
case filterBuilderValueTypes.INDEXER:
return IndexerFilterBuilderRowValueConnector;
- case filterBuilderValueTypes.LANGUAGE_PROFILE:
- return LanguageProfileFilterBuilderRowValueConnector;
-
case filterBuilderValueTypes.PROTOCOL:
return ProtocolFilterBuilderRowValue;
diff --git a/frontend/src/Components/Filter/Builder/LanguageProfileFilterBuilderRowValueConnector.js b/frontend/src/Components/Filter/Builder/LanguageProfileFilterBuilderRowValueConnector.js
deleted file mode 100644
index 31b1e952a..000000000
--- a/frontend/src/Components/Filter/Builder/LanguageProfileFilterBuilderRowValueConnector.js
+++ /dev/null
@@ -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);
diff --git a/frontend/src/Components/Form/FormInputGroup.js b/frontend/src/Components/Form/FormInputGroup.js
index 5951520d5..94780aba2 100644
--- a/frontend/src/Components/Form/FormInputGroup.js
+++ b/frontend/src/Components/Form/FormInputGroup.js
@@ -12,7 +12,6 @@ import EnhancedSelectInputConnector from './EnhancedSelectInputConnector';
import FormInputHelpText from './FormInputHelpText';
import IndexerSelectInputConnector from './IndexerSelectInputConnector';
import KeyValueListInput from './KeyValueListInput';
-import LanguageProfileSelectInputConnector from './LanguageProfileSelectInputConnector';
import MonitorEpisodesSelectInput from './MonitorEpisodesSelectInput';
import NumberInput from './NumberInput';
import OAuthInputConnector from './OAuthInputConnector';
@@ -64,9 +63,6 @@ function getComponent(type) {
case inputTypes.QUALITY_PROFILE_SELECT:
return QualityProfileSelectInputConnector;
- case inputTypes.LANGUAGE_PROFILE_SELECT:
- return LanguageProfileSelectInputConnector;
-
case inputTypes.INDEXER_SELECT:
return IndexerSelectInputConnector;
diff --git a/frontend/src/Components/Form/LanguageProfileSelectInputConnector.js b/frontend/src/Components/Form/LanguageProfileSelectInputConnector.js
deleted file mode 100644
index 01c00969d..000000000
--- a/frontend/src/Components/Form/LanguageProfileSelectInputConnector.js
+++ /dev/null
@@ -1,99 +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 createSortedSectionSelector from 'Store/Selectors/createSortedSectionSelector';
-import sortByName from 'Utilities/Array/sortByName';
-import SelectInput from './SelectInput';
-
-function createMapStateToProps() {
- return createSelector(
- createSortedSectionSelector('settings.languageProfiles', sortByName),
- (state, { includeNoChange }) => includeNoChange,
- (state, { includeMixed }) => includeMixed,
- (languageProfiles, includeNoChange, includeMixed) => {
- const values = _.map(languageProfiles.items, (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 (
-
- );
- }
-}
-
-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);
diff --git a/frontend/src/Components/Form/LanguageSelectInputConnector.js b/frontend/src/Components/Form/LanguageSelectInputConnector.js
new file mode 100644
index 000000000..dd3a52017
--- /dev/null
+++ b/frontend/src/Components/Form/LanguageSelectInputConnector.js
@@ -0,0 +1,52 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import EnhancedSelectInput from './EnhancedSelectInput';
+
+function createMapStateToProps() {
+ return createSelector(
+ (state, { values }) => values,
+ ( languages ) => {
+
+ const minId = languages.reduce((min, v) => (v.key < 1 ? v.key : min), languages[0].key);
+
+ const values = languages.map(({ key, value }) => {
+ return {
+ key,
+ value,
+ dividerAfter: minId < 1 ? key === minId : false
+ };
+ });
+
+ return {
+ values
+ };
+ }
+ );
+}
+
+class LanguageSelectInputConnector extends Component {
+
+ //
+ // Render
+
+ render() {
+
+ return (
+
+ );
+ }
+}
+
+LanguageSelectInputConnector.propTypes = {
+ name: PropTypes.string.isRequired,
+ value: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.number), PropTypes.number]).isRequired,
+ values: PropTypes.arrayOf(PropTypes.object).isRequired,
+ onChange: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps)(LanguageSelectInputConnector);
diff --git a/frontend/src/Components/Page/ErrorPage.js b/frontend/src/Components/Page/ErrorPage.js
index 7e2f5e405..fbbc1af25 100644
--- a/frontend/src/Components/Page/ErrorPage.js
+++ b/frontend/src/Components/Page/ErrorPage.js
@@ -11,7 +11,6 @@ function ErrorPage(props) {
customFiltersError,
tagsError,
qualityProfilesError,
- languageProfilesError,
uiSettingsError,
systemStatusError
} = props;
@@ -28,8 +27,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 (uiSettingsError) {
errorMessage = getErrorMessage(uiSettingsError, 'Failed to load UI settings from API');
} else if (systemStatusError) {
@@ -56,7 +53,6 @@ ErrorPage.propTypes = {
customFiltersError: PropTypes.object,
tagsError: PropTypes.object,
qualityProfilesError: PropTypes.object,
- languageProfilesError: PropTypes.object,
uiSettingsError: PropTypes.object,
systemStatusError: PropTypes.object
};
diff --git a/frontend/src/Components/Page/PageConnector.js b/frontend/src/Components/Page/PageConnector.js
index 0cd28240b..a3127eddf 100644
--- a/frontend/src/Components/Page/PageConnector.js
+++ b/frontend/src/Components/Page/PageConnector.js
@@ -6,7 +6,7 @@ import { createSelector } from 'reselect';
import { saveDimensions, setIsSidebarVisible } from 'Store/Actions/appActions';
import { fetchCustomFilters } from 'Store/Actions/customFilterActions';
import { fetchSeries } from 'Store/Actions/seriesActions';
-import { fetchImportLists, fetchLanguageProfiles, fetchQualityProfiles, fetchUISettings } from 'Store/Actions/settingsActions';
+import { fetchImportLists, fetchLanguages, fetchQualityProfiles, fetchUISettings } from 'Store/Actions/settingsActions';
import { fetchStatus } from 'Store/Actions/systemActions';
import { fetchTags } from 'Store/Actions/tagActions';
import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
@@ -49,7 +49,7 @@ 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.languages.isPopulated,
(state) => state.settings.importLists.isPopulated,
(state) => state.system.status.isPopulated,
(
@@ -58,7 +58,7 @@ const selectIsPopulated = createSelector(
tagsIsPopulated,
uiSettingsIsPopulated,
qualityProfilesIsPopulated,
- languageProfilesIsPopulated,
+ languagesIsPopulated,
importListsIsPopulated,
systemStatusIsPopulated
) => {
@@ -68,7 +68,7 @@ const selectIsPopulated = createSelector(
tagsIsPopulated &&
uiSettingsIsPopulated &&
qualityProfilesIsPopulated &&
- languageProfilesIsPopulated &&
+ languagesIsPopulated &&
importListsIsPopulated &&
systemStatusIsPopulated
);
@@ -81,7 +81,7 @@ 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.languages.error,
(state) => state.settings.importLists.error,
(state) => state.system.status.error,
(
@@ -90,7 +90,7 @@ const selectErrors = createSelector(
tagsError,
uiSettingsError,
qualityProfilesError,
- languageProfilesError,
+ languagesError,
importListsError,
systemStatusError
) => {
@@ -100,7 +100,7 @@ const selectErrors = createSelector(
tagsError ||
uiSettingsError ||
qualityProfilesError ||
- languageProfilesError ||
+ languagesError ||
importListsError ||
systemStatusError
);
@@ -112,7 +112,7 @@ const selectErrors = createSelector(
tagsError,
uiSettingsError,
qualityProfilesError,
- languageProfilesError,
+ languagesError,
importListsError,
systemStatusError
};
@@ -161,8 +161,8 @@ function createMapDispatchToProps(dispatch, props) {
dispatchFetchQualityProfiles() {
dispatch(fetchQualityProfiles());
},
- dispatchFetchLanguageProfiles() {
- dispatch(fetchLanguageProfiles());
+ dispatchFetchLanguages() {
+ dispatch(fetchLanguages());
},
dispatchFetchImportLists() {
dispatch(fetchImportLists());
@@ -201,7 +201,7 @@ class PageConnector extends Component {
this.props.dispatchFetchCustomFilters();
this.props.dispatchFetchTags();
this.props.dispatchFetchQualityProfiles();
- this.props.dispatchFetchLanguageProfiles();
+ this.props.dispatchFetchLanguages();
this.props.dispatchFetchImportLists();
this.props.dispatchFetchUISettings();
this.props.dispatchFetchStatus();
@@ -225,7 +225,7 @@ class PageConnector extends Component {
dispatchFetchSeries,
dispatchFetchTags,
dispatchFetchQualityProfiles,
- dispatchFetchLanguageProfiles,
+ dispatchFetchLanguages,
dispatchFetchImportLists,
dispatchFetchUISettings,
dispatchFetchStatus,
@@ -264,7 +264,7 @@ PageConnector.propTypes = {
dispatchFetchCustomFilters: PropTypes.func.isRequired,
dispatchFetchTags: PropTypes.func.isRequired,
dispatchFetchQualityProfiles: PropTypes.func.isRequired,
- dispatchFetchLanguageProfiles: PropTypes.func.isRequired,
+ dispatchFetchLanguages: PropTypes.func.isRequired,
dispatchFetchImportLists: PropTypes.func.isRequired,
dispatchFetchUISettings: PropTypes.func.isRequired,
dispatchFetchStatus: PropTypes.func.isRequired,
diff --git a/frontend/src/Episode/EpisodeLanguage.js b/frontend/src/Episode/EpisodeLanguage.js
deleted file mode 100644
index 52c8b3390..000000000
--- a/frontend/src/Episode/EpisodeLanguage.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Label from 'Components/Label';
-import { kinds } from 'Helpers/Props';
-
-function EpisodeLanguage(props) {
- const {
- className,
- language,
- isCutoffNotMet
- } = props;
-
- if (!language) {
- return null;
- }
-
- return (
-
- );
-}
-
-EpisodeLanguage.propTypes = {
- className: PropTypes.string,
- language: PropTypes.object,
- isCutoffNotMet: PropTypes.bool
-};
-
-EpisodeLanguage.defaultProps = {
- isCutoffNotMet: true
-};
-
-export default EpisodeLanguage;
diff --git a/frontend/src/Episode/EpisodeLanguages.js b/frontend/src/Episode/EpisodeLanguages.js
new file mode 100644
index 000000000..53e3854cc
--- /dev/null
+++ b/frontend/src/Episode/EpisodeLanguages.js
@@ -0,0 +1,69 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Label from 'Components/Label';
+import Popover from 'Components/Tooltip/Popover';
+import { kinds, tooltipPositions } from 'Helpers/Props';
+
+function EpisodeLanguages(props) {
+ const {
+ className,
+ languages,
+ isCutoffNotMet
+ } = props;
+
+ if (!languages) {
+ return null;
+ }
+
+ if (languages.length === 1) {
+ return (
+
+ );
+ }
+
+ return (
+
+ Multi-Languages
+
+ }
+ title={'Languages'}
+ body={
+
+ {
+ languages.map((language) => {
+ return (
+ -
+ {language.name}
+
+ );
+ })
+ }
+
+ }
+ position={tooltipPositions.LEFT}
+ />
+ );
+}
+
+EpisodeLanguages.propTypes = {
+ className: PropTypes.string,
+ languages: PropTypes.arrayOf(PropTypes.object),
+ isCutoffNotMet: PropTypes.bool
+};
+
+EpisodeLanguages.defaultProps = {
+ isCutoffNotMet: true
+};
+
+export default EpisodeLanguages;
diff --git a/frontend/src/Episode/History/EpisodeHistory.js b/frontend/src/Episode/History/EpisodeHistory.js
index e85c9589d..ebf6eaaff 100644
--- a/frontend/src/Episode/History/EpisodeHistory.js
+++ b/frontend/src/Episode/History/EpisodeHistory.js
@@ -18,8 +18,8 @@ const columns = [
isVisible: true
},
{
- name: 'language',
- label: 'Language',
+ name: 'languages',
+ label: 'Languages',
isVisible: true
},
{
diff --git a/frontend/src/Episode/History/EpisodeHistoryRow.js b/frontend/src/Episode/History/EpisodeHistoryRow.js
index f6a824b28..e02883124 100644
--- a/frontend/src/Episode/History/EpisodeHistoryRow.js
+++ b/frontend/src/Episode/History/EpisodeHistoryRow.js
@@ -11,7 +11,7 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
import TableRow from 'Components/Table/TableRow';
import Popover from 'Components/Tooltip/Popover';
import Tooltip from 'Components/Tooltip/Tooltip';
-import EpisodeLanguage from 'Episode/EpisodeLanguage';
+import EpisodeLanguages from 'Episode/EpisodeLanguages';
import EpisodeQuality from 'Episode/EpisodeQuality';
import { icons, kinds, tooltipPositions } from 'Helpers/Props';
import formatPreferredWordScore from 'Utilities/Number/formatPreferredWordScore';
@@ -65,7 +65,7 @@ class EpisodeHistoryRow extends Component {
const {
eventType,
sourceTitle,
- language,
+ languages,
languageCutoffNotMet,
quality,
qualityCutoffNotMet,
@@ -90,8 +90,8 @@ class EpisodeHistoryRow extends Component {
-
@@ -177,7 +177,7 @@ EpisodeHistoryRow.propTypes = {
id: PropTypes.number.isRequired,
eventType: PropTypes.string.isRequired,
sourceTitle: PropTypes.string.isRequired,
- language: PropTypes.object.isRequired,
+ languages: PropTypes.arrayOf(PropTypes.object).isRequired,
languageCutoffNotMet: PropTypes.bool.isRequired,
quality: PropTypes.object.isRequired,
qualityCutoffNotMet: PropTypes.bool.isRequired,
diff --git a/frontend/src/Episode/Summary/EpisodeFileRow.css b/frontend/src/Episode/Summary/EpisodeFileRow.css
index 565a785f0..a8b5f9372 100644
--- a/frontend/src/Episode/Summary/EpisodeFileRow.css
+++ b/frontend/src/Episode/Summary/EpisodeFileRow.css
@@ -4,7 +4,7 @@
width: 100px;
}
-.language,
+.languages,
.quality {
composes: cell from '~Components/Table/Cells/TableRowCell.css';
diff --git a/frontend/src/Episode/Summary/EpisodeFileRow.js b/frontend/src/Episode/Summary/EpisodeFileRow.js
index 32994a197..901771a48 100644
--- a/frontend/src/Episode/Summary/EpisodeFileRow.js
+++ b/frontend/src/Episode/Summary/EpisodeFileRow.js
@@ -6,7 +6,7 @@ import ConfirmModal from 'Components/Modal/ConfirmModal';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
import TableRow from 'Components/Table/TableRow';
import Popover from 'Components/Tooltip/Popover';
-import EpisodeLanguage from 'Episode/EpisodeLanguage';
+import EpisodeLanguages from 'Episode/EpisodeLanguages';
import EpisodeQuality from 'Episode/EpisodeQuality';
import { icons, kinds, tooltipPositions } from 'Helpers/Props';
import formatBytes from 'Utilities/Number/formatBytes';
@@ -50,7 +50,7 @@ class EpisodeFileRow extends Component {
const {
path,
size,
- language,
+ languages,
quality,
languageCutoffNotMet,
qualityCutoffNotMet,
@@ -87,14 +87,14 @@ class EpisodeFileRow extends Component {
);
}
- if (name === 'language') {
+ if (name === 'languages') {
return (
-
@@ -167,7 +167,7 @@ class EpisodeFileRow extends Component {
EpisodeFileRow.propTypes = {
path: PropTypes.string.isRequired,
size: PropTypes.number.isRequired,
- language: PropTypes.object.isRequired,
+ languages: PropTypes.arrayOf(PropTypes.object).isRequired,
languageCutoffNotMet: PropTypes.bool.isRequired,
quality: PropTypes.object.isRequired,
qualityCutoffNotMet: PropTypes.bool.isRequired,
diff --git a/frontend/src/Episode/Summary/EpisodeSummary.js b/frontend/src/Episode/Summary/EpisodeSummary.js
index 37d9f2150..74e6d7336 100644
--- a/frontend/src/Episode/Summary/EpisodeSummary.js
+++ b/frontend/src/Episode/Summary/EpisodeSummary.js
@@ -24,8 +24,8 @@ const columns = [
isVisible: true
},
{
- name: 'language',
- label: 'Language',
+ name: 'languages',
+ label: 'Languages',
isSortable: false,
isVisible: true
},
@@ -84,7 +84,7 @@ class EpisodeSummary extends Component {
mediaInfo,
path,
size,
- language,
+ languages,
quality,
languageCutoffNotMet,
qualityCutoffNotMet,
@@ -132,7 +132,7 @@ class EpisodeSummary extends Component {
{
return {
- language: episodeFile ? episodeFile.language : undefined
+ languages: episodeFile ? episodeFile.languages : undefined
};
}
);
}
-export default connect(createMapStateToProps)(EpisodeLanguage);
+export default connect(createMapStateToProps)(EpisodeLanguages);
diff --git a/frontend/src/Helpers/Props/filterBuilderValueTypes.js b/frontend/src/Helpers/Props/filterBuilderValueTypes.js
index 0490975a6..a1f8f499d 100644
--- a/frontend/src/Helpers/Props/filterBuilderValueTypes.js
+++ b/frontend/src/Helpers/Props/filterBuilderValueTypes.js
@@ -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 PROTOCOL = 'protocol';
export const QUALITY = 'quality';
export const QUALITY_PROFILE = 'qualityProfile';
diff --git a/frontend/src/Helpers/Props/inputTypes.js b/frontend/src/Helpers/Props/inputTypes.js
index 8bba563a2..d0aecd281 100644
--- a/frontend/src/Helpers/Props/inputTypes.js
+++ b/frontend/src/Helpers/Props/inputTypes.js
@@ -9,8 +9,8 @@ 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 INDEXER_SELECT = 'indexerSelect';
+export const LANGUAGE_SELECT = 'languageSelect';
export const DOWNLOAD_CLIENT_SELECT = 'downloadClientSelect';
export const ROOT_FOLDER_SELECT = 'rootFolderSelect';
export const SELECT = 'select';
@@ -35,10 +35,10 @@ export const all = [
PASSWORD,
PATH,
QUALITY_PROFILE_SELECT,
- LANGUAGE_PROFILE_SELECT,
INDEXER_SELECT,
DOWNLOAD_CLIENT_SELECT,
ROOT_FOLDER_SELECT,
+ LANGUAGE_SELECT,
SELECT,
DYNAMIC_SELECT,
SERIES_TYPE_SELECT,
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
index 214d8c189..4d52272c7 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
@@ -66,8 +66,8 @@ const columns = [
isVisible: true
},
{
- name: 'language',
- label: 'Language',
+ name: 'languages',
+ label: 'Languages',
isSortable: true,
isVisible: true
},
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js
index 92db91013..360f59652 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js
@@ -193,7 +193,7 @@ class InteractiveImportModalContentConnector extends Component {
episodes,
releaseGroup,
quality,
- language,
+ languages,
episodeFileId
} = item;
@@ -217,8 +217,8 @@ class InteractiveImportModalContentConnector extends Component {
return;
}
- if (!language) {
- this.setState({ interactiveImportErrorMessage: 'Language must be chosen for each selected file' });
+ if (!languages) {
+ this.setState({ interactiveImportErrorMessage: 'Language(s) must be chosen for each selected file' });
return;
}
@@ -230,7 +230,7 @@ class InteractiveImportModalContentConnector extends Component {
id: episodeFileId,
releaseGroup,
quality,
- language
+ languages
});
return;
@@ -244,7 +244,7 @@ class InteractiveImportModalContentConnector extends Component {
episodeIds: episodes.map((e) => e.id),
releaseGroup,
quality,
- language,
+ languages,
downloadId: this.props.downloadId,
episodeFileId
});
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
index 012108f8c..b2304553f 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.css
@@ -5,7 +5,7 @@
}
.quality,
-.language {
+.languages {
composes: cell from '~Components/Table/Cells/TableRowCell.css';
text-align: center;
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
index ba8c29ae5..8e89c4b9e 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js
@@ -7,7 +7,7 @@ import TableRowCellButton from 'Components/Table/Cells/TableRowCellButton';
import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
import TableRow from 'Components/Table/TableRow';
import Popover from 'Components/Tooltip/Popover';
-import EpisodeLanguage from 'Episode/EpisodeLanguage';
+import EpisodeLanguages from 'Episode/EpisodeLanguages';
import EpisodeQuality from 'Episode/EpisodeQuality';
import { icons, kinds, tooltipPositions } from 'Helpers/Props';
import SelectEpisodeModal from 'InteractiveImport/Episode/SelectEpisodeModal';
@@ -47,7 +47,7 @@ class InteractiveImportRow extends Component {
seasonNumber,
episodes,
quality,
- language,
+ languages,
episodeFileId,
columns
} = this.props;
@@ -58,7 +58,7 @@ class InteractiveImportRow extends Component {
seasonNumber != null &&
episodes.length &&
quality &&
- language
+ languages
) {
this.props.onSelectedChange({
id,
@@ -79,7 +79,7 @@ class InteractiveImportRow extends Component {
seasonNumber,
episodes,
quality,
- language,
+ languages,
isSelected,
onValidRowChange
} = this.props;
@@ -89,7 +89,7 @@ class InteractiveImportRow extends Component {
prevProps.seasonNumber === seasonNumber &&
!hasDifferentItems(prevProps.episodes, episodes) &&
prevProps.quality === quality &&
- prevProps.language === language &&
+ prevProps.languages === languages &&
prevProps.isSelected === isSelected
) {
return;
@@ -100,7 +100,7 @@ class InteractiveImportRow extends Component {
seasonNumber != null &&
episodes.length &&
quality &&
- language
+ languages
);
if (isSelected && !isValid) {
@@ -210,7 +210,7 @@ class InteractiveImportRow extends Component {
seasonNumber,
episodes,
quality,
- language,
+ languages,
releaseGroup,
size,
rejections,
@@ -252,7 +252,7 @@ class InteractiveImportRow extends Component {
const showEpisodeNumbersPlaceholder = isSelected && Number.isInteger(seasonNumber) && !episodes.length;
const showReleaseGroupPlaceholder = isSelected && !releaseGroup;
const showQualityPlaceholder = isSelected && !quality;
- const showLanguagePlaceholder = isSelected && !language;
+ const showLanguagePlaceholder = isSelected && !languages;
return (
@@ -352,10 +352,10 @@ class InteractiveImportRow extends Component {
}
{
- !showLanguagePlaceholder && !!language &&
-
}
@@ -441,7 +441,7 @@ class InteractiveImportRow extends Component {
@@ -460,7 +460,7 @@ InteractiveImportRow.propTypes = {
episodes: PropTypes.arrayOf(PropTypes.object).isRequired,
releaseGroup: PropTypes.string,
quality: PropTypes.object,
- language: PropTypes.object,
+ languages: PropTypes.arrayOf(PropTypes.object),
size: PropTypes.number.isRequired,
rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
columns: PropTypes.arrayOf(PropTypes.object).isRequired,
diff --git a/frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js b/frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js
index bda7193d0..5ed9660dc 100644
--- a/frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js
+++ b/frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js
@@ -4,7 +4,6 @@ import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { reprocessInteractiveImportItems, updateInteractiveImportItems } from 'Store/Actions/interactiveImportActions';
-import { fetchLanguageProfileSchema } from 'Store/Actions/settingsActions';
import createLanguagesSelector from 'Store/Selectors/createLanguagesSelector';
import SelectLanguageModalContent from './SelectLanguageModalContent';
@@ -18,22 +17,12 @@ function createMapStateToProps() {
}
const mapDispatchToProps = {
- dispatchFetchLanguageProfileSchema: fetchLanguageProfileSchema,
dispatchUpdateInteractiveImportItems: updateInteractiveImportItems,
dispatchReprocessInteractiveImportItems: reprocessInteractiveImportItems
};
class SelectLanguageModalContentConnector extends Component {
- //
- // Lifecycle
-
- componentDidMount = () => {
- if (!this.props.isPopulated) {
- this.props.dispatchFetchLanguageProfileSchema();
- }
- };
-
//
// Listeners
@@ -44,13 +33,20 @@ class SelectLanguageModalContentConnector extends Component {
dispatchReprocessInteractiveImportItems
} = this.props;
- const languageId = parseInt(value);
- const language = _.find(this.props.items,
- (item) => item.language.id === languageId).language;
+ const languages = [];
+
+ value.forEach((languageId) => {
+ const language = _.find(this.props.items,
+ (item) => item.id === parseInt(languageId));
+
+ if (language !== undefined) {
+ languages.push(language);
+ }
+ });
dispatchUpdateInteractiveImportItems({
ids,
- language
+ languages
});
dispatchReprocessInteractiveImportItems({ ids });
@@ -77,7 +73,6 @@ SelectLanguageModalContentConnector.propTypes = {
isPopulated: PropTypes.bool.isRequired,
error: PropTypes.object,
items: PropTypes.arrayOf(PropTypes.object).isRequired,
- dispatchFetchLanguageProfileSchema: PropTypes.func.isRequired,
dispatchUpdateInteractiveImportItems: PropTypes.func.isRequired,
dispatchReprocessInteractiveImportItems: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
diff --git a/frontend/src/InteractiveSearch/InteractiveSearch.js b/frontend/src/InteractiveSearch/InteractiveSearch.js
index da0921314..c3eadb2ae 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearch.js
+++ b/frontend/src/InteractiveSearch/InteractiveSearch.js
@@ -51,7 +51,7 @@ const columns = [
},
{
name: 'languageWeight',
- label: 'Language',
+ label: 'Languages',
isSortable: true,
isVisible: true
},
diff --git a/frontend/src/InteractiveSearch/InteractiveSearchRow.css b/frontend/src/InteractiveSearch/InteractiveSearchRow.css
index 4f7037ca6..b51f12375 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearchRow.css
+++ b/frontend/src/InteractiveSearch/InteractiveSearchRow.css
@@ -24,13 +24,13 @@
}
.quality,
-.language {
+.languages {
composes: cell from '~Components/Table/Cells/TableRowCell.css';
text-align: center;
}
-.language {
+.languages {
width: 100px;
}
diff --git a/frontend/src/InteractiveSearch/InteractiveSearchRow.js b/frontend/src/InteractiveSearch/InteractiveSearchRow.js
index b0a7bed2b..dd68d00fc 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearchRow.js
+++ b/frontend/src/InteractiveSearch/InteractiveSearchRow.js
@@ -10,7 +10,7 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
import TableRow from 'Components/Table/TableRow';
import Popover from 'Components/Tooltip/Popover';
import Tooltip from 'Components/Tooltip/Tooltip';
-import EpisodeLanguage from 'Episode/EpisodeLanguage';
+import EpisodeLanguages from 'Episode/EpisodeLanguages';
import EpisodeQuality from 'Episode/EpisodeQuality';
import { icons, kinds, tooltipPositions } from 'Helpers/Props';
import formatDateTime from 'Utilities/Date/formatDateTime';
@@ -116,7 +116,7 @@ class InteractiveSearchRow extends Component {
seeders,
leechers,
quality,
- language,
+ languages,
customFormatScore,
customFormats,
sceneMapping,
@@ -188,8 +188,8 @@ class InteractiveSearchRow extends Component {
}
-
-
+
+
@@ -286,7 +286,7 @@ InteractiveSearchRow.propTypes = {
seeders: PropTypes.number,
leechers: PropTypes.number,
quality: PropTypes.object.isRequired,
- language: PropTypes.object.isRequired,
+ languages: PropTypes.arrayOf(PropTypes.object).isRequired,
customFormats: PropTypes.arrayOf(PropTypes.object),
customFormatScore: PropTypes.number.isRequired,
sceneMapping: PropTypes.object,
diff --git a/frontend/src/Series/Details/EpisodeRow.css b/frontend/src/Series/Details/EpisodeRow.css
index 2585248a0..c9fa30526 100644
--- a/frontend/src/Series/Details/EpisodeRow.css
+++ b/frontend/src/Series/Details/EpisodeRow.css
@@ -28,7 +28,7 @@
width: 100px;
}
-.language,
+.languages,
.audio,
.video,
.status {
diff --git a/frontend/src/Series/Details/EpisodeRow.js b/frontend/src/Series/Details/EpisodeRow.js
index 0806f7f59..10e4daffb 100644
--- a/frontend/src/Series/Details/EpisodeRow.js
+++ b/frontend/src/Series/Details/EpisodeRow.js
@@ -180,11 +180,11 @@ class EpisodeRow extends Component {
);
}
- if (name === 'language') {
+ if (name === 'languages') {
return (
- {
- showLanguageProfile &&
-
- Language Profile
-
-
-
- }
-
Series Type
@@ -209,7 +193,6 @@ EditSeriesModalContent.propTypes = {
title: PropTypes.string.isRequired,
item: PropTypes.object.isRequired,
isSaving: PropTypes.bool.isRequired,
- showLanguageProfile: PropTypes.bool.isRequired,
isPathChanging: PropTypes.bool.isRequired,
originalPath: PropTypes.string.isRequired,
onInputChange: PropTypes.func.isRequired,
diff --git a/frontend/src/Series/Edit/EditSeriesModalContentConnector.js b/frontend/src/Series/Edit/EditSeriesModalContentConnector.js
index 7e3fa175a..0521f92df 100644
--- a/frontend/src/Series/Edit/EditSeriesModalContentConnector.js
+++ b/frontend/src/Series/Edit/EditSeriesModalContentConnector.js
@@ -27,10 +27,9 @@ function createIsPathChangingSelector() {
function createMapStateToProps() {
return createSelector(
(state) => state.series,
- (state) => state.settings.languageProfiles,
createSeriesSelector(),
createIsPathChangingSelector(),
- (seriesState, languageProfiles, series, isPathChanging) => {
+ (seriesState, series, isPathChanging) => {
const {
isSaving,
saveError,
@@ -41,7 +40,6 @@ function createMapStateToProps() {
'monitored',
'seasonFolder',
'qualityProfileId',
- 'languageProfileId',
'seriesType',
'path',
'tags'
@@ -56,7 +54,6 @@ function createMapStateToProps() {
isPathChanging,
originalPath: series.path,
item: settings.settings,
- showLanguageProfile: languageProfiles.items.length > 1,
...settings
};
}
diff --git a/frontend/src/Series/Editor/SeriesEditor.js b/frontend/src/Series/Editor/SeriesEditor.js
index 1439f2c65..b3aaffe12 100644
--- a/frontend/src/Series/Editor/SeriesEditor.js
+++ b/frontend/src/Series/Editor/SeriesEditor.js
@@ -212,7 +212,6 @@ class SeriesEditor extends Component {
deleteError={deleteError}
isOrganizingSeries={isOrganizingSeries}
columns={columns}
- showLanguageProfile={columns.find((column) => column.name === 'languageProfileId').isVisible}
onSaveSelected={this.onSaveSelected}
onOrganizeSeriesPress={this.onOrganizeSeriesPress}
/>
diff --git a/frontend/src/Series/Editor/SeriesEditorFooter.js b/frontend/src/Series/Editor/SeriesEditorFooter.js
index f31b7f046..f427b42bd 100644
--- a/frontend/src/Series/Editor/SeriesEditorFooter.js
+++ b/frontend/src/Series/Editor/SeriesEditorFooter.js
@@ -1,6 +1,5 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
-import LanguageProfileSelectInputConnector from 'Components/Form/LanguageProfileSelectInputConnector';
import QualityProfileSelectInputConnector from 'Components/Form/QualityProfileSelectInputConnector';
import RootFolderSelectInputConnector from 'Components/Form/RootFolderSelectInputConnector';
import SelectInput from 'Components/Form/SelectInput';
@@ -27,7 +26,6 @@ class SeriesEditorFooter extends Component {
this.state = {
monitored: NO_CHANGE,
qualityProfileId: NO_CHANGE,
- languageProfileId: NO_CHANGE,
seriesType: NO_CHANGE,
seasonFolder: NO_CHANGE,
rootFolderPath: NO_CHANGE,
@@ -49,7 +47,6 @@ class SeriesEditorFooter extends Component {
this.setState({
monitored: NO_CHANGE,
qualityProfileId: NO_CHANGE,
- languageProfileId: NO_CHANGE,
seriesType: NO_CHANGE,
seasonFolder: NO_CHANGE,
rootFolderPath: NO_CHANGE,
@@ -152,7 +149,6 @@ class SeriesEditorFooter extends Component {
const {
monitored,
qualityProfileId,
- languageProfileId,
seriesType,
seasonFolder,
rootFolderPath,
@@ -225,28 +221,6 @@ class SeriesEditorFooter extends Component {
);
}
- if (name === 'languageProfileId') {
- return (
-
-
-
-
-
- );
- }
-
if (name === 'seriesType') {
return (
- {languageProfile.name}
-
- );
- }
-
if (name === 'seriesType') {
return (
@@ -167,7 +158,6 @@ SeriesEditorRow.propTypes = {
titleSlug: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
monitored: PropTypes.bool.isRequired,
- languageProfile: PropTypes.object.isRequired,
qualityProfile: PropTypes.object.isRequired,
seriesType: PropTypes.string.isRequired,
seasonFolder: PropTypes.bool.isRequired,
diff --git a/frontend/src/Series/Editor/SeriesEditorRowConnector.js b/frontend/src/Series/Editor/SeriesEditorRowConnector.js
index 3d1ee2e71..1b70e92fe 100644
--- a/frontend/src/Series/Editor/SeriesEditorRowConnector.js
+++ b/frontend/src/Series/Editor/SeriesEditorRowConnector.js
@@ -2,17 +2,14 @@ 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 createQualityProfileSelector from 'Store/Selectors/createQualityProfileSelector';
import SeriesEditorRow from './SeriesEditorRow';
function createMapStateToProps() {
return createSelector(
- createLanguageProfileSelector(),
createQualityProfileSelector(),
- (languageProfile, qualityProfile) => {
+ (qualityProfile) => {
return {
- languageProfile,
qualityProfile
};
}
diff --git a/frontend/src/Series/History/SeriesHistoryModalContent.js b/frontend/src/Series/History/SeriesHistoryModalContent.js
index dc6d07a81..3bc19b857 100644
--- a/frontend/src/Series/History/SeriesHistoryModalContent.js
+++ b/frontend/src/Series/History/SeriesHistoryModalContent.js
@@ -29,8 +29,8 @@ const columns = [
isVisible: true
},
{
- name: 'language',
- label: 'Language',
+ name: 'languages',
+ label: 'Languages',
isVisible: true
},
{
diff --git a/frontend/src/Series/History/SeriesHistoryRow.js b/frontend/src/Series/History/SeriesHistoryRow.js
index a45495a9a..98a67cc93 100644
--- a/frontend/src/Series/History/SeriesHistoryRow.js
+++ b/frontend/src/Series/History/SeriesHistoryRow.js
@@ -11,7 +11,7 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell';
import TableRow from 'Components/Table/TableRow';
import Popover from 'Components/Tooltip/Popover';
import Tooltip from 'Components/Tooltip/Tooltip';
-import EpisodeLanguage from 'Episode/EpisodeLanguage';
+import EpisodeLanguages from 'Episode/EpisodeLanguages';
import EpisodeNumber from 'Episode/EpisodeNumber';
import EpisodeQuality from 'Episode/EpisodeQuality';
import SeasonEpisodeNumber from 'Episode/SeasonEpisodeNumber';
@@ -67,7 +67,7 @@ class SeriesHistoryRow extends Component {
const {
eventType,
sourceTitle,
- language,
+ languages,
languageCutoffNotMet,
quality,
qualityCutoffNotMet,
@@ -110,8 +110,8 @@ class SeriesHistoryRow extends Component {
-
@@ -197,7 +197,7 @@ SeriesHistoryRow.propTypes = {
id: PropTypes.number.isRequired,
eventType: PropTypes.string.isRequired,
sourceTitle: PropTypes.string.isRequired,
- language: PropTypes.object.isRequired,
+ languages: PropTypes.object.isRequired,
languageCutoffNotMet: PropTypes.bool.isRequired,
quality: PropTypes.object.isRequired,
qualityCutoffNotMet: PropTypes.bool.isRequired,
diff --git a/frontend/src/Series/Index/Menus/SeriesIndexSortMenu.js b/frontend/src/Series/Index/Menus/SeriesIndexSortMenu.js
index 4ca1d86e6..018a4c8eb 100644
--- a/frontend/src/Series/Index/Menus/SeriesIndexSortMenu.js
+++ b/frontend/src/Series/Index/Menus/SeriesIndexSortMenu.js
@@ -55,15 +55,6 @@ function SeriesIndexSortMenu(props) {
Quality Profile
-
- Language Profile
-
-
diff --git a/frontend/src/Series/Index/SeriesIndexItemConnector.js b/frontend/src/Series/Index/SeriesIndexItemConnector.js
index 7f5380af2..bff4a77b1 100644
--- a/frontend/src/Series/Index/SeriesIndexItemConnector.js
+++ b/frontend/src/Series/Index/SeriesIndexItemConnector.js
@@ -6,7 +6,6 @@ import { createSelector } from 'reselect';
import * as commandNames from 'Commands/commandNames';
import { executeCommand } from 'Store/Actions/commandActions';
import createExecutingCommandsSelector from 'Store/Selectors/createExecutingCommandsSelector';
-import createSeriesLanguageProfileSelector from 'Store/Selectors/createSeriesLanguageProfileSelector';
import createSeriesQualityProfileSelector from 'Store/Selectors/createSeriesQualityProfileSelector';
import createSeriesSelector from 'Store/Selectors/createSeriesSelector';
@@ -32,13 +31,11 @@ function createMapStateToProps() {
return createSelector(
createSeriesSelector(),
createSeriesQualityProfileSelector(),
- createSeriesLanguageProfileSelector(),
selectShowSearchAction(),
createExecutingCommandsSelector(),
(
series,
qualityProfile,
- languageProfile,
showSearchAction,
executingCommands
) => {
@@ -71,7 +68,6 @@ function createMapStateToProps() {
return {
...series,
qualityProfile,
- languageProfile,
latestSeason,
showSearchAction,
isRefreshingSeries,
diff --git a/frontend/src/Series/Index/Table/SeriesIndexHeader.css b/frontend/src/Series/Index/Table/SeriesIndexHeader.css
index ce9f0f6ed..8c5d9f7b0 100644
--- a/frontend/src/Series/Index/Table/SeriesIndexHeader.css
+++ b/frontend/src/Series/Index/Table/SeriesIndexHeader.css
@@ -30,8 +30,7 @@
flex: 2 0 90px;
}
-.qualityProfileId,
-.languageProfileId {
+.qualityProfileId {
composes: headerCell from '~Components/Table/VirtualTableHeaderCell.css';
flex: 1 0 125px;
diff --git a/frontend/src/Series/Index/Table/SeriesIndexRow.css b/frontend/src/Series/Index/Table/SeriesIndexRow.css
index c5375a7d7..85d313c05 100644
--- a/frontend/src/Series/Index/Table/SeriesIndexRow.css
+++ b/frontend/src/Series/Index/Table/SeriesIndexRow.css
@@ -66,8 +66,7 @@
flex: 2 0 90px;
}
-.qualityProfileId,
-.languageProfileId {
+.qualityProfileId {
composes: cell;
flex: 1 0 125px;
diff --git a/frontend/src/Series/Index/Table/SeriesIndexRow.js b/frontend/src/Series/Index/Table/SeriesIndexRow.js
index c33ff6783..96052addc 100644
--- a/frontend/src/Series/Index/Table/SeriesIndexRow.js
+++ b/frontend/src/Series/Index/Table/SeriesIndexRow.js
@@ -86,7 +86,6 @@ class SeriesIndexRow extends Component {
seriesType,
network,
qualityProfile,
- languageProfile,
nextAiring,
previousAiring,
added,
@@ -224,17 +223,6 @@ class SeriesIndexRow extends Component {
);
}
- if (name === 'languageProfileId') {
- return (
-
- {languageProfile.name}
-
- );
- }
-
if (name === 'nextAiring') {
return (
diff --git a/frontend/src/Series/Index/Table/hasGrowableColumns.js b/frontend/src/Series/Index/Table/hasGrowableColumns.js
index f51824314..7494e2402 100644
--- a/frontend/src/Series/Index/Table/hasGrowableColumns.js
+++ b/frontend/src/Series/Index/Table/hasGrowableColumns.js
@@ -1,7 +1,6 @@
const growableColumns = [
'network',
'qualityProfileId',
- 'languageProfileId',
'path',
'tags'
];
diff --git a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.css b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.css
index db5a98500..fd7ddf093 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.css
+++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.css
@@ -4,12 +4,6 @@
margin-right: auto;
}
-.hideLanguageProfile {
- composes: group from '~Components/Form/FormGroup.css';
-
- display: none;
-}
-
.labelIcon {
margin-left: 8px;
}
diff --git a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js
index fb3400fd2..e71c680fc 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js
+++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContent.js
@@ -35,7 +35,6 @@ function EditImportListModalContent(props) {
onSavePress,
onTestPress,
onDeleteImportListPress,
- showLanguageProfile,
...otherProps
} = props;
@@ -46,7 +45,6 @@ function EditImportListModalContent(props) {
shouldMonitor,
rootFolderPath,
qualityProfileId,
- languageProfileId,
seriesType,
seasonFolder,
tags,
@@ -148,18 +146,6 @@ function EditImportListModalContent(props) {
/>
-
- Language Profile
-
-
-
-
Series Type
@@ -279,7 +265,6 @@ EditImportListModalContent.propTypes = {
isTesting: PropTypes.bool.isRequired,
saveError: PropTypes.object,
item: PropTypes.object.isRequired,
- showLanguageProfile: PropTypes.bool.isRequired,
onInputChange: PropTypes.func.isRequired,
onFieldChange: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired,
diff --git a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContentConnector.js b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContentConnector.js
index 17981a1e4..3a7ad8b1f 100644
--- a/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContentConnector.js
+++ b/frontend/src/Settings/ImportLists/ImportLists/EditImportListModalContentConnector.js
@@ -9,12 +9,10 @@ import EditImportListModalContent from './EditImportListModalContent';
function createMapStateToProps() {
return createSelector(
(state) => state.settings.advancedSettings,
- (state) => state.settings.languageProfiles,
createProviderSettingsSelector('importLists'),
- (advancedSettings, languageProfiles, importList) => {
+ (advancedSettings, importList) => {
return {
advancedSettings,
- showLanguageProfile: languageProfiles.items.length > 1,
...importList
};
}
diff --git a/frontend/src/Settings/Profiles/Language/EditLanguageProfileModal.js b/frontend/src/Settings/Profiles/Language/EditLanguageProfileModal.js
deleted file mode 100644
index 8968f2b4b..000000000
--- a/frontend/src/Settings/Profiles/Language/EditLanguageProfileModal.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Modal from 'Components/Modal/Modal';
-import { sizes } from 'Helpers/Props';
-import EditLanguageProfileModalContentConnector from './EditLanguageProfileModalContentConnector';
-
-function EditLanguageProfileModal({ isOpen, onModalClose, ...otherProps }) {
- return (
-
-
-
- );
-}
-
-EditLanguageProfileModal.propTypes = {
- isOpen: PropTypes.bool.isRequired,
- onModalClose: PropTypes.func.isRequired
-};
-
-export default EditLanguageProfileModal;
diff --git a/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalConnector.js b/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalConnector.js
deleted file mode 100644
index 5443a9062..000000000
--- a/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalConnector.js
+++ /dev/null
@@ -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 (
-
- );
- }
-}
-
-EditLanguageProfileModalConnector.propTypes = {
- onModalClose: PropTypes.func.isRequired,
- clearPendingChanges: PropTypes.func.isRequired
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(EditLanguageProfileModalConnector);
diff --git a/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContent.css b/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContent.css
deleted file mode 100644
index 74dd1c8b7..000000000
--- a/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContent.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.deleteButtonContainer {
- margin-right: auto;
-}
diff --git a/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContent.js b/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContent.js
deleted file mode 100644
index e4360beba..000000000
--- a/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContent.js
+++ /dev/null
@@ -1,165 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import Form from 'Components/Form/Form';
-import FormGroup from 'Components/Form/FormGroup';
-import FormInputGroup from 'Components/Form/FormInputGroup';
-import FormLabel from 'Components/Form/FormLabel';
-import Button from 'Components/Link/Button';
-import SpinnerErrorButton from 'Components/Link/SpinnerErrorButton';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import ModalBody from 'Components/Modal/ModalBody';
-import ModalContent from 'Components/Modal/ModalContent';
-import ModalFooter from 'Components/Modal/ModalFooter';
-import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds } from 'Helpers/Props';
-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 (
-
-
- {id ? 'Edit Language Profile' : 'Add Language Profile'}
-
-
-
- {
- isFetching &&
-
- }
-
- {
- !isFetching && !!error &&
- Unable to add a new language profile, please try again.
- }
-
- {
- !isFetching && !error &&
-
- }
-
-
- {
- id &&
-
-
-
- }
-
-
-
-
- Save
-
-
-
- );
-}
-
-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;
diff --git a/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContentConnector.js b/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContentConnector.js
deleted file mode 100644
index 911546c07..000000000
--- a/frontend/src/Settings/Profiles/Language/EditLanguageProfileModalContentConnector.js
+++ /dev/null
@@ -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 { fetchLanguageProfileSchema, saveLanguageProfile, setLanguageProfileValue } from 'Store/Actions/settingsActions';
-import createProfileInUseSelector from 'Store/Selectors/createProfileInUseSelector';
-import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
-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 (
-
- );
- }
-}
-
-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);
diff --git a/frontend/src/Settings/Profiles/Language/LanguageProfile.css b/frontend/src/Settings/Profiles/Language/LanguageProfile.css
deleted file mode 100644
index da85dc483..000000000
--- a/frontend/src/Settings/Profiles/Language/LanguageProfile.css
+++ /dev/null
@@ -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;
-}
diff --git a/frontend/src/Settings/Profiles/Language/LanguageProfile.js b/frontend/src/Settings/Profiles/Language/LanguageProfile.js
deleted file mode 100644
index b353d37f4..000000000
--- a/frontend/src/Settings/Profiles/Language/LanguageProfile.js
+++ /dev/null
@@ -1,147 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import Card from 'Components/Card';
-import Label from 'Components/Label';
-import IconButton from 'Components/Link/IconButton';
-import ConfirmModal from 'Components/Modal/ConfirmModal';
-import { icons, kinds } from 'Helpers/Props';
-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 (
-
-
-
-
- {
- languages.map((item) => {
- if (!item.allowed) {
- return null;
- }
-
- const isCutoff = upgradeAllowed && item.language.id === cutoff.id;
-
- return (
-
- );
- })
- }
-
-
-
-
-
-
- );
- }
-}
-
-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;
diff --git a/frontend/src/Settings/Profiles/Language/LanguageProfileItem.css b/frontend/src/Settings/Profiles/Language/LanguageProfileItem.css
deleted file mode 100644
index 090f5f09d..000000000
--- a/frontend/src/Settings/Profiles/Language/LanguageProfileItem.css
+++ /dev/null
@@ -1,44 +0,0 @@
-.languageProfileItem {
- display: flex;
- align-items: stretch;
- width: 100%;
- border: 1px solid #aaa;
- border-radius: 4px;
- background: var(--inputBackgroundColor);
-}
-
-.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;
-}
diff --git a/frontend/src/Settings/Profiles/Language/LanguageProfileItem.js b/frontend/src/Settings/Profiles/Language/LanguageProfileItem.js
deleted file mode 100644
index 750b81f20..000000000
--- a/frontend/src/Settings/Profiles/Language/LanguageProfileItem.js
+++ /dev/null
@@ -1,83 +0,0 @@
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import CheckInput from 'Components/Form/CheckInput';
-import Icon from 'Components/Icon';
-import { icons } from 'Helpers/Props';
-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 (
-
-
-
- {
- connectDragSource(
-
-
-
- )
- }
-
-
-
-
- );
- }
-}
-
-LanguageProfileItemDragPreview.propTypes = {
- item: PropTypes.object,
- itemType: PropTypes.string,
- currentOffset: PropTypes.shape({
- x: PropTypes.number.isRequired,
- y: PropTypes.number.isRequired
- })
-};
-
-export default DragLayer(collectDragLayer)(LanguageProfileItemDragPreview);
diff --git a/frontend/src/Settings/Profiles/Language/LanguageProfileItemDragSource.css b/frontend/src/Settings/Profiles/Language/LanguageProfileItemDragSource.css
deleted file mode 100644
index f59379129..000000000
--- a/frontend/src/Settings/Profiles/Language/LanguageProfileItemDragSource.css
+++ /dev/null
@@ -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;
-}
diff --git a/frontend/src/Settings/Profiles/Language/LanguageProfileItemDragSource.js b/frontend/src/Settings/Profiles/Language/LanguageProfileItemDragSource.js
deleted file mode 100644
index 1c5d3e061..000000000
--- a/frontend/src/Settings/Profiles/Language/LanguageProfileItemDragSource.js
+++ /dev/null
@@ -1,157 +0,0 @@
-import classNames from 'classnames';
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { DragSource, DropTarget } from 'react-dnd';
-import { findDOMNode } from 'react-dom';
-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(
-
- {
- isBefore &&
-
- }
-
-
-
- {
- isAfter &&
-
- }
-
-
-
- {
- errors.map((error, index) => {
- return (
-
- );
- })
- }
-
- {
- warnings.map((warning, index) => {
- return (
-
- );
- })
- }
-
-
- {
- languageProfileItems.map(({ allowed, language }, index) => {
- return (
-
- );
- }).reverse()
- }
-
-
-
-