More Cleanup

frontend/src/Indexer/Edit/EditMovieModal.js

@@ -0,0 +1,25 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Modal from 'Components/Modal/Modal';
+import EditMovieModalContentConnector from './EditMovieModalContentConnector';
+
+function EditMovieModal({ isOpen, onModalClose, ...otherProps }) {
+  return (
+    <Modal
+      isOpen={isOpen}
+      onModalClose={onModalClose}
+    >
+      <EditMovieModalContentConnector
+        {...otherProps}
+        onModalClose={onModalClose}
+      />
+    </Modal>
+  );
+}
+
+EditMovieModal.propTypes = {
+  isOpen: PropTypes.bool.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default EditMovieModal;

frontend/src/Indexer/Edit/EditMovieModalConnector.js

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

frontend/src/Indexer/Edit/EditMovieModalContent.css

@@ -0,0 +1,5 @@
+.deleteButton {
+  composes: button from '~Components/Link/Button.css';
+
+  margin-right: auto;
+}

frontend/src/Indexer/Edit/EditMovieModalContent.js

@@ -0,0 +1,180 @@
+import PropTypes from 'prop-types';
+import React, { Component } 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 SpinnerButton from 'Components/Link/SpinnerButton';
+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 translate from 'Utilities/String/translate';
+import styles from './EditMovieModalContent.css';
+
+class EditMovieModalContent extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      isConfirmMoveModalOpen: false
+    };
+  }
+
+  //
+  // Listeners
+
+  onSavePress = () => {
+    const {
+      isPathChanging,
+      onSavePress
+    } = this.props;
+
+    if (isPathChanging && !this.state.isConfirmMoveModalOpen) {
+      this.setState({ isConfirmMoveModalOpen: true });
+    } else {
+      this.setState({ isConfirmMoveModalOpen: false });
+
+      onSavePress(false);
+    }
+  }
+
+  //
+  // Render
+
+  render() {
+    const {
+      title,
+      item,
+      isSaving,
+      originalPath,
+      onInputChange,
+      onModalClose,
+      onDeleteMoviePress,
+      ...otherProps
+    } = this.props;
+
+    const {
+      monitored,
+      qualityProfileId,
+      minimumAvailability,
+      // Id,
+      path,
+      tags
+    } = item;
+
+    return (
+      <ModalContent onModalClose={onModalClose}>
+        <ModalHeader>
+          {translate('Edit')} - {title}
+        </ModalHeader>
+
+        <ModalBody>
+          <Form
+            {...otherProps}
+          >
+            <FormGroup>
+              <FormLabel>{translate('Monitored')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.CHECK}
+                name="monitored"
+                helpText={translate('MonitoredHelpText')}
+                {...monitored}
+                onChange={onInputChange}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>{translate('MinimumAvailability')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.AVAILABILITY_SELECT}
+                name="minimumAvailability"
+                {...minimumAvailability}
+                onChange={onInputChange}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>{translate('QualityProfile')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.QUALITY_PROFILE_SELECT}
+                name="qualityProfileId"
+                {...qualityProfileId}
+                onChange={onInputChange}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>{translate('Path')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.PATH}
+                name="path"
+                {...path}
+                onChange={onInputChange}
+              />
+            </FormGroup>
+
+            <FormGroup>
+              <FormLabel>{translate('Tags')}</FormLabel>
+
+              <FormInputGroup
+                type={inputTypes.TAG}
+                name="tags"
+                {...tags}
+                onChange={onInputChange}
+              />
+            </FormGroup>
+          </Form>
+        </ModalBody>
+
+        <ModalFooter>
+          <Button
+            className={styles.deleteButton}
+            kind={kinds.DANGER}
+            onPress={onDeleteMoviePress}
+          >
+            {translate('Delete')}
+          </Button>
+
+          <Button
+            onPress={onModalClose}
+          >
+            {translate('Cancel')}
+          </Button>
+
+          <SpinnerButton
+            isSpinning={isSaving}
+            onPress={this.onSavePress}
+          >
+            {translate('Save')}
+          </SpinnerButton>
+        </ModalFooter>
+      </ModalContent>
+    );
+  }
+}
+
+EditMovieModalContent.propTypes = {
+  movieId: PropTypes.number.isRequired,
+  title: PropTypes.string.isRequired,
+  item: PropTypes.object.isRequired,
+  isSaving: PropTypes.bool.isRequired,
+  isPathChanging: PropTypes.bool.isRequired,
+  originalPath: PropTypes.string.isRequired,
+  onInputChange: PropTypes.func.isRequired,
+  onSavePress: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired,
+  onDeleteMoviePress: PropTypes.func.isRequired
+};
+
+export default EditMovieModalContent;

frontend/src/Indexer/Edit/EditMovieModalContentConnector.js

@@ -0,0 +1,115 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { saveMovie, setMovieValue } from 'Store/Actions/movieActions';
+import createMovieSelector from 'Store/Selectors/createMovieSelector';
+import selectSettings from 'Store/Selectors/selectSettings';
+import EditMovieModalContent from './EditMovieModalContent';
+
+function createIsPathChangingSelector() {
+  return createSelector(
+    (state) => state.movies.pendingChanges,
+    createMovieSelector(),
+    (pendingChanges, movie) => {
+      const path = pendingChanges.path;
+
+      if (path == null) {
+        return false;
+      }
+
+      return movie.path !== path;
+    }
+  );
+}
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.movies,
+    createMovieSelector(),
+    createIsPathChangingSelector(),
+    (moviesState, movie, isPathChanging) => {
+      const {
+        isSaving,
+        saveError,
+        pendingChanges
+      } = moviesState;
+
+      const movieSettings = {
+        monitored: movie.monitored,
+        qualityProfileId: movie.qualityProfileId,
+        minimumAvailability: movie.minimumAvailability,
+        path: movie.path,
+        tags: movie.tags
+      };
+
+      const settings = selectSettings(movieSettings, pendingChanges, saveError);
+
+      return {
+        title: movie.title,
+        isSaving,
+        saveError,
+        isPathChanging,
+        originalPath: movie.path,
+        item: settings.settings,
+        ...settings
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  dispatchSetMovieValue: setMovieValue,
+  dispatchSaveMovie: saveMovie
+};
+
+class EditMovieModalContentConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidUpdate(prevProps, prevState) {
+    if (prevProps.isSaving && !this.props.isSaving && !this.props.saveError) {
+      this.props.onModalClose();
+    }
+  }
+
+  //
+  // Listeners
+
+  onInputChange = ({ name, value }) => {
+    this.props.dispatchSetMovieValue({ name, value });
+  }
+
+  onSavePress = (moveFiles) => {
+    this.props.dispatchSaveMovie({
+      id: this.props.movieId,
+      moveFiles
+    });
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <EditMovieModalContent
+        {...this.props}
+        onInputChange={this.onInputChange}
+        onSavePress={this.onSavePress}
+        onMoveMoviePress={this.onMoveMoviePress}
+      />
+    );
+  }
+}
+
+EditMovieModalContentConnector.propTypes = {
+  movieId: PropTypes.number,
+  isSaving: PropTypes.bool.isRequired,
+  saveError: PropTypes.object,
+  dispatchSetMovieValue: PropTypes.func.isRequired,
+  dispatchSaveMovie: PropTypes.func.isRequired,
+  onModalClose: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(EditMovieModalContentConnector);