Merge branch 'master' into UIIN-3124

CHANGELOG.md

@@ -5,6 +5,7 @@
 * Run `history.replace` once during component mount and update to avoid URL rewriting. Refs UIIN-3099.
 * ECS | "FOLIO/MARC-shared" source is displayed in manually shared instance record. Fixes UIIN-3115.
 * Allow user to move item to another holdings associated with another instance. Fixes UIIN-3102.
+* ECS | Instance details pane does not contain all tenants when user does not have affiliations / permissions in all tenants. Fixes UIIN-3113.
 * Cautiously evaluate tenant permissions to avoid NPEs. Refs UIIN-3124.
 
 ## [12.0.0](https://github.com/folio-org/ui-inventory/tree/v12.0.0) (2024-10-31)

src/hooks/useMemberTenantHoldings/useMemberTenantHoldings.js

@@ -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,