Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UIEH-1428 Memoize TitleSearchFilters component to remove unnecessary renders #1731

Merged
merged 4 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* Agreements accordion - Revise Are you sure you want to unassign agreement? message. (UIEH-1420)
* Agreements accordion - Add a tooltip for the `New` and `Add` buttons. (UIEH-1424)
* eHoldings package-title (resource) view: display Proxied URL. (UIEH-1419)
* Fix title search is slow with many Packages filter options. (UIEH-1428)

## [9.1.1] (https://github.com/folio-org/ui-eholdings/tree/v9.1.1) (2024-03-24)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,24 @@ import PackagesFilterAccordion from '../packages-filter-accordion';
const propTypes = {
activeFilters: PropTypes.object.isRequired,
disabled: PropTypes.bool.isRequired,
isPackagesLoading: PropTypes.bool.isRequired,
isResultsLoading: PropTypes.bool.isRequired,
onUpdate: PropTypes.func.isRequired,
packagesFacetCollection: PropTypes.object.isRequired,
params: PropTypes.object.isRequired,
prevDataOfOptedPackage: PropTypes.object.isRequired,
results: PropTypes.object.isRequired,
resultsLength: PropTypes.number.isRequired,
titlesFacets: PropTypes.object.isRequired,
};

const PackagesFilter = ({
activeFilters,
disabled,
params,
packagesFacetCollection,
isPackagesLoading,
titlesFacets,
prevDataOfOptedPackage,
results,
resultsLength,
isResultsLoading,
onUpdate,
}) => {
const initialTitlesPackages = useRef(titlesFacets.packages).current;
Expand Down Expand Up @@ -65,8 +67,8 @@ const PackagesFilter = ({
const areStalePackages = (initialTitlesPackages === titlesFacets.packages)
&& isEqual(prevActiveFilters.current, activeFilters);

const noResults = params.q && !results.length && !results.isLoading;
const isFirstResultsLoading = !activeFilters.packageIds && results.isLoading && !results.length;
const noResults = params.q && !resultsLength && !isResultsLoading;
const isFirstResultsLoading = !activeFilters.packageIds && isResultsLoading && !resultsLength;

if (!params.q || (noResults && !activeFilters.packageIds)) {
return null;
Expand All @@ -83,7 +85,7 @@ const PackagesFilter = ({
activeFilters={activeFilters}
dataOptions={dataOptions}
disabled={disabled}
isLoading={results.isLoading || packagesFacetCollection.isLoading}
isLoading={isResultsLoading || isPackagesLoading}
onUpdate={onUpdate}
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ const getComponent = (props = {}) => (
params={{ q: 'book' }}
titlesFacets={{}}
prevDataOfOptedPackage={{}}
packagesFacetCollection={{}}
results={{}}
isPackagesLoading={false}
resultsLength={0}
isResultsLoading={false}
onUpdate={() => {}}
{...props}
/>
Expand All @@ -42,7 +43,6 @@ describe('Given PackagesFilter', () => {
const { container } = renderComponent({
params: { q: 'book' },
activeFilters: { packageIds: '' },
results: { length: 0, isLoading: false },
});

expect(container).toBeEmptyDOMElement();
Expand All @@ -64,7 +64,7 @@ describe('Given PackagesFilter', () => {
const { getByTestId } = renderComponent({
params: { q: 'book' },
activeFilters: { packageIds: '' },
results: { length: 0, isLoading: true },
isResultsLoading: true,
});

expect(getByTestId('spinner-ellipsis')).toBeDefined();
Expand Down
5 changes: 3 additions & 2 deletions src/components/search-form/search-form.js
Original file line number Diff line number Diff line change
Expand Up @@ -377,9 +377,10 @@ class SearchForm extends Component {
activeFilters={combinedFilters}
params={params}
prevDataOfOptedPackage={prevDataOfOptedPackage}
results={results}
resultsLength={results.length}
isResultsLoading={results.isLoading}
titlesFacets={titlesFacets}
packagesFacetCollection={packagesFacetCollection}
isPackagesLoading={packagesFacetCollection.isLoading}
onUpdate={this.handleUpdateFilter}
disabled={standaloneFiltersEnabled}
/>
Expand Down
20 changes: 13 additions & 7 deletions src/components/title-search-filters.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { memo } from 'react';
import PropTypes from 'prop-types';
import isEqual from 'lodash/isEqual';

import SearchFilters from './search-form/search-filters';
import PackagesFilter from './search-form/components/packages-filter';
import {
Expand All @@ -10,11 +13,12 @@ import {
const propTypes = {
activeFilters: PropTypes.object.isRequired,
disabled: PropTypes.bool.isRequired,
isPackagesLoading: PropTypes.bool.isRequired,
isResultsLoading: PropTypes.bool.isRequired,
onUpdate: PropTypes.func.isRequired,
packagesFacetCollection: PropTypes.object.isRequired,
params: PropTypes.object.isRequired,
prevDataOfOptedPackage: PropTypes.object.isRequired,
results: PropTypes.object.isRequired,
resultsLength: PropTypes.number.isRequired,
titlesFacets: PropTypes.object.isRequired,
};

Expand All @@ -32,8 +36,9 @@ function TitleSearchFilters(props) {
disabled,
params,
prevDataOfOptedPackage,
results,
packagesFacetCollection,
resultsLength,
isResultsLoading,
isPackagesLoading,
titlesFacets,
onUpdate,
} = props;
Expand All @@ -54,9 +59,10 @@ function TitleSearchFilters(props) {
disabled={disabled}
params={params}
prevDataOfOptedPackage={prevDataOfOptedPackage}
results={results}
resultsLength={resultsLength}
isResultsLoading={isResultsLoading}
titlesFacets={titlesFacets}
packagesFacetCollection={packagesFacetCollection}
isPackagesLoading={isPackagesLoading}
onUpdate={onUpdate}
/>
</>
Expand All @@ -65,4 +71,4 @@ function TitleSearchFilters(props) {

TitleSearchFilters.propTypes = propTypes;

export default TitleSearchFilters;
export default memo(TitleSearchFilters, isEqual);
Loading