Search and History Improvements

frontend/src/Indexer/Editor/MovieEditorFooter.js

@@ -158,8 +158,7 @@ MovieEditorFooter.propTypes = {
   saveError: PropTypes.object,
   isDeleting: PropTypes.bool.isRequired,
   deleteError: PropTypes.object,
-  onSaveSelected: PropTypes.func.isRequired,
-  onOrganizeMoviePress: PropTypes.func.isRequired
+  onSaveSelected: PropTypes.func.isRequired
 };
 
 export default MovieEditorFooter;

frontend/src/Indexer/History/MovieHistoryRow.css

@@ -1,11 +0,0 @@
-.actions {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
-  min-width: 70px;
-}
-
-.sourceTitle {
-  composes: cell from '~Components/Table/Cells/TableRowCell.css';
-
-  word-break: break-word;
-}

frontend/src/Indexer/History/MovieHistoryRow.js

@@ -1,162 +0,0 @@
-import HistoryDetailsModal from 'Activity/History/Details/HistoryDetailsModal';
-import HistoryEventTypeCell from 'Activity/History/HistoryEventTypeCell';
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import IconButton from 'Components/Link/IconButton';
-import ConfirmModal from 'Components/Modal/ConfirmModal';
-import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector';
-import TableRowCell from 'Components/Table/Cells/TableRowCell';
-import TableRow from 'Components/Table/TableRow';
-import { icons, kinds } from 'Helpers/Props';
-import MovieLanguage from 'Indexer/MovieLanguage';
-import MovieQuality from 'Indexer/MovieQuality';
-import translate from 'Utilities/String/translate';
-import styles from './MovieHistoryRow.css';
-
-class MovieHistoryRow extends Component {
-
-  //
-  // Lifecycle
-
-  constructor(props, context) {
-    super(props, context);
-
-    this.state = {
-      isMarkAsFailedModalOpen: false,
-      isDetailsModalOpen: false
-    };
-  }
-
-  //
-  // Listeners
-
-  onMarkAsFailedPress = () => {
-    this.setState({ isMarkAsFailedModalOpen: true });
-  }
-
-  onConfirmMarkAsFailed = () => {
-    this.props.onMarkAsFailedPress(this.props.id);
-    this.setState({ isMarkAsFailedModalOpen: false });
-  }
-
-  onMarkAsFailedModalClose = () => {
-    this.setState({ isMarkAsFailedModalOpen: false });
-  }
-
-  onDetailsPress = () => {
-    this.setState({ isDetailsModalOpen: true });
-  }
-
-  onDetailsModalClose = () => {
-    this.setState({ isDetailsModalOpen: false });
-  }
-
-  //
-  // Render
-
-  render() {
-    const {
-      eventType,
-      sourceTitle,
-      quality,
-      languages,
-      qualityCutoffNotMet,
-      date,
-      data,
-      isMarkingAsFailed,
-      shortDateFormat,
-      timeFormat,
-      onMarkAsFailedPress
-    } = this.props;
-
-    const {
-      isMarkAsFailedModalOpen
-    } = this.state;
-
-    return (
-      <TableRow>
-        <HistoryEventTypeCell
-          eventType={eventType}
-          data={data}
-        />
-
-        <TableRowCell className={styles.sourceTitle}>
-          {sourceTitle}
-        </TableRowCell>
-
-        <TableRowCell>
-          <MovieLanguage
-            languages={languages}
-          />
-        </TableRowCell>
-
-        <TableRowCell>
-          <MovieQuality
-            quality={quality}
-            isCutoffNotMet={qualityCutoffNotMet}
-          />
-        </TableRowCell>
-
-        <RelativeDateCellConnector
-          date={date}
-        />
-
-        <TableRowCell className={styles.actions}>
-          <IconButton
-            name={icons.INFO}
-            onPress={this.onDetailsPress}
-          />
-
-          {
-            eventType === 'grabbed' &&
-              <IconButton
-                title={translate('MarkAsFailed')}
-                name={icons.REMOVE}
-                onPress={this.onMarkAsFailedPress}
-              />
-          }
-        </TableRowCell>
-
-        <ConfirmModal
-          isOpen={isMarkAsFailedModalOpen}
-          kind={kinds.DANGER}
-          title={translate('MarkAsFailed')}
-          message={translate('MarkAsFailedMessageText', [sourceTitle])}
-          confirmLabel={translate('MarkAsFailed')}
-          onConfirm={this.onConfirmMarkAsFailed}
-          onCancel={this.onMarkAsFailedModalClose}
-        />
-
-        <HistoryDetailsModal
-          isOpen={this.state.isDetailsModalOpen}
-          eventType={eventType}
-          sourceTitle={sourceTitle}
-          data={data}
-          isMarkingAsFailed={isMarkingAsFailed}
-          shortDateFormat={shortDateFormat}
-          timeFormat={timeFormat}
-          onMarkAsFailedPress={onMarkAsFailedPress}
-          onModalClose={this.onDetailsModalClose}
-        />
-      </TableRow>
-    );
-  }
-}
-
-MovieHistoryRow.propTypes = {
-  id: PropTypes.number.isRequired,
-  eventType: PropTypes.string.isRequired,
-  sourceTitle: PropTypes.string.isRequired,
-  languages: PropTypes.arrayOf(PropTypes.object).isRequired,
-  quality: PropTypes.object.isRequired,
-  qualityCutoffNotMet: PropTypes.bool.isRequired,
-  date: PropTypes.string.isRequired,
-  data: PropTypes.object.isRequired,
-  isMarkingAsFailed: PropTypes.bool,
-  movie: PropTypes.object.isRequired,
-  shortDateFormat: PropTypes.string.isRequired,
-  timeFormat: PropTypes.string.isRequired,
-  onMarkAsFailedPress: PropTypes.func.isRequired
-};
-
-export default MovieHistoryRow;

frontend/src/Indexer/History/MovieHistoryRowConnector.js

@@ -1,27 +0,0 @@
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { fetchHistory, markAsFailed } from 'Store/Actions/historyActions';
-import createIndexerSelector from 'Store/Selectors/createIndexerSelector';
-import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
-import MovieHistoryRow from './MovieHistoryRow';
-
-function createMapStateToProps() {
-  return createSelector(
-    createIndexerSelector(),
-    createUISettingsSelector(),
-    (movie, uiSettings) => {
-      return {
-        movie,
-        shortDateFormat: uiSettings.shortDateFormat,
-        timeFormat: uiSettings.timeFormat
-      };
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  fetchHistory,
-  markAsFailed
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(MovieHistoryRow);

frontend/src/Indexer/History/MovieHistoryTable.js

@@ -1,19 +0,0 @@
-import React from 'react';
-import MovieHistoryTableContentConnector from './MovieHistoryTableContentConnector';
-
-function MovieHistoryTable(props) {
-  const {
-    ...otherProps
-  } = props;
-
-  return (
-    <MovieHistoryTableContentConnector
-      {...otherProps}
-    />
-  );
-}
-
-MovieHistoryTable.propTypes = {
-};
-
-export default MovieHistoryTable;

frontend/src/Indexer/History/MovieHistoryTableContent.css

@@ -1,5 +0,0 @@
-.blankpad {
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-left: 2em;
-}

frontend/src/Indexer/History/MovieHistoryTableContent.js

@@ -1,114 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import IconButton from 'Components/Link/IconButton';
-import LoadingIndicator from 'Components/Loading/LoadingIndicator';
-import Table from 'Components/Table/Table';
-import TableBody from 'Components/Table/TableBody';
-import { icons } from 'Helpers/Props';
-import translate from 'Utilities/String/translate';
-import MovieHistoryRowConnector from './MovieHistoryRowConnector';
-import styles from './MovieHistoryTableContent.css';
-
-const columns = [
-  {
-    name: 'eventType',
-    isVisible: true
-  },
-  {
-    name: 'sourceTitle',
-    label: translate('SourceTitle'),
-    isVisible: true
-  },
-  {
-    name: 'languages',
-    label: translate('Languages'),
-    isVisible: true
-  },
-  {
-    name: 'quality',
-    label: translate('Quality'),
-    isVisible: true
-  },
-  {
-    name: 'customFormats',
-    label: translate('CustomFormats'),
-    isSortable: false,
-    isVisible: true
-  },
-  {
-    name: 'date',
-    label: translate('Date'),
-    isVisible: true
-  },
-  {
-    name: 'actions',
-    label: React.createElement(IconButton, { name: icons.ADVANCED_SETTINGS }),
-    isVisible: true
-  }
-];
-
-class MovieHistoryTableContent extends Component {
-
-  //
-  // Render
-
-  render() {
-    const {
-      isFetching,
-      isPopulated,
-      error,
-      items,
-      onMarkAsFailedPress
-    } = this.props;
-
-    const hasItems = !!items.length;
-
-    return (
-      <div>
-        {
-          isFetching &&
-            <LoadingIndicator />
-        }
-
-        {
-          !isFetching && !!error &&
-            <div className={styles.blankpad}>Unable to load history</div>
-        }
-
-        {
-          isPopulated && !hasItems && !error &&
-            <div className={styles.blankpad}>No history</div>
-        }
-
-        {
-          isPopulated && hasItems && !error &&
-            <Table columns={columns}>
-              <TableBody>
-                {
-                  items.map((item) => {
-                    return (
-                      <MovieHistoryRowConnector
-                        key={item.id}
-                        {...item}
-                        onMarkAsFailedPress={onMarkAsFailedPress}
-                      />
-                    );
-                  })
-                }
-              </TableBody>
-            </Table>
-        }
-      </div>
-    );
-  }
-}
-
-MovieHistoryTableContent.propTypes = {
-  isFetching: PropTypes.bool.isRequired,
-  isPopulated: PropTypes.bool.isRequired,
-  error: PropTypes.object,
-  items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  onMarkAsFailedPress: PropTypes.func.isRequired
-};
-
-export default MovieHistoryTableContent;

frontend/src/Indexer/History/MovieHistoryTableContentConnector.js

@@ -1,55 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-import { createSelector } from 'reselect';
-import { movieHistoryMarkAsFailed } from 'Store/Actions/movieHistoryActions';
-import MovieHistoryTableContent from './MovieHistoryTableContent';
-
-function createMapStateToProps() {
-  return createSelector(
-    (state) => state.movieHistory,
-    (movieHistory) => {
-      return movieHistory;
-    }
-  );
-}
-
-const mapDispatchToProps = {
-  movieHistoryMarkAsFailed
-};
-
-class MovieHistoryTableContentConnector extends Component {
-
-  //
-  // Listeners
-
-  onMarkAsFailedPress = (historyId) => {
-    const {
-      movieId
-    } = this.props;
-
-    this.props.movieHistoryMarkAsFailed({
-      historyId,
-      movieId
-    });
-  }
-
-  //
-  // Render
-
-  render() {
-    return (
-      <MovieHistoryTableContent
-        {...this.props}
-        onMarkAsFailedPress={this.onMarkAsFailedPress}
-      />
-    );
-  }
-}
-
-MovieHistoryTableContentConnector.propTypes = {
-  movieId: PropTypes.number.isRequired,
-  movieHistoryMarkAsFailed: PropTypes.func.isRequired
-};
-
-export default connect(createMapStateToProps, mapDispatchToProps)(MovieHistoryTableContentConnector);

frontend/src/Indexer/Index/IndexerIndexConnector.js

@@ -15,11 +15,11 @@ function createMapStateToProps() {
     createIndexerClientSideCollectionItemsSelector('indexerIndex'),
     createDimensionsSelector(),
     (
-      movies,
+      indexers,
       dimensionsState
     ) => {
       return {
-        ...movies,
+        ...indexers,
         isSmallScreen: dimensionsState.isSmallScreen
       };
     }