UIREC-423 Provide the '<FieldInventory>' component with the complete …

…list of locations for mapping (#618)

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## 6.1.0 (IN PROGRESS)
 
+* Provide the `<FieldInventory>` component with the complete list of locations for mapping. Refs UIREC-423.
+
 ## [6.0.4](https://github.com/folio-org/ui-receiving/tree/v6.0.4) (2024-12-06)
 [Full Changelog](https://github.com/folio-org/ui-receiving/compare/v6.0.3...v6.0.4)
 

src/TitleBindPieces/TitleBindPieces.js

@@ -77,7 +77,6 @@ const TitleBindPieces = ({
             <TitleBindPiecesCreateItemForm
               instanceId={instanceId}
               selectLocation={form.mutators.setLocationValue}
-              bindItemValues={values?.bindItem}
             />
             <FieldArray
               id={FIELD_NAME}

src/TitleBindPieces/TitleBindPiecesCreateItemForm/TitleBindPiecesCreateItemForm.js

@@ -7,9 +7,10 @@ import {
 } from 'react-intl';
 
 import {
-  validateRequired,
   ConsortiumFieldInventory,
   FieldInventory,
+  useLocationsQuery,
+  validateRequired,
 } from '@folio/stripes-acq-components';
 import {
   Col,
@@ -18,7 +19,6 @@ import {
   TextField,
 } from '@folio/stripes/components';
 
-import { useHoldingsAndLocations } from '../../common/hooks';
 import { useReceivingSearchContext } from '../../contexts';
 import { PIECE_FORM_FIELD_NAMES } from '../constants';
 import {
@@ -29,20 +29,19 @@ import { buildOptions } from '../utils';
 
 export const TitleBindPiecesCreateItemForm = ({
   instanceId,
-  bindItemValues = {},
   selectLocation,
 }) => {
   const { materialTypes } = useMaterialTypes();
   const { loanTypes } = useLoanTypes();
   const intl = useIntl();
 
-  const { locations } = useHoldingsAndLocations({
-    instanceId,
-    tenantId: bindItemValues.tenantId,
-  });
-
   const { crossTenant } = useReceivingSearchContext();
 
+  const {
+    isLoading: isLocationsLoading,
+    locations,
+  } = useLocationsQuery({ consortium: crossTenant });
+
   const FieldInventoryComponent = crossTenant
     ? ConsortiumFieldInventory
     : FieldInventory;
@@ -132,6 +131,7 @@ export const TitleBindPiecesCreateItemForm = ({
         <FieldInventoryComponent
           affiliationName={PIECE_FORM_FIELD_NAMES.tenantId}
           instanceId={instanceId}
+          isLoading={isLocationsLoading}
           locationIds={locationIds}
           locations={locations}
           holdingName={PIECE_FORM_FIELD_NAMES.holdingId}
@@ -149,5 +149,4 @@ export const TitleBindPiecesCreateItemForm = ({
 TitleBindPiecesCreateItemForm.propTypes = {
   instanceId: PropTypes.string.isRequired,
   selectLocation: PropTypes.func.isRequired,
-  bindItemValues: PropTypes.object,
 };

src/TitleBindPieces/TitleBindPiecesCreateItemForm/TitleBindPiecesCreateItemForm.test.js

@@ -11,13 +11,15 @@ import {
   screen,
 } from '@folio/jest-config-stripes/testing-library/react';
 import stripesFinalForm from '@folio/stripes/final-form';
+import { useLocationsQuery } from '@folio/stripes-acq-components';
 
 import { TitleBindPiecesCreateItemForm } from './TitleBindPiecesCreateItemForm';
 
 jest.mock('@folio/stripes-acq-components', () => ({
   ...jest.requireActual('@folio/stripes-acq-components'),
   ConsortiumFieldInventory: () => 'ConsortiumFieldInventory',
   FieldInventory: () => 'FieldInventory',
+  useLocationsQuery: jest.fn(),
 }));
 jest.mock('../hooks', () => ({
   useMaterialTypes: jest.fn().mockReturnValue({ materialTypes: [] }),
@@ -59,6 +61,14 @@ const renderComponent = (props = defaultProps) => render(
 );
 
 describe('TitleBindPiecesCreateItemForm', () => {
+  beforeEach(() => {
+    useLocationsQuery.mockReturnValue({ locations: [] });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('should render component', () => {
     renderComponent();
 

src/common/hooks/index.js

@@ -1,5 +1,4 @@
 export * from './useHoldingItems';
-export * from './useHoldingsAndLocations';
 export * from './useItem';
 export * from './useOrder';
 export * from './useOrganizationsBatch';