Fixup Interactive Search Infinite Loop and Filter CSS

Readarr · Apr 1, 2020 · dd8db64 · dd8db64
1 parent 43f981b
commit dd8db64
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 39 deletions.
diff --git a/frontend/src/Artist/Details/ArtistDetails.css b/frontend/src/Artist/Details/ArtistDetails.css
@@ -96,6 +96,10 @@
   margin-left: 20px;
 }
 
+.filterIcon {
+  float: right;
+}
+
 .artistNavigationButtons {
   white-space: nowrap;
 }

diff --git a/frontend/src/InteractiveSearch/InteractiveSearch.js b/frontend/src/InteractiveSearch/InteractiveSearch.js
@@ -1,13 +1,10 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import { align, icons, sortDirections } from 'Helpers/Props';
+import { icons, sortDirections } from 'Helpers/Props';
 import LoadingIndicator from 'Components/Loading/LoadingIndicator';
 import Icon from 'Components/Icon';
-import FilterMenu from 'Components/Menu/FilterMenu';
-import PageMenuButton from 'Components/Menu/PageMenuButton';
 import Table from 'Components/Table/Table';
 import TableBody from 'Components/Table/TableBody';
-import InteractiveSearchFilterModalConnector from './InteractiveSearchFilterModalConnector';
 import InteractiveSearchRow from './InteractiveSearchRow';
 import styles from './InteractiveSearch.css';
 
@@ -90,36 +87,16 @@ function InteractiveSearch(props) {
     error,
     totalReleasesCount,
     items,
-    selectedFilterKey,
-    filters,
-    customFilters,
     sortKey,
     sortDirection,
-    type,
     longDateFormat,
     timeFormat,
     onSortPress,
-    onFilterSelect,
     onGrabPress
   } = props;
 
   return (
     <div>
-      { false &&
-        <div className={styles.filterMenuContainer}>
-          <FilterMenu
-            alignMenu={align.RIGHT}
-            selectedFilterKey={selectedFilterKey}
-            filters={filters}
-            customFilters={customFilters}
-            buttonComponent={PageMenuButton}
-            filterModalConnectorComponent={InteractiveSearchFilterModalConnector}
-            filterModalConnectorComponentProps={{ type }}
-            onFilterSelect={onFilterSelect}
-          />
-        </div>
-      }
-
       {
         isFetching ? <LoadingIndicator /> : null
       }
@@ -194,16 +171,12 @@ InteractiveSearch.propTypes = {
   error: PropTypes.object,
   totalReleasesCount: PropTypes.number.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
-  filters: PropTypes.arrayOf(PropTypes.object).isRequired,
-  customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
   sortKey: PropTypes.string,
   sortDirection: PropTypes.string,
   type: PropTypes.string.isRequired,
   longDateFormat: PropTypes.string.isRequired,
   timeFormat: PropTypes.string.isRequired,
   onSortPress: PropTypes.func.isRequired,
-  onFilterSelect: PropTypes.func.isRequired,
   onGrabPress: PropTypes.func.isRequired
 };
 

diff --git a/frontend/src/InteractiveSearch/InteractiveSearchConnector.js b/frontend/src/InteractiveSearch/InteractiveSearchConnector.js
@@ -67,16 +67,6 @@ class InteractiveSearchConnector extends Component {
     }
   }
 
-  componentDidUpdate(prevProps) {
-    const {
-      searchPayload,
-      dispatchFetchReleases
-    } = this.props;
-    if (prevProps.searchPayload !== searchPayload) {
-      dispatchFetchReleases(searchPayload);
-    }
-  }
-
   //
   // Render
 

diff --git a/frontend/src/Store/Actions/releaseActions.js b/frontend/src/Store/Actions/releaseActions.js
@@ -151,7 +151,7 @@ export const defaultState = {
   },
 
   artist: {
-    selectedFilterKey: 'discography-pack'
+    selectedFilterKey: 'all'
   }
 };