[UI] Add Language to Manual Import, Fix Posters,Banners

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js

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

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js

@@ -74,7 +74,8 @@ class InteractiveImportModalContentConnector extends Component {
           artist,
           album,
           tracks,
-          quality
+          quality,
+          language
         } = item;
 
         if (!artist) {
@@ -98,6 +99,7 @@ class InteractiveImportModalContentConnector extends Component {
           albumId: album.id,
           trackIds: _.map(tracks, 'id'),
           quality,
+          language,
           downloadId: this.props.downloadId
         });
       }

frontend/src/InteractiveImport/Interactive/InteractiveImportRow.js

@@ -9,10 +9,12 @@ import TableRowCellButton from 'Components/Table/Cells/TableRowCellButton';
 import TableSelectCell from 'Components/Table/Cells/TableSelectCell';
 import Popover from 'Components/Tooltip/Popover';
 import EpisodeQuality from 'Episode/EpisodeQuality';
+import EpisodeLanguage from 'Episode/EpisodeLanguage';
 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 styles from './InteractiveImportRow.css';
 
@@ -28,7 +30,8 @@ class InteractiveImportRow extends Component {
       isSelectArtistModalOpen: false,
       isSelectAlbumModalOpen: false,
       isSelectTrackModalOpen: false,
-      isSelectQualityModalOpen: false
+      isSelectQualityModalOpen: false,
+      isSelectLanguageModalOpen: false
     };
   }
 
@@ -38,10 +41,17 @@ class InteractiveImportRow extends Component {
       artist,
       album,
       tracks,
-      quality
+      quality,
+      language
     } = this.props;
 
-    if (artist && album !== undefined && tracks.length && quality) {
+    if (
+      artist &&
+      album != null &&
+      tracks.length &&
+      quality &&
+      language
+    ) {
       this.props.onSelectedChange({ id, value: true });
     }
   }
@@ -53,6 +63,7 @@ class InteractiveImportRow extends Component {
       album,
       tracks,
       quality,
+      language,
       isSelected,
       onValidRowChange
     } = this.props;
@@ -61,7 +72,13 @@ class InteractiveImportRow extends Component {
       return;
     }
 
-    const isValid = !!(artist && album != null && tracks.length && quality);
+    const isValid = !!(
+      artist &&
+      album != null &&
+      tracks.length &&
+      quality &&
+      language
+    );
 
     if (isSelected && !isValid) {
       onValidRowChange(id, false);
@@ -103,6 +120,10 @@ class InteractiveImportRow extends Component {
     this.setState({ isSelectQualityModalOpen: true });
   }
 
+  onSelectLanguagePress = () => {
+    this.setState({ isSelectLanguageModalOpen: true });
+  }
+
   onSelectArtistModalClose = (changed) => {
     this.setState({ isSelectArtistModalOpen: false });
     this.selectRowAfterChange(changed);
@@ -123,6 +144,11 @@ class InteractiveImportRow extends Component {
     this.selectRowAfterChange(changed);
   }
 
+  onSelectLanguageModalClose = (changed) => {
+    this.setState({ isSelectLanguageModalOpen: false });
+    this.selectRowAfterChange(changed);
+  }
+
   //
   // Render
 
@@ -134,6 +160,7 @@ class InteractiveImportRow extends Component {
       album,
       tracks,
       quality,
+      language,
       size,
       rejections,
       isSelected,
@@ -144,7 +171,8 @@ class InteractiveImportRow extends Component {
       isSelectArtistModalOpen,
       isSelectAlbumModalOpen,
       isSelectTrackModalOpen,
-      isSelectQualityModalOpen
+      isSelectQualityModalOpen,
+      isSelectLanguageModalOpen
     } = this.state;
 
     const artistName = artist ? artist.artistName : '';
@@ -206,6 +234,15 @@ class InteractiveImportRow extends Component {
           />
         </TableRowCellButton>
 
+        <TableRowCellButton
+          className={styles.language}
+          onPress={this.onSelectLanguagePress}
+        >
+          <EpisodeLanguage
+            language={language}
+          />
+        </TableRowCellButton>
+
         <TableRowCell>
           {formatBytes(size)}
         </TableRowCell>
@@ -268,6 +305,13 @@ class InteractiveImportRow extends Component {
           real={quality.revision.real > 0}
           onModalClose={this.onSelectQualityModalClose}
         />
+
+        <SelectLanguageModal
+          isOpen={isSelectLanguageModalOpen}
+          id={id}
+          languageId={language.id}
+          onModalClose={this.onSelectLanguageModalClose}
+        />
       </TableRow>
     );
   }
@@ -281,6 +325,7 @@ InteractiveImportRow.propTypes = {
   album: PropTypes.object,
   tracks: PropTypes.arrayOf(PropTypes.object).isRequired,
   quality: PropTypes.object,
+  language: PropTypes.object,
   size: PropTypes.number.isRequired,
   rejections: PropTypes.arrayOf(PropTypes.object).isRequired,
   isSelected: PropTypes.bool,

frontend/src/InteractiveImport/Language/SelectLanguageModal.js

@@ -0,0 +1,37 @@
+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;

frontend/src/InteractiveImport/Language/SelectLanguageModalContent.js

@@ -0,0 +1,87 @@
+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;

frontend/src/InteractiveImport/Language/SelectLanguageModalContentConnector.js

@@ -0,0 +1,87 @@
+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 {
+        isFetchingSchema: isFetching,
+        schemaPopulated: isPopulated,
+        schemaError: error,
+        schema
+      } = languageProfiles;
+
+      return {
+        isFetching,
+        isPopulated,
+        error,
+        items: schema.languages || []
+      };
+    }
+  );
+}
+
+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);