Trigger manual search from any History Item

frontend/src/Search/SearchFooter.css

@@ -24,18 +24,10 @@
   flex-grow: 1;
 }
 
-.organizeSelectedButton,
-.tagsButton {
+.searchButton {
   composes: button from '~Components/Link/SpinnerButton.css';
 
-  margin-right: 10px;
-  height: 35px;
-}
-
-.deleteSelectedButton {
-  composes: button from '~Components/Link/SpinnerButton.css';
-
-  margin-left: 50px;
+  margin-left: 25px;
   height: 35px;
 }
 

frontend/src/Search/SearchFooter.js

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import IndexersSelectInputConnector from 'Components/Form/IndexersSelectInputConnector';
@@ -16,36 +17,75 @@ class SearchFooter extends Component {
   constructor(props, context) {
     super(props, context);
 
+    const {
+      defaultIndexerIds,
+      defaultCategories,
+      defaultSearchQuery
+    } = props;
+
     this.state = {
       searchingReleases: false,
-      searchQuery: '',
-      indexerIds: [],
-      categories: []
+      searchQuery: defaultSearchQuery,
+      searchIndexerIds: defaultIndexerIds,
+      searchCategories: defaultCategories
     };
   }
 
+  componentDidMount() {
+    const {
+      searchIndexerIds,
+      searchCategories,
+      searchQuery
+    } = this.state;
+
+    if (searchQuery !== '' || searchCategories !== [] || searchIndexerIds !== []) {
+      this.onSearchPress();
+    }
+  }
+
   componentDidUpdate(prevProps) {
     const {
       isFetching,
+      defaultIndexerIds,
+      defaultCategories,
+      defaultSearchQuery,
       searchError
     } = this.props;
 
+    const {
+      searchIndexerIds,
+      searchCategories,
+      searchQuery
+    } = this.state;
+
+    const newState = {};
+
+    if (searchIndexerIds !== defaultIndexerIds) {
+      newState.searchIndexerIds = defaultIndexerIds;
+    }
+
+    if (searchCategories !== defaultCategories) {
+      newState.searchCategories = defaultCategories;
+    }
+
+    if (searchQuery !== defaultSearchQuery) {
+      newState.searchQuery = defaultSearchQuery;
+    }
+
     if (prevProps.isFetching && !isFetching && !searchError) {
-      this.setState({
-        searchingReleases: false
-      });
+      newState.searchingReleases = false;
+    }
+
+    if (!_.isEmpty(newState)) {
+      this.setState(newState);
     }
   }
 
   //
   // Listeners
 
-  onInputChange = ({ name, value }) => {
-    this.setState({ [name]: value });
-  }
-
   onSearchPress = () => {
-    this.props.onSearchPress(this.state.searchQuery, this.state.indexerIds, this.state.categories);
+    this.props.onSearchPress(this.state.searchQuery, this.state.searchIndexerIds, this.state.searchCategories);
   }
 
   //
@@ -54,13 +94,14 @@ class SearchFooter extends Component {
   render() {
     const {
       isFetching,
-      hasIndexers
+      hasIndexers,
+      onInputChange
     } = this.props;
 
     const {
       searchQuery,
-      indexerIds,
-      categories
+      searchIndexerIds,
+      searchCategories
     } = this.state;
 
     return (
@@ -75,7 +116,7 @@ class SearchFooter extends Component {
             name='searchQuery'
             value={searchQuery}
             isDisabled={isFetching}
-            onChange={this.onInputChange}
+            onChange={onInputChange}
           />
         </div>
 
@@ -86,10 +127,10 @@ class SearchFooter extends Component {
           />
 
           <IndexersSelectInputConnector
-            name='indexerIds'
-            value={indexerIds}
+            name='searchIndexerIds'
+            value={searchIndexerIds}
             isDisabled={isFetching}
-            onChange={this.onInputChange}
+            onChange={onInputChange}
           />
         </div>
 
@@ -100,19 +141,24 @@ class SearchFooter extends Component {
           />
 
           <NewznabCategorySelectInputConnector
-            name='categories'
-            value={categories}
+            name='searchCategories'
+            value={searchCategories}
             isDisabled={isFetching}
-            onChange={this.onInputChange}
+            onChange={onInputChange}
           />
         </div>
 
         <div className={styles.buttonContainer}>
           <div className={styles.buttonContainerContent}>
+            <SearchFooterLabel
+              label={`Search ${searchIndexerIds.length === 0 ? 'all' : searchIndexerIds.length} Indexers`}
+              isSaving={false}
+            />
+
             <div className={styles.buttons}>
 
               <SpinnerButton
-                className={styles.deleteSelectedButton}
+                className={styles.searchButton}
                 isSpinning={isFetching}
                 isDisabled={isFetching || !hasIndexers}
                 onPress={this.onSearchPress}
@@ -128,9 +174,13 @@ class SearchFooter extends Component {
 }
 
 SearchFooter.propTypes = {
+  defaultIndexerIds: PropTypes.arrayOf(PropTypes.number).isRequired,
+  defaultCategories: PropTypes.arrayOf(PropTypes.number).isRequired,
+  defaultSearchQuery: PropTypes.string.isRequired,
   isFetching: PropTypes.bool.isRequired,
   onSearchPress: PropTypes.func.isRequired,
   hasIndexers: PropTypes.bool.isRequired,
+  onInputChange: PropTypes.func.isRequired,
   searchError: PropTypes.object
 };
 

frontend/src/Search/SearchFooterConnector.js

@@ -0,0 +1,58 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import { setSearchDefault } from 'Store/Actions/releaseActions';
+import SearchFooter from './SearchFooter';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.releases,
+    (releases) => {
+      const {
+        searchQuery: defaultSearchQuery,
+        searchIndexerIds: defaultIndexerIds,
+        searchCategories: defaultCategories
+      } = releases.defaults;
+
+      return {
+        defaultSearchQuery,
+        defaultIndexerIds,
+        defaultCategories
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  setSearchDefault
+};
+
+class SearchFooterConnector extends Component {
+
+  //
+  // Listeners
+
+  onInputChange = ({ name, value }) => {
+    console.log(name, value);
+    this.props.setSearchDefault({ [name]: value });
+  }
+
+  //
+  // Render
+
+  render() {
+    return (
+      <SearchFooter
+        {...this.props}
+        onInputChange={this.onInputChange}
+      />
+    );
+  }
+}
+
+SearchFooterConnector.propTypes = {
+  setSearchDefault: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(SearchFooterConnector);

frontend/src/Search/SearchIndex.js

@@ -21,7 +21,7 @@ import translate from 'Utilities/String/translate';
 import SearchIndexFilterMenu from './Menus/SearchIndexFilterMenu';
 import SearchIndexSortMenu from './Menus/SearchIndexSortMenu';
 import NoSearchResults from './NoSearchResults';
-import SearchFooter from './SearchFooter.js';
+import SearchFooterConnector from './SearchFooterConnector';
 import SearchIndexTableConnector from './Table/SearchIndexTableConnector';
 import styles from './SearchIndex.css';
 
@@ -290,7 +290,7 @@ class SearchIndex extends Component {
           }
         </div>
 
-        <SearchFooter
+        <SearchFooterConnector
           isFetching={isFetching}
           hasIndexers={hasIndexers}
           onSearchPress={this.onSearchPress}