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.

Sign up for GitHub

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

UIIN-3160: Decrease the amount of re-renders of ConsortialHoldings component and fix accordion states between instances #2716

Merged
merged 7 commits into from
Jan 28, 2025
Merged

UIIN-3160: Decrease the amount of re-renders of ConsortialHoldings component and fix accordion states between instances #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d6e4e54
UIIN-3160: Decrease the amount of rerenders in ConsortialHoldings com…
OleksandrHladchenko1 Jan 20, 2025
97a871a
Merge branch 'master' into UIIN-3160
OleksandrHladchenko1 Jan 20, 2025
5a4c04c
UIIN-3160: Fix problem with accordion state
OleksandrHladchenko1 Jan 28, 2025
b78d672
Merge branch 'UIIN-3160' of https://github.com/folio-org/ui-inventory…
OleksandrHladchenko1 Jan 28, 2025
cf265c0
Merge branch 'master' into UIIN-3160
OleksandrHladchenko1 Jan 28, 2025
fc43089
Merge branch 'master' into UIIN-3160
OleksandrHladchenko1 Jan 28, 2025
747ec2c
Update CHANGELOG.md
OleksandrHladchenko1 Jan 28, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* Change import of `exportToCsv` from `stripes-util` to `stripes-components`. Refs UIIN-3025.
* ECS: Disable opening item details if a user is not affiliated with item's member tenant. Fixes UIIN-3187.
* Correctly depend on `inflected`. Refs UIIN-3203.
* Decrease the amount of rerenders in `ConsortialHoldings` component. Fixes UIIN-3196.

## [12.0.12](https://github.com/folio-org/ui-inventory/tree/v12.0.12) (2025-01-27)
[Full Changelog](https://github.com/folio-org/ui-inventory/compare/v12.0.11...v12.0.12)
Expand Down
4 changes: 2 additions & 2 deletions src/Instance/HoldingsList/consortium/ConsortialHoldings/ConsortialHoldings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const ConsortialHoldings = ({
updateStatus({});
updatePrevInstanceId(instanceId);
}
}, [instanceId]);
}, []);

useEffect(() => {
if (typeof isAllExpanded === 'boolean') {
Expand Down Expand Up @@ -91,7 +91,7 @@ const ConsortialHoldings = ({
onRegisterAccordion={onRegisterNewAcc}
>
<Accordion
id="consortialHoldings"
id={`consortialHoldings.${instance?.id}`}
label={<FormattedMessage id="ui-inventory.consortialHoldings" />}
displayWhenClosed={renderExpandAllButton}
displayWhenOpen={renderExpandAllButton}
Expand Down
2 changes: 1 addition & 1 deletion src/Instance/HoldingsList/consortium/MemberTenantHoldings/MemberTenantHoldings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const MemberTenantHoldings = ({
return (
<Accordion
className={css.memberTenantHoldings}
id={memberTenantId}
id={`${memberTenantId}.${instance?.id}`}
label={name}
>
<div className={css.memberTenantHoldings}>
Expand Down
2 changes: 0 additions & 2 deletions src/Instance/InstanceDetails/InstanceDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import React, {
import { useIntl, FormattedMessage } from 'react-intl';
import { useLocation } from 'react-router-dom';
import PropTypes from 'prop-types';
import { uniqueId } from 'lodash';

import {
AppIcon,
Expand Down Expand Up @@ -212,7 +211,6 @@ const InstanceDetails = forwardRef(({

{isConsortialHoldingsVisible && (
<ConsortialHoldings
key={uniqueId(instance?.id)}
instance={instance}
prevInstanceId={prevInstanceId.current}
updatePrevInstanceId={updatePrevInstanceId}
Expand Down
Loading