fix(ui): Fixing search filtering issue introduced with sticky filters (#5643)

This commit is contained in:
John Joyce 2022-08-15 11:30:52 -07:00 committed by GitHub
parent 647d82d45f
commit b97702f621
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -13,6 +13,7 @@ import { navigateToSearchUrl } from './utils/navigateToSearchUrl';
import { useGetAuthenticatedUser } from '../useGetAuthenticatedUser';
import analytics, { EventType } from '../analytics';
import useFilters from './utils/useFilters';
import { PageRoutes } from '../../conf/Global';
const styles = {
children: {
@ -34,14 +35,21 @@ const defaultProps = {
onAutoComplete: undefined,
};
const isSearchResultPage = (path: string) => {
return path.startsWith(PageRoutes.SEARCH);
};
/**
* A page that includes a sticky search header (nav bar)
*/
export const SearchablePage = ({ onSearch, onAutoComplete, children }: Props) => {
const location = useLocation();
const params = QueryString.parse(location.search, { arrayFormat: 'comma' });
const filters: Array<FacetFilterInput> = useFilters(params);
const currentQuery: string = decodeURIComponent(params.query ? (params.query as string) : '');
const paramFilters: Array<FacetFilterInput> = useFilters(params);
const filters = isSearchResultPage(location.pathname) ? paramFilters : [];
const currentQuery: string = isSearchResultPage(location.pathname)
? decodeURIComponent(params.query ? (params.query as string) : '')
: '';
const history = useHistory();
const entityRegistry = useEntityRegistry();