Skip to content

Commit

Permalink
UIIN-3113: ECS | Instance details pane does not contain all tenants w…
Browse files Browse the repository at this point in the history
…hen user does not have affiliations / permissions in all tenants (#2664)

(cherry picked from commit db50c79)
  • Loading branch information
mariia-aloshyna committed Nov 22, 2024
1 parent 94e7d19 commit d25767d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change history for ui-inventory

## [12.0.2] (IN PROGRESS)

* ECS | Instance details pane does not contain all tenants when user does not have affiliations / permissions in all tenants. Fixes UIIN-3113.

## [12.0.1](https://github.com/folio-org/ui-inventory/tree/v12.0.1) (2024-11-15)
[Full Changelog](https://github.com/folio-org/ui-inventory/compare/v12.0.0...v12.0.1)

Expand Down
12 changes: 8 additions & 4 deletions src/hooks/useMemberTenantHoldings/useMemberTenantHoldings.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,14 @@ const useMemberTenantHoldings = (instance, tenantId, userTenantPermissions) => {
const { holdingsRecords: expandedHoldings, isLoading: isExpandedHoldingsLoading } = useInstanceHoldingsQuery(instance?.id, { tenantId, enabled: canViewHoldings });
const { holdings: limitedHoldings, isLoading: isLimitedHoldingsLoading } = useConsortiumHoldings(instance?.id, tenantId, { enabled: !canViewHoldings });

const holdings = useMemo(() => expandedHoldings || limitedHoldings || [],
[expandedHoldings, limitedHoldings, isExpandedHoldingsLoading, isLimitedHoldingsLoading]);
const isLoading = useMemo(() => isExpandedHoldingsLoading || isLimitedHoldingsLoading,
[isExpandedHoldingsLoading, isLimitedHoldingsLoading]);
const holdings = useMemo(
() => (expandedHoldings?.length ? expandedHoldings : limitedHoldings?.length ? limitedHoldings : []),
[expandedHoldings, limitedHoldings, isExpandedHoldingsLoading, isLimitedHoldingsLoading],
);
const isLoading = useMemo(
() => isExpandedHoldingsLoading || isLimitedHoldingsLoading,
[isExpandedHoldingsLoading, isLimitedHoldingsLoading],
);

return {
holdings,
Expand Down

0 comments on commit d25767d

Please sign in to comment.