Merge remote-tracking branch 'origin/master' into UIIN-3162

folio-org · Jan 17, 2025 · 4f8c1ec · 4f8c1ec
2 parents c70bdca + 616fce6
commit 4f8c1ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,9 +10,16 @@
 * React 19: refactor away from react-dom/test-utils. Refs UIIN-2888.
 * Add call number browse settings. Refs UIIN-3116.
 * Add "linked-data 1.0" interface to "optionalOkapiInterfaces". Refs UIIN-3166.
-* Fix infinite loading animation after cancel edit/duplicate or 'Save & Close' consortial holdings/items. Fixes UIIN-3167.
 * Remove hover-over text next to "Effective call number" on the Item record detail view. Refs UIIN-3131.
 * Change import of `exportToCsv` from `stripes-util` to `stripes-components`. Refs UIIN-3025.
+* Display `Shared` facet when user opens "Move holdings/items to another instance" modal. Refs UIIN-3198.
+* ECS - Allow 'Move holdings/items to another instance' if instance is shared. Refs UIIN-3188.
+* Fix '"location name" is undefined' error when trying to open instance details on ECS. Fixes UIIN-3196.
+
+## [12.0.9](https://github.com/folio-org/ui-inventory/tree/v12.0.9) (2025-01-13)
+[Full Changelog](https://github.com/folio-org/ui-inventory/compare/v12.0.8...v12.0.9)
+
+* Fix infinite loading animation after cancel edit/duplicate or 'Save & Close' consortial holdings/items. Fixes UIIN-3167.
 
 ## [12.0.8](https://github.com/folio-org/ui-inventory/tree/v12.0.8) (2024-12-24)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v12.0.7...v12.0.8)

diff --git a/src/Instance/HoldingsList/consortium/LimitedHoldingsList/LimitedHoldingsList.js b/src/Instance/HoldingsList/consortium/LimitedHoldingsList/LimitedHoldingsList.js
@@ -19,7 +19,7 @@ const LimitedHoldingsList = ({
       instance={instance}
       holding={holding}
       tenantId={tenantId}
-      locationName={locationsById[holding.permanentLocationId].name}
+      locationName={locationsById[holding.permanentLocationId]?.name}
       userTenantPermissions={userTenantPermissions}
       pathToAccordionsState={pathToAccordionsState}
     />

diff --git a/src/ViewInstance.js b/src/ViewInstance.js
@@ -840,7 +840,7 @@ class ViewInstance extends React.Component {
     );
 
     const showQuickMarcMenuSection = isSourceMARC && (canCreateMARCHoldings || canEditMARCRecord || canDeriveMARCRecord);
-    const canMoveHoldingsItemsToAnotherInstance = (canMoveItems || canMoveHoldings) && !isShared;
+    const canMoveHoldingsItemsToAnotherInstance = canMoveItems || canMoveHoldings;
 
     // the `identifier` is responsible for displaying the plugin `copyright-permissions-checker`
     if (!showInventoryMenuSection && !showQuickMarcMenuSection && !identifier) {
@@ -1232,7 +1232,6 @@ class ViewInstance extends React.Component {
                   onSelect={this.selectInstance}
                   onClose={this.toggleFindInstancePlugin}
                   withTrigger={false}
-                  suppressSharedFacet
                 />
               )
             }