Fixed: Changes to Profiles, Languages, Manual Import

frontend/src/InteractiveImport/Interactive/InteractiveImportModalContentConnector.js

@@ -19,11 +19,11 @@ function createMapStateToProps() {
 }
 
 const mapDispatchToProps = {
-  fetchInteractiveImportItems,
-  setInteractiveImportSort,
-  setInteractiveImportMode,
-  clearInteractiveImport,
-  executeCommand
+  dispatchFetchInteractiveImportItems: fetchInteractiveImportItems,
+  dispatchSetInteractiveImportSort: setInteractiveImportSort,
+  dispatchSetInteractiveImportMode: setInteractiveImportMode,
+  dispatchClearInteractiveImport: clearInteractiveImport,
+  dispatchExecuteCommand: executeCommand
 };
 
 class InteractiveImportModalContentConnector extends Component {
@@ -50,7 +50,7 @@ class InteractiveImportModalContentConnector extends Component {
       filterExistingFiles
     } = this.state;
 
-    this.props.fetchInteractiveImportItems({
+    this.props.dispatchFetchInteractiveImportItems({
       downloadId,
       folder,
       filterExistingFiles
@@ -68,7 +68,7 @@ class InteractiveImportModalContentConnector extends Component {
         folder
       } = this.props;
 
-      this.props.fetchInteractiveImportItems({
+      this.props.dispatchFetchInteractiveImportItems({
         downloadId,
         folder,
         filterExistingFiles
@@ -77,14 +77,14 @@ class InteractiveImportModalContentConnector extends Component {
   }
 
   componentWillUnmount() {
-    this.props.clearInteractiveImport();
+    this.props.dispatchClearInteractiveImport();
   }
 
   //
   // Listeners
 
   onSortPress = (sortKey, sortDirection) => {
-    this.props.setInteractiveImportSort({ sortKey, sortDirection });
+    this.props.dispatchSetInteractiveImportSort({ sortKey, sortDirection });
   }
 
   onFilterExistingFilesChange = (filterExistingFiles) => {
@@ -92,7 +92,7 @@ class InteractiveImportModalContentConnector extends Component {
   }
 
   onImportModeChange = (importMode) => {
-    this.props.setInteractiveImportMode({ importMode });
+    this.props.dispatchSetInteractiveImportMode({ importMode });
   }
 
   onImportSelectedPress = (selected, importMode) => {
@@ -103,25 +103,13 @@ class InteractiveImportModalContentConnector extends Component {
 
       if (isSelected) {
         const {
-          series,
-          seasonNumber,
-          episodes,
+          movie,
           quality,
           language
         } = item;
 
-        if (!series) {
-          this.setState({ interactiveImportErrorMessage: 'Series must be chosen for each selected file' });
-          return false;
-        }
-
-        if (isNaN(seasonNumber)) {
-          this.setState({ interactiveImportErrorMessage: 'Season must be chosen for each selected file' });
-          return false;
-        }
-
-        if (!episodes || !episodes.length) {
-          this.setState({ interactiveImportErrorMessage: 'One or more episodes must be chosen for each selected file' });
+        if (!movie) {
+          this.setState({ interactiveImportErrorMessage: 'Movie must be chosen for each selected file' });
           return false;
         }
 
@@ -138,8 +126,7 @@ class InteractiveImportModalContentConnector extends Component {
         files.push({
           path: item.path,
           folderName: item.folderName,
-          seriesId: series.id,
-          episodeIds: _.map(episodes, 'id'),
+          movieId: movie.id,
           quality,
           language,
           downloadId: this.props.downloadId
@@ -151,7 +138,7 @@ class InteractiveImportModalContentConnector extends Component {
       return;
     }
 
-    this.props.executeCommand({
+    this.props.dispatchExecuteCommand({
       name: commandNames.INTERACTIVE_IMPORT,
       files,
       importMode
@@ -188,11 +175,11 @@ InteractiveImportModalContentConnector.propTypes = {
   folder: PropTypes.string,
   filterExistingFiles: PropTypes.bool.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  fetchInteractiveImportItems: PropTypes.func.isRequired,
-  setInteractiveImportSort: PropTypes.func.isRequired,
-  clearInteractiveImport: PropTypes.func.isRequired,
-  setInteractiveImportMode: PropTypes.func.isRequired,
-  executeCommand: PropTypes.func.isRequired,
+  dispatchFetchInteractiveImportItems: PropTypes.func.isRequired,
+  dispatchSetInteractiveImportSort: PropTypes.func.isRequired,
+  dispatchSetInteractiveImportMode: PropTypes.func.isRequired,
+  dispatchClearInteractiveImport: PropTypes.func.isRequired,
+  dispatchExecuteCommand: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };