From c42845afc317c8b6805e02ecde367a849662a09f Mon Sep 17 00:00:00 2001
From: ssandupatla <58558770+ssandupatla@users.noreply.github.com>
Date: Fri, 28 Apr 2023 16:38:11 +0530
Subject: [PATCH 01/68] UIIN-1584 create JEST/RTL test cases for useFacets.js
 (#2136)

---
 src/common/hooks/useFacets.test.js | 312 +++++++++++++++++++++++++++++
 1 file changed, 312 insertions(+)
 create mode 100644 src/common/hooks/useFacets.test.js

diff --git a/src/common/hooks/useFacets.test.js b/src/common/hooks/useFacets.test.js
new file mode 100644
index 000000000..5791ee5f9
--- /dev/null
+++ b/src/common/hooks/useFacets.test.js
@@ -0,0 +1,312 @@
+import { renderHook, act } from '@testing-library/react-hooks';
+import { useLocation } from 'react-router-dom';
+import React from 'react';
+import { useFacetSettings } from '../../stores/facetsStore';
+import useFacets from './useFacets';
+
+jest.mock('react-router-dom', () => ({
+  useLocation: jest.fn(),
+}));
+
+jest.mock('../../stores/facetsStore', () => ({
+  useFacetSettings: jest
+    .fn()
+    .mockReturnValue([{ foo: { value: 'bar' }, quux: { value: 'changed' } }]),
+}));
+
+describe('useFacets', () => {
+  const segmentAccordions = {
+    test: true,
+    foo: true,
+    baz: false,
+  };
+  const segmentOptions = { baz: ['qux'], quux: ['corge'] };
+  const selectedFacetFilters = {
+    selectedFilters: { foo: { value: 'bar' } },
+    facetName: 'test',
+  };
+  const getNewRecords = jest.fn(() => {
+    return { quux: ['corge', 'grault'], garply: ['waldo'] };
+  });
+
+  const data = {
+    query: { query: null, filters: 'filters' },
+    onFetchFacets: jest.fn(),
+    parentResources: {
+      facets: { records: [[{ name: 'baz' }]], isPending: true },
+    },
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    useLocation.mockReturnValue({ pathname: '/path' });
+    useFacetSettings.mockReturnValue([selectedFacetFilters, jest.fn()]);
+  });
+
+  it('returns initial state', () => {
+    const { result } = renderHook(() => useFacets(
+      segmentAccordions,
+      segmentOptions,
+      selectedFacetFilters,
+      getNewRecords,
+      data
+    ));
+    expect(result.current[0]).toEqual(segmentAccordions);
+  });
+
+  it('updates accordions state on new toggle', () => {
+    const { result } = renderHook(() => useFacets(
+      segmentAccordions,
+      segmentOptions,
+      selectedFacetFilters,
+      getNewRecords,
+      data
+    ));
+
+    act(() => {
+      result.current[1]({ id: 'foo' });
+    });
+    expect(result.current[0]).toEqual({
+      ...segmentAccordions,
+      foo: false,
+    });
+  });
+
+  it('updates accordions state on open toggle', () => {
+    const { result } = renderHook(() => useFacets(
+      segmentAccordions,
+      segmentOptions,
+      selectedFacetFilters,
+      getNewRecords,
+      data
+    ));
+
+    act(() => {
+      result.current[2]({
+        onMoreClickedFacet: true,
+        focusedFacet: '',
+        facetToOpen: true,
+        dateFacet: true,
+      });
+    });
+    expect(result.current[0]).toEqual({
+      ...segmentAccordions,
+      foo: true,
+    });
+  });
+
+  it('updates accordions state on segment toggle', () => {
+    const { result } = renderHook(() => useFacets(
+      segmentAccordions,
+      segmentOptions,
+      {},
+      getNewRecords,
+      data
+    ));
+
+    act(() => {
+      result.current[2]({
+        onMoreClickedFacet: true,
+        focusedFacet: '',
+        facetToOpen: true,
+        dateFacet: true,
+      });
+    });
+    expect(result.current[0]).toEqual({
+      ...segmentAccordions,
+      foo: true,
+    });
+  });
+
+  it('updates accordions state on records toggle', () => {
+    const { result } = renderHook(() => useFacets(
+      segmentAccordions,
+      segmentOptions,
+      selectedFacetFilters,
+      getNewRecords,
+      data
+    ));
+
+    act(() => {
+      result.current[2]({
+        onMoreClickedFacet: true,
+        focusedFacet: '',
+        facetToOpen: false,
+        dateFacet: true,
+      });
+    });
+    expect(result.current[0]).toEqual({
+      ...segmentAccordions,
+      foo: true,
+    });
+  });
+
+  it('updates accordions state on facet toggle', () => {
+    const { result } = renderHook(() => useFacets(
+      segmentAccordions,
+      segmentOptions,
+      selectedFacetFilters,
+      getNewRecords,
+      data
+    ));
+
+    act(() => {
+      result.current[2]({
+        onMoreClickedFacet: false,
+        focusedFacet: true,
+        facetToOpen: false,
+        dateFacet: true,
+      });
+    });
+    expect(result.current[0]).toEqual({
+      ...segmentAccordions,
+      foo: true,
+    });
+  });
+
+  it('updates accordions state on date toggle', () => {
+    const { result } = renderHook(() => useFacets(
+      segmentAccordions,
+      segmentOptions,
+      selectedFacetFilters,
+      getNewRecords,
+      data
+    ));
+
+    act(() => {
+      result.current[2]({
+        onMoreClickedFacet: false,
+        focusedFacet: true,
+        facetToOpen: false,
+        dateFacet: false,
+      });
+    });
+    expect(result.current[0]).toEqual({
+      ...segmentAccordions,
+      foo: true,
+    });
+  });
+
+  it('updates facet settings on data filter search', () => {
+    const spy = jest.spyOn(React, 'useRef');
+    spy.mockImplementation(() => {
+      return { current: {}, ...segmentAccordions };
+    });
+    const { result } = renderHook(() => useFacets(
+      segmentAccordions,
+      segmentOptions,
+      selectedFacetFilters,
+      getNewRecords,
+      data
+    ));
+
+    act(() => {
+      result.current[3]({ name: 'quux', value: 'changed' });
+    });
+    expect(result.current[0]).toEqual({
+      ...segmentAccordions,
+      foo: true,
+    });
+  });
+
+  it('updates facet settings on accordions filter search', () => {
+    const spy = jest.spyOn(React, 'useRef');
+    spy.mockImplementation(() => {
+      return { current: { test: ['ere'] }, ...segmentAccordions };
+    });
+    const { result } = renderHook(() => useFacets(
+      segmentAccordions,
+      segmentOptions,
+      { selectedFilters: undefined, facetName: 'test' },
+      getNewRecords,
+      data
+    ));
+    act(() => {
+      result.current[3]({ name: 'quux', value: 'changed' });
+    });
+    expect(result.current[0]).toEqual({
+      ...segmentAccordions,
+      foo: true,
+    });
+  });
+  it('updates facet settings on selected filter search', () => {
+    jest.spyOn(React, 'useRef').mockReturnValueOnce({
+      current: {},
+    });
+    const { result } = renderHook(() => useFacets(
+      segmentAccordions,
+      segmentOptions,
+      {
+        selectedFilters: undefined,
+        facetName: 'test',
+      },
+      getNewRecords,
+      data
+    ));
+
+    act(() => {
+      result.current[5]('test');
+    });
+    expect(result.current[0]).toEqual({
+      ...segmentAccordions,
+      foo: true,
+    });
+  });
+  it('updates facet settings on facet filter search', () => {
+    const spy = jest.spyOn(React, 'useRef');
+    spy.mockImplementation(() => {
+      return {
+        current: {
+          test: ['ere'],
+          prevFacetValue: 'test',
+          selectedFilters: ['hggh'],
+          facetName: 'test',
+        },
+        ...segmentAccordions,
+      };
+    });
+    const { result } = renderHook(() => useFacets(
+      segmentAccordions,
+      segmentOptions,
+      {
+        selectedFilters: undefined,
+        facetName: 'test',
+      },
+      getNewRecords,
+      data
+    ));
+
+    act(() => {
+      result.current[5]('test');
+    });
+    expect(result.current[0]).toEqual({
+      ...segmentAccordions,
+      foo: true,
+    });
+  });
+  it('updates facet settings on ref filter search', () => {
+    const spy = jest.spyOn(React, 'useRef');
+    spy.mockImplementation(() => {
+      return {
+        current: { test: ['ere'], prevFacetValue: 'test', facetName: 'test' },
+        ...segmentAccordions,
+      };
+    });
+    const { result } = renderHook(() => useFacets(
+      { foo: false },
+      segmentOptions,
+      {
+        selectedFilters: undefined,
+        facetName: 'test',
+      },
+      getNewRecords,
+      data
+    ));
+    act(() => {
+      result.current[5]('test');
+    });
+    expect(result.current[0]).toEqual({
+      foo: false,
+    });
+  });
+});

From fb26f7dd6a2be4861185a4b8709f9e2e41570370 Mon Sep 17 00:00:00 2001
From: cchitneedi <100114810+cchitneedi@users.noreply.github.com>
Date: Fri, 28 Apr 2023 17:10:27 +0530
Subject: [PATCH 02/68] UIIN-1585 create Jest/RTL test for
 holdingsRecordFilterRenderer.js (#2133)

* UIIN-1585 create Jest/RTL test for holdingsRecordFilterRenderer.js

* Update holdingsRecordFilterRenderer.test.js

removed unused import
---
 .../holdingsRecordFilterRenderer.test.js      | 118 ++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100644 src/components/HoldingsRecordFilters/holdingsRecordFilterRenderer.test.js

diff --git a/src/components/HoldingsRecordFilters/holdingsRecordFilterRenderer.test.js b/src/components/HoldingsRecordFilters/holdingsRecordFilterRenderer.test.js
new file mode 100644
index 000000000..4a461b3f9
--- /dev/null
+++ b/src/components/HoldingsRecordFilters/holdingsRecordFilterRenderer.test.js
@@ -0,0 +1,118 @@
+import React from 'react';
+import { BrowserRouter as Router } from 'react-router-dom';
+
+import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/react';
+import '../../../test/jest/__mock__/currencyData.mock';
+import '../../../test/jest/__mock__/stripesConfig.mock';
+import '../../../test/jest/__mock__/stripesCore.mock';
+import '../../../test/jest/__mock__/stripesIcon.mock';
+import renderWithIntl from '../../../test/jest/helpers/renderWithIntl';
+import translationsProperties from '../../../test/jest/helpers/translationsProperties';
+
+import holdingsRecordFilterRenderer from './holdingsRecordFilterRenderer';
+
+
+import {
+  getSourceOptions,
+  getSuppressedOptions,
+  processFacetOptions,
+  processStatisticalCodes,
+} from '../../facetUtils';
+
+jest.mock('../../facetUtils', () => ({
+  ...jest.requireActual('../../facetUtils'),
+  getSourceOptions: jest.fn(),
+  getSuppressedOptions: jest.fn(),
+  processFacetOptions: jest.fn(),
+  processStatisticalCodes: jest.fn(),
+}));
+
+jest.mock('@folio/stripes/components', () => ({
+  ...jest.requireActual('@folio/stripes/components'),
+  Accordion: jest.fn(({ onClearFilter, children }) => (
+    <div>
+      {children}
+      <button type="button" onClick={() => onClearFilter()}>onClearFilter</button>
+    </div>
+  )),
+}), { virtual: true });
+
+jest.mock('../CheckboxFacet/CheckboxFacet', () => ({ onChange }) => (
+  <div>
+    <div>CheckboxFacet</div>
+    <button type="button" onClick={() => onChange()}>onChange</button>
+  </div>
+));
+
+const onChangeMock = jest.fn();
+const resources = {
+  facets: {
+    hasLoaded: true,
+    resource: 'facets',
+    records: [{
+      'items.effectiveLocationId': 'effectiveLocationId1',
+      'holdings.permanentLocationId': 'permanentLocationId1',
+      'holdings.statisticalCodeIds': 'statisticalCodeIds1',
+      'holdings.discoverySuppress': 'discoverySuppress1',
+      'holdings.sourceId': 'sourceId1',
+      'holdingsTags': 'holdingsTags1',
+      'holdings.holdingsTypeId': 'holdingsTypeId1',
+    }],
+  },
+};
+const DATA = {
+
+  locations: [],
+  statisticalCodes: [],
+  holdingsSources: [],
+  holdingsTypes: [],
+  tags: [],
+  query: { filters: '' },
+  onFetchFacets: jest.fn(),
+  parentResources: resources
+};
+
+const renderFilters = (data = DATA, onChange = onChangeMock) => renderWithIntl(
+  <Router>{holdingsRecordFilterRenderer(data)(onChange)}</Router>,
+  translationsProperties
+);
+
+
+describe('holdingsRecordFilterRenderer', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('processFacetOptions should be called when holdingsRecordFilterRenderer renders', () => {
+    renderFilters();
+    expect(processFacetOptions).toHaveBeenCalledTimes(4);
+  });
+
+  it('getSuppressedOptions should be called when holdingsRecordFilterRenderer renders', () => {
+    renderFilters();
+    expect(getSuppressedOptions).toHaveBeenCalledTimes(1);
+  });
+  it('getSourceOptions should be called when holdingsRecordFilterRenderer renders', () => {
+    renderFilters();
+    expect(getSourceOptions).toBeCalled();
+  });
+  it('processStatisticalCodes should be called when holdingsRecordFilterRenderer renders', () => {
+    renderFilters();
+    expect(processStatisticalCodes).toHaveBeenCalledTimes(1);
+  });
+
+  it('onChange function to be called when clearfilter button is clicked', () => {
+    renderFilters();
+    userEvent.click(screen.getAllByRole('button', { name: 'onClearFilter' })[0]);
+    expect(onChangeMock).toBeCalled();
+  });
+  it('onChange function to be called when onChange button is clicked', () => {
+    renderFilters();
+    userEvent.click(screen.getAllByRole('button', { name: 'onChange' })[0]);
+    expect(onChangeMock).toBeCalled();
+  });
+});
+
+
+

From 64a8b0e64366a5ff7960c1106941caf210db104a Mon Sep 17 00:00:00 2001
From: KetineniM <53168935+KetineniM@users.noreply.github.com>
Date: Fri, 28 Apr 2023 17:41:03 +0530
Subject: [PATCH 03/68] UIIN-1575 JEST/RTL test cases for InstanceFilters
 (#2132)

* UIIN-1575 JEST/RTL test cases for InstanceFilters

* Update InstanceFilters.test.js

Issues resolved

* Update InstanceFilters.test.js

removed unwanted import statements

* Update InstanceFilters.test.js

Issues resolved
---
 .../InstanceFilters/InstanceFilters.test.js   | 181 ++++++++++++++++--
 1 file changed, 161 insertions(+), 20 deletions(-)

diff --git a/src/components/InstanceFilters/InstanceFilters.test.js b/src/components/InstanceFilters/InstanceFilters.test.js
index c1919e66d..eb2e4d8b1 100644
--- a/src/components/InstanceFilters/InstanceFilters.test.js
+++ b/src/components/InstanceFilters/InstanceFilters.test.js
@@ -1,20 +1,59 @@
 import React from 'react';
+import '../../../test/jest/__mock__';
 import { BrowserRouter as Router } from 'react-router-dom';
-import { noop } from 'lodash';
+import { screen, waitFor } from '@testing-library/react';
+import { ModuleHierarchyProvider } from '@folio/stripes-core/src/components/ModuleHierarchy';
 
-import '../../../test/jest/__mock__';
+import userEvent from '@testing-library/user-event';
+import renderWithIntl from '../../../test/jest/helpers/renderWithIntl';
+import {
+  FACETS
+} from '../../constants';
+import InstanceFilters from './InstanceFilters';
+import translationsProperties from '../../../test/jest/helpers/translationsProperties';
 
-import { ModuleHierarchyProvider } from '@folio/stripes/core';
+jest.mock('../CheckboxFacet/CheckboxFacet', () => jest.fn().mockReturnValue('CheckboxFacet'));
 
-import renderWithIntl from '../../../test/jest/helpers/renderWithIntl';
+jest.mock('../../facetUtils', () => ({
+  ...jest.requireActual('../../facetUtils'),
+  getSourceOptions: jest.fn(),
+  getSuppressedOptions: jest.fn(),
+}));
 
-import InstanceFilters from './InstanceFilters';
+const activeFilters = {
+  [FACETS.EFFECTIVE_LOCATION]: ['loc1'],
+  [FACETS.ITEM_STATUS]: ['ITEM_STATUS1'],
+  [FACETS.RESOURCE]: ['RESOURCE1'],
+  [FACETS.FORMAT]: ['Format1'],
+  [FACETS.MODE]: ['Mode1'],
+  [FACETS.NATURE_OF_CONTENT]: ['NATUREOFCONTENT1'],
+  [FACETS.STAFF_SUPPRESS]: ['STAFFSUPPRESS1'],
+  [FACETS.INSTANCES_DISCOVERY_SUPPRESS]: ['DISCOVERYSUPPRESS1'],
+  [FACETS.STATISTICAL_CODE_IDS]: ['STATISTICALCODEIDS1'],
+  [FACETS.CREATED_DATE]: ['2022-01-01'],
+  [FACETS.UPDATED_DATE]: ['2022-01-01'],
+  [FACETS.STATUS]: ['STATUS1'],
+  [FACETS.SOURCE]: ['SOURCE1']
+};
 
 const resources = {
   facets: {
     hasLoaded: true,
     resource: 'facets',
-    records: [],
+    records: [{
+      'items.effectiveLocationId': 'effectiveLocationId1',
+      'languages': 'languages',
+      'statisticalCodeIds': 'statisticalCodeIds1',
+      'discoverySuppress': 'discoverySuppress1',
+      'source': 'source1',
+      'instanceTags': 'instanceTags1',
+      'statusId': 'statusId1',
+      'staffSuppress': 'staffSuppress1',
+      'natureOfContentTermIds': 'natureOfContentTermIds1',
+      'modeOfIssuanceId': 'modeOfIssuanceId1',
+      'instanceFormatIds': 'instanceFormatIds1',
+      'instanceTypeId': 'instanceTypeId1',
+    }],
     other: { totalRecords: 0 }
   },
 };
@@ -22,46 +61,148 @@ const resources = {
 const data = {
   locations: [],
   resourceTypes: [],
-  statisticalCodes: [],
   instanceFormats: [],
   modesOfIssuance: [],
+  statisticalCodes: [],
   tagsRecords: [],
   natureOfContentTerms: [],
   query: [],
-  onFetchFacets: noop,
+  onFetchFacets: jest.fn(),
   parentResources: resources,
 };
-
+const onChange = jest.fn();
+const onClear = jest.fn();
 const renderInstanceFilters = () => {
   return renderWithIntl(
     <Router>
       <ModuleHierarchyProvider module="@folio/inventory">
         <InstanceFilters
-          activeFilters={{ 'language': ['eng'] }}
+          activeFilters={activeFilters}
           data={data}
-          onChange={noop}
-          onClear={noop}
+          onChange={onChange}
+          onClear={onClear}
           parentResources={resources}
         />
       </ModuleHierarchyProvider>
-    </Router>
+    </Router>,
+    translationsProperties
   );
 };
 
 describe('InstanceFilters', () => {
-  beforeEach(() => {
+  it('Should Clear selected filters for effective Location', async () => {
     renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[1]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+  it('Should Clear selected filters for language', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[3]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for resource', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[5]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
   });
 
-  it('Contains a filter for creation date ', () => {
-    expect(document.querySelector('#createdDate')).toBeInTheDocument();
+  it('Should Clear selected filters for format', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[7]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
   });
 
-  it('Contains a filter for update date ', () => {
-    expect(document.querySelector('#updatedDate')).toBeInTheDocument();
+  it('Should Clear selected filters for mode', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[9]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for nature Of Content', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[11]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
   });
 
-  it('Contains a filter for statistical code', () => {
-    expect(document.querySelector('#statisticalCodeIds')).toBeInTheDocument();
+  it('Should Clear selected filters for staffSuppress', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[13]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for Suppress from discovery', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[15]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for Statistical code filter list', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[17]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for Date created filter list', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[19]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for Date updated filter list', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[26]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for Instance status filter list', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[33]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for Source filter list', async () => {
+    renderInstanceFilters();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[35]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
   });
 });

From 3d1d9de039ef20d804f75ab125e20d5f52161d38 Mon Sep 17 00:00:00 2001
From: cchitneedi <100114810+cchitneedi@users.noreply.github.com>
Date: Fri, 28 Apr 2023 18:24:36 +0530
Subject: [PATCH 04/68] UIIN-1782 create Jest/RTL test for SubInstanceList.js
 (#2114)

* UIIN-1782 create Jest/RTL test for SubInstanceList.js

* UIIN-1782 create Jest/RTL test for SubInstanceList.js
---
 .../SubInstanceList/SubInstanceList.test.js   | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 src/Instance/InstanceDetails/SubInstanceList/SubInstanceList.test.js

diff --git a/src/Instance/InstanceDetails/SubInstanceList/SubInstanceList.test.js b/src/Instance/InstanceDetails/SubInstanceList/SubInstanceList.test.js
new file mode 100644
index 000000000..a47570c0a
--- /dev/null
+++ b/src/Instance/InstanceDetails/SubInstanceList/SubInstanceList.test.js
@@ -0,0 +1,92 @@
+import React from 'react';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import '../../../../test/jest/__mock__';
+import { Router } from 'react-router';
+import userEvent from '@testing-library/user-event';
+import { createMemoryHistory } from 'history';
+import { renderWithIntl, translationsProperties } from '../../../../test/jest/helpers';
+import useLoadSubInstances from '../../../hooks/useLoadSubInstances';
+
+import SubInstanceList from './SubInstanceList';
+
+const mockuseLoadSubInstancesVaues = [
+  {
+    id: '1',
+    title: 'Test Title 1',
+    hrid: 'TestHrid1',
+    publication: [{ publisher: 'Test Publisher 1', dateOfPublication: '04-17-2023' }],
+    identifiers: [
+      { identifierTypeId: 'ISBN', value: '369369' },
+    ]
+  },
+  {
+    id: '2',
+    title: 'Test Title 2',
+    hrid: 'TestHrid2',
+    publication: [{ publisher: 'Test Publisher 2', dateOfPublication: '04-17-2023' }],
+    identifiers: [
+      { identifierTypeId: 'ISSN', value: '789789' },
+    ],
+  }
+];
+
+const history = createMemoryHistory();
+const defaultProps = {
+  id: 'TestID',
+  label: 'LabelTest',
+  titles: [{}],
+  titleKey: 'id',
+};
+
+const queryClient = new QueryClient();
+const renderSubInstanceList = (props) => renderWithIntl(
+  <Router history={history}>
+    <QueryClientProvider client={queryClient}>
+      <SubInstanceList {...props} />
+    </QueryClientProvider>
+  </Router>,
+  translationsProperties
+);
+
+
+jest.mock('../../../hooks/useReferenceData', () => jest.fn().mockReturnValue({
+  identifierTypesById : {
+    'ISBN': { name : 'ISBN' },
+    'ISSN': { name : 'ISSN' }
+  }
+}));
+jest.mock('../../../hooks/useLoadSubInstances', () => jest.fn());
+
+
+describe('render SubInstanceList', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  it('NoValue should display when no title is present', () => {
+    useLoadSubInstances.mockReturnValue([{}]);
+    const { getAllByText } = renderSubInstanceList(defaultProps);
+    expect(getAllByText(/No value set/i).length).toBe(4);
+  });
+  it('No link to be present when tittleKey is empty', () => {
+    useLoadSubInstances.mockReturnValue(mockuseLoadSubInstancesVaues);
+    const { container, getByText } = renderSubInstanceList({ ...defaultProps, titleKey: '' });
+    expect(getByText('Test Title 1')).toBeInTheDocument();
+    expect(getByText('Test Title 1')).not.toHaveAttribute('href');
+    expect(getByText('Test Title 2')).toBeInTheDocument();
+    expect(getByText('Test Title 2')).not.toHaveAttribute('href');
+    expect(container.getElementsByTagName('a').length).toBe(0);
+  });
+  it('Link to a title to be present when title and tittleKey is present', () => {
+    useLoadSubInstances.mockReturnValue(mockuseLoadSubInstancesVaues);
+    const { container, getByText } = renderSubInstanceList(defaultProps);
+    expect(getByText('Test Title 1')).toHaveAttribute('href', '/inventory/view/1');
+    expect(getByText('Test Title 2')).toHaveAttribute('href', '/inventory/view/2');
+    expect(container.getElementsByTagName('a').length).toBe(2);
+  });
+  it('Pagination message to be render on clicking next button', () => {
+    useLoadSubInstances.mockReturnValue(mockuseLoadSubInstancesVaues);
+    const { container, getByRole } = renderSubInstanceList(defaultProps);
+    userEvent.click(getByRole('button', { name: 'Next' }));
+    expect(container.getElementsByClassName('sr-only').length).toBe(1);
+  });
+});

From 366c69d229fade2882bcf316a084d81c694a231f Mon Sep 17 00:00:00 2001
From: cchitneedi <100114810+cchitneedi@users.noreply.github.com>
Date: Fri, 28 Apr 2023 18:46:15 +0530
Subject: [PATCH 05/68] UIIN-1773 create Jest/RTL test for
 TitleSeriesStatements.js (#2116)

---
 .../TitleSeriesStatements.test.js             | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 src/Instance/InstanceDetails/InstanceTitleData/TitleSeriesStatements.test.js

diff --git a/src/Instance/InstanceDetails/InstanceTitleData/TitleSeriesStatements.test.js b/src/Instance/InstanceDetails/InstanceTitleData/TitleSeriesStatements.test.js
new file mode 100644
index 000000000..b33b6216c
--- /dev/null
+++ b/src/Instance/InstanceDetails/InstanceTitleData/TitleSeriesStatements.test.js
@@ -0,0 +1,40 @@
+import React from 'react';
+import { BrowserRouter as Router } from 'react-router-dom';
+
+import { screen } from '@testing-library/react';
+
+import '../../../../test/jest/__mock__';
+import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
+
+import TitleSeriesStatements from './TitleSeriesStatements';
+
+const seriesStatements = ['Statement 1', 'Statement 2'];
+
+jest.mock('../ControllableDetail', () => ({
+  ControllableDetail: jest.fn().mockReturnValue('ControllableDetail'),
+}));
+
+const props = {
+  seriesStatements,
+  segment: 'segments',
+  source: 'source-test'
+};
+
+const renderTitleSeriesStatements = () => (
+  renderWithIntl(
+    <Router>
+      <TitleSeriesStatements {...props} />
+    </Router>
+  )
+);
+
+describe('TitleSeriesStatements', () => {
+  it('Should renders correctly', () => {
+    const { getByRole } = renderTitleSeriesStatements();
+    const list = getByRole('grid');
+    expect(list).toBeInTheDocument();
+    expect(list).toHaveAttribute('id', 'list-series-statement');
+    expect(screen.getByText(/ui-inventory.seriesStatement/i)).toBeInTheDocument();
+    expect(screen.getAllByText(/ControllableDetail/i)).toBeTruthy();
+  });
+});

From d9585990339d943388859bf81a8416cac4f68422 Mon Sep 17 00:00:00 2001
From: FOLIO Translations Bot
 <38661258+folio-translations@users.noreply.github.com>
Date: Fri, 28 Apr 2023 17:42:36 -0400
Subject: [PATCH 06/68] Lokalise: updates

---
 translations/ui-inventory/ar.json     |  3 ++-
 translations/ui-inventory/ber.json    |  3 ++-
 translations/ui-inventory/ca.json     |  3 ++-
 translations/ui-inventory/cs_CZ.json  | 15 ++++++++-------
 translations/ui-inventory/da.json     |  3 ++-
 translations/ui-inventory/de.json     |  9 +++++----
 translations/ui-inventory/en_GB.json  |  3 ++-
 translations/ui-inventory/en_SE.json  |  3 ++-
 translations/ui-inventory/en_US.json  |  3 ++-
 translations/ui-inventory/es.json     |  3 ++-
 translations/ui-inventory/es_419.json | 15 ++++++++-------
 translations/ui-inventory/es_ES.json  |  3 ++-
 translations/ui-inventory/fr.json     |  3 ++-
 translations/ui-inventory/fr_FR.json  |  3 ++-
 translations/ui-inventory/he.json     |  3 ++-
 translations/ui-inventory/hi_IN.json  |  3 ++-
 translations/ui-inventory/hu.json     |  3 ++-
 translations/ui-inventory/it_IT.json  |  3 ++-
 translations/ui-inventory/ja.json     |  3 ++-
 translations/ui-inventory/ko.json     |  3 ++-
 translations/ui-inventory/nb.json     |  3 ++-
 translations/ui-inventory/nn.json     |  3 ++-
 translations/ui-inventory/pl.json     |  3 ++-
 translations/ui-inventory/pt_BR.json  |  7 ++++---
 translations/ui-inventory/pt_PT.json  |  3 ++-
 translations/ui-inventory/ru.json     |  3 ++-
 translations/ui-inventory/sv.json     |  3 ++-
 translations/ui-inventory/ur.json     |  3 ++-
 translations/ui-inventory/zh_CN.json  |  9 +++++----
 translations/ui-inventory/zh_TW.json  |  3 ++-
 30 files changed, 80 insertions(+), 50 deletions(-)

diff --git a/translations/ui-inventory/ar.json b/translations/ui-inventory/ar.json
index 10542560a..a7d7f641b 100644
--- a/translations/ui-inventory/ar.json
+++ b/translations/ui-inventory/ar.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ber.json b/translations/ui-inventory/ber.json
index efc7049ec..6edccc4aa 100644
--- a/translations/ui-inventory/ber.json
+++ b/translations/ui-inventory/ber.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ca.json b/translations/ui-inventory/ca.json
index 76d244f33..d66f93ea5 100644
--- a/translations/ui-inventory/ca.json
+++ b/translations/ui-inventory/ca.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/cs_CZ.json b/translations/ui-inventory/cs_CZ.json
index eb3aa10be..200330959 100644
--- a/translations/ui-inventory/cs_CZ.json
+++ b/translations/ui-inventory/cs_CZ.json
@@ -371,9 +371,9 @@
     "formatCode": "Kód formátu",
     "addNatureOfContentTerm": "Přidat povahu obsahu",
     "selectNatureOfContentTerm": "Vyberte povahu obsahu",
-    "hridHandling": "Přidělování HRID",
-    "hridHandling.description.line1": "Po úvodní migraci dat jsou nové FOLIO HRID přidělovány sekvenčně podle stavu počitadla v těchto nastaveních.",
-    "hridHandling.description.line2": "Pokud se nezmění nebo neodstraní, bude novým identifikátorům FOLIO HRID přidělen výchozí prefix.",
+    "hridHandling": "Zpracování HRID",
+    "hridHandling.description.line1": "Po úvodní migraci dat jsou nové FOLIO HRID přiřazovány sekvenčně podle stavu počitadla v těchto nastaveních.",
+    "hridHandling.description.line2": "Pokud se nezmění nebo neodstraní, bude novým identifikátorům FOLIO HRID přiřazen výchozí prefix.",
     "hridHandling.description.line3": "HRID ve stávajícím katalogu FOLIO a MARC záznamech nelze změnit",
     "hridHandling.sectionHeader1": "Záznamy titulů a MARC bibliografické záznamy",
     "hridHandling.sectionHeader2": "Záznamy holdingů a MARC holdingové záznamy",
@@ -512,7 +512,7 @@
     "permission.settings.call-number-types": "Nastavení (Katalog): Vytvoření, úprava a smazání typů signatur",
     "permission.settings.holdings-note-types": "Nastavení (Katalog): Vytvářet, upravit a mazat typy poznámek holdingů",
     "permission.settings.item-note-types": "Nastavení (Katalog): Vytváření, úpravy, smazání typů poznámek k jednotkám",
-    "permission.settings.hrid-handling": "Nastavení (Katalog): Vytvoření, úprava a smazání přidělování HRID",
+    "permission.settings.hrid-handling": "Nastavení (Katalog): Vytvoření, úprava a smazání zpracování HRID",
     "permission.instance.view": "Katalog: Zobrazit tituly, holdingy a jednotky",
     "permission.instance.create": "Katalog: Zobrazení, vytvoření titulů",
     "permission.instance.edit": "Katalog: Zobrazení, vytvoření, úprava titulů",
@@ -774,9 +774,10 @@
     "copycat.overlayJobProfileToBeUsed": "Vyberte profil, který se má použít k překrytí aktuálních dat",
     "effectiveLocationHoldings": "Efektivní lokace pro holdingy",
     "info.effectiveCallNumber": "Toto pole obsahuje signaturu jednotky, která je buď zděděna ze záznamu holdingu, nebo je aktualizovanou signaturou záznamu jednotky. Při procházení signatur se bude vyhledávat v tomto poli.",
-    "info.shelvingOrder": "Toto pole je normalizovaná forma signatury, která určuje, jak je signatura při procházení tříděna.",
+    "info.shelvingOrder": "Toto pole je normalizovaná forma signatury, která určuje, jak je signatura při procházení seřazena.",
     "markAsHeader": "Označit jako",
     "newMARCRecord": "Nový záznam MARC Bib",
-    "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.add": "Přidat Vazbu a analitiku",
+    "boundWithTitles.enterHoldingsHrid": "Zadejte HRID holdingů",
+    "selectCode": "Vybrat kód"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/da.json b/translations/ui-inventory/da.json
index ba5bae5f9..df82ffced 100644
--- a/translations/ui-inventory/da.json
+++ b/translations/ui-inventory/da.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/de.json b/translations/ui-inventory/de.json
index 49a0c5ba9..ed9f3f77c 100644
--- a/translations/ui-inventory/de.json
+++ b/translations/ui-inventory/de.json
@@ -365,10 +365,10 @@
     "acquisition": "Erwerbung",
     "holdingsNoteType": "Anmerkungstyp des Bestands",
     "itemNoteType": "Anmerkungstyp des Exemplars",
-    "formatSource": "Format-Quelle",
+    "formatSource": "Formatquelle",
     "formatTerm": "Formatbegriff",
-    "formatCategory": "Format-Kategorie",
-    "formatCode": "Format-Code",
+    "formatCategory": "Formatkategorie",
+    "formatCode": "Formatcode",
     "addNatureOfContentTerm": "Art des Inhalts hinzufügen",
     "selectNatureOfContentTerm": "Art des Inhalts auswählen",
     "hridHandling": "HRID-Handhabung",
@@ -778,5 +778,6 @@
     "markAsHeader": "Markieren als",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_GB.json b/translations/ui-inventory/en_GB.json
index 396371beb..22950aecf 100644
--- a/translations/ui-inventory/en_GB.json
+++ b/translations/ui-inventory/en_GB.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_SE.json b/translations/ui-inventory/en_SE.json
index 396371beb..22950aecf 100644
--- a/translations/ui-inventory/en_SE.json
+++ b/translations/ui-inventory/en_SE.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_US.json b/translations/ui-inventory/en_US.json
index 2fd96c030..51be90b3a 100644
--- a/translations/ui-inventory/en_US.json
+++ b/translations/ui-inventory/en_US.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es.json b/translations/ui-inventory/es.json
index ca9cc36ca..c7a53a0cf 100644
--- a/translations/ui-inventory/es.json
+++ b/translations/ui-inventory/es.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_419.json b/translations/ui-inventory/es_419.json
index 106a34be5..37af441cd 100644
--- a/translations/ui-inventory/es_419.json
+++ b/translations/ui-inventory/es_419.json
@@ -163,8 +163,8 @@
     "addPublicationFrequency": "Añadir frecuencia",
     "addPublicationRange": "Añadir rango",
     "publicationRange": "Rango de publicación",
-    "staffSuppress": "Suprimir en la intranet",
-    "discoverySuppress": "Suprimir en el discovery",
+    "staffSuppress": "Ocultar en el EDS",
+    "discoverySuppress": "Ocultar en el EDS",
     "previouslyHeld": "Reservado previamente",
     "addElectronicAccess": "Añadir acceso electrónico",
     "instanceStatus": "Término de estado de la instancia",
@@ -535,12 +535,12 @@
     "folio": "FOLIO",
     "marc": "MARC",
     "effectiveLocationShort": "Localización efectiva",
-    "moveItems.move.holdings.count": "Move: {count, number} {count, plural, one {holding} other {holdings}}",
-    "moveItems.instance.dropZone": "Drop holding",
+    "moveItems.move.holdings.count": "Mover: {count, number} {count, plural, one {tener} other {tener}}",
+    "moveItems.instance.dropZone": "Sujeción de la gota",
     "moveItems.modal.confirmLabel": "Continuar",
     "moveItems.modal.title": "Confirmar movimiento",
-    "moveItems.instance.items.success": "{count, number} {count, plural, one {item has} other {items have}} been successfully moved.",
-    "moveItems.instance.holdings.success": "{count, number} {count, plural, one {holding has} other {holdings have}} been successfully moved.",
+    "moveItems.instance.items.success": "{count, number} {count, plural, one {artículo ha} other {artículos han}} sido movidos con éxito.",
+    "moveItems.instance.holdings.success": "{count, number} {count, plural, one {retención ha} other {retenciones han}} sido trasladadas con éxito.",
     "moveItems.instance.items.error": "Los siguientes ejemplares no se pudieron mover {items}. Verifique los campos del registro de la instancia e intente nuevamente o notifique a su administrador de sistemas.",
     "moveItems.instance.items.error.server": "Hubo un problema al actualizar los siguientes ejemplares {items}. Vuelva a intentarlo o notifique a su administrador de sistemas.",
     "moveItems.instance.holdings.error": "Las siguientes existencias no se pudieron mover {holdings}. Verifique los campos del registro de la instancia e intente nuevamente o notifique a su administrador de sistemas.",
@@ -778,5 +778,6 @@
     "markAsHeader": "Marcar como",
     "newMARCRecord": "Nuevo MARC Bib Record",
     "boundWithTitles.add": "Añadir Bound-with y análisis",
-    "boundWithTitles.enterHoldingsHrid": "Ingrese las participaciones HRID"
+    "boundWithTitles.enterHoldingsHrid": "Ingrese las participaciones HRID",
+    "selectCode": "Seleccionar código"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_ES.json b/translations/ui-inventory/es_ES.json
index 0ebe34b49..e213cdb20 100644
--- a/translations/ui-inventory/es_ES.json
+++ b/translations/ui-inventory/es_ES.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr.json b/translations/ui-inventory/fr.json
index 6470cf807..f764fc5e8 100644
--- a/translations/ui-inventory/fr.json
+++ b/translations/ui-inventory/fr.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr_FR.json b/translations/ui-inventory/fr_FR.json
index 2b5f381d0..01d9e9f23 100644
--- a/translations/ui-inventory/fr_FR.json
+++ b/translations/ui-inventory/fr_FR.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/he.json b/translations/ui-inventory/he.json
index 2bbb4bd3c..aebae3530 100644
--- a/translations/ui-inventory/he.json
+++ b/translations/ui-inventory/he.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hi_IN.json b/translations/ui-inventory/hi_IN.json
index efc7049ec..6edccc4aa 100644
--- a/translations/ui-inventory/hi_IN.json
+++ b/translations/ui-inventory/hi_IN.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hu.json b/translations/ui-inventory/hu.json
index cd00cf215..9815b6271 100644
--- a/translations/ui-inventory/hu.json
+++ b/translations/ui-inventory/hu.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/it_IT.json b/translations/ui-inventory/it_IT.json
index 80b13d5b4..f949c3b90 100644
--- a/translations/ui-inventory/it_IT.json
+++ b/translations/ui-inventory/it_IT.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ja.json b/translations/ui-inventory/ja.json
index 852c17424..ed9ff1600 100644
--- a/translations/ui-inventory/ja.json
+++ b/translations/ui-inventory/ja.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ko.json b/translations/ui-inventory/ko.json
index 659cdef1b..83701cebf 100644
--- a/translations/ui-inventory/ko.json
+++ b/translations/ui-inventory/ko.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nb.json b/translations/ui-inventory/nb.json
index efc7049ec..6edccc4aa 100644
--- a/translations/ui-inventory/nb.json
+++ b/translations/ui-inventory/nb.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nn.json b/translations/ui-inventory/nn.json
index efc7049ec..6edccc4aa 100644
--- a/translations/ui-inventory/nn.json
+++ b/translations/ui-inventory/nn.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pl.json b/translations/ui-inventory/pl.json
index c3642d0b5..7e3b1af29 100644
--- a/translations/ui-inventory/pl.json
+++ b/translations/ui-inventory/pl.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_BR.json b/translations/ui-inventory/pt_BR.json
index 981d6a905..ec14cd773 100644
--- a/translations/ui-inventory/pt_BR.json
+++ b/translations/ui-inventory/pt_BR.json
@@ -229,7 +229,7 @@
     "addHoldingsStatementForIndexes": "Adicionar declaração de coleções para índices",
     "addHoldingsStatementForSupplements": "Adicionar declaração de coleções para suplementos",
     "relatedInstances": "Instâncias relacionadas",
-    "instanceRelationshipsAnalyticsBoundWith": "Relacionamentos entre instâncias (analiticas e encadernado com)",
+    "instanceRelationshipsAnalyticsBoundWith": "Relacionamentos entre instâncias (analíticas e encadernado com)",
     "instanceStatusTypes": "Tipos de status da instância",
     "instanceStatusType": "Tipo de status da instância",
     "instanceHoldingsItem": "Instâncias, Coleções, Itens",
@@ -777,6 +777,7 @@
     "info.shelvingOrder": "Este campo é a forma normalizada do número de chamada que determina como o número de chamada é classificado durante a navegação.",
     "markAsHeader": "Marcar como",
     "newMARCRecord": "Novo registro MARC Bibliográfico",
-    "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.add": "Adicione encadernados e analíticas",
+    "boundWithTitles.enterHoldingsHrid": "Digite o HRID das Coleções",
+    "selectCode": "Selecione o código"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_PT.json b/translations/ui-inventory/pt_PT.json
index 5ebfcad2a..2b210cc58 100644
--- a/translations/ui-inventory/pt_PT.json
+++ b/translations/ui-inventory/pt_PT.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ru.json b/translations/ui-inventory/ru.json
index 2000f3c9d..a4d134341 100644
--- a/translations/ui-inventory/ru.json
+++ b/translations/ui-inventory/ru.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/sv.json b/translations/ui-inventory/sv.json
index efc7049ec..6edccc4aa 100644
--- a/translations/ui-inventory/sv.json
+++ b/translations/ui-inventory/sv.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ur.json b/translations/ui-inventory/ur.json
index 14f61c347..210e3514b 100644
--- a/translations/ui-inventory/ur.json
+++ b/translations/ui-inventory/ur.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_CN.json b/translations/ui-inventory/zh_CN.json
index ab7069eaf..f5d7ca7fa 100644
--- a/translations/ui-inventory/zh_CN.json
+++ b/translations/ui-inventory/zh_CN.json
@@ -614,8 +614,8 @@
     "internalIdEmbedPath": "内部ID嵌入路径",
     "copycat.import": "导入",
     "copycat.reimport": "重新导入",
-    "copycat.callout.updated": "已更新记录{xid}",
-    "copycat.callout.created": "已创建记录{xid}",
+    "copycat.callout.updated": "记录{xid}已更新。结果可能需要一些时间才能在典藏中显示",
+    "copycat.callout.created": "记录{xid}已创建。结果可能需要一些时间才能在典藏中显示",
     "copycat.callout.simpleError": "发生错误： {err}",
     "copycat.callout.complexError": "发生错误： {err} ： {detail}",
     "permission.single-record-import": "典藏：导入单个书目记录",
@@ -777,6 +777,7 @@
     "info.shelvingOrder": "本字段是索书号的规范化形式，它决定浏览时索书号的排序方式。",
     "markAsHeader": "标记为",
     "newMARCRecord": "新建MARC书目记录",
-    "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.add": "添加合订与分析",
+    "boundWithTitles.enterHoldingsHrid": "输入馆藏HRID",
+    "selectCode": "选择代码"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_TW.json b/translations/ui-inventory/zh_TW.json
index 91313a3c1..1d0f5cc3c 100644
--- a/translations/ui-inventory/zh_TW.json
+++ b/translations/ui-inventory/zh_TW.json
@@ -778,5 +778,6 @@
     "markAsHeader": "Mark as",
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID"
+    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
+    "selectCode": "Select code"
 }
\ No newline at end of file

From e0eada87dae36644d45fa56be0625361615d9f3c Mon Sep 17 00:00:00 2001
From: KetineniM <53168935+KetineniM@users.noreply.github.com>
Date: Fri, 5 May 2023 11:17:12 +0530
Subject: [PATCH 07/68] UIIN-1586 JEST/RTL test cases for itemFilterRenderer
 (#2130)

---
 .../ItemFilters/itemFilterRenderer.test.js    | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/src/components/ItemFilters/itemFilterRenderer.test.js b/src/components/ItemFilters/itemFilterRenderer.test.js
index b7e5fcce7..93a5afbc6 100644
--- a/src/components/ItemFilters/itemFilterRenderer.test.js
+++ b/src/components/ItemFilters/itemFilterRenderer.test.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { screen } from '@testing-library/react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { noop } from 'lodash';
+import userEvent from '@testing-library/user-event';
 
 import '../../../test/jest/__mock__';
 
@@ -9,6 +10,18 @@ import itemFilterRenderer from './itemFilterRenderer';
 import renderWithIntl from '../../../test/jest/helpers/renderWithIntl';
 import translationsProperties from '../../../test/jest/helpers/translationsProperties';
 
+jest.mock('./ItemFilters', () => ({ onClear }) => (
+  <div>
+    <button
+      type="button"
+      data-testid="onClear"
+      onClick={() => onClear('name')}
+    >
+      Clear
+    </button>
+  </div>
+));
+
 const DATA = {
   materialTypes: [],
   locations: [],
@@ -25,27 +38,9 @@ const renderFilters = (data = DATA, onChange = noop) => (renderWithIntl(
 describe('itemFilterRenderer fn', () => {
   beforeEach(() => renderFilters());
 
-  it('should display filter by tags accordion', () => {
-    expect(screen.getByText('Tags')).toBeInTheDocument();
-  });
-
-  it('should display filter by status accordion', () => {
-    expect(screen.getByText('Item status')).toBeInTheDocument();
-  });
-
-  it('should display filter by effectiveLocation accordion', () => {
-    expect(screen.getByText('Effective location (item)')).toBeInTheDocument();
-  });
-
-  it('should display filter by permanentLocation accordion', () => {
-    expect(screen.getByText('Holdings permanent location')).toBeInTheDocument();
-  });
-
-  it('should display filter by materialType accordion', () => {
-    expect(screen.getByText('Material type')).toBeInTheDocument();
-  });
-
-  it('should display filter by discoverySuppress accordion', () => {
-    expect(screen.getByText('Suppress from discovery')).toBeInTheDocument();
+  it('should click the clearButton', () => {
+    const clearButton = screen.getByTestId('onClear');
+    expect(clearButton).toBeInTheDocument();
+    userEvent.click(clearButton);
   });
 });

From a7d2dbcfed098ba3d7ee85a00dfcc97665274f21 Mon Sep 17 00:00:00 2001
From: VSnehalatha <53073086+VSnehalatha@users.noreply.github.com>
Date: Fri, 5 May 2023 15:31:13 +0530
Subject: [PATCH 08/68] UIIN-1778 Create Jest/RTL test for ViewRequests.js
 (#2097)

* Create Jest/RTL test for ViewRequests.js

* Update ViewRequests.test.js
---
 .../ViewRequests/ViewRequests.test.js         | 88 +++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 src/Instance/ViewRequests/ViewRequests.test.js

diff --git a/src/Instance/ViewRequests/ViewRequests.test.js b/src/Instance/ViewRequests/ViewRequests.test.js
new file mode 100644
index 000000000..259011196
--- /dev/null
+++ b/src/Instance/ViewRequests/ViewRequests.test.js
@@ -0,0 +1,88 @@
+import React from 'react';
+import { BrowserRouter as Router } from 'react-router-dom';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import '../../../test/jest/__mock__';
+import renderWithIntl from '../../../test/jest/helpers/renderWithIntl';
+
+import ViewRequests from './ViewRequests';
+
+const items = [
+  {
+    barcode: '1234',
+    status: { name: 'available' },
+    id: '1',
+    holdingsRecordId: '2',
+    materialType: { name: 'book' },
+    temporaryLoanType: { name: 'temporary' },
+    effectiveLocation: { name: 'Main Library' },
+    enumeration: 'vol 1',
+    chronology: '2001'
+  },
+];
+const requestsMap = new Map([['1', '1']]);
+const loansMap = new Map([['1', [{ id: '1', dueDate: '2023-03-31T20:00:00.000Z' }]]]);
+const instanceId = '1';
+const instance = { title: 'Book Title', publication: [{ dateOfPublication: '2022' }] };
+
+const onCloseViewRequests = jest.fn();
+
+const ViewRequestsSetup = () => (
+  <Router>
+    <ViewRequests
+      instance={instance}
+      instanceId={instanceId}
+      items={items}
+      loansMap={loansMap}
+      onCloseViewRequests={onCloseViewRequests}
+      requestsMap={requestsMap}
+    />
+  </Router>
+);
+
+describe('ViewRequests', () => {
+  beforeEach(() => {
+    renderWithIntl(<ViewRequestsSetup />);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  it('should render paneTitles', () => {
+    expect(screen.getByText(/ui-inventory.instanceRecordRequestsTitle/i)).toBeInTheDocument();
+    expect(screen.getByText(/ui-inventory.instanceRecordRequestsSubtitle/i)).toBeInTheDocument();
+  });
+  it('should render the correct column headers', () => {
+    expect(screen.getByText(/ui-inventory.item.barcode/i)).toBeInTheDocument();
+    expect(screen.getByText(/ui-inventory.status/i)).toBeInTheDocument();
+    expect(screen.getByText(/ui-inventory.item.availability.dueDate/i)).toBeInTheDocument();
+    expect(screen.getByText(/ui-inventory.item.requestQueue/i)).toBeInTheDocument();
+    expect(screen.getByText(/ui-inventory.effectiveLocationShort/i)).toBeInTheDocument();
+    expect(screen.getByText(/ui-inventory.loanType/i)).toBeInTheDocument();
+    expect(screen.getByText(/ui-inventory.enumeration/i)).toBeInTheDocument();
+    expect(screen.getByText(/ui-inventory.chronology/i)).toBeInTheDocument();
+    expect(screen.getByText(/ui-inventory.materialType/i)).toBeInTheDocument();
+  });
+  it('should render the correct data for each item', () => {
+    expect(screen.getByText(/1234/i)).toBeInTheDocument();
+    expect(screen.getByText(/available/i)).toBeInTheDocument();
+    expect(screen.getByText('3/31/2023, 8:00 PM')).toBeInTheDocument();
+    expect(screen.getByText('1')).toBeInTheDocument();
+    expect(screen.getByText(/Main Library/i)).toBeInTheDocument();
+    expect(screen.getByText(/temporary/i)).toBeInTheDocument();
+    expect(screen.getByText(/vol 1/i)).toBeInTheDocument();
+    expect(screen.getByText(/2001/i)).toBeInTheDocument();
+    expect(screen.getByText(/book/i)).toBeInTheDocument();
+  });
+  it('should click barcodeButton', () => {
+    const barcodeButton = screen.getByRole('button', { name: 'ui-inventory.item.barcode' });
+    expect(barcodeButton).toBeInTheDocument();
+    userEvent.click(barcodeButton);
+  });
+  it('should click requestQueue', () => {
+    const requestQueueButton = screen.getByRole('button', { name: 'ui-inventory.item.requestQueue' });
+    expect(requestQueueButton).toBeInTheDocument();
+    userEvent.click(requestQueueButton);
+  });
+});

From ea38daca04dbf825e442da5a58270e0322485adb Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Fri, 5 May 2023 15:19:04 +0300
Subject: [PATCH 09/68] UIIN-2338: The 'Missing' and 'Withdrawn' options in the
 actions menu are absent after clicking on the 'Actions' button for item
 status "In process" (#2142)

---
 CHANGELOG.md          |   2 +-
 src/views/ItemView.js | 258 ++++++++++++++++++++++--------------------
 2 files changed, 137 insertions(+), 123 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 784fa38f5..2fac72619 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@
 * Holdings Create/Edit screens: Replace custom RepeatableField with component from stripes. Refs UIIN-2398.
 * Holdings Create/Edit screens: Repeatable field trashcan is not aligned with the data row. Fixes UIIN-2373.
 * Holdings view source: Print button not visible with "View MARC holdings record" permission. Refs UIIN-2405.
-
+* The 'Missing' and 'Withdrawn' options in the actions menu are absent after clicking on the 'Actions' button for item status "In process". Fixes UIIN-2338.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/views/ItemView.js b/src/views/ItemView.js
index 9b07a8bf0..520d953bd 100644
--- a/src/views/ItemView.js
+++ b/src/views/ItemView.js
@@ -252,146 +252,160 @@ class ItemView extends React.Component {
     const firstItem = get(resources, 'itemsResource.records[0]');
     const request = get(resources, 'requests.records[0]');
     const newRequestLink = `/requests?itemId=${firstItem.id}&query=${firstItem.id}&layer=create`;
-    const canCreate = stripes.hasPerm('ui-inventory.item.create');
-    const canEdit = stripes.hasPerm('ui-inventory.item.edit');
-    const canMarkAsMissing = stripes.hasPerm('ui-inventory.item.markasmissing');
-    const canDelete = stripes.hasPerm('ui-inventory.item.delete');
-    const canDisplayActionMenu = actionMenuDisplayPerms.some(perm => stripes.hasPerm(perm));
-
-    if (!canDisplayActionMenu) {
+    const userHasPermToCreate = stripes.hasPerm('ui-inventory.item.create');
+    const userHasPermToEdit = stripes.hasPerm('ui-inventory.item.edit');
+    const userHasPermToMarkAsMissing = stripes.hasPerm('ui-inventory.item.markasmissing');
+    const userHasPermToMarkAsWithdrawn = stripes.hasPerm('ui-inventory.items.mark-items-withdrawn');
+    const userHasPermToDelete = stripes.hasPerm('ui-inventory.item.delete');
+    const userHasPermToObserveActionMenu = actionMenuDisplayPerms.some(perm => stripes.hasPerm(perm));
+
+    const userCanMarkItemAsMissing = canMarkItemAsMissing(firstItem);
+    const userCanMarkItemAsWithdrawn = canMarkItemAsWithdrawn(firstItem);
+    const userCanMarkItemWithStatus = canMarkItemWithStatus(firstItem);
+    const userCanCreateNewRequest = canCreateNewRequest(firstItem, stripes);
+
+    if (!userHasPermToObserveActionMenu) {
       return null;
     }
 
-    return (
-      <>
-        <MenuSection id="items-list-actions">
-          { canEdit && (
-          <Button
-            href={this.craftLayerUrl('editItem')}
-            onClick={() => {
-              onToggle();
-              this.onClickEditItem();
-            }}
-            buttonStyle="dropdownItem"
-            data-test-inventory-edit-item-action
-          >
-            <Icon icon="edit">
-              <FormattedMessage id="ui-inventory.editItem" />
-            </Icon>
-          </Button>
-          )}
-          { canCreate && (
+    const editActionItem = (
+      <Button
+        href={this.craftLayerUrl('editItem')}
+        onClick={() => {
+          onToggle();
+          this.onClickEditItem();
+        }}
+        buttonStyle="dropdownItem"
+        data-test-inventory-edit-item-action
+      >
+        <Icon icon="edit">
+          <FormattedMessage id="ui-inventory.editItem" />
+        </Icon>
+      </Button>
+    );
+    const duplicateActionItem = (
+      <Button
+        id="clickable-copy-item"
+        onClick={() => {
+          onToggle();
+          this.onCopy(firstItem);
+        }}
+        buttonStyle="dropdownItem"
+        data-test-inventory-duplicate-item-action
+      >
+        <Icon icon="duplicate">
+          <FormattedMessage id="ui-inventory.copyItem" />
+        </Icon>
+      </Button>
+    );
+    const deleteActionItem = (
+      <Button
+        id="clickable-delete-item"
+        onClick={() => {
+          onToggle();
+          this.canDeleteItem(firstItem, request);
+        }}
+        buttonStyle="dropdownItem"
+        data-test-inventory-delete-item-action
+      >
+        <Icon icon="trash">
+          <FormattedMessage id="ui-inventory.deleteItem" />
+        </Icon>
+      </Button>
+    );
+    const newRequestActionItem = (
+      <Button
+        to={newRequestLink}
+        buttonStyle="dropdownItem"
+        data-test-inventory-create-request-action
+      >
+        <Icon icon="plus-sign">
+          <FormattedMessage id="ui-inventory.newRequest" />
+        </Icon>
+      </Button>
+    );
+    const markAsMissingActionItem = (
+      <Button
+        id="clickable-missing-item"
+        onClick={() => {
+          onToggle();
+          this.setState({ itemMissingModal: true });
+        }}
+        buttonStyle="dropdownItem"
+        data-test-mark-as-missing-item
+      >
+        <Icon icon="flag">
+          <FormattedMessage id="ui-inventory.item.status.missing" />
+        </Icon>
+      </Button>
+    );
+    const markAsWithdrawnActionItem = (
+      <Button
+        id="clickable-withdrawn-item"
+        onClick={() => {
+          onToggle();
+          this.setState({ itemWithdrawnModal: true });
+        }}
+        buttonStyle="dropdownItem"
+        data-test-mark-as-withdrawn-item
+      >
+        <Icon icon="flag">
+          <FormattedMessage id="ui-inventory.item.status.withdrawn" />
+        </Icon>
+      </Button>
+    );
+    const renderItemStatusActionItems = () => Object.keys(itemStatusMutators)
+      .filter(status => itemStatusesMap[status] !== firstItem?.status?.name)
+      .map(status => {
+        const itemStatus = itemStatusesMap[status];
+        const parameterizedStatus = parameterize(itemStatus);
+
+        const actionMenuItem = (
           <Button
-            id="clickable-copy-item"
-            onClick={() => {
-              onToggle();
-              this.onCopy(firstItem);
-            }}
+            key={status}
+            id={`clickable-${parameterizedStatus}`}
             buttonStyle="dropdownItem"
-            data-test-inventory-duplicate-item-action
-          >
-            <Icon icon="duplicate">
-              <FormattedMessage id="ui-inventory.copyItem" />
-            </Icon>
-          </Button>
-          )}
-          { canDelete && (
-          <Button
-            id="clickable-delete-item"
             onClick={() => {
               onToggle();
-              this.canDeleteItem(firstItem, request);
+              this.setState({ selectedItemStatus: status });
             }}
-            buttonStyle="dropdownItem"
-            data-test-inventory-delete-item-action
           >
-            <Icon icon="trash">
-              <FormattedMessage id="ui-inventory.deleteItem" />
+            <Icon icon="flag">
+              { itemStatus }
             </Icon>
           </Button>
-          )}
-          { canCreateNewRequest(firstItem, stripes) && (
-          <Button
-            to={newRequestLink}
-            buttonStyle="dropdownItem"
-            data-test-inventory-create-request-action
+        );
+        return (
+          <IfPermission
+            perm={`ui-inventory.items.mark-${parameterizedStatus}`}
+            key={parameterizedStatus}
           >
-            <Icon icon="plus-sign">
-              <FormattedMessage id="ui-inventory.newRequest" />
-            </Icon>
-          </Button>
-          )}
+            {actionMenuItem}
+          </IfPermission>
+        );
+      });
+
+    const isMarkAsMenuSectionVisible = (userCanMarkItemAsMissing && userHasPermToMarkAsMissing)
+      || (userHasPermToMarkAsWithdrawn && userCanMarkItemAsWithdrawn)
+      || userCanMarkItemWithStatus;
+
+    return (
+      <>
+        <MenuSection id="items-list-actions">
+          {userHasPermToEdit && editActionItem}
+          {userHasPermToCreate && duplicateActionItem}
+          {userHasPermToDelete && deleteActionItem}
+          {userCanCreateNewRequest && newRequestActionItem}
         </MenuSection>
-        { canMarkItemWithStatus(firstItem) && (
+        {isMarkAsMenuSectionVisible && (
           <MenuSection
             id="items-list-mark-as"
             label={<FormattedMessage id="ui-inventory.markAsHeader" />}
             labelTag="h3"
           >
-            { canMarkItemAsMissing(firstItem) && canMarkAsMissing && (
-            <Button
-              id="clickable-missing-item"
-              onClick={() => {
-                onToggle();
-                this.setState({ itemMissingModal: true });
-              }}
-              buttonStyle="dropdownItem"
-              data-test-mark-as-missing-item
-            >
-              <Icon icon="flag">
-                <FormattedMessage id="ui-inventory.item.status.missing" />
-              </Icon>
-            </Button>
-            )}
-            <IfPermission perm="ui-inventory.items.mark-items-withdrawn">
-              { canMarkItemAsWithdrawn(firstItem) && (
-              <Button
-                id="clickable-withdrawn-item"
-                onClick={() => {
-                  onToggle();
-                  this.setState({ itemWithdrawnModal: true });
-                }}
-                buttonStyle="dropdownItem"
-                data-test-mark-as-withdrawn-item
-              >
-                <Icon icon="flag">
-                  <FormattedMessage id="ui-inventory.item.status.withdrawn" />
-                </Icon>
-              </Button>
-              )}
-            </IfPermission>
-            {
-              Object.keys(itemStatusMutators)
-                .filter(status => itemStatusesMap[status] !== firstItem?.status?.name)
-                .map(status => {
-                  const itemStatus = itemStatusesMap[status];
-                  const parameterizedStatus = parameterize(itemStatus);
-
-                  const actionMenuItem = (
-                    <Button
-                      key={status}
-                      id={`clickable-${parameterizedStatus}`}
-                      buttonStyle="dropdownItem"
-                      onClick={() => {
-                        onToggle();
-                        this.setState({ selectedItemStatus: status });
-                      }}
-                    >
-                      <Icon icon="flag">
-                        { itemStatus }
-                      </Icon>
-                    </Button>
-                  );
-                  return (
-                    <IfPermission
-                      perm={`ui-inventory.items.mark-${parameterizedStatus}`}
-                      key={parameterizedStatus}
-                    >
-                      {actionMenuItem}
-                    </IfPermission>
-                  );
-                })
-            }
+            {userCanMarkItemAsMissing && userHasPermToMarkAsMissing && markAsMissingActionItem}
+            {userCanMarkItemAsWithdrawn && userHasPermToMarkAsWithdrawn && markAsWithdrawnActionItem}
+            {userCanMarkItemWithStatus && renderItemStatusActionItems()}
           </MenuSection>
         )}
       </>

From 48aa3f76c5d3f8227d76a39c6f0ff06b569a43ed Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Fri, 5 May 2023 22:53:12 +0300
Subject: [PATCH 10/68] UIIN-2397: Item Create/Edit screens: Replace custom
 RepeatableField with component from stripes (#2137)

---
 CHANGELOG.md                                  |   2 +
 package.json                                  |   2 +-
 src/components/RepeatableField/FieldRow.js    | 270 ------------------
 .../RepeatableField/RepeatableField.css       |   7 -
 .../RepeatableField/RepeatableField.js        | 127 --------
 src/components/RepeatableField/index.js       |   1 -
 src/components/RepeatableField/readme.md      |  85 ------
 src/components/index.js                       |   1 -
 src/edit/InstanceForm.js                      |  19 +-
 src/edit/items/BoundWithFieldRow.js           |  57 ----
 src/edit/items/BoundWithModal.js              |   1 +
 src/edit/items/ItemForm.js                    | 202 ++-----------
 src/edit/items/ItemForm.test.js               | 108 +------
 .../repeatableFields/BoundWithTitlesFields.js | 165 +++++++++++
 .../CirculationNotesFields.js                 | 124 ++++++++
 .../FormerIdentifierFields.js                 |  66 +++++
 .../repeatableFields/YearCaptionFields.js     |  66 +++++
 src/edit/items/repeatableFields/index.js      |   4 +
 .../tests/BoundWithTitlesFields.test.js       | 179 ++++++++++++
 src/edit/noteFields.js                        |  39 ++-
 src/edit/noteFields.test.js                   |  28 +-
 src/hooks/index.js                            |   1 +
 src/hooks/useBoundWithTitlesByHrids/index.js  |   1 +
 .../useBoundWithTitlesByHrids.js              |  48 ++++
 .../useBoundWithTitlesByHrids.test.js         |  56 ++++
 test/jest/helpers/index.js                    |   1 +
 test/jest/helpers/renderWithFinalForm.js      |  37 +++
 27 files changed, 852 insertions(+), 845 deletions(-)
 delete mode 100644 src/components/RepeatableField/FieldRow.js
 delete mode 100644 src/components/RepeatableField/RepeatableField.css
 delete mode 100644 src/components/RepeatableField/RepeatableField.js
 delete mode 100644 src/components/RepeatableField/index.js
 delete mode 100644 src/components/RepeatableField/readme.md
 delete mode 100644 src/edit/items/BoundWithFieldRow.js
 create mode 100644 src/edit/items/repeatableFields/BoundWithTitlesFields.js
 create mode 100644 src/edit/items/repeatableFields/CirculationNotesFields.js
 create mode 100644 src/edit/items/repeatableFields/FormerIdentifierFields.js
 create mode 100644 src/edit/items/repeatableFields/YearCaptionFields.js
 create mode 100644 src/edit/items/repeatableFields/index.js
 create mode 100644 src/edit/items/repeatableFields/tests/BoundWithTitlesFields.test.js
 create mode 100644 src/hooks/useBoundWithTitlesByHrids/index.js
 create mode 100644 src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.js
 create mode 100644 src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.test.js
 create mode 100644 test/jest/helpers/renderWithFinalForm.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fac72619..bbdc63cf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
 * Holdings Create/Edit screens: Repeatable field trashcan is not aligned with the data row. Fixes UIIN-2373.
 * Holdings view source: Print button not visible with "View MARC holdings record" permission. Refs UIIN-2405.
 * The 'Missing' and 'Withdrawn' options in the actions menu are absent after clicking on the 'Actions' button for item status "In process". Fixes UIIN-2338.
+* Item Create/Edit screens: Replace custom RepeatableField with component from stripes. Refs UIIN-2397.
+* Item Create/Edit screens: Repeatable field trashcan is not aligned with the data row. Fixes UIIN-2374.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/package.json b/package.json
index 1d5c31e6d..6b5f32e53 100644
--- a/package.json
+++ b/package.json
@@ -836,7 +836,7 @@
     "lint": "eslint .",
     "test": "yarn run test:unit",
     "test:jest": "jest",
-    "test:unit": "jest --silent --ci --coverage",
+    "test:unit": "jest --ci --coverage",
     "test:unit:watch": "jest --watch --coverage",
     "test:e2e": "stripes test karma",
     "test:e2e:ci": "stripes test karma --karma.singleRun --karma.browsers ChromeDocker --karma.reporters mocha junit --coverage",
diff --git a/src/components/RepeatableField/FieldRow.js b/src/components/RepeatableField/FieldRow.js
deleted file mode 100644
index f0c587913..000000000
--- a/src/components/RepeatableField/FieldRow.js
+++ /dev/null
@@ -1,270 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import uniqueId from 'lodash/uniqueId';
-import { Field } from 'react-final-form';
-import { FormattedMessage } from 'react-intl';
-
-import {
-  Button,
-  Icon,
-  Row,
-  Col,
-  omitProps,
-  SRStatus,
-} from '@folio/stripes/components';
-
-import css from './RepeatableField.css';
-
-class FieldRow extends React.Component {
-  constructor(props) {
-    super(props);
-
-    this.refIfLastRow = this.refIfLastRow.bind(this);
-    this.renderControl = this.renderControl.bind(this);
-    this.addButton = null;
-    this.srstatus = null;
-    this.action = null;
-
-    this.addButtonId = this.props.addButtonId || uniqueId(`${this.props.label}AddButton`);
-  }
-
-  componentDidMount() {
-    if (this.props.fields.length === 0 && this.props.addDefaultItem) {
-      setTimeout(() => { this.props.addDefault(this.props.fields); }, 5);
-    }
-  }
-
-  componentDidUpdate() {
-    const {
-      fields,
-      label,
-      hideAdd,
-    } = this.props;
-
-    if (this.action) {
-      if (this.action.type === 'add') {
-        this.srstatus.sendMessage(
-          `added new ${label} field. ${fields.length} ${label} total`
-        );
-        this.action = null;
-      }
-      if (this.action.type === 'remove') {
-        const { item } = this.action;
-        let contextualSpeech;
-        if (typeof item === 'string') {
-          contextualSpeech = this.action.item;
-        } else if (typeof item === 'object') {
-          const valueArray = [];
-          for (const key in item) {
-            if (typeof item[key] === 'string' && item[key].length < 25) {
-              valueArray.push(item[key]);
-            }
-          }
-          if (valueArray.length > 0) {
-            contextualSpeech = valueArray.join(' ');
-          } else {
-            contextualSpeech = this.action.index;
-          }
-        }
-        this.srstatus.sendMessage(
-          `${label} ${contextualSpeech} has been removed. ${fields.length} ${label} total`
-        );
-        this.action = null;
-        if (!hideAdd) {
-          document.getElementById(this.addButtonId).focus();
-        }
-      }
-    }
-  }
-
-  handleRemove(index, item) {
-    this.action = { type: 'remove', item, index };
-    this.props.fields.remove(index);
-  }
-
-  handleAdd() {
-    this.action = { type: 'add' };
-  }
-
-  refIfLastRow(ref, index) {
-    const { fields } = this.props;
-    if (index === fields.length - 1) {
-      this.lastRow = ref;
-      this.props.lastRowRef(ref);
-    }
-  }
-
-  renderControl(fields, field, fieldIndex, template, templateIndex) {
-    if (template.render) {
-      return template.render({ fields, field, fieldIndex, templateIndex });
-    }
-
-    const { name, label, ...rest } = omitProps(template, ['component', 'render', 'columnSize']);
-    const labelProps = {};
-    if (fieldIndex === 0) {
-      labelProps.label = label;
-    } else {
-      labelProps['aria-label'] = `${label} ${fieldIndex}`;
-    }
-    return (
-      <Field
-        name={name ? `${fields.name}[${fieldIndex}].${name}` : `${fields.name}[${fieldIndex}]`}
-        component={this.props.formatter}
-        templateIndex={templateIndex}
-        id={uniqueId(field)}
-        fullWidth
-        {...labelProps}
-        data-key={fieldIndex}
-        fields={fields}
-        {...rest}
-      />
-    );
-  }
-
-  render() {
-    const {
-      addDefaultItem,
-      addLabel,
-      canAdd,
-      canDelete,
-      hideAdd,
-      containerRef,
-      fields,
-      label,
-      onAddField,
-      template,
-    } = this.props;
-
-    const legend = (
-      <legend
-        id={this._arrayId}
-        className={css.RFLegend}
-      >
-        {label}
-      </legend>
-    );
-
-    const handleButtonClick = () => { onAddField(fields); };
-
-    if (fields.length === 0 && !addDefaultItem && !hideAdd) {
-      return (
-        <div ref={containerRef}>
-          <SRStatus ref={(ref) => { this.srstatus = ref; }} />
-          <fieldset className={css.RFFieldset}>
-            {legend}
-            <Button
-              style={{ marginBottom: '12px' }}
-              onClick={handleButtonClick}
-              id={this.addButtonId}
-              disabled={!canAdd}
-            >
-              {addLabel || (
-                <Icon icon="plus-sign">
-                  <FormattedMessage
-                    id="ui-inventory.addLabel"
-                    values={{ label }}
-                  />
-                </Icon>
-              )}
-            </Button>
-          </fieldset>
-        </div>
-      );
-    }
-    return (
-      <div ref={containerRef}>
-        <SRStatus ref={(ref) => { this.srstatus = ref; }} />
-        <fieldset className={css.RFFieldset}>
-          {legend}
-
-          {fields.map((f, fieldIndex) => (
-            <div
-              data-test-repeater-field-row
-              key={`${label}-${fieldIndex}`}
-              style={{ width: '100%' }}
-              ref={(ref) => { this.refIfLastRow(ref, fieldIndex); }}
-            >
-              <Row bottom="xs">
-                <Col xs={10}>
-                  <Row>
-                    {template.map((t, i) => {
-                      const { columnSize } = t;
-                      const colSizes = typeof columnSize === 'object' ? columnSize : { xs: true };
-                      return (
-                        <Col {...colSizes} key={`field-${i}`}>
-                          {this.renderControl(fields, f, fieldIndex, t, i)}
-                        </Col>
-                      );
-                    })}
-                  </Row>
-                </Col>
-                <Col xs={2}>
-                  <FormattedMessage
-                    id="stripes-components.removeFields"
-                    values={{ item: label, num: fieldIndex + 1 }}
-                  >
-                    {([ariaLabel]) => (
-                      <Button
-                        buttonStyle="link"
-                        onClick={() => { this.handleRemove(fieldIndex, f); }}
-                        aria-label={ariaLabel}
-                        disabled={
-                          typeof canDelete === 'boolean' ?
-                            !canDelete :
-                            !canDelete(fields, fieldIndex)}
-                      >
-                        <Icon icon="trash" />
-                      </Button>
-                    )}
-                  </FormattedMessage>
-                </Col>
-              </Row>
-              {fieldIndex === fields.length - 1 &&
-                !hideAdd &&
-                <Button
-                  onClick={handleButtonClick}
-                  id={this.addButtonId}
-                  disabled={!canAdd}
-                >
-                  {addLabel || (
-                    <FormattedMessage
-                      id="stripes-components.addNewField"
-                      values={{ item: label }}
-                    />)}
-                </Button>
-              }
-            </div>
-          ))}
-        </fieldset>
-      </div>
-    );
-  }
-}
-
-FieldRow.propTypes = {
-  addButtonId: PropTypes.string,
-  addDefault: PropTypes.func,
-  addDefaultItem: PropTypes.bool,
-  addLabel: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
-  canAdd: PropTypes.bool,
-  canEdit: PropTypes.bool,
-  canDelete: PropTypes.oneOfType([PropTypes.bool, PropTypes.func]),
-  hideAdd: PropTypes.bool,
-  containerRef: PropTypes.func,
-  fields: PropTypes.object,
-  formatter: PropTypes.func,
-  label: PropTypes.oneOfType([PropTypes.string, PropTypes.object, PropTypes.node]),
-  lastRowRef: PropTypes.func,
-  newItemTemplate: PropTypes.object,
-  onAddField: PropTypes.func,
-  template: PropTypes.arrayOf(PropTypes.object),
-};
-
-FieldRow.defaultProps = {
-  canAdd: true,
-  canEdit: true,
-  canDelete: true,
-  hideAdd: false,
-};
-
-export default FieldRow;
diff --git a/src/components/RepeatableField/RepeatableField.css b/src/components/RepeatableField/RepeatableField.css
deleted file mode 100644
index 812eb8170..000000000
--- a/src/components/RepeatableField/RepeatableField.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.RFFieldset {
-  padding: 1em 0;
-}
-
-.RFLegend {
-  margin-bottom: 6px;
-}
diff --git a/src/components/RepeatableField/RepeatableField.js b/src/components/RepeatableField/RepeatableField.js
deleted file mode 100644
index 7f0733233..000000000
--- a/src/components/RepeatableField/RepeatableField.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import cloneDeep from 'lodash/cloneDeep';
-import { FieldArray } from 'react-final-form-arrays';
-import FieldRow from './FieldRow';
-
-class RepeatableField extends React.Component {
-  constructor(props) {
-    super(props);
-
-    this.lastField = null;
-
-    this._added = false;
-    this._arrayId = `${this.props.label}-fields`;
-    this.buildComponentFromTemplate = this.buildComponentFromTemplate.bind(
-      this
-    );
-    this.addDefaultField = this.addDefaultField.bind(this);
-    this.handleAddField = this.handleAddField.bind(this);
-  }
-
-  componentDidUpdate() {
-    if (this._added && this.lastRow) {
-      const firstInput = this.lastRow.querySelector('input, select');
-      if (firstInput) {
-        firstInput.focus();
-        this._added = false;
-      }
-    }
-  }
-
-  buildComponentFromTemplate = ({ templateIndex, input, meta, ...rest }) => {
-    const Component = this.props.template[templateIndex].component;
-    return <Component input={input} meta={meta} {...rest} />;
-  };
-
-  addDefaultField(fields) {
-    if (this.props.newItemTemplate) {
-      fields.push(cloneDeep(this.props.newItemTemplate));
-    } else {
-      fields.push();
-    }
-  }
-
-  handleAddField(fields) {
-    if (this.props.newItemTemplate) {
-      fields.push(cloneDeep(this.props.newItemTemplate));
-    } else {
-      fields.push();
-    }
-    this._added = true;
-  }
-
-  render() {
-    const {
-      name,
-      template,
-      label,
-      newItemTemplate,
-      addDefaultItem,
-      addLabel,
-      addButtonId,
-      canAdd,
-      canEdit,
-      canDelete,
-      hideAdd,
-      component,
-    } = this.props;
-
-    const mappedTemplate = canEdit
-      ? template
-      : template.map(field => ({
-        ...field,
-        disabled: true,
-      }));
-
-    return (
-      <FieldArray
-        name={name}
-        component={component}
-        onAddField={this.handleAddField}
-        formatter={this.buildComponentFromTemplate}
-        template={mappedTemplate}
-        containerRef={ref => {
-          this.container = ref;
-        }}
-        label={label}
-        newItemTemplate={newItemTemplate}
-        addDefault={this.addDefaultField}
-        addDefaultItem={addDefaultItem}
-        addLabel={addLabel}
-        addButtonId={addButtonId}
-        canAdd={canAdd}
-        canDelete={canDelete}
-        hideAdd={hideAdd}
-        lastRowRef={ref => {
-          this.lastRow = ref;
-        }}
-      />
-    );
-  }
-}
-
-RepeatableField.propTypes = {
-  addButtonId: PropTypes.string,
-  addDefaultItem: PropTypes.bool,
-  addLabel: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
-  label: PropTypes.oneOfType([PropTypes.node, PropTypes.string]),
-  name: PropTypes.string.isRequired,
-  newItemTemplate: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
-  template: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object)]),
-  canAdd: PropTypes.bool,
-  canEdit: PropTypes.bool,
-  canDelete: PropTypes.oneOfType([PropTypes.bool, PropTypes.func]),
-  hideAdd: PropTypes.bool,
-  component: PropTypes.func,
-};
-
-RepeatableField.defaultProps = {
-  canAdd: true,
-  canEdit: true,
-  canDelete: true,
-  hideAdd: false,
-  component: FieldRow,
-};
-
-export default RepeatableField;
diff --git a/src/components/RepeatableField/index.js b/src/components/RepeatableField/index.js
deleted file mode 100644
index f7362b473..000000000
--- a/src/components/RepeatableField/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './RepeatableField';
diff --git a/src/components/RepeatableField/readme.md b/src/components/RepeatableField/readme.md
deleted file mode 100644
index 4192e4771..000000000
--- a/src/components/RepeatableField/readme.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# Repeatable Field
-Form component for rendering arrays of editable data.
-
-## Usage
-This example renders a list of items where multiple fields (a `<TextField>` and a `<Select>` field) are rendered for each item:
-
-```
-  <RepeatableField
-    name="things"
-    label="List of multi-field values"
-    addLabel="+ Add a multi-field item"
-    template= {[{
-        name:"name",
-        component: TextField,
-      },
-      {
-        name:"type",
-        component: Select,
-        dataOptions: [{label:"Type 1", value: "1"}, {label: "Type 2", value: "2"}, {label: "Type 3", value: "3"}],
-      },
-    ]}
-    newItemTemplate= {{name:"", type:"1"}}
-  />
-```
-
-## Props
-
-Name | type | description | default | required
---- | --- | --- | --- | ---
-name | string | Name of particular array of data that the rendered array of fields will refer to. |  | yes
-label  | string | The visible label of the array of fields | | yes
-addLabel | string | text for the 'Add item' button that's rendered with the fields. | |
-addButtonId | string | HTML `id` attribute to assign to the add button. If not provided, one will be generated. | |
-template | array of objects | Each object within the array represents props that will be passed to the rendered final-form `<Field>` inputs. | | yes
-newItemTemplate | object | Object representing the default field values applied when a new item is added to the array. | | yes
-addDefaultItem | bool | Sets whether or not the list will add a default, empty item. | `false` |
-
-## Single field example
-Renders a single `<TextField>` for each item...
-```
-<RepeatableField
-  name="singleFields"
-  label="List of single values"
-  addLabel="+ Add a field"
-  template= {[{
-    name:"name",
-    component: TextField,
-  }]}
-  newItemTemplate= {{name:""}}
-/>
-```
-
-## Custom Field components
-
-The `component` property of the `template` array can be used to pass in an existing component. If deeper control of props is necessary, such as option lists for `<Select>` inputs being manipulated based on `field` settings, you can pass a rendering function through to a `render` key on the template object instead of using the `component` key. The function will be passed the `fields` object, `field`, `fieldIndex`, `template`, `templateIndex` for use within your render function.
-
-```
-const renderLanguageField = ({fields, field, fieldIndex, template, templateIndex}) => {
-  const languageOptions = languages.selectOptions(field);
-  return (
-    <Field
-      label={fieldIndex === 0 ? 'language' : null}
-      name={`${field}`}
-      component={Select}
-      dataOptions={[{ label: 'Select language', value: '' }, ...languageOptions]}
-    />
-  );
-}
-
-class LanguageFields extends React.Component {
-  render() {
-    return (
-      <RepeatableField
-        name="languages"
-        label="Languages"
-        addLabel="+ Add language"
-        addId="clickable-add-language"
-        template={[{
-          render: renderLanguageField
-        }]}
-      />
-    );
-  }
-}
-```
diff --git a/src/components/index.js b/src/components/index.js
index 44cca2c67..3e2ac0035 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,5 +1,4 @@
 export { default as FilterNavigation } from './FilterNavigation';
-export { default as RepeatableField } from './RepeatableField';
 export { default as InstanceFilters, InstanceFiltersBrowse, instanceFilterRenderer } from './InstanceFilters';
 export { default as HoldingsRecordFilters, holdingsRecordFilterRenderer } from './HoldingsRecordFilters';
 export { default as ItemFilters, itemFilterRenderer } from './ItemFilters';
diff --git a/src/edit/InstanceForm.js b/src/edit/InstanceForm.js
index 3fcd4aa8d..718ea3d18 100644
--- a/src/edit/InstanceForm.js
+++ b/src/edit/InstanceForm.js
@@ -86,7 +86,7 @@ function validate(values) {
   }
 
   // Language not required, but must be not null if supplied
-  if (values.languages && values.languages.length) {
+  if (!isEmpty(values.languages)) {
     const errorList = [];
     values.languages.forEach((item, i) => {
       if (!item) {
@@ -97,7 +97,7 @@ function validate(values) {
   }
 
 
-  if (values.alternativeTitles && values.alternativeTitles.length) {
+  if (!isEmpty(values.alternativeTitles)) {
     const errorList = [];
     values.alternativeTitles.forEach((item, i) => {
       const error = {};
@@ -235,7 +235,7 @@ class InstanceForm extends React.Component {
 
     const { records } = instanceBlockedFields;
 
-    if (!records || !records.length) return false;
+    if (isEmpty(records)) return false;
 
     const { blockedFields } = records[0];
 
@@ -268,6 +268,14 @@ class InstanceForm extends React.Component {
       }),
     ) : [];
 
+    const instanceNoteTypeOptions = referenceTables.instanceNoteTypes ? referenceTables.instanceNoteTypes.map(
+      it => ({
+        label: it.name,
+        value: it.id,
+        selected: it.id === initialValues.instanceTypeId,
+      }),
+    ) : [];
+
     const instanceStatusOptions = referenceTables.instanceStatuses ? referenceTables.instanceStatuses.map(
       it => ({
         label: `${it.name} (${it.source}: ${it.code})`,
@@ -370,7 +378,7 @@ class InstanceForm extends React.Component {
                       }
                       id="instanceSection01"
                     >
-                      {(initialValues.metadata && initialValues.metadata.createdDate) &&
+                      {(initialValues.metadata?.createdDate) &&
                         <this.cViewMetaData metadata={initialValues.metadata} />
                       }
                       <Row>
@@ -664,7 +672,8 @@ class InstanceForm extends React.Component {
                         canAdd={!this.isFieldBlocked('notes')}
                         canEdit={!this.isFieldBlocked('notes')}
                         canDelete={!this.isFieldBlocked('notes')}
-                        instanceNoteTypes={referenceTables.instanceNoteTypes}
+                        noteTypeOptions={instanceNoteTypeOptions}
+                        noteTypeIdField="instanceNoteTypeId"
                       />
                     </Accordion>
                     <Accordion
diff --git a/src/edit/items/BoundWithFieldRow.js b/src/edit/items/BoundWithFieldRow.js
deleted file mode 100644
index 2e6cfd0a7..000000000
--- a/src/edit/items/BoundWithFieldRow.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-import { Loading } from '@folio/stripes/components';
-
-import { keyBy } from 'lodash';
-
-import FieldRow from '../../components/RepeatableField/FieldRow';
-import useHoldingsQueryByHrids from '../../hooks/useHoldingsQueryByHrids';
-import useInstancesQuery from '../../hooks/useInstancesQuery';
-
-// Fetches holdings and instances info given in the input holdings HRID
-const BoundWithFieldRow = ({ fields, ...rest }) => {
-  const data = fields.value ? fields.value : [];
-
-  // Load the holdings records matching the input HRIDs
-  const holdingsRecordHrids = data.map(boundWithTitle => boundWithTitle.briefHoldingsRecord.hrid);
-  const { isLoading: isHoldingsLoading, holdingsRecords } = useHoldingsQueryByHrids(holdingsRecordHrids);
-
-  // Load the instance records matching the holdings' instanceIds.
-  const instanceIds = holdingsRecords.map(record => record.instanceId);
-  const instances = useInstancesQuery(instanceIds);
-  if (isHoldingsLoading || !instances.isSuccess) return <Loading size="large" />;
-
-  // Enrich the data displayed in the FieldRow
-  const holdingsRecordsByHrid = keyBy(holdingsRecords, 'hrid');
-  const instancesById = keyBy(instances.data?.instances, 'id');
-  data.forEach(boundWithTitle => {
-    if (!boundWithTitle.briefHoldingsRecord?.id) {
-      const holdingsRecord = holdingsRecordsByHrid[boundWithTitle.briefHoldingsRecord?.hrid];
-
-      if (holdingsRecord) {
-        boundWithTitle.briefHoldingsRecord.id = holdingsRecord.id;
-
-        const instance = instancesById[holdingsRecord.instanceId];
-        boundWithTitle.briefInstance = {
-          id: instance?.id,
-          hrid: instance?.hrid,
-          title: instance?.title,
-        };
-      }
-    }
-  });
-
-  return (
-    <FieldRow
-      fields={fields}
-      {...rest}
-    />
-  );
-};
-
-BoundWithFieldRow.propTypes = {
-  fields: PropTypes.object,
-};
-
-export default BoundWithFieldRow;
diff --git a/src/edit/items/BoundWithModal.js b/src/edit/items/BoundWithModal.js
index 93a5e92ad..570fba12d 100644
--- a/src/edit/items/BoundWithModal.js
+++ b/src/edit/items/BoundWithModal.js
@@ -107,6 +107,7 @@ const BoundWithModal = ({
                     value={hrids[i]}
                     onChange={handleChange}
                     data-index={i}
+                    autoFocus={i === 0}
                   />
                 </Col>
               </Row>
diff --git a/src/edit/items/ItemForm.js b/src/edit/items/ItemForm.js
index f436afd4a..fc1baf9b5 100644
--- a/src/edit/items/ItemForm.js
+++ b/src/edit/items/ItemForm.js
@@ -1,5 +1,9 @@
 import React, { createRef } from 'react';
-import { get, cloneDeep } from 'lodash';
+import {
+  get,
+  cloneDeep,
+  uniqBy,
+} from 'lodash';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import {
@@ -39,9 +43,6 @@ import {
 } from '@folio/stripes/smart-components';
 import { effectiveCallNumber } from '@folio/stripes/util';
 
-import RepeatableField from '../../components/RepeatableField';
-import BoundWithFieldRow from './BoundWithFieldRow';
-
 import OptimisticLockingBanner from '../../components/OptimisticLockingBanner';
 import ElectronicAccessFields from '../electronicAccessFields';
 import { memoize, mutators } from '../formUtils';
@@ -50,18 +51,24 @@ import { LocationSelectionWithCheck } from '../common';
 import AdministrativeNoteFields from '../administrativeNoteFields';
 import styles from './ItemForm.css';
 import { RemoteStorageWarning } from './RemoteStorageWarning';
-import BoundWithModal from './BoundWithModal';
-
+import {
+  BoundWithTitlesFields,
+  CirculationNotesFields,
+  FormerIdentifierFields,
+  YearCaptionFields
+} from './repeatableFields';
+import StatisticalCodeFields from '../statisticalCodeFields';
+import NoteFields from '../noteFields';
 
 function validate(values) {
   const errors = {};
   const selectToContinueMsg = <FormattedMessage id="ui-inventory.selectToContinue" />;
 
-  if (!(values.materialType && values.materialType.id)) {
+  if (!values.materialType?.id) {
     errors.materialType = { id: selectToContinueMsg };
   }
 
-  if (!(values.permanentLoanType && values.permanentLoanType.id)) {
+  if (!values.permanentLoanType?.id) {
     errors.permanentLoanType = { id: selectToContinueMsg };
   }
 
@@ -118,10 +125,6 @@ class ItemForm extends React.Component {
 
     this.cViewMetaData = props.stripes.connect(ViewMetaData);
     this.accordionStatusRef = createRef();
-
-    this.state = {
-      boundWithModalOpen: false,
-    };
   }
 
   handleAccordionToggle = ({ id }) => {
@@ -144,25 +147,10 @@ class ItemForm extends React.Component {
     this.props.form.change('itemDamagedStatusDate', new Date());
   }
 
-  openBoundWithModal = (e) => {
-    e.preventDefault();
-    e.stopPropagation();
-
-    this.setState({ boundWithModalOpen: true });
-  };
-
-  closeBoundWithModal = () => {
-    this.setState({ boundWithModalOpen: false });
-  }
-
-  addBoundWiths = (newBoundWithHoldingsHrids) => {
-    let boundWithTitles = cloneDeep(this.props.form.getFieldState('boundWithTitles').value);
-    const newBoundWithTitles = newBoundWithHoldingsHrids.map(holdingsRecordHrid => ({
-      briefHoldingsRecord: { hrid: holdingsRecordHrid },
-    }));
-    boundWithTitles = boundWithTitles.concat(newBoundWithTitles);
+  addBoundWiths = (newBoundWithTitles) => {
+    let boundWithTitles = cloneDeep(this.props.form.getFieldState('boundWithTitles')?.value) || [];
+    boundWithTitles = uniqBy([...boundWithTitles, ...newBoundWithTitles], 'briefHoldingsRecord.hrid');
     this.props.form.change('boundWithTitles', boundWithTitles);
-    this.closeBoundWithModal();
   }
 
   getFooter = () => {
@@ -475,31 +463,12 @@ class ItemForm extends React.Component {
                     </Row>
                     <Row>
                       <Col sm={8}>
-                        <RepeatableField
-                          name="formerIds"
-                          addButtonId="clickable-add-former-id"
-                          addLabel={<FormattedMessage id="ui-inventory.addFormerId" />}
-                          template={[{
-                            component: TextField,
-                            label: <FormattedMessage id="ui-inventory.formerId" />,
-                          }]}
-                        />
+                        <FormerIdentifierFields />
                       </Col>
                     </Row>
                     <Row>
                       <Col sm={10}>
-                        <RepeatableField
-                          name="statisticalCodeIds"
-                          addButtonId="clickable-add-statistical-code"
-                          addLabel={<FormattedMessage id="ui-inventory.addStatisticalCode" />}
-                          template={[
-                            {
-                              label: <FormattedMessage id="ui-inventory.statisticalCode" />,
-                              component: Select,
-                              dataOptions: [{ label: 'Select code', value: '' }, ...statisticalCodeOptions],
-                            }
-                          ]}
-                        />
+                        <StatisticalCodeFields statisticalCodeOptions={statisticalCodeOptions} />
                       </Col>
                     </Row>
                     <Row>
@@ -652,15 +621,7 @@ class ItemForm extends React.Component {
                     </Row>
                     <Row>
                       <Col sm={6}>
-                        <RepeatableField
-                          name="yearCaption"
-                          addButtonId="clickable-add-year-caption"
-                          addLabel={<FormattedMessage id="ui-inventory.addYearCaption" />}
-                          template={[{
-                            component: TextField,
-                            label: <FormattedMessage id="ui-inventory.yearCaption" />
-                          }]}
-                        />
+                        <YearCaptionFields />
                       </Col>
                     </Row>
                   </Accordion>
@@ -733,38 +694,11 @@ class ItemForm extends React.Component {
                   >
                     <Row>
                       <Col sm={10}>
-                        <RepeatableField
-                          name="notes"
-                          addButtonId="clickable-add-note"
-                          addLabel={<FormattedMessage id="ui-inventory.addNote" />}
-                          template={[
-                            {
-                              name: 'itemNoteTypeId',
-                              label: <FormattedMessage id="ui-inventory.noteType" />,
-                              component: Select,
-                              dataOptions: [{ label: 'Select type', value: '' }, ...itemNoteTypeOptions],
-                              required: true
-                            },
-                            {
-                              name: 'note',
-                              label: <FormattedMessage id="ui-inventory.note" />,
-                              component: TextArea,
-                              rows: 1,
-                              required: true
-                            },
-                            {
-                              name: 'staffOnly',
-                              label: <FormattedMessage id="ui-inventory.staffOnly" />,
-                              component: Checkbox,
-                              type: 'checkbox',
-                              inline: true,
-                              vertical: true,
-                              columnSize: {
-                                xs: 3,
-                                lg: 2,
-                              }
-                            }
-                          ]}
+                        <NoteFields
+                          noteTypeOptions={itemNoteTypeOptions}
+                          noteTypeIdField="itemNoteTypeId"
+                          requiredFields={['itemNoteTypeId', 'note']}
+                          renderLegend={false}
                         />
                       </Col>
                     </Row>
@@ -832,43 +766,7 @@ class ItemForm extends React.Component {
                     </Row>
                     <Row>
                       <Col sm={10}>
-                        <RepeatableField
-                          name="circulationNotes"
-                          addButtonId="clickable-add-checkin-checkout-note"
-                          addLabel={<FormattedMessage id="ui-inventory.addCirculationNote" />}
-                          template={[
-                            {
-                              name: 'noteType',
-                              label: <FormattedMessage id="ui-inventory.noteType" />,
-                              component: Select,
-                              dataOptions: [
-                                { label: 'Select type', value: '' },
-                                { label: 'Check in note', value: 'Check in' },
-                                { label: 'Check out note', value: 'Check out' }
-                              ],
-                              required: true
-                            },
-                            {
-                              name: 'note',
-                              label: <FormattedMessage id="ui-inventory.note" />,
-                              component: TextArea,
-                              rows: 1,
-                              required: true
-                            },
-                            {
-                              name: 'staffOnly',
-                              label: <FormattedMessage id="ui-inventory.staffOnly" />,
-                              component: Checkbox,
-                              type: 'checkbox',
-                              inline: true,
-                              vertical: true,
-                              columnSize: {
-                                xs: 3,
-                                lg: 2,
-                              }
-                            }
-                          ]}
-                        />
+                        <CirculationNotesFields />
                       </Col>
                     </Row>
                   </Accordion>
@@ -922,51 +820,9 @@ class ItemForm extends React.Component {
                     id="acc10"
                     label={<FormattedMessage id="ui-inventory.boundWithTitles" />}
                   >
-                    <RepeatableField
-                      name="boundWithTitles"
-                      label={<FormattedMessage id="ui-inventory.boundWithTitles" />}
-                      canAdd={false}
-                      canDelete={(fields, fieldIndex) => {
-                        return fields?.value[fieldIndex]?.briefHoldingsRecord?.id !==
-                          item?.holdingsRecordId;
-                      }}
-                      hideAdd
-                      component={BoundWithFieldRow}
-                      template={[
-                        {
-                          name: 'briefInstance.hrid',
-                          label: <FormattedMessage id="ui-inventory.instanceHrid" />,
-                          component: TextField,
-                          disabled: true,
-                          value: boundWithTitle => boundWithTitle.briefInstance.hrid,
-                        },
-                        {
-                          name: 'briefInstance.title',
-                          label: <FormattedMessage id="ui-inventory.instanceTitleLabel" />,
-                          component: TextField,
-                          disabled: true,
-                        },
-                        {
-                          name: 'briefHoldingsRecord.hrid',
-                          label: <FormattedMessage id="ui-inventory.holdingsHrid" />,
-                          component: TextField,
-                          disabled: true,
-                        },
-                      ]}
-                    />
-                    <Button
-                      data-testid="bound-with-add-button"
-                      type="button"
-                      align="end"
-                      onClick={this.openBoundWithModal}
-                    >
-                      <FormattedMessage id="ui-inventory.boundWithTitles.add" />
-                    </Button>
-                    <BoundWithModal
+                    <BoundWithTitlesFields
                       item={item}
-                      open={this.state.boundWithModalOpen}
-                      onClose={this.closeBoundWithModal}
-                      onOk={this.addBoundWiths}
+                      addBoundWithTitles={newBoundWiths => this.addBoundWiths(newBoundWiths)}
                     />
                   </Accordion>
                 </AccordionSet>
diff --git a/src/edit/items/ItemForm.test.js b/src/edit/items/ItemForm.test.js
index ccd608d7d..6065cee66 100644
--- a/src/edit/items/ItemForm.test.js
+++ b/src/edit/items/ItemForm.test.js
@@ -4,14 +4,11 @@ import {
   QueryClient,
   QueryClientProvider,
 } from 'react-query';
-import { screen, waitFor } from '@testing-library/react';
-import user from '@testing-library/user-event';
 
 import '../../../test/jest/__mock__';
 
 import { StripesContext } from '@folio/stripes/core';
 
-
 import {
   renderWithIntl,
   translationsProperties,
@@ -21,30 +18,9 @@ import { DataContext } from '../../contexts';
 
 import ItemForm from './ItemForm';
 
-import useHoldingsQueryByHrids from '../../hooks/useHoldingsQueryByHrids';
-import useInstancesQuery from '../../hooks/useInstancesQuery';
-
 jest.mock('../common', () => ({
   LocationSelectionWithCheck: () => <div>LocationSelection</div>,
 }));
-jest.mock('../../hooks/useHoldingsQueryByHrids');
-useHoldingsQueryByHrids.mockImplementation(() => {
-  return {
-    isLoading: false,
-    holdingsRecords: [
-      { hrid: 'bw789', id: 'bw789', instanceId: 'bw789' },
-    ],
-  };
-});
-jest.mock('../../hooks/useInstancesQuery');
-useInstancesQuery.mockImplementation(() => {
-  return {
-    isSuccess: true,
-    data: {
-      instances: [],
-    },
-  };
-});
 
 const mockInitialValues = {
   permanentLocationId: 'permanentLocationId',
@@ -118,77 +94,17 @@ describe('ItemForm', () => {
     expect(container.querySelectorAll('form').length).toEqual(1);
   });
 
-  describe('when displaying boundWithTitles rows', () => {
-    it('should disable delete on a directly linked holding', async () => {
-      const { container } = renderItemForm();
-
-      await waitFor(() => {
-        const directlyLinkedTitle = container.querySelector("*[data-test-repeater-field-row] input[value='bw123']");
-        const directlyLinkedDelete = directlyLinkedTitle.closest('div[data-test-repeater-field-row]')
-          .getElementsByTagName('button').item(0);
-        expect(directlyLinkedDelete.disabled).toBeTruthy();
-      });
-    });
-
-    it('should enable delete on an indirectly linked holding', async () => {
-      const { container } = renderItemForm();
-
-      await waitFor(() => {
-        const indirectlyLinkedTitle = container.querySelector("*[data-test-repeater-field-row] input[value='bw456']");
-        const indirectlyLinkedDelete = indirectlyLinkedTitle.closest('div[data-test-repeater-field-row]')
-          .getElementsByTagName('button').item(0);
-        expect(indirectlyLinkedDelete.disabled).toBeFalsy();
-      });
-    });
-  });
-
-  describe('Bound With modal', () => {
-    it('should start out closed', async () => {
-      renderItemForm();
-
-      const saveButton = screen.queryByTestId('bound-with-modal-save-button');
-      expect(saveButton).toBeNull();
-    });
-
-    it('should open and close', async () => {
-      renderItemForm();
-
-      const openModalButton = await screen.findByTestId('bound-with-add-button');
-      user.click(openModalButton);
-
-      // Open the modal, test that the save button is visible
-      let saveButton = screen.queryByTestId('bound-with-modal-save-button');
-      expect(saveButton).not.toBeNull();
-      expect(saveButton).toBeVisible();
-
-      // Close the modal, look for the button again, test that it has disappeared
-      const cancelModalButton = screen.queryByTestId('bound-with-modal-cancel-button');
-      user.click(cancelModalButton);
-      await waitFor(() => {
-        saveButton = screen.queryByTestId('bound-with-modal-save-button');
-        expect(saveButton).toBeNull();
-      });
-    });
-
-    it('should trigger addBoundWiths when saved', async () => {
-      const { container } = renderItemForm();
-
-      // Initially there are two bound-with holdings
-      let rows = container.querySelectorAll('#acc10 *[data-test-repeater-field-row]');
-      expect(rows.length).toEqual(2);
-
-      const openModalButton = await screen.findByTestId('bound-with-add-button');
-      user.click(openModalButton);
-
-      const firstInput = screen.queryAllByTestId('bound-with-modal-input')[0];
-      user.type(firstInput, 'bw789');
-
-      const saveModalButton = screen.queryByTestId('bound-with-modal-save-button');
-      user.click(saveModalButton);
-
-      // There should now be three
-      rows = container.querySelectorAll('#acc10 *[data-test-repeater-field-row]');
-      expect(rows.length).toEqual(3);
-    });
+  it('should render correct accordions', () => {
+    const { getByText, getAllByText } = renderItemForm();
+
+    expect(getByText('Administrative data')).toBeInTheDocument();
+    expect(getByText('Item data')).toBeInTheDocument();
+    expect(getByText('Enumeration data')).toBeInTheDocument();
+    expect(getByText('Condition')).toBeInTheDocument();
+    expect(getByText('Item notes')).toBeInTheDocument();
+    expect(getByText('Loan and availability')).toBeInTheDocument();
+    expect(getByText('Location')).toBeInTheDocument();
+    expect(getAllByText('Electronic access')[0]).toBeInTheDocument();
+    expect(getAllByText('Bound-with and analytics')[0]).toBeInTheDocument();
   });
 });
diff --git a/src/edit/items/repeatableFields/BoundWithTitlesFields.js b/src/edit/items/repeatableFields/BoundWithTitlesFields.js
new file mode 100644
index 000000000..35411b619
--- /dev/null
+++ b/src/edit/items/repeatableFields/BoundWithTitlesFields.js
@@ -0,0 +1,165 @@
+import React, {
+  useEffect,
+  useState,
+} from 'react';
+import {
+  FormattedMessage,
+  useIntl,
+} from 'react-intl';
+import { isEqual } from 'lodash';
+import { FieldArray } from 'react-final-form-arrays';
+import { Field } from 'react-final-form';
+import PropTypes from 'prop-types';
+
+import {
+  Row,
+  Col,
+  Label,
+  TextField,
+  RepeatableField,
+  Button,
+  IconButton,
+} from '@folio/stripes/components';
+
+import BoundWithModal from '../BoundWithModal';
+import { useBoundWithTitlesByHrids } from '../../../hooks';
+import usePrevious from '../../../hooks/usePrevious';
+
+const BoundWithTitlesFields = ({
+  item,
+  addBoundWithTitles,
+}) => {
+  const { formatMessage } = useIntl();
+
+  const [isBoundWithModalOpen, setBoundWithModalOpen] = useState(false);
+  const [addedHoldingsHrids, setAddedHoldingsHrids] = useState([]);
+  const { boundWithTitles: newBoundWithTitles } = useBoundWithTitlesByHrids(addedHoldingsHrids);
+  const prevBoundWithTitles = usePrevious(newBoundWithTitles);
+
+  useEffect(() => {
+    if (!isEqual(prevBoundWithTitles, newBoundWithTitles)) {
+      addBoundWithTitles(newBoundWithTitles);
+    }
+  }, [newBoundWithTitles]);
+
+  const hridLabel = formatMessage({ id: 'ui-inventory.instanceHrid' });
+  const titleLabel = formatMessage({ id: 'ui-inventory.instanceTitleLabel' });
+  const holdingsHridLabel = formatMessage({ id: 'ui-inventory.holdingsHrid' });
+  const trashcanLabel = formatMessage({ id: 'stripes-components.deleteThisItem' });
+
+  const addBoundWiths = newHoldingsHrids => {
+    setAddedHoldingsHrids(newHoldingsHrids);
+    setBoundWithModalOpen(false);
+  };
+
+  const onBoundWithTitlesRemove = (fields, index) => {
+    const removedField = fields.value[index];
+    const newlyAddedIndex = addedHoldingsHrids.indexOf(removedField.briefHoldingsRecord.hrid);
+
+    if (newlyAddedIndex !== -1) {
+      const updatedHoldingsHrids = [...addedHoldingsHrids];
+      updatedHoldingsHrids.splice(newlyAddedIndex, 1);
+      setAddedHoldingsHrids(updatedHoldingsHrids);
+    }
+
+    fields.remove(index);
+  };
+
+  const headLabels = (
+    <Row>
+      <Col sm>
+        <Label tagName="legend">
+          {hridLabel}
+        </Label>
+      </Col>
+      <Col sm>
+        <Label tagName="legend">
+          {titleLabel}
+        </Label>
+      </Col>
+      <Col sm>
+        <Label tagName="legend">
+          {holdingsHridLabel}
+        </Label>
+      </Col>
+      <Col sm={1}>
+        <Label tagName="legend" className="sr-only">
+          {trashcanLabel}
+        </Label>
+      </Col>
+    </Row>
+  );
+
+  const renderField = (field, index, fields) => (
+    <Row>
+      <Col sm>
+        <Field
+          ariaLabel={hridLabel}
+          name={`${field}.briefInstance.hrid`}
+          component={TextField}
+          disabled
+        />
+      </Col>
+      <Col sm>
+        <Field
+          ariaLabel={titleLabel}
+          name={`${field}.briefInstance.title`}
+          component={TextField}
+          disabled
+        />
+      </Col>
+      <Col sm>
+        <Field
+          ariaLabel={holdingsHridLabel}
+          name={`${field}.briefHoldingsRecord.hrid`}
+          component={TextField}
+          disabled
+        />
+      </Col>
+      <Col sm={1}>
+        <IconButton
+          icon="trash"
+          onClick={() => onBoundWithTitlesRemove(fields, index)}
+          size="medium"
+          disabled={fields.value[index]?.briefHoldingsRecord?.id === item?.holdingsRecordId}
+          aria-label={trashcanLabel}
+        />
+      </Col>
+    </Row>
+  );
+
+  return (
+    <>
+      <FieldArray
+        name="boundWithTitles"
+        component={RepeatableField}
+        legend={<FormattedMessage id="ui-inventory.boundWithTitles" />}
+        headLabels={headLabels}
+        renderField={renderField}
+        canAdd={false}
+        onRemove={false}
+      />
+      <Button
+        data-testid="bound-with-add-button"
+        type="button"
+        align="end"
+        onClick={() => setBoundWithModalOpen(true)}
+      >
+        <FormattedMessage id="ui-inventory.boundWithTitles.add" />
+      </Button>
+      <BoundWithModal
+        item={item}
+        open={isBoundWithModalOpen}
+        onClose={() => setBoundWithModalOpen(false)}
+        onOk={addBoundWiths}
+      />
+    </>
+  );
+};
+
+BoundWithTitlesFields.propTypes = {
+  item: PropTypes.object.isRequired,
+  addBoundWithTitles: PropTypes.func.isRequired,
+};
+
+export default BoundWithTitlesFields;
diff --git a/src/edit/items/repeatableFields/CirculationNotesFields.js b/src/edit/items/repeatableFields/CirculationNotesFields.js
new file mode 100644
index 000000000..015178794
--- /dev/null
+++ b/src/edit/items/repeatableFields/CirculationNotesFields.js
@@ -0,0 +1,124 @@
+import React from 'react';
+import { FieldArray } from 'react-final-form-arrays';
+import { Field } from 'react-final-form';
+import {
+  FormattedMessage,
+  useIntl,
+} from 'react-intl';
+import PropTypes from 'prop-types';
+
+import {
+  RepeatableField,
+  TextArea,
+  Select,
+  Checkbox,
+  Row,
+  Col,
+  Label,
+} from '@folio/stripes/components';
+
+const CirculationNotesFields = props => {
+  const { formatMessage } = useIntl();
+
+  const {
+    canAdd,
+    canEdit,
+    canDelete,
+  } = props;
+
+  const noteTypeOptions = [
+    { label: formatMessage({ id: 'ui-inventory.selectType' }), value: '' },
+    { label: 'Check in note', value: 'Check in' },
+    { label: 'Check out note', value: 'Check out' }
+  ];
+
+  const noteTypeLabel = formatMessage({ id: 'ui-inventory.noteType' });
+  const noteLabel = formatMessage({ id: 'ui-inventory.note' });
+  const staffOnlyLabel = formatMessage({ id: 'ui-inventory.staffOnly' });
+
+  const headLabels = (
+    <Row>
+      <Col sm={5}>
+        <Label tagName="legend" required>
+          {noteTypeLabel}
+        </Label>
+      </Col>
+      <Col sm={5}>
+        <Label tagName="legend" required>
+          {noteLabel}
+        </Label>
+      </Col>
+      <Col xs={3} lg={2}>
+        <Label tagName="legend">
+          {staffOnlyLabel}
+        </Label>
+      </Col>
+    </Row>
+  );
+
+  const renderField = field => (
+    <Row>
+      <Col sm={5}>
+        <Field
+          aria-label={noteTypeLabel}
+          name={`${field}.noteType`}
+          component={Select}
+          dataOptions={noteTypeOptions}
+          disabled={!canEdit}
+          required
+        />
+      </Col>
+      <Col sm={5}>
+        <Field
+          aria-label={noteLabel}
+          name={`${field}.note`}
+          component={TextArea}
+          rows={1}
+          disabled={!canEdit}
+          required
+        />
+      </Col>
+      <Col xs={3} lg={2}>
+        <Field
+          aria-label={staffOnlyLabel}
+          name={`${field}.staffOnly`}
+          component={Checkbox}
+          type="checkbox"
+          inline
+          vertical
+          disabled={!canEdit}
+        />
+      </Col>
+    </Row>
+  );
+
+  return (
+    <FieldArray
+      name="circulationNotes"
+      component={RepeatableField}
+      addLabel={<FormattedMessage id="ui-inventory.addCirculationNote" />}
+      onAdd={fields => fields.push({
+        noteType: '',
+        note: '',
+        staffOnly: false,
+      })}
+      headLabels={headLabels}
+      renderField={renderField}
+      canAdd={canAdd}
+      canRemove={canDelete}
+    />
+  );
+};
+
+CirculationNotesFields.propTypes = {
+  canAdd: PropTypes.bool,
+  canEdit: PropTypes.bool,
+  canDelete: PropTypes.bool,
+};
+CirculationNotesFields.defaultProps = {
+  canAdd: true,
+  canEdit: true,
+  canDelete: true,
+};
+
+export default CirculationNotesFields;
diff --git a/src/edit/items/repeatableFields/FormerIdentifierFields.js b/src/edit/items/repeatableFields/FormerIdentifierFields.js
new file mode 100644
index 000000000..e878b70d7
--- /dev/null
+++ b/src/edit/items/repeatableFields/FormerIdentifierFields.js
@@ -0,0 +1,66 @@
+import React from 'react';
+import {
+  FormattedMessage,
+  useIntl,
+} from 'react-intl';
+import { FieldArray } from 'react-final-form-arrays';
+import { Field } from 'react-final-form';
+import PropTypes from 'prop-types';
+
+import {
+  Label,
+  TextField,
+  RepeatableField,
+} from '@folio/stripes/components';
+
+const FormerIdentifierFields = ({
+  canAdd,
+  canEdit,
+  canDelete,
+}) => {
+  const { formatMessage } = useIntl();
+
+  const formerIdLabel = formatMessage({ id: 'ui-inventory.formerId' });
+
+  const legend = (
+    <Label tagName="legend">
+      {formerIdLabel}
+    </Label>
+  );
+
+  const renderField = field => (
+    <Field
+      ariaLabel={formerIdLabel}
+      name={field}
+      component={TextField}
+      disabled={!canEdit}
+    />
+  );
+
+  return (
+    <FieldArray
+      name="formerIds"
+      component={RepeatableField}
+      addLabel={<FormattedMessage id="ui-inventory.addFormerId" />}
+      onAdd={fields => fields.push('')}
+      headLabels={legend}
+      renderField={renderField}
+      canAdd={canAdd}
+      canRemove={canDelete}
+    />
+  );
+};
+
+FormerIdentifierFields.propTypes = {
+  canAdd: PropTypes.bool,
+  canEdit: PropTypes.bool,
+  canDelete: PropTypes.bool,
+};
+
+FormerIdentifierFields.defaultProps = {
+  canAdd: true,
+  canEdit: true,
+  canDelete: true,
+};
+
+export default FormerIdentifierFields;
diff --git a/src/edit/items/repeatableFields/YearCaptionFields.js b/src/edit/items/repeatableFields/YearCaptionFields.js
new file mode 100644
index 000000000..28db287fc
--- /dev/null
+++ b/src/edit/items/repeatableFields/YearCaptionFields.js
@@ -0,0 +1,66 @@
+import React from 'react';
+import {
+  FormattedMessage,
+  useIntl,
+} from 'react-intl';
+import { FieldArray } from 'react-final-form-arrays';
+import { Field } from 'react-final-form';
+import PropTypes from 'prop-types';
+
+import {
+  Label,
+  TextField,
+  RepeatableField,
+} from '@folio/stripes/components';
+
+const YearCaptionFields = ({
+  canAdd,
+  canEdit,
+  canDelete,
+}) => {
+  const { formatMessage } = useIntl();
+
+  const yearCaptionLabel = formatMessage({ id: 'ui-inventory.yearCaption' });
+
+  const legend = (
+    <Label tagName="legend">
+      {yearCaptionLabel}
+    </Label>
+  );
+
+  const renderField = field => (
+    <Field
+      ariaLabel={yearCaptionLabel}
+      name={field}
+      component={TextField}
+      disabled={!canEdit}
+    />
+  );
+
+  return (
+    <FieldArray
+      name="yearCaption"
+      component={RepeatableField}
+      addLabel={<FormattedMessage id="ui-inventory.addYearCaption" />}
+      onAdd={fields => fields.push('')}
+      headLabels={legend}
+      renderField={renderField}
+      canAdd={canAdd}
+      canRemove={canDelete}
+    />
+  );
+};
+
+YearCaptionFields.propTypes = {
+  canAdd: PropTypes.bool,
+  canEdit: PropTypes.bool,
+  canDelete: PropTypes.bool,
+};
+
+YearCaptionFields.defaultProps = {
+  canAdd: true,
+  canEdit: true,
+  canDelete: true,
+};
+
+export default YearCaptionFields;
diff --git a/src/edit/items/repeatableFields/index.js b/src/edit/items/repeatableFields/index.js
new file mode 100644
index 000000000..58e916d50
--- /dev/null
+++ b/src/edit/items/repeatableFields/index.js
@@ -0,0 +1,4 @@
+export { default as BoundWithTitlesFields } from './BoundWithTitlesFields';
+export { default as CirculationNotesFields } from './CirculationNotesFields';
+export { default as FormerIdentifierFields } from './FormerIdentifierFields';
+export { default as YearCaptionFields } from './YearCaptionFields';
diff --git a/src/edit/items/repeatableFields/tests/BoundWithTitlesFields.test.js b/src/edit/items/repeatableFields/tests/BoundWithTitlesFields.test.js
new file mode 100644
index 000000000..0eb8ff7d4
--- /dev/null
+++ b/src/edit/items/repeatableFields/tests/BoundWithTitlesFields.test.js
@@ -0,0 +1,179 @@
+import React from 'react';
+import userEvent from '@testing-library/user-event';
+import { waitFor } from '@testing-library/react';
+
+import '../../../../../test/jest/__mock__';
+
+import BoundWithTitlesFields from '../BoundWithTitlesFields';
+import useBoundWithTitlesByHrids from '../../../../hooks/useBoundWithTitlesByHrids';
+
+import renderWithRouter from '../../../../../test/jest/helpers/renderWithRouter';
+import renderWithIntl from '../../../../../test/jest/helpers/renderWithIntl';
+import renderWithFinalForm from '../../../../../test/jest/helpers/renderWithFinalForm';
+import translationsProperties from '../../../../../test/jest/helpers/translationsProperties';
+
+jest.mock('../../../../hooks/useBoundWithTitlesByHrids', () => {
+  return jest.fn(() => ({ isLoading: false, boundWithTitles: [] }));
+});
+jest.mock('../../BoundWithModal', () => {
+  return jest.fn(({ open, onOk, onClose }) => (open ? (
+    <div>
+      <span>BoundWith Modal</span>
+      <button
+        type="button"
+        onClick={onClose}
+      >
+        Cancel
+      </button>
+      <button
+        type="button"
+        id="confirmButton"
+        onClick={onOk}
+      >
+        Save & close
+      </button>
+    </div>
+  ) : null));
+});
+jest.mock('@folio/stripes/components', () => ({
+  ...jest.requireActual('@folio/stripes/components'),
+  Loading: () => <div>Loading</div>,
+}));
+
+const addBoundWithTitlesProp = jest.fn();
+const initialValues = {
+  boundWithTitles: [
+    {
+      briefInstance: {
+        title: 'instanceTitle',
+        hrid: 'instanceHrid'
+      },
+      briefHoldingsRecord: {
+        id: 'holdingsId',
+        hrid: 'holdingHrid',
+      },
+    },
+  ],
+};
+
+const renderBoundWithTitlesFields = (props = {}) => {
+  const component = (
+    <BoundWithTitlesFields
+      item={{}}
+      addBoundWithTitles={addBoundWithTitlesProp}
+      {...props}
+    />
+  );
+
+  return renderWithIntl(
+    renderWithRouter(renderWithFinalForm(component, { initialValues })),
+    translationsProperties,
+  );
+};
+
+describe('BoundWithTitlesFields', () => {
+  it('should render a legend', () => {
+    const { getByText } = renderBoundWithTitlesFields();
+
+    expect(getByText('Bound-with and analytics')).toBeInTheDocument();
+  });
+
+  it('should render Add Bound-with and analytics button', () => {
+    const { getByText } = renderBoundWithTitlesFields();
+
+    expect(getByText('Add Bound-with and analytics')).toBeInTheDocument();
+  });
+
+  describe('when there is data', () => {
+    it('should render correct fields', () => {
+      const { getByLabelText } = renderBoundWithTitlesFields();
+
+      expect(getByLabelText('Instance HRID')).toBeInTheDocument();
+      expect(getByLabelText('Instance title')).toBeInTheDocument();
+      expect(getByLabelText('Holdings HRID')).toBeInTheDocument();
+    });
+
+    it('all fields should be disabled', () => {
+      const { getByLabelText } = renderBoundWithTitlesFields();
+
+      expect(getByLabelText('Instance HRID')).toBeDisabled();
+      expect(getByLabelText('Instance title')).toBeDisabled();
+      expect(getByLabelText('Holdings HRID')).toBeDisabled();
+    });
+  });
+
+  describe('when clicking Add Bound-with and analytics button', () => {
+    it('BoundWith Modal should appear', async () => {
+      const { getByText } = renderBoundWithTitlesFields();
+      const addButton = getByText('Add Bound-with and analytics');
+      userEvent.click(addButton);
+
+      await waitFor(() => expect(getByText('BoundWith Modal')).toBeInTheDocument());
+    });
+
+    describe('when clicking Cancel button', () => {
+      it('BoundWith Modal should disappear', async () => {
+        const { queryByText, getByRole, getByText } = renderBoundWithTitlesFields();
+        const addButton = getByText('Add Bound-with and analytics');
+        userEvent.click(addButton);
+        userEvent.click(getByRole('button', { name: 'Cancel' }));
+
+        await waitFor(() => expect(queryByText('BoundWith Modal')).not.toBeInTheDocument());
+      });
+    });
+
+    describe('when clicking Save & close button', () => {
+      it('BoundWith Modal should disappear', async () => {
+        const { queryByText, getByRole, getByText } = renderBoundWithTitlesFields();
+        const addButton = getByText('Add Bound-with and analytics');
+        userEvent.click(addButton);
+        userEvent.click(getByRole('button', { name: 'Save & close' }));
+
+        await waitFor(() => expect(queryByText('BoundWith Modal')).not.toBeInTheDocument());
+      });
+
+      it('and new bound with titles info should be fetched', async () => {
+        const { getByRole, getByText } = renderBoundWithTitlesFields();
+        const addButton = getByText('Add Bound-with and analytics');
+        userEvent.click(addButton);
+        userEvent.click(getByRole('button', { name: 'Save & close' }));
+
+        expect(useBoundWithTitlesByHrids).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe("when item's holdingsRecordId is equal to added briefHoldingsRecord id", () => {
+    it('trash icon for this field should be disabled', () => {
+      const { getByRole } = renderBoundWithTitlesFields({ item: { holdingsRecordId: 'holdingsId' } });
+
+      const deleteButton = getByRole('button', { name: /delete this item/i });
+
+      expect(deleteButton).toBeDisabled();
+    });
+  });
+
+  describe("when item's holdingsRecordId is not equal to added briefHoldingsRecord id", () => {
+    it('trash icon for this field should be active', () => {
+      const { getByRole } = renderBoundWithTitlesFields({ item: { holdingsRecordId: 'holdingsId1' } });
+
+      const deleteButton = getByRole('button', { name: /delete this item/i });
+
+      expect(deleteButton).not.toBeDisabled();
+    });
+  });
+
+  describe('when clicking trash icon', () => {
+    it('should remove repeatable field', () => {
+      const { queryByLabelText, getByRole } = renderBoundWithTitlesFields();
+
+      const deleteButton = getByRole('button', { name: /delete this item/i });
+
+      userEvent.click(deleteButton);
+
+      expect(queryByLabelText('Instance HRID')).not.toBeInTheDocument();
+      expect(queryByLabelText('Instance title')).not.toBeInTheDocument();
+      expect(queryByLabelText('Holdings HRID')).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/src/edit/noteFields.js b/src/edit/noteFields.js
index d1759b355..2cf47c783 100644
--- a/src/edit/noteFields.js
+++ b/src/edit/noteFields.js
@@ -21,35 +21,37 @@ const NoteFields = props => {
   const { formatMessage } = useIntl();
 
   const {
-    instanceNoteTypes,
+    noteTypeOptions,
+    noteTypeIdField,
+    requiredFields,
+    renderLegend,
     canAdd,
     canEdit,
     canDelete,
   } = props;
 
-  const instanceNoteTypeOptions = instanceNoteTypes.map(it => ({
-    label: it.name,
-    value: it.id,
-  }));
-
   const noteTypeLabel = formatMessage({ id: 'ui-inventory.noteType' });
   const noteLabel = formatMessage({ id: 'ui-inventory.note' });
   const staffOnlyLabel = formatMessage({ id: 'ui-inventory.staffOnly' });
 
+  const isNoteTypeRequired = requiredFields.some(field => field === noteTypeIdField);
+  const isNoteRequired = requiredFields.some(field => field === 'note');
+  const isStaffOnlyRequired = requiredFields.some(field => field === 'staffOnly');
+
   const headLabels = (
     <Row>
       <Col sm={5}>
-        <Label tagName="legend">
+        <Label tagName="legend" required={isNoteTypeRequired}>
           {noteTypeLabel}
         </Label>
       </Col>
       <Col sm={5}>
-        <Label tagName="legend">
+        <Label tagName="legend" required={isNoteRequired}>
           {noteLabel}
         </Label>
       </Col>
       <Col xs={3} lg={2}>
-        <Label tagName="legend">
+        <Label tagName="legend" required={isStaffOnlyRequired}>
           {staffOnlyLabel}
         </Label>
       </Col>
@@ -61,10 +63,11 @@ const NoteFields = props => {
       <Col sm={5}>
         <Field
           aria-label={noteTypeLabel}
-          name={`${field}.instanceNoteTypeId`}
+          name={`${field}.${noteTypeIdField}`}
           component={Select}
-          dataOptions={[{ label: formatMessage({ id: 'ui-inventory.selectType' }), value: '' }, ...instanceNoteTypeOptions]}
+          dataOptions={[{ label: formatMessage({ id: 'ui-inventory.selectType' }), value: '' }, ...noteTypeOptions]}
           disabled={!canEdit}
+          required={isNoteTypeRequired}
         />
       </Col>
       <Col sm={5}>
@@ -74,6 +77,7 @@ const NoteFields = props => {
           component={TextArea}
           rows={1}
           disabled={!canEdit}
+          required={isNoteRequired}
         />
       </Col>
       <Col xs={3} lg={2}>
@@ -85,6 +89,7 @@ const NoteFields = props => {
           inline
           vertical
           disabled={!canEdit}
+          required={isStaffOnlyRequired}
         />
       </Col>
     </Row>
@@ -94,10 +99,10 @@ const NoteFields = props => {
     <FieldArray
       name="notes"
       component={RepeatableField}
-      legend={<FormattedMessage id="ui-inventory.notes" />}
+      legend={renderLegend ? <FormattedMessage id="ui-inventory.notes" /> : null}
       addLabel={<FormattedMessage id="ui-inventory.addNote" />}
       onAdd={fields => fields.push({
-        instanceNoteTypeId: '',
+        [noteTypeIdField]: '',
         note: '',
         staffOnly: false,
       })}
@@ -110,12 +115,18 @@ const NoteFields = props => {
 };
 
 NoteFields.propTypes = {
-  instanceNoteTypes: PropTypes.arrayOf(PropTypes.object),
+  noteTypeIdField: PropTypes.string.isRequired,
+  noteTypeOptions: PropTypes.arrayOf(PropTypes.object),
+  requiredFields: PropTypes.arrayOf(PropTypes.string),
+  renderLegend: PropTypes.bool,
   canAdd: PropTypes.bool,
   canEdit: PropTypes.bool,
   canDelete: PropTypes.bool,
 };
 NoteFields.defaultProps = {
+  noteTypeOptions: [],
+  requiredFields: [],
+  renderLegend: true,
   canAdd: true,
   canEdit: true,
   canDelete: true,
diff --git a/src/edit/noteFields.test.js b/src/edit/noteFields.test.js
index 74be32f07..77e86db6d 100644
--- a/src/edit/noteFields.test.js
+++ b/src/edit/noteFields.test.js
@@ -16,7 +16,8 @@ jest.unmock('@folio/stripes/components');
 const onSubmit = jest.fn();
 
 const props = {
-  instanceNoteTypes: [{ name: 'instanceNoteTypesName', id: '123456789' }]
+  noteTypeIdField: 'noteTypeIdField',
+  noteTypeOptions: [{ name: 'noteTypeName', id: '123456789' }],
 };
 
 const Form = ({ handleSubmit }) => (
@@ -43,15 +44,26 @@ const renderNoteFields = () => renderWithIntl(
 afterEach(() => jest.clearAllMocks());
 
 describe('NoteFields', () => {
-  it('renders RepeatableField', () => {
+  it('should render a legend', () => {
     renderNoteFields();
+
     expect(screen.getByText('Notes')).toBeInTheDocument();
   });
-  it('click on Add note button', () => {
-    renderNoteFields();
-    const addNoteButton = screen.getByText('Add note');
-    userEvent.click(addNoteButton);
-    const RelationshipDropdown = screen.getAllByText('instanceNoteTypesName');
-    expect(RelationshipDropdown).toHaveLength(1);
+
+  describe('when clicking on Add note button', () => {
+    it('correct fields should be rendered', () => {
+      renderNoteFields();
+
+      const addNoteButton = screen.getByText('Add note');
+      userEvent.click(addNoteButton);
+
+      const relationshipDropdown = screen.getAllByRole('option');
+
+      // where 1 of options is a default option
+      expect(relationshipDropdown).toHaveLength(2);
+      expect(screen.getAllByText(/Note type/i)[0]).toBeInTheDocument();
+      expect(screen.getAllByText(/Note/i)[0]).toBeInTheDocument();
+      expect(screen.getAllByText(/Staff only/i)[0]).toBeInTheDocument();
+    });
   });
 });
diff --git a/src/hooks/index.js b/src/hooks/index.js
index 2ccfdb29a..1842bb751 100644
--- a/src/hooks/index.js
+++ b/src/hooks/index.js
@@ -1,3 +1,4 @@
+export { default as useBoundWithTitlesByHrids } from './useBoundWithTitlesByHrids';
 export { default as useBrowseValidation } from './useBrowseValidation';
 export { default as useCallout } from './useCallout';
 export { default as useHoldingItemsQuery } from './useHoldingItemsQuery';
diff --git a/src/hooks/useBoundWithTitlesByHrids/index.js b/src/hooks/useBoundWithTitlesByHrids/index.js
new file mode 100644
index 000000000..e5b4c1cd1
--- /dev/null
+++ b/src/hooks/useBoundWithTitlesByHrids/index.js
@@ -0,0 +1 @@
+export { default } from './useBoundWithTitlesByHrids';
diff --git a/src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.js b/src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.js
new file mode 100644
index 000000000..ba114a000
--- /dev/null
+++ b/src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.js
@@ -0,0 +1,48 @@
+import { keyBy } from 'lodash';
+
+import useHoldingsQueryByHrids from '../useHoldingsQueryByHrids';
+import useInstancesQuery from '../useInstancesQuery';
+
+const useBoundWithTitlesByHrids = holdingsHrids => {
+  // Load the holdings records matching the input HRIDs
+  const { isLoading: isHoldingsLoading, holdingsRecords } = useHoldingsQueryByHrids(holdingsHrids);
+
+  // Load the instance records matching the holdings' instanceIds.
+  const instanceIds = holdingsRecords.map(record => record.instanceId);
+  const instances = useInstancesQuery(instanceIds);
+
+  if (isHoldingsLoading || !instances.isSuccess) return { isLoading: true, boundWithTitles: [] };
+
+  const holdingsRecordsByHrid = keyBy(holdingsRecords, 'hrid');
+  const instancesById = keyBy(instances.data?.instances, 'id');
+
+  const boundWithTitles = holdingsHrids.map(hrid => {
+    let boundWithTitle = { briefHoldingsRecord: { hrid } };
+    const holdingsRecord = holdingsRecordsByHrid[hrid];
+
+    if (holdingsRecord) {
+      const instance = instancesById[holdingsRecord.instanceId];
+
+      boundWithTitle = {
+        briefHoldingsRecord: {
+          hrid,
+          id: holdingsRecord.id,
+        },
+        briefInstance: {
+          id: instance?.id,
+          hrid: instance?.hrid,
+          title: instance?.title,
+        },
+      };
+    }
+
+    return boundWithTitle;
+  });
+
+  return {
+    isLoading: false,
+    boundWithTitles,
+  };
+};
+
+export default useBoundWithTitlesByHrids;
diff --git a/src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.test.js b/src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.test.js
new file mode 100644
index 000000000..fa90e8cdc
--- /dev/null
+++ b/src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.test.js
@@ -0,0 +1,56 @@
+import React from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+
+import '../../../test/jest/__mock__';
+
+import useBoundWithTitlesByHrids from './useBoundWithTitlesByHrids';
+
+jest.mock('../useHoldingsQueryByHrids', () => {
+  const mockHoldingsRecords = {
+    isLoading: false,
+    holdingsRecords: [{
+      instanceId: 'instanceId',
+      hrid: 'holdingHrid',
+      id: 'holdingId',
+    }],
+  };
+
+  return () => mockHoldingsRecords;
+});
+jest.mock('../useInstancesQuery', () => {
+  const mockInstances = {
+    isSuccess: true,
+    data: { instances: [
+      {
+        id: 'instanceId',
+        hrid: 'instanceHrid',
+        title: 'instanceTitle',
+      },
+    ] },
+  };
+
+  return () => mockInstances;
+});
+
+describe('useBoundWithTitlesByHrids', () => {
+  it('should return boundWithTitles data', async () => {
+    const { result, waitFor } = renderHook(() => useBoundWithTitlesByHrids(['holdingHrid']));
+
+    await waitFor(() => !result.current.isLoading);
+
+    const expectedResult = [{
+      briefHoldingsRecord: {
+        hrid: 'holdingHrid',
+        id: 'holdingId',
+      },
+      briefInstance: {
+        id: 'instanceId',
+        hrid: 'instanceHrid',
+        title: 'instanceTitle',
+      },
+    }];
+
+    expect(result.current.boundWithTitles).toEqual(expectedResult);
+  });
+});
+
diff --git a/test/jest/helpers/index.js b/test/jest/helpers/index.js
index 19131be08..b9c939cf3 100644
--- a/test/jest/helpers/index.js
+++ b/test/jest/helpers/index.js
@@ -1,3 +1,4 @@
 export { default as stripesStub } from './stripesStub';
 export { default as translationsProperties } from './translationsProperties';
+export { default as renderWithFinalForm } from './renderWithFinalForm';
 export { default as renderWithIntl } from './renderWithIntl';
diff --git a/test/jest/helpers/renderWithFinalForm.js b/test/jest/helpers/renderWithFinalForm.js
new file mode 100644
index 000000000..ca7bee3ec
--- /dev/null
+++ b/test/jest/helpers/renderWithFinalForm.js
@@ -0,0 +1,37 @@
+import React from 'react';
+
+import stripesFinalForm from '@folio/stripes/final-form';
+
+const renderWithFinalForm = (
+  component,
+  {
+    onSubmit: onCustomSubmit,
+    initialValues = {},
+    navigationCheck = true,
+    enableReinitialize = false,
+    ...stripesFinalFormProps
+  } = {}
+) => {
+  const onSubmit = () => {};
+
+  const Form = ({ handleSubmit }) => (
+    <form onSubmit={handleSubmit}>
+      {component}
+    </form>
+  );
+
+  const WrappedForm = stripesFinalForm({
+    navigationCheck,
+    enableReinitialize,
+    ...stripesFinalFormProps
+  })(Form);
+
+  return (
+    <WrappedForm
+      onSubmit={onCustomSubmit || onSubmit}
+      initialValues={initialValues}
+    />
+  );
+};
+
+export default renderWithFinalForm;

From 8e86491d0ae1b62584cbb955d90909dbfc33a180 Mon Sep 17 00:00:00 2001
From: VSnehalatha <53073086+VSnehalatha@users.noreply.github.com>
Date: Tue, 9 May 2023 19:11:39 +0530
Subject: [PATCH 11/68]  UIIN-1708 Jest/RTL test for useReferenceData.js
 (#2105)

---
 src/hooks/useReferenceData.test.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/hooks/useReferenceData.test.js

diff --git a/src/hooks/useReferenceData.test.js b/src/hooks/useReferenceData.test.js
new file mode 100644
index 000000000..1fa3afb30
--- /dev/null
+++ b/src/hooks/useReferenceData.test.js
@@ -0,0 +1,14 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { DataContext } from '../contexts';
+import useReferenceData from './useReferenceData';
+
+describe('useReferenceData', () => {
+  it('return the data from the DataContext', () => {
+    const data = { foo: 'dataFoo' };
+    const wrapper = ({ children }) => (
+      <DataContext.Provider value={data}>{children}</DataContext.Provider>
+    );
+    const { result } = renderHook(() => useReferenceData(), { wrapper });
+    expect(result.current).toEqual(data);
+  });
+});

From a2018d72ce8972d8b437e53a255d2adf9a625833 Mon Sep 17 00:00:00 2001
From: VSnehalatha <53073086+VSnehalatha@users.noreply.github.com>
Date: Tue, 9 May 2023 19:30:12 +0530
Subject: [PATCH 12/68] UIIN-1721 create Jest/RTL test for InstanceDetails.js
 (#2118)

---
 .../InstanceDetails/InstanceDetails.test.js   | 240 ++++++++++++++++++
 1 file changed, 240 insertions(+)
 create mode 100644 src/Instance/InstanceDetails/InstanceDetails.test.js

diff --git a/src/Instance/InstanceDetails/InstanceDetails.test.js b/src/Instance/InstanceDetails/InstanceDetails.test.js
new file mode 100644
index 000000000..225ce1ec8
--- /dev/null
+++ b/src/Instance/InstanceDetails/InstanceDetails.test.js
@@ -0,0 +1,240 @@
+import React from 'react';
+import '../../../test/jest/__mock__';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { MemoryRouter } from 'react-router-dom';
+import { DataContext } from '../../contexts';
+import { renderWithIntl, translationsProperties } from '../../../test/jest/helpers';
+import InstanceDetails from './InstanceDetails';
+
+jest.mock('../../components/ViewSource/ViewSource', () => jest.fn().mockReturnValue('ViewSource'));
+jest.mock('../InstanceDetails/InstanceTitle/InstanceTitle', () => jest.fn().mockReturnValue('InstanceTitle'));
+jest.mock('../InstanceDetails/InstanceContributorsView/InstanceContributorsView', () => jest.fn().mockReturnValue('InstanceContributorsView'));
+jest.mock('../InstanceDetails/InstanceSubjectView/InstanceSubjectView', () => jest.fn().mockReturnValue('InstanceSubjectView'));
+jest.mock('../InstanceDetails/InstanceTitleData/AlternativeTitlesList', () => jest.fn().mockReturnValue('AlternativeTitlesList'));
+jest.mock('../InstanceDetails/InstanceTitleData/TitleSeriesStatements', () => jest.fn().mockReturnValue('TitleSeriesStatements'));
+jest.mock('../InstanceDetails/ControllableDetail/ControllableDetail', () => jest.fn().mockReturnValue('ControllableDetail'));
+jest.mock('../InstanceDetails/SubInstanceGroup/SubInstanceGroup', () => jest.fn().mockReturnValue('SubInstanceGroup'));
+jest.mock('../InstanceDetails/InstanceAcquisition/InstanceAcquisition', () => jest.fn().mockReturnValue('InstanceAcquisition'));
+jest.mock('../InstanceDetails/InstanceTitleData/InstanceTitleData', () => jest.fn().mockReturnValue('InstanceTitleData'));
+
+jest.mock('@folio/stripes-core', () => ({
+  ...jest.requireActual('@folio/stripes-core'),
+  TitleManager: ({ children }) => <>{children}</>
+}));
+
+const instance = {
+  title: 'Test Title',
+  contributors: [],
+  identifiers: [],
+  instanceTypeId: '1234',
+  instanceFormatIds: [],
+  physicalDescriptions: [],
+  languages: [],
+  publication: [],
+  notes: [],
+  staffSuppress: false,
+  discoverySuppress: false,
+};
+
+const mockReferenceData = {
+  titleTypes:[
+    { id: '1', name: 'Type 1' },
+    { id: '2', name: 'Type 2' },
+  ],
+  instanceTypes: [
+    { id: '1', name: 'Book' },
+    { id: '2', name: 'E-book' },
+  ]
+};
+
+const queryClient = new QueryClient();
+
+const actionMenu = jest.fn();
+const onClose = jest.fn();
+const tagsEnabled = true;
+describe('InstanceDetails', () => {
+  it('renders the InstanceDetails component', () => {
+    renderWithIntl(
+      <QueryClientProvider client={queryClient}>
+        <DataContext.Provider value={mockReferenceData}>
+          <MemoryRouter>
+            <InstanceDetails
+              instance={instance}
+              onClose={onClose}
+              tagsEnabled={tagsEnabled}
+              actionMenu={actionMenu}
+            />,
+          </MemoryRouter>
+        </DataContext.Provider>
+      </QueryClientProvider>,
+      translationsProperties
+    );
+    expect(screen.getByText('InstanceTitle')).toBeInTheDocument();
+    expect(screen.getByText('Add holdings')).toBeInTheDocument();
+    expect(screen.getByText('Administrative data')).toBeInTheDocument();
+    expect(screen.getByText('Instance HRID')).toBeInTheDocument();
+    expect(screen.getByText('Source')).toBeInTheDocument();
+    expect(screen.getByText('Cataloged date')).toBeInTheDocument();
+    expect(screen.getByText('Instance status term')).toBeInTheDocument();
+    expect(screen.getByText('status updated -')).toBeInTheDocument();
+    expect(screen.getByText('Instance status code')).toBeInTheDocument();
+    expect(screen.getByText('Instance status source')).toBeInTheDocument();
+    expect(screen.getByText('Mode of issuance')).toBeInTheDocument();
+    expect(screen.getByText('Statistical code type')).toBeInTheDocument();
+    expect(screen.getByText('Statistical code')).toBeInTheDocument();
+    expect(screen.getByText('Format category')).toBeInTheDocument();
+    expect(screen.getByText('Format term')).toBeInTheDocument();
+    expect(screen.getByText('Format code')).toBeInTheDocument();
+    expect(screen.getByText('Format source')).toBeInTheDocument();
+    expect(screen.getByText('Language')).toBeInTheDocument();
+    expect(screen.getByText('Publication frequency')).toBeInTheDocument();
+    expect(screen.getByText('Publication range')).toBeInTheDocument();
+    expect(screen.getByText('Instance notes')).toBeInTheDocument();
+    expect(screen.getByText('Staff only')).toBeInTheDocument();
+    expect(screen.getByText('Note')).toBeInTheDocument();
+    expect(screen.getByText('Electronic access')).toBeInTheDocument();
+    expect(screen.getByText('URL relationship')).toBeInTheDocument();
+    expect(screen.getByText('URI')).toBeInTheDocument();
+    expect(screen.getByText('Link text')).toBeInTheDocument();
+    expect(screen.getByText('Materials specified')).toBeInTheDocument();
+    expect(screen.getByText('URL public note')).toBeInTheDocument();
+    expect(screen.getByText('Classification identifier type')).toBeInTheDocument();
+    expect(screen.getByText('Instance relationship (analytics and bound-with)')).toBeInTheDocument();
+  });
+
+  it('should show a correct Warning message banner when staff suppressed', () => {
+    const staffSuppressedInstance = {
+      ...instance,
+      staffSuppress: true,
+    };
+    renderWithIntl(
+      <QueryClientProvider client={queryClient}>
+        <DataContext.Provider value={mockReferenceData}>
+          <MemoryRouter>
+            <InstanceDetails
+              instance={staffSuppressedInstance}
+              onClose={onClose}
+              tagsEnabled={tagsEnabled}
+              actionMenu={actionMenu}
+            />,
+          </MemoryRouter>
+        </DataContext.Provider>
+      </QueryClientProvider>,
+      translationsProperties
+    );
+
+    expect(screen.getByText('Warning: Instance is marked staff suppressed')).toBeInTheDocument();
+    expect(screen.getByText('Staff suppressed')).toBeInTheDocument();
+  });
+
+  it('should show a correct Warning message banner when discovery suppressed', () => {
+    const discoverySuppressedInstance = {
+      ...instance,
+      discoverySuppress: true,
+    };
+    renderWithIntl(
+      <QueryClientProvider client={queryClient}>
+        <DataContext.Provider value={mockReferenceData}>
+          <MemoryRouter>
+            <InstanceDetails
+              instance={discoverySuppressedInstance}
+              onClose={onClose}
+              tagsEnabled={tagsEnabled}
+              actionMenu={actionMenu}
+            />,
+          </MemoryRouter>
+        </DataContext.Provider>
+      </QueryClientProvider>,
+      translationsProperties
+    );
+
+    expect(screen.getByText('Warning: Instance is marked suppressed from discovery')).toBeInTheDocument();
+    expect(screen.getByText('Suppressed from discovery')).toBeInTheDocument();
+  });
+  it('should show a correct Warning message banner when both staff and discovery suppressed', () => {
+    const bothSuppressedInstance = {
+      ...instance,
+      staffSuppress: true,
+      discoverySuppress: true,
+    };
+    renderWithIntl(
+      <QueryClientProvider client={queryClient}>
+        <DataContext.Provider value={mockReferenceData}>
+          <MemoryRouter>
+            <InstanceDetails
+              instance={bothSuppressedInstance}
+              onClose={onClose}
+              tagsEnabled={tagsEnabled}
+              actionMenu={actionMenu}
+            />,
+          </MemoryRouter>
+        </DataContext.Provider>
+      </QueryClientProvider>,
+      translationsProperties
+    );
+
+    expect(screen.getByText('Warning: Instance is marked suppressed from discovery and staff suppressed')).toBeInTheDocument();
+  });
+
+  it('expands and collapses the accordion sections', () => {
+    renderWithIntl(
+      <QueryClientProvider client={queryClient}>
+        <DataContext.Provider value={mockReferenceData}>
+          <MemoryRouter>
+            <InstanceDetails
+              instance={instance}
+              onClose={onClose}
+              tagsEnabled={tagsEnabled}
+              actionMenu={actionMenu}
+            />,
+          </MemoryRouter>
+        </DataContext.Provider>
+      </QueryClientProvider>,
+      translationsProperties
+    );
+
+    const expandAllButtons = screen.getByText('Expand all');
+    const firstAccordionSection = screen.getByRole('button', { name: /Administrative data/i });
+    const secondAccordionSection = screen.getByRole('button', { name: /Instance notes/i });
+    const thirdAccordionSection = screen.getByRole('button', { name: /Electronic access/i });
+    const fourthAccordionSection = screen.getByRole('button', { name: /Classification/i });
+    expect(firstAccordionSection.getAttribute('aria-expanded')).toBe('false');
+    expect(secondAccordionSection.getAttribute('aria-expanded')).toBe('false');
+    expect(thirdAccordionSection.getAttribute('aria-expanded')).toBe('false');
+    expect(fourthAccordionSection.getAttribute('aria-expanded')).toBe('false');
+    userEvent.click(expandAllButtons);
+    expect(firstAccordionSection.getAttribute('aria-expanded')).toBe('true');
+    expect(secondAccordionSection.getAttribute('aria-expanded')).toBe('true');
+    expect(thirdAccordionSection.getAttribute('aria-expanded')).toBe('true');
+    expect(fourthAccordionSection.getAttribute('aria-expanded')).toBe('true');
+    const collapseAllButtons = screen.getByText('Collapse all');
+    userEvent.click(collapseAllButtons);
+    expect(firstAccordionSection.getAttribute('aria-expanded')).toBe('false');
+    expect(secondAccordionSection.getAttribute('aria-expanded')).toBe('false');
+    expect(thirdAccordionSection.getAttribute('aria-expanded')).toBe('false');
+    expect(fourthAccordionSection.getAttribute('aria-expanded')).toBe('false');
+  });
+
+  it('renders tags button if tagsEnabled is true', () => {
+    renderWithIntl(
+      <QueryClientProvider client={queryClient}>
+        <DataContext.Provider value={mockReferenceData}>
+          <MemoryRouter>
+            <InstanceDetails
+              instance={instance}
+              onClose={onClose}
+              tagsEnabled={tagsEnabled}
+              actionMenu={actionMenu}
+            />,
+          </MemoryRouter>
+        </DataContext.Provider>
+      </QueryClientProvider>,
+      translationsProperties
+    );
+    const button = screen.getAllByRole('button', { id: 'clickable-show-tags' });
+    userEvent.click(button[1]);
+    expect(button[1]).toBeEnabled();
+  });
+});

From 6365cec7e21a334bbe0d8fed3046c21431a9dfa9 Mon Sep 17 00:00:00 2001
From: ssandupatla <58558770+ssandupatla@users.noreply.github.com>
Date: Tue, 9 May 2023 21:53:36 +0530
Subject: [PATCH 13/68] UIIN-1684 create JEST/RTL for Check.js (#2080)

* UIIN-1684 create JEST/RTL for Check.js

* Update Check.test.js

Check.test.js Fille updated
---
 src/RemoteStorageService/Check.test.js | 57 ++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 src/RemoteStorageService/Check.test.js

diff --git a/src/RemoteStorageService/Check.test.js b/src/RemoteStorageService/Check.test.js
new file mode 100644
index 000000000..b6a832488
--- /dev/null
+++ b/src/RemoteStorageService/Check.test.js
@@ -0,0 +1,57 @@
+import { renderHook } from '@testing-library/react-hooks';
+import '../../test/jest/__mock__';
+import { useHoldings } from '../providers';
+import { useByLocation, useByHoldings } from './Check';
+
+jest.mock('../providers', () => ({
+  useHoldings: jest.fn(),
+}));
+
+describe('useByLocation', () => {
+  it('return true if fromLocationId is in remoteMap and toLocationId is not', () => {
+    const { result } = renderHook(() => useByLocation());
+    expect(result.current({ fromLocationId: 'holdings-id-1', toLocationId: 'holdings-id-3' })).toBe(true);
+  });
+  it('return false if fromLocationId is not in remoteMap', () => {
+    const { result } = renderHook(() => useByLocation());
+    expect(result.current({ fromLocationId: 'holdings-id-4', toLocationId: 'holdings-id-2' })).toBe(false);
+  });
+  it('return false if toLocationId is in remoteMap', () => {
+    const { result } = renderHook(() => useByLocation());
+    expect(result.current({ fromLocationId: 'holdings-id-1', toLocationId: 'holdings-id-2' })).toBe(false);
+  });
+});
+
+describe('useByHoldings', () => {
+  beforeEach(() => {
+    useHoldings.mockReturnValue({ holdingsById: {
+      'holdings-id-1': { permanentLocationId: 'holdings-id-1' },
+      'holdings-id-2': { permanentLocationId: 'holdings-id-2' },
+    } });
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  it('return true if from location is in remote storage and to location is not', () => {
+    const { result } = renderHook(() => useByHoldings());
+    expect(result.current({ fromHoldingsId: 'holdings-id-1', toHoldingsId: 'holdings-id-3' })).toBe(true);
+  });
+  it('return false if holdingsById is undefined', () => {
+    useHoldings.mockReturnValueOnce({ holdingsById: undefined });
+    const { result } = renderHook(() => useByHoldings());
+    expect(result.current({ fromHoldingsId: 'holdings-id-1', toHoldingsId: 'holdings-id-2' })).toBe(false);
+  });
+  it('return false if from location is not in remote storage', () => {
+    const { result } = renderHook(() => useByHoldings());
+    expect(result.current({ fromHoldingsId: 'holdings-id-3', toHoldingsId: 'holdings-id-2' })).toBe(false);
+  });
+  it('return false if to location is in remote storage', () => {
+    useHoldings.mockReturnValueOnce({ holdingsById: {
+      'holdings-id-1': { permanentLocationId: 'holdings-id-1' },
+      'holdings-id-2': { permanentLocationId: 'holdings-id-2' },
+    } });
+    const { result } = renderHook(() => useByHoldings());
+    expect(result.current({ fromHoldingsId: 'holdings-id-1', toHoldingsId: 'holdings-id-2' })).toBe(false);
+  });
+});
+

From d83437d64b1bb52f9360b542b3e0533ab6b866e3 Mon Sep 17 00:00:00 2001
From: VSnehalatha <53073086+VSnehalatha@users.noreply.github.com>
Date: Tue, 9 May 2023 22:11:37 +0530
Subject: [PATCH 14/68]  UIIN-1764 Jest/RTL test for ItemStatus.js (#2112)

---
 src/views/ItemStatus/ItemStatus.test.js | 67 +++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 src/views/ItemStatus/ItemStatus.test.js

diff --git a/src/views/ItemStatus/ItemStatus.test.js b/src/views/ItemStatus/ItemStatus.test.js
new file mode 100644
index 000000000..6a1b048a7
--- /dev/null
+++ b/src/views/ItemStatus/ItemStatus.test.js
@@ -0,0 +1,67 @@
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import { screen } from '@testing-library/react';
+import { act } from '@testing-library/react-hooks';
+
+import '../../../test/jest/__mock__';
+
+import {
+  renderWithIntl,
+  translationsProperties,
+} from '../../../test/jest/helpers';
+
+import {
+  itemStatuses,
+} from '../../constants';
+
+import ItemStatus from './ItemStatus';
+
+jest.mock('../../constants', () => ({
+  ...jest.requireActual('../../constants'),
+  itemStatusesMap: () => <div>ViewMetaData 1</div>,
+}));
+
+const mockMutator = {
+  item: {
+    GET: jest.fn().mockResolvedValueOnce([{ id: 123, name: 'Test' }]),
+  },
+  servicePoint: {
+    GET: jest.fn().mockResolvedValueOnce([{ id: 223, name: 'Test2' }]),
+  },
+};
+
+const defaultProps = {
+  itemId: 'item-123',
+  status: { name: 'Available', date: '2022-01-01T00:00:00.000Z' },
+  openLoan: {},
+  mutator: mockMutator,
+};
+
+const statusData = { name: 'Checked out', date: '2023-03-01T00:00:00.000Z' };
+
+const ItemStatusSetup = ({ status }) => (
+  <MemoryRouter>
+    <ItemStatus {...defaultProps} status={status} />
+  </MemoryRouter>
+);
+
+const renderItemStatusSetup = (status = statusData) => renderWithIntl(
+  <ItemStatusSetup status={status} />,
+  translationsProperties
+);
+
+describe('ItemStatus', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  it('render ItemStatus', () => {
+    renderItemStatusSetup();
+    expect(screen.getByText(/Item status/i)).toBeInTheDocument();
+    expect(screen.getByText(/Checked out/i)).toBeInTheDocument();
+    expect(screen.getByText('status updated 3/1/2023, 12:00 AM')).toBeInTheDocument();
+    act(() => {
+      renderItemStatusSetup(defaultProps, itemStatuses);
+      expect(screen.getByText(/Loading/i)).toBeInTheDocument();
+    });
+  });
+});

From 0f02281f082fcb836f0a0b7624ef84decb5b14a4 Mon Sep 17 00:00:00 2001
From: ssandupatla <58558770+ssandupatla@users.noreply.github.com>
Date: Tue, 9 May 2023 22:30:23 +0530
Subject: [PATCH 15/68] UIIN-1779 create Jest/RTL test for ViewInstance.js
 (#2144)

---
 src/ViewInstance.test.js                     | 317 ++++++++++++++++---
 test/jest/__mock__/stripesComponents.mock.js |  16 +-
 2 files changed, 288 insertions(+), 45 deletions(-)

diff --git a/src/ViewInstance.test.js b/src/ViewInstance.test.js
index 27b89af18..0d1de999b 100644
--- a/src/ViewInstance.test.js
+++ b/src/ViewInstance.test.js
@@ -1,64 +1,161 @@
-import { screen } from '@testing-library/react';
-import { QueryClient, QueryClientProvider } from 'react-query';
-import { MemoryRouter } from 'react-router-dom';
-
 import '../test/jest/__mock__';
-
+import React from 'react';
+import { screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import { Router } from 'react-router-dom';
+import { createMemoryHistory } from 'history';
 import { instances } from '../test/fixtures/instances';
-import { renderWithIntl, translationsProperties } from '../test/jest/helpers';
 import { DataContext } from './contexts';
 import StripesConnectedInstance from './ConnectedInstance/StripesConnectedInstance';
+import { renderWithIntl, translationsProperties } from '../test/jest/helpers';
 import ViewInstance from './ViewInstance';
 
+const spyOncollapseAllSections = jest.spyOn(require('@folio/stripes/components'), 'collapseAllSections');
+
+const spyOnexpandAllSections = jest.spyOn(require('@folio/stripes/components'), 'expandAllSections');
+
+jest.mock('@folio/stripes-core', () => ({
+  ...jest.requireActual('@folio/stripes-core'),
+  TitleManager: ({ children }) => <>{children}</>
+}));
+
+jest.mock('./components/ImportRecordModal/ImportRecordModal', () => (props) => {
+  const { isOpen, handleSubmit, handleCancel } = props;
+  if (isOpen) {
+    const args = {
+      externalIdentifierType: 'typeTest',
+      externalIdentifier: 'externalIdentifier',
+      selectedJobProfileId: 'profileId'
+    };
+    const container = 
+    <div>
+      <div>ImportRecordModal</div>
+      <button type="button" onClick={() => handleSubmit(args)}>handleSubmit</button>
+      <button type="button" onClick={() => handleCancel()}>handleCancel</button>
+    </div>;
+    return container;
+  }
+  return null;
+});
+
+jest.mock('./components/InstancePlugin/InstancePlugin', () => ({ onSelect, onClose }) => {
+  return (
+    <div>
+      <div>InstancePlugin</div>
+      <button type="button" onClick={() => onSelect()}>onSelect</button>
+      <button type="button" onClick={() => onClose()}>onClose</button>
+    </div>
+  );
+});
+
 jest.mock('./RemoteStorageService/Check', () => ({
   ...jest.requireActual('./RemoteStorageService/Check'),
   useByLocation: jest.fn(() => false),
   useByHoldings: jest.fn(() => false),
 }));
 
+const location = {
+  pathname: '/testPathName',
+  search: '?filters=test1&query=test2&sort=test3&qindex=test',
+  hash: ''
+};
+const mockPush = jest.fn();
+const mockReplace = jest.fn();
+const history = createMemoryHistory();
+history.location = location;
+history.push = mockPush;
+history.replace = mockReplace;
 const instance = {
   ...instances[0],
+  subjects:['Information society--Political aspects'],
   parentInstances: [],
   childInstances: [],
 };
 
 jest
   .spyOn(StripesConnectedInstance.prototype, 'instance')
-  .mockImplementation(() => instance);
+  .mockImplementation(() => instance)
+  .mockImplementationOnce(() => {});
 
-const defaultProps = {
+const goToMock = jest.fn();
+const mockReset = jest.fn();
+const updateMock = jest.fn();
+const mockonClose = jest.fn();
+const mockData = jest.fn().mockResolvedValue(true);
+const defaultProp = {
   selectedInstance: instance,
-  paneWidth: '44%',
-  openedFromBrowse: false,
-  onCopy: jest.fn(),
-  onClose: jest.fn(),
+  goTo: goToMock,
+  match: {
+    path: '/inventory/view',
+    params: {
+      id: 'testId'
+    },
+  },
+  intl: {
+    formatMessage: jest.fn(),
+  },
   mutator: {
     allInstanceItems: {
-      GET: jest.fn(() => Promise.resolve([])),
-      reset: jest.fn(),
-    },
-    configs: {
-      GET: jest.fn(() => Promise.resolve([])),
-      reset: jest.fn(),
+      reset: mockReset
     },
     holdings: {
-      POST: jest.fn(() => Promise.resolve({})),
-      reset: jest.fn(),
-    },
-    instanceRequests: {
-      GET: jest.fn(() => Promise.resolve({})),
-      reset: jest.fn(),
+      POST: jest.fn(),
     },
     marcRecord: {
-      GET: jest.fn(() => Promise.resolve([])),
-      reset: jest.fn(),
+      GET: mockData,
+    },
+    query: {
+      update: updateMock,
     },
     movableItems: {
       GET: jest.fn(() => Promise.resolve([])),
       reset: jest.fn(),
     },
-    query: {},
+    instanceRequests: {
+      GET: jest.fn(() => Promise.resolve([])),
+      reset: jest.fn()
+    }
+  },
+  onClose: mockonClose,
+  onCopy: jest.fn(),
+  openedFromBrowse: false,
+  paneWidth: '55%',
+  resources: {
+    allInstanceItems: {
+      reset: mockReset
+    },
+    allInstanceHoldings: {},
+    locations: {},
+    configs: {
+      hasLoaded: true,
+      records: [
+        {
+          value: 'testParse'
+        },
+      ]
+    },
+    instanceRequests: {
+      other: {
+        totalRecords: 10,
+      },
+      records: [
+        {
+          id: 'testIdRecord1'
+        }
+      ],
+    },
   },
+  stripes: {
+    connect: jest.fn(),
+    hasPerm: jest.fn().mockReturnValue(true),
+    locale: 'Testlocale',
+    logger: {
+      log: jest.fn()
+    },
+  },
+  tagsEnabled: true,
+  updateLocation: jest.fn(),
 };
 
 const referenceData = {
@@ -80,40 +177,174 @@ const queryClient = new QueryClient();
 
 const renderViewInstance = (props = {}) => renderWithIntl(
   <QueryClientProvider client={queryClient}>
-    <MemoryRouter
+    <Router
+      history={history}
       initialEntries={[{
         pathname: `/inventory/view/${instances[0].id}`,
       }]}
     >
       <DataContext.Provider value={referenceData}>
         <ViewInstance
-          {...defaultProps}
+          {...defaultProp}
           {...props}
         />
       </DataContext.Provider>
-    </MemoryRouter>
+    </Router>
   </QueryClientProvider>,
   translationsProperties
 );
 
 describe('ViewInstance', () => {
   beforeEach(() => {
-    // defaultProps.history.push.mockClear();
+    jest.clearAllMocks();
   });
-
-  describe('Action menu', () => {
-    it('should display action menu items', async () => {
+  it('should display action menu items', () => {
+    renderViewInstance();
+    expect(screen.getByText('Move items within an instance')).toBeInTheDocument();
+    expect(screen.getByText('Move holdings/items to another instance')).toBeInTheDocument();
+  });
+  it('should NOT display \'move\' action menu items when instance was opened from Browse page', () => {
+    renderViewInstance({ openedFromBrowse: true });
+    expect(screen.queryByText('Move items within an instance')).not.toBeInTheDocument();
+    expect(screen.queryByText('Move holdings/items to another instance')).not.toBeInTheDocument();
+  });
+  describe('Action Menu', () => {
+    it('"onClickEditInstance" should be called when the user clicks the "Edit instance" button', () => {
       renderViewInstance();
-
-      expect(screen.getByText('Move items within an instance')).toBeInTheDocument();
-      expect(screen.getByText('Move holdings/items to another instance')).toBeInTheDocument();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'Edit instance' }));
+      expect(mockPush).toBeCalled();
     });
-
-    it('should NOT display \'move\' action menu items when instance was opened from Browse page', async () => {
-      renderViewInstance({ openedFromBrowse: true });
-
-      expect(screen.queryByText('Move items within an instance')).not.toBeInTheDocument();
-      expect(screen.queryByText('Move holdings/items to another instance')).not.toBeInTheDocument();
+    it('"onClickViewRequests" should be called when the user clicks the "View requests" button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'View requests' }));
+      expect(mockPush).toBeCalled();
+    });
+    it('"onCopy" function should be called when the user clicks the "Duplicate instance" button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'Duplicate instance' }));
+      expect(defaultProp.onCopy).toBeCalled();
+    });
+    it('"handleViewSource" should be called when the user clicks the "View source" button', async () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      const veiwSourceButton = screen.getByRole('button', { name: 'View source' });
+      await waitFor(() => {
+        expect(veiwSourceButton).not.toHaveAttribute('disabled');
+      });
+      userEvent.click(veiwSourceButton);
+      expect(goToMock).toBeCalled();
+    });
+    it('"createHoldingsMarc" should be called when the user clicks the "Add MARC holdings record" button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'Add MARC holdings record' }));
+      expect(mockPush).toBeCalled();
+    });
+    it('"Move items within an instance" button to be clicked', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'Move items within an instance' }));
+      expect(renderViewInstance()).toBeTruthy();
+    });
+    it('"InstancePlugin" should render when user clicks "Move holdings/items to another instance" button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'Move holdings/items to another instance' }));
+      expect(screen.getByRole('button', { name: '+' }));
+    });
+    it('"ImportRecordModal" component should render when user clicks "Overlay source bibliographic record" button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'Overlay source bibliographic record' }));
+      expect(screen.getByText('ImportRecordModal')).toBeInTheDocument();
+    });
+    it('"handleImportRecordModalSubmit" should be called when the user clicks the "handleSubmit" button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'Overlay source bibliographic record' }));
+      userEvent.click(screen.getByRole('button', { name: 'handleSubmit' }));
+      expect(updateMock).toBeCalled();
+    });
+    it('"ImportRecordModal" component should be closed when the user clicks "handleClose" button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'Overlay source bibliographic record' }));
+      userEvent.click(screen.getByRole('button', { name: 'handleCancel' }));
+      expect(screen.queryByText('ImportRecordModal')).not.toBeInTheDocument();
+    });
+    it('NewOrderModal should render when the user clicks the new order button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'New order' }));
+      expect(screen.queryByText(/Create order/i)).toBeInTheDocument();
+    });
+    it('push function should be called when the user clicks the "Edit MARC bibliographic record" button', async () => {
+      renderViewInstance();
+      const expectedValue = {
+        pathname: `/inventory/quick-marc/edit-bib/${defaultProp.selectedInstance.id}`,
+        search: 'filters=test1&query=test2&sort=test3&qindex=test'
+      };
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      const button = screen.getByRole('button', { name: 'Edit MARC bibliographic record' });
+      await waitFor(() => {
+        expect(button).not.toHaveAttribute('disabled');
+      });
+      userEvent.click(button);
+      expect(mockPush).toBeCalledWith(expectedValue);
+    });
+    it('push function should be called when the user clicks the "Derive new MARC bibliographic record" button', async () => {
+      renderViewInstance();
+      const expectedValue = {
+        pathname: `/inventory/quick-marc/duplicate-bib/${defaultProp.selectedInstance.id}`,
+        search: 'filters=test1&query=test2&sort=test3&qindex=test'
+      };
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      const button = screen.getByRole('button', { name: 'Derive new MARC bibliographic record' });
+      await waitFor(() => {
+        expect(button).not.toHaveAttribute('disabled');
+      });
+      userEvent.click(button);
+      expect(mockPush).toBeCalledWith(expectedValue);
+    });
+    it('NewOrderModal should be closed when the user clicks the close button', async () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'New order' }));
+	  expect(screen.queryByText(/Create order/i)).toBeInTheDocument();
+      userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
+      await waitFor(() => {
+        expect(screen.queryByText(/Create order/i)).not.toBeInTheDocument();
+      });
+    });
+  });
+  describe('Tests for shortcut of HasCommand', () => {
+    it('updateLocation function to be triggered on clicking new button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'new' }));
+      expect(defaultProp.updateLocation).toBeCalled();
+    });
+    it('onClickEditInstance function to be triggered on clicking edit button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'edit' }));
+      expect(mockPush).toBeCalled();
+    });
+    it('onCopy function to be triggered on clicking duplicateRecord button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'duplicateRecord' }));
+      expect(defaultProp.onCopy).toBeCalled();
+    });
+    it('collapseAllSections triggered on clicking collapseAllSections button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'collapseAllSections' }));
+      expect(spyOncollapseAllSections).toBeCalled();
+    });
+    it('expandAllSections triggered on clicking expandAllSections button', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'expandAllSections' }));
+      expect(spyOnexpandAllSections).toBeCalled();
     });
   });
 });
diff --git a/test/jest/__mock__/stripesComponents.mock.js b/test/jest/__mock__/stripesComponents.mock.js
index 6af025fbf..b934b4beb 100644
--- a/test/jest/__mock__/stripesComponents.mock.js
+++ b/test/jest/__mock__/stripesComponents.mock.js
@@ -2,7 +2,8 @@ import React from 'react';
 
 jest.mock('@folio/stripes/components', () => ({
   ...jest.requireActual('@folio/stripes/components'),
-  ConfirmationModal: jest.fn(({ heading, message, onConfirm, onCancel }) => (
+  collapseAllSections: jest.fn(),
+  ConfirmationModal: jest.fn(({ heading, message, onConfirm, onCancel, onRemove }) => (
     <div>
       <span>ConfirmationModal</span>
       {heading}
@@ -10,9 +11,11 @@ jest.mock('@folio/stripes/components', () => ({
       <div>
         <button type="button" onClick={onConfirm}>confirm</button>
         <button type="button" onClick={onCancel}>cancel</button>
+        <button type="button" onClick={onRemove}>remove</button>
       </div>
     </div>
   )),
+  expandAllSections: jest.fn(),
   formattedLanguageName: jest.fn((languageCode) => {
     switch (languageCode) {
       case 'en':
@@ -25,8 +28,17 @@ jest.mock('@folio/stripes/components', () => ({
         return '';
     }
   }),
+  HasCommand: (props) => {
+    const { commands, children } = props;
+    const component =
+      <>
+        {commands.map((shortcut, index) => (
+          <button key={index} type="button" onClick={() => shortcut.handler()}>{shortcut.name}</button>
+        ))}{children};
+      </>;
+    return component;
+  },
   Loading: () => <div>Loading</div>,
   LoadingPane: () => <div>LoadingPane</div>,
   LoadingView: () => <div>LoadingView</div>,
-  LoadingPane: () => <div>LoadingPane</div>,
 }), { virtual: true });

From 88d87f07bb5b5f5ba8e00f516281720d7d86cc4f Mon Sep 17 00:00:00 2001
From: ssandupatla <58558770+ssandupatla@users.noreply.github.com>
Date: Wed, 10 May 2023 11:27:50 +0530
Subject: [PATCH 16/68]  UIIN-1747 JEST/RTL test cases for utils.js (#2110)

---
 src/Instance/ViewRequests/utils.test.js | 163 ++++++++++++++++++++++++
 1 file changed, 163 insertions(+)
 create mode 100644 src/Instance/ViewRequests/utils.test.js

diff --git a/src/Instance/ViewRequests/utils.test.js b/src/Instance/ViewRequests/utils.test.js
new file mode 100644
index 000000000..9c0897443
--- /dev/null
+++ b/src/Instance/ViewRequests/utils.test.js
@@ -0,0 +1,163 @@
+import {
+  getRecordsInBatch,
+  buildQueryByHoldingsIds,
+  buildQueryByItemsIds,
+  batchFetch,
+  batchFetchItems,
+  batchFetchRequests,
+} from './utils';
+
+import '../../../test/jest/__mock__';
+
+describe('getRecordsInBatch', () => {
+  const mockMutator = {
+    GET: jest.fn(() => Promise.resolve()),
+    reset: jest.fn(),
+  };
+  it('should return an empty array if no records are found', async () => {
+    mockMutator.GET.mockReturnValueOnce(Promise.resolve({ totalRecords: 0 }));
+    const result = await getRecordsInBatch(mockMutator, {});
+    expect(result).toEqual([]);
+  });
+  it('should return all records in one batch if there are fewer records than the limit', async () => {
+    const records = [{ id: '1' }, { id: '2' }, { id: '3' }];
+    mockMutator.GET.mockReturnValueOnce(Promise.resolve({ totalRecords: records.length }));
+    mockMutator.GET.mockImplementationOnce(({ params }) => {
+      const offset = params.offset || 0;
+      const recordsChunk = records.slice(offset, offset + params.limit);
+      return Promise.resolve(recordsChunk);
+    });
+    const result = await getRecordsInBatch(mockMutator, {});
+    expect(result).toEqual(records);
+  });
+  it('should return all records in multiple batches if there are more records than the limit', async () => {
+    const records = [{ id: '1' }, { id: '2' }, { id: '3' }, { id: '4' }, { id: '5' }, { id: '6' }, { id: '7' }, { id: '8' }];
+    mockMutator.GET.mockReturnValueOnce(Promise.resolve({ totalRecords: records.length }));
+    mockMutator.GET.mockImplementation(({ params }) => {
+      const offset = params.offset || 0;
+      const recordsChunk = records.slice(offset, offset + params.limit);
+      return Promise.resolve(recordsChunk);
+    });
+    const result = await getRecordsInBatch(mockMutator, {});
+    expect(result).toEqual(records);
+  });
+});
+
+describe('buildQueryByHoldingsIds', () => {
+  it('should return empty string when given an empty array', () => {
+    const query = buildQueryByHoldingsIds([]);
+    expect(query).toBe('');
+  });
+  it('should return a query string when given an array of holdings', () => {
+    const holdings = [
+      { id: 1 },
+      { id: 2 },
+      { id: 3 },
+    ];
+    const query = buildQueryByHoldingsIds(holdings);
+    expect(query).toBe('holdingsRecordId==1 or holdingsRecordId==2 or holdingsRecordId==3');
+  });
+  it('should handle a single holding in the array', () => {
+    const holdings = [
+      { id: 1 },
+    ];
+    const query = buildQueryByHoldingsIds(holdings);
+    expect(query).toBe('holdingsRecordId==1');
+  });
+});
+
+describe('buildQueryByItemsIds', () => {
+  it('returns empty string for empty input', () => {
+    const result = buildQueryByItemsIds([]);
+    expect(result).toEqual('');
+  });
+  it('returns correct query for single item', () => {
+    const result = buildQueryByItemsIds([{ id: 123 }]);
+    expect(result).toEqual('itemId==123');
+  });
+  it('returns correct query for multiple items', () => {
+    const result = buildQueryByItemsIds([{ id: 123 }, { id: 456 }, { id: 789 }]);
+    expect(result).toEqual('itemId==123 or itemId==456 or itemId==789');
+  });
+  it('returns empty string for input without ids', () => {
+    const result = buildQueryByItemsIds([{ foo: 'bar' }]);
+    expect(result).toEqual('itemId==undefined');
+  });
+});
+
+describe('batchFetch', () => {
+  const mutator = {
+    reset: jest.fn(),
+    GET: jest.fn(),
+  };
+  beforeEach(() => {
+    mutator.reset.mockClear();
+    mutator.GET.mockClear();
+  });
+  it('should return empty array when no records are provided', async () => {
+    const records = [];
+    const buildQuery = jest.fn();
+    const response = await batchFetch(mutator, records, buildQuery);
+    expect(response).toEqual([]);
+    expect(mutator.reset).toHaveBeenCalledTimes(1);
+    expect(mutator.GET).toHaveBeenCalledTimes(0);
+  });
+  it('should return empty array when query is empty', async () => {
+    const records = [{ id: 1 }];
+    const buildQuery = jest.fn(() => '');
+    const response = await batchFetch(mutator, records, buildQuery);
+    expect(response).toEqual([]);
+    expect(mutator.reset).toHaveBeenCalledTimes(1);
+    expect(mutator.GET).toHaveBeenCalledTimes(0);
+  });
+  it('should return records when mutator.GET returns data', async () => {
+    const records = [{ id: 1 }, { id: 2 }];
+    const buildQuery = buildQueryByHoldingsIds;
+    const data = [];
+    mutator.GET.mockResolvedValueOnce({ data });
+    const response = await batchFetch(mutator, records, buildQuery);
+    expect(response).toEqual(data);
+    expect(mutator.reset).toHaveBeenCalledTimes(1);
+    expect(mutator.GET).toHaveBeenCalledTimes(1);
+    expect(mutator.GET).toHaveBeenCalledWith({
+      params: {
+        limit: 0,
+        query: '(holdingsRecordId==1 or holdingsRecordId==2)',
+      },
+      records: undefined,
+    });
+  });
+});
+
+describe('batchFetchItems', () => {
+  const mockMutator = {
+    GET: jest.fn(() => Promise.resolve()),
+    reset: jest.fn(),
+  };
+  it('returns an empty array if holdings are empty', async () => {
+    const result = await batchFetchItems(mockMutator, []);
+    expect(result).toEqual([]);
+  });
+});
+
+describe('batchFetchRequests', () => {
+  let mutator;
+  beforeEach(() => {
+    mutator = {
+      GET: jest.fn(),
+      reset: jest.fn(),
+    };
+  });
+  it('should return empty array if items array is empty', async () => {
+    const result = await batchFetchRequests(mutator, []);
+    expect(result).toEqual([]);
+  });
+  it('should flatten the response arrays and return the concatenated records', async () => {
+    const records = [{ id: 1 }, { id: 2 }];
+    mutator.GET.mockReturnValueOnce(Promise.resolve({ totalRecords: 2 }));
+    mutator.GET.mockReturnValueOnce(Promise.resolve(records));
+    const items = [{ id: 1 }, { id: 2 }];
+    const result = await batchFetchRequests(mutator, items);
+    expect(result).toEqual(records);
+  });
+});

From 66e39a7ad729c07102433ba01e0d735f298f35ad Mon Sep 17 00:00:00 2001
From: cchitneedi <100114810+cchitneedi@users.noreply.github.com>
Date: Wed, 10 May 2023 11:47:58 +0530
Subject: [PATCH 17/68] UIIN-1700 create Jest/RTL test for
 ViewHoldingsRecord.js (#2146)

---
 src/ViewHoldingsRecord.test.js | 104 ++++++++++++++++++++++++---------
 1 file changed, 76 insertions(+), 28 deletions(-)

diff --git a/src/ViewHoldingsRecord.test.js b/src/ViewHoldingsRecord.test.js
index b17c450ad..9b8594a8f 100644
--- a/src/ViewHoldingsRecord.test.js
+++ b/src/ViewHoldingsRecord.test.js
@@ -1,25 +1,27 @@
 import '../test/jest/__mock__';
-
+import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { MemoryRouter } from 'react-router-dom';
-import user from '@testing-library/user-event';
+import userEvent from '@testing-library/user-event';
 import { screen, waitFor } from '@testing-library/react';
 
 import { renderWithIntl, translationsProperties } from '../test/jest/helpers';
 import ViewHoldingsRecord from './ViewHoldingsRecord';
 
+
 jest.mock('./withLocation', () => jest.fn(c => c));
-jest.mock('@folio/stripes/components', () => ({
-  ...jest.requireActual('@folio/stripes/components'),
-  LoadingView: () => 'LoadingView',
-}));
+
+const spyOncollapseAllSections = jest.spyOn(require('@folio/stripes/components'), 'collapseAllSections');
+const spyOnexpandAllSections = jest.spyOn(require('@folio/stripes/components'), 'expandAllSections');
+
+const mockData = jest.fn().mockResolvedValue({ id: 'testId' });
 
 const defaultProps = {
   id: 'id',
   goTo: jest.fn(),
   holdingsrecordid: 'holdingId',
   referenceTables: {
-    holdingsSources: [{ id: 'sourceId' }],
+    holdingsSources: [{ id: 'sourceId', name: 'MARC' }],
     locationsById: {
       inactiveLocation: { name: 'Location 1', isActive: false },
     },
@@ -37,7 +39,7 @@ const defaultProps = {
   },
   mutator: {
     instances1: {
-      GET: jest.fn(() => Promise.resolve({ id: 'instanceId' })),
+      GET: jest.fn(() => Promise.resolve({ id: 'instanceId', source: 'testSource' })),
       reset: jest.fn(() => Promise.resolve()),
     },
     holdingsRecords: {
@@ -48,7 +50,7 @@ const defaultProps = {
       reset: jest.fn(() => Promise.resolve()),
     },
     marcRecord: {
-      GET: jest.fn(() => Promise.resolve({ id: 'marcRecordId' })),
+      GET: mockData,
       DELETE: jest.fn(() => Promise.resolve()),
     },
     marcRecordId: {
@@ -63,6 +65,7 @@ const defaultProps = {
   },
   location: {
     search: '/',
+    pathname: 'pathname'
   },
 };
 
@@ -82,53 +85,98 @@ const renderViewHoldingsRecord = (props = {}) => renderWithIntl(
 
 describe('ViewHoldingsRecord actions', () => {
   beforeEach(() => {
-    defaultProps.history.push.mockClear();
+    jest.clearAllMocks();
   });
 
   it('should render Loading when awaiting resource', () => {
     const { getByText } = renderViewHoldingsRecord({ referenceTables: {} });
-
     expect(getByText('LoadingView')).toBeDefined();
   });
 
   it('should close view holding page', async () => {
     renderViewHoldingsRecord();
-
-    await waitFor(() => {
-      const closeBtn = screen.getAllByRole('button')[0];
-
-      user.click(closeBtn);
-
-      expect(defaultProps.history.push).toHaveBeenCalled();
-    });
+    userEvent.click(await screen.findByRole('button', { name: 'confirm' }));
+    expect(defaultProps.history.push).toBeCalled();
   });
 
   it('should translate to edit holding form page', async () => {
     renderViewHoldingsRecord();
-
     const editHoldingBtn = await screen.findByTestId('edit-holding-btn');
-
-    user.click(editHoldingBtn);
-
+    userEvent.click(editHoldingBtn);
     expect(defaultProps.history.push).toHaveBeenCalled();
   });
 
   it('should translate to duplicate holding form page', async () => {
     renderViewHoldingsRecord();
-
     const duplicatHoldingBtn = await screen.findByTestId('duplicate-holding-btn');
-
-    user.click(duplicatHoldingBtn);
-
+    userEvent.click(duplicatHoldingBtn);
     expect(defaultProps.history.push).toHaveBeenCalled();
   });
 
   it('should display "inactive" by an inactive temporary location', async () => {
     renderViewHoldingsRecord();
-
     await waitFor(() => {
       const tempLocation = document.querySelector('*[data-test-id=temporary-location]').innerHTML;
       expect(tempLocation).toContain('Inactive');
     });
   });
+  it('handleViewSource should be called when View Source button', async () => {
+    renderViewHoldingsRecord();
+    userEvent.click(await screen.findByText('Actions'));
+    const viewSourceBtn = screen.getByRole('button', { name: 'View source' });
+    await waitFor(() => {
+      expect(viewSourceBtn).not.toHaveAttribute('disabled');
+    });
+    userEvent.click(viewSourceBtn);
+    expect(defaultProps.goTo).toBeCalled();
+  });
+  it('"handleEditInQuickMarc" function should be called when "Edit in quickMARC" button', async () => {
+    renderViewHoldingsRecord();
+    userEvent.click(await screen.findByText('Actions'));
+    const quickMarcbtn = screen.getByRole('button', { name: 'Edit in quickMARC' });
+    await waitFor(() => {
+      expect(quickMarcbtn).not.toHaveAttribute('disabled');
+    });
+    userEvent.click(quickMarcbtn);
+    expect(defaultProps.goTo).toBeCalled();
+  });
+  describe('Tests for shortcut of HasCommand', () => {
+    it('"onCopyHolding" function to be triggered on clicking "duplicateRecord" button', async () => {
+      const data = {
+        pathname: `/inventory/copy/${defaultProps.id}/${defaultProps.holdingsrecordid}`,
+        search: defaultProps.location.search,
+        state: { backPathname: defaultProps.location.pathname },
+      };
+      renderViewHoldingsRecord();
+      userEvent.click(await screen.findByRole('button', { name: 'duplicateRecord' }));
+      expect(defaultProps.history.push).toBeCalledWith(data);
+    });
+    it('"onEditHolding" function to be triggered on clicking edit button', async () => {
+      const data = {
+        pathname: `/inventory/edit/${defaultProps.id}/${defaultProps.holdingsrecordid}`,
+        search: defaultProps.location.search,
+        state: { backPathname: defaultProps.location.pathname },
+      };
+      renderViewHoldingsRecord();
+      userEvent.click(await screen.findByRole('button', { name: 'edit' }));
+      expect(defaultProps.history.push).toBeCalledWith(data);
+    });
+    it('"goTo" function to be triggered on clicking duplicateRecord button', async () => {
+      renderViewHoldingsRecord();
+      userEvent.click(await screen.findByRole('button', { name: 'search' }));
+      expect(defaultProps.goTo).toBeCalledWith('/inventory');
+    });
+    it('collapseAllSections triggered on clicking collapseAllSections button', async () => {
+      renderViewHoldingsRecord();
+      userEvent.click(await screen.findByRole('button', { name: 'collapseAllSections' }));
+      expect(spyOncollapseAllSections).toBeCalled();
+    });
+    it('expandAllSections triggered on clicking expandAllSections button', async () => {
+      renderViewHoldingsRecord();
+      userEvent.click(await screen.findByRole('button', { name: 'expandAllSections' }));
+      await waitFor(() => {
+        expect(spyOnexpandAllSections).toBeCalled();
+      });
+    });
+  });
 });

From 54edcda7d6ec3c8644f4a30adaf7236011688dd0 Mon Sep 17 00:00:00 2001
From: Alisher Musurmonov <alisher_musurmonov1@epam.com>
Date: Thu, 11 May 2023 00:59:27 +0500
Subject: [PATCH 18/68] fix: display chronology column in receiving history
 (#2151)

---
 CHANGELOG.md                                                 | 1 +
 .../HoldingReceivingHistory/HoldingReceivingHistory.js       | 5 ++++-
 .../HoldingReceivingHistory/HoldingReceivingHistory.test.js  | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbdc63cf8..d932f035e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 * The 'Missing' and 'Withdrawn' options in the actions menu are absent after clicking on the 'Actions' button for item status "In process". Fixes UIIN-2338.
 * Item Create/Edit screens: Replace custom RepeatableField with component from stripes. Refs UIIN-2397.
 * Item Create/Edit screens: Repeatable field trashcan is not aligned with the data row. Fixes UIIN-2374.
+* Chronology not displayed in receiving history. Fixes UIIN-2411.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.js b/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.js
index fde86634b..9e889a310 100644
--- a/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.js
+++ b/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.js
@@ -20,15 +20,17 @@ const columnMapping = {
   'caption': <FormattedMessage id="ui-inventory.caption" />,
   'copyNumber': <FormattedMessage id="ui-inventory.copyNumber" />,
   'enumeration': <FormattedMessage id="ui-inventory.enumeration" />,
+  'chronology': <FormattedMessage id="ui-inventory.chronology" />,
   'receivedDate': <FormattedMessage id="ui-inventory.receivingHistory.receivedDate" />,
   'comment': <FormattedMessage id="ui-inventory.receivingHistory.comment" />,
   'source': <FormattedMessage id="ui-inventory.receivingHistory.source" />,
 };
-const visibleColumns = ['caption', 'copyNumber', 'enumeration', 'receivedDate', 'comment', 'source'];
+const visibleColumns = ['caption', 'copyNumber', 'enumeration', 'chronology', 'receivedDate', 'comment', 'source'];
 const columnFormatter = {
   'caption': i => i.caption || <NoValue />,
   'copyNumber': i => i.copyNumber || <NoValue />,
   'enumeration': i => i.enumeration || <NoValue />,
+  'chronology': i => i.chronology || <NoValue />,
   'receivedDate': i => (i.receivedDate ? <FormattedDate value={i.receivedDate} /> : <NoValue />),
   'comment': i => i.comment || <NoValue />,
   'source': i => <FormattedMessage id={`ui-inventory.receivingHistory.source.${i.source || 'user'}`} />,
@@ -36,6 +38,7 @@ const columnFormatter = {
 const sorters = {
   'caption': ({ caption }) => caption,
   'copyNumber': ({ copyNumber }) => copyNumber,
+  'chronology': ({ chronology }) => chronology,
   'enumeration': ({ enumeration }) => enumeration,
   'receivedDate': ({ receivedDate }) => receivedDate,
   'source': ({ source }) => source,
diff --git a/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.test.js b/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.test.js
index bdbf0b755..f66e4aeff 100644
--- a/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.test.js
+++ b/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.test.js
@@ -28,6 +28,7 @@ describe('HoldingReceivingHistory', () => {
     renderHoldingReceivingHistory({ id: 'holdingUid' });
 
     expect(screen.getByText(receivingHistory[0].enumeration)).toBeInTheDocument();
+    expect(screen.getByText(receivingHistory[0].chronology)).toBeInTheDocument();
   });
 
   it('should apply sort by a column', () => {

From 91ae8f979ab716b3309a0cd0b7ed9f8d844ed317 Mon Sep 17 00:00:00 2001
From: Dmitriy-Litvinenko <Dmitriy_Litvinenko@epam.com>
Date: Wed, 10 May 2023 13:29:47 +0300
Subject: [PATCH 19/68] UIIN-2412: Also support circulation 14.0

---
 CHANGELOG.md                              | 1 +
 package.json                              | 2 +-
 test/bigtest/network/factories/request.js | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d932f035e..da97419c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * Item Create/Edit screens: Replace custom RepeatableField with component from stripes. Refs UIIN-2397.
 * Item Create/Edit screens: Repeatable field trashcan is not aligned with the data row. Fixes UIIN-2374.
 * Chronology not displayed in receiving history. Fixes UIIN-2411.
+* Also support `circulation` `14.0`. Refs UIIN-2412.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/package.json b/package.json
index 6b5f32e53..e12e7075d 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,7 @@
       "alternative-title-types": "1.0",
       "call-number-types": "1.0",
       "browse": "0.6 1.0",
-      "circulation": "9.0 10.0 11.0 12.0 13.0",
+      "circulation": "9.0 10.0 11.0 12.0 13.0 14.0",
       "classification-types": "1.1",
       "configuration": "2.0",
       "contributor-name-types": "1.2",
diff --git a/test/bigtest/network/factories/request.js b/test/bigtest/network/factories/request.js
index d672d647e..e1d815e04 100644
--- a/test/bigtest/network/factories/request.js
+++ b/test/bigtest/network/factories/request.js
@@ -7,7 +7,7 @@ export default Factory.extend({
   requestDate: () => faker.date.past().toISOString().substring(0, 10),
   status: () => 'Open - Not yet filled',
   position: (i) => i + 1,
-  fulfilmentPreference: 'Hold Shelf',
+  fulfillmentPreference: 'Hold Shelf',
   holdShelfExpirationDate: '2017-01-20',
   loan: {
     dueDate: '2017-09-19T12:42:21.000Z',

From 9d27467261e4bb9c2ea218cd0bd84ff53cccbe37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Turek?=
 <128044179+przemyslawturek@users.noreply.github.com>
Date: Tue, 16 May 2023 14:35:16 +0200
Subject: [PATCH 20/68] UIIN-2354 Validator Instance/Holdings/Item notes
 character limit 32K (#2149)

* UIIN-2354

Validator Instance/Holdings/Item notes character limit 32K

* UIIN-2354

Changed validator name, moved const to constants file

* UIIN-2354

Added unit test for validate form in utils

* UIIN-2354

Added mock to test

* UIIN-2354

Change description for tests
---
 CHANGELOG.md                                  |   1 +
 src/constants.js                              |   1 +
 src/edit/administrativeNoteFields.js          |  10 ++
 .../holdings/repeatableFields/NoteFields.js   |  11 ++
 src/edit/noteFields.js                        |  11 ++
 src/utils.test.js                             | 109 ++++++++++++++++++
 6 files changed, 143 insertions(+)
 create mode 100644 src/utils.test.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da97419c7..90d039e6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 * Item Create/Edit screens: Repeatable field trashcan is not aligned with the data row. Fixes UIIN-2374.
 * Chronology not displayed in receiving history. Fixes UIIN-2411.
 * Also support `circulation` `14.0`. Refs UIIN-2412.
+* Instance/Holdings/Item notes, administrative notes character limit to 32K. Refs UIIN-2354.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/constants.js b/src/constants.js
index 720908d47..006396aeb 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -416,6 +416,7 @@ export const PAGE_DIRECTIONS = {
 };
 
 export const BROWSE_RESULTS_COUNT = 100;
+export const NOTE_CHARS_MAX_LENGTH = 32000;
 
 export const ORDERS_API = 'orders/composite-orders';
 
diff --git a/src/edit/administrativeNoteFields.js b/src/edit/administrativeNoteFields.js
index d46eb3c12..2fff1d969 100644
--- a/src/edit/administrativeNoteFields.js
+++ b/src/edit/administrativeNoteFields.js
@@ -11,10 +11,19 @@ import {
   TextArea,
 } from '@folio/stripes/components';
 
+import {
+  validateFieldLength
+} from '../utils';
+
+import {
+  NOTE_CHARS_MAX_LENGTH
+} from '../constants';
+
 const AdministrativeNoteFields = () => {
   const { formatMessage } = useIntl();
 
   const administrativeNoteLabel = formatMessage({ id: 'ui-inventory.administrativeNote' });
+  const validate = value => validateFieldLength(value, NOTE_CHARS_MAX_LENGTH);
 
   const legend = (
     <Label tagName="legend">
@@ -29,6 +38,7 @@ const AdministrativeNoteFields = () => {
       component={TextArea}
       rows={1}
       fullWidth
+      validate={validate}
     />
   );
 
diff --git a/src/edit/holdings/repeatableFields/NoteFields.js b/src/edit/holdings/repeatableFields/NoteFields.js
index fedcdeb26..771fce770 100644
--- a/src/edit/holdings/repeatableFields/NoteFields.js
+++ b/src/edit/holdings/repeatableFields/NoteFields.js
@@ -17,6 +17,14 @@ import {
   TextArea,
 } from '@folio/stripes/components';
 
+import {
+  validateFieldLength
+} from '../../../utils';
+
+import {
+  NOTE_CHARS_MAX_LENGTH
+} from '../../../constants';
+
 const NoteFields = ({
   noteTypeOptions,
   canAdd,
@@ -29,6 +37,8 @@ const NoteFields = ({
   const noteLabel = formatMessage({ id: 'ui-inventory.note' });
   const staffOnlyLabel = formatMessage({ id: 'ui-inventory.staffOnly' });
 
+  const validate = value => validateFieldLength(value, NOTE_CHARS_MAX_LENGTH);
+
   const headLabels = (
     <Row>
       <Col xs={12} lg={4}>
@@ -75,6 +85,7 @@ const NoteFields = ({
           rows={1}
           disabled={!canEdit}
           required
+          validate={validate}
         />
       </Col>
       <Col xs={12} lg={1}>
diff --git a/src/edit/noteFields.js b/src/edit/noteFields.js
index 2cf47c783..debda500c 100644
--- a/src/edit/noteFields.js
+++ b/src/edit/noteFields.js
@@ -17,6 +17,14 @@ import {
   Label,
 } from '@folio/stripes/components';
 
+import {
+  validateFieldLength
+} from '../utils';
+
+import {
+  NOTE_CHARS_MAX_LENGTH
+} from '../constants';
+
 const NoteFields = props => {
   const { formatMessage } = useIntl();
 
@@ -38,6 +46,8 @@ const NoteFields = props => {
   const isNoteRequired = requiredFields.some(field => field === 'note');
   const isStaffOnlyRequired = requiredFields.some(field => field === 'staffOnly');
 
+  const validate = value => validateFieldLength(value, NOTE_CHARS_MAX_LENGTH);
+
   const headLabels = (
     <Row>
       <Col sm={5}>
@@ -78,6 +88,7 @@ const NoteFields = props => {
           rows={1}
           disabled={!canEdit}
           required={isNoteRequired}
+          validate={validate}
         />
       </Col>
       <Col xs={3} lg={2}>
diff --git a/src/utils.test.js b/src/utils.test.js
new file mode 100644
index 000000000..17cfe76a8
--- /dev/null
+++ b/src/utils.test.js
@@ -0,0 +1,109 @@
+import '../test/jest/__mock__';
+
+import { FormattedMessage } from 'react-intl';
+import {
+  validateRequiredField,
+  validateFieldLength,
+  validateNumericField,
+  validateAlphaNumericField,
+} from './utils';
+
+describe('validateRequiredField', () => {
+  const expectedResult = <FormattedMessage id="ui-inventory.hridHandling.validation.enterValue" />;
+
+  it('should return undefined when field is set int', () => {
+    const value = '20';
+    expect(validateRequiredField(value)).toBe(undefined);
+  });
+
+  it('should return undefined when field is set numeric', () => {
+    const value = 20.5;
+    expect(validateRequiredField(value)).toBe(undefined);
+  });
+
+  it('should return validation error when field is undefined', () => {
+    const value = undefined;
+    expect(validateRequiredField(value)).toEqual(expectedResult);
+  });
+
+  it('should return validation error when field none numeric', () => {
+    const value = 'abc32';
+    expect(validateRequiredField(value)).toEqual(expectedResult);
+  });
+
+  it('should return validation error when field is set empty string', () => {
+    const value = '';
+    expect(validateRequiredField(value)).toEqual(expectedResult);
+  });
+});
+
+describe('validateFieldLength', () => {
+  const value = '1234567890';
+
+  it('should return undefined when field length is lower then maxlength', () => {
+    const maxLength = 20;
+    expect(validateFieldLength(value, maxLength)).toBe(undefined);
+  });
+
+  it('should return undefined when field length is exactly as maxlength', () => {
+    const maxLength = 10;
+    expect(validateFieldLength(value, maxLength)).toBe(undefined);
+  });
+
+  it('should return undefined when field length is empty', () => {
+    expect(validateFieldLength('', 10)).toBe(undefined);
+  });
+
+  it('should return undefined when field length is undefined', () => {
+    expect(validateFieldLength(undefined, 10)).toBe(undefined);
+  });
+
+  it('should return undefined when field length and maxlength is undefined ', () => {
+    expect(validateFieldLength(undefined, undefined)).toBe(undefined);
+  });
+
+  it('should return validation error when field length is longer then maxlength', () => {
+    const maxLength = 5;
+    const expectedResult = <FormattedMessage id="ui-inventory.hridHandling.validation.maxLength" values={{ maxLength }} />;
+
+    expect(validateFieldLength(value, maxLength)).toEqual(expectedResult);
+  });
+});
+
+describe('validateNumericField', () => {
+  it('should return undefined when field is numeric', () => {
+    const value = 20;
+    expect(validateNumericField(value)).toBe(undefined);
+  });
+
+  it('should return undefined when field is numeric string', () => {
+    const value = '20';
+    expect(validateNumericField(value)).toBe(undefined);
+  });
+
+
+  it('should return undefined when field undefined', () => {
+    const value = undefined;
+    expect(validateNumericField(value)).toBe(undefined);
+  });
+
+  it('should return validation error when field is not numeric', () => {
+    const value = 'ABC';
+    const expectedResult = <FormattedMessage id="ui-inventory.hridHandling.validation.startWithField" />;
+    expect(validateNumericField(value)).toEqual(expectedResult);
+  });
+});
+
+describe('validateAlphaNumericField', () => {
+  const alphaNumeric = '1234567890qwertyuiopasdfghjklzxcvbnm?!$\'()[]{};:.,-';
+  const nonAlphaNumeric = 'abc@gmail.com#';
+
+  it('should return undefined when field is alphaNumeric', () => {
+    expect(validateAlphaNumericField(alphaNumeric)).toBe(undefined);
+  });
+
+  it('should return validation error when field is none alphaNumeric', () => {
+    const expectedResult = <FormattedMessage id="ui-inventory.hridHandling.validation.assignPrefixField" />;
+    expect(validateAlphaNumericField(nonAlphaNumeric)).toEqual(expectedResult);
+  });
+});

From aef125f99f045b17a39d602f66296643ae4147e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kuklis?= <michal.kuklis@gmail.com>
Date: Tue, 16 May 2023 11:07:44 -0400
Subject: [PATCH 21/68] UIIN-2427: Import testing-library deps from
 @folio/jest-config-stripes (#2152)

* UIIN-2427: Import testing-library deps from @folio/jest-config-stripes

* Update changelog
---
 CHANGELOG.md                                                | 1 +
 src/Holding/DuplicateHolding/DuplicateHolding.test.js       | 2 +-
 src/Holding/EditHolding/EditHolding.test.js                 | 2 +-
 .../HoldingAquisitions/HoldingAquisitions.test.js           | 2 +-
 .../HoldingAquisitions/useHoldingOrderLines.test.js         | 2 +-
 .../ViewHolding/HoldingBoundWith/HoldingBoundWith.test.js   | 2 +-
 .../HoldingBoundWith/useBoundWithHoldings.test.js           | 2 +-
 .../ViewHolding/HoldingBoundWith/useBoundWithItems.test.js  | 2 +-
 .../HoldingReceivingHistory/HoldingReceivingHistory.test.js | 4 ++--
 .../HoldingReceivingHistory/useReceivingHistory.test.js     | 2 +-
 src/Instance/DnDContext.test.js                             | 2 +-
 src/Instance/HoldingsList/Holding/Holding.test.js           | 4 ++--
 src/Instance/HoldingsList/Holding/HoldingAccordion.test.js  | 4 ++--
 .../HoldingsList/Holding/HoldingButtonsGroup.test.js        | 4 ++--
 src/Instance/HoldingsList/Holding/HoldingContainer.test.js  | 4 ++--
 .../Holding/MoveToDropdown/MoveToDropdown.test.js           | 4 ++--
 src/Instance/HoldingsList/HoldingsList.test.js              | 2 +-
 src/Instance/HoldingsList/HoldingsListContainer.test.js     | 2 +-
 .../InstanceAcquisition/InstanceAcquisition.test.js         | 2 +-
 .../InstanceAcquisition/useInstanceAcquisition.test.js      | 2 +-
 .../InstanceClassificationView.test.js                      | 2 +-
 .../InstanceContributorsView.test.js                        | 4 ++--
 .../InstanceDescriptiveView/InstanceDescriptiveView.test.js | 2 +-
 .../InstanceDetails/InstanceDescriptiveView/utils.test.js   | 2 +-
 src/Instance/InstanceDetails/InstanceDetails.test.js        | 4 ++--
 .../InstanceElecAccessView/InstanceElecAccessView.test.js   | 2 +-
 .../InstanceIdentifiersView/InstanceIdentifiersView.test.js | 2 +-
 .../InstanceNotesView/InstanceNotesView.test.js             | 2 +-
 .../InstanceSubjectView/InstanceSubjectView.test.js         | 2 +-
 .../InstanceTitleData/InstanceTitleData.test.js             | 4 ++--
 .../InstanceTitleData/TitleSeriesStatements.test.js         | 2 +-
 .../SubInstanceGroup/SubInstanceGroup.test.js               | 2 +-
 .../InstanceDetails/SubInstanceList/SubInstanceList.test.js | 2 +-
 src/Instance/InstanceEdit/InstanceEdit.test.js              | 4 ++--
 .../InstanceEdit/InstanceField/InstanceField.test.js        | 2 +-
 src/Instance/InstanceMarc/InstanceMarcContainer.test.js     | 2 +-
 .../HoldingMovementList/HoldingsListMovement.test.js        | 2 +-
 src/Instance/InstanceMovement/InstanceMovement.test.js      | 2 +-
 .../InstanceMovement/InstanceMovementContainer.test.js      | 4 ++--
 .../InstanceMovementDetails/InstanceMovementDetails.test.js | 4 ++--
 .../InstanceMovementDetailsActions.test.js                  | 4 ++--
 .../InstanceMovementDetailsContainer.test.js                | 2 +-
 src/Instance/ItemsList/tests/ItemsList.test.js              | 2 +-
 src/Instance/Move/ConfirmationModal.test.js                 | 2 +-
 src/Instance/MoveItemsContext/Confirmation.test.js          | 2 +-
 src/Instance/MoveItemsContext/useNoKeyboardSensors.test.js  | 4 ++--
 src/Instance/ViewRequests/ViewRequests.test.js              | 4 ++--
 src/Instance/ViewRequests/useFetchItems.test.js             | 2 +-
 src/Item/CreateItem/CreateItem.test.js                      | 2 +-
 src/Item/DuplicateItem/DuplicateItem.test.js                | 2 +-
 src/Item/EditItem/EditItem.test.js                          | 2 +-
 src/Item/ViewItem/ItemAcquisition/ItemAcquisition.test.js   | 2 +-
 .../ViewItem/ItemAcquisition/useItemAcquisition.test.js     | 2 +-
 .../useBoundWithsMutation/useBoundWithsMutation.test.js     | 2 +-
 src/Item/hooks/useItem/useItem.test.js                      | 2 +-
 src/Item/hooks/useItemMutation/useItemMutation.test.js      | 2 +-
 src/RemoteStorageService/Check.test.js                      | 2 +-
 src/ViewHoldingsRecord.test.js                              | 4 ++--
 src/ViewInstance.test.js                                    | 6 +++---
 src/common/hooks/useConfirmationModal.test.js               | 4 ++--
 .../useControlledAccordion/useControlledAccordion.test.js   | 2 +-
 src/common/hooks/useFacets.test.js                          | 2 +-
 src/common/hooks/useGoBack.test.js                          | 2 +-
 src/common/hooks/useHolding/useHolding.test.js              | 2 +-
 src/common/hooks/useInstance.test.js                        | 2 +-
 src/common/hooks/useInstanceQuery/useInstanceQuery.test.js  | 2 +-
 .../BrowseInventoryFilters/BrowseInventoryFilters.test.js   | 4 ++--
 src/components/BrowseResultsList/BrowseResultsList.test.js  | 4 ++--
 .../BrowseResultsList/getBrowseResultsFormatter.test.js     | 4 ++--
 src/components/BrowseResultsPane/BrowseResultsPane.test.js  | 2 +-
 src/components/CheckboxFacet/CheckboxFacet.test.js          | 4 ++--
 src/components/CheckboxFacet/CheckboxFacetList.test.js      | 4 ++--
 .../FacetOptionFormatter/FacetOptionFormatter.test.js       | 2 +-
 .../holdingsRecordFilterRenderer.test.js                    | 4 ++--
 src/components/ImportRecordModal/ImportRecordModal.test.js  | 2 +-
 src/components/InstanceFilters/InstanceFilters.test.js      | 4 ++--
 .../InstanceFiltersBrowse/instanceFiltersBrowse.test.js     | 2 +-
 src/components/InstancesList/InstancesList.test.js          | 4 ++--
 src/components/ItemFilters/itemFilterRenderer.test.js       | 4 ++--
 src/components/MissedMatchItem/MissedMatchItem.test.js      | 2 +-
 .../MultiSelectionFacet/MultiSelectionFacet.test.js         | 2 +-
 src/components/NewOrderModal/NewOrderModal.test.js          | 4 ++--
 src/components/NewOrderModal/NewOrderModalContainer.test.js | 4 ++--
 .../SearchModeNavigation/SearchModeNavigation.test.js       | 2 +-
 src/components/TagsFilter/TagsFilter.test.js                | 2 +-
 .../MenuSection/NewInstanceRequestButton.test.js            | 2 +-
 .../ViewInstance/MenuSection/RequestsReorderButton.test.js  | 2 +-
 src/components/ViewSource/ViewSource.test.js                | 4 ++--
 src/components/WarningMessage/WarningMessage.test.js        | 2 +-
 src/contexts/DataContext.test.js                            | 2 +-
 src/edit/InstanceForm.test.js                               | 2 +-
 src/edit/administrativeNodeFields.test.js                   | 4 ++--
 src/edit/alternativeTitles.test.js                          | 4 ++--
 src/edit/classificationFields.test.js                       | 4 ++--
 .../PrimaryToggleButton/PrimaryToggleButton.test.js         | 4 ++--
 src/edit/contributorFields.test.js                          | 4 ++--
 src/edit/descriptionFields.test.js                          | 4 ++--
 src/edit/editionFields.test.js                              | 4 ++--
 src/edit/electronicAccessFields.test.js                     | 4 ++--
 src/edit/holdings/HoldingsForm.test.js                      | 2 +-
 src/edit/holdings/RemoteStorageWarning.test.js              | 4 ++--
 .../repeatableFields/tests/HoldingsStatementFields.test.js  | 4 ++--
 .../tests/HoldingsStatementForSupplementsFields.test.js     | 4 ++--
 src/edit/holdings/repeatableFields/tests/NoteFields.test.js | 4 ++--
 src/edit/identifierFields.test.js                           | 4 ++--
 src/edit/instanceFormatFields.test.js                       | 4 ++--
 src/edit/items/RemoteStorageWarning.test.js                 | 2 +-
 .../repeatableFields/tests/BoundWithTitlesFields.test.js    | 4 ++--
 src/edit/languageFields.test.js                             | 4 ++--
 src/edit/natureOfContentFields.test.js                      | 4 ++--
 src/edit/noteFields.test.js                                 | 4 ++--
 src/edit/precedingTitleFields.test.js                       | 4 ++--
 src/edit/publicationFields.test.js                          | 6 +++---
 src/edit/publicationFrequencyFields.test.js                 | 4 ++--
 src/edit/publicationRangeFields.test.js                     | 4 ++--
 src/edit/seriesFields.test.js                               | 4 ++--
 src/edit/subjectFields.test.js                              | 4 ++--
 src/edit/succeedingTitleFields.test.js                      | 2 +-
 .../useBoundWithTitlesByHrids.test.js                       | 2 +-
 src/hooks/useBrowseValidation/useBrowseValidation.test.js   | 2 +-
 src/hooks/useHoldingItemsQuery.test.js                      | 2 +-
 src/hooks/useHoldingMutation/useHoldingMutation.test.js     | 2 +-
 src/hooks/useHoldingsQueryByHrids.test.js                   | 2 +-
 src/hooks/useInstancesQuery.test.js                         | 2 +-
 src/hooks/useInventoryBrowse/useInventoryBrowse.test.js     | 2 +-
 src/hooks/useLogout/useLogout.test.js                       | 2 +-
 src/hooks/useReferenceData.test.js                          | 2 +-
 src/providers/DataProviders.test.js                         | 2 +-
 src/providers/HoldingsProvider.test.js                      | 2 +-
 src/providers/LastSearchTermsProvider.test.js               | 2 +-
 src/referenceFormatters.test.js                             | 2 +-
 src/routes/BrowseRoute/BrowseRoute.test.js                  | 2 +-
 src/routes/CreateItemRoute.test.js                          | 2 +-
 src/routes/DuplicateHoldingRoute.test.js                    | 2 +-
 src/routes/DuplicateItemRoute.test.js                       | 2 +-
 src/routes/EditHoldingRoute.test.js                         | 2 +-
 src/routes/EditItemRoute.test.js                            | 2 +-
 src/routes/InstancesRoute.test.js                           | 4 ++--
 src/routes/ViewHoldingRoute.test.js                         | 2 +-
 src/settings/FastAdd/FastAddForm.test.js                    | 4 ++--
 src/settings/FastAdd/FastAddSettings.test.js                | 4 ++--
 src/settings/ItemNoteTypesSettings.test.js                  | 2 +-
 src/settings/StatisticalCodeSettings.test.js                | 2 +-
 src/settings/TargetProfileForm.test.js                      | 2 +-
 src/settings/TargetProfiles.test.js                         | 2 +-
 src/views/BrowseInventory/BrowseInventory.test.js           | 4 ++--
 src/views/InstancesView.test.js                             | 2 +-
 src/views/ItemStatus/ItemStatus.test.js                     | 4 ++--
 src/views/ItemView.test.js                                  | 2 +-
 src/withLocation.test.js                                    | 4 ++--
 test/jest/helpers/renderWithIntl.js                         | 2 +-
 151 files changed, 213 insertions(+), 212 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90d039e6a..b0052f4b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * Chronology not displayed in receiving history. Fixes UIIN-2411.
 * Also support `circulation` `14.0`. Refs UIIN-2412.
 * Instance/Holdings/Item notes, administrative notes character limit to 32K. Refs UIIN-2354.
+* Import testing-library deps from `@folio/jest-config-stripes`. Refs UIIN-2427.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/Holding/DuplicateHolding/DuplicateHolding.test.js b/src/Holding/DuplicateHolding/DuplicateHolding.test.js
index 75daf6836..f9d84cc72 100644
--- a/src/Holding/DuplicateHolding/DuplicateHolding.test.js
+++ b/src/Holding/DuplicateHolding/DuplicateHolding.test.js
@@ -2,7 +2,7 @@ import '../../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import { instance } from '../../../test/fixtures/instance';
 import {
diff --git a/src/Holding/EditHolding/EditHolding.test.js b/src/Holding/EditHolding/EditHolding.test.js
index 2a3a4f701..34494fc91 100644
--- a/src/Holding/EditHolding/EditHolding.test.js
+++ b/src/Holding/EditHolding/EditHolding.test.js
@@ -2,7 +2,7 @@ import '../../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import { instance } from '../../../test/fixtures/instance';
 import {
diff --git a/src/Holding/ViewHolding/HoldingAquisitions/HoldingAquisitions.test.js b/src/Holding/ViewHolding/HoldingAquisitions/HoldingAquisitions.test.js
index 275bde416..650ef1dc5 100644
--- a/src/Holding/ViewHolding/HoldingAquisitions/HoldingAquisitions.test.js
+++ b/src/Holding/ViewHolding/HoldingAquisitions/HoldingAquisitions.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Holding/ViewHolding/HoldingAquisitions/useHoldingOrderLines.test.js b/src/Holding/ViewHolding/HoldingAquisitions/useHoldingOrderLines.test.js
index b8f23db88..f18e0508d 100644
--- a/src/Holding/ViewHolding/HoldingAquisitions/useHoldingOrderLines.test.js
+++ b/src/Holding/ViewHolding/HoldingAquisitions/useHoldingOrderLines.test.js
@@ -3,7 +3,7 @@ import {
   QueryClient,
   QueryClientProvider,
 } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/Holding/ViewHolding/HoldingBoundWith/HoldingBoundWith.test.js b/src/Holding/ViewHolding/HoldingBoundWith/HoldingBoundWith.test.js
index f80aeb355..4b9387890 100644
--- a/src/Holding/ViewHolding/HoldingBoundWith/HoldingBoundWith.test.js
+++ b/src/Holding/ViewHolding/HoldingBoundWith/HoldingBoundWith.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.test.js b/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.test.js
index 627e676a8..115123b49 100644
--- a/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.test.js
+++ b/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.test.js
@@ -3,7 +3,7 @@ import {
   QueryClient,
   QueryClientProvider,
 } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithItems.test.js b/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithItems.test.js
index dd40e190c..d6b7edf12 100644
--- a/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithItems.test.js
+++ b/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithItems.test.js
@@ -3,7 +3,7 @@ import {
   QueryClient,
   QueryClientProvider,
 } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.test.js b/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.test.js
index f66e4aeff..bd5e3d019 100644
--- a/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.test.js
+++ b/src/Holding/ViewHolding/HoldingReceivingHistory/HoldingReceivingHistory.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import user from '@testing-library/user-event';
-import { screen } from '@testing-library/react';
+import user from '@folio/jest-config-stripes/testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Holding/ViewHolding/HoldingReceivingHistory/useReceivingHistory.test.js b/src/Holding/ViewHolding/HoldingReceivingHistory/useReceivingHistory.test.js
index cbf46c0a1..8d5fb9627 100644
--- a/src/Holding/ViewHolding/HoldingReceivingHistory/useReceivingHistory.test.js
+++ b/src/Holding/ViewHolding/HoldingReceivingHistory/useReceivingHistory.test.js
@@ -3,7 +3,7 @@ import {
   QueryClient,
   QueryClientProvider,
 } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/Instance/DnDContext.test.js b/src/Instance/DnDContext.test.js
index 3730b208e..e89837e76 100644
--- a/src/Instance/DnDContext.test.js
+++ b/src/Instance/DnDContext.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { render } from '@folio/jest-config-stripes/testing-library/react';
 import DnDContext from './DnDContext';
 
 describe('DnDContext', () => {
diff --git a/src/Instance/HoldingsList/Holding/Holding.test.js b/src/Instance/HoldingsList/Holding/Holding.test.js
index 9266a9e94..a14f961a7 100644
--- a/src/Instance/HoldingsList/Holding/Holding.test.js
+++ b/src/Instance/HoldingsList/Holding/Holding.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/Instance/HoldingsList/Holding/HoldingAccordion.test.js b/src/Instance/HoldingsList/Holding/HoldingAccordion.test.js
index 8bc920612..7d48b1275 100644
--- a/src/Instance/HoldingsList/Holding/HoldingAccordion.test.js
+++ b/src/Instance/HoldingsList/Holding/HoldingAccordion.test.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { noop } from 'lodash';
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { act } from 'react-dom/test-utils';
-import { screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/Instance/HoldingsList/Holding/HoldingButtonsGroup.test.js b/src/Instance/HoldingsList/Holding/HoldingButtonsGroup.test.js
index 447cfe463..f9163f63d 100644
--- a/src/Instance/HoldingsList/Holding/HoldingButtonsGroup.test.js
+++ b/src/Instance/HoldingsList/Holding/HoldingButtonsGroup.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/Instance/HoldingsList/Holding/HoldingContainer.test.js b/src/Instance/HoldingsList/Holding/HoldingContainer.test.js
index 9477582b9..217fc2e34 100644
--- a/src/Instance/HoldingsList/Holding/HoldingContainer.test.js
+++ b/src/Instance/HoldingsList/Holding/HoldingContainer.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import '../../../../test/jest/__mock__';
 import { IntlProvider } from 'react-intl';
 import { MemoryRouter } from 'react-router-dom';
diff --git a/src/Instance/HoldingsList/Holding/MoveToDropdown/MoveToDropdown.test.js b/src/Instance/HoldingsList/Holding/MoveToDropdown/MoveToDropdown.test.js
index 6c3e565b4..40e86d30b 100644
--- a/src/Instance/HoldingsList/Holding/MoveToDropdown/MoveToDropdown.test.js
+++ b/src/Instance/HoldingsList/Holding/MoveToDropdown/MoveToDropdown.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { Router } from 'react-router';
 import { createMemoryHistory } from 'history';
 import { DataContext } from '../../../../contexts';
diff --git a/src/Instance/HoldingsList/HoldingsList.test.js b/src/Instance/HoldingsList/HoldingsList.test.js
index 0e4d4d6c3..4610e9ad9 100644
--- a/src/Instance/HoldingsList/HoldingsList.test.js
+++ b/src/Instance/HoldingsList/HoldingsList.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen, render } from '@testing-library/react';
+import { screen, render } from '@folio/jest-config-stripes/testing-library/react';
 import '../../../test/jest/__mock__';
 import { MemoryRouter } from 'react-router-dom';
 import HoldingsList from './HoldingsList';
diff --git a/src/Instance/HoldingsList/HoldingsListContainer.test.js b/src/Instance/HoldingsList/HoldingsListContainer.test.js
index 869aecc09..8c2eedd4d 100644
--- a/src/Instance/HoldingsList/HoldingsListContainer.test.js
+++ b/src/Instance/HoldingsList/HoldingsListContainer.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor } from '@folio/jest-config-stripes/testing-library/react';
 import '../../../test/jest/__mock__';
 import { MemoryRouter } from 'react-router-dom';
 import { useInstanceHoldingsQuery } from '../../providers';
diff --git a/src/Instance/InstanceDetails/InstanceAcquisition/InstanceAcquisition.test.js b/src/Instance/InstanceDetails/InstanceAcquisition/InstanceAcquisition.test.js
index 557158ea3..0a978027b 100644
--- a/src/Instance/InstanceDetails/InstanceAcquisition/InstanceAcquisition.test.js
+++ b/src/Instance/InstanceDetails/InstanceAcquisition/InstanceAcquisition.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Instance/InstanceDetails/InstanceAcquisition/useInstanceAcquisition.test.js b/src/Instance/InstanceDetails/InstanceAcquisition/useInstanceAcquisition.test.js
index 90c667d73..aea768013 100644
--- a/src/Instance/InstanceDetails/InstanceAcquisition/useInstanceAcquisition.test.js
+++ b/src/Instance/InstanceDetails/InstanceAcquisition/useInstanceAcquisition.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/Instance/InstanceDetails/InstanceClassificationView/InstanceClassificationView.test.js b/src/Instance/InstanceDetails/InstanceClassificationView/InstanceClassificationView.test.js
index 6c78543f5..bddee95b6 100644
--- a/src/Instance/InstanceDetails/InstanceClassificationView/InstanceClassificationView.test.js
+++ b/src/Instance/InstanceDetails/InstanceClassificationView/InstanceClassificationView.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Instance/InstanceDetails/InstanceContributorsView/InstanceContributorsView.test.js b/src/Instance/InstanceDetails/InstanceContributorsView/InstanceContributorsView.test.js
index 13d1f3599..6067c1ee3 100644
--- a/src/Instance/InstanceDetails/InstanceContributorsView/InstanceContributorsView.test.js
+++ b/src/Instance/InstanceDetails/InstanceContributorsView/InstanceContributorsView.test.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/Instance/InstanceDetails/InstanceDescriptiveView/InstanceDescriptiveView.test.js b/src/Instance/InstanceDetails/InstanceDescriptiveView/InstanceDescriptiveView.test.js
index d363f7153..1f7dcf2d9 100644
--- a/src/Instance/InstanceDetails/InstanceDescriptiveView/InstanceDescriptiveView.test.js
+++ b/src/Instance/InstanceDetails/InstanceDescriptiveView/InstanceDescriptiveView.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Instance/InstanceDetails/InstanceDescriptiveView/utils.test.js b/src/Instance/InstanceDetails/InstanceDescriptiveView/utils.test.js
index ba6bf094a..caf7640cb 100644
--- a/src/Instance/InstanceDetails/InstanceDescriptiveView/utils.test.js
+++ b/src/Instance/InstanceDetails/InstanceDescriptiveView/utils.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 import '../../../../test/jest/__mock__';
 import { formatLanguages } from './utils';
 
diff --git a/src/Instance/InstanceDetails/InstanceDetails.test.js b/src/Instance/InstanceDetails/InstanceDetails.test.js
index 225ce1ec8..7c08c8cb7 100644
--- a/src/Instance/InstanceDetails/InstanceDetails.test.js
+++ b/src/Instance/InstanceDetails/InstanceDetails.test.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import '../../../test/jest/__mock__';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { MemoryRouter } from 'react-router-dom';
 import { DataContext } from '../../contexts';
 import { renderWithIntl, translationsProperties } from '../../../test/jest/helpers';
diff --git a/src/Instance/InstanceDetails/InstanceElecAccessView/InstanceElecAccessView.test.js b/src/Instance/InstanceDetails/InstanceElecAccessView/InstanceElecAccessView.test.js
index 551eaf19b..260e60b19 100644
--- a/src/Instance/InstanceDetails/InstanceElecAccessView/InstanceElecAccessView.test.js
+++ b/src/Instance/InstanceDetails/InstanceElecAccessView/InstanceElecAccessView.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Instance/InstanceDetails/InstanceIdentifiersView/InstanceIdentifiersView.test.js b/src/Instance/InstanceDetails/InstanceIdentifiersView/InstanceIdentifiersView.test.js
index 0325d63aa..d9f6e62cd 100644
--- a/src/Instance/InstanceDetails/InstanceIdentifiersView/InstanceIdentifiersView.test.js
+++ b/src/Instance/InstanceDetails/InstanceIdentifiersView/InstanceIdentifiersView.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Instance/InstanceDetails/InstanceNotesView/InstanceNotesView.test.js b/src/Instance/InstanceDetails/InstanceNotesView/InstanceNotesView.test.js
index 3b3c35fb3..7ff944ad5 100644
--- a/src/Instance/InstanceDetails/InstanceNotesView/InstanceNotesView.test.js
+++ b/src/Instance/InstanceDetails/InstanceNotesView/InstanceNotesView.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Instance/InstanceDetails/InstanceSubjectView/InstanceSubjectView.test.js b/src/Instance/InstanceDetails/InstanceSubjectView/InstanceSubjectView.test.js
index a78bea316..faf41775e 100644
--- a/src/Instance/InstanceDetails/InstanceSubjectView/InstanceSubjectView.test.js
+++ b/src/Instance/InstanceDetails/InstanceSubjectView/InstanceSubjectView.test.js
@@ -4,7 +4,7 @@ import '../../../../test/jest/__mock__';
 
 import { Router } from 'react-router';
 import { createMemoryHistory } from 'history';
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import { DataContext } from '../../../contexts';
 
diff --git a/src/Instance/InstanceDetails/InstanceTitleData/InstanceTitleData.test.js b/src/Instance/InstanceDetails/InstanceTitleData/InstanceTitleData.test.js
index 05b89fb0b..c68511e9b 100644
--- a/src/Instance/InstanceDetails/InstanceTitleData/InstanceTitleData.test.js
+++ b/src/Instance/InstanceDetails/InstanceTitleData/InstanceTitleData.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
-import userEvent from '@testing-library/user-event';
-import { screen } from '@testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
 import InstanceTitleData from './InstanceTitleData';
diff --git a/src/Instance/InstanceDetails/InstanceTitleData/TitleSeriesStatements.test.js b/src/Instance/InstanceDetails/InstanceTitleData/TitleSeriesStatements.test.js
index b33b6216c..a70832daa 100644
--- a/src/Instance/InstanceDetails/InstanceTitleData/TitleSeriesStatements.test.js
+++ b/src/Instance/InstanceDetails/InstanceTitleData/TitleSeriesStatements.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Instance/InstanceDetails/SubInstanceGroup/SubInstanceGroup.test.js b/src/Instance/InstanceDetails/SubInstanceGroup/SubInstanceGroup.test.js
index dd3c25f50..6b84646b6 100644
--- a/src/Instance/InstanceDetails/SubInstanceGroup/SubInstanceGroup.test.js
+++ b/src/Instance/InstanceDetails/SubInstanceGroup/SubInstanceGroup.test.js
@@ -1,4 +1,4 @@
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import React from 'react';
 import '../../../../test/jest/__mock__';
 import { renderWithIntl, translationsProperties } from '../../../../test/jest/helpers';
diff --git a/src/Instance/InstanceDetails/SubInstanceList/SubInstanceList.test.js b/src/Instance/InstanceDetails/SubInstanceList/SubInstanceList.test.js
index a47570c0a..e355c0c78 100644
--- a/src/Instance/InstanceDetails/SubInstanceList/SubInstanceList.test.js
+++ b/src/Instance/InstanceDetails/SubInstanceList/SubInstanceList.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import '../../../../test/jest/__mock__';
 import { Router } from 'react-router';
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { createMemoryHistory } from 'history';
 import { renderWithIntl, translationsProperties } from '../../../../test/jest/helpers';
 import useLoadSubInstances from '../../../hooks/useLoadSubInstances';
diff --git a/src/Instance/InstanceEdit/InstanceEdit.test.js b/src/Instance/InstanceEdit/InstanceEdit.test.js
index dc6b9142c..a5da4f317 100644
--- a/src/Instance/InstanceEdit/InstanceEdit.test.js
+++ b/src/Instance/InstanceEdit/InstanceEdit.test.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { noop } from 'lodash';
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { act } from 'react-dom/test-utils';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 
 import '../../../test/jest/__mock__';
diff --git a/src/Instance/InstanceEdit/InstanceField/InstanceField.test.js b/src/Instance/InstanceEdit/InstanceField/InstanceField.test.js
index b66eaf2e7..d4b4fb991 100644
--- a/src/Instance/InstanceEdit/InstanceField/InstanceField.test.js
+++ b/src/Instance/InstanceEdit/InstanceField/InstanceField.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import { noop, keyBy } from 'lodash';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { act } from 'react-dom/test-utils';
diff --git a/src/Instance/InstanceMarc/InstanceMarcContainer.test.js b/src/Instance/InstanceMarc/InstanceMarcContainer.test.js
index 45225da38..41d442238 100644
--- a/src/Instance/InstanceMarc/InstanceMarcContainer.test.js
+++ b/src/Instance/InstanceMarc/InstanceMarcContainer.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import '../../../test/jest/__mock__';
 import { MemoryRouter } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import InstanceMarcContainer from './InstanceMarcContainer';
 
diff --git a/src/Instance/InstanceMovement/HoldingMovementList/HoldingsListMovement.test.js b/src/Instance/InstanceMovement/HoldingMovementList/HoldingsListMovement.test.js
index a5dbe38af..5a90a2e41 100644
--- a/src/Instance/InstanceMovement/HoldingMovementList/HoldingsListMovement.test.js
+++ b/src/Instance/InstanceMovement/HoldingMovementList/HoldingsListMovement.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import { Router } from 'react-router';
 import { createMemoryHistory } from 'history';
diff --git a/src/Instance/InstanceMovement/InstanceMovement.test.js b/src/Instance/InstanceMovement/InstanceMovement.test.js
index aeb89250d..41262c282 100644
--- a/src/Instance/InstanceMovement/InstanceMovement.test.js
+++ b/src/Instance/InstanceMovement/InstanceMovement.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { DataContext } from '../../contexts';
 import '../../../test/jest/__mock__';
diff --git a/src/Instance/InstanceMovement/InstanceMovementContainer.test.js b/src/Instance/InstanceMovement/InstanceMovementContainer.test.js
index 2bc70d4a9..a893ac33b 100644
--- a/src/Instance/InstanceMovement/InstanceMovementContainer.test.js
+++ b/src/Instance/InstanceMovement/InstanceMovementContainer.test.js
@@ -1,8 +1,8 @@
 import '../../../test/jest/__mock__';
 
 import React from 'react';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { MemoryRouter } from 'react-router-dom';
 
 import InstanceMovementContainer from './InstanceMovementContainer';
diff --git a/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetails.test.js b/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetails.test.js
index 84702505d..a4f7b81e6 100644
--- a/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetails.test.js
+++ b/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetails.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { QueryClient, QueryClientProvider } from 'react-query';
 
 import '../../../../test/jest/__mock__';
diff --git a/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetailsActions.test.js b/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetailsActions.test.js
index 72d8a7a2e..1f94323d4 100644
--- a/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetailsActions.test.js
+++ b/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetailsActions.test.js
@@ -1,8 +1,8 @@
 import '../../../../test/jest/__mock__';
 
 import React from 'react';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { MemoryRouter } from 'react-router-dom';
 import InstanceMovementDetailsActions from './InstanceMovementDetailsActions';
 import {
diff --git a/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetailsContainer.test.js b/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetailsContainer.test.js
index d2471fba0..3e65d58a9 100644
--- a/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetailsContainer.test.js
+++ b/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetailsContainer.test.js
@@ -1,6 +1,6 @@
 import '../../../../test/jest/__mock__';
 import { MemoryRouter } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 import InstanceMovementDetailsContainer from './InstanceMovementDetailsContainer';
 
 jest.mock('./InstanceMovementDetails', () => jest.fn().mockReturnValue('InstanceMovementDetails'));
diff --git a/src/Instance/ItemsList/tests/ItemsList.test.js b/src/Instance/ItemsList/tests/ItemsList.test.js
index 546f8aff2..157d0deb4 100644
--- a/src/Instance/ItemsList/tests/ItemsList.test.js
+++ b/src/Instance/ItemsList/tests/ItemsList.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { act } from 'react-dom/test-utils';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/Instance/Move/ConfirmationModal.test.js b/src/Instance/Move/ConfirmationModal.test.js
index 74b6d46fd..0e6e48353 100644
--- a/src/Instance/Move/ConfirmationModal.test.js
+++ b/src/Instance/Move/ConfirmationModal.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import '../../../test/jest/__mock__';
 import { renderWithIntl, translationsProperties } from '../../../test/jest/helpers';
 import { ConfirmationModal } from './ConfirmationModal';
diff --git a/src/Instance/MoveItemsContext/Confirmation.test.js b/src/Instance/MoveItemsContext/Confirmation.test.js
index 895f12f55..dd1df6c78 100644
--- a/src/Instance/MoveItemsContext/Confirmation.test.js
+++ b/src/Instance/MoveItemsContext/Confirmation.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import '../../../test/jest/__mock__';
 import { renderWithIntl, translationsProperties } from '../../../test/jest/helpers';
 import { Confirmation } from './Confirmation';
diff --git a/src/Instance/MoveItemsContext/useNoKeyboardSensors.test.js b/src/Instance/MoveItemsContext/useNoKeyboardSensors.test.js
index cae5b5532..2e6daa262 100644
--- a/src/Instance/MoveItemsContext/useNoKeyboardSensors.test.js
+++ b/src/Instance/MoveItemsContext/useNoKeyboardSensors.test.js
@@ -1,5 +1,5 @@
-import { fireEvent } from '@testing-library/dom';
-import { renderHook, act } from '@testing-library/react-hooks';
+import { fireEvent } from '@folio/jest-config-stripes/testing-library/dom';
+import { renderHook, act } from '@folio/jest-config-stripes/testing-library/react-hooks';
 import useNoKeyboardSensors from './useNoKeyboardSensors';
 
 const mockApi = {
diff --git a/src/Instance/ViewRequests/ViewRequests.test.js b/src/Instance/ViewRequests/ViewRequests.test.js
index 259011196..8d227c5b8 100644
--- a/src/Instance/ViewRequests/ViewRequests.test.js
+++ b/src/Instance/ViewRequests/ViewRequests.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../test/jest/__mock__';
 import renderWithIntl from '../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Instance/ViewRequests/useFetchItems.test.js b/src/Instance/ViewRequests/useFetchItems.test.js
index e3ee9d3e3..2c93136f8 100644
--- a/src/Instance/ViewRequests/useFetchItems.test.js
+++ b/src/Instance/ViewRequests/useFetchItems.test.js
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 import useFetchItems from './useFetchItems';
 import { batchFetchItems } from './utils';
 
diff --git a/src/Item/CreateItem/CreateItem.test.js b/src/Item/CreateItem/CreateItem.test.js
index 9f7d27d7a..8761679ce 100644
--- a/src/Item/CreateItem/CreateItem.test.js
+++ b/src/Item/CreateItem/CreateItem.test.js
@@ -1,7 +1,7 @@
 import '../../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 
 import { instance } from '../../../test/fixtures/instance';
diff --git a/src/Item/DuplicateItem/DuplicateItem.test.js b/src/Item/DuplicateItem/DuplicateItem.test.js
index d9ace5ac2..d25d821b1 100644
--- a/src/Item/DuplicateItem/DuplicateItem.test.js
+++ b/src/Item/DuplicateItem/DuplicateItem.test.js
@@ -1,7 +1,7 @@
 import '../../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 
 import { instance } from '../../../test/fixtures/instance';
diff --git a/src/Item/EditItem/EditItem.test.js b/src/Item/EditItem/EditItem.test.js
index 68ee3a9c3..0b1320585 100644
--- a/src/Item/EditItem/EditItem.test.js
+++ b/src/Item/EditItem/EditItem.test.js
@@ -1,7 +1,7 @@
 import '../../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen, waitFor } from '@folio/jest-config-stripes/testing-library/react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 
 import { instance } from '../../../test/fixtures/instance';
diff --git a/src/Item/ViewItem/ItemAcquisition/ItemAcquisition.test.js b/src/Item/ViewItem/ItemAcquisition/ItemAcquisition.test.js
index bea654cea..bc1cdf87c 100644
--- a/src/Item/ViewItem/ItemAcquisition/ItemAcquisition.test.js
+++ b/src/Item/ViewItem/ItemAcquisition/ItemAcquisition.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
diff --git a/src/Item/ViewItem/ItemAcquisition/useItemAcquisition.test.js b/src/Item/ViewItem/ItemAcquisition/useItemAcquisition.test.js
index 1363afb8b..ea1901880 100644
--- a/src/Item/ViewItem/ItemAcquisition/useItemAcquisition.test.js
+++ b/src/Item/ViewItem/ItemAcquisition/useItemAcquisition.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/Item/hooks/useBoundWithsMutation/useBoundWithsMutation.test.js b/src/Item/hooks/useBoundWithsMutation/useBoundWithsMutation.test.js
index b0ddcea49..5b24e22a9 100644
--- a/src/Item/hooks/useBoundWithsMutation/useBoundWithsMutation.test.js
+++ b/src/Item/hooks/useBoundWithsMutation/useBoundWithsMutation.test.js
@@ -2,7 +2,7 @@ import '../../../../test/jest/__mock__';
 
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import { useOkapiKy } from '@folio/stripes/core';
 
diff --git a/src/Item/hooks/useItem/useItem.test.js b/src/Item/hooks/useItem/useItem.test.js
index 9a25a6b17..e42c9f8ea 100644
--- a/src/Item/hooks/useItem/useItem.test.js
+++ b/src/Item/hooks/useItem/useItem.test.js
@@ -2,7 +2,7 @@ import '../../../../test/jest/__mock__';
 
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import { useOkapiKy } from '@folio/stripes/core';
 
diff --git a/src/Item/hooks/useItemMutation/useItemMutation.test.js b/src/Item/hooks/useItemMutation/useItemMutation.test.js
index 0fd7b2226..5ea7fb8d7 100644
--- a/src/Item/hooks/useItemMutation/useItemMutation.test.js
+++ b/src/Item/hooks/useItemMutation/useItemMutation.test.js
@@ -2,7 +2,7 @@ import '../../../../test/jest/__mock__';
 
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import { useOkapiKy } from '@folio/stripes/core';
 
diff --git a/src/RemoteStorageService/Check.test.js b/src/RemoteStorageService/Check.test.js
index b6a832488..3ae6ae524 100644
--- a/src/RemoteStorageService/Check.test.js
+++ b/src/RemoteStorageService/Check.test.js
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 import '../../test/jest/__mock__';
 import { useHoldings } from '../providers';
 import { useByLocation, useByHoldings } from './Check';
diff --git a/src/ViewHoldingsRecord.test.js b/src/ViewHoldingsRecord.test.js
index 9b8594a8f..3f069ad10 100644
--- a/src/ViewHoldingsRecord.test.js
+++ b/src/ViewHoldingsRecord.test.js
@@ -2,8 +2,8 @@ import '../test/jest/__mock__';
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { MemoryRouter } from 'react-router-dom';
-import userEvent from '@testing-library/user-event';
-import { screen, waitFor } from '@testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
+import { screen, waitFor } from '@folio/jest-config-stripes/testing-library/react';
 
 import { renderWithIntl, translationsProperties } from '../test/jest/helpers';
 import ViewHoldingsRecord from './ViewHoldingsRecord';
diff --git a/src/ViewInstance.test.js b/src/ViewInstance.test.js
index 0d1de999b..6bcf5bfa9 100644
--- a/src/ViewInstance.test.js
+++ b/src/ViewInstance.test.js
@@ -1,7 +1,7 @@
 import '../test/jest/__mock__';
 import React from 'react';
-import { screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen, waitFor } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { QueryClient, QueryClientProvider } from 'react-query';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
@@ -28,7 +28,7 @@ jest.mock('./components/ImportRecordModal/ImportRecordModal', () => (props) => {
       externalIdentifier: 'externalIdentifier',
       selectedJobProfileId: 'profileId'
     };
-    const container = 
+    const container =
     <div>
       <div>ImportRecordModal</div>
       <button type="button" onClick={() => handleSubmit(args)}>handleSubmit</button>
diff --git a/src/common/hooks/useConfirmationModal.test.js b/src/common/hooks/useConfirmationModal.test.js
index 501d37475..6ca14282c 100644
--- a/src/common/hooks/useConfirmationModal.test.js
+++ b/src/common/hooks/useConfirmationModal.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import { waitFor } from '@testing-library/react';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { waitFor } from '@folio/jest-config-stripes/testing-library/react';
+import { act, renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 import { useConfirmationModal } from './useConfirmationModal';
 
 describe('useConfirmationModal', () => {
diff --git a/src/common/hooks/useControlledAccordion/useControlledAccordion.test.js b/src/common/hooks/useControlledAccordion/useControlledAccordion.test.js
index f4d990c55..1c9759cf1 100644
--- a/src/common/hooks/useControlledAccordion/useControlledAccordion.test.js
+++ b/src/common/hooks/useControlledAccordion/useControlledAccordion.test.js
@@ -1,4 +1,4 @@
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import useControlledAccordion from './useControlledAccordion';
 
diff --git a/src/common/hooks/useFacets.test.js b/src/common/hooks/useFacets.test.js
index 5791ee5f9..fbfab6ac8 100644
--- a/src/common/hooks/useFacets.test.js
+++ b/src/common/hooks/useFacets.test.js
@@ -1,4 +1,4 @@
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@folio/jest-config-stripes/testing-library/react-hooks';
 import { useLocation } from 'react-router-dom';
 import React from 'react';
 import { useFacetSettings } from '../../stores/facetsStore';
diff --git a/src/common/hooks/useGoBack.test.js b/src/common/hooks/useGoBack.test.js
index 69639eb94..45672584b 100644
--- a/src/common/hooks/useGoBack.test.js
+++ b/src/common/hooks/useGoBack.test.js
@@ -1,4 +1,4 @@
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@folio/jest-config-stripes/testing-library/react-hooks';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router-dom';
 import useGoBack from './useGoBack';
diff --git a/src/common/hooks/useHolding/useHolding.test.js b/src/common/hooks/useHolding/useHolding.test.js
index a543af849..4b627002a 100644
--- a/src/common/hooks/useHolding/useHolding.test.js
+++ b/src/common/hooks/useHolding/useHolding.test.js
@@ -2,7 +2,7 @@ import '../../../../test/jest/__mock__';
 
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import { useOkapiKy } from '@folio/stripes/core';
 
diff --git a/src/common/hooks/useInstance.test.js b/src/common/hooks/useInstance.test.js
index ebfc1e2a4..28539398d 100644
--- a/src/common/hooks/useInstance.test.js
+++ b/src/common/hooks/useInstance.test.js
@@ -1,4 +1,4 @@
-import { renderHook, act } from '@testing-library/react-hooks';
+import { renderHook, act } from '@folio/jest-config-stripes/testing-library/react-hooks';
 import useInstance from './useInstance';
 
 describe('useInstance', () => {
diff --git a/src/common/hooks/useInstanceQuery/useInstanceQuery.test.js b/src/common/hooks/useInstanceQuery/useInstanceQuery.test.js
index 65ebaf42b..d31162211 100644
--- a/src/common/hooks/useInstanceQuery/useInstanceQuery.test.js
+++ b/src/common/hooks/useInstanceQuery/useInstanceQuery.test.js
@@ -2,7 +2,7 @@ import '../../../../test/jest/__mock__';
 
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import { useOkapiKy } from '@folio/stripes/core';
 
diff --git a/src/components/BrowseInventoryFilters/BrowseInventoryFilters.test.js b/src/components/BrowseInventoryFilters/BrowseInventoryFilters.test.js
index 91399d73b..b938aebc4 100644
--- a/src/components/BrowseInventoryFilters/BrowseInventoryFilters.test.js
+++ b/src/components/BrowseInventoryFilters/BrowseInventoryFilters.test.js
@@ -1,5 +1,5 @@
-import userEvent from '@testing-library/user-event';
-import { act, screen } from '@testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
+import { act, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '__mock__';
 
diff --git a/src/components/BrowseResultsList/BrowseResultsList.test.js b/src/components/BrowseResultsList/BrowseResultsList.test.js
index 0eac1f1b9..ee578c42e 100644
--- a/src/components/BrowseResultsList/BrowseResultsList.test.js
+++ b/src/components/BrowseResultsList/BrowseResultsList.test.js
@@ -1,9 +1,9 @@
 import '../../../test/jest/__mock__';
 
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import flow from 'lodash/flow';
 import queryString from 'query-string';
-import { act, cleanup, screen } from '@testing-library/react';
+import { act, cleanup, screen } from '@folio/jest-config-stripes/testing-library/react';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router-dom';
 
diff --git a/src/components/BrowseResultsList/getBrowseResultsFormatter.test.js b/src/components/BrowseResultsList/getBrowseResultsFormatter.test.js
index c53283a22..81db14d0f 100644
--- a/src/components/BrowseResultsList/getBrowseResultsFormatter.test.js
+++ b/src/components/BrowseResultsList/getBrowseResultsFormatter.test.js
@@ -1,7 +1,7 @@
 import '../../../test/jest/__mock__';
 
-import userEvent from '@testing-library/user-event';
-import { act, screen } from '@testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
+import { act, screen } from '@folio/jest-config-stripes/testing-library/react';
 import { createMemoryHistory } from 'history';
 import { Router } from 'react-router-dom';
 
diff --git a/src/components/BrowseResultsPane/BrowseResultsPane.test.js b/src/components/BrowseResultsPane/BrowseResultsPane.test.js
index 07a7fb9a6..55b67d992 100644
--- a/src/components/BrowseResultsPane/BrowseResultsPane.test.js
+++ b/src/components/BrowseResultsPane/BrowseResultsPane.test.js
@@ -1,6 +1,6 @@
 import '../../../test/jest/__mock__';
 
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import {
   renderWithIntl,
diff --git a/src/components/CheckboxFacet/CheckboxFacet.test.js b/src/components/CheckboxFacet/CheckboxFacet.test.js
index 56eb4cf45..5a1c03aae 100644
--- a/src/components/CheckboxFacet/CheckboxFacet.test.js
+++ b/src/components/CheckboxFacet/CheckboxFacet.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import { screen, act, render } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen, act, render } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import '../../../test/jest/__mock__';
 import { renderWithIntl, translationsProperties } from '../../../test/jest/helpers';
 import CheckboxFacet from './CheckboxFacet';
diff --git a/src/components/CheckboxFacet/CheckboxFacetList.test.js b/src/components/CheckboxFacet/CheckboxFacetList.test.js
index 7a355e523..7592abcef 100644
--- a/src/components/CheckboxFacet/CheckboxFacetList.test.js
+++ b/src/components/CheckboxFacet/CheckboxFacetList.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import { render, waitFor, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { render, waitFor, screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { useSearchValue } from '../../stores/facetsStore';
 import '../../../test/jest/__mock__';
 import CheckboxFacetList from './CheckboxFacetList';
diff --git a/src/components/FacetOptionFormatter/FacetOptionFormatter.test.js b/src/components/FacetOptionFormatter/FacetOptionFormatter.test.js
index 3b79ae5bd..d276a875e 100644
--- a/src/components/FacetOptionFormatter/FacetOptionFormatter.test.js
+++ b/src/components/FacetOptionFormatter/FacetOptionFormatter.test.js
@@ -1,6 +1,6 @@
 import '../../../test/jest/__mock__';
 
-import { render } from '@testing-library/react';
+import { render } from '@folio/jest-config-stripes/testing-library/react';
 
 import FacetOptionFormatter from './FacetOptionFormatter';
 
diff --git a/src/components/HoldingsRecordFilters/holdingsRecordFilterRenderer.test.js b/src/components/HoldingsRecordFilters/holdingsRecordFilterRenderer.test.js
index 4a461b3f9..d5b53a042 100644
--- a/src/components/HoldingsRecordFilters/holdingsRecordFilterRenderer.test.js
+++ b/src/components/HoldingsRecordFilters/holdingsRecordFilterRenderer.test.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 
-import userEvent from '@testing-library/user-event';
-import { screen } from '@testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import '../../../test/jest/__mock__/currencyData.mock';
 import '../../../test/jest/__mock__/stripesConfig.mock';
 import '../../../test/jest/__mock__/stripesCore.mock';
diff --git a/src/components/ImportRecordModal/ImportRecordModal.test.js b/src/components/ImportRecordModal/ImportRecordModal.test.js
index 320b64a76..2bbe2c950 100644
--- a/src/components/ImportRecordModal/ImportRecordModal.test.js
+++ b/src/components/ImportRecordModal/ImportRecordModal.test.js
@@ -7,7 +7,7 @@ import '../../../test/jest/__mock__';
 import {
   fireEvent,
   screen,
-} from '@testing-library/dom';
+} from '@folio/jest-config-stripes/testing-library/dom';
 import {
   renderWithIntl,
   translationsProperties,
diff --git a/src/components/InstanceFilters/InstanceFilters.test.js b/src/components/InstanceFilters/InstanceFilters.test.js
index eb2e4d8b1..7aa8fa236 100644
--- a/src/components/InstanceFilters/InstanceFilters.test.js
+++ b/src/components/InstanceFilters/InstanceFilters.test.js
@@ -1,10 +1,10 @@
 import React from 'react';
 import '../../../test/jest/__mock__';
 import { BrowserRouter as Router } from 'react-router-dom';
-import { screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@folio/jest-config-stripes/testing-library/react';
 import { ModuleHierarchyProvider } from '@folio/stripes-core/src/components/ModuleHierarchy';
 
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import renderWithIntl from '../../../test/jest/helpers/renderWithIntl';
 import {
   FACETS
diff --git a/src/components/InstanceFilters/InstanceFiltersBrowse/instanceFiltersBrowse.test.js b/src/components/InstanceFilters/InstanceFiltersBrowse/instanceFiltersBrowse.test.js
index cbc74eee2..ecae4dff6 100644
--- a/src/components/InstanceFilters/InstanceFiltersBrowse/instanceFiltersBrowse.test.js
+++ b/src/components/InstanceFilters/InstanceFiltersBrowse/instanceFiltersBrowse.test.js
@@ -4,7 +4,7 @@ import { noop } from 'lodash';
 import {
   screen,
   fireEvent,
-} from '@testing-library/react';
+} from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/components/InstancesList/InstancesList.test.js b/src/components/InstancesList/InstancesList.test.js
index 53b8181c6..347b892fd 100644
--- a/src/components/InstancesList/InstancesList.test.js
+++ b/src/components/InstancesList/InstancesList.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Router } from 'react-router-dom';
 import { noop } from 'lodash';
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { createMemoryHistory } from 'history';
 import {
   act,
@@ -9,7 +9,7 @@ import {
   screen,
   waitFor,
   cleanup,
-} from '@testing-library/react';
+} from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/components/ItemFilters/itemFilterRenderer.test.js b/src/components/ItemFilters/itemFilterRenderer.test.js
index 93a5afbc6..8ea6ea3bb 100644
--- a/src/components/ItemFilters/itemFilterRenderer.test.js
+++ b/src/components/ItemFilters/itemFilterRenderer.test.js
@@ -1,8 +1,8 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { noop } from 'lodash';
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/components/MissedMatchItem/MissedMatchItem.test.js b/src/components/MissedMatchItem/MissedMatchItem.test.js
index d7e4be015..32958fe94 100644
--- a/src/components/MissedMatchItem/MissedMatchItem.test.js
+++ b/src/components/MissedMatchItem/MissedMatchItem.test.js
@@ -1,6 +1,6 @@
 import '../../../test/jest/__mock__';
 
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import {
   renderWithIntl,
diff --git a/src/components/MultiSelectionFacet/MultiSelectionFacet.test.js b/src/components/MultiSelectionFacet/MultiSelectionFacet.test.js
index 4f1c115f5..76f07d145 100644
--- a/src/components/MultiSelectionFacet/MultiSelectionFacet.test.js
+++ b/src/components/MultiSelectionFacet/MultiSelectionFacet.test.js
@@ -3,7 +3,7 @@ import {
   render,
   screen,
   fireEvent,
-} from '@testing-library/react';
+} from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/components/NewOrderModal/NewOrderModal.test.js b/src/components/NewOrderModal/NewOrderModal.test.js
index e371f0def..bc7e9bd4e 100644
--- a/src/components/NewOrderModal/NewOrderModal.test.js
+++ b/src/components/NewOrderModal/NewOrderModal.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
-import user from '@testing-library/user-event';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
+import user from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/components/NewOrderModal/NewOrderModalContainer.test.js b/src/components/NewOrderModal/NewOrderModalContainer.test.js
index 14c8e6dca..5461ee4ff 100644
--- a/src/components/NewOrderModal/NewOrderModalContainer.test.js
+++ b/src/components/NewOrderModal/NewOrderModalContainer.test.js
@@ -3,8 +3,8 @@ import {
   BrowserRouter as Router,
   useHistory,
 } from 'react-router-dom';
-import { act, render, screen } from '@testing-library/react';
-import user from '@testing-library/user-event';
+import { act, render, screen } from '@folio/jest-config-stripes/testing-library/react';
+import user from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/components/SearchModeNavigation/SearchModeNavigation.test.js b/src/components/SearchModeNavigation/SearchModeNavigation.test.js
index b81245876..1093a45f5 100644
--- a/src/components/SearchModeNavigation/SearchModeNavigation.test.js
+++ b/src/components/SearchModeNavigation/SearchModeNavigation.test.js
@@ -1,4 +1,4 @@
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 
 import '../../../test/jest/__mock__';
diff --git a/src/components/TagsFilter/TagsFilter.test.js b/src/components/TagsFilter/TagsFilter.test.js
index a27fdda0f..3698a789a 100644
--- a/src/components/TagsFilter/TagsFilter.test.js
+++ b/src/components/TagsFilter/TagsFilter.test.js
@@ -4,7 +4,7 @@ import {
   cleanup,
   fireEvent,
   screen,
-} from '@testing-library/react';
+} from '@folio/jest-config-stripes/testing-library/react';
 import { noop } from 'lodash';
 
 import '../../../test/jest/__mock__';
diff --git a/src/components/ViewInstance/MenuSection/NewInstanceRequestButton.test.js b/src/components/ViewInstance/MenuSection/NewInstanceRequestButton.test.js
index 2bdde6a10..5f741878c 100644
--- a/src/components/ViewInstance/MenuSection/NewInstanceRequestButton.test.js
+++ b/src/components/ViewInstance/MenuSection/NewInstanceRequestButton.test.js
@@ -3,7 +3,7 @@ import { BrowserRouter } from 'react-router-dom';
 import {
   render,
   screen,
-} from '@testing-library/react';
+} from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/components/ViewInstance/MenuSection/RequestsReorderButton.test.js b/src/components/ViewInstance/MenuSection/RequestsReorderButton.test.js
index c53570306..d958610ab 100644
--- a/src/components/ViewInstance/MenuSection/RequestsReorderButton.test.js
+++ b/src/components/ViewInstance/MenuSection/RequestsReorderButton.test.js
@@ -3,7 +3,7 @@ import { BrowserRouter } from 'react-router-dom';
 import {
   render,
   screen,
-} from '@testing-library/react';
+} from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../test/jest/__mock__';
 
diff --git a/src/components/ViewSource/ViewSource.test.js b/src/components/ViewSource/ViewSource.test.js
index 4ce2667c5..d623f9949 100644
--- a/src/components/ViewSource/ViewSource.test.js
+++ b/src/components/ViewSource/ViewSource.test.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { act } from 'react-dom/test-utils';
-import { screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/components/WarningMessage/WarningMessage.test.js b/src/components/WarningMessage/WarningMessage.test.js
index 27453984c..719e560ee 100644
--- a/src/components/WarningMessage/WarningMessage.test.js
+++ b/src/components/WarningMessage/WarningMessage.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/contexts/DataContext.test.js b/src/contexts/DataContext.test.js
index dec690dec..50313a54d 100644
--- a/src/contexts/DataContext.test.js
+++ b/src/contexts/DataContext.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { render } from '@folio/jest-config-stripes/testing-library/react';
 import DataContext from './DataContext';
 
 describe('DataContext', () => {
diff --git a/src/edit/InstanceForm.test.js b/src/edit/InstanceForm.test.js
index fd90725d0..b8878a692 100644
--- a/src/edit/InstanceForm.test.js
+++ b/src/edit/InstanceForm.test.js
@@ -4,7 +4,7 @@ import {
   QueryClient,
   QueryClientProvider,
 } from 'react-query';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/administrativeNodeFields.test.js b/src/edit/administrativeNodeFields.test.js
index 9dce2ba16..e3a10d4dd 100644
--- a/src/edit/administrativeNodeFields.test.js
+++ b/src/edit/administrativeNodeFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/alternativeTitles.test.js b/src/edit/alternativeTitles.test.js
index 06672add2..265b71051 100644
--- a/src/edit/alternativeTitles.test.js
+++ b/src/edit/alternativeTitles.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/classificationFields.test.js b/src/edit/classificationFields.test.js
index 8d9c682ba..cd3052d18 100644
--- a/src/edit/classificationFields.test.js
+++ b/src/edit/classificationFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/components/PrimaryToggleButton/PrimaryToggleButton.test.js b/src/edit/components/PrimaryToggleButton/PrimaryToggleButton.test.js
index 7088a239f..d4a7f46f5 100644
--- a/src/edit/components/PrimaryToggleButton/PrimaryToggleButton.test.js
+++ b/src/edit/components/PrimaryToggleButton/PrimaryToggleButton.test.js
@@ -2,8 +2,8 @@ import React from 'react';
 import {
   render,
   screen,
-} from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+} from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../../test/jest/__mock__';
 import Harness from '../../../../test/jest/helpers/Harness';
diff --git a/src/edit/contributorFields.test.js b/src/edit/contributorFields.test.js
index d3794c2e4..abb221541 100644
--- a/src/edit/contributorFields.test.js
+++ b/src/edit/contributorFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/descriptionFields.test.js b/src/edit/descriptionFields.test.js
index a55ee7bd1..27dbbda7a 100644
--- a/src/edit/descriptionFields.test.js
+++ b/src/edit/descriptionFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/editionFields.test.js b/src/edit/editionFields.test.js
index 9e7579c9c..d75ed6d80 100644
--- a/src/edit/editionFields.test.js
+++ b/src/edit/editionFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/electronicAccessFields.test.js b/src/edit/electronicAccessFields.test.js
index 3edb28b6d..462ebe93a 100644
--- a/src/edit/electronicAccessFields.test.js
+++ b/src/edit/electronicAccessFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/holdings/HoldingsForm.test.js b/src/edit/holdings/HoldingsForm.test.js
index f57a2da9b..bc683fb4b 100644
--- a/src/edit/holdings/HoldingsForm.test.js
+++ b/src/edit/holdings/HoldingsForm.test.js
@@ -4,7 +4,7 @@ import {
   QueryClient,
   QueryClientProvider,
 } from 'react-query';
-import { fireEvent } from '@testing-library/react';
+import { fireEvent } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/edit/holdings/RemoteStorageWarning.test.js b/src/edit/holdings/RemoteStorageWarning.test.js
index aa301c937..ca593b92a 100644
--- a/src/edit/holdings/RemoteStorageWarning.test.js
+++ b/src/edit/holdings/RemoteStorageWarning.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Form } from 'react-final-form';
-import { screen } from '@testing-library/react';
-import { cleanup } from '@testing-library/react-hooks';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import { cleanup } from '@folio/jest-config-stripes/testing-library/react-hooks';
 import '../../../test/jest/__mock__';
 import { renderWithIntl, translationsProperties } from '../../../test/jest/helpers';
 import { RemoteStorageWarning } from './RemoteStorageWarning';
diff --git a/src/edit/holdings/repeatableFields/tests/HoldingsStatementFields.test.js b/src/edit/holdings/repeatableFields/tests/HoldingsStatementFields.test.js
index 3481b8698..3ada5b3ce 100644
--- a/src/edit/holdings/repeatableFields/tests/HoldingsStatementFields.test.js
+++ b/src/edit/holdings/repeatableFields/tests/HoldingsStatementFields.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import '../../../../../test/jest/__mock__';
 import stripesFinalForm from '@folio/stripes/final-form';
 import renderWithRouter from '../../../../../test/jest/helpers/renderWithRouter';
diff --git a/src/edit/holdings/repeatableFields/tests/HoldingsStatementForSupplementsFields.test.js b/src/edit/holdings/repeatableFields/tests/HoldingsStatementForSupplementsFields.test.js
index 76bbd589d..6359003fe 100644
--- a/src/edit/holdings/repeatableFields/tests/HoldingsStatementForSupplementsFields.test.js
+++ b/src/edit/holdings/repeatableFields/tests/HoldingsStatementForSupplementsFields.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import '../../../../../test/jest/__mock__';
 import stripesFinalForm from '@folio/stripes/final-form';
 import renderWithRouter from '../../../../../test/jest/helpers/renderWithRouter';
diff --git a/src/edit/holdings/repeatableFields/tests/NoteFields.test.js b/src/edit/holdings/repeatableFields/tests/NoteFields.test.js
index 8e6dc209f..0992d28e9 100644
--- a/src/edit/holdings/repeatableFields/tests/NoteFields.test.js
+++ b/src/edit/holdings/repeatableFields/tests/NoteFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../../../../test/jest/__mock__';
 
diff --git a/src/edit/identifierFields.test.js b/src/edit/identifierFields.test.js
index 52f44c0df..5338dfb95 100644
--- a/src/edit/identifierFields.test.js
+++ b/src/edit/identifierFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/instanceFormatFields.test.js b/src/edit/instanceFormatFields.test.js
index 94eccf77d..a70eed0b8 100644
--- a/src/edit/instanceFormatFields.test.js
+++ b/src/edit/instanceFormatFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import '../../test/jest/__mock__';
 import stripesFinalForm from '@folio/stripes/final-form';
 import renderWithRouter from '../../test/jest/helpers/renderWithRouter';
diff --git a/src/edit/items/RemoteStorageWarning.test.js b/src/edit/items/RemoteStorageWarning.test.js
index 6ac006291..3b868efdd 100644
--- a/src/edit/items/RemoteStorageWarning.test.js
+++ b/src/edit/items/RemoteStorageWarning.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Form } from 'react-final-form';
-import { cleanup } from '@testing-library/react-hooks';
+import { cleanup } from '@folio/jest-config-stripes/testing-library/react-hooks';
 import '../../../test/jest/__mock__';
 import { renderWithIntl, translationsProperties } from '../../../test/jest/helpers';
 import { RemoteStorageWarning } from './RemoteStorageWarning';
diff --git a/src/edit/items/repeatableFields/tests/BoundWithTitlesFields.test.js b/src/edit/items/repeatableFields/tests/BoundWithTitlesFields.test.js
index 0eb8ff7d4..9319efa5c 100644
--- a/src/edit/items/repeatableFields/tests/BoundWithTitlesFields.test.js
+++ b/src/edit/items/repeatableFields/tests/BoundWithTitlesFields.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import userEvent from '@testing-library/user-event';
-import { waitFor } from '@testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
+import { waitFor } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../../../test/jest/__mock__';
 
diff --git a/src/edit/languageFields.test.js b/src/edit/languageFields.test.js
index b09039574..9ec68204c 100644
--- a/src/edit/languageFields.test.js
+++ b/src/edit/languageFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/natureOfContentFields.test.js b/src/edit/natureOfContentFields.test.js
index af098f826..f64b5c620 100644
--- a/src/edit/natureOfContentFields.test.js
+++ b/src/edit/natureOfContentFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/noteFields.test.js b/src/edit/noteFields.test.js
index 77e86db6d..1b3120dda 100644
--- a/src/edit/noteFields.test.js
+++ b/src/edit/noteFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/edit/precedingTitleFields.test.js b/src/edit/precedingTitleFields.test.js
index 6c6450940..905bf1601 100644
--- a/src/edit/precedingTitleFields.test.js
+++ b/src/edit/precedingTitleFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
 import '../../test/jest/__mock__';
 import stripesFinalForm from '@folio/stripes/final-form';
diff --git a/src/edit/publicationFields.test.js b/src/edit/publicationFields.test.js
index 6e57fbfe5..0c7699b1a 100644
--- a/src/edit/publicationFields.test.js
+++ b/src/edit/publicationFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import '../../test/jest/__mock__';
 import stripesFinalForm from '@folio/stripes/final-form';
 import renderWithRouter from '../../test/jest/helpers/renderWithRouter';
@@ -41,7 +41,7 @@ describe('PublicationFields', () => {
 
       const publicationButton = screen.getByText('Add publication');
       userEvent.click(publicationButton);
-      
+
       expect(screen.getByText('Publisher')).toBeInTheDocument();
       expect(screen.getByText('Publisher role')).toBeInTheDocument();
       expect(screen.getByText('Place')).toBeInTheDocument();
diff --git a/src/edit/publicationFrequencyFields.test.js b/src/edit/publicationFrequencyFields.test.js
index 63a5ddcaa..a09e6dc43 100644
--- a/src/edit/publicationFrequencyFields.test.js
+++ b/src/edit/publicationFrequencyFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import '../../test/jest/__mock__';
 import stripesFinalForm from '@folio/stripes/final-form';
 import renderWithRouter from '../../test/jest/helpers/renderWithRouter';
diff --git a/src/edit/publicationRangeFields.test.js b/src/edit/publicationRangeFields.test.js
index 3928ec1d7..600c1715b 100644
--- a/src/edit/publicationRangeFields.test.js
+++ b/src/edit/publicationRangeFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import '../../test/jest/__mock__';
 import stripesFinalForm from '@folio/stripes/final-form';
 import renderWithRouter from '../../test/jest/helpers/renderWithRouter';
diff --git a/src/edit/seriesFields.test.js b/src/edit/seriesFields.test.js
index b328dbdeb..7e8935e60 100644
--- a/src/edit/seriesFields.test.js
+++ b/src/edit/seriesFields.test.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import { screen, fireEvent } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen, fireEvent } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import '../../test/jest/__mock__';
 import stripesFinalForm from '@folio/stripes/final-form';
 import renderWithRouter from '../../test/jest/helpers/renderWithRouter';
diff --git a/src/edit/subjectFields.test.js b/src/edit/subjectFields.test.js
index 8d4287eb0..963ede9e8 100644
--- a/src/edit/subjectFields.test.js
+++ b/src/edit/subjectFields.test.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import '../../test/jest/__mock__';
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import stripesFinalForm from '@folio/stripes/final-form';
 import renderWithRouter from '../../test/jest/helpers/renderWithRouter';
 import renderWithIntl from '../../test/jest/helpers/renderWithIntl';
diff --git a/src/edit/succeedingTitleFields.test.js b/src/edit/succeedingTitleFields.test.js
index b9b5b814b..eff784771 100644
--- a/src/edit/succeedingTitleFields.test.js
+++ b/src/edit/succeedingTitleFields.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import userEvent from '@testing-library/user-event';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import '../../test/jest/__mock__';
 import stripesFinalForm from '@folio/stripes/final-form';
 import renderWithRouter from '../../test/jest/helpers/renderWithRouter';
diff --git a/src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.test.js b/src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.test.js
index fa90e8cdc..74bb90286 100644
--- a/src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.test.js
+++ b/src/hooks/useBoundWithTitlesByHrids/useBoundWithTitlesByHrids.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/hooks/useBrowseValidation/useBrowseValidation.test.js b/src/hooks/useBrowseValidation/useBrowseValidation.test.js
index b08c42c3b..5418b8f8c 100644
--- a/src/hooks/useBrowseValidation/useBrowseValidation.test.js
+++ b/src/hooks/useBrowseValidation/useBrowseValidation.test.js
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/hooks/useHoldingItemsQuery.test.js b/src/hooks/useHoldingItemsQuery.test.js
index c66aac7e6..f297606bd 100644
--- a/src/hooks/useHoldingItemsQuery.test.js
+++ b/src/hooks/useHoldingItemsQuery.test.js
@@ -3,7 +3,7 @@ import {
   QueryClient,
   QueryClientProvider,
 } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/hooks/useHoldingMutation/useHoldingMutation.test.js b/src/hooks/useHoldingMutation/useHoldingMutation.test.js
index 992e8467b..a615c843f 100644
--- a/src/hooks/useHoldingMutation/useHoldingMutation.test.js
+++ b/src/hooks/useHoldingMutation/useHoldingMutation.test.js
@@ -2,7 +2,7 @@ import '../../../test/jest/__mock__';
 
 import React from 'react';
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import { useOkapiKy } from '@folio/stripes/core';
 
diff --git a/src/hooks/useHoldingsQueryByHrids.test.js b/src/hooks/useHoldingsQueryByHrids.test.js
index cb20c4d5d..13a2c1fc0 100644
--- a/src/hooks/useHoldingsQueryByHrids.test.js
+++ b/src/hooks/useHoldingsQueryByHrids.test.js
@@ -3,7 +3,7 @@ import {
   QueryClient,
   QueryClientProvider,
 } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/hooks/useInstancesQuery.test.js b/src/hooks/useInstancesQuery.test.js
index 8b809808f..4e11ec7be 100644
--- a/src/hooks/useInstancesQuery.test.js
+++ b/src/hooks/useInstancesQuery.test.js
@@ -3,7 +3,7 @@ import {
   QueryClient,
   QueryClientProvider,
 } from 'react-query';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/hooks/useInventoryBrowse/useInventoryBrowse.test.js b/src/hooks/useInventoryBrowse/useInventoryBrowse.test.js
index 1aa7b7ce9..a5e15180d 100644
--- a/src/hooks/useInventoryBrowse/useInventoryBrowse.test.js
+++ b/src/hooks/useInventoryBrowse/useInventoryBrowse.test.js
@@ -1,5 +1,5 @@
 import { QueryClient, QueryClientProvider } from 'react-query';
-import { act, renderHook } from '@testing-library/react-hooks';
+import { act, renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/hooks/useLogout/useLogout.test.js b/src/hooks/useLogout/useLogout.test.js
index 2f544dcdb..47097f70b 100644
--- a/src/hooks/useLogout/useLogout.test.js
+++ b/src/hooks/useLogout/useLogout.test.js
@@ -1,5 +1,5 @@
 import { Router } from 'react-router-dom';
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/hooks/useReferenceData.test.js b/src/hooks/useReferenceData.test.js
index 1fa3afb30..40249b84f 100644
--- a/src/hooks/useReferenceData.test.js
+++ b/src/hooks/useReferenceData.test.js
@@ -1,4 +1,4 @@
-import { renderHook } from '@testing-library/react-hooks';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
 import { DataContext } from '../contexts';
 import useReferenceData from './useReferenceData';
 
diff --git a/src/providers/DataProviders.test.js b/src/providers/DataProviders.test.js
index 8af413269..40e991cba 100644
--- a/src/providers/DataProviders.test.js
+++ b/src/providers/DataProviders.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 import { resources, resources2 } from '../../test/fixtures/DataProviders';
 import '../../test/jest/__mock__';
 
diff --git a/src/providers/HoldingsProvider.test.js b/src/providers/HoldingsProvider.test.js
index 1129dc794..66b86a57d 100644
--- a/src/providers/HoldingsProvider.test.js
+++ b/src/providers/HoldingsProvider.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, act } from '@testing-library/react';
+import { render, act } from '@folio/jest-config-stripes/testing-library/react';
 
 import { useQuery } from 'react-query';
 import '../../test/jest/__mock__';
diff --git a/src/providers/LastSearchTermsProvider.test.js b/src/providers/LastSearchTermsProvider.test.js
index e541a5bd5..a370ea2b7 100644
--- a/src/providers/LastSearchTermsProvider.test.js
+++ b/src/providers/LastSearchTermsProvider.test.js
@@ -1,4 +1,4 @@
-import { render } from '@testing-library/react';
+import { render } from '@folio/jest-config-stripes/testing-library/react';
 import '../../test/jest/__mock__';
 import LastSearchTermsProvider from './LastSearchTermsProvider';
 import { LastSearchTermsContext } from '../contexts';
diff --git a/src/referenceFormatters.test.js b/src/referenceFormatters.test.js
index 595ff790e..5bdd056bd 100644
--- a/src/referenceFormatters.test.js
+++ b/src/referenceFormatters.test.js
@@ -1,4 +1,4 @@
-import { render, cleanup } from '@testing-library/react';
+import { render, cleanup } from '@folio/jest-config-stripes/testing-library/react';
 import * as Formatter from './referenceFormatters';
 
 describe('ContributorsFormatter', () => {
diff --git a/src/routes/BrowseRoute/BrowseRoute.test.js b/src/routes/BrowseRoute/BrowseRoute.test.js
index 4efa1f386..6b5b58cab 100644
--- a/src/routes/BrowseRoute/BrowseRoute.test.js
+++ b/src/routes/BrowseRoute/BrowseRoute.test.js
@@ -1,7 +1,7 @@
 import '../../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import {
   renderWithIntl,
diff --git a/src/routes/CreateItemRoute.test.js b/src/routes/CreateItemRoute.test.js
index 3cdc91590..53c0e59d1 100644
--- a/src/routes/CreateItemRoute.test.js
+++ b/src/routes/CreateItemRoute.test.js
@@ -1,7 +1,7 @@
 import '../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import CreateItemRoute from './CreateItemRoute';
 
diff --git a/src/routes/DuplicateHoldingRoute.test.js b/src/routes/DuplicateHoldingRoute.test.js
index cf7805695..0994d43cc 100644
--- a/src/routes/DuplicateHoldingRoute.test.js
+++ b/src/routes/DuplicateHoldingRoute.test.js
@@ -1,7 +1,7 @@
 import '../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import DuplicateHoldingRoute from './DuplicateHoldingRoute';
 
diff --git a/src/routes/DuplicateItemRoute.test.js b/src/routes/DuplicateItemRoute.test.js
index a6955fc3d..d604e25bb 100644
--- a/src/routes/DuplicateItemRoute.test.js
+++ b/src/routes/DuplicateItemRoute.test.js
@@ -1,7 +1,7 @@
 import '../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import DuplicateItemRoute from './DuplicateItemRoute';
 
diff --git a/src/routes/EditHoldingRoute.test.js b/src/routes/EditHoldingRoute.test.js
index 65dba69a5..6b60c7080 100644
--- a/src/routes/EditHoldingRoute.test.js
+++ b/src/routes/EditHoldingRoute.test.js
@@ -1,7 +1,7 @@
 import '../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import EditHoldingRoute from './EditHoldingRoute';
 
diff --git a/src/routes/EditItemRoute.test.js b/src/routes/EditItemRoute.test.js
index c7cb12fa3..52a036da1 100644
--- a/src/routes/EditItemRoute.test.js
+++ b/src/routes/EditItemRoute.test.js
@@ -1,7 +1,7 @@
 import '../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import EditItemRoute from './EditItemRoute';
 
diff --git a/src/routes/InstancesRoute.test.js b/src/routes/InstancesRoute.test.js
index 620db0d7c..357b1bfb0 100644
--- a/src/routes/InstancesRoute.test.js
+++ b/src/routes/InstancesRoute.test.js
@@ -7,8 +7,8 @@ import {
   getAllByRole,
   waitForElementToBeRemoved,
   waitFor,
-} from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+} from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { noop } from 'lodash';
 
 import '../../test/jest/__mock__';
diff --git a/src/routes/ViewHoldingRoute.test.js b/src/routes/ViewHoldingRoute.test.js
index a648fc101..65065d09f 100644
--- a/src/routes/ViewHoldingRoute.test.js
+++ b/src/routes/ViewHoldingRoute.test.js
@@ -1,7 +1,7 @@
 import '../../test/jest/__mock__';
 
 import { MemoryRouter } from 'react-router-dom';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import ViewHoldingRoute from './ViewHoldingRoute';
 
diff --git a/src/settings/FastAdd/FastAddForm.test.js b/src/settings/FastAdd/FastAddForm.test.js
index 890290751..3827d27ab 100644
--- a/src/settings/FastAdd/FastAddForm.test.js
+++ b/src/settings/FastAdd/FastAddForm.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
-import userEvent from '@testing-library/user-event';
-import { screen } from '@testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import { FormattedMessage } from 'react-intl';
 import '../../../test/jest/__mock__';
 import {
diff --git a/src/settings/FastAdd/FastAddSettings.test.js b/src/settings/FastAdd/FastAddSettings.test.js
index 931dc8099..75fac8978 100644
--- a/src/settings/FastAdd/FastAddSettings.test.js
+++ b/src/settings/FastAdd/FastAddSettings.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Form } from 'react-final-form';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import '../../../test/jest/__mock__';
 import { renderWithIntl, stripesStub, translationsProperties } from '../../../test/jest/helpers';
 import FastAddSettings from './FastAddSettings';
diff --git a/src/settings/ItemNoteTypesSettings.test.js b/src/settings/ItemNoteTypesSettings.test.js
index d427a39c3..4ff75e38e 100644
--- a/src/settings/ItemNoteTypesSettings.test.js
+++ b/src/settings/ItemNoteTypesSettings.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/settings/StatisticalCodeSettings.test.js b/src/settings/StatisticalCodeSettings.test.js
index 467ee870f..c38c4c219 100644
--- a/src/settings/StatisticalCodeSettings.test.js
+++ b/src/settings/StatisticalCodeSettings.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render, screen } from '@folio/jest-config-stripes/testing-library/react';
 import { Form } from 'react-final-form';
 import { IntlProvider } from 'react-intl';
 import '../../test/jest/__mock__';
diff --git a/src/settings/TargetProfileForm.test.js b/src/settings/TargetProfileForm.test.js
index e1be783c2..67face389 100644
--- a/src/settings/TargetProfileForm.test.js
+++ b/src/settings/TargetProfileForm.test.js
@@ -3,7 +3,7 @@ import { MemoryRouter } from 'react-router-dom';
 import {
   fireEvent,
   waitFor,
-} from '@testing-library/react';
+} from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../test/jest/__mock__';
 
diff --git a/src/settings/TargetProfiles.test.js b/src/settings/TargetProfiles.test.js
index b9e9963b5..40664dbe7 100644
--- a/src/settings/TargetProfiles.test.js
+++ b/src/settings/TargetProfiles.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
 import '../../test/jest/__mock__/currencyData.mock';
diff --git a/src/views/BrowseInventory/BrowseInventory.test.js b/src/views/BrowseInventory/BrowseInventory.test.js
index f8866f063..619f93c4b 100644
--- a/src/views/BrowseInventory/BrowseInventory.test.js
+++ b/src/views/BrowseInventory/BrowseInventory.test.js
@@ -2,8 +2,8 @@ import '../../../test/jest/__mock__';
 
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
-import userEvent from '@testing-library/user-event';
-import { act, screen } from '@testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
+import { act, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import { useLocationFilters } from '@folio/stripes-acq-components';
 
diff --git a/src/views/InstancesView.test.js b/src/views/InstancesView.test.js
index 03f946e1c..dc91e53d8 100644
--- a/src/views/InstancesView.test.js
+++ b/src/views/InstancesView.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render, act } from '@testing-library/react';
+import { render, act } from '@folio/jest-config-stripes/testing-library/react';
 import '../../test/jest/__mock__';
 import InstancesView from './InstancesView';
 import InstancesList from '../components/InstancesList';
diff --git a/src/views/ItemStatus/ItemStatus.test.js b/src/views/ItemStatus/ItemStatus.test.js
index 6a1b048a7..e7a3f7dac 100644
--- a/src/views/ItemStatus/ItemStatus.test.js
+++ b/src/views/ItemStatus/ItemStatus.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { screen } from '@testing-library/react';
-import { act } from '@testing-library/react-hooks';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import { act } from '@folio/jest-config-stripes/testing-library/react-hooks';
 
 import '../../../test/jest/__mock__';
 
diff --git a/src/views/ItemView.test.js b/src/views/ItemView.test.js
index 9c2c7fcbc..cd936e6f1 100644
--- a/src/views/ItemView.test.js
+++ b/src/views/ItemView.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter as Router } from 'react-router-dom';
 import { noop } from 'lodash';
-import { waitFor, screen } from '@testing-library/react';
+import { waitFor, screen } from '@folio/jest-config-stripes/testing-library/react';
 
 
 import '../../test/jest/__mock__';
diff --git a/src/withLocation.test.js b/src/withLocation.test.js
index 3482c117c..886a8fccb 100644
--- a/src/withLocation.test.js
+++ b/src/withLocation.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
-import { cleanup, render, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { cleanup, render, waitFor } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { Router } from 'react-router-dom';
 import { createMemoryHistory } from 'history';
 import withLocation from './withLocation';
diff --git a/test/jest/helpers/renderWithIntl.js b/test/jest/helpers/renderWithIntl.js
index 3f88dd3b2..4ba727acd 100644
--- a/test/jest/helpers/renderWithIntl.js
+++ b/test/jest/helpers/renderWithIntl.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { render } from '@testing-library/react';
+import { render } from '@folio/jest-config-stripes/testing-library/react';
 
 import Harness from './Harness';
 

From adc367d309435dac1746cb9750290498afe0bc9b Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Tue, 16 May 2023 18:45:52 +0300
Subject: [PATCH 22/68] UIIN-2353: Bump zustand to v4 (#2147)

---
 CHANGELOG.md              |  1 +
 package.json              |  9 +++++----
 src/stores/facetsStore.js | 31 ++++++++++++++-----------------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0052f4b2..fe27bb473 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 * Also support `circulation` `14.0`. Refs UIIN-2412.
 * Instance/Holdings/Item notes, administrative notes character limit to 32K. Refs UIIN-2354.
 * Import testing-library deps from `@folio/jest-config-stripes`. Refs UIIN-2427.
+* Bump zustand to v4. Refs UIIN-2353.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/package.json b/package.json
index e12e7075d..5f0c1e3d3 100644
--- a/package.json
+++ b/package.json
@@ -880,7 +880,8 @@
     "react-query": "^3.6.0",
     "react-router-dom": "^5.0.1",
     "regenerator-runtime": "^0.13.3",
-    "sinon": "^7.0.0"
+    "sinon": "^7.0.0",
+    "zustand": "^4.1.1"
   },
   "dependencies": {
     "@folio/quick-marc": "^6.0.0",
@@ -900,8 +901,7 @@
     "react-final-form-arrays": "^3.1.0",
     "react-final-form-listeners": "^1.0.2",
     "react-router-prop-types": "^1.0.4",
-    "redux-form": "^8.3.7",
-    "zustand": "^3.7.2"
+    "redux-form": "^8.3.7"
   },
   "peerDependencies": {
     "@folio/stripes": "^8.0.0",
@@ -909,7 +909,8 @@
     "react-intl": "^5.8.0",
     "react-query": "^3.6.0",
     "react-router": "^5.0.1",
-    "react-router-dom": "^5.0.1"
+    "react-router-dom": "^5.0.1",
+    "zustand": "^4.1.1"
   },
   "optionalDependencies": {
     "@folio/plugin-create-inventory-records": "^3.0.0",
diff --git a/src/stores/facetsStore.js b/src/stores/facetsStore.js
index 8cd215cd0..ab1c7db53 100644
--- a/src/stores/facetsStore.js
+++ b/src/stores/facetsStore.js
@@ -1,4 +1,5 @@
-import create from 'zustand';
+import { create } from 'zustand';
+import { omit } from 'lodash';
 
 // Facets store contains a global state related
 // to facets.
@@ -7,23 +8,19 @@ import create from 'zustand';
 // for each facet.
 const facetsStore = create((set) => ({
   facetSettings: {},
-  setFacetSettings: (name, value) => {
-    set(state => {
-      state.facetSettings = {
-        ...state.facetSettings,
-        [name]: {
-          ...state.facetSettings[name],
-          ...value,
-        },
-      };
-    });
-  },
+  setFacetSettings: (name, value) => set(state => ({
+    facetSettings: {
+      ...state.facetSettings,
+      [name]: {
+        ...state.facetSettings[name],
+        ...value,
+      },
+    }
+  })),
   resetFacetSettings: () => set({ facetSettings: {} }),
-  resetFacetByName: (name) => {
-    set(state => {
-      delete state.facetSettings[name];
-    });
-  }
+  resetFacetByName: (name) => set(state => ({
+    facetSettings: { ...omit(state.facetSettings, name) },
+  })),
 }));
 
 // selectors

From 039f5810f45b0b765d6dfa2d1dd815a550bb334b Mon Sep 17 00:00:00 2001
From: FOLIO Translations Bot
 <38661258+folio-translations@users.noreply.github.com>
Date: Tue, 23 May 2023 16:51:47 -0400
Subject: [PATCH 23/68] Lokalise: updates

---
 translations/ui-inventory/de.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/translations/ui-inventory/de.json b/translations/ui-inventory/de.json
index ed9f3f77c..07b77a8f5 100644
--- a/translations/ui-inventory/de.json
+++ b/translations/ui-inventory/de.json
@@ -776,8 +776,8 @@
     "info.effectiveCallNumber": "Dieses Feld enthält die Signatur des Exemplars, die entweder aus dem Bestandsdatensatz geerbt wird oder die aktualisierte Signatur des Exempardatensatzes ist. Beim browsen nach Signaturen wird dieses Feld durchsucht.",
     "info.shelvingOrder": "Dieses Feld ist die normalisierte Form der Signatur, die bestimmt, wie die Signatur beim browsen sortiert wird.",
     "markAsHeader": "Markieren als",
-    "newMARCRecord": "New MARC Bib Record",
-    "boundWithTitles.add": "Add Bound-with and analytics",
-    "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "newMARCRecord": "Neuer bibliographischer MARC-Datensatz",
+    "boundWithTitles.add": "Konvoluttitel hinzufügen",
+    "boundWithTitles.enterHoldingsHrid": "Bestands-HRID eingeben",
+    "selectCode": "Code auswählen"
 }
\ No newline at end of file

From 9e657fe67db418e2cc30ced883de65af461b606e Mon Sep 17 00:00:00 2001
From: Dmytro-Melnyshyn <77053927+Dmytro-Melnyshyn@users.noreply.github.com>
Date: Mon, 29 May 2023 02:20:59 -0700
Subject: [PATCH 24/68] UIIN-2431: Fix the `records-editor/records` request by
 adding the correct `_actionType`. (#2158)

---
 CHANGELOG.md                                                  | 3 ++-
 package.json                                                  | 4 ++--
 src/Instance/InstanceMovement/InstanceMovementContainer.js    | 1 +
 .../InstanceMovement/InstanceMovementContainer.test.js        | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe27bb473..327c84576 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change history for ui-inventory
 
-## 9.5.0 IN PROGRESS
+## 10.0.0 IN PROGRESS
 * Added a new option in the "Actions" dropdown within the Inventory app search page for "+New MARC Bib Record". Refs UIIN-2356.
 * Change the url for the "New MARC Bib Record" page. Refs UIIN-2380.
 * Avoid private paths in stripes-core imports. Refs UIIN-2367.
@@ -19,6 +19,7 @@
 * Instance/Holdings/Item notes, administrative notes character limit to 32K. Refs UIIN-2354.
 * Import testing-library deps from `@folio/jest-config-stripes`. Refs UIIN-2427.
 * Bump zustand to v4. Refs UIIN-2353.
+* Fix the `records-editor/records` request by adding `_actionType`. Refs UIIN-2431.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/package.json b/package.json
index 5f0c1e3d3..1db228383 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@folio/inventory",
-  "version": "9.4.5",
+  "version": "10.0.0",
   "description": "Inventory manager",
   "repository": "folio-org/ui-inventory",
   "publishConfig": {
@@ -884,7 +884,7 @@
     "zustand": "^4.1.1"
   },
   "dependencies": {
-    "@folio/quick-marc": "^6.0.0",
+    "@folio/quick-marc": "^7.0.0",
     "@folio/stripes-acq-components": "^4.0.0",
     "file-saver": "^2.0.0",
     "final-form": "^4.18.2",
diff --git a/src/Instance/InstanceMovement/InstanceMovementContainer.js b/src/Instance/InstanceMovement/InstanceMovementContainer.js
index 1595e92bb..8b00d2bce 100644
--- a/src/Instance/InstanceMovement/InstanceMovementContainer.js
+++ b/src/Instance/InstanceMovement/InstanceMovementContainer.js
@@ -77,6 +77,7 @@ const InstanceMovementContainer = ({
             parsedRecordId,
             fields: changeHridForMarcHoldings(fields, instanceTo.hrid),
             relatedRecordVersion: ++holdingsById[marcHoldingsId]._version,
+            _actionType: 'edit',
           });
         });
     });
diff --git a/src/Instance/InstanceMovement/InstanceMovementContainer.test.js b/src/Instance/InstanceMovement/InstanceMovementContainer.test.js
index a893ac33b..197b26507 100644
--- a/src/Instance/InstanceMovement/InstanceMovementContainer.test.js
+++ b/src/Instance/InstanceMovement/InstanceMovementContainer.test.js
@@ -188,6 +188,7 @@ describe('Given InstanceMovementContainer', () => {
           content: 'instance-hrid-2',
         }],
         relatedRecordVersion: 2,
+        _actionType: 'edit',
       });
     });
 

From b21b62d1d5954174bb4a1aed61eed63c3cc5e30f Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Tue, 30 May 2023 18:16:57 +0300
Subject: [PATCH 25/68] UIIN-2112: Navigating away and back to item-edit or
 holdings-edit screen throws NPE (#2161)

---
 CHANGELOG.md                        |  1 +
 src/edit/electronicAccessFields.js  |  1 +
 src/edit/items/ItemForm.js          | 18 +++++++++---------
 src/routes/CreateHoldingRoute.js    |  2 +-
 src/routes/CreateItemRoute.js       |  2 +-
 src/routes/DuplicateHoldingRoute.js |  2 +-
 src/routes/DuplicateItemRoute.js    |  2 +-
 src/routes/EditHoldingRoute.js      |  2 +-
 src/routes/EditItemRoute.js         |  2 +-
 9 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 327c84576..8db31ae17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 * Import testing-library deps from `@folio/jest-config-stripes`. Refs UIIN-2427.
 * Bump zustand to v4. Refs UIIN-2353.
 * Fix the `records-editor/records` request by adding `_actionType`. Refs UIIN-2431.
+* Navigating away and back to item-edit or holdings-edit screen throws NPE. Fixes UIIN-2112.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/edit/electronicAccessFields.js b/src/edit/electronicAccessFields.js
index 721c52668..32a6743ed 100644
--- a/src/edit/electronicAccessFields.js
+++ b/src/edit/electronicAccessFields.js
@@ -145,6 +145,7 @@ ElectronicAccessFields.propTypes = {
 };
 
 ElectronicAccessFields.defaultProps = {
+  relationship: [],
   canAdd: true,
   canEdit: true,
   canDelete: true,
diff --git a/src/edit/items/ItemForm.js b/src/edit/items/ItemForm.js
index fc1baf9b5..abeec9e98 100644
--- a/src/edit/items/ItemForm.js
+++ b/src/edit/items/ItemForm.js
@@ -201,15 +201,15 @@ class ItemForm extends React.Component {
       httpError,
 
       referenceTables: {
-        locationsById,
-        materialTypes,
+        locationsById = [],
+        materialTypes = [],
         loanTypes = [],
-        itemNoteTypes,
-        electronicAccessRelationships,
-        callNumberTypes,
-        statisticalCodes,
-        statisticalCodeTypes,
-        itemDamagedStatuses,
+        itemNoteTypes = [],
+        electronicAccessRelationships = [],
+        callNumberTypes = [],
+        statisticalCodes = [],
+        statisticalCodeTypes = [],
+        itemDamagedStatuses = [],
       },
       handleSubmit,
       pristine,
@@ -217,7 +217,7 @@ class ItemForm extends React.Component {
       history,
     } = this.props;
 
-    const holdingLocation = locationsById[holdingsRecord.permanentLocationId];
+    const holdingLocation = locationsById[holdingsRecord?.permanentLocationId];
     const item = initialValues;
 
     const refLookup = (referenceTable, id) => {
diff --git a/src/routes/CreateHoldingRoute.js b/src/routes/CreateHoldingRoute.js
index 26c05078e..06ef018a0 100644
--- a/src/routes/CreateHoldingRoute.js
+++ b/src/routes/CreateHoldingRoute.js
@@ -10,7 +10,7 @@ const CreateHoldingRoute = ({ match }) => {
 
   return (
     <CreateHolding
-      referenceData={referenceData}
+      referenceData={referenceData || {}}
       instanceId={match.params.id}
     />
   );
diff --git a/src/routes/CreateItemRoute.js b/src/routes/CreateItemRoute.js
index 86fe52202..6efb904bb 100644
--- a/src/routes/CreateItemRoute.js
+++ b/src/routes/CreateItemRoute.js
@@ -10,7 +10,7 @@ const CreateItemRoute = () => {
 
   return (
     <CreateItem
-      referenceData={referenceData}
+      referenceData={referenceData || {}}
       instanceId={id}
       holdingId={holdingId}
     />
diff --git a/src/routes/DuplicateHoldingRoute.js b/src/routes/DuplicateHoldingRoute.js
index e8419dce8..13f94c142 100644
--- a/src/routes/DuplicateHoldingRoute.js
+++ b/src/routes/DuplicateHoldingRoute.js
@@ -10,7 +10,7 @@ const DuplicateHoldingRoute = () => {
 
   return (
     <DuplicateHolding
-      referenceTables={referenceTables}
+      referenceTables={referenceTables || {}}
       instanceId={instanceId}
       holdingId={holdingId}
     />
diff --git a/src/routes/DuplicateItemRoute.js b/src/routes/DuplicateItemRoute.js
index 0af21a0a2..1d1e6c40b 100644
--- a/src/routes/DuplicateItemRoute.js
+++ b/src/routes/DuplicateItemRoute.js
@@ -10,7 +10,7 @@ const DuplicateItemRoute = () => {
 
   return (
     <DuplicateItem
-      referenceData={referenceData}
+      referenceData={referenceData || {}}
       instanceId={id}
       holdingId={holdingsrecordid}
       itemId={itemid}
diff --git a/src/routes/EditHoldingRoute.js b/src/routes/EditHoldingRoute.js
index 0e3420ded..1bfb1d263 100644
--- a/src/routes/EditHoldingRoute.js
+++ b/src/routes/EditHoldingRoute.js
@@ -10,7 +10,7 @@ const EditHoldingRoute = () => {
 
   return (
     <EditHolding
-      referenceTables={referenceTables}
+      referenceTables={referenceTables || {}}
       instanceId={instanceId}
       holdingId={holdingId}
     />
diff --git a/src/routes/EditItemRoute.js b/src/routes/EditItemRoute.js
index a6af67daf..775f70d8b 100644
--- a/src/routes/EditItemRoute.js
+++ b/src/routes/EditItemRoute.js
@@ -10,7 +10,7 @@ const EditItemRoute = () => {
 
   return (
     <EditItem
-      referenceData={referenceData}
+      referenceData={referenceData || {}}
       instanceId={id}
       holdingId={holdingId}
       itemId={itemId}

From 3a7fbb245eb4bc0b0ef90c66d256db7ee635e57c Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Tue, 30 May 2023 20:32:19 +0300
Subject: [PATCH 26/68] UIIN-2428: ISRI: Adjust jobProfiles GET request to
 fetch profiles by ids (#2159)

---
 CHANGELOG.md                             |   2 +
 src/constants.js                         |   1 +
 src/settings/TargetProfileDetail.js      | 110 ++++++++++++++++++-----
 src/settings/TargetProfileDetail.test.js |  36 ++++++--
 4 files changed, 123 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8db31ae17..4d15df00b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@
 * Bump zustand to v4. Refs UIIN-2353.
 * Fix the `records-editor/records` request by adding `_actionType`. Refs UIIN-2431.
 * Navigating away and back to item-edit or holdings-edit screen throws NPE. Fixes UIIN-2112.
+* ISRI: Adjust jobProfiles GET request to fetch profiles by ids. Refs UIIN-2428.
+* Sorting of profiles is not executed in alphabetical order in the Z39.50 target profiles View. Fixes UIIN-2424.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/constants.js b/src/constants.js
index 006396aeb..a2cf03d89 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -10,6 +10,7 @@ const DECLARED_LOST = 'Declared lost';
 
 export const BROWSE_INVENTORY_ROUTE = '/inventory/browse';
 export const INVENTORY_ROUTE = '/inventory';
+export const DATA_IMPORT_JOB_PROFILES_ROUTE = 'data-import-profiles/jobProfiles';
 
 export const searchModeSegments = {
   search: 'search',
diff --git a/src/settings/TargetProfileDetail.js b/src/settings/TargetProfileDetail.js
index 0d959ba14..c07f28763 100644
--- a/src/settings/TargetProfileDetail.js
+++ b/src/settings/TargetProfileDetail.js
@@ -12,12 +12,16 @@ import {
   TextLink,
 } from '@folio/stripes/components';
 
-import { LIMIT_MAX } from '../constants';
+import {
+  DATA_IMPORT_JOB_PROFILES_ROUTE,
+  LIMIT_MAX,
+} from '../constants';
 
 const JOB_PROFILES_COLUMNS_NAME = {
   ID: 'id',
   IS_DEFAULT: 'isDefault',
 };
+const DATA_TYPE_MARC_QUERY = 'dataType==("MARC")';
 
 class TargetProfileDetail extends React.Component {
   static propTypes = {
@@ -30,7 +34,31 @@ class TargetProfileDetail extends React.Component {
           }).isRequired,
         ),
       }).isRequired,
-      jobProfiles: PropTypes.shape({
+      defaultCreateJobProfile: PropTypes.shape({
+        records: PropTypes.arrayOf(
+          PropTypes.shape({
+            id: PropTypes.string.isRequired,
+            name: PropTypes.string.isRequired,
+          }).isRequired,
+        ),
+      }).isRequired,
+      defaultUpdateJobProfile: PropTypes.shape({
+        records: PropTypes.arrayOf(
+          PropTypes.shape({
+            id: PropTypes.string.isRequired,
+            name: PropTypes.string.isRequired,
+          }).isRequired,
+        ),
+      }).isRequired,
+      allowedCreateJobProfiles: PropTypes.shape({
+        records: PropTypes.arrayOf(
+          PropTypes.shape({
+            id: PropTypes.string.isRequired,
+            name: PropTypes.string.isRequired,
+          }).isRequired,
+        ),
+      }).isRequired,
+      allowedUpdateJobProfiles: PropTypes.shape({
         records: PropTypes.arrayOf(
           PropTypes.shape({
             id: PropTypes.string.isRequired,
@@ -47,27 +75,63 @@ class TargetProfileDetail extends React.Component {
       path: 'identifier-types?query=id=!{initialValues.externalIdentifierType}',
       records: 'identifierTypes',
     },
-    jobProfiles: {
+    defaultCreateJobProfile: {
       type: 'okapi',
-      records: 'jobProfiles',
-      path: `data-import-profiles/jobProfiles?limit=${LIMIT_MAX}&query=dataType==("MARC") sortBy name`,
+      path: (_queryParams, _pathComponents, _resourceData, _logger, props) => {
+        const {
+          initialValues: { createJobProfileId } = {},
+        } = props;
+
+        return `${DATA_IMPORT_JOB_PROFILES_ROUTE}/${createJobProfileId}`;
+      },
     },
-  });
+    defaultUpdateJobProfile: {
+      type: 'okapi',
+      path: (_queryParams, _pathComponents, _resourceData, _logger, props) => {
+        const {
+          initialValues: { updateJobProfileId } = {},
+        } = props;
+
+        return `${DATA_IMPORT_JOB_PROFILES_ROUTE}/${updateJobProfileId}`;
+      },
+    },
+    allowedCreateJobProfiles: {
+      type: 'okapi',
+      records: 'jobProfiles',
+      path: (_queryParams, _pathComponents, _resourceData, _logger, props) => {
+        const {
+          initialValues: { allowedCreateJobProfileIds = [] } = {},
+        } = props;
+        const ids = allowedCreateJobProfileIds.join(' or ');
+        const allowedIdsQuery = `id==(${ids})`;
 
-  getJobProfilesContent = (profileIds, defaultProfileId) => {
-    const { resources: { jobProfiles } } = this.props;
+        return `${DATA_IMPORT_JOB_PROFILES_ROUTE}?limit=${LIMIT_MAX}&query=${DATA_TYPE_MARC_QUERY} and ${allowedIdsQuery} sortBy name`;
+      },
+    },
+    allowedUpdateJobProfiles: {
+      type: 'okapi',
+      records: 'jobProfiles',
+      path: (_queryParams, _pathComponents, _resourceData, _logger, props) => {
+        const {
+          initialValues: { allowedUpdateJobProfileIds = [] } = {},
+        } = props;
+        const ids = allowedUpdateJobProfileIds.join(' or ');
+        const allowedIdsQuery = `id==(${ids})`;
 
-    const content = [...profileIds];
-    const indexOfDefault = content.indexOf(defaultProfileId);
+        return `${DATA_IMPORT_JOB_PROFILES_ROUTE}?limit=${LIMIT_MAX}&query=${DATA_TYPE_MARC_QUERY} and ${allowedIdsQuery} sortBy name`;
+      },
+    },
+  });
 
-    if (indexOfDefault > -1) {
-      content.splice(indexOfDefault, 1);
-      content.unshift(defaultProfileId);
-    }
+  getJobProfilesContent = (defaultJobProfileRecord, allowedJobProfilesRecords) => {
+    const content = [
+      defaultJobProfileRecord,
+      ...allowedJobProfilesRecords.filter(jobProfile => jobProfile?.id !== defaultJobProfileRecord?.id),
+    ];
 
-    return content.map(id => ({
-      id,
-      name: jobProfiles?.records.find(jobProfile => jobProfile.id === id)?.name,
+    return content.map(jobProfile => ({
+      id: jobProfile?.id,
+      name: jobProfile?.name,
     }));
   }
 
@@ -94,11 +158,15 @@ class TargetProfileDetail extends React.Component {
     const {
       initialValues,
       initialValues: {
-        allowedCreateJobProfileIds = [],
-        allowedUpdateJobProfileIds = [],
         createJobProfileId = '',
         updateJobProfileId = '',
       },
+      resources: {
+        defaultCreateJobProfile: { records: [defaultCreateJobProfileRecord] },
+        defaultUpdateJobProfile: { records: [defaultUpdateJobProfileRecord] },
+        allowedCreateJobProfiles: { records: allowedCreateJobProfilesRecords },
+        allowedUpdateJobProfiles: { records: allowedUpdateJobProfilesRecords },
+      },
     } = this.props;
 
     const t = initialValues.targetOptions;
@@ -109,8 +177,8 @@ class TargetProfileDetail extends React.Component {
     );
 
     const jobProfilesVisibleColumns = [JOB_PROFILES_COLUMNS_NAME.ID, JOB_PROFILES_COLUMNS_NAME.IS_DEFAULT];
-    const createJobProfilesContent = this.getJobProfilesContent(allowedCreateJobProfileIds, createJobProfileId);
-    const updateJobProfilesContent = this.getJobProfilesContent(allowedUpdateJobProfileIds, updateJobProfileId);
+    const createJobProfilesContent = this.getJobProfilesContent(defaultCreateJobProfileRecord, allowedCreateJobProfilesRecords);
+    const updateJobProfilesContent = this.getJobProfilesContent(defaultUpdateJobProfileRecord, allowedUpdateJobProfilesRecords);
     const createJobProfilesFormatter = this.getJobProfilesFormatter(createJobProfileId);
     const updateJobProfilesFormatter = this.getJobProfilesFormatter(updateJobProfileId);
 
diff --git a/src/settings/TargetProfileDetail.test.js b/src/settings/TargetProfileDetail.test.js
index db1adeb22..b0a15f314 100644
--- a/src/settings/TargetProfileDetail.test.js
+++ b/src/settings/TargetProfileDetail.test.js
@@ -17,22 +17,48 @@ const identifierTypeResources = {
     hasLoaded: true,
   },
 };
-const jobProfilesResources = {
+const defaultCreateJobProfileResources = {
+  records: [{
+    id: 'createJobProfileTestId',
+    name: 'create name',
+  }],
+  other: { totalRecords: null },
+  hasLoaded: true,
+};
+const defaultUpdateJobProfileResources = {
+  records: [{
+    id: 'updateJobProfileTestId',
+    name: 'update name',
+  }],
+  other: { totalRecords: null },
+  hasLoaded: true,
+};
+const allowedCreateJobProfilesResources = {
   jobProfiles: {
     records: [{
       id: 'createJobProfileTestId',
       name: 'create name',
-    }, {
+    }],
+    other: { totalRecords: 1 },
+    hasLoaded: true,
+  },
+};
+const allowedUpdateJobProfilesResources = {
+  jobProfiles: {
+    records: [{
       id: 'updateJobProfileTestId',
       name: 'update name',
     }],
-    other: { totalRecords: 2 },
+    other: { totalRecords: 1 },
     hasLoaded: true,
   },
 };
 const resources = {
-  ...identifierTypeResources,
-  ...jobProfilesResources,
+  identifierType: identifierTypeResources.identifierType,
+  defaultCreateJobProfile: defaultCreateJobProfileResources,
+  defaultUpdateJobProfile: defaultUpdateJobProfileResources,
+  allowedCreateJobProfiles: allowedCreateJobProfilesResources.jobProfiles,
+  allowedUpdateJobProfiles: allowedUpdateJobProfilesResources.jobProfiles,
 };
 
 const defaultInitialValues = {

From 3a19bc64cfdbdc88044ee4e7b28d725d2d1a8221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Turek?=
 <128044179+przemyslawturek@users.noreply.github.com>
Date: Wed, 31 May 2023 14:49:32 +0200
Subject: [PATCH 27/68] UIIN-2357 Added sort options in Actions for
 Instance/Holdings/Item (#2160)

* UIIN-2357

Added sort options in Actions for Instance/Holdings/Item

* Fix after code review

Reformat code
Fix duplication
Fix const for UpperCase
---
 CHANGELOG.md                                  |  1 +
 .../FilterNavigation/FilterNavigation.js      | 31 ++++---
 src/components/InstancesList/InstancesList.js | 89 ++++++++++++++++++-
 .../InstancesList/InstancesList.test.js       | 41 +++++++++
 src/constants.js                              |  6 ++
 translations/ui-inventory/en.json             |  5 ++
 6 files changed, 160 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d15df00b..7db2c2f30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 * Navigating away and back to item-edit or holdings-edit screen throws NPE. Fixes UIIN-2112.
 * ISRI: Adjust jobProfiles GET request to fetch profiles by ids. Refs UIIN-2428.
 * Sorting of profiles is not executed in alphabetical order in the Z39.50 target profiles View. Fixes UIIN-2424.
+* Added sort options in Actions for Instance/Holdings/Item. Refs UIIN-2357.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/components/FilterNavigation/FilterNavigation.js b/src/components/FilterNavigation/FilterNavigation.js
index fae03052e..d39a3076a 100644
--- a/src/components/FilterNavigation/FilterNavigation.js
+++ b/src/components/FilterNavigation/FilterNavigation.js
@@ -8,29 +8,36 @@ import {
 
 import { segments } from '../../constants';
 
-const FilterNavigation = ({ segment, onChange }) => (
+const FilterNavigation = ({ segment, segmentsSortBy, onChange }) => (
   <ButtonGroup
     fullWidth
     data-test-filters-navigation
   >
     {
-      Object.keys(segments).map(name => (
-        <Button
-          key={`${name}`}
-          to={`/inventory?segment=${name}&sort=title`}
-          buttonStyle={`${segment === name ? 'primary' : 'default'}`}
-          id={`segment-navigation-${name}`}
-          onClick={onChange}
-        >
-          <FormattedMessage id={`ui-inventory.filters.${name}`} />
-        </Button>
-      ))
+      Object.keys(segments).map((name) => {
+        const sort = segmentsSortBy.find(x => x.name === name).sort || '';
+
+        return (
+          <>
+            <Button
+              key={`${name}`}
+              to={`/inventory?segment=${name}${sort !== '' ? '&sort=' : ''}${sort}`}
+              buttonStyle={`${segment === name ? 'primary' : 'default'}`}
+              id={`segment-navigation-${name}`}
+              onClick={onChange}
+            >
+              <FormattedMessage id={`ui-inventory.filters.${name}`} />
+            </Button>
+          </>
+        );
+      })
     }
   </ButtonGroup>
 );
 
 FilterNavigation.propTypes = {
   segment: PropTypes.string,
+  segmentsSortBy: PropTypes.arrayOf(PropTypes.object),
   onChange: PropTypes.func,
 };
 
diff --git a/src/components/InstancesList/InstancesList.js b/src/components/InstancesList/InstancesList.js
index 04b012aaf..fb2c63668 100644
--- a/src/components/InstancesList/InstancesList.js
+++ b/src/components/InstancesList/InstancesList.js
@@ -31,6 +31,7 @@ import {
   Icon,
   Checkbox,
   MenuSection,
+  Select,
   checkScope,
   HasCommand,
   MCLPagingTypes,
@@ -57,6 +58,7 @@ import {
 } from '../../utils';
 import {
   INSTANCES_ID_REPORT_TIMEOUT,
+  SORTABLE_SEARCH_RESULT_LIST_COLUMNS,
   segments,
 } from '../../constants';
 import {
@@ -155,6 +157,7 @@ class InstancesList extends React.Component {
       isImportRecordModalOpened: false,
       optionSelected: '',
       searchAndSortKey: 0,
+      segmentsSortBy: this.getInitialSegmentsSortBy(),
       isSingleResult: this.props.showSingleResult,
       searchInProgress: false,
     };
@@ -189,6 +192,7 @@ class InstancesList extends React.Component {
 
   componentDidUpdate(prevProps) {
     const qindex = this.getQIndexFromParams();
+    const sortBy = this.getSortFromParams();
 
     this.storeLastSearchTerms(prevProps);
 
@@ -200,6 +204,10 @@ class InstancesList extends React.Component {
       // eslint-disable-next-line react/no-did-update-set-state
       this.setState({ optionSelected: qindex });
     }
+
+    if (this.state.segmentsSortBy.find(x => x.name === this.props.segment && x.sort !== sortBy)) {
+      this.setSegmentSortBy(sortBy);
+    }
   }
 
   componentWillUnmount() {
@@ -251,10 +259,21 @@ class InstancesList extends React.Component {
     return params.get('qindex');
   }
 
+  getSortFromParams = () => {
+    const params = new URLSearchParams(this.props.location.search);
+    return params.get('sort');
+  }
+
   getInitialToggableColumns = () => {
     return getItem(VISIBLE_COLUMNS_STORAGE_KEY) || TOGGLEABLE_COLUMNS;
   }
 
+  getInitialSegmentsSortBy = () => {
+    return Object.keys(segments).map(name => (
+      { name, sort: SORTABLE_SEARCH_RESULT_LIST_COLUMNS.TITLE }
+    ));
+  }
+
   getVisibleColumns = () => {
     const columns = this.state.visibleColumns;
     const visibleColumns = new Set([...columns, ...NON_TOGGLEABLE_COLUMNS]);
@@ -369,7 +388,11 @@ class InstancesList extends React.Component {
       <SearchModeNavigation
         search={this.props.getLastBrowse()}
       />
-      <FilterNavigation segment={this.props.segment} onChange={this.refocusOnInputSearch} />
+      <FilterNavigation
+        segment={this.props.segment}
+        segmentsSortBy={this.state.segmentsSortBy}
+        onChange={this.refocusOnInputSearch}
+      />
     </>
   );
 
@@ -578,6 +601,22 @@ class InstancesList extends React.Component {
     setItem(`${namespace}.position`, null);
   }
 
+  setSegmentSortBy = (sortBy) => {
+    const { segment } = this.props;
+
+    const segmentsSortBy = this.state.segmentsSortBy.map((key) => {
+      if (key.name === segment) {
+        key.sort = sortBy;
+        return key;
+      }
+      return key;
+    });
+
+    this.setState({
+      segmentsSortBy
+    });
+  }
+
   getActionMenu = ({ onToggle }) => {
     const { parentResources, intl, segment } = this.props;
     const { inTransitItemsExportInProgress } = this.state;
@@ -594,6 +633,43 @@ class InstancesList extends React.Component {
       };
     };
 
+    const setSortedColumn = (event) => {
+      const {
+        match: { path },
+        goTo,
+        getParams,
+      } = this.props;
+
+      onToggle();
+
+      const params = getParams();
+      params.sort = event.target.value;
+
+      this.setSegmentSortBy(params.sort);
+
+      const { sort, ...rest } = params;
+      const queryParams = params.sort === '' ? rest : { sort, ...rest };
+
+      goTo(path, { ...queryParams });
+    };
+
+    const sortOptions = Object.values(SORTABLE_SEARCH_RESULT_LIST_COLUMNS).map(option => ({
+      value: option,
+      label: intl.formatMessage({ id: `ui-inventory.actions.menuSection.sortBy.${option}` }),
+    }));
+
+    const sortByOptions = [
+      {
+        value: '',
+        label: intl.formatMessage({ id: 'ui-inventory.actions.menuSection.sortBy.relevance' }),
+      },
+      ...sortOptions,
+    ];
+
+    const getSortByValue = () => {
+      return this.state.segmentsSortBy.find(x => x.name === segment).sort?.replace('-', '') || '';
+    };
+
     return (
       <>
         <MenuSection label={intl.formatMessage({ id: 'ui-inventory.actions' })} id="actions-menu-section">
@@ -700,6 +776,17 @@ class InstancesList extends React.Component {
             isDisabled: !selectedRowsCount,
           })}
         </MenuSection>
+        <MenuSection
+          data-testid="menu-section-sort-by"
+          label={intl.formatMessage({ id: 'ui-inventory.actions.menuSection.sortBy' })}
+        >
+          <Select
+            data-testid="sort-by-selection"
+            dataOptions={sortByOptions}
+            value={getSortByValue()}
+            onChange={setSortedColumn}
+          />
+        </MenuSection>
         <MenuSection label={intl.formatMessage({ id: 'ui-inventory.showColumns' })} id="columns-menu-section">
           {TOGGLEABLE_COLUMNS.map(key => (
             <Checkbox
diff --git a/src/components/InstancesList/InstancesList.test.js b/src/components/InstancesList/InstancesList.test.js
index 347b892fd..a48c26332 100644
--- a/src/components/InstancesList/InstancesList.test.js
+++ b/src/components/InstancesList/InstancesList.test.js
@@ -9,6 +9,7 @@ import {
   screen,
   waitFor,
   cleanup,
+  within,
 } from '@folio/jest-config-stripes/testing-library/react';
 
 import '../../../test/jest/__mock__';
@@ -20,6 +21,7 @@ import translationsProperties from '../../../test/jest/helpers/translationsPrope
 import { instances as instancesFixture } from '../../../test/fixtures/instances';
 import { getFilterConfig } from '../../filterConfig';
 import InstancesList from './InstancesList';
+import { SORTABLE_SEARCH_RESULT_LIST_COLUMNS } from '../../constants';
 
 const updateMock = jest.fn();
 const mockQueryReplace = jest.fn();
@@ -276,6 +278,45 @@ describe('InstancesList', () => {
           expect(document.querySelector('#clickable-list-column-contributors')).not.toBeInTheDocument();
         });
       });
+
+      describe('select sort by', () => {
+        it('should render menu option', () => {
+          expect(screen.getByTestId('menu-section-sort-by')).toBeInTheDocument();
+        });
+
+        it('should render select', () => {
+          expect(screen.getByTestId('sort-by-selection')).toBeInTheDocument();
+        });
+
+        it('should render as many options as defined plus Relevance', () => {
+          const options = within(screen.getByTestId('sort-by-selection')).getAllByRole('option');
+          expect(options).toHaveLength(Object.keys(SORTABLE_SEARCH_RESULT_LIST_COLUMNS).length + 1);
+        });
+      });
+
+      describe('select proper sort options', () => {
+        it('should select Title as default selected sort option', () => {
+          const search = '?segment=instances&sort=title';
+          history.push({ search });
+
+          const option = within(screen.getByTestId('menu-section-sort-by')).getByRole('option', { name: 'Title' });
+          expect(option.selected).toBeTruthy();
+        });
+
+        it('should select Contributors option', () => {
+          userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+          userEvent.selectOptions(screen.getByTestId('sort-by-selection'), 'contributors');
+
+          const option = within(screen.getByTestId('menu-section-sort-by')).getByRole('option', { name: 'Contributors' });
+          expect(option.selected).toBeTruthy();
+        });
+
+        it('should select option value "Contributors" after column "Contributors" click', async () => {
+          await act(async () => userEvent.click(document.querySelector('#clickable-list-column-contributors')));
+
+          expect((screen.getByRole('option', { name: 'Contributors' })).selected).toBeTruthy();
+        });
+      });
     });
 
     describe('filters pane', () => {
diff --git a/src/constants.js b/src/constants.js
index a2cf03d89..0db7bdd47 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -210,6 +210,12 @@ export const SORT_DIRECTION = {
   DESCENDING: 'descending',
 };
 
+export const SORTABLE_SEARCH_RESULT_LIST_COLUMNS = {
+  TITLE: 'title',
+  CONTRIBUTORS: 'contributors',
+};
+
+
 export const DEFAULT_FILTERS_NUMBER = 6;
 
 export const FACETS = {
diff --git a/translations/ui-inventory/en.json b/translations/ui-inventory/en.json
index c359b8882..851f5c778 100644
--- a/translations/ui-inventory/en.json
+++ b/translations/ui-inventory/en.json
@@ -734,6 +734,11 @@
   "copycat.callout.simpleError": "Something went wrong: {err}",
   "copycat.callout.complexError": "Something went wrong: {err}: {detail}",
 
+  "actions.menuSection.sortBy": "Sort by",
+  "actions.menuSection.sortBy.relevance": "Relevance",
+  "actions.menuSection.sortBy.title": "Title",
+  "actions.menuSection.sortBy.contributors": "Contributors",
+
   "remote.confirmation.heading": "Removing from remote storage",
   "remote.confirmation.message": "Are you sure you want to remove {something} from remote storage?",
   "remote.warning.common": "To remove {something} from remote storage, run an exception report or communicate this directly to your remote storage location.",

From a0c1a8a60723fb42acb8712daf9e77bd1c385411 Mon Sep 17 00:00:00 2001
From: Oleksandr Hladchenko
 <85172747+OleksandrHladchenko1@users.noreply.github.com>
Date: Wed, 31 May 2023 16:08:00 +0300
Subject: [PATCH 28/68] UIIN-2420: Add validation to statistical code field &
 disable default option (#2165)

* UIDATIMP-2420: Make the default option disabled

* UIIN-2420: Add validation for statistical code select component
---
 CHANGELOG.md                      |  1 +
 src/edit/statisticalCodeFields.js | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7db2c2f30..82df459fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 * ISRI: Adjust jobProfiles GET request to fetch profiles by ids. Refs UIIN-2428.
 * Sorting of profiles is not executed in alphabetical order in the Z39.50 target profiles View. Fixes UIIN-2424.
 * Added sort options in Actions for Instance/Holdings/Item. Refs UIIN-2357.
+* Statistical code empty field error. Refs UIIN-2420.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/edit/statisticalCodeFields.js b/src/edit/statisticalCodeFields.js
index 925c64353..0c5184230 100644
--- a/src/edit/statisticalCodeFields.js
+++ b/src/edit/statisticalCodeFields.js
@@ -34,13 +34,9 @@ const StatisticalCodeFields = ({
       aria-label={statisticalCodeLabel}
       name={field}
       component={Select}
-      dataOptions={[
-        {
-          label: formatMessage({ id: 'ui-inventory.selectCode' }),
-          value: '',
-        },
-        ...statisticalCodeOptions,
-      ]}
+      placeholder={formatMessage({ id: 'ui-inventory.selectCode' })}
+      validate={value => (!value ? formatMessage({ id: 'ui-inventory.selectToContinue' }) : undefined)}
+      dataOptions={statisticalCodeOptions}
       disabled={!canEdit}
     />
   );

From 3c2577fb0638bfdfd83bc060d824dc9c2c89f810 Mon Sep 17 00:00:00 2001
From: Dmytro-Melnyshyn <77053927+Dmytro-Melnyshyn@users.noreply.github.com>
Date: Wed, 31 May 2023 06:25:39 -0700
Subject: [PATCH 29/68] UIIN-2360: Hide the 'Actions' button for the view page
 if there are no permissions. (#2163)

---
 CHANGELOG.md             |   1 +
 src/ViewInstance.js      | 487 ++++++++++++++++++++-------------------
 src/ViewInstance.test.js |  19 ++
 3 files changed, 270 insertions(+), 237 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82df459fc..1b3136803 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 * Sorting of profiles is not executed in alphabetical order in the Z39.50 target profiles View. Fixes UIIN-2424.
 * Added sort options in Actions for Instance/Holdings/Item. Refs UIIN-2357.
 * Statistical code empty field error. Refs UIIN-2420.
+* Hide the `Actions` button for the view page if there are no permissions. Refs UIIN-2360.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/ViewInstance.js b/src/ViewInstance.js
index 89a4d0ba7..392bb16a5 100644
--- a/src/ViewInstance.js
+++ b/src/ViewInstance.js
@@ -402,7 +402,7 @@ class ViewInstance extends React.Component {
     return null;
   };
 
-  createActionMenuGetter = instance => ({ onToggle }) => {
+  createActionMenuGetter = (instance, data) => ({ onToggle }) => {
     const {
       onCopy,
       stripes,
@@ -420,13 +420,36 @@ class ViewInstance extends React.Component {
     const isSourceMARC = get(instance, ['source'], '') === 'MARC';
     const canEditInstance = stripes.hasPerm('ui-inventory.instance.edit');
     const canCreateInstance = stripes.hasPerm('ui-inventory.instance.create');
+    const canCreateRequest = stripes.hasPerm('ui-requests.create');
     const canMoveItems = stripes.hasPerm('ui-inventory.item.move');
     const canCreateMARCHoldings = stripes.hasPerm('ui-quick-marc.quick-marc-holdings-editor.create');
     const canMoveHoldings = stripes.hasPerm('ui-inventory.holdings.move');
     const canEditMARCRecord = stripes.hasPerm('ui-quick-marc.quick-marc-editor.all');
     const canDeriveMARCRecord = stripes.hasPerm('ui-quick-marc.quick-marc-editor.duplicate');
-    const hasReorderPermissions = stripes.hasPerm('ui-requests.create') || stripes.hasPerm('ui-requests.edit') || stripes.hasPerm('ui-requests.all');
+    const hasReorderPermissions = canCreateRequest || stripes.hasPerm('ui-requests.edit') || stripes.hasPerm('ui-requests.all');
     const canViewMARCSource = stripes.hasPerm('ui-quick-marc.quick-marc-editor.view');
+    const canViewInstance = stripes.hasPerm('ui-inventory.instance.view');
+    const canViewSource = canViewMARCSource && canViewInstance;
+    const canImport = stripes.hasInterface('copycat-imports') && stripes.hasPerm('copycat.profiles.collection.get');
+    const canCreateOrder = stripes.hasInterface('orders') && stripes.hasPerm('ui-inventory.instance.createOrder');
+    const canReorder = stripes.hasPerm('ui-requests.reorderQueue');
+    const numberOfRequests = instanceRequests.other?.totalRecords;
+    const canReorderRequests = titleLevelRequestsFeatureEnabled && hasReorderPermissions && numberOfRequests && canReorder;
+    const canViewRequests = !titleLevelRequestsFeatureEnabled;
+    const canCreateNewRequest = titleLevelRequestsFeatureEnabled && canCreateRequest;
+    const identifier = this.getIdentifiers(data);
+
+    const showInventoryMenuSection = (
+      canEditInstance
+      || canViewSource
+      || (!openedFromBrowse && (canMoveItems || canMoveHoldings))
+      || canImport
+      || canCreateInstance
+      || canCreateOrder
+      || canReorderRequests
+      || canViewRequests
+      || canCreateNewRequest
+    );
 
     const showQuickMarcMenuSection = isSourceMARC && (canCreateMARCHoldings || canEditMARCRecord || canDeriveMARCRecord);
 
@@ -434,88 +457,85 @@ class ViewInstance extends React.Component {
       return null;
     }
 
+    // the `identifier` is responsible for displaying the plugin `copyright-permissions-checker`
+    if (!showInventoryMenuSection && !showQuickMarcMenuSection && !identifier) {
+      return null;
+    }
+
     return (
       <>
-        <MenuSection label={intl.formatMessage({ id: 'ui-inventory.inventory.label' })} id="inventory-menu-section">
-          <IfPermission perm="ui-inventory.instance.edit">
-            <Button
-              id="edit-instance"
-              onClick={() => {
-                onToggle();
-                this.onClickEditInstance();
-              }}
-              buttonStyle="dropdownItem"
-            >
-              <Icon icon="edit">
-                <FormattedMessage id="ui-inventory.editInstance" />
-              </Icon>
-            </Button>
-          </IfPermission>
-
-          {
-            canViewMARCSource && (
-              <IfPermission perm="ui-inventory.instance.view">
-                <Button
-                  id="clickable-view-source"
-                  buttonStyle="dropdownItem"
-                  disabled={!marcRecord}
-                  onClick={(e) => {
-                    onToggle();
-                    this.handleViewSource(e, instance);
-                  }}
-                >
-                  <Icon icon="document">
-                    <FormattedMessage id="ui-inventory.viewSource" />
-                  </Icon>
-                </Button>
-              </IfPermission>
-            )
-          }
-
-          {
-            !openedFromBrowse && (
-              <>
-                {
-                  canMoveItems && (
-                    <Button
-                      id="move-instance-items"
-                      buttonStyle="dropdownItem"
-                      onClick={() => {
-                        onToggle();
-                        this.toggleItemsMovement();
-                      }}
-                    >
-                      <Icon icon="transfer">
-                        <FormattedMessage
-                          id={`ui-inventory.moveItems.instance.actionMenu.${this.state.isItemsMovement ? 'disable' : 'enable'}`}
-                        />
-                      </Icon>
-                    </Button>
-                  )
-                }
-
-                {
-                  (canMoveItems || canMoveHoldings) && (
-                    <Button
-                      id="move-instance"
-                      buttonStyle="dropdownItem"
-                      onClick={() => {
-                        onToggle();
-                        this.toggleFindInstancePlugin();
-                      }}
-                    >
-                      <Icon icon="arrow-right">
-                        <FormattedMessage id="ui-inventory.moveItems" />
-                      </Icon>
-                    </Button>
-                  )
-                }
-              </>
-            )
-          }
-
-          <IfInterface name="copycat-imports">
-            <IfPermission perm="copycat.profiles.collection.get">
+        {showInventoryMenuSection && (
+          <MenuSection label={intl.formatMessage({ id: 'ui-inventory.inventory.label' })} id="inventory-menu-section">
+            {canEditInstance && (
+              <Button
+                id="edit-instance"
+                onClick={() => {
+                  onToggle();
+                  this.onClickEditInstance();
+                }}
+                buttonStyle="dropdownItem"
+              >
+                <Icon icon="edit">
+                  <FormattedMessage id="ui-inventory.editInstance" />
+                </Icon>
+              </Button>
+            )}
+            {canViewSource && (
+              <Button
+                id="clickable-view-source"
+                buttonStyle="dropdownItem"
+                disabled={!marcRecord}
+                onClick={(e) => {
+                  onToggle();
+                  this.handleViewSource(e, instance);
+                }}
+              >
+                <Icon icon="document">
+                  <FormattedMessage id="ui-inventory.viewSource" />
+                </Icon>
+              </Button>
+            )}
+            {
+              !openedFromBrowse && (
+                <>
+                  {
+                    canMoveItems && (
+                      <Button
+                        id="move-instance-items"
+                        buttonStyle="dropdownItem"
+                        onClick={() => {
+                          onToggle();
+                          this.toggleItemsMovement();
+                        }}
+                      >
+                        <Icon icon="transfer">
+                          <FormattedMessage
+                            id={`ui-inventory.moveItems.instance.actionMenu.${this.state.isItemsMovement ? 'disable' : 'enable'}`}
+                          />
+                        </Icon>
+                      </Button>
+                    )
+                  }
+                  {
+                    (canMoveItems || canMoveHoldings) && (
+                      <Button
+                        id="move-instance"
+                        buttonStyle="dropdownItem"
+                        onClick={() => {
+                          onToggle();
+                          this.toggleFindInstancePlugin();
+                        }}
+                      >
+                        <Icon icon="arrow-right">
+                          <FormattedMessage id="ui-inventory.moveItems" />
+                        </Icon>
+                      </Button>
+                    )
+                  }
+                </>
+              )
+            }
+            {canImport && (
               <Button
                 id="dropdown-clickable-reimport-record"
                 onClick={() => {
@@ -528,26 +548,22 @@ class ViewInstance extends React.Component {
                   <FormattedMessage id="ui-inventory.copycat.overlaySourceBib" />
                 </Icon>
               </Button>
-            </IfPermission>
-          </IfInterface>
-
-          <IfPermission perm="ui-inventory.instance.create">
-            <Button
-              id="copy-instance"
-              onClick={() => {
-                onToggle();
-                onCopy(instance);
-              }}
-              buttonStyle="dropdownItem"
-            >
-              <Icon icon="duplicate">
-                <FormattedMessage id="ui-inventory.duplicateInstance" />
-              </Icon>
-            </Button>
-          </IfPermission>
-
-          <IfInterface name="orders">
-            <IfPermission perm="ui-inventory.instance.createOrder">
+            )}
+            {canCreateInstance && (
+              <Button
+                id="copy-instance"
+                onClick={() => {
+                  onToggle();
+                  onCopy(instance);
+                }}
+                buttonStyle="dropdownItem"
+              >
+                <Icon icon="duplicate">
+                  <FormattedMessage id="ui-inventory.duplicateInstance" />
+                </Icon>
+              </Button>
+            )}
+            {canCreateOrder && (
               <Button
                 id="clickable-create-order"
                 buttonStyle="dropdownItem"
@@ -560,40 +576,38 @@ class ViewInstance extends React.Component {
                   <FormattedMessage id="ui-inventory.newOrder" />
                 </Icon>
               </Button>
-            </IfPermission>
-          </IfInterface>
-
-          {
-            titleLevelRequestsFeatureEnabled
-              ? (
-                <RequestsReorderButton
-                  hasReorderPermissions={hasReorderPermissions}
-                  requestId={instanceRequests.records[0]?.id}
-                  instanceId={instance.id}
-                  numberOfRequests={instanceRequests.other?.totalRecords}
-                />
-              )
-              : (
-                <Button
-                  id="view-requests"
-                  onClick={() => {
-                    onToggle();
-                    this.onClickViewRequests();
-                  }}
-                  buttonStyle="dropdownItem"
-                >
-                  <Icon icon="eye-open">
-                    <FormattedMessage id="ui-inventory.viewRequests" />
-                  </Icon>
-                </Button>
-              )
-          }
-
-          <NewInstanceRequestButton
-            isTlrEnabled={!!titleLevelRequestsFeatureEnabled}
-            instanceId={instance.id}
-          />
-        </MenuSection>
+            )}
+            {
+              titleLevelRequestsFeatureEnabled
+                ? (
+                  <RequestsReorderButton
+                    hasReorderPermissions={hasReorderPermissions}
+                    requestId={instanceRequests.records[0]?.id}
+                    instanceId={instance.id}
+                    numberOfRequests={numberOfRequests}
+                  />
+                )
+                : (
+                  <Button
+                    id="view-requests"
+                    onClick={() => {
+                      onToggle();
+                      this.onClickViewRequests();
+                    }}
+                    buttonStyle="dropdownItem"
+                  >
+                    <Icon icon="eye-open">
+                      <FormattedMessage id="ui-inventory.viewRequests" />
+                    </Icon>
+                  </Button>
+                )
+            }
+            <NewInstanceRequestButton
+              isTlrEnabled={!!titleLevelRequestsFeatureEnabled}
+              instanceId={instance.id}
+            />
+          </MenuSection>
+        )}
 
         {
           showQuickMarcMenuSection && (
@@ -647,31 +661,27 @@ class ViewInstance extends React.Component {
           )
         }
 
-        <DataContext.Consumer>
-          {data => (
-            <Pluggable
-              id="copyright-permissions-checker"
-              toggle={this.toggleCopyrightModal}
-              open={this.state.isCopyrightModalOpened}
-              identifier={this.getIdentifiers(data)}
-              type="copyright-permissions-checker"
-              renderTrigger={({ menuText }) => (
-                <Button
-                  id="copyright-permissions-check"
-                  buttonStyle="dropdownItem"
-                  onClick={() => {
-                    onToggle();
-                    this.toggleCopyrightModal();
-                  }}
-                >
-                  <Icon icon="report">
-                    {menuText}
-                  </Icon>
-                </Button>
-              )}
-            />
+        <Pluggable
+          id="copyright-permissions-checker"
+          toggle={this.toggleCopyrightModal}
+          open={this.state.isCopyrightModalOpened}
+          identifier={identifier}
+          type="copyright-permissions-checker"
+          renderTrigger={({ menuText }) => (
+            <Button
+              id="copyright-permissions-check"
+              buttonStyle="dropdownItem"
+              onClick={() => {
+                onToggle();
+                this.toggleCopyrightModal();
+              }}
+            >
+              <Icon icon="report">
+                {menuText}
+              </Icon>
+            </Button>
           )}
-        </DataContext.Consumer>
+        />
       </>
     );
   };
@@ -743,91 +753,93 @@ class ViewInstance extends React.Component {
     }
 
     return (
-      <>
-        <HasCommand
-          commands={shortcuts}
-          isWithinScope={checkScope}
-          scope={document.body}
-        >
-          <InstanceDetails
-            id="pane-instancedetails"
-            paneTitle={
-              <FormattedMessage
-                id="ui-inventory.instanceRecordTitle"
-                values={{
-                  title: instance?.title,
-                  publisherAndDate: getPublishingInfo(instance),
-                }}
-              />
-            }
-            paneSubtitle={
-              <FormattedMessage
-                id="ui-inventory.instanceRecordSubtitle"
-                values={{
-                  hrid: instance?.hrid,
-                  updatedDate: getDate(instance?.metadata?.updatedDate),
-                }}
+      <DataContext.Consumer>
+        {data => (
+          <HasCommand
+            commands={shortcuts}
+            isWithinScope={checkScope}
+            scope={document.body}
+          >
+            <InstanceDetails
+              id="pane-instancedetails"
+              paneTitle={
+                <FormattedMessage
+                  id="ui-inventory.instanceRecordTitle"
+                  values={{
+                    title: instance?.title,
+                    publisherAndDate: getPublishingInfo(instance),
+                  }}
+                />
+              }
+              paneSubtitle={
+                <FormattedMessage
+                  id="ui-inventory.instanceRecordSubtitle"
+                  values={{
+                    hrid: instance?.hrid,
+                    updatedDate: getDate(instance?.metadata?.updatedDate),
+                  }}
+                />
+              }
+              onClose={onClose}
+              actionMenu={this.createActionMenuGetter(instance, data)}
+              instance={instance}
+              tagsEnabled={tagsEnabled}
+              ref={this.accordionStatusRef}
+            >
+              {
+                (!holdingsrecordid && !itemid) ?
+                  (
+                    <MoveItemsContext>
+                      <HoldingsListContainer
+                        instance={instance}
+                        draggable={this.state.isItemsMovement}
+                        droppable
+                      />
+                    </MoveItemsContext>
+                  )
+                  :
+                  null
+              }
+            </InstanceDetails>
+
+            <Callout ref={this.calloutRef} />
+
+            {this.state.afterCreate &&
+              <CalloutRenderer
+                message={<FormattedMessage id="ui-inventory.instance.successfullySaved" values={{ hrid: instance.hrid }} />}
               />
             }
-            onClose={onClose}
-            actionMenu={this.createActionMenuGetter(instance)}
-            instance={instance}
-            tagsEnabled={tagsEnabled}
-            ref={this.accordionStatusRef}
-          >
+
             {
-              (!holdingsrecordid && !itemid) ?
-                (
-                  <MoveItemsContext>
-                    <HoldingsListContainer
-                      instance={instance}
-                      draggable={this.state.isItemsMovement}
-                      droppable
-                    />
-                  </MoveItemsContext>
-                )
-                :
-                null
+              this.state.findInstancePluginOpened && (
+                <InstancePlugin
+                  onSelect={this.selectInstance}
+                  onClose={this.toggleFindInstancePlugin}
+                  withTrigger={false}
+                />
+              )
             }
-          </InstanceDetails>
 
-          <Callout ref={this.calloutRef} />
+            <IfInterface name="copycat-imports">
+              <IfPermission perm="copycat.profiles.collection.get">
+                <ImportRecordModal
+                  isOpen={this.state.isImportRecordModalOpened}
+                  currentExternalIdentifier={undefined}
+                  handleSubmit={this.handleImportRecordModalSubmit}
+                  handleCancel={this.handleImportRecordModalCancel}
+                  id={id}
+                />
+              </IfPermission>
+            </IfInterface>
 
-          {this.state.afterCreate &&
-            <CalloutRenderer
-              message={<FormattedMessage id="ui-inventory.instance.successfullySaved" values={{ hrid: instance.hrid }} />}
+            <NewOrderModal
+              open={this.state.isNewOrderModalOpen}
+              onCancel={this.toggleNewOrderModal}
             />
-          }
-
-          {
-            this.state.findInstancePluginOpened && (
-              <InstancePlugin
-                onSelect={this.selectInstance}
-                onClose={this.toggleFindInstancePlugin}
-                withTrigger={false}
-              />
-            )
-          }
 
-          <IfInterface name="copycat-imports">
-            <IfPermission perm="copycat.profiles.collection.get">
-              <ImportRecordModal
-                isOpen={this.state.isImportRecordModalOpened}
-                currentExternalIdentifier={undefined}
-                handleSubmit={this.handleImportRecordModalSubmit}
-                handleCancel={this.handleImportRecordModalCancel}
-                id={id}
-              />
-            </IfPermission>
-          </IfInterface>
-
-          <NewOrderModal
-            open={this.state.isNewOrderModalOpen}
-            onCancel={this.toggleNewOrderModal}
-          />
-
-        </HasCommand>
-      </>
+          </HasCommand>
+        )}
+      </DataContext.Consumer>
     );
   }
 }
@@ -884,6 +896,7 @@ ViewInstance.propTypes = {
   }).isRequired,
   stripes: PropTypes.shape({
     connect: PropTypes.func.isRequired,
+    hasInterface: PropTypes.func.isRequired,
     hasPerm: PropTypes.func.isRequired,
     locale: PropTypes.string.isRequired,
     logger: PropTypes.object.isRequired,
diff --git a/src/ViewInstance.test.js b/src/ViewInstance.test.js
index 6bcf5bfa9..8606c8537 100644
--- a/src/ViewInstance.test.js
+++ b/src/ViewInstance.test.js
@@ -148,6 +148,7 @@ const defaultProp = {
   },
   stripes: {
     connect: jest.fn(),
+    hasInterface: jest.fn().mockReturnValue(true),
     hasPerm: jest.fn().mockReturnValue(true),
     locale: 'Testlocale',
     logger: {
@@ -209,6 +210,24 @@ describe('ViewInstance', () => {
     expect(screen.queryByText('Move holdings/items to another instance')).not.toBeInTheDocument();
   });
   describe('Action Menu', () => {
+    it('should not be displayed', () => {
+      renderViewInstance({
+        stripes: {
+          ...defaultProp.stripes,
+          hasInterface: jest.fn().mockReturnValue(false),
+          hasPerm: jest.fn().mockReturnValue(false),
+        },
+        resources: {
+          ...defaultProp.resources,
+          configs: {
+            ...defaultProp.resources.configs,
+            records: [{ value: JSON.stringify({ titleLevelRequestsFeatureEnabled: true }) }],
+          },
+        },
+      });
+
+      expect(screen.queryByRole('button', { name: 'Actions' })).not.toBeInTheDocument();
+    });
     it('"onClickEditInstance" should be called when the user clicks the "Edit instance" button', () => {
       renderViewInstance();
       userEvent.click(screen.getByRole('button', { name: 'Actions' }));

From 65046ca05637cb36fdfd39e7e374f6f4571d5a02 Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Wed, 31 May 2023 17:33:33 +0300
Subject: [PATCH 30/68] UIIN-2419: When duplicating an item, the circulation
 history is duplicated when it should not be (#2166)

---
 CHANGELOG.md                            | 1 +
 src/Item/DuplicateItem/DuplicateItem.js | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b3136803..a02005f65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 * Added sort options in Actions for Instance/Holdings/Item. Refs UIIN-2357.
 * Statistical code empty field error. Refs UIIN-2420.
 * Hide the `Actions` button for the view page if there are no permissions. Refs UIIN-2360.
+* When duplicating an item, the circulation history is duplicated when it should not be. Fixes UIIN-2419.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/Item/DuplicateItem/DuplicateItem.js b/src/Item/DuplicateItem/DuplicateItem.js
index 6634256a5..47f19556a 100644
--- a/src/Item/DuplicateItem/DuplicateItem.js
+++ b/src/Item/DuplicateItem/DuplicateItem.js
@@ -26,6 +26,10 @@ import {
   useItemMutation,
 } from '../hooks';
 
+import { itemStatusesMap } from '../../constants';
+
+const OMITTED_INITIAL_FIELDS = ['id', 'hrid', 'barcode', 'lastCheckIn'];
+
 const DuplicateItem = ({
   referenceData,
   instanceId,
@@ -42,9 +46,9 @@ const DuplicateItem = ({
   const stripes = useStripes();
 
   const initialValues = useMemo(() => {
-    const duplicatedItem = omit(item, ['id', 'hrid', 'barcode']);
+    const duplicatedItem = omit(item, OMITTED_INITIAL_FIELDS);
 
-    duplicatedItem.status = { name: 'Available' };
+    duplicatedItem.status = { name: itemStatusesMap.AVAILABLE };
 
     return duplicatedItem;
   }, [item]);

From e05b964ba1867cd10691dcd8b8efaf38780edb25 Mon Sep 17 00:00:00 2001
From: FOLIO Translations Bot
 <38661258+folio-translations@users.noreply.github.com>
Date: Wed, 31 May 2023 16:52:36 -0400
Subject: [PATCH 31/68] Lokalise: updates

---
 translations/ui-inventory/ar.json     |  6 +-
 translations/ui-inventory/ber.json    |  6 +-
 translations/ui-inventory/ca.json     |  6 +-
 translations/ui-inventory/cs_CZ.json  | 36 ++++++-----
 translations/ui-inventory/da.json     |  6 +-
 translations/ui-inventory/de.json     | 12 ++--
 translations/ui-inventory/en_GB.json  |  6 +-
 translations/ui-inventory/en_SE.json  |  6 +-
 translations/ui-inventory/en_US.json  |  6 +-
 translations/ui-inventory/es.json     | 14 +++--
 translations/ui-inventory/es_419.json | 88 ++++++++++++++-------------
 translations/ui-inventory/es_ES.json  | 14 +++--
 translations/ui-inventory/fr.json     |  6 +-
 translations/ui-inventory/fr_FR.json  |  6 +-
 translations/ui-inventory/he.json     |  6 +-
 translations/ui-inventory/hi_IN.json  |  6 +-
 translations/ui-inventory/hu.json     |  6 +-
 translations/ui-inventory/it_IT.json  |  6 +-
 translations/ui-inventory/ja.json     |  6 +-
 translations/ui-inventory/ko.json     |  6 +-
 translations/ui-inventory/nb.json     |  6 +-
 translations/ui-inventory/nn.json     |  6 +-
 translations/ui-inventory/pl.json     |  6 +-
 translations/ui-inventory/pt_BR.json  |  6 +-
 translations/ui-inventory/pt_PT.json  |  6 +-
 translations/ui-inventory/ru.json     |  6 +-
 translations/ui-inventory/sv.json     |  6 +-
 translations/ui-inventory/ur.json     |  6 +-
 translations/ui-inventory/zh_CN.json  |  6 +-
 translations/ui-inventory/zh_TW.json  |  6 +-
 30 files changed, 217 insertions(+), 97 deletions(-)

diff --git a/translations/ui-inventory/ar.json b/translations/ui-inventory/ar.json
index a7d7f641b..d12b34924 100644
--- a/translations/ui-inventory/ar.json
+++ b/translations/ui-inventory/ar.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ber.json b/translations/ui-inventory/ber.json
index 6edccc4aa..7d7240d78 100644
--- a/translations/ui-inventory/ber.json
+++ b/translations/ui-inventory/ber.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ca.json b/translations/ui-inventory/ca.json
index d66f93ea5..d62853d6d 100644
--- a/translations/ui-inventory/ca.json
+++ b/translations/ui-inventory/ca.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/cs_CZ.json b/translations/ui-inventory/cs_CZ.json
index 200330959..bd74662f7 100644
--- a/translations/ui-inventory/cs_CZ.json
+++ b/translations/ui-inventory/cs_CZ.json
@@ -23,7 +23,7 @@
     "alternativeTitles": "Alternativní názvy",
     "addAlternativeTitles": "Přidat alternativní název",
     "classifications": "Klasifikace",
-    "selectClassification": "Vyberte typ klasifikace",
+    "selectClassification": "Vybrat typ klasifikace",
     "number": "Číslo",
     "type": "Typ",
     "contributors": "Autoři",
@@ -35,7 +35,7 @@
     "identifier": "Identifikátor",
     "identifiers": "Identifikátory",
     "addIdentifier": "Přidat identifikátor",
-    "selectResourceType": "Vyberte typ zdroje",
+    "selectResourceType": "Vybrat typ zdroje",
     "formats": "Formáty",
     "format": "Formát",
     "selectFormat": "Zvolte formát",
@@ -44,10 +44,10 @@
     "instanceRecord": "Záznam titulu",
     "contentData": "Údaje o obsahu",
     "descriptiveData": "Popisné údaje",
-    "selectMaterialType": "Vyberte typ materiálu",
-    "selectLoanType": "Vyberte typ výpůjčky",
+    "selectMaterialType": "Vybrat typ materiálu",
+    "selectLoanType": "Vybrat typ výpůjčky",
     "loanTypePermanent": "Typ trvalé výpůjčky",
-    "selectTemporaryLocation": "Vyberte dočasnou lokaci",
+    "selectTemporaryLocation": "Vybrat dočasnou lokaci",
     "loanTypeTemporary": "Typ dočasné výpůjčky",
     "enumeration": "Výčet",
     "chronology": "Chronologie",
@@ -169,7 +169,7 @@
     "addElectronicAccess": "Přidání elektronického přístupu",
     "instanceStatus": "Termín stavu titulu",
     "selectInstanceStatus": "Vyberte stav titulu",
-    "selectModeOfIssuance": "Vyberte způsob vydání",
+    "selectModeOfIssuance": "Vybrat způsob vydání",
     "instanceStatusUpdatedDate": "Datum aktualizace stavu",
     "hridTaken": "Toto HRID již bylo použito",
     "instances.columns.title": "Název",
@@ -264,7 +264,7 @@
     "statisticalCodes": "Statistické kódy",
     "statisticalCode": "Statistický kód",
     "statisticalCodeNames": "Jména statistických kódů",
-    "selectStatisticalCode": "Vyberte typ statistického kódu",
+    "selectStatisticalCode": "Vybrat typ statistického kódu",
     "numberOfMissingPieces": "Počet chybějících kusů",
     "missingPieces": "Chybějící kusy",
     "itemDamagedStatus": "Stav poškozené jednotky",
@@ -281,23 +281,23 @@
     "holdingsTitle": "Holdingy: {location} > {callNumber}",
     "addContributor": "Přidat autora",
     "selectIdentifierType": "Vyberte typ identifikátoru",
-    "selectAlternativeTitleType": "Vyberte alternativní typ titulku",
+    "selectAlternativeTitleType": "Vybrat alternativní typ titulku",
     "parentInstances": "Nadřazený titul",
     "addParentInstance": "Přidat nadřazený titul",
-    "selectType": "Vyberte typ",
-    "selectStatus": "Vyberte stav",
+    "selectType": "Vybrat typ",
+    "selectStatus": "Vybrat stav",
     "createNewHoldingsRecord": "Vytvořte nový záznam holdingu",
     "volume": "Svazek",
     "yearCaption": "Rok, titulek",
     "addYearCaption": "Přidat rok, titulek",
     "descriptionOfPieces": "Popis kusů",
-    "selectCallNumberType": "Vyberte typ",
+    "selectCallNumberType": "Vybrat typ",
     "itemIdentifier": "Identifikátor jednotky",
     "formerId": "Dřívější identifikátor",
     "addFormerId": "Přidat dřívější identifikátor",
     "accessionNumber": "Přístupové číslo",
     "addStatisticalCode": "Přidání statistického kódu",
-    "selectHoldingsType": "Vyberte typ holdingů",
+    "selectHoldingsType": "Vybrat typ holdingů",
     "publicDisplay": "Veřejné vystavení",
     "addReceivingHistory": "Přidat historii příjmu",
     "selectIllPolicy": "Vybrat pravidla MVS",
@@ -338,7 +338,7 @@
     "noItemDeleteModal.orderMessage": "HRID jednotky <strong>{hrid}</strong> s čárovým kódem <strong>{barcode}</strong> je objednána a nelze ji <strong>smazat</strong> dokud nebudou vymazány všechny závislosti na aplikaci Objednávka. Pokud chcete pokračovat v mazání záznamu jednotky, přejděte do aplikace Objednávka a vymažte závislosti.",
     "holdingRecord": "Záznam holdingu {location} {callNumber}",
     "instanceRecordTitle": "Titul • {title} • {publisherAndDate}",
-    "makePrimary": "Nastavit jako primární",
+    "makePrimary": "Nastavit jako hlavní",
     "holdingsNoteTypes": "Typy poznámek holdingů",
     "itemNoteTypes": "Typy poznámek jednotky",
     "itemOnHoldingsRecordDeleteModal.message": "HRID záznamu holdingu <strong>{hrid}</strong> s lokací <strong>{location}</strong> má <strong>jeden</strong> přidružený záznam jednotky. Aby bylo možné pokračovat v mazání tohoto holdingu, musí být smazán související záznam jednotky.",
@@ -765,13 +765,13 @@
     "select.updateJobProfileId": "Vybrat profil úlohy pro překrytí/aktualizaci",
     "defaultJobProfile": "Výchozí",
     "copycat.externalTarget": "Externí cíl",
-    "copycat.jobProfileToBeUsed": "Vyberte profil, který se má použít",
+    "copycat.jobProfileToBeUsed": "Vybrat profil, který se má použít",
     "copycat.defaultJobProfile": "{jobProfile} (Výchozí)",
     "ariaLabel.createJobProfile": "Nastavit profil úlohy {profileIndex} pro vytvoření jako výchozí",
     "ariaLabel.updateJobProfile": "Nastavit profil úlohy {profileIndex} pro aktualizaci jako výchozí",
     "jobProfiles.info": "Před přiřazením k importu jednotlivých záznamů katalogu pečlivě zkontrolujte uvedené profily úloh. Lze přiřadit pouze MARC bibliografické profily úloh, nikoli profily úloh pro MARC holdingy nebo MARC autority.",
     "copycat.overlaySourceBib": "Překrýt zdroj bibliografického záznamu",
-    "copycat.overlayJobProfileToBeUsed": "Vyberte profil, který se má použít k překrytí aktuálních dat",
+    "copycat.overlayJobProfileToBeUsed": "Vybrat profil, který se má použít k překrytí aktuálních dat",
     "effectiveLocationHoldings": "Efektivní lokace pro holdingy",
     "info.effectiveCallNumber": "Toto pole obsahuje signaturu jednotky, která je buď zděděna ze záznamu holdingu, nebo je aktualizovanou signaturou záznamu jednotky. Při procházení signatur se bude vyhledávat v tomto poli.",
     "info.shelvingOrder": "Toto pole je normalizovaná forma signatury, která určuje, jak je signatura při procházení seřazena.",
@@ -779,5 +779,9 @@
     "newMARCRecord": "Nový záznam MARC Bib",
     "boundWithTitles.add": "Přidat Vazbu a analitiku",
     "boundWithTitles.enterHoldingsHrid": "Zadejte HRID holdingů",
-    "selectCode": "Vybrat kód"
+    "selectCode": "Vybrat kód",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/da.json b/translations/ui-inventory/da.json
index df82ffced..2dba530d7 100644
--- a/translations/ui-inventory/da.json
+++ b/translations/ui-inventory/da.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/de.json b/translations/ui-inventory/de.json
index 07b77a8f5..0af2e081b 100644
--- a/translations/ui-inventory/de.json
+++ b/translations/ui-inventory/de.json
@@ -339,8 +339,8 @@
     "holdingRecord": "Bestandsdatensatz{location} {callNumber}",
     "instanceRecordTitle": "Instanzdatensatz {title} {publisherAndDate}",
     "makePrimary": "Zum 1. geistigen Schöpfer machen",
-    "holdingsNoteTypes": "Anmerkungstypen des Bestands",
-    "itemNoteTypes": "Anmerkungstypen des Exemplars",
+    "holdingsNoteTypes": "Bestands-Anmerkungstypen",
+    "itemNoteTypes": "Exemplar-Anmerkungstypen",
     "itemOnHoldingsRecordDeleteModal.message": "Bestandsdatensatz HRID <strong>{hrid}</strong> mit Standort <strong>{location}</strong> hat <strong>ein</strong> zugehöriges Exemplar. Um die Löschung dieses Bestandsdatensatzes fortzusetzen, muss das zugehörige Exemplar gelöscht werden.",
     "itemsOnHoldingsRecordDeleteModal.message": "Bestandsdatensatz HRID <strong>{hrid}</strong> mit Standort <strong>{location}</strong> hat <strong>{itemCount}</strong> zugehörige Exemplare. Um die Löschung dieses Bestandsdatensatzes fortzusetzen, müssen alle zugehörigen Exemplare gelöscht werden.",
     "condition": "Zustand",
@@ -349,7 +349,7 @@
     "isbn": "ISBN",
     "issn": "ISSN",
     "marcSourceRecord.notFoundError": "Kann den bibliografischen MARC-Datensatz für die \"{name}\"-Instanz nicht finden!",
-    "instanceNoteTypes": "Anmerkungstypen der Instanz",
+    "instanceNoteTypes": "Instanz-Anmerkungstypen",
     "modesOfIssuance": "Erscheinungsweise",
     "resourceIdentifierTypes": "Ressourcen-Identifikatorentypen",
     "classificationIdentifierTypes": "Klassifikations-Identifikatorentypen",
@@ -779,5 +779,9 @@
     "newMARCRecord": "Neuer bibliographischer MARC-Datensatz",
     "boundWithTitles.add": "Konvoluttitel hinzufügen",
     "boundWithTitles.enterHoldingsHrid": "Bestands-HRID eingeben",
-    "selectCode": "Code auswählen"
+    "selectCode": "Code auswählen",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_GB.json b/translations/ui-inventory/en_GB.json
index 22950aecf..2a84bf373 100644
--- a/translations/ui-inventory/en_GB.json
+++ b/translations/ui-inventory/en_GB.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_SE.json b/translations/ui-inventory/en_SE.json
index 22950aecf..2a84bf373 100644
--- a/translations/ui-inventory/en_SE.json
+++ b/translations/ui-inventory/en_SE.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_US.json b/translations/ui-inventory/en_US.json
index 51be90b3a..d177d6259 100644
--- a/translations/ui-inventory/en_US.json
+++ b/translations/ui-inventory/en_US.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es.json b/translations/ui-inventory/es.json
index c7a53a0cf..871c3f6dc 100644
--- a/translations/ui-inventory/es.json
+++ b/translations/ui-inventory/es.json
@@ -544,7 +544,7 @@
     "moveItems.instance.items.error": "The following items could not be moved {items}. Check the instance record fields and try again or notify your systems administrator.",
     "moveItems.instance.items.error.server": "There was a problem updating the following items {items}. Please try again or notify your systems administrator.",
     "moveItems.instance.holdings.error": "The following holdings could not be moved {holdings}. Check the instance record fields and try again or notify your systems administrator.",
-    "moveItems.instance.holdings.error.server": "Hubo un problema al actualizar las siguientes existencias {holdings}. Vuelva a intentarlo o notifique a su administrador de sistemas.",
+    "moveItems.instance.holdings.error.server": "Hubo un problema al actualizar las siguientes Holdings {holdings}. Vuelva a intentarlo o notifique a su administrador de sistemas.",
     "newFastAddRecord": "New Fast Add Record",
     "holdingsStatementPublicNote": "Holdings statement public note",
     "holdingsStatementStaffNote": "Holdings statement staff note",
@@ -563,9 +563,9 @@
     "defaultInstanceStatus": "Default instance status",
     "fastAdd": "Fast add",
     "uniqueCode": "Code must be unique",
-    "holdingsSources": "Fuentes de existencias",
-    "holdingsSource": "Fuente de existencias",
-    "selectHoldingsSource": "Seleccionar fuente de existencias",
+    "holdingsSources": "Fuentes de Holdings",
+    "holdingsSource": "Fuente de Holdings",
+    "selectHoldingsSource": "Seleccionar fuente de Holdings",
     "holdingsSourceLabel": "Fuente",
     "uniqueName": "El nombre debe ser único",
     "viewRequests": "Ver solicitudes",
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_419.json b/translations/ui-inventory/es_419.json
index 37af441cd..1b960b6a7 100644
--- a/translations/ui-inventory/es_419.json
+++ b/translations/ui-inventory/es_419.json
@@ -15,11 +15,11 @@
     "itemRecord": "Registro del Artículo",
     "editInstance": "Editar",
     "instanceDetails": "Detalles de la Instancia",
-    "addHoldings": "Agregar existencias",
+    "addHoldings": "Agregar Holdings",
     "itemDotStatus": "Artículo . {barcode} {status}",
     "instances": "Instancias",
     "instance": "Instancia:",
-    "holdings": "Existencias",
+    "holdings": "Holdings",
     "alternativeTitles": "Títulos alternativos",
     "addAlternativeTitles": "Agregar título alternativo",
     "classifications": "Clasificaciones",
@@ -77,20 +77,20 @@
     "loans": "Préstamos",
     "materialTypes": "Tipos de materiales",
     "materialType": "Tipo de material",
-    "holdingsHeader": "Existencias: {location} > {callNumber} {copyNumber}",
-    "viewHoldings": "Ver existencias",
-    "holdingsRecord": "Registro de Existencias",
-    "viewHoldingsRecord": "Ver Registro de Existencias",
-    "holdingsData": "Datos de Existencias",
-    "holdingsId": "ID de Existencias",
-    "holdingsStatement": "Declaración de Existencias",
-    "holdingsStatements": "Declaraciones de existencias",
+    "holdingsHeader": "Holdings: {location} > {callNumber} {copyNumber}",
+    "viewHoldings": "Ver Holdings",
+    "holdingsRecord": "Registro de Holdings",
+    "viewHoldingsRecord": "Ver Registro de Holdings",
+    "holdingsData": "Datos de Holdings",
+    "holdingsId": "ID de Holdings",
+    "holdingsStatement": "Declaración de Holdings",
+    "holdingsStatements": "Declaraciones de Holdings",
     "removeStatement": "Quitar declaración {num}",
     "deleteStatement": "Eliminar Declaración",
-    "editHoldingsRecordDialog": "Editar Cuadro de diálogo del registro de existencias",
-    "copyHoldingsRecordDialog": "Copiar el Cuadro de diálogo de Registro de Existencias",
-    "createHoldingsRecord": "Crear Nuevo Registro de Existencias",
-    "updateHoldingsRecord": "Actualizar Registro de Existencias",
+    "editHoldingsRecordDialog": "Editar Cuadro de diálogo del registro de Holdings",
+    "copyHoldingsRecordDialog": "Copiar el Cuadro de diálogo de Registro de Holdings",
+    "createHoldingsRecord": "Crear Nuevo Registro de Holdings",
+    "updateHoldingsRecord": "Actualizar Registro de Holdings",
     "editHoldings": "Editar",
     "instanceData": "Datos de instancia",
     "instanceId": "ID de instancia",
@@ -107,7 +107,7 @@
     "classification": "Clasificación",
     "seriesStatement": "Mención de serie",
     "editInstanceDialog": "Editar Diálogo de Instancia",
-    "addNewHoldingsDialog": "Añadir Nuevo Diálogo de Existencias",
+    "addNewHoldingsDialog": "Añadir Nuevo Diálogo de los Holdings",
     "addItem": "Agregar artículo",
     "viewItem": "Ver artículo",
     "itemData": "Datos del item",
@@ -120,25 +120,25 @@
     "contributorType": "Tipo de colaborador",
     "contributorTypes": "Tipos de colaboradores",
     "onePublicationFieldToContinue": "Por favor rellene uno o más campos de publicación para continuar",
-    "holdingsLocation": "Ubicación de las existencias",
+    "holdingsLocation": "Ubicación de las Holdings",
     "itemLocation": "Ubicación del artículo",
     "effectiveLocation": "Ubicación efectiva para el artículo",
     "permanent": "Permanente",
     "temporary": "Temporal",
     "selectPermanenLocation": "Seleccionar ubicación permanente",
     "selectLocation": "Seleccionar ubicación",
-    "inheritFromHoldings": "Heredar de las existencias",
+    "inheritFromHoldings": "Heredar de las Holdings",
     "itemBarcode": "Código de barras del artículo",
     "enumerationData": "Datos de enumeración",
     "itemPublicNote": "Nota pública del artículo",
-    "holdingsHrid": "Existencias HRID",
+    "holdingsHrid": "Holdings HRID",
     "instanceHrid": "Instancia HRID",
     "viewSource": "Ver fuente",
     "itemHrid": "Artículo HRID",
     "administrativeData": "Datos administrativos",
     "itemNotes": "Notas del artículo",
     "itemCallNumber": "Número de llamada del artículo",
-    "holdingsNotes": "Notas sobre las existencias",
+    "holdingsNotes": "Notas sobre las Holdings",
     "electronicAccess": "Acceso Electrónico",
     "meta.title": "Inventario",
     "location": "Ubicación",
@@ -232,7 +232,7 @@
     "instanceRelationshipsAnalyticsBoundWith": "Relación de instancia (analíticas y encuadernadas con)",
     "instanceStatusTypes": "Tipos de estados de la instancia",
     "instanceStatusType": "Tipo de estado de la instancia",
-    "instanceHoldingsItem": "Instancias, existencias, artículos",
+    "instanceHoldingsItem": "Instancias, Holdings, artículos",
     "URLrelationship": "Relación URL",
     "urlRelationshipTerm": "Término de la relación URL",
     "digitizationPolicy": "Política de digitalización",
@@ -531,7 +531,7 @@
     "moveItems.move.items.count": "Mover: {count, number} {count, plural, one {ítem} other {ítems}}",
     "moveItems.instance.actionMenu.enable": "Mover ejemplares dentro de una instancia.",
     "moveItems.instance.actionMenu.disable": "Detener el movimiento de ejemplares dentro de una instancia.",
-    "moveItems": "Mover existencias / ejemplares a otra instancia.",
+    "moveItems": "Mover Holdings / ejemplares a otra instancia.",
     "folio": "FOLIO",
     "marc": "MARC",
     "effectiveLocationShort": "Localización efectiva",
@@ -543,15 +543,15 @@
     "moveItems.instance.holdings.success": "{count, number} {count, plural, one {retención ha} other {retenciones han}} sido trasladadas con éxito.",
     "moveItems.instance.items.error": "Los siguientes ejemplares no se pudieron mover {items}. Verifique los campos del registro de la instancia e intente nuevamente o notifique a su administrador de sistemas.",
     "moveItems.instance.items.error.server": "Hubo un problema al actualizar los siguientes ejemplares {items}. Vuelva a intentarlo o notifique a su administrador de sistemas.",
-    "moveItems.instance.holdings.error": "Las siguientes existencias no se pudieron mover {holdings}. Verifique los campos del registro de la instancia e intente nuevamente o notifique a su administrador de sistemas.",
-    "moveItems.instance.holdings.error.server": "Hubo un problema al actualizar las siguientes existencias {holdings}. Vuelva a intentarlo o notifique a su administrador de sistemas.",
+    "moveItems.instance.holdings.error": "Las siguientes Holdings no se pudieron mover {holdings}. Verifique los campos del registro de la instancia e intente nuevamente o notifique a su administrador de sistemas.",
+    "moveItems.instance.holdings.error.server": "Hubo un problema al actualizar las siguientes Holdings {holdings}. Vuelva a intentarlo o notifique a su administrador de sistemas.",
     "newFastAddRecord": "Agregar nuevo registro rápido.",
-    "holdingsStatementPublicNote": "Nota pública sobre el estado de las existencias.",
-    "holdingsStatementStaffNote": "Nota del personal sobre el estado de las existencias.",
-    "holdingsStatementForIndexesPublicNote": "Nota pública sobre el estado de las existencias para indización.",
-    "holdingsStatementForIndexesStaffNote": "Nota del personal sobre el estado de las existencias para indización.",
-    "holdingsStatementForSupplementsPublicNote": "Nota pública sobre el estado de las existencias de suplementos.",
-    "holdingsStatementForSupplementsStaffNote": "Nota del personal sobre el estado de las existencias de suplementos.",
+    "holdingsStatementPublicNote": "Nota pública sobre el estado de las Holdings.",
+    "holdingsStatementStaffNote": "Nota del personal sobre el estado de las Holdings.",
+    "holdingsStatementForIndexesPublicNote": "Nota pública sobre el estado de las Holdings para indización.",
+    "holdingsStatementForIndexesStaffNote": "Nota del personal sobre el estado de las Holdings para indización.",
+    "holdingsStatementForSupplementsPublicNote": "Nota pública sobre el estado de las Holdings de suplementos.",
+    "holdingsStatementForSupplementsStaffNote": "Nota del personal sobre el estado de las Holdings de suplementos.",
     "permission.item.move": "Inventario: mover artículos",
     "permission.holdings.move": "Inventario: mover holdings",
     "item.status.agedToLost": "Préstamo vencido a perdido",
@@ -563,9 +563,9 @@
     "defaultInstanceStatus": "Estado de instancia predeterminado.",
     "fastAdd": "Adición rápida",
     "uniqueCode": "El código debe ser único",
-    "holdingsSources": "Fuentes de existencias",
-    "holdingsSource": "Fuente de existencias",
-    "selectHoldingsSource": "Seleccionar fuente de existencias",
+    "holdingsSources": "Fuentes de Holdings",
+    "holdingsSource": "Fuente de Holdings",
+    "selectHoldingsSource": "Seleccionar fuente de Holdings",
     "holdingsSourceLabel": "Fuente",
     "uniqueName": "El nombre debe ser único",
     "viewRequests": "Ver solicitudes",
@@ -634,11 +634,11 @@
     "remote.confirmation.message": "¿Está seguro que desea eliminar {something} del almacenamiento remoto?",
     "remote.warning.common": "Para eliminar {something} del almacenamiento remoto, ejecute un informe de excepción o comuníquelo directamente a su ubicación de almacenamiento remoto.",
     "remote.warning.titles": "Esto incluye {count, plural, =0 {<strong>no</strong> títulos} one {<strong>#</strong> títulos} other {<strong>#</strong> títulos}}.",
-    "remote.holdings": "Las existencias.",
+    "remote.holdings": "Las Holdings.",
     "remote.items": "{count, plural, one {este item} other {<strong>#</strong> items}}",
     "button.addTargetOption": "Agregar opción de destino",
     "warning.instance.suppressedFromDiscovery": "Advertencia: la instancia está marcada como suprimida del descubrimiento.",
-    "warning.holdingsRecord.suppressedFromDiscovery": "Advertencia: las existencias están marcadas como suprimidas del descubrimiento.",
+    "warning.holdingsRecord.suppressedFromDiscovery": "Advertencia: las Holdings están marcadas como suprimidas del descubrimiento.",
     "warning.item.suppressedFromDiscovery": "Advertencia: el ejemplar está marcado como suprimido del descubrimiento.",
     "warning.instance.staffSuppressed": "Adevertencia: El ejemplar está marcado como suprimido por el staff",
     "warning.instance.suppressedFromDiscoveryAndStaffSuppressed": "Advertencia: la instancia está marcada como suprimida del descubrimiento y del personal eliminado.",
@@ -651,7 +651,7 @@
     "item.successfullySaved": "El <strong>ejemplar</strong> - HRID <strong>{hrid}</strong> ha sido guardado exitosamente.",
     "holdingsRecord.successfullySaved": "La <strong>existencia</strong> - HRID <strong>{hrid}</strong> ha sido guardada exitosamente.",
     "instance.successfullySaved": "La <strong>instancia</strong> - HRID <strong>{hrid}</strong> ha sido guardada exitosamente.",
-    "holdingsPaneTitle": "Existencias • {location} • {callNumber}",
+    "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Última actualización: {updatedDate}",
     "instance.saveError": "Error al guardar la instancia",
     "itemRecordWithDescriptionBW": "Registro del ítem ({materialType}, {status}, Atado con)",
@@ -680,8 +680,8 @@
     "receivingHistory.source.user": "Usuario",
     "holdingsLabelShort": "Tenencias:",
     "appMenu.keyboardShortcuts": "Atajos de teclado",
-    "marcHoldingsRecord": "Registro de existencias MARC",
-    "marcHoldingsRecord.paneTitle": "Registro de existencias - {title}",
+    "marcHoldingsRecord": "Registro de Holdings MARC",
+    "marcHoldingsRecord.paneTitle": "Registro de Holdings - {title}",
     "boundWithTitles": "Vinculación y análisis",
     "instanceTitleLabel": "Título de la instancia",
     "caption": "Leyenda",
@@ -693,7 +693,7 @@
     "saveHoldingsUIIDS.info": "Se ha recibido la solicitud para guardar los UUID de las explotaciones. La descarga del archivo puede tardar unos minutos.",
     "saveHoldingsUIIDS.error": "Se ha producido un error al guardar los UUID de las participaciones. Por favor, inténtelo de nuevo.",
     "instance.suppressedFromDiscovery": "Suprimido del descubrimiento",
-    "createMARCHoldings": "Añadir registro de existencias MARC",
+    "createMARCHoldings": "Añadir registro de holdings MARC",
     "exportInProgress": "Exportación en progreso",
     "acq.acqUnit": "Unidad de adquisición",
     "showMoreOptions": "Mostrar más opciones",
@@ -717,7 +717,7 @@
     "browseCallNumbers.missedMatch": "estaría aquí",
     "search.allFields": "Todos",
     "acq.dateOpened": "Fecha de apertura",
-    "moveItems.selectHolding": "Seleccionar existencias",
+    "moveItems.selectHolding": "Seleccionar Holdings",
     "browseContributors": "Buscar colaboradores",
     "newOrder": "Nuevo pedido",
     "permission.instance.createOrder": "Inventario: Crear pedido desde instancia",
@@ -730,7 +730,7 @@
     "instances.columns.contributor": "Colaborador",
     "instances.columns.contributorType": "Tipo",
     "instances.columns.relatorTerm": "Término relativo",
-    "search.holdings.uuid": "UUID de existencias",
+    "search.holdings.uuid": "UUID de Holdings",
     "search.item.uuid": "UUID del artículo",
     "filters.nameType": "Tipo de nombre",
     "instanceStatusShort": "Estado de la instancia",
@@ -773,11 +773,15 @@
     "copycat.overlaySourceBib": "Superponer registro bibliográfico de origen",
     "copycat.overlayJobProfileToBeUsed": "Seleccione el perfil que se utilizará para superponer los datos actuales",
     "effectiveLocationHoldings": "Localización efectiva de las existéncias",
-    "info.effectiveCallNumber": "Este campo contiene la signatura del artículo, que se hereda del registro de existencias o es la signatura actualizada en el registro del artículo. Al consultar las signaturas, se buscará en este campo.",
+    "info.effectiveCallNumber": "Este campo contiene la signatura del artículo, que se hereda del registro de Holdings o es la signatura actualizada en el registro del artículo. Al consultar las signaturas, se buscará en este campo.",
     "info.shelvingOrder": "Este campo es la forma normalizada del número de llamada que determina cómo se ordena el número de llamada durante la navegación.",
     "markAsHeader": "Marcar como",
     "newMARCRecord": "Nuevo MARC Bib Record",
     "boundWithTitles.add": "Añadir Bound-with y análisis",
     "boundWithTitles.enterHoldingsHrid": "Ingrese las participaciones HRID",
-    "selectCode": "Seleccionar código"
+    "selectCode": "Seleccionar código",
+    "actions.menuSection.sortBy": "Ordenar por",
+    "actions.menuSection.sortBy.relevance": "Relevancia",
+    "actions.menuSection.sortBy.title": "Título",
+    "actions.menuSection.sortBy.contributors": "Colaboradores"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_ES.json b/translations/ui-inventory/es_ES.json
index e213cdb20..72d65e152 100644
--- a/translations/ui-inventory/es_ES.json
+++ b/translations/ui-inventory/es_ES.json
@@ -544,7 +544,7 @@
     "moveItems.instance.items.error": "The following items could not be moved {items}. Check the instance record fields and try again or notify your systems administrator.",
     "moveItems.instance.items.error.server": "There was a problem updating the following items {items}. Please try again or notify your systems administrator.",
     "moveItems.instance.holdings.error": "The following holdings could not be moved {holdings}. Check the instance record fields and try again or notify your systems administrator.",
-    "moveItems.instance.holdings.error.server": "Hubo un problema al actualizar las siguientes existencias {holdings}. Vuelva a intentarlo o notifique a su administrador de sistemas.",
+    "moveItems.instance.holdings.error.server": "Hubo un problema al actualizar las siguientes Holdings {holdings}. Vuelva a intentarlo o notifique a su administrador de sistemas.",
     "newFastAddRecord": "Nuevo registro al vuelo",
     "holdingsStatementPublicNote": "Nota pública de la mención de fondos",
     "holdingsStatementStaffNote": "Holdings statement staff note",
@@ -563,9 +563,9 @@
     "defaultInstanceStatus": "Estado predeterminado de la instancia",
     "fastAdd": "Agregar catalogación al vuelo",
     "uniqueCode": "Code must be unique",
-    "holdingsSources": "Fuentes de existencias",
-    "holdingsSource": "Fuente de existencias",
-    "selectHoldingsSource": "Seleccionar fuente de existencias",
+    "holdingsSources": "Fuentes de Holdings",
+    "holdingsSource": "Fuente de Holdings",
+    "selectHoldingsSource": "Seleccionar fuente de Holdings",
     "holdingsSourceLabel": "Fuente",
     "uniqueName": "El nombre debe ser único",
     "viewRequests": "Ver solicitudes",
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr.json b/translations/ui-inventory/fr.json
index f764fc5e8..f24bbaade 100644
--- a/translations/ui-inventory/fr.json
+++ b/translations/ui-inventory/fr.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr_FR.json b/translations/ui-inventory/fr_FR.json
index 01d9e9f23..df1264e59 100644
--- a/translations/ui-inventory/fr_FR.json
+++ b/translations/ui-inventory/fr_FR.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/he.json b/translations/ui-inventory/he.json
index aebae3530..a3bbdea0a 100644
--- a/translations/ui-inventory/he.json
+++ b/translations/ui-inventory/he.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hi_IN.json b/translations/ui-inventory/hi_IN.json
index 6edccc4aa..7d7240d78 100644
--- a/translations/ui-inventory/hi_IN.json
+++ b/translations/ui-inventory/hi_IN.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hu.json b/translations/ui-inventory/hu.json
index 9815b6271..320a680b6 100644
--- a/translations/ui-inventory/hu.json
+++ b/translations/ui-inventory/hu.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/it_IT.json b/translations/ui-inventory/it_IT.json
index f949c3b90..35b2c19aa 100644
--- a/translations/ui-inventory/it_IT.json
+++ b/translations/ui-inventory/it_IT.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ja.json b/translations/ui-inventory/ja.json
index ed9ff1600..26b540891 100644
--- a/translations/ui-inventory/ja.json
+++ b/translations/ui-inventory/ja.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ko.json b/translations/ui-inventory/ko.json
index 83701cebf..4c9934c3d 100644
--- a/translations/ui-inventory/ko.json
+++ b/translations/ui-inventory/ko.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nb.json b/translations/ui-inventory/nb.json
index 6edccc4aa..7d7240d78 100644
--- a/translations/ui-inventory/nb.json
+++ b/translations/ui-inventory/nb.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nn.json b/translations/ui-inventory/nn.json
index 6edccc4aa..7d7240d78 100644
--- a/translations/ui-inventory/nn.json
+++ b/translations/ui-inventory/nn.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pl.json b/translations/ui-inventory/pl.json
index 7e3b1af29..088cfe920 100644
--- a/translations/ui-inventory/pl.json
+++ b/translations/ui-inventory/pl.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_BR.json b/translations/ui-inventory/pt_BR.json
index ec14cd773..ae2b54e5c 100644
--- a/translations/ui-inventory/pt_BR.json
+++ b/translations/ui-inventory/pt_BR.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "Novo registro MARC Bibliográfico",
     "boundWithTitles.add": "Adicione encadernados e analíticas",
     "boundWithTitles.enterHoldingsHrid": "Digite o HRID das Coleções",
-    "selectCode": "Selecione o código"
+    "selectCode": "Selecione o código",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_PT.json b/translations/ui-inventory/pt_PT.json
index 2b210cc58..01b87b434 100644
--- a/translations/ui-inventory/pt_PT.json
+++ b/translations/ui-inventory/pt_PT.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ru.json b/translations/ui-inventory/ru.json
index a4d134341..1b1cb059a 100644
--- a/translations/ui-inventory/ru.json
+++ b/translations/ui-inventory/ru.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/sv.json b/translations/ui-inventory/sv.json
index 6edccc4aa..7d7240d78 100644
--- a/translations/ui-inventory/sv.json
+++ b/translations/ui-inventory/sv.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ur.json b/translations/ui-inventory/ur.json
index 210e3514b..681958a6a 100644
--- a/translations/ui-inventory/ur.json
+++ b/translations/ui-inventory/ur.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_CN.json b/translations/ui-inventory/zh_CN.json
index f5d7ca7fa..67805c8fe 100644
--- a/translations/ui-inventory/zh_CN.json
+++ b/translations/ui-inventory/zh_CN.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "新建MARC书目记录",
     "boundWithTitles.add": "添加合订与分析",
     "boundWithTitles.enterHoldingsHrid": "输入馆藏HRID",
-    "selectCode": "选择代码"
+    "selectCode": "选择代码",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_TW.json b/translations/ui-inventory/zh_TW.json
index 1d0f5cc3c..468377cb7 100644
--- a/translations/ui-inventory/zh_TW.json
+++ b/translations/ui-inventory/zh_TW.json
@@ -779,5 +779,9 @@
     "newMARCRecord": "New MARC Bib Record",
     "boundWithTitles.add": "Add Bound-with and analytics",
     "boundWithTitles.enterHoldingsHrid": "Enter Holdings HRID",
-    "selectCode": "Select code"
+    "selectCode": "Select code",
+    "actions.menuSection.sortBy": "Sort by",
+    "actions.menuSection.sortBy.relevance": "Relevance",
+    "actions.menuSection.sortBy.title": "Title",
+    "actions.menuSection.sortBy.contributors": "Contributors"
 }
\ No newline at end of file

From 27de0f48077d41e88f38e60192a904e99845605b Mon Sep 17 00:00:00 2001
From: cchitneedi <100114810+cchitneedi@users.noreply.github.com>
Date: Thu, 1 Jun 2023 11:54:07 +0530
Subject: [PATCH 32/68] UIIN-1607 create Jest/RTL test for
 HoldingsRecordFilters.js (#2131)

* UIIN-1607 create Jest/RTL test for HoldingsRecordFilters.js

* Update HoldingsRecordFilters.test.js

removed screen.debug();

* Update HoldingsRecordFilters.test.js

removed unused import

* Update HoldingsRecordFilters.test.js

removed unused import

* Update HoldingsRecordFilters.test.js

Removed Unused imports

* Update HoldingsRecordFilters.test.js

Unused imports removed

* Update HoldingsRecordFilters.test.js

imports changed

* Update HoldingsRecordFilters.test.js

Changes Updated

* UIIN-1607 create Jest/RTL test for HoldingsRecordFilters.js

* Update HoldingsRecordFilters.test.js

changes updated in imports

* Update HoldingsRecordFilters.test.js

import { ModuleHierarchyProvider } from '@folio/stripes-core/src/components/ModuleHierarchy'; import added

* Update HoldingsRecordFilters.test.js

changes updated in Imports

* Update HoldingsRecordFilters.test.js

removed before each method

* Update HoldingsRecordFilters.test.js

file updated
---
 .../HoldingsRecordFilters.test.js             | 144 +++++++++++++++---
 1 file changed, 123 insertions(+), 21 deletions(-)

diff --git a/src/components/HoldingsRecordFilters/HoldingsRecordFilters.test.js b/src/components/HoldingsRecordFilters/HoldingsRecordFilters.test.js
index a8fb96f13..eb9358918 100644
--- a/src/components/HoldingsRecordFilters/HoldingsRecordFilters.test.js
+++ b/src/components/HoldingsRecordFilters/HoldingsRecordFilters.test.js
@@ -1,70 +1,172 @@
 import React from 'react';
-import { BrowserRouter as Router } from 'react-router-dom';
-import { noop } from 'lodash';
-
 import '../../../test/jest/__mock__';
+import { BrowserRouter as Router } from 'react-router-dom';
+import { screen, waitFor } from '@testing-library/react';
+import { ModuleHierarchyProvider } from '@folio/stripes-core/src/components/ModuleHierarchy';
 
-import { ModuleHierarchyProvider } from '@folio/stripes/core';
+import userEvent from '@testing-library/user-event';
 import renderWithIntl from '../../../test/jest/helpers/renderWithIntl';
-
+import {
+  FACETS
+} from '../../constants';
 import HoldingsRecordFilters from './HoldingsRecordFilters';
+import translationsProperties from '../../../test/jest/helpers/translationsProperties';
+
+jest.mock('../CheckboxFacet/CheckboxFacet', () => jest.fn().mockReturnValue('CheckboxFacet'));
+
+jest.mock('../../facetUtils', () => ({
+  ...jest.requireActual('../../facetUtils'),
+  getSourceOptions: jest.fn(),
+  getSuppressedOptions: jest.fn(),
+}));
 
+const activeFilters = {
+  [FACETS.EFFECTIVE_LOCATION]: ['loc1'],
+  [FACETS.HOLDINGS_PERMANENT_LOCATION]: ['loc2'],
+  [FACETS.HOLDINGS_TYPE]: ['loc3'],
+  [FACETS.HOLDINGS_DISCOVERY_SUPPRESS]: ['loc4'],
+  [FACETS.HOLDINGS_STATISTICAL_CODE_IDS]: ['loc5'],
+  [FACETS.HOLDINGS_CREATED_DATE]: ['2022-01-01'],
+  [FACETS.HOLDINGS_UPDATED_DATE]: ['2022-01-01'],
+  [FACETS.HOLDINGS_SOURCE]: ['loc8']
+};
 const resources = {
   facets: {
     hasLoaded: true,
     resource: 'facets',
-    records: [],
+    records: [{
+      'items.effectiveLocationId': 'effectiveLocationId1',
+      'holdings.permanentLocationId': 'permanentLocationId1',
+      'holdings.statisticalCodeIds': 'statisticalCodeIds1',
+      'holdings.discoverySuppress': 'discoverySuppress1',
+      'holdings.sourceId': 'sourceId1',
+      'holdingsTags': 'holdingsTags1',
+      'holdings.holdingsTypeId': 'holdingsTypeId1',
+    }],
     other: { totalRecords: 0 }
   },
 };
 
 const data = {
   locations: [],
+  statisticalCodes: [],
+  holdingsSources: [],
+  holdingsTypes: [],
   resourceTypes: [],
   instanceFormats: [],
   modesOfIssuance: [],
-  statisticalCodes: [],
   tagsRecords: [],
   natureOfContentTerms: [],
   query: [],
-  onFetchFacets: noop,
+  onFetchFacets: jest.fn(),
   parentResources: resources,
 };
 
+const onChange = jest.fn();
+const onClear = jest.fn();
+
 const renderHoldingsRecordFilters = () => {
   return renderWithIntl(
     <Router>
       <ModuleHierarchyProvider module="@folio/inventory">
         <HoldingsRecordFilters
-          activeFilters={{ 'language': ['eng'] }}
+          activeFilters={activeFilters}
           data={data}
-          onChange={noop}
-          onClear={noop}
           parentResources={resources}
+          onChange={onChange}
+          onClear={onClear}
         />
       </ModuleHierarchyProvider>
-    </Router>
+    </Router>,
+    translationsProperties
   );
 };
 
 describe('HoldingsRecordFilters', () => {
-  beforeEach(() => {
+  it('Should Render effectiveLocation, Clear selectedfilters buttons', async () => {
+    renderHoldingsRecordFilters();
+    const effectiveLocation = document.querySelector('[id="accordion-toggle-button-effectiveLocation"]');
+    userEvent.click(effectiveLocation);
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[1]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Render holdingsPermanentLocation, Clear selectedfilters buttons', async () => {
     renderHoldingsRecordFilters();
+    const holdingsPermanentLocation = document.querySelector('[id="accordion-toggle-button-holdingsPermanentLocation"]');
+    userEvent.click(holdingsPermanentLocation);
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[3]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
   });
 
-  it('Contains a filter for creation date', () => {
-    expect(document.querySelector('#holdingsCreatedDate')).toBeInTheDocument();
+  it('Should Render holdingsType, Clear selectedfilters buttons', async () => {
+    renderHoldingsRecordFilters();
+    const holdingsType = document.querySelector('[id="accordion-toggle-button-holdingsType"]');
+    userEvent.click(holdingsType);
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[5]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
   });
 
-  it('Contains a filter for update date', () => {
-    expect(document.querySelector('#holdingsUpdatedDate')).toBeInTheDocument();
+  it('Should Render holdingsDiscoverySuppress, Clear selectedfilters buttons', async () => {
+    renderHoldingsRecordFilters();
+    const holdingsDiscoverySuppress = document.querySelector('[id="accordion-toggle-button-holdingsDiscoverySuppress"]');
+    userEvent.click(holdingsDiscoverySuppress);
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[7]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
   });
 
-  it('Contains a filter for statistical code', () => {
-    expect(document.querySelector('#holdingsStatisticalCodeIds')).toBeInTheDocument();
+  it('Should Render holdingsStatisticalCodeIds, Clear selectedfilters buttons', async () => {
+    renderHoldingsRecordFilters();
+    const holdingsStatisticalCodeIds = document.querySelector('[id="accordion-toggle-button-holdingsStatisticalCodeIds"]');
+    userEvent.click(holdingsStatisticalCodeIds);
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[9]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
   });
 
-  it('Contains a filter for source', () => {
-    expect(document.querySelector('#holdingsSource')).toBeInTheDocument();
+  it('Should Render holdingsCreatedDate, Clear selectedfilters buttons', async () => {
+    renderHoldingsRecordFilters();
+    const holdingsCreatedDate = document.querySelector('[id="accordion-toggle-button-holdingsCreatedDate"]');
+    userEvent.click(holdingsCreatedDate);
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[11]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Render holdingsUpdatedDate, Clear selectedfilters buttons', async () => {
+    renderHoldingsRecordFilters();
+    const holdingsUpdatedDate = document.querySelector('[id="accordion-toggle-button-holdingsUpdatedDate"]');
+    userEvent.click(holdingsUpdatedDate);
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[18]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+  it('Should Render holdingsSource, Clear selectedfilters buttons', async () => {
+    renderHoldingsRecordFilters();
+    const holdingsSource = document.querySelector('[id="accordion-toggle-button-holdingsSource"]');
+    userEvent.click(holdingsSource);
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[25]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
   });
 });

From 2fde3413feabd21537a6a7d8d27f070479fc2f4c Mon Sep 17 00:00:00 2001
From: cchitneedi <100114810+cchitneedi@users.noreply.github.com>
Date: Thu, 1 Jun 2023 13:08:59 +0530
Subject: [PATCH 33/68] UIIN-1609 create Jest/RTL test for
 instanceFilterRenderer.js (#2060)

* UIIN-1609 create Jest/RTL test for instanceFilterRenderer.js

* Update instanceFilterRenderer.test.js

Test names added

* Update instanceFilterRenderer.test.js

changes for tests

* UIIN-1609 create Jest/RTL test for instanceFilterRenderer.js

* Update instanceFilterRenderer.test.js

removed Unused Import
---
 .../instanceFilterRenderer.test.js            | 131 ++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 src/components/InstanceFilters/instanceFilterRenderer.test.js

diff --git a/src/components/InstanceFilters/instanceFilterRenderer.test.js b/src/components/InstanceFilters/instanceFilterRenderer.test.js
new file mode 100644
index 000000000..fe2d18b37
--- /dev/null
+++ b/src/components/InstanceFilters/instanceFilterRenderer.test.js
@@ -0,0 +1,131 @@
+import React from 'react';
+import { BrowserRouter as Router } from 'react-router-dom';
+import { screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import '../../../test/jest/__mock__/currencyData.mock';
+import '../../../test/jest/__mock__/stripesConfig.mock';
+import '../../../test/jest/__mock__/stripesCore.mock';
+import '../../../test/jest/__mock__/stripesIcon.mock';
+import renderWithIntl from '../../../test/jest/helpers/renderWithIntl';
+import translationsProperties from '../../../test/jest/helpers/translationsProperties';
+
+import instanceFilterRenderer from './instanceFilterRenderer';
+
+
+import {
+  getSourceOptions,
+  getSuppressedOptions,
+  processFacetOptions,
+  processStatisticalCodes,
+} from '../../facetUtils';
+import { languageOptionsES } from './languages';
+
+jest.mock('./languages', () => ({
+  ...jest.requireActual('./languages'),
+  languageOptionsES: jest.fn(),
+}));
+jest.mock('@folio/stripes/components', () => ({
+  ...jest.requireActual('@folio/stripes/components'),
+  Accordion: jest.fn(({ onClearFilter, children }) => (
+    <div>
+      {children}
+      <button type="button" onClick={() => onClearFilter()}>onClearFilter</button>
+    </div>
+  )),
+}), { virtual: true });
+
+jest.mock('../../facetUtils', () => ({
+  ...jest.requireActual('../../facetUtils'),
+  getSourceOptions: jest.fn(),
+  getSuppressedOptions: jest.fn(),
+  processFacetOptions: jest.fn(),
+  processStatisticalCodes: jest.fn(),
+}));
+jest.mock('../CheckboxFacet/CheckboxFacet', () => ({ onChange }) => (
+  <div>
+    <div>CheckboxFacet</div>
+    <button type="button" onClick={() => onChange()}>onChange</button>
+  </div>
+));
+
+const onChangeMock = jest.fn();
+const resources = {
+  facets: {
+    hasLoaded: true,
+    resource: 'facets',
+    records: [{
+      'items.effectiveLocationId': 'effectiveLocationId1',
+      'languages': 'languages',
+      'statisticalCodeIds': 'statisticalCodeIds1',
+      'discoverySuppress': 'discoverySuppress1',
+      'source': 'source1',
+      'instanceTags': 'instanceTags1',
+      'statusId': 'statusId1',
+      'staffSuppress': 'staffSuppress1',
+      'natureOfContentTermIds': 'natureOfContentTermIds1',
+      'modeOfIssuanceId': 'modeOfIssuanceId1',
+      'instanceFormatIds': 'instanceFormatIds1',
+      'instanceTypeId': 'instanceTypeId1',
+    }],
+  },
+};
+const DATA = {
+  locations: ['Location 1', 'Location 2'],
+  instanceTypes: ['Book', 'CD'],
+  instanceFormats: ['Physical', 'Electronic'],
+  instanceStatuses: ['Available', 'Checked Out'],
+  modesOfIssuance: ['Monograph', 'Serial'],
+  natureOfContentTerms: ['Fiction', 'Non-fiction'],
+  statisticalCodes: [],
+  query: {
+    filters: 'locations.id,instanceTypes.id',
+  },
+  onFetchFacets: jest.fn(),
+  parentResources: resources,
+};
+
+const renderFilters = (data = DATA, onChange = onChangeMock) => renderWithIntl(
+  <Router>{instanceFilterRenderer(data)(onChange)}</Router>,
+  translationsProperties
+);
+
+describe('instanceFilterRenderer', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  it('processFacetOptions should be called when instanceFilterRenderer renders', () => {
+    renderFilters();
+    expect(processFacetOptions).toBeCalledWith(undefined, DATA.locations, undefined, expect.anything(), expect.anything());
+    expect(processFacetOptions).toBeCalledWith(undefined, DATA.instanceTypes, undefined, expect.anything(), expect.anything());
+    expect(processFacetOptions).toBeCalledWith(undefined, DATA.instanceFormats, undefined, expect.anything(), expect.anything());
+    expect(processFacetOptions).toBeCalledWith(undefined, DATA.modesOfIssuance, undefined, expect.anything(), expect.anything());
+    expect(processFacetOptions).toBeCalledWith(undefined, DATA.natureOfContentTerms, undefined, expect.anything(), expect.anything());
+    expect(processFacetOptions).toBeCalledWith(undefined, DATA.instanceStatuses, undefined, expect.anything(), expect.anything());
+  });
+  it('languageOptionsES should be called when instanceFilterRenderer renders', () => {
+    renderFilters();
+    expect(languageOptionsES).toBeCalled();
+  });
+  it('getSuppressedOptions should be called when instanceFilterRenderer renders', () => {
+    renderFilters();
+    expect(getSuppressedOptions).toHaveBeenCalledTimes(2);
+  });
+  it('getSourceOptions should be called when instanceFilterRenderer renders', () => {
+    renderFilters();
+    expect(getSourceOptions).toBeCalled();
+  });
+  it('processStatisticalCodes should be called when instanceFilterRenderer renders', () => {
+    renderFilters();
+    expect(processStatisticalCodes).toBeCalledWith(undefined, DATA.statisticalCodes, undefined, expect.anything(), expect.anything());
+  });
+  it('onChange function to be called when clearfilter button is clicked', () => {
+    renderFilters();
+    userEvent.click(screen.getAllByRole('button', { name: 'onClearFilter' })[0]);
+    expect(onChangeMock).toBeCalled();
+  });
+  it('onChange function to be called when onChange button is clicked', () => {
+    renderFilters();
+    userEvent.click(screen.getAllByRole('button', { name: 'onChange' })[0]);
+    expect(onChangeMock).toBeCalled();
+  });
+});

From b306653fbaf86731d8be260e5fd88e87ae67ad71 Mon Sep 17 00:00:00 2001
From: KetineniM <53168935+KetineniM@users.noreply.github.com>
Date: Thu, 1 Jun 2023 13:31:49 +0530
Subject: [PATCH 34/68] UIIN-1616 JEST/RTL test cases for ItemFilters (#2138)

---
 .../ItemFilters/ItemFilters.test.js           | 156 ++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 src/components/ItemFilters/ItemFilters.test.js

diff --git a/src/components/ItemFilters/ItemFilters.test.js b/src/components/ItemFilters/ItemFilters.test.js
new file mode 100644
index 000000000..8356a8041
--- /dev/null
+++ b/src/components/ItemFilters/ItemFilters.test.js
@@ -0,0 +1,156 @@
+import React from 'react';
+import { BrowserRouter as Router } from 'react-router-dom';
+import { screen, waitFor } from '@testing-library/react';
+import { ModuleHierarchyProvider } from '@folio/stripes-core/src/components/ModuleHierarchy';
+import '../../../test/jest/__mock__';
+import userEvent from '@testing-library/user-event';
+import renderWithIntl from '../../../test/jest/helpers/renderWithIntl';
+
+import ItemFilters from './ItemFilters';
+import translationsProperties from '../../../test/jest/helpers/translationsProperties';
+import { FACETS } from '../../constants';
+
+jest.mock('../CheckboxFacet/CheckboxFacet', () => jest.fn().mockReturnValue('CheckboxFacet'));
+
+jest.mock('../../facetUtils', () => ({
+  ...jest.requireActual('../../facetUtils'),
+  getSourceOptions: jest.fn(),
+  getSuppressedOptions: jest.fn(),
+}));
+
+const activeFilters = {
+  [FACETS.EFFECTIVE_LOCATION]: ['loc1'],
+  [FACETS.ITEM_STATUS]: ['ITEM_STATUS1'],
+  [FACETS.HOLDINGS_PERMANENT_LOCATION]: ['loc2'],
+  [FACETS.MATERIAL_TYPE]: ['MATERIAL_TYPE]1'],
+  [FACETS.ITEMS_DISCOVERY_SUPPRESS]: ['DISCOVERYSUPPRESS1'],
+  [FACETS.ITEMS_STATISTICAL_CODE_IDS]: ['STATISTICALCODEIDS1'],
+  [FACETS.ITEMS_CREATED_DATE]: ['2022-01-01'],
+  [FACETS.ITEMS_UPDATED_DATE]: ['2022-01-01'],
+};
+
+const resources = {
+  facets: {
+    hasLoaded: true,
+    resource: 'facets',
+    records: [{
+      'items.effectiveLocationId': 'effectiveLocationId1',
+      'holdings.permanentLocationId': 'permanentLocationId1',
+      'items.statisticalCodeIds': 'statisticalCodeIds1',
+      'items.discoverySuppress': 'discoverySuppress1',
+      'items.status.name': 'name1',
+      'itemTags': 'itemTags1',
+      'items.materialTypeId': 'materialTypeId1',
+    }],
+    other: { totalRecords: 0 }
+  },
+};
+
+const data = {
+  locations: [],
+  resourceTypes: [],
+  instanceFormats: [],
+  modesOfIssuance: [],
+  statisticalCodes: [],
+  tagsRecords: [],
+  natureOfContentTerms: [],
+  query: [],
+  onFetchFacets: jest.fn(),
+  parentResources: resources,
+};
+const onChange = jest.fn();
+const onClear = jest.fn();
+const renderItemFilters = () => {
+  return renderWithIntl(
+    <Router>
+      <ModuleHierarchyProvider module="@folio/inventory">
+        <ItemFilters
+          activeFilters={activeFilters}
+          data={data}
+          onChange={onChange}
+          onClear={onClear}
+          parentResources={resources}
+        />
+      </ModuleHierarchyProvider>
+    </Router>,
+    translationsProperties
+  );
+};
+
+describe('ItemFilters', () => {
+  beforeEach(() => {
+    renderItemFilters();
+  });
+
+  it('Should Clear selected filters for itemStatus', async () => {
+    expect(screen.getByText('Item status')).toBeInTheDocument();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[1]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for effectiveLocation', async () => {
+    expect(screen.getByText('Effective location (item)')).toBeInTheDocument();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[3]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for holdingsPermanentLocation', async () => {
+    expect(screen.getByText('Holdings permanent location')).toBeInTheDocument();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[5]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for materialType', async () => {
+    expect(screen.getByText('Material type')).toBeInTheDocument();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[7]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for itemsDiscoverySuppress', async () => {
+    expect(screen.getByText('Suppress from discovery')).toBeInTheDocument();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[9]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for itemsStatisticalCodeIds', async () => {
+    expect(screen.getByText('Statistical code')).toBeInTheDocument();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[11]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for items Created Date', async () => {
+    expect(screen.getByText('Date created')).toBeInTheDocument();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[13]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+
+  it('Should Clear selected filters for itemsUpdatedDate', async () => {
+    expect(screen.getByText('Date updated')).toBeInTheDocument();
+    const Clearselectedfilters = screen.getAllByRole('button');
+    userEvent.click(Clearselectedfilters[20]);
+    await waitFor(() => {
+      expect(onClear).toBeCalled();
+    });
+  });
+});

From 0d194fa3eab8117685e7758b2ec3ea6839d7da32 Mon Sep 17 00:00:00 2001
From: Denys Bohdan <denys_bohdan@epam.com>
Date: Thu, 1 Jun 2023 14:31:17 +0300
Subject: [PATCH 35/68] UIIN-2434 Don't reset browse query when on Browse route
 and click Browse segment (#2162)

* UIIN-2434 Don't reset browse query when on Browse route and click Browse segment

* UIIN-2434 Added babel config for tests

* UIIN-2434 Added tests
---
 CHANGELOG.md                                  |  1 +
 .../SearchModeNavigation.js                   | 15 ++++---
 .../SearchModeNavigation.test.js              | 40 ++++++++++++++++++-
 3 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a02005f65..b79f85958 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 * Statistical code empty field error. Refs UIIN-2420.
 * Hide the `Actions` button for the view page if there are no permissions. Refs UIIN-2360.
 * When duplicating an item, the circulation history is duplicated when it should not be. Fixes UIIN-2419.
+* Don't reset browse query when on Browse route and click Browse segment. Fixes UIIN-2434.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/components/SearchModeNavigation/SearchModeNavigation.js b/src/components/SearchModeNavigation/SearchModeNavigation.js
index ae26b5d89..738b1f42f 100644
--- a/src/components/SearchModeNavigation/SearchModeNavigation.js
+++ b/src/components/SearchModeNavigation/SearchModeNavigation.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useRouteMatch } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 
 import {
   Button,
@@ -14,24 +14,27 @@ import {
 } from '../../constants';
 
 const SearchModeNavigation = ({ search, state }) => {
-  const { path } = useRouteMatch();
+  const {
+    search: currentSearch,
+    pathname,
+  } = useLocation();
 
   const checkIsButtonActive = useCallback((segment) => (
-    path === searchModeRoutesMap[segment] ? 'primary' : 'default'
-  ), [path]);
+    pathname === searchModeRoutesMap[segment] ? 'primary' : 'default'
+  ), [pathname]);
 
   return (
     <ButtonGroup fullWidth>
       {
         Object.keys(searchModeSegments).map(segment => {
-          const isCurrentSegment = path === searchModeSegments[segment];
+          const isCurrentSegment = pathname === searchModeRoutesMap[segment];
 
           return (
             <Button
               key={`${segment}`}
               to={{
                 pathname: searchModeRoutesMap[segment],
-                search: isCurrentSegment ? null : search,
+                search: isCurrentSegment ? currentSearch : search,
                 state,
               }}
               buttonStyle={checkIsButtonActive(segment)}
diff --git a/src/components/SearchModeNavigation/SearchModeNavigation.test.js b/src/components/SearchModeNavigation/SearchModeNavigation.test.js
index 1093a45f5..19d2fea42 100644
--- a/src/components/SearchModeNavigation/SearchModeNavigation.test.js
+++ b/src/components/SearchModeNavigation/SearchModeNavigation.test.js
@@ -8,9 +8,23 @@ import {
   translationsProperties,
 } from '../../../test/jest/helpers';
 import SearchModeNavigation from './SearchModeNavigation';
+import {
+  INVENTORY_ROUTE,
+  BROWSE_INVENTORY_ROUTE,
+} from '../../constants';
+
+const initialSearch = '?qindex=contributors&query=test';
 
-const renderSearchModeNavigation = (props = {}) => renderWithIntl(
-  <MemoryRouter>
+const renderSearchModeNavigation = (
+  props = {},
+  initialRoute = BROWSE_INVENTORY_ROUTE,
+) => renderWithIntl(
+  <MemoryRouter
+    initialEntries={[{
+      pathname: initialRoute,
+      search: initialSearch,
+    }]}
+  >
     <SearchModeNavigation
       {...props}
     />
@@ -25,4 +39,26 @@ describe('SearchModeNavigation', () => {
     expect(screen.getByText('Search')).toBeInTheDocument();
     expect(screen.getByText('Browse')).toBeInTheDocument();
   });
+
+  describe('when current segment is browse', () => {
+    it('should keep browse query in url in browse button', async () => {
+      renderSearchModeNavigation();
+
+      const browseButton = await screen.findByRole('button', { name: 'Browse' });
+
+      expect(browseButton.href.includes(`${BROWSE_INVENTORY_ROUTE}${initialSearch}`)).toBeTruthy();
+    });
+
+    it('should keep set search query in url in search button', async () => {
+      const search = '?query=test';
+
+      renderSearchModeNavigation({
+        search,
+      });
+
+      const browseButton = await screen.findByRole('button', { name: 'Search' });
+
+      expect(browseButton.href.includes(`${INVENTORY_ROUTE}${search}`)).toBeTruthy();
+    });
+  });
 });

From d177db7c5599449710d72fde706a0cc0b73f688a Mon Sep 17 00:00:00 2001
From: Denys Bohdan <denys_bohdan@epam.com>
Date: Thu, 1 Jun 2023 15:12:55 +0300
Subject: [PATCH 36/68] UIIN-2435 Prevent double-escaping of query when
 Browsing (#2167)

---
 CHANGELOG.md                                       | 1 +
 src/hooks/useInventoryBrowse/useInventoryBrowse.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b79f85958..939e8cb27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 * Hide the `Actions` button for the view page if there are no permissions. Refs UIIN-2360.
 * When duplicating an item, the circulation history is duplicated when it should not be. Fixes UIIN-2419.
 * Don't reset browse query when on Browse route and click Browse segment. Fixes UIIN-2434.
+* Prevent double-escaping of query when Browsing. Fixes UIIN-2435.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/hooks/useInventoryBrowse/useInventoryBrowse.js b/src/hooks/useInventoryBrowse/useInventoryBrowse.js
index bbc31e388..bd11599cc 100644
--- a/src/hooks/useInventoryBrowse/useInventoryBrowse.js
+++ b/src/hooks/useInventoryBrowse/useInventoryBrowse.js
@@ -97,6 +97,8 @@ const useInventoryBrowse = ({
           ...otherFilters,
         },
         pageNumber === 0 ? getInitialPageQuery : getUpdatedPageQuery(direction, anchor),
+        undefined,
+        false,
       );
 
       return ky.get(path, {

From a075d98a7547d9050706a6302047a479a5614e12 Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Thu, 1 Jun 2023 16:20:43 +0300
Subject: [PATCH 37/68] UIIN-2205: When adding items, cursor is in the barcode
 field as default (#2164)

---
 CHANGELOG.md                    | 1 +
 src/edit/items/ItemForm.js      | 1 +
 src/edit/items/ItemForm.test.js | 7 +++++++
 3 files changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 939e8cb27..a2e52aa7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 * When duplicating an item, the circulation history is duplicated when it should not be. Fixes UIIN-2419.
 * Don't reset browse query when on Browse route and click Browse segment. Fixes UIIN-2434.
 * Prevent double-escaping of query when Browsing. Fixes UIIN-2435.
+* When adding items, cursor is in the barcode field as default. Refs UIIN-2205.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/edit/items/ItemForm.js b/src/edit/items/ItemForm.js
index abeec9e98..19061a580 100644
--- a/src/edit/items/ItemForm.js
+++ b/src/edit/items/ItemForm.js
@@ -439,6 +439,7 @@ class ItemForm extends React.Component {
                           id="additem_barcode"
                           validate={validateBarcode(this.props)}
                           component={TextField}
+                          autoFocus
                           fullWidth
                         />
                       </Col>
diff --git a/src/edit/items/ItemForm.test.js b/src/edit/items/ItemForm.test.js
index 6065cee66..31b8ceb69 100644
--- a/src/edit/items/ItemForm.test.js
+++ b/src/edit/items/ItemForm.test.js
@@ -94,6 +94,13 @@ describe('ItemForm', () => {
     expect(container.querySelectorAll('form').length).toEqual(1);
   });
 
+  it('should place cursor in the barcode field as default', () => {
+    const { getByLabelText } = renderItemForm();
+    const barcodeField = getByLabelText(/Barcode/i);
+
+    expect(barcodeField).toHaveFocus();
+  });
+
   it('should render correct accordions', () => {
     const { getByText, getAllByText } = renderItemForm();
 

From 3eb71003ae57608d4982d0ce7f264b08c290fd26 Mon Sep 17 00:00:00 2001
From: UladzislauKutarkin
 <72550466+UladzislauKutarkin@users.noreply.github.com>
Date: Fri, 2 Jun 2023 16:09:53 +0400
Subject: [PATCH 38/68] UIIN-2430: Quick export from instance detail view
 (#2170)

---
 CHANGELOG.md                      |  1 +
 src/ViewInstance.js               | 57 +++++++++++++++++++++++++++++++
 src/ViewInstance.test.js          | 19 ++++++++---
 translations/ui-inventory/en.json |  1 +
 4 files changed, 73 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2e52aa7d..5c7100d0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 * Don't reset browse query when on Browse route and click Browse segment. Fixes UIIN-2434.
 * Prevent double-escaping of query when Browsing. Fixes UIIN-2435.
 * When adding items, cursor is in the barcode field as default. Refs UIIN-2205.
+* Quick export from instance detail view. Refs UIIN-2430.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/ViewInstance.js b/src/ViewInstance.js
index 392bb16a5..689357922 100644
--- a/src/ViewInstance.js
+++ b/src/ViewInstance.js
@@ -58,6 +58,7 @@ import {
 import ImportRecordModal from './components/ImportRecordModal';
 import NewInstanceRequestButton from './components/ViewInstance/MenuSection/NewInstanceRequestButton';
 import RequestsReorderButton from './components/ViewInstance/MenuSection/RequestsReorderButton';
+import { IdReportGenerator } from './reports';
 
 const quickMarcPages = {
   editInstance: 'edit-bib',
@@ -124,6 +125,13 @@ class ViewInstance extends React.Component {
       accumulate: true,
       throwErrors: false,
     },
+    quickExport: {
+      type: 'okapi',
+      fetch: false,
+      path: 'data-export/quick-export',
+      throwErrors: false,
+      clientGeneratePk: false,
+    },
     instanceRelationshipTypes: {
       type: 'okapi',
       records: 'instanceRelationshipTypes',
@@ -158,6 +166,7 @@ class ViewInstance extends React.Component {
       isCopyrightModalOpened: false,
       isNewOrderModalOpen: false,
       afterCreate: false,
+      instancesQuickExportInProgress: false,
     };
     this.instanceId = null;
     this.cViewHoldingsRecord = this.props.stripes.connect(ViewHoldingsRecord);
@@ -349,6 +358,34 @@ class ViewInstance extends React.Component {
     goTo(`${location.pathname.replace('/view/', '/viewsource/')}${location.search}`);
   };
 
+
+  triggerQuickExport = async () => {
+    const { instancesQuickExportInProgress } = this.state;
+    const { match } = this.props;
+
+    if (instancesQuickExportInProgress) return;
+
+    this.setState({ instancesQuickExportInProgress: true });
+
+    try {
+      const instanceIds = [match.params.id];
+
+      await this.props.mutator.quickExport.POST({
+        uuids: instanceIds,
+        type: 'uuid',
+        recordType: 'INSTANCE'
+      });
+      new IdReportGenerator('QuickInstanceExport').toCSV(instanceIds);
+    } catch (error) {
+      this.calloutRef.current.sendCallout({
+        type: 'error',
+        message: <FormattedMessage id="ui-inventory.communicationProblem" />,
+      });
+    } finally {
+      this.setState({ instancesQuickExportInProgress: false });
+    }
+  };
+
   handleImportRecordModalSubmit = (args) => {
     this.setState({ isImportRecordModalOpened: false });
     this.props.mutator.query.update({
@@ -439,6 +476,14 @@ class ViewInstance extends React.Component {
     const canCreateNewRequest = titleLevelRequestsFeatureEnabled && canCreateRequest;
     const identifier = this.getIdentifiers(data);
 
+    const buildOnClickHandler = onClickHandler => {
+      return () => {
+        onToggle();
+
+        onClickHandler(this.context.sendCallout);
+      };
+    };
+
     const showInventoryMenuSection = (
       canEditInstance
       || canViewSource
@@ -563,6 +608,15 @@ class ViewInstance extends React.Component {
                 </Icon>
               </Button>
             )}
+            <Button
+              id="quick-export-trigger"
+              onClick={buildOnClickHandler(this.triggerQuickExport)}
+              buttonStyle="dropdownItem"
+            >
+              <Icon icon="download">
+                <FormattedMessage id="ui-inventory.exportInstanceInMARC" />
+              </Icon>
+            </Button>
             {canCreateOrder && (
               <Button
                 id="clickable-create-order"
@@ -871,6 +925,9 @@ ViewInstance.propTypes = {
     marcRecord: PropTypes.shape({
       GET: PropTypes.func.isRequired,
     }),
+    quickExport: PropTypes.shape({
+      POST: PropTypes.func.isRequired,
+    }),
     query: PropTypes.object.isRequired,
     movableItems: PropTypes.object.isRequired,
     instanceRequests: PropTypes.shape({
diff --git a/src/ViewInstance.test.js b/src/ViewInstance.test.js
index 8606c8537..d8adaf452 100644
--- a/src/ViewInstance.test.js
+++ b/src/ViewInstance.test.js
@@ -29,11 +29,11 @@ jest.mock('./components/ImportRecordModal/ImportRecordModal', () => (props) => {
       selectedJobProfileId: 'profileId'
     };
     const container =
-    <div>
-      <div>ImportRecordModal</div>
-      <button type="button" onClick={() => handleSubmit(args)}>handleSubmit</button>
-      <button type="button" onClick={() => handleCancel()}>handleCancel</button>
-    </div>;
+      <div>
+        <div>ImportRecordModal</div>
+        <button type="button" onClick={() => handleSubmit(args)}>handleSubmit</button>
+        <button type="button" onClick={() => handleCancel()}>handleCancel</button>
+      </div>;
     return container;
   }
   return null;
@@ -105,6 +105,9 @@ const defaultProp = {
     marcRecord: {
       GET: mockData,
     },
+    quickExport:{
+      POST: jest.fn(),
+    },
     query: {
       update: updateMock,
     },
@@ -268,6 +271,12 @@ describe('ViewInstance', () => {
       userEvent.click(screen.getByRole('button', { name: 'Move items within an instance' }));
       expect(renderViewInstance()).toBeTruthy();
     });
+    it('"Export instance (MARC)" button to be clicked', () => {
+      renderViewInstance();
+      userEvent.click(screen.getByRole('button', { name: 'Actions' }));
+      userEvent.click(screen.getByRole('button', { name: 'Export instance (MARC)' }));
+      expect(renderViewInstance()).toBeTruthy();
+    });
     it('"InstancePlugin" should render when user clicks "Move holdings/items to another instance" button', () => {
       renderViewInstance();
       userEvent.click(screen.getByRole('button', { name: 'Actions' }));
diff --git a/translations/ui-inventory/en.json b/translations/ui-inventory/en.json
index 851f5c778..0e1db64da 100644
--- a/translations/ui-inventory/en.json
+++ b/translations/ui-inventory/en.json
@@ -573,6 +573,7 @@
   "saveHoldingsUIIDS.error": "Error occurred while saving holdings UUIDs. Please try again.",
   "saveInstancesCQLQuery": "Save instances CQL query",
   "exportInstancesInMARC": "Export instances (MARC)",
+  "exportInstanceInMARC": "Export instance (MARC)",
   "exportInstancesInMARCLimitExceeded": "Selected record limit of {count, number} exceeded",
   "exportInstancesInJSON": "Export instances (JSON)",
   "reports.inTransitItem.barcode": "Item barcode",

From eb6b2a5a2943418637be0479d8ea0b687548630b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kuklis?= <michal.kuklis@gmail.com>
Date: Tue, 6 Jun 2023 11:30:59 -0400
Subject: [PATCH 39/68] UIIN-2443: Rename hrid qindex for item to avoid
 collisions with holdings and instances (#2171)

---
 CHANGELOG.md        | 1 +
 src/constants.js    | 2 +-
 src/filterConfig.js | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c7100d0a..852e668a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -147,6 +147,7 @@
 * Moved the print button from QuickMarkView, into the ViewSource. Due to the folio-org/ui-quick-marc#468. Refs UIIN-2324.
 * Change title for the print popup. Refs UIIN-2329.
 * Move @testing-library/* to dev-deps. Refs UIIN-2309.
+* Rename `hrid` qindex for item to avoid collisions with holdings and instances. Fixes UIIN-2443.
 
 ## [9.2.0](https://github.com/folio-org/ui-inventory/tree/v9.2.0) (2022-10-27)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.1.0...v9.2.0)
diff --git a/src/constants.js b/src/constants.js
index 0db7bdd47..ae7a5a684 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -434,6 +434,6 @@ export const SINGLE_ITEM_QUERY_TEMPLATES = {
   'items.barcode': 'barcode==%{query}',
   isbn: 'isbn==%{query}',
   issn: 'issn==%{query}',
-  hrid: 'hrid==%{query}',
+  itemHrid: 'hrid==%{query}',
   iid: 'id==%{query}',
 };
diff --git a/src/filterConfig.js b/src/filterConfig.js
index ba9f51509..a8cb9fb29 100644
--- a/src/filterConfig.js
+++ b/src/filterConfig.js
@@ -248,7 +248,7 @@ export const itemIndexes = [
   { label: 'ui-inventory.search.itemNotes', value: 'holdingsNotes', queryTemplate: 'item.notes.note all "%{query.query}" or item.administrativeNotes all "%{query.query}"' },
   { label: 'ui-inventory.search.itemAdministrativeNotes', value: 'itemAdministrativeNotes', queryTemplate: 'item.administrativeNotes all "%{query.query}"' },
   { label: 'ui-inventory.search.itemCirculationNotes', value: 'itemCirculationNotes', queryTemplate: 'item.circulationNotes.note all "%{query.query}"' },
-  { label: 'ui-inventory.itemHrid', value: 'hrid', queryTemplate: 'items.hrid=="%{query.query}"' },
+  { label: 'ui-inventory.itemHrid', value: 'itemHrid', queryTemplate: 'items.hrid=="%{query.query}"' },
   { label: 'ui-inventory.search.item.uuid', value: 'iid', queryTemplate: 'item.id=="%{query.query}"' },
   { label: 'ui-inventory.search.allFields', value: 'allFields', queryTemplate: 'cql.all all "%{query.query}"' },
   { label: 'ui-inventory.querySearch', value: 'querySearch', queryTemplate: '%{query.query}' },

From 6144be779eb853925aa3db7702cad81719199829 Mon Sep 17 00:00:00 2001
From: Zak Burke <zburke@ebsco.com>
Date: Tue, 6 Jun 2023 14:17:45 -0400
Subject: [PATCH 40/68] do not publish 'artifacts' to npm (#2155)

https://issues.folio.org/browse/STRIPES-865
---
 .github/workflows/build-npm-release.yml | 1 +
 .github/workflows/build-npm.yml         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/build-npm-release.yml b/.github/workflows/build-npm-release.yml
index 659d222bf..c875a6d08 100644
--- a/.github/workflows/build-npm-release.yml
+++ b/.github/workflows/build-npm-release.yml
@@ -222,6 +222,7 @@ jobs:
 
       - name: Exclude some CI-generated artifacts in package
         run: |
+          echo "artifacts" >> .npmignore
           echo ".github" >> .npmignore
           echo ".scannerwork" >> .npmignore
           cat .npmignore
diff --git a/.github/workflows/build-npm.yml b/.github/workflows/build-npm.yml
index 8dc9ef46a..4fa336254 100644
--- a/.github/workflows/build-npm.yml
+++ b/.github/workflows/build-npm.yml
@@ -168,6 +168,7 @@ jobs:
       - name: Exclude some CI-generated artifacts in package
         if: ${{ github.ref == 'refs/heads/master' || github.ref  == 'refs/heads/main' }}
         run: |
+          echo "artifacts" >> .npmignore
           echo ".github" >> .npmignore
           echo ".scannerwork" >> .npmignore
           cat .npmignore

From fa846edda14ed35309d3c45a6fd278061e06c5fa Mon Sep 17 00:00:00 2001
From: Dmytro-Melnyshyn <77053927+Dmytro-Melnyshyn@users.noreply.github.com>
Date: Wed, 7 Jun 2023 05:16:45 -0700
Subject: [PATCH 41/68] UIIN-2445: Escape quotes to search for Subjects and
 Contributor. (#2172)

---
 CHANGELOG.md                                  |  1 +
 .../InstanceMovementDetails.test.js           |  2 +-
 src/components/BrowseResultsList/utils.js     |  2 +-
 src/constants.js                              |  2 ++
 src/filterConfig.js                           |  7 ++++-
 src/routes/buildManifestObject.js             | 14 ++-------
 src/routes/buildManifestObject.test.js        | 30 ++++++++++---------
 test/jest/helpers/Harness.js                  |  9 ------
 8 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 852e668a3..0689a8397 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
 * Prevent double-escaping of query when Browsing. Fixes UIIN-2435.
 * When adding items, cursor is in the barcode field as default. Refs UIIN-2205.
 * Quick export from instance detail view. Refs UIIN-2430.
+* Escape quotes to search for Subjects and Contributor. Refs UIIN-2445.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetails.test.js b/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetails.test.js
index a4f7b81e6..d31c859f8 100644
--- a/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetails.test.js
+++ b/src/Instance/InstanceMovement/InstanceMovementDetails/InstanceMovementDetails.test.js
@@ -73,7 +73,7 @@ describe('InstanceMovementDetails', () => {
   });
   it('render Action Menu', () => {
     renderInstanceMovementDetails();
-    const actionMenu = screen.getByText(/Action Menu/i)
+    const actionMenu = screen.getByText(/Action Menu/i);
     expect(actionMenu).toBeInTheDocument();
   });
   it('render HoldingsListContainer', () => {
diff --git a/src/components/BrowseResultsList/utils.js b/src/components/BrowseResultsList/utils.js
index dbb8a5013..c5ad1c78d 100644
--- a/src/components/BrowseResultsList/utils.js
+++ b/src/components/BrowseResultsList/utils.js
@@ -28,7 +28,7 @@ export const getSearchParams = (row, qindex) => {
     [browseModeOptions.SUBJECTS]: {
       qindex: queryIndexes.SUBJECT,
       query: row.value,
-      authorityId: row.authorityId,
+      ...(row.authorityId && { filters: `${FACETS.AUTHORITY_ID}.${row.authorityId}` }),
     },
   };
 
diff --git a/src/constants.js b/src/constants.js
index ae7a5a684..e2d1c7fe2 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -250,6 +250,7 @@ export const FACETS = {
   NAME_TYPE: 'nameType',
   SEARCH_CONTRIBUTORS: 'searchContributors',
   HOLDINGS_TYPE: 'holdingsType',
+  AUTHORITY_ID: 'authorityId',
 };
 
 export const FACETS_CQL = {
@@ -284,6 +285,7 @@ export const FACETS_CQL = {
   NAME_TYPE: 'contributorNameTypeId',
   SEARCH_CONTRIBUTORS: 'contributors.contributorNameTypeId',
   HOLDINGS_TYPE: 'holdings.holdingsTypeId',
+  AUTHORITY_ID: 'authorityId',
 };
 
 export const FACETS_TO_REQUEST = {
diff --git a/src/filterConfig.js b/src/filterConfig.js
index a8cb9fb29..f009ae712 100644
--- a/src/filterConfig.js
+++ b/src/filterConfig.js
@@ -106,6 +106,11 @@ export const instanceFilterConfig = [
     cql: FACETS_CQL.SEARCH_CONTRIBUTORS,
     values: [],
   },
+  {
+    name: FACETS.AUTHORITY_ID,
+    cql: FACETS_CQL.AUTHORITY_ID,
+    values: [],
+  },
 ];
 
 export const instanceIndexes = [
@@ -122,7 +127,7 @@ export const instanceIndexes = [
   { label: 'ui-inventory.search.oclc', value: 'oclc', queryTemplate: 'oclc="%{query.query}"' },
   { label: 'ui-inventory.search.instanceNotes', value: 'instanceNotes', queryTemplate: 'notes.note all "%{query.query}" or administrativeNotes all "%{query.query}"' },
   { label: 'ui-inventory.search.instanceAdministrativeNotes', value: 'instanceAdministrativeNotes', queryTemplate: 'administrativeNotes all "%{query.query}"' },
-  { label: 'ui-inventory.subject', value: 'subject', queryTemplate: ({ query, authorityId }) => `subjects.value==/string "${query}"${authorityId ? ` and authorityId=="${authorityId}"` : ''}` },
+  { label: 'ui-inventory.subject', value: 'subject', queryTemplate: 'subjects.value==/string "%{query.query}"' },
   { label: 'ui-inventory.effectiveCallNumberShelving', value: 'callNumber', queryTemplate: 'itemEffectiveShelvingOrder==/string "%{query.query}"' },
   { label: 'ui-inventory.instanceHrid', value: 'hrid', queryTemplate: 'hrid=="%{query.query}"' },
   { label: 'ui-inventory.instanceId', value: 'id', queryTemplate: 'id="%{query.query}"' },
diff --git a/src/routes/buildManifestObject.js b/src/routes/buildManifestObject.js
index f828f3f03..cc244d18c 100644
--- a/src/routes/buildManifestObject.js
+++ b/src/routes/buildManifestObject.js
@@ -19,7 +19,6 @@ const INITIAL_RESULT_COUNT = 100;
 const DEFAULT_SORT = 'title';
 
 const getQueryTemplateContributor = (queryValue) => `contributors.name==/string "${queryValue}"`;
-const getQueryTemplateSubjects = (queryValue, andAuthorityId) => `subjects.value==/string "${queryValue}"${andAuthorityId}`;
 const getQueryTemplateCallNumber = (queryValue) => `itemEffectiveShelvingOrder==/string "${queryValue}"`;
 
 export function buildQuery(queryParams, pathComponents, resourceData, logger, props) {
@@ -27,23 +26,17 @@ export function buildQuery(queryParams, pathComponents, resourceData, logger, pr
   const query = { ...resourceData.query };
   const queryIndex = queryParams?.qindex ?? 'all';
   const queryValue = get(queryParams, 'query', '');
-  const authorityId = queryParams?.authorityId;
   let queryTemplate = getQueryTemplate(queryIndex, indexes);
 
   if (queryParams?.selectedBrowseResult) {
-    if (queryIndex === queryIndexes.SUBJECT) {
-      const queryVal = queryValue.replace(/"/g, '\\"');
-      const andAuthorityId = authorityId ? ` and authorityId==${authorityId}` : '';
-
-      queryTemplate = getQueryTemplateSubjects(queryVal, andAuthorityId);
-    }
-
     if (queryIndex === queryIndexes.CALL_NUMBER) {
       queryTemplate = getQueryTemplateCallNumber(queryValue);
     }
 
     if (queryIndex === queryIndexes.CONTRIBUTOR) {
-      queryTemplate = getQueryTemplateContributor(queryValue);
+      const escapedQueryValue = queryValue.replaceAll('"', '\\"');
+
+      queryTemplate = getQueryTemplateContributor(escapedQueryValue);
     }
 
     query.selectedBrowseResult = null; // reset this parameter so the next search uses `=` instead of `==/string`
@@ -174,7 +167,6 @@ export function buildManifestObject() {
         filters: '',
         sort: '',
         selectedBrowseResult: false,
-        authorityId: '',
       },
     },
     resultCount: { initialValue: INITIAL_RESULT_COUNT },
diff --git a/src/routes/buildManifestObject.test.js b/src/routes/buildManifestObject.test.js
index cdd176a5a..aee1ce7f6 100644
--- a/src/routes/buildManifestObject.test.js
+++ b/src/routes/buildManifestObject.test.js
@@ -19,8 +19,8 @@ const getBuildQueryArgs = ({
 
 const defaultQueryParamsMap = {
   [queryIndexes.CALL_NUMBER]: { qindex: queryIndexes.CALL_NUMBER, query: 'Some call number query' },
-  [queryIndexes.CONTRIBUTOR]: { qindex: queryIndexes.CONTRIBUTOR, query: 'Some contributor query' },
-  [queryIndexes.SUBJECT]: { qindex: queryIndexes.SUBJECT, query: 'Some subject query' },
+  [queryIndexes.CONTRIBUTOR]: { qindex: queryIndexes.CONTRIBUTOR, query: 'Some "contributor" query' },
+  [queryIndexes.SUBJECT]: { qindex: queryIndexes.SUBJECT, query: 'Some "subject" query' },
 };
 
 describe('buildQuery', () => {
@@ -39,30 +39,32 @@ describe('buildQuery', () => {
       const queryParams = { ...defaultQueryParamsMap[qindex] };
       const cql = buildQuery(...getBuildQueryArgs({ queryParams }));
 
-      const queryTemplate = getQueryTemplate(qindex);
-      expect(cql).toEqual(expect.stringContaining(`${queryTemplate.replace('%{query.query}', defaultQueryParamsMap[qindex].query)}`));
+      expect(cql).toContain('(contributors.name="Some \\"contributor\\" query")');
     });
 
     describe('\'Subject\' search option', () => {
-      describe('when there in no an authorityId in query params', () => {
-        it('should build query', () => {
+      describe('when a record is not linked with an authority record', () => {
+        it('should build query without the authorityId', () => {
           const qindex = queryIndexes.SUBJECT;
           const queryParams = { ...defaultQueryParamsMap[qindex] };
           const cql = buildQuery(...getBuildQueryArgs({ queryParams }));
 
-          const queryTemplate = getQueryTemplate(qindex);
-          expect(cql).toEqual(expect.stringContaining(queryTemplate(queryParams)));
+          expect(cql).toEqual('(subjects.value==/string "Some \\"subject\\" query") sortby title');
         });
       });
 
-      describe('when there in an authorityId in query params', () => {
+      describe('when a record is linked with an authority record', () => {
         it('should build query with the authorityId', () => {
           const qindex = queryIndexes.SUBJECT;
-          const queryParams = { ...defaultQueryParamsMap[qindex], authorityId: 'UUID' };
+          const queryParams = {
+            ...defaultQueryParamsMap[qindex],
+            filters: 'authorityId.37c01934-37c3-4874-a992-3912fcf526db',
+          };
           const cql = buildQuery(...getBuildQueryArgs({ queryParams }));
 
-          const queryTemplate = getQueryTemplate(qindex);
-          expect(cql).toEqual(expect.stringContaining(queryTemplate(queryParams)));
+          expect(cql).toContain(
+            '(subjects.value==/string "Some \\"subject\\" query") and authorityId=="37c01934-37c3-4874-a992-3912fcf526db")'
+          );
         });
       });
     });
@@ -88,7 +90,7 @@ describe('buildQuery', () => {
       };
       const cql = buildQuery(...getBuildQueryArgs({ queryParams }));
 
-      expect(cql).toEqual(expect.stringContaining(`contributors.name==/string "${defaultQueryParamsMap[qindex].query}"`));
+      expect(cql).toContain('(contributors.name==/string "Some \\"contributor\\" query")');
     });
 
     it('should build query for \'Subjects\' browse option', () => {
@@ -99,7 +101,7 @@ describe('buildQuery', () => {
       };
       const cql = buildQuery(...getBuildQueryArgs({ queryParams }));
 
-      expect(cql).toEqual(expect.stringContaining(`subjects.value==/string "${defaultQueryParamsMap[qindex].query}"`));
+      expect(cql).toContain('(subjects.value==/string "Some \\"subject\\" query")');
     });
   });
 });
diff --git a/test/jest/helpers/Harness.js b/test/jest/helpers/Harness.js
index 9e80ee7fe..bfb8e0acb 100644
--- a/test/jest/helpers/Harness.js
+++ b/test/jest/helpers/Harness.js
@@ -48,15 +48,6 @@ Harness.propTypes = {
       translations: PropTypes.object,
     })
   ),
-  shouldMockOffsetSize: PropTypes.bool,
-  width: PropTypes.number,
-  height: PropTypes.number,
-};
-
-Harness.defaultProps = {
-  width: 500,
-  height: 500,
-  shouldMockOffsetSize: true,
 };
 
 export default Harness;

From bbbf19c59cd4d9bf7f09247c60481e6b9e1f418f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Kuklis?= <michal.kuklis@gmail.com>
Date: Thu, 8 Jun 2023 09:02:53 -0400
Subject: [PATCH 42/68] UIIN-2401: Reset BoundWithModal when modal is closed
 (#2174)

---
 CHANGELOG.md                          |  1 +
 src/edit/items/BoundWithModal.js      | 10 +++--
 src/edit/items/BoundWithModal.test.js | 62 +++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 src/edit/items/BoundWithModal.test.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0689a8397..390b7ad05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -149,6 +149,7 @@
 * Change title for the print popup. Refs UIIN-2329.
 * Move @testing-library/* to dev-deps. Refs UIIN-2309.
 * Rename `hrid` qindex for item to avoid collisions with holdings and instances. Fixes UIIN-2443.
+* Reset `<BoundWithModal>` when modal is closed. Fixes UIIN-2401.
 
 ## [9.2.0](https://github.com/folio-org/ui-inventory/tree/v9.2.0) (2022-10-27)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.1.0...v9.2.0)
diff --git a/src/edit/items/BoundWithModal.js b/src/edit/items/BoundWithModal.js
index 570fba12d..c09722a13 100644
--- a/src/edit/items/BoundWithModal.js
+++ b/src/edit/items/BoundWithModal.js
@@ -24,7 +24,6 @@ const BoundWithModal = ({
   onOk,
 }) => {
   const intl = useIntl();
-
   const initHrids = () => Array(FIELD_COUNT).fill('');
   const [hrids, setHrids] = useState(initHrids());
 
@@ -46,13 +45,18 @@ const BoundWithModal = ({
     setHrids(initHrids());
   };
 
+  const handleClose = (event) => {
+    setHrids(initHrids());
+    onClose(event);
+  };
+
   return (
     <Modal
       data-testid="bound-with-modal"
       open={open}
       dismissible
       label={<FormattedMessage id="ui-inventory.boundWithTitles.add" />}
-      onClose={onClose}
+      onClose={handleClose}
       footer={(
         <ModalFooter>
           <Button
@@ -65,7 +69,7 @@ const BoundWithModal = ({
           </Button>
           <Button
             data-testid="bound-with-modal-cancel-button"
-            onClick={onClose}
+            onClick={handleClose}
           >
             <FormattedMessage id="ui-inventory.cancel" />
           </Button>
diff --git a/src/edit/items/BoundWithModal.test.js b/src/edit/items/BoundWithModal.test.js
new file mode 100644
index 000000000..c38defa3f
--- /dev/null
+++ b/src/edit/items/BoundWithModal.test.js
@@ -0,0 +1,62 @@
+import React from 'react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
+
+import '../../../test/jest/__mock__';
+
+import { renderWithIntl, translationsProperties } from '../../../test/jest/helpers';
+
+
+import BoundWithModal from './BoundWithModal';
+
+const itemMock = {
+  hrid: '12345',
+  barcode: '67890',
+};
+
+const onOkMock = jest.fn();
+const onCloseMock = jest.fn();
+
+const renderBoundWithModal = () => renderWithIntl(
+  <BoundWithModal
+    item={itemMock}
+    open
+    onClose={onCloseMock}
+    onOk={onOkMock}
+  />,
+  translationsProperties
+);
+
+describe('BoundWithModal', () => {
+  beforeEach(() => {
+    renderBoundWithModal();
+  });
+
+  it('renders without crashing', () => {
+    expect(screen.getByTestId('bound-with-modal')).toBeInTheDocument();
+  });
+
+  it('displays item details', () => {
+    expect(screen.getByText(itemMock.hrid)).toBeInTheDocument();
+    expect(screen.getByText(itemMock.barcode)).toBeInTheDocument();
+  });
+
+  it('triggers onOk callback with input values when save button is clicked', () => {
+    const inputs = screen.getAllByTestId('bound-with-modal-input');
+
+    // fill inputs with values
+    inputs.forEach((input, i) => {
+      userEvent.type(input, `Value ${i}`);
+    });
+
+    userEvent.click(screen.getByTestId('bound-with-modal-save-button'));
+
+    expect(onOkMock).toHaveBeenCalledWith(['Value 0', 'Value 1', 'Value 2', 'Value 3', 'Value 4', 'Value 5', 'Value 6']);
+  });
+
+  it('triggers onClose callback when cancel button is clicked', () => {
+    userEvent.click(screen.getByTestId('bound-with-modal-cancel-button'));
+
+    expect(onCloseMock).toHaveBeenCalled();
+  });
+});

From 0f95a38f3f4c2480bb66b86a26c07745ed150558 Mon Sep 17 00:00:00 2001
From: FOLIO Translations Bot
 <38661258+folio-translations@users.noreply.github.com>
Date: Sat, 17 Jun 2023 21:44:51 -0400
Subject: [PATCH 43/68] Lokalise: updates

---
 translations/ui-inventory/ar.json     |  3 +-
 translations/ui-inventory/ber.json    |  3 +-
 translations/ui-inventory/ca.json     |  3 +-
 translations/ui-inventory/cs_CZ.json  | 11 ++++---
 translations/ui-inventory/da.json     |  3 +-
 translations/ui-inventory/de.json     |  3 +-
 translations/ui-inventory/en_GB.json  | 47 ++++++++++++++-------------
 translations/ui-inventory/en_SE.json  | 47 ++++++++++++++-------------
 translations/ui-inventory/en_US.json  |  5 +--
 translations/ui-inventory/es.json     |  3 +-
 translations/ui-inventory/es_419.json |  3 +-
 translations/ui-inventory/es_ES.json  |  5 +--
 translations/ui-inventory/fr.json     |  3 +-
 translations/ui-inventory/fr_FR.json  |  3 +-
 translations/ui-inventory/he.json     |  3 +-
 translations/ui-inventory/hi_IN.json  |  3 +-
 translations/ui-inventory/hu.json     |  3 +-
 translations/ui-inventory/it_IT.json  |  3 +-
 translations/ui-inventory/ja.json     |  5 +--
 translations/ui-inventory/ko.json     |  3 +-
 translations/ui-inventory/nb.json     |  3 +-
 translations/ui-inventory/nn.json     |  3 +-
 translations/ui-inventory/pl.json     |  3 +-
 translations/ui-inventory/pt_BR.json  |  9 ++---
 translations/ui-inventory/pt_PT.json  |  3 +-
 translations/ui-inventory/ru.json     |  3 +-
 translations/ui-inventory/sv.json     |  3 +-
 translations/ui-inventory/ur.json     |  3 +-
 translations/ui-inventory/zh_CN.json  |  3 +-
 translations/ui-inventory/zh_TW.json  |  3 +-
 30 files changed, 114 insertions(+), 84 deletions(-)

diff --git a/translations/ui-inventory/ar.json b/translations/ui-inventory/ar.json
index d12b34924..46568a3bc 100644
--- a/translations/ui-inventory/ar.json
+++ b/translations/ui-inventory/ar.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ber.json b/translations/ui-inventory/ber.json
index 7d7240d78..693536147 100644
--- a/translations/ui-inventory/ber.json
+++ b/translations/ui-inventory/ber.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ca.json b/translations/ui-inventory/ca.json
index d62853d6d..1981aebe0 100644
--- a/translations/ui-inventory/ca.json
+++ b/translations/ui-inventory/ca.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/cs_CZ.json b/translations/ui-inventory/cs_CZ.json
index bd74662f7..eb85fb189 100644
--- a/translations/ui-inventory/cs_CZ.json
+++ b/translations/ui-inventory/cs_CZ.json
@@ -371,7 +371,7 @@
     "formatCode": "Kód formátu",
     "addNatureOfContentTerm": "Přidat povahu obsahu",
     "selectNatureOfContentTerm": "Vyberte povahu obsahu",
-    "hridHandling": "Zpracování HRID",
+    "hridHandling": "Přidělování HRID",
     "hridHandling.description.line1": "Po úvodní migraci dat jsou nové FOLIO HRID přiřazovány sekvenčně podle stavu počitadla v těchto nastaveních.",
     "hridHandling.description.line2": "Pokud se nezmění nebo neodstraní, bude novým identifikátorům FOLIO HRID přiřazen výchozí prefix.",
     "hridHandling.description.line3": "HRID ve stávajícím katalogu FOLIO a MARC záznamech nelze změnit",
@@ -780,8 +780,9 @@
     "boundWithTitles.add": "Přidat Vazbu a analitiku",
     "boundWithTitles.enterHoldingsHrid": "Zadejte HRID holdingů",
     "selectCode": "Vybrat kód",
-    "actions.menuSection.sortBy": "Sort by",
-    "actions.menuSection.sortBy.relevance": "Relevance",
-    "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy": "Seřadit podle",
+    "actions.menuSection.sortBy.relevance": "Relevantnost",
+    "actions.menuSection.sortBy.title": "Název",
+    "actions.menuSection.sortBy.contributors": "Autoři",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/da.json b/translations/ui-inventory/da.json
index 2dba530d7..f0f7f5d9b 100644
--- a/translations/ui-inventory/da.json
+++ b/translations/ui-inventory/da.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/de.json b/translations/ui-inventory/de.json
index 0af2e081b..617ef6254 100644
--- a/translations/ui-inventory/de.json
+++ b/translations/ui-inventory/de.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_GB.json b/translations/ui-inventory/en_GB.json
index 2a84bf373..693536147 100644
--- a/translations/ui-inventory/en_GB.json
+++ b/translations/ui-inventory/en_GB.json
@@ -13,10 +13,10 @@
     "createInstance": "Create instance",
     "updateInstance": "Update instance",
     "itemRecord": "Item record",
-    "editInstance": "Edit",
+    "editInstance": "Edit instance",
     "instanceDetails": "Instance details",
     "addHoldings": "Add holdings",
-    "itemDotStatus": "Item record {barcode} {status}",
+    "itemDotStatus": "Item • {barcode} • {status}",
     "instances": "Instances",
     "instance": "Instance: ",
     "holdings": "Holdings",
@@ -77,7 +77,7 @@
     "loans": "Loans",
     "materialTypes": "Material types",
     "materialType": "Material type",
-    "holdingsHeader": "Holdings: {location} > {callNumber} {copyNumber}",
+    "holdingsHeader": "<span>Holdings: {location} > {callNumber} {copyNumber}</span>",
     "viewHoldings": "View holdings",
     "holdingsRecord": "Holdings record",
     "viewHoldingsRecord": "View holdings record",
@@ -249,7 +249,7 @@
     "illPolicy": "ILL policy",
     "loanTypePermanentRequired": "Permanent loan type *",
     "materialTypeRequired": "Material type *",
-    "duplicateInstance": "Duplicate",
+    "duplicateInstance": "Duplicate instance",
     "cancel": "Cancel",
     "newInstance": "New instance",
     "duplicateHoldings": "Duplicate",
@@ -337,14 +337,14 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance record {title} {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
     "itemOnHoldingsRecordDeleteModal.message": "Holdings record HRID <strong>{hrid}</strong> with location <strong>{location}</strong> has <strong>one</strong> associated item record. To be able to continue deletion of this holdings record, the associated item record must be deleted.",
     "itemsOnHoldingsRecordDeleteModal.message": "Holdings record HRID <strong>{hrid}</strong> with location <strong>{location}</strong> has <strong>{itemCount}</strong> associated item records. To be able to continue deletion of this holdings record, all associated item records must be deleted.",
     "condition": "Condition",
-    "search.all": "Keyword (title, contributor, identifier)",
+    "search.all": "Keyword (title, contributor, identifier, HRID, UUID)",
     "subject": "Subject",
     "isbn": "ISBN",
     "issn": "ISSN",
@@ -435,7 +435,7 @@
     "reports.inTransitItem.enumeration": "Enumeration",
     "reports.inTransitItem.volume": "Volume",
     "reports.inTransitItem.yearCaption": "Year",
-    "effectiveCallNumber": "Effective call number string",
+    "effectiveCallNumber": "Effective call number",
     "updatedDateAndTime": "Updated date and time",
     "updatedSource": "Updated source",
     "createdDateAndTime": "Created date and time",
@@ -524,7 +524,7 @@
     "permission.holdings.edit": "Inventory: View, create, edit holdings",
     "permission.holdings.delete": "Inventory: View, create, edit, delete holdings",
     "permission.instance.view-staff-suppressed-records": "Inventory: View instance records being suppressed for staff",
-    "permission.settings.list.view": "Settings (Inventory): Display list of settings pages",
+    "permission.settings.list.view": "Settings (Inventory): View list of settings pages",
     "permission.items.mark-items-withdrawn": "Inventory: Mark items withdrawn",
     "moveItems.selectAll": "Select/unselect all items for movement",
     "moveItems.selectItem": "Select/unselect item for movement",
@@ -584,9 +584,9 @@
     "instances.rows.recordsSelected": "{count, number} {count, plural, one {record} other {records}} selected",
     "exportInstancesInMARCLimitExceeded": "Selected record limit of {count, number} exceeded",
     "integrations": "Integrations",
-    "singleRecordImport": "Single Record Import",
-    "targetProfiles": "Target profiles",
-    "targetProfile": "target profile",
+    "singleRecordImport": "Single record import",
+    "targetProfiles": "Z39.50 target profiles",
+    "targetProfile": "Z39.50 target profile",
     "permission.settings.single-record-import": "Settings (Inventory): Configure single-record import",
     "itemRecordWithDescription": "Item record ({materialType}, {status})",
     "instanceRecordWithType": "Instance record ({instanceTypeName})",
@@ -615,7 +615,7 @@
     "copycat.import": "Import",
     "copycat.reimport": "Re-import",
     "copycat.callout.updated": "Record {xid} updated. Results may take a few moments to become visible in Inventory",
-    "copycat.callout.created": "Created record {xid}",
+    "copycat.callout.created": "Record {xid} created. Results may take a few moments to become visible in Inventory",
     "copycat.callout.simpleError": "Something went wrong: {err}",
     "copycat.callout.complexError": "Something went wrong: {err}: {detail}",
     "permission.single-record-import": "Inventory: Import single bibliographic records",
@@ -626,7 +626,7 @@
     "permission.items.mark-in-process-non-requestable": "Inventory: Mark items in process (non-requestable)",
     "externalIdentifierType": "External identifier type",
     "enabled": "Enabled",
-    "copycat.enterIdentifier": "Enter {identifierName} identifier",
+    "copycat.enterIdentifier": "Enter the {identifierName} identifier",
     "targetOptions": "Target options",
     "confirmDirtyNavigate": "Form has unsaved changes. Are you sure you want to leave?",
     "copycat.noProfiles": "No profiles enabled",
@@ -651,7 +651,7 @@
     "item.successfullySaved": "The <strong>item</strong> - HRID <strong>{hrid}</strong> has been successfully saved.",
     "holdingsRecord.successfullySaved": "The <strong>holdings</strong> - HRID <strong>{hrid}</strong> has been successfully saved.",
     "instance.successfullySaved": "The <strong>instance</strong> - HRID <strong>{hrid}</strong> has been successfully saved.",
-    "holdingsPaneTitle": "Holding • {location} • {callNumber}",
+    "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
     "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
@@ -672,7 +672,7 @@
     "acq.orderType": "Order type",
     "acq.orderType.One-Time": "One-time",
     "acq.orderType.Ongoing": "Ongoing",
-    "boundWith": "and {boundWithCount, plural, one {one more title} other {and other titles}}",
+    "boundWith": "and {boundWithCount, plural, one {one more title} other {other titles}}",
     "receivingHistory.receivedDate": "Receipt date",
     "receivingHistory.comment": "Comment",
     "receivingHistory.source": "Source",
@@ -682,14 +682,14 @@
     "appMenu.keyboardShortcuts": "Keyboard shortcuts",
     "marcHoldingsRecord": "MARC holdings record",
     "marcHoldingsRecord.paneTitle": "Holdings record - {title}",
-    "boundWithTitles": "Bound-with titles",
+    "boundWithTitles": "Bound-with and analytics",
     "instanceTitleLabel": "Instance title",
     "caption": "Caption",
     "editMARCHoldings": "Edit in quickMARC",
     "editMARCHoldings.paneTitle": "Location: {location} - [{callNumber}]",
     "quickMARC.label": "quickMARC",
     "edit": "Edit",
-    "saveHoldingsUIIDS": "Save Holdings UUIDs",
+    "saveHoldingsUIIDS": "Save holdings UUIDs",
     "saveHoldingsUIIDS.info": "Request to save holdings UUIDs has been received. File download may take a few minutes.",
     "saveHoldingsUIIDS.error": "Error occurred while saving holdings UUIDs. Please try again.",
     "instance.suppressedFromDiscovery": "Suppressed from discovery",
@@ -717,10 +717,10 @@
     "browseCallNumbers.missedMatch": "would be here",
     "search.allFields": "All",
     "acq.dateOpened": "Date opened",
-    "moveItems.selectHolding": "Select/unselect holding for movement",
+    "moveItems.selectHolding": "Select holdings",
     "browseContributors": "Browse contributors",
     "newOrder": "New order",
-    "permission.instance.createOrder": "Inventory: create order from instance",
+    "permission.instance.createOrder": "Inventory: Create order from instance",
     "search.oclc": "OCLC number, normalized",
     "newOrder.modal.create": "Create",
     "newOrder.modal.label": "Create order",
@@ -748,9 +748,9 @@
     "search.instanceNotes": "Instance notes (all)",
     "search.holdingsNotes": "Holdings notes (all)",
     "search.itemNotes": "Item notes (all)",
-    "search.instanceAdministrativeNotes": "Instance administrative notes (all)",
-    "search.holdingsAdministrativeNotes": "Holdings administrative notes (all)",
-    "search.itemAdministrativeNotes": "Item administrative notes (all)",
+    "search.instanceAdministrativeNotes": "Instance administrative notes",
+    "search.holdingsAdministrativeNotes": "Holdings administrative notes",
+    "search.itemAdministrativeNotes": "Item administrative notes",
     "inactive": "Inactive",
     "inactive.paneTitle": "<em>Inactive</em> {location}",
     "search.itemCirculationNotes": "Circulation notes",
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_SE.json b/translations/ui-inventory/en_SE.json
index 2a84bf373..693536147 100644
--- a/translations/ui-inventory/en_SE.json
+++ b/translations/ui-inventory/en_SE.json
@@ -13,10 +13,10 @@
     "createInstance": "Create instance",
     "updateInstance": "Update instance",
     "itemRecord": "Item record",
-    "editInstance": "Edit",
+    "editInstance": "Edit instance",
     "instanceDetails": "Instance details",
     "addHoldings": "Add holdings",
-    "itemDotStatus": "Item record {barcode} {status}",
+    "itemDotStatus": "Item • {barcode} • {status}",
     "instances": "Instances",
     "instance": "Instance: ",
     "holdings": "Holdings",
@@ -77,7 +77,7 @@
     "loans": "Loans",
     "materialTypes": "Material types",
     "materialType": "Material type",
-    "holdingsHeader": "Holdings: {location} > {callNumber} {copyNumber}",
+    "holdingsHeader": "<span>Holdings: {location} > {callNumber} {copyNumber}</span>",
     "viewHoldings": "View holdings",
     "holdingsRecord": "Holdings record",
     "viewHoldingsRecord": "View holdings record",
@@ -249,7 +249,7 @@
     "illPolicy": "ILL policy",
     "loanTypePermanentRequired": "Permanent loan type *",
     "materialTypeRequired": "Material type *",
-    "duplicateInstance": "Duplicate",
+    "duplicateInstance": "Duplicate instance",
     "cancel": "Cancel",
     "newInstance": "New instance",
     "duplicateHoldings": "Duplicate",
@@ -337,14 +337,14 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance record {title} {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
     "itemOnHoldingsRecordDeleteModal.message": "Holdings record HRID <strong>{hrid}</strong> with location <strong>{location}</strong> has <strong>one</strong> associated item record. To be able to continue deletion of this holdings record, the associated item record must be deleted.",
     "itemsOnHoldingsRecordDeleteModal.message": "Holdings record HRID <strong>{hrid}</strong> with location <strong>{location}</strong> has <strong>{itemCount}</strong> associated item records. To be able to continue deletion of this holdings record, all associated item records must be deleted.",
     "condition": "Condition",
-    "search.all": "Keyword (title, contributor, identifier)",
+    "search.all": "Keyword (title, contributor, identifier, HRID, UUID)",
     "subject": "Subject",
     "isbn": "ISBN",
     "issn": "ISSN",
@@ -435,7 +435,7 @@
     "reports.inTransitItem.enumeration": "Enumeration",
     "reports.inTransitItem.volume": "Volume",
     "reports.inTransitItem.yearCaption": "Year",
-    "effectiveCallNumber": "Effective call number string",
+    "effectiveCallNumber": "Effective call number",
     "updatedDateAndTime": "Updated date and time",
     "updatedSource": "Updated source",
     "createdDateAndTime": "Created date and time",
@@ -524,7 +524,7 @@
     "permission.holdings.edit": "Inventory: View, create, edit holdings",
     "permission.holdings.delete": "Inventory: View, create, edit, delete holdings",
     "permission.instance.view-staff-suppressed-records": "Inventory: View instance records being suppressed for staff",
-    "permission.settings.list.view": "Settings (Inventory): Display list of settings pages",
+    "permission.settings.list.view": "Settings (Inventory): View list of settings pages",
     "permission.items.mark-items-withdrawn": "Inventory: Mark items withdrawn",
     "moveItems.selectAll": "Select/unselect all items for movement",
     "moveItems.selectItem": "Select/unselect item for movement",
@@ -584,9 +584,9 @@
     "instances.rows.recordsSelected": "{count, number} {count, plural, one {record} other {records}} selected",
     "exportInstancesInMARCLimitExceeded": "Selected record limit of {count, number} exceeded",
     "integrations": "Integrations",
-    "singleRecordImport": "Single Record Import",
-    "targetProfiles": "Target profiles",
-    "targetProfile": "target profile",
+    "singleRecordImport": "Single record import",
+    "targetProfiles": "Z39.50 target profiles",
+    "targetProfile": "Z39.50 target profile",
     "permission.settings.single-record-import": "Settings (Inventory): Configure single-record import",
     "itemRecordWithDescription": "Item record ({materialType}, {status})",
     "instanceRecordWithType": "Instance record ({instanceTypeName})",
@@ -615,7 +615,7 @@
     "copycat.import": "Import",
     "copycat.reimport": "Re-import",
     "copycat.callout.updated": "Record {xid} updated. Results may take a few moments to become visible in Inventory",
-    "copycat.callout.created": "Created record {xid}",
+    "copycat.callout.created": "Record {xid} created. Results may take a few moments to become visible in Inventory",
     "copycat.callout.simpleError": "Something went wrong: {err}",
     "copycat.callout.complexError": "Something went wrong: {err}: {detail}",
     "permission.single-record-import": "Inventory: Import single bibliographic records",
@@ -626,7 +626,7 @@
     "permission.items.mark-in-process-non-requestable": "Inventory: Mark items in process (non-requestable)",
     "externalIdentifierType": "External identifier type",
     "enabled": "Enabled",
-    "copycat.enterIdentifier": "Enter {identifierName} identifier",
+    "copycat.enterIdentifier": "Enter the {identifierName} identifier",
     "targetOptions": "Target options",
     "confirmDirtyNavigate": "Form has unsaved changes. Are you sure you want to leave?",
     "copycat.noProfiles": "No profiles enabled",
@@ -651,7 +651,7 @@
     "item.successfullySaved": "The <strong>item</strong> - HRID <strong>{hrid}</strong> has been successfully saved.",
     "holdingsRecord.successfullySaved": "The <strong>holdings</strong> - HRID <strong>{hrid}</strong> has been successfully saved.",
     "instance.successfullySaved": "The <strong>instance</strong> - HRID <strong>{hrid}</strong> has been successfully saved.",
-    "holdingsPaneTitle": "Holding • {location} • {callNumber}",
+    "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
     "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
@@ -672,7 +672,7 @@
     "acq.orderType": "Order type",
     "acq.orderType.One-Time": "One-time",
     "acq.orderType.Ongoing": "Ongoing",
-    "boundWith": "and {boundWithCount, plural, one {one more title} other {and other titles}}",
+    "boundWith": "and {boundWithCount, plural, one {one more title} other {other titles}}",
     "receivingHistory.receivedDate": "Receipt date",
     "receivingHistory.comment": "Comment",
     "receivingHistory.source": "Source",
@@ -682,14 +682,14 @@
     "appMenu.keyboardShortcuts": "Keyboard shortcuts",
     "marcHoldingsRecord": "MARC holdings record",
     "marcHoldingsRecord.paneTitle": "Holdings record - {title}",
-    "boundWithTitles": "Bound-with titles",
+    "boundWithTitles": "Bound-with and analytics",
     "instanceTitleLabel": "Instance title",
     "caption": "Caption",
     "editMARCHoldings": "Edit in quickMARC",
     "editMARCHoldings.paneTitle": "Location: {location} - [{callNumber}]",
     "quickMARC.label": "quickMARC",
     "edit": "Edit",
-    "saveHoldingsUIIDS": "Save Holdings UUIDs",
+    "saveHoldingsUIIDS": "Save holdings UUIDs",
     "saveHoldingsUIIDS.info": "Request to save holdings UUIDs has been received. File download may take a few minutes.",
     "saveHoldingsUIIDS.error": "Error occurred while saving holdings UUIDs. Please try again.",
     "instance.suppressedFromDiscovery": "Suppressed from discovery",
@@ -717,10 +717,10 @@
     "browseCallNumbers.missedMatch": "would be here",
     "search.allFields": "All",
     "acq.dateOpened": "Date opened",
-    "moveItems.selectHolding": "Select/unselect holding for movement",
+    "moveItems.selectHolding": "Select holdings",
     "browseContributors": "Browse contributors",
     "newOrder": "New order",
-    "permission.instance.createOrder": "Inventory: create order from instance",
+    "permission.instance.createOrder": "Inventory: Create order from instance",
     "search.oclc": "OCLC number, normalized",
     "newOrder.modal.create": "Create",
     "newOrder.modal.label": "Create order",
@@ -748,9 +748,9 @@
     "search.instanceNotes": "Instance notes (all)",
     "search.holdingsNotes": "Holdings notes (all)",
     "search.itemNotes": "Item notes (all)",
-    "search.instanceAdministrativeNotes": "Instance administrative notes (all)",
-    "search.holdingsAdministrativeNotes": "Holdings administrative notes (all)",
-    "search.itemAdministrativeNotes": "Item administrative notes (all)",
+    "search.instanceAdministrativeNotes": "Instance administrative notes",
+    "search.holdingsAdministrativeNotes": "Holdings administrative notes",
+    "search.itemAdministrativeNotes": "Item administrative notes",
     "inactive": "Inactive",
     "inactive.paneTitle": "<em>Inactive</em> {location}",
     "search.itemCirculationNotes": "Circulation notes",
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_US.json b/translations/ui-inventory/en_US.json
index d177d6259..693536147 100644
--- a/translations/ui-inventory/en_US.json
+++ b/translations/ui-inventory/en_US.json
@@ -385,7 +385,7 @@
     "hridHandling.validation.startWithField": "Please enter a numeric value",
     "hridHandling.validation.assignPrefixField": "Please enter an alphanumeric value",
     "noBarcode": "No barcode",
-    "items.successfullyCopiedMessage": "The item barcode {barcode} was successfully copied to the clip board",
+    "items.successfullyCopiedMessage": "The item barcode {barcode} was successfully copied to the clipboard",
     "filters.instances": "Instance",
     "filters.holdings": "Holdings",
     "filters.items": "Item",
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es.json b/translations/ui-inventory/es.json
index 871c3f6dc..184e54fab 100644
--- a/translations/ui-inventory/es.json
+++ b/translations/ui-inventory/es.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_419.json b/translations/ui-inventory/es_419.json
index 1b960b6a7..4861282a7 100644
--- a/translations/ui-inventory/es_419.json
+++ b/translations/ui-inventory/es_419.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Ordenar por",
     "actions.menuSection.sortBy.relevance": "Relevancia",
     "actions.menuSection.sortBy.title": "Título",
-    "actions.menuSection.sortBy.contributors": "Colaboradores"
+    "actions.menuSection.sortBy.contributors": "Colaboradores",
+    "exportInstanceInMARC": "Instancia de exportación (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_ES.json b/translations/ui-inventory/es_ES.json
index 72d65e152..4d93c39f8 100644
--- a/translations/ui-inventory/es_ES.json
+++ b/translations/ui-inventory/es_ES.json
@@ -737,7 +737,7 @@
     "effectiveCallNumberShelving": "Signatura efectiva (item), orden de estantería",
     "browseContributors.results.error": "Error recuperando resultados, revise la búsqueda o vuelva a intentarlo",
     "remote.warning.common.items": "Item has been successfully moved in FOLIO. To complete removing this item from remote storage, run an exception report or communicate this directly to your remote storage location.",
-    "search": "Search",
+    "search": "Buscar",
     "linkedToMarcAuthority": "Linked to MARC authority",
     "browse.callNumbers": "Números de clasificación",
     "browse.contributors": "Colaboradores",
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr.json b/translations/ui-inventory/fr.json
index f24bbaade..f22ae60cb 100644
--- a/translations/ui-inventory/fr.json
+++ b/translations/ui-inventory/fr.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr_FR.json b/translations/ui-inventory/fr_FR.json
index df1264e59..b9da8386f 100644
--- a/translations/ui-inventory/fr_FR.json
+++ b/translations/ui-inventory/fr_FR.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/he.json b/translations/ui-inventory/he.json
index a3bbdea0a..2fbefd325 100644
--- a/translations/ui-inventory/he.json
+++ b/translations/ui-inventory/he.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hi_IN.json b/translations/ui-inventory/hi_IN.json
index 7d7240d78..693536147 100644
--- a/translations/ui-inventory/hi_IN.json
+++ b/translations/ui-inventory/hi_IN.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hu.json b/translations/ui-inventory/hu.json
index 320a680b6..fdf0f161f 100644
--- a/translations/ui-inventory/hu.json
+++ b/translations/ui-inventory/hu.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/it_IT.json b/translations/ui-inventory/it_IT.json
index 35b2c19aa..a9f9519e2 100644
--- a/translations/ui-inventory/it_IT.json
+++ b/translations/ui-inventory/it_IT.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ja.json b/translations/ui-inventory/ja.json
index 26b540891..f9775e1b0 100644
--- a/translations/ui-inventory/ja.json
+++ b/translations/ui-inventory/ja.json
@@ -715,7 +715,7 @@
     "instances.columns.numberOfTitles": "Number of titles",
     "viewAndReorderRequestsQueue": "View requests & reorder ({number})",
     "browseCallNumbers.missedMatch": "would be here",
-    "search.allFields": "All",
+    "search.allFields": "全て",
     "acq.dateOpened": "Date opened",
     "moveItems.selectHolding": "Select holdings",
     "browseContributors": "Browse contributors",
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ko.json b/translations/ui-inventory/ko.json
index 4c9934c3d..9304b0e62 100644
--- a/translations/ui-inventory/ko.json
+++ b/translations/ui-inventory/ko.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nb.json b/translations/ui-inventory/nb.json
index 7d7240d78..693536147 100644
--- a/translations/ui-inventory/nb.json
+++ b/translations/ui-inventory/nb.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nn.json b/translations/ui-inventory/nn.json
index 7d7240d78..693536147 100644
--- a/translations/ui-inventory/nn.json
+++ b/translations/ui-inventory/nn.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pl.json b/translations/ui-inventory/pl.json
index 088cfe920..7faee11c1 100644
--- a/translations/ui-inventory/pl.json
+++ b/translations/ui-inventory/pl.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_BR.json b/translations/ui-inventory/pt_BR.json
index ae2b54e5c..363143be9 100644
--- a/translations/ui-inventory/pt_BR.json
+++ b/translations/ui-inventory/pt_BR.json
@@ -780,8 +780,9 @@
     "boundWithTitles.add": "Adicione encadernados e analíticas",
     "boundWithTitles.enterHoldingsHrid": "Digite o HRID das Coleções",
     "selectCode": "Selecione o código",
-    "actions.menuSection.sortBy": "Sort by",
-    "actions.menuSection.sortBy.relevance": "Relevance",
-    "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy": "Ordenar por",
+    "actions.menuSection.sortBy.relevance": "Relevância",
+    "actions.menuSection.sortBy.title": "Título",
+    "actions.menuSection.sortBy.contributors": "Colaboradores",
+    "exportInstanceInMARC": "Exportar instâncias (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_PT.json b/translations/ui-inventory/pt_PT.json
index 01b87b434..a984085b2 100644
--- a/translations/ui-inventory/pt_PT.json
+++ b/translations/ui-inventory/pt_PT.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ru.json b/translations/ui-inventory/ru.json
index 1b1cb059a..45f6bac17 100644
--- a/translations/ui-inventory/ru.json
+++ b/translations/ui-inventory/ru.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/sv.json b/translations/ui-inventory/sv.json
index 7d7240d78..693536147 100644
--- a/translations/ui-inventory/sv.json
+++ b/translations/ui-inventory/sv.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ur.json b/translations/ui-inventory/ur.json
index 681958a6a..b0f8d282d 100644
--- a/translations/ui-inventory/ur.json
+++ b/translations/ui-inventory/ur.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_CN.json b/translations/ui-inventory/zh_CN.json
index 67805c8fe..9445728ff 100644
--- a/translations/ui-inventory/zh_CN.json
+++ b/translations/ui-inventory/zh_CN.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_TW.json b/translations/ui-inventory/zh_TW.json
index 468377cb7..c521aeba2 100644
--- a/translations/ui-inventory/zh_TW.json
+++ b/translations/ui-inventory/zh_TW.json
@@ -783,5 +783,6 @@
     "actions.menuSection.sortBy": "Sort by",
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors"
+    "actions.menuSection.sortBy.contributors": "Contributors",
+    "exportInstanceInMARC": "Export instance (MARC)"
 }
\ No newline at end of file

From e7e1b76e1624bea89cbfb13da264a3059d208e7d Mon Sep 17 00:00:00 2001
From: Dmytro-Melnyshyn <77053927+Dmytro-Melnyshyn@users.noreply.github.com>
Date: Tue, 20 Jun 2023 10:13:11 +0300
Subject: [PATCH 44/68] UIIN-2444: Fix Search and Browse navigation and
 determining if the button is active. (#2173)

---
 CHANGELOG.md                                  |  1 +
 .../SearchModeNavigation.js                   | 14 ++++---
 .../SearchModeNavigation.test.js              | 40 ++++++++++++++++++-
 3 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 390b7ad05..c7bbe781a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 * When adding items, cursor is in the barcode field as default. Refs UIIN-2205.
 * Quick export from instance detail view. Refs UIIN-2430.
 * Escape quotes to search for Subjects and Contributor. Refs UIIN-2445.
+* Fix Search and Browse navigation and determining if the button is active. Refs UIIN-2444.
 
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
diff --git a/src/components/SearchModeNavigation/SearchModeNavigation.js b/src/components/SearchModeNavigation/SearchModeNavigation.js
index 738b1f42f..f418edcf3 100644
--- a/src/components/SearchModeNavigation/SearchModeNavigation.js
+++ b/src/components/SearchModeNavigation/SearchModeNavigation.js
@@ -1,7 +1,10 @@
 import PropTypes from 'prop-types';
 import { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
-import { useLocation } from 'react-router-dom';
+import {
+  useLocation,
+  useRouteMatch,
+} from 'react-router-dom';
 
 import {
   Button,
@@ -14,26 +17,27 @@ import {
 } from '../../constants';
 
 const SearchModeNavigation = ({ search, state }) => {
+  const { path } = useRouteMatch();
   const {
     search: currentSearch,
     pathname,
   } = useLocation();
 
   const checkIsButtonActive = useCallback((segment) => (
-    pathname === searchModeRoutesMap[segment] ? 'primary' : 'default'
-  ), [pathname]);
+    path === searchModeRoutesMap[segment] ? 'primary' : 'default'
+  ), [path]);
 
   return (
     <ButtonGroup fullWidth>
       {
         Object.keys(searchModeSegments).map(segment => {
-          const isCurrentSegment = pathname === searchModeRoutesMap[segment];
+          const isCurrentSegment = path === searchModeRoutesMap[segment];
 
           return (
             <Button
               key={`${segment}`}
               to={{
-                pathname: searchModeRoutesMap[segment],
+                pathname: isCurrentSegment ? pathname : searchModeRoutesMap[segment],
                 search: isCurrentSegment ? currentSearch : search,
                 state,
               }}
diff --git a/src/components/SearchModeNavigation/SearchModeNavigation.test.js b/src/components/SearchModeNavigation/SearchModeNavigation.test.js
index 19d2fea42..200582ffb 100644
--- a/src/components/SearchModeNavigation/SearchModeNavigation.test.js
+++ b/src/components/SearchModeNavigation/SearchModeNavigation.test.js
@@ -1,5 +1,8 @@
 import { screen } from '@folio/jest-config-stripes/testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
+import {
+  MemoryRouter,
+  useRouteMatch,
+} from 'react-router-dom';
 
 import '../../../test/jest/__mock__';
 
@@ -13,6 +16,11 @@ import {
   BROWSE_INVENTORY_ROUTE,
 } from '../../constants';
 
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useRouteMatch: jest.fn().mockReturnValue({ path: '/inventory/browse' }),
+}));
+
 const initialSearch = '?qindex=contributors&query=test';
 
 const renderSearchModeNavigation = (
@@ -61,4 +69,34 @@ describe('SearchModeNavigation', () => {
       expect(browseButton.href.includes(`${INVENTORY_ROUTE}${search}`)).toBeTruthy();
     });
   });
+
+  describe('when current segment is search', () => {
+    const pathname = `${INVENTORY_ROUTE}/view/UUID`;
+    const search = '?query=test';
+
+    beforeEach(() => {
+      useRouteMatch.mockReturnValue({ path: INVENTORY_ROUTE });
+      renderSearchModeNavigation({ search }, pathname);
+    });
+
+    it('should style the Search button as active', async () => {
+      const searchButton = await screen.findByRole('button', { name: 'Search' });
+      const browseButton = await screen.findByRole('button', { name: 'Browse' });
+
+      expect(searchButton.className).toContain('primary');
+      expect(browseButton.className).toContain('default');
+    });
+
+    it('should keep the current search query in the href for the Search button', async () => {
+      const searchButton = await screen.findByRole('button', { name: 'Search' });
+
+      expect(searchButton.href).toContain(`${pathname}${initialSearch}`);
+    });
+
+    it('should keep the last browse query in the href for the Browse button', async () => {
+      const browseButton = await screen.findByRole('button', { name: 'Browse' });
+
+      expect(browseButton.href).toContain(`${BROWSE_INVENTORY_ROUTE}${search}`);
+    });
+  });
 });

From 4c30c9c756a088cdaaf1658d08714eabf557cfa4 Mon Sep 17 00:00:00 2001
From: Denys Bohdan <denys_bohdan@epam.com>
Date: Tue, 20 Jun 2023 13:40:47 +0300
Subject: [PATCH 45/68] Release v9.4.6 (#2179)

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7bbe781a..23c1e2e60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,11 @@
 * Escape quotes to search for Subjects and Contributor. Refs UIIN-2445.
 * Fix Search and Browse navigation and determining if the button is active. Refs UIIN-2444.
 
+## [9.4.6](https://github.com/folio-org/ui-inventory/tree/v9.4.6) (2023-06-19)
+[Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.5...v9.4.6)
+
+* Rename `hrid` qindex for item to avoid collisions with holdings and instances. Fixes UIIN-2443.
+
 ## [9.4.5](https://github.com/folio-org/ui-inventory/tree/v9.4.5) (2023-04-03)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.4...v9.4.5)
 

From 420361a79a98bebf655cb39dfc53718afed164fe Mon Sep 17 00:00:00 2001
From: Oleksandr Hladchenko
 <85172747+OleksandrHladchenko1@users.noreply.github.com>
Date: Thu, 22 Jun 2023 13:49:48 +0300
Subject: [PATCH 46/68] UIIN-2377: Allow scrolling after choosing the option in
 checkbox facets (#2180)

---
 CHANGELOG.md                                  |  1 +
 src/common/hooks/useFacets.js                 |  2 +-
 src/components/CheckboxFacet/CheckboxFacet.js | 15 +++++++++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23c1e2e60..02c5aa181 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 * Quick export from instance detail view. Refs UIIN-2430.
 * Escape quotes to search for Subjects and Contributor. Refs UIIN-2445.
 * Fix Search and Browse navigation and determining if the button is active. Refs UIIN-2444.
+* Scrolling within Inventory facets. Refs UIIN-2377.
 
 ## [9.4.6](https://github.com/folio-org/ui-inventory/tree/v9.4.6) (2023-06-19)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.5...v9.4.6)
diff --git a/src/common/hooks/useFacets.js b/src/common/hooks/useFacets.js
index 80dcc35f2..916259359 100644
--- a/src/common/hooks/useFacets.js
+++ b/src/common/hooks/useFacets.js
@@ -192,7 +192,7 @@ const useFacets = (
       const isNoFilterSelected = _.every(accordionsData, value => !value?.isSelected);
       if (!query && prevQuery.current && isNoFilterSelected) return;
 
-      handleFetchFacets({ facetToOpen: facetNameToOpen });
+      handleFetchFacets({ focusedFacet: facetNameToOpen });
     }
   }, [accordionsData]);
 
diff --git a/src/components/CheckboxFacet/CheckboxFacet.js b/src/components/CheckboxFacet/CheckboxFacet.js
index 4bfacd354..818a55f9a 100644
--- a/src/components/CheckboxFacet/CheckboxFacet.js
+++ b/src/components/CheckboxFacet/CheckboxFacet.js
@@ -39,13 +39,20 @@ export default class CheckboxFacet extends React.Component {
   };
 
   componentDidUpdate(prevProps) {
+    const prevDataLength = prevProps.dataOptions.length;
+    const currentDataLength = this.props.dataOptions.length;
+
     if (
       this.state.isMoreClicked &&
-      prevProps.dataOptions.length === DEFAULT_FILTERS_NUMBER &&
-      this.props.dataOptions.length > DEFAULT_FILTERS_NUMBER
+      prevDataLength === DEFAULT_FILTERS_NUMBER &&
+      currentDataLength > DEFAULT_FILTERS_NUMBER
     ) {
       this.updateMore();
     }
+
+    if (prevDataLength > currentDataLength && currentDataLength === DEFAULT_FILTERS_NUMBER) {
+      this.setDefaultMore();
+    }
   }
 
   onMoreClick = (totalOptions) => {
@@ -98,6 +105,10 @@ export default class CheckboxFacet extends React.Component {
     });
   }
 
+  setDefaultMore = () => {
+    this.setState(({ more: SHOW_OPTIONS_COUNT }));
+  }
+
   render() {
     const {
       dataOptions,

From 5afb02e996d4fb70771ad1e40046c38fb7cd4159 Mon Sep 17 00:00:00 2001
From: FOLIO Translations Bot
 <38661258+folio-translations@users.noreply.github.com>
Date: Sun, 25 Jun 2023 18:08:01 -0400
Subject: [PATCH 47/68] Lokalise: updates

---
 translations/ui-inventory/cs_CZ.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/translations/ui-inventory/cs_CZ.json b/translations/ui-inventory/cs_CZ.json
index eb85fb189..43bce6267 100644
--- a/translations/ui-inventory/cs_CZ.json
+++ b/translations/ui-inventory/cs_CZ.json
@@ -784,5 +784,5 @@
     "actions.menuSection.sortBy.relevance": "Relevantnost",
     "actions.menuSection.sortBy.title": "Název",
     "actions.menuSection.sortBy.contributors": "Autoři",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export titulu (MARC)"
 }
\ No newline at end of file

From 509a6c975e20432c404a53489451499548b9b040 Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Mon, 26 Jun 2023 13:51:17 +0300
Subject: [PATCH 48/68] UIIN-1392: When removing the dead icons in the Item
 record, then the displayed text looks inconsistent (#2176)

---
 CHANGELOG.md                      |  1 +
 src/views/ItemView.js             |  4 ++--
 src/views/ItemView.test.js        | 19 ++++++++++++-------
 translations/ui-inventory/en.json |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02c5aa181..4bc26142d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 * Escape quotes to search for Subjects and Contributor. Refs UIIN-2445.
 * Fix Search and Browse navigation and determining if the button is active. Refs UIIN-2444.
 * Scrolling within Inventory facets. Refs UIIN-2377.
+* When removing the dead icons in the Item record, then the displayed text looks inconsistent. Fixes UIIN-1392.
 
 ## [9.4.6](https://github.com/folio-org/ui-inventory/tree/v9.4.6) (2023-06-19)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.5...v9.4.6)
diff --git a/src/views/ItemView.js b/src/views/ItemView.js
index 520d953bd..a11f407ee 100644
--- a/src/views/ItemView.js
+++ b/src/views/ItemView.js
@@ -977,8 +977,8 @@ class ItemView extends React.Component {
                           'ui-inventory.itemRecordWithDescription'
                       }
                       values={{
-                        materialType: item?.materialType?.name,
-                        status: item?.status?.name,
+                        materialType: item?.materialType?.name.toLowerCase(),
+                        status: item?.status?.name.toLowerCase(),
                       }}
                     />
                   </Col>
diff --git a/src/views/ItemView.test.js b/src/views/ItemView.test.js
index cd936e6f1..938af0e7f 100644
--- a/src/views/ItemView.test.js
+++ b/src/views/ItemView.test.js
@@ -7,7 +7,7 @@ import { waitFor, screen } from '@folio/jest-config-stripes/testing-library/reac
 import '../../test/jest/__mock__';
 
 import { StripesContext, ModuleHierarchyProvider } from '@folio/stripes/core';
-import renderWithIntl from '../../test/jest/helpers/renderWithIntl';
+import { renderWithIntl, translationsProperties } from '../../test/jest/helpers';
 
 import ItemView from './ItemView';
 
@@ -77,6 +77,7 @@ const resources = {
             },
           },
         ],
+        materialType: { name: 'book' },
       },
     ],
   },
@@ -118,13 +119,17 @@ const ItemViewSetup = () => (
 describe('ItemView', () => {
   describe('rendering ItemView', () => {
     beforeEach(() => {
-      renderWithIntl(<ItemViewSetup />);
+      renderWithIntl(<ItemViewSetup />, translationsProperties);
     });
 
     afterEach(() => {
       jest.clearAllMocks();
     });
 
+    it('should display item record with material type, status, and bound with in lower case in parentheses', () => {
+      expect(screen.getByText('Item record (book, available, bound with)')).toBeInTheDocument();
+    });
+
     it('should display a table of bound-with items', () => {
       expect(document.querySelector('#item-list-bound-with-titles')).toBeInTheDocument();
     });
@@ -149,35 +154,35 @@ describe('ItemView', () => {
     it('should display "inactive" by an inactive holding permanent location', async () => {
       await waitFor(() => {
         const location = document.querySelector('*[data-testid=holding-permanent-location]').innerHTML;
-        expect(location).toContain('ui-inventory.inactive');
+        expect(location).toContain('Inactive');
       });
     });
 
     it('should display "inactive" by an inactive holding temporary location', async () => {
       await waitFor(() => {
         const location = document.querySelector('*[data-testid=holding-temporary-location]').innerHTML;
-        expect(location).toContain('ui-inventory.inactive');
+        expect(location).toContain('Inactive');
       });
     });
 
     it('should display "inactive" by an inactive item permanent location', async () => {
       await waitFor(() => {
         const location = document.querySelector('*[data-testid=item-permanent-location]').innerHTML;
-        expect(location).toContain('ui-inventory.inactive');
+        expect(location).toContain('Inactive');
       });
     });
 
     it('should display "inactive" by an inactive item temporary location', async () => {
       await waitFor(() => {
         const location = document.querySelector('*[data-testid=item-temporary-location]').innerHTML;
-        expect(location).toContain('ui-inventory.inactive');
+        expect(location).toContain('Inactive');
       });
     });
 
     it('should display "inactive" by an inactive item effective location', async () => {
       await waitFor(() => {
         const location = document.querySelector('*[data-testid=item-effective-location]').innerHTML;
-        expect(location).toContain('ui-inventory.inactive');
+        expect(location).toContain('Inactive');
       });
     });
 
diff --git a/translations/ui-inventory/en.json b/translations/ui-inventory/en.json
index 0e1db64da..a5a72790f 100644
--- a/translations/ui-inventory/en.json
+++ b/translations/ui-inventory/en.json
@@ -45,7 +45,7 @@
   "updateInstance": "Update instance",
   "itemRecord": "Item record",
   "itemRecordWithDescription": "Item record ({materialType}, {status})",
-  "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+  "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
   "code": "code",
   "duplicateInstance": "Duplicate instance",
   "save": "Save",

From c5167f72fd73ee9d90909d455e780b627a3d60b3 Mon Sep 17 00:00:00 2001
From: Oleksandr Hladchenko
 <85172747+OleksandrHladchenko1@users.noreply.github.com>
Date: Mon, 26 Jun 2023 17:24:08 +0300
Subject: [PATCH 49/68] UIIN-2436: Adjust the sentence case for some Inventory
 action options (#2185)

---
 CHANGELOG.md                      | 1 +
 translations/ui-inventory/en.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4bc26142d..63ab02c86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
 * Fix Search and Browse navigation and determining if the button is active. Refs UIIN-2444.
 * Scrolling within Inventory facets. Refs UIIN-2377.
 * When removing the dead icons in the Item record, then the displayed text looks inconsistent. Fixes UIIN-1392.
+* Adjust the sentence case for some Inventory action options. Refs UIIN-2436.
 
 ## [9.4.6](https://github.com/folio-org/ui-inventory/tree/v9.4.6) (2023-06-19)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.5...v9.4.6)
diff --git a/translations/ui-inventory/en.json b/translations/ui-inventory/en.json
index a5a72790f..9b67a3598 100644
--- a/translations/ui-inventory/en.json
+++ b/translations/ui-inventory/en.json
@@ -506,7 +506,7 @@
   "editItemDialog": "Edit item dialog",
   "copyItemDialog": "Copy item dialog",
   "copyItem": "Duplicate",
-  "newRequest": "New Request",
+  "newRequest": "New request",
   "fastAdd": "Fast add",
   "newMARCRecord": "New MARC Bib Record",
   "newFastAddRecord": "New Fast Add Record",

From 48f4d92b5a3593e3d0af078788fe8b8b9f822824 Mon Sep 17 00:00:00 2001
From: Oleksandr Hladchenko
 <85172747+OleksandrHladchenko1@users.noreply.github.com>
Date: Mon, 26 Jun 2023 18:54:59 +0300
Subject: [PATCH 50/68] UIIN-2437: Adjust the Instance Edit screen header
 (#2183)

* UIIN-2437: Add new title for instance edit page

* UIIN-2437: Adjust header when publisher and  publication date don't exist

* UIIN-2437: Update CHANGELOG.md

* Update CHANGELOG.md

* UIIN-2437: Fix tests
---
 CHANGELOG.md                               |  1 +
 src/Instance/InstanceDetails/utils.js      |  3 +-
 src/Instance/InstanceDetails/utils.test.js | 14 ++++++-
 src/edit/InstanceForm.js                   | 49 ++++++++++++++++++++--
 translations/ui-inventory/en.json          |  3 +-
 5 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63ab02c86..1289ad53e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
 * Scrolling within Inventory facets. Refs UIIN-2377.
 * When removing the dead icons in the Item record, then the displayed text looks inconsistent. Fixes UIIN-1392.
 * Adjust the sentence case for some Inventory action options. Refs UIIN-2436.
+* Adjust the Instance Edit screen header. Refs UIIN-2437.
 
 ## [9.4.6](https://github.com/folio-org/ui-inventory/tree/v9.4.6) (2023-06-19)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.5...v9.4.6)
diff --git a/src/Instance/InstanceDetails/utils.js b/src/Instance/InstanceDetails/utils.js
index ee3c75a05..1d9b3bbbb 100644
--- a/src/Instance/InstanceDetails/utils.js
+++ b/src/Instance/InstanceDetails/utils.js
@@ -11,9 +11,10 @@ export const getPublishingInfo = instance => {
   const publication = instance.publication && instance.publication[0];
 
   if (publication) {
+    const publisherStr = publication.publisher ? ` • ${publication.publisher}` : '';
     const publishDateStr = publication.dateOfPublication ? ` • ${publication.dateOfPublication}` : '';
 
-    return `${publication.publisher ?? ''}${publishDateStr}`;
+    return `${publisherStr}${publishDateStr}`;
   }
 
   return undefined;
diff --git a/src/Instance/InstanceDetails/utils.test.js b/src/Instance/InstanceDetails/utils.test.js
index cc6c7b9d6..c2f5148af 100644
--- a/src/Instance/InstanceDetails/utils.test.js
+++ b/src/Instance/InstanceDetails/utils.test.js
@@ -12,7 +12,7 @@ describe('getPublishingInfo', () => {
         },
       ],
     };
-    expect(getPublishingInfo(instanceProps)).toEqual('Publisher • 2022-01-01');
+    expect(getPublishingInfo(instanceProps)).toEqual(' • Publisher • 2022-01-01');
   });
   it('returns expected string when publication object exists without dateOfPublication', () => {
     const instanceProps = {
@@ -22,7 +22,17 @@ describe('getPublishingInfo', () => {
         },
       ],
     };
-    expect(getPublishingInfo(instanceProps)).toEqual('Publisher');
+    expect(getPublishingInfo(instanceProps)).toEqual(' • Publisher');
+  });
+  it('returns expected string when publication object exists without publisher', () => {
+    const instanceProps = {
+      publication: [
+        {
+          dateOfPublication: '2022',
+        },
+      ],
+    };
+    expect(getPublishingInfo(instanceProps)).toEqual(' • 2022');
   });
   it('returns undefined when publication object does not exist', () => {
     const instanceProps = {};
diff --git a/src/edit/InstanceForm.js b/src/edit/InstanceForm.js
index 718ea3d18..308964353 100644
--- a/src/edit/InstanceForm.js
+++ b/src/edit/InstanceForm.js
@@ -8,7 +8,10 @@ import {
 import { FormattedMessage } from 'react-intl';
 import { withRouter } from 'react-router';
 
-import { stripesConnect } from '@folio/stripes/core';
+import {
+  AppIcon,
+  stripesConnect,
+} from '@folio/stripes/core';
 import { ViewMetaData } from '@folio/stripes/smart-components';
 import {
   Accordion,
@@ -57,6 +60,7 @@ import PrecedingTitleFields from './precedingTitleFields';
 import NatureOfContentFields from './natureOfContentFields';
 import SucceedingTitleFields from './succeedingTitleFields';
 import {
+  getDate,
   handleKeyCommand,
   psTitleRelationshipId,
   validateOptionalField,
@@ -70,6 +74,7 @@ import ParentInstanceFields from '../Instance/InstanceEdit/ParentInstanceFields'
 import ChildInstanceFields from '../Instance/InstanceEdit/ChildInstanceFields';
 
 import styles from './InstanceForm.css';
+import { getPublishingInfo } from '../Instance/InstanceDetails/utils';
 
 function validate(values) {
   const errors = {};
@@ -178,11 +183,48 @@ class InstanceForm extends React.Component {
       initialValues,
     } = this.props;
 
-    const titleTranslationKey = initialValues.id ? 'ui-inventory.edit' : 'ui-inventory.newInstance';
+    const newInstanceTitle = <FormattedMessage id="ui-inventory.newInstance" />;
+
+    const getEditInstanceTitle = () => {
+      const publishingInfo = getPublishingInfo(initialValues);
+
+      return (
+        <>
+          <AppIcon app="inventory" iconKey="instance" size="small" />
+          {' '}
+          <FormattedMessage
+            id="ui-inventory.editInstance.title"
+            values={{ title: initialValues.title }}
+          />
+          {publishingInfo}
+        </>
+      );
+    };
 
     return (
       <span data-test-header-title>
-        <FormattedMessage id={titleTranslationKey} />
+        {initialValues.id ? getEditInstanceTitle() : newInstanceTitle}
+      </span>
+    );
+  }
+
+  getPaneSubTitle() {
+    const {
+      initialValues: {
+        hrid,
+        metadata: { updatedDate },
+      }
+    } = this.props;
+
+    return (
+      <span data-test-header-sub-title>
+        <FormattedMessage
+          id="ui-inventory.instanceRecordSubtitle"
+          values={{
+            hrid,
+            updatedDate: getDate(updatedDate),
+          }}
+        />
       </span>
     );
   }
@@ -352,6 +394,7 @@ class InstanceForm extends React.Component {
               onClose={onCancel}
               footer={this.getFooter()}
               paneTitle={this.getPaneTitle()}
+              paneSub={initialValues?.id ? this.getPaneSubTitle() : null}
               actionMenu={this.getActionMenu}
               id={id}
             >
diff --git a/translations/ui-inventory/en.json b/translations/ui-inventory/en.json
index 9b67a3598..fe140948e 100644
--- a/translations/ui-inventory/en.json
+++ b/translations/ui-inventory/en.json
@@ -54,6 +54,7 @@
   "edit": "Edit",
   "newInstance": "New instance",
   "editInstance": "Edit instance",
+  "editInstance.title": "Edit instance • {title}",
   "moveItems": "Move holdings/items to another instance",
   "viewRequests": "View requests",
   "viewAndReorderRequestsQueue": "View requests & reorder ({number})",
@@ -243,7 +244,7 @@
   "titleData": "Title data",
   "instanceRecord": "Instance record",
   "instanceRecordWithType": "Instance record ({instanceTypeName})",
-  "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+  "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
   "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
   "instanceRecordRequestsTitle": "Requests on items - {instanceResourceTitle}, {instancePublicationDate}",
   "instanceRecordRequestsSubtitle": "{count} items found",

From 8e7945e764a19aeaf6590ac8ac363bc07c7c2e10 Mon Sep 17 00:00:00 2001
From: Denys Bohdan <denys_bohdan@epam.com>
Date: Tue, 27 Jun 2023 14:08:40 +0300
Subject: [PATCH 51/68] UIIN-2433  Inventory: Retain Search/Browse
 query/options/filter and facet selections UNLESS user resets/clear selections
 (#2177)

* UIIN-2433  Inventory: Retain Search/Browse query/options/filter and facet selections UNLESS user resets/clear selections

* UIIN-2433 Highlight last opened record when switching from Browse to Search

* UIIN-2433 Fix tests

* UIIN-2433 Added more tests

* UIIN-2433 Fixes clear storage data after logout

* UIIN-2433 Save last opened record id for each segment
---
 CHANGELOG.md                                  |  1 +
 .../FilterNavigation/FilterNavigation.js      | 65 +++++++++++--------
 src/components/InstancesList/InstancesList.js | 54 +++++++++++++--
 .../InstancesList/InstancesList.test.js       | 57 ++++++++++++----
 .../SearchModeNavigation.js                   | 47 ++++++++------
 .../SearchModeNavigation.test.js              | 37 +++++++++--
 src/hooks/useLogout/useLogout.js              | 31 ++-------
 src/hooks/useLogout/utils.js                  | 30 +++++++++
 src/providers/LastSearchTermsProvider.js      | 22 +++++--
 src/providers/LastSearchTermsProvider.test.js | 36 ++++++----
 src/routes/InstancesRoute.js                  |  3 +
 11 files changed, 267 insertions(+), 116 deletions(-)
 create mode 100644 src/hooks/useLogout/utils.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1289ad53e..eccbf0145 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
 * When removing the dead icons in the Item record, then the displayed text looks inconsistent. Fixes UIIN-1392.
 * Adjust the sentence case for some Inventory action options. Refs UIIN-2436.
 * Adjust the Instance Edit screen header. Refs UIIN-2437.
+* Inventory: Retain Search/Browse query/options/filter and facet selections UNLESS user resets/clear selections. Refs UIIN-2433.
 
 ## [9.4.6](https://github.com/folio-org/ui-inventory/tree/v9.4.6) (2023-06-19)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.5...v9.4.6)
diff --git a/src/components/FilterNavigation/FilterNavigation.js b/src/components/FilterNavigation/FilterNavigation.js
index d39a3076a..92fd20f55 100644
--- a/src/components/FilterNavigation/FilterNavigation.js
+++ b/src/components/FilterNavigation/FilterNavigation.js
@@ -1,43 +1,54 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
+import queryString from 'query-string';
+
 import {
   ButtonGroup,
   Button,
 } from '@folio/stripes/components';
 
 import { segments } from '../../constants';
+import { useLastSearchTerms } from '../../hooks';
+
+const FilterNavigation = ({ segment, onChange }) => {
+  const { getLastSearch } = useLastSearchTerms();
+
+  return (
+    <ButtonGroup
+      fullWidth
+      data-test-filters-navigation
+    >
+      {
+        Object.keys(segments).map((name) => {
+          const searchParams = queryString.parse(getLastSearch(name));
 
-const FilterNavigation = ({ segment, segmentsSortBy, onChange }) => (
-  <ButtonGroup
-    fullWidth
-    data-test-filters-navigation
-  >
-    {
-      Object.keys(segments).map((name) => {
-        const sort = segmentsSortBy.find(x => x.name === name).sort || '';
-
-        return (
-          <>
-            <Button
-              key={`${name}`}
-              to={`/inventory?segment=${name}${sort !== '' ? '&sort=' : ''}${sort}`}
-              buttonStyle={`${segment === name ? 'primary' : 'default'}`}
-              id={`segment-navigation-${name}`}
-              onClick={onChange}
-            >
-              <FormattedMessage id={`ui-inventory.filters.${name}`} />
-            </Button>
-          </>
-        );
-      })
-    }
-  </ButtonGroup>
-);
+          searchParams.segment = name;
+
+          return (
+            <>
+              <Button
+                key={`${name}`}
+                to={{
+                  pathname: '/inventory',
+                  search: queryString.stringify(searchParams),
+                }}
+                buttonStyle={`${segment === name ? 'primary' : 'default'}`}
+                id={`segment-navigation-${name}`}
+                onClick={() => onChange(name)}
+              >
+                <FormattedMessage id={`ui-inventory.filters.${name}`} />
+              </Button>
+            </>
+          );
+        })
+      }
+    </ButtonGroup>
+  );
+};
 
 FilterNavigation.propTypes = {
   segment: PropTypes.string,
-  segmentsSortBy: PropTypes.arrayOf(PropTypes.object),
   onChange: PropTypes.func,
 };
 
diff --git a/src/components/InstancesList/InstancesList.js b/src/components/InstancesList/InstancesList.js
index fb2c63668..ff1954f4b 100644
--- a/src/components/InstancesList/InstancesList.js
+++ b/src/components/InstancesList/InstancesList.js
@@ -78,6 +78,7 @@ import {
 import facetsStore from '../../stores/facetsStore';
 
 import css from './instances.css';
+import registerLogoutListener from '../../hooks/useLogout/utils';
 
 const INITIAL_RESULT_COUNT = 30;
 const RESULT_COUNT_INCREMENT = 30;
@@ -123,6 +124,7 @@ class InstancesList extends React.Component {
     location: PropTypes.shape({
       search: PropTypes.string,
       state: PropTypes.object,
+      pathname: PropTypes.string,
     }),
     stripes: PropTypes.object.isRequired,
     history: PropTypes.shape({
@@ -133,6 +135,7 @@ class InstancesList extends React.Component {
     getLastSearchOffset: PropTypes.func.isRequired,
     storeLastSearch: PropTypes.func.isRequired,
     storeLastSearchOffset: PropTypes.func.isRequired,
+    storeLastSegment: PropTypes.func.isRequired,
   };
 
   static contextType = CalloutContext;
@@ -167,6 +170,7 @@ class InstancesList extends React.Component {
     const {
       history,
       getParams,
+      namespace,
     } = this.props;
     const params = getParams();
 
@@ -188,6 +192,8 @@ class InstancesList extends React.Component {
       openedFromBrowse: params.selectedBrowseResult === 'true',
       optionSelected: '',
     });
+
+    registerLogoutListener(this.clearStorage, namespace, 'instances-list-logout', history);
   }
 
   componentDidUpdate(prevProps) {
@@ -208,6 +214,12 @@ class InstancesList extends React.Component {
     if (this.state.segmentsSortBy.find(x => x.name === this.props.segment && x.sort !== sortBy)) {
       this.setSegmentSortBy(sortBy);
     }
+
+    const id = this.props.location.pathname.split('/')[3];
+
+    if (id) {
+      setItem(`${this.props.namespace}.${this.props.segment}.lastOpenRecord`, id);
+    }
   }
 
   componentWillUnmount() {
@@ -221,6 +233,16 @@ class InstancesList extends React.Component {
     authorityId: '',
   };
 
+  clearStorage = () => {
+    const {
+      namespace,
+    } = this.props;
+
+    Object.values(segments).forEach((segment) => {
+      setItem(`${namespace}.${segment}.lastOpenRecord`, null);
+    });
+  }
+
   processLastSearchTerms = () => {
     const {
       getParams,
@@ -228,12 +250,13 @@ class InstancesList extends React.Component {
       parentMutator,
       getLastSearchOffset,
       storeLastSearch,
+      segment,
     } = this.props;
     const params = getParams();
-    const lastSearchOffset = getLastSearchOffset();
+    const lastSearchOffset = getLastSearchOffset(segment);
     const offset = params.selectedBrowseResult === 'true' ? 0 : lastSearchOffset;
 
-    storeLastSearch(location.search);
+    storeLastSearch(location.search, segment);
     parentMutator.resultOffset.replace(offset);
   }
 
@@ -243,14 +266,15 @@ class InstancesList extends React.Component {
       parentResources,
       storeLastSearch,
       storeLastSearchOffset,
+      segment,
     } = this.props;
 
     if (prevProps.location.search !== location.search) {
-      storeLastSearch(location.search);
+      storeLastSearch(location.search, segment);
     }
 
     if (prevProps.parentResources.resultOffset !== parentResources.resultOffset) {
-      storeLastSearchOffset(parentResources.resultOffset);
+      storeLastSearchOffset(parentResources.resultOffset, segment);
     }
   }
 
@@ -371,6 +395,8 @@ class InstancesList extends React.Component {
   }
 
   refocusOnInputSearch = (segment) => {
+    const { storeLastSegment } = this.props;
+
     // when navigation button is clicked to change the search segment
     // the focus stays on the button so refocus back on the input search.
     // https://issues.folio.org/browse/UIIN-1358
@@ -379,18 +405,33 @@ class InstancesList extends React.Component {
         optionSelected: ''
       });
     }
+    storeLastSegment(segment);
     facetsStore.getState().resetFacetSettings();
     document.getElementById('input-inventory-search').focus();
   }
 
+  onSearchModeSwitch = () => {
+    const {
+      namespace,
+      location: { pathname },
+      segment,
+    } = this.props;
+
+    const id = pathname.split('/')[3];
+
+    if (id) {
+      setItem(`${namespace}.${segment}.lastOpenRecord`, id);
+    }
+  }
+
   renderNavigation = () => (
     <>
       <SearchModeNavigation
         search={this.props.getLastBrowse()}
+        onSearchModeSwitch={this.onSearchModeSwitch}
       />
       <FilterNavigation
         segment={this.props.segment}
-        segmentsSortBy={this.state.segmentsSortBy}
         onChange={this.refocusOnInputSearch}
       />
     </>
@@ -990,6 +1031,7 @@ class InstancesList extends React.Component {
       },
       namespace,
       stripes,
+      segment,
     } = this.props;
     const {
       isSelectedRecordsModalOpened,
@@ -1072,7 +1114,6 @@ class InstancesList extends React.Component {
       this.setState({ optionSelected: qindex });
 
       parentMutator.query.update({
-        qindex,
         filters: '',
         ...this.extraParamsToReset,
       });
@@ -1119,6 +1160,7 @@ class InstancesList extends React.Component {
             selectedIndex={get(data.query, 'qindex')}
             searchableIndexesPlaceholder={null}
             initialResultCount={INITIAL_RESULT_COUNT}
+            initiallySelectedRecord={getItem(`${namespace}.${segment}.lastOpenRecord`)}
             resultCountIncrement={RESULT_COUNT_INCREMENT}
             viewRecordComponent={ViewInstanceWrapper}
             editRecordComponent={InstanceForm}
diff --git a/src/components/InstancesList/InstancesList.test.js b/src/components/InstancesList/InstancesList.test.js
index a48c26332..f4635470a 100644
--- a/src/components/InstancesList/InstancesList.test.js
+++ b/src/components/InstancesList/InstancesList.test.js
@@ -5,10 +5,10 @@ import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 import { createMemoryHistory } from 'history';
 import {
   act,
+  cleanup,
   fireEvent,
   screen,
   waitFor,
-  cleanup,
   within,
 } from '@folio/jest-config-stripes/testing-library/react';
 
@@ -21,6 +21,7 @@ import translationsProperties from '../../../test/jest/helpers/translationsPrope
 import { instances as instancesFixture } from '../../../test/fixtures/instances';
 import { getFilterConfig } from '../../filterConfig';
 import InstancesList from './InstancesList';
+import { setItem } from '../../storage';
 import { SORTABLE_SEARCH_RESULT_LIST_COLUMNS } from '../../constants';
 
 const updateMock = jest.fn();
@@ -30,8 +31,19 @@ const mockStoreLastSearch = jest.fn();
 const mockRecordsReset = jest.fn();
 const mockGetLastSearchOffset = jest.fn();
 const mockStoreLastSearchOffset = jest.fn();
+const mockGetLastSearch = jest.fn();
+
+jest.mock('../../storage', () => ({
+  ...jest.requireActual('../../storage'),
+  setItem: jest.fn(),
+}));
 
-jest.mock('../../storage');
+jest.mock('../../hooks', () => ({
+  ...jest.requireActual('../../hooks'),
+  useLastSearchTerms: () => ({
+    getLastSearch: mockGetLastSearch,
+  }),
+}));
 
 const stripesStub = {
   connect: Component => <Component />,
@@ -143,7 +155,7 @@ describe('InstancesList', () => {
       it('should write location.search to the session storage', () => {
         const search = '?qindex=title&query=book&sort=title';
         history.push({ search });
-        expect(mockStoreLastSearch).toHaveBeenCalledWith(search);
+        expect(mockStoreLastSearch).toHaveBeenCalledWith(search, 'instances');
       });
 
       describe('and browse result was selected', () => {
@@ -185,7 +197,7 @@ describe('InstancesList', () => {
           const search = '?qindex=title&query=book&sort=title';
           mockStoreLastSearch.mockClear();
           history.push({ search });
-          expect(mockStoreLastSearch).toHaveBeenCalledWith(search);
+          expect(mockStoreLastSearch).toHaveBeenCalledWith(search, 'instances');
         });
       });
 
@@ -204,7 +216,7 @@ describe('InstancesList', () => {
             },
           }, rerender);
 
-          expect(mockStoreLastSearchOffset).toHaveBeenCalledWith(offset);
+          expect(mockStoreLastSearchOffset).toHaveBeenCalledWith(offset, 'instances');
         });
       });
     });
@@ -219,20 +231,37 @@ describe('InstancesList', () => {
       });
     });
 
-    it('should pass the correct search by clicking on the `Browse` tab', () => {
-      cleanup();
-      const search = '?qindex=subjects&query=book';
+    describe('when clicking on the `Browse` tab', () => {
+      it('should pass the correct search by clicking on the `Browse` tab', () => {
+        cleanup();
+        const search = '?qindex=subjects&query=book';
+
+        jest.spyOn(history, 'push');
+
+        renderInstancesList({
+          segment: 'instances',
+          getLastBrowse: () => search,
+        });
 
-      jest.spyOn(history, 'push');
+        fireEvent.click(screen.getByRole('button', { name: 'Browse' }));
 
-      renderInstancesList({
-        segment: 'instances',
-        getLastBrowse: () => search,
+        expect(history.push).toHaveBeenCalledWith(expect.objectContaining({ search }));
       });
 
-      fireEvent.click(screen.getByRole('button', { name: 'Browse' }));
+      it('should store last opened record id', () => {
+        cleanup();
+        history = createMemoryHistory({ initialEntries: [{
+          pathname: '/inventory/view/test-id',
+        }] });
+
+        renderInstancesList({
+          segment: 'instances',
+        });
 
-      expect(history.push).toHaveBeenCalledWith(expect.objectContaining({ search }));
+        fireEvent.click(screen.getByRole('button', { name: 'Browse' }));
+
+        expect(setItem).toHaveBeenCalledWith('@folio/inventory.instances.lastOpenRecord', 'test-id');
+      });
     });
 
     it('should have proper list results size', () => {
diff --git a/src/components/SearchModeNavigation/SearchModeNavigation.js b/src/components/SearchModeNavigation/SearchModeNavigation.js
index f418edcf3..48248b018 100644
--- a/src/components/SearchModeNavigation/SearchModeNavigation.js
+++ b/src/components/SearchModeNavigation/SearchModeNavigation.js
@@ -3,6 +3,7 @@ import { useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 import {
   useLocation,
+  useHistory,
   useRouteMatch,
 } from 'react-router-dom';
 
@@ -16,38 +17,45 @@ import {
   searchModeSegments,
 } from '../../constants';
 
-const SearchModeNavigation = ({ search, state }) => {
+const SearchModeNavigation = ({ search, state, onSearchModeSwitch }) => {
   const { path } = useRouteMatch();
   const {
     search: currentSearch,
     pathname,
   } = useLocation();
+  const history = useHistory();
 
   const checkIsButtonActive = useCallback((segment) => (
     path === searchModeRoutesMap[segment] ? 'primary' : 'default'
   ), [path]);
 
+  const onClick = useCallback((segment) => {
+    const isCurrentSegment = path === searchModeRoutesMap[segment];
+
+    if (onSearchModeSwitch) {
+      onSearchModeSwitch();
+    }
+
+    history.push({
+      pathname: isCurrentSegment ? pathname : searchModeRoutesMap[segment],
+      search: isCurrentSegment ? currentSearch : search,
+      state,
+    });
+  }, [onSearchModeSwitch, history, path, currentSearch, search, state]);
+
   return (
     <ButtonGroup fullWidth>
       {
-        Object.keys(searchModeSegments).map(segment => {
-          const isCurrentSegment = path === searchModeRoutesMap[segment];
-
-          return (
-            <Button
-              key={`${segment}`}
-              to={{
-                pathname: isCurrentSegment ? pathname : searchModeRoutesMap[segment],
-                search: isCurrentSegment ? currentSearch : search,
-                state,
-              }}
-              buttonStyle={checkIsButtonActive(segment)}
-              id={`mode-navigation-${segment}`}
-            >
-              <FormattedMessage id={`ui-inventory.${segment}`} />
-            </Button>
-          );
-        })
+        Object.keys(searchModeSegments).map(segment => (
+          <Button
+            key={`${segment}`}
+            buttonStyle={checkIsButtonActive(segment)}
+            onClick={() => onClick(segment)}
+            id={`mode-navigation-${segment}`}
+          >
+            <FormattedMessage id={`ui-inventory.${segment}`} />
+          </Button>
+        ))
       }
     </ButtonGroup>
   );
@@ -56,6 +64,7 @@ const SearchModeNavigation = ({ search, state }) => {
 SearchModeNavigation.propTypes = {
   search: PropTypes.string,
   state: PropTypes.any,
+  onSearchModeSwitch: PropTypes.func,
 };
 
 export default SearchModeNavigation;
diff --git a/src/components/SearchModeNavigation/SearchModeNavigation.test.js b/src/components/SearchModeNavigation/SearchModeNavigation.test.js
index 200582ffb..64af42f03 100644
--- a/src/components/SearchModeNavigation/SearchModeNavigation.test.js
+++ b/src/components/SearchModeNavigation/SearchModeNavigation.test.js
@@ -1,4 +1,4 @@
-import { screen } from '@folio/jest-config-stripes/testing-library/react';
+import { fireEvent, screen } from '@folio/jest-config-stripes/testing-library/react';
 import {
   MemoryRouter,
   useRouteMatch,
@@ -16,9 +16,14 @@ import {
   BROWSE_INVENTORY_ROUTE,
 } from '../../constants';
 
+const mockPush = jest.fn();
+
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useRouteMatch: jest.fn().mockReturnValue({ path: '/inventory/browse' }),
+  useHistory: () => ({
+    push: mockPush,
+  }),
 }));
 
 const initialSearch = '?qindex=contributors&query=test';
@@ -41,6 +46,10 @@ const renderSearchModeNavigation = (
 );
 
 describe('SearchModeNavigation', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('should render search mode navigation buttons', () => {
     renderSearchModeNavigation();
 
@@ -53,8 +62,12 @@ describe('SearchModeNavigation', () => {
       renderSearchModeNavigation();
 
       const browseButton = await screen.findByRole('button', { name: 'Browse' });
+      fireEvent.click(browseButton);
 
-      expect(browseButton.href.includes(`${BROWSE_INVENTORY_ROUTE}${initialSearch}`)).toBeTruthy();
+      expect(mockPush).toHaveBeenCalledWith({
+        pathname: BROWSE_INVENTORY_ROUTE,
+        search: initialSearch,
+      });
     });
 
     it('should keep set search query in url in search button', async () => {
@@ -65,8 +78,12 @@ describe('SearchModeNavigation', () => {
       });
 
       const browseButton = await screen.findByRole('button', { name: 'Search' });
+      fireEvent.click(browseButton);
 
-      expect(browseButton.href.includes(`${INVENTORY_ROUTE}${search}`)).toBeTruthy();
+      expect(mockPush).toHaveBeenCalledWith({
+        pathname: INVENTORY_ROUTE,
+        search,
+      });
     });
   });
 
@@ -90,13 +107,23 @@ describe('SearchModeNavigation', () => {
     it('should keep the current search query in the href for the Search button', async () => {
       const searchButton = await screen.findByRole('button', { name: 'Search' });
 
-      expect(searchButton.href).toContain(`${pathname}${initialSearch}`);
+      fireEvent.click(searchButton);
+
+      expect(mockPush).toHaveBeenCalledWith({
+        pathname,
+        search: initialSearch,
+      });
     });
 
     it('should keep the last browse query in the href for the Browse button', async () => {
       const browseButton = await screen.findByRole('button', { name: 'Browse' });
 
-      expect(browseButton.href).toContain(`${BROWSE_INVENTORY_ROUTE}${search}`);
+      fireEvent.click(browseButton);
+
+      expect(mockPush).toHaveBeenCalledWith({
+        pathname: BROWSE_INVENTORY_ROUTE,
+        search,
+      });
     });
   });
 });
diff --git a/src/hooks/useLogout/useLogout.js b/src/hooks/useLogout/useLogout.js
index 611d7c4b1..09e5e6239 100644
--- a/src/hooks/useLogout/useLogout.js
+++ b/src/hooks/useLogout/useLogout.js
@@ -1,7 +1,9 @@
 import { useEffect } from 'react';
-import { useNamespace } from '@folio/stripes/core';
 import { useHistory } from 'react-router-dom';
-import { getItem, setItem } from '../../storage';
+
+import { useNamespace } from '@folio/stripes/core';
+
+import registerLogoutListener from './utils';
 
 // In this useEffect we are waiting for the user's logout to do something afterwards.
 const useLogout = (cb, persistKey) => {
@@ -9,30 +11,7 @@ const useLogout = (cb, persistKey) => {
   const [namespace] = useNamespace();
 
   useEffect(() => {
-    const logoutListenerKey = `${namespace}.${persistKey || 'logout-listener-registered'}`;
-    const isListenerListening = getItem(logoutListenerKey);
-
-    const resetListenerRegister = () => {
-      setItem(logoutListenerKey, null);
-    };
-
-    if (!isListenerListening) {
-      // The history.listen resets itself after a page refresh, so we need to fire it again by resetting the flag.
-      window.addEventListener('beforeunload', resetListenerRegister);
-
-      const unlisten = history.listen(location => {
-        const isLogout = location.pathname === '/';
-
-        if (isLogout) {
-          cb();
-          resetListenerRegister();
-          window.removeEventListener('beforeunload', resetListenerRegister);
-          unlisten();
-        }
-      });
-
-      setItem(logoutListenerKey, true);
-    }
+    registerLogoutListener(cb, namespace, persistKey, history);
   }, []);
 };
 
diff --git a/src/hooks/useLogout/utils.js b/src/hooks/useLogout/utils.js
new file mode 100644
index 000000000..ee21eb99e
--- /dev/null
+++ b/src/hooks/useLogout/utils.js
@@ -0,0 +1,30 @@
+import { getItem, setItem } from '../../storage';
+
+const registerLogoutListener = (cb, namespace, persistKey, history) => {
+  const logoutListenerKey = `${namespace}.${persistKey || 'logout-listener-registered'}`;
+  const isListenerListening = getItem(logoutListenerKey);
+
+  const resetListenerRegister = () => {
+    setItem(logoutListenerKey, null);
+  };
+
+  if (!isListenerListening) {
+    // The history.listen resets itself after a page refresh, so we need to fire it again by resetting the flag.
+    window.addEventListener('beforeunload', resetListenerRegister);
+
+    const unlisten = history.listen(location => {
+      const isLogout = location.pathname === '/';
+
+      if (isLogout) {
+        cb();
+        resetListenerRegister();
+        window.removeEventListener('beforeunload', resetListenerRegister);
+        unlisten();
+      }
+    });
+
+    setItem(logoutListenerKey, true);
+  }
+};
+
+export default registerLogoutListener;
diff --git a/src/providers/LastSearchTermsProvider.js b/src/providers/LastSearchTermsProvider.js
index d23ac3014..dd733148e 100644
--- a/src/providers/LastSearchTermsProvider.js
+++ b/src/providers/LastSearchTermsProvider.js
@@ -7,37 +7,47 @@ import { LastSearchTermsContext } from '../contexts';
 import { getItem, setItem } from '../storage';
 import { INIT_PAGE_CONFIG } from '../hooks/useInventoryBrowse';
 import { useLogout } from '../hooks';
+import { segments } from '../constants';
 
 const LastSearchTermsProvider = ({ children }) => {
   const [namespace] = useNamespace();
 
   const resetStorageAfterLogout = () => {
-    setItem(`${namespace}/search.lastSearch`, null);
+    setItem(`${namespace}/search.${segments.instances}.lastSearch`, null);
+    setItem(`${namespace}/search.${segments.holdings}.lastSearch`, null);
+    setItem(`${namespace}/search.${segments.items}.lastSearch`, null);
     setItem(`${namespace}/browse.lastSearch`, null);
-    setItem(`${namespace}/search.lastOffset`, null);
+    setItem(`${namespace}/search.${segments.instances}.lastOffset`, null);
+    setItem(`${namespace}/search.${segments.holdings}.lastOffset`, null);
+    setItem(`${namespace}/search.${segments.items}.lastOffset`, null);
     setItem(`${namespace}/browse.lastOffset`, null);
+    setItem(`${namespace}/search.lastSegment`, null);
   };
 
   useLogout(resetStorageAfterLogout);
 
-  const getLastSearch = () => getItem(`${namespace}/search.lastSearch`) || '';
+  const getLastSegment = () => getItem(`${namespace}/search.lastSegment`) || segments.instances;
+  const getLastSearch = (segment = getLastSegment()) => getItem(`${namespace}/search.${segment}.lastSearch`) || '';
   const getLastBrowse = () => getItem(`${namespace}/browse.lastSearch`) || '';
-  const getLastSearchOffset = () => getItem(`${namespace}/search.lastOffset`) || 0;
+  const getLastSearchOffset = (segment) => getItem(`${namespace}/search.${segment}.lastOffset`) || 0;
   const getLastBrowseOffset = () => getItem(`${namespace}/browse.lastOffset`) || INIT_PAGE_CONFIG;
-  const storeLastSearch = (search) => setItem(`${namespace}/search.lastSearch`, search);
+  const storeLastSearch = (search, segment) => setItem(`${namespace}/search.${segment}.lastSearch`, search);
   const storeLastBrowse = (search) => setItem(`${namespace}/browse.lastSearch`, search);
-  const storeLastSearchOffset = (resultOffset) => setItem(`${namespace}/search.lastOffset`, resultOffset);
+  const storeLastSearchOffset = (resultOffset, segment) => setItem(`${namespace}/search.${segment}.lastOffset`, resultOffset);
   const storeLastBrowseOffset = (pageConfig) => setItem(`${namespace}/browse.lastOffset`, pageConfig);
+  const storeLastSegment = (segment) => setItem(`${namespace}/search.lastSegment`, segment);
 
   const lastSearchTerms = useMemo(() => ({
     getLastSearch,
     getLastBrowse,
     getLastSearchOffset,
     getLastBrowseOffset,
+    getLastSegment,
     storeLastSearch,
     storeLastBrowse,
     storeLastSearchOffset,
     storeLastBrowseOffset,
+    storeLastSegment,
   }), []);
 
   return (
diff --git a/src/providers/LastSearchTermsProvider.test.js b/src/providers/LastSearchTermsProvider.test.js
index a370ea2b7..b752a3c55 100644
--- a/src/providers/LastSearchTermsProvider.test.js
+++ b/src/providers/LastSearchTermsProvider.test.js
@@ -31,35 +31,41 @@ describe('LastSearchTermsProvider', () => {
         {({
           getLastSearch,
           getLastBrowse,
+          getLastSegment,
           getLastSearchOffset,
           getLastBrowseOffset,
           storeLastSearch,
           storeLastBrowse,
+          storeLastSegment,
           storeLastSearchOffset,
           storeLastBrowseOffset,
         }) => (
           <div>
             <div data-testid="initialSearch">{getLastSearch()}</div>
             <div data-testid="initialBrowse">{getLastBrowse()}</div>
-            <div data-testid="initialSearchOffset">{getLastSearchOffset()}</div>
+            <div data-testid="initialSegment">{getLastSegment()}</div>
+            <div data-testid="initialSearchOffset">{getLastSearchOffset('instances')}</div>
             <div data-testid="initialBrowseOffset">{JSON.stringify(getLastBrowseOffset())}</div>
-            {storeLastSearch('fakeSearch')}
+            {storeLastSearch('fakeSearch', 'instances')}
             {storeLastBrowse('fakeBrowse')}
-            {storeLastSearchOffset('fakeSearchOffset')}
+            {storeLastSearchOffset('fakeSearchOffset', 'instances')}
             {storeLastBrowseOffset('fakeBrowseOffset')}
+            {storeLastSegment('instances')}
           </div>
         )}
       </LastSearchTermsContext.Consumer>
     );
 
-    expect(getItem).toHaveBeenNthCalledWith(1, '@folio/inventory/search.lastSearch');
-    expect(getItem).toHaveBeenNthCalledWith(2, '@folio/inventory/browse.lastSearch');
-    expect(getItem).toHaveBeenNthCalledWith(3, '@folio/inventory/search.lastOffset');
-    expect(getItem).toHaveBeenNthCalledWith(4, '@folio/inventory/browse.lastOffset');
+    expect(getItem).toHaveBeenNthCalledWith(1, '@folio/inventory/search.lastSegment');
+    expect(getItem).toHaveBeenNthCalledWith(2, '@folio/inventory/search.instances.lastSearch');
+    expect(getItem).toHaveBeenNthCalledWith(3, '@folio/inventory/browse.lastSearch');
+    expect(getItem).toHaveBeenNthCalledWith(4, '@folio/inventory/search.lastSegment');
+    expect(getItem).toHaveBeenNthCalledWith(5, '@folio/inventory/search.instances.lastOffset');
+    expect(getItem).toHaveBeenNthCalledWith(6, '@folio/inventory/browse.lastOffset');
 
-    expect(setItem).toHaveBeenNthCalledWith(1, '@folio/inventory/search.lastSearch', 'fakeSearch');
+    expect(setItem).toHaveBeenNthCalledWith(1, '@folio/inventory/search.instances.lastSearch', 'fakeSearch');
     expect(setItem).toHaveBeenNthCalledWith(2, '@folio/inventory/browse.lastSearch', 'fakeBrowse');
-    expect(setItem).toHaveBeenNthCalledWith(3, '@folio/inventory/search.lastOffset', 'fakeSearchOffset');
+    expect(setItem).toHaveBeenNthCalledWith(3, '@folio/inventory/search.instances.lastOffset', 'fakeSearchOffset');
     expect(setItem).toHaveBeenNthCalledWith(4, '@folio/inventory/browse.lastOffset', 'fakeBrowseOffset');
 
     expect(getByTestId('initialSearch')).toHaveTextContent('');
@@ -73,10 +79,14 @@ describe('LastSearchTermsProvider', () => {
       useLogout.mockImplementation(cb => cb());
       customRender();
 
-      expect(setItem).toHaveBeenNthCalledWith(1, '@folio/inventory/search.lastSearch', null);
-      expect(setItem).toHaveBeenNthCalledWith(2, '@folio/inventory/browse.lastSearch', null);
-      expect(setItem).toHaveBeenNthCalledWith(3, '@folio/inventory/search.lastOffset', null);
-      expect(setItem).toHaveBeenNthCalledWith(4, '@folio/inventory/browse.lastOffset', null);
+      expect(setItem).toHaveBeenNthCalledWith(1, '@folio/inventory/search.instances.lastSearch', null);
+      expect(setItem).toHaveBeenNthCalledWith(2, '@folio/inventory/search.holdings.lastSearch', null);
+      expect(setItem).toHaveBeenNthCalledWith(3, '@folio/inventory/search.items.lastSearch', null);
+      expect(setItem).toHaveBeenNthCalledWith(4, '@folio/inventory/browse.lastSearch', null);
+      expect(setItem).toHaveBeenNthCalledWith(5, '@folio/inventory/search.instances.lastOffset', null);
+      expect(setItem).toHaveBeenNthCalledWith(6, '@folio/inventory/search.holdings.lastOffset', null);
+      expect(setItem).toHaveBeenNthCalledWith(7, '@folio/inventory/search.items.lastOffset', null);
+      expect(setItem).toHaveBeenNthCalledWith(8, '@folio/inventory/browse.lastOffset', null);
 
       useLogout.mockRestore();
     });
diff --git a/src/routes/InstancesRoute.js b/src/routes/InstancesRoute.js
index 0095ae6a4..32eebf33c 100644
--- a/src/routes/InstancesRoute.js
+++ b/src/routes/InstancesRoute.js
@@ -25,6 +25,7 @@ class InstancesRoute extends React.Component {
     getLastSearchOffset: PropTypes.func.isRequired,
     storeLastSearch: PropTypes.func.isRequired,
     storeLastSearchOffset: PropTypes.func.isRequired,
+    storeLastSegment: PropTypes.func.isRequired,
   };
 
   static defaultProps = {
@@ -47,6 +48,7 @@ class InstancesRoute extends React.Component {
       getLastSearchOffset,
       storeLastSearch,
       storeLastSearchOffset,
+      storeLastSegment,
     } = this.props;
     const { segment } = getParams(this.props);
     const { indexes, renderer } = getFilterConfig(segment);
@@ -76,6 +78,7 @@ class InstancesRoute extends React.Component {
             getLastSearchOffset={getLastSearchOffset}
             storeLastSearch={storeLastSearch}
             storeLastSearchOffset={storeLastSearchOffset}
+            storeLastSegment={storeLastSegment}
           />
         )}
       </DataContext.Consumer>

From 416fb603ba11382e41b75e6616e7aaa7d02a158c Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Tue, 27 Jun 2023 15:12:38 +0300
Subject: [PATCH 52/68] UIIN-2466: Statistical Code dropdown "contains" type
 ahead functionality needed (Instance/Holdings/Items) (#2186)

---
 CHANGELOG.md                      | 1 +
 src/edit/statisticalCodeFields.js | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eccbf0145..84ca5092f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@
 * Adjust the sentence case for some Inventory action options. Refs UIIN-2436.
 * Adjust the Instance Edit screen header. Refs UIIN-2437.
 * Inventory: Retain Search/Browse query/options/filter and facet selections UNLESS user resets/clear selections. Refs UIIN-2433.
+* Statistical Code dropdown "contains" type ahead functionality needed (Instance/Holdings/Items). Refs UIIN-2466.
 
 ## [9.4.6](https://github.com/folio-org/ui-inventory/tree/v9.4.6) (2023-06-19)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.5...v9.4.6)
diff --git a/src/edit/statisticalCodeFields.js b/src/edit/statisticalCodeFields.js
index 0c5184230..e9f0d060a 100644
--- a/src/edit/statisticalCodeFields.js
+++ b/src/edit/statisticalCodeFields.js
@@ -6,11 +6,12 @@ import {
   useIntl,
 } from 'react-intl';
 import PropTypes from 'prop-types';
+import { escapeRegExp } from 'lodash';
 
 import {
   RepeatableField,
   Label,
-  Select,
+  Selection,
 } from '@folio/stripes/components';
 
 const StatisticalCodeFields = ({
@@ -29,15 +30,18 @@ const StatisticalCodeFields = ({
     </Label>
   );
 
+  const onFilter = (value, data) => data.filter(o => new RegExp(escapeRegExp(value), 'i').test(o.label));
+
   const renderField = field => (
     <Field
       aria-label={statisticalCodeLabel}
       name={field}
-      component={Select}
+      component={Selection}
       placeholder={formatMessage({ id: 'ui-inventory.selectCode' })}
       validate={value => (!value ? formatMessage({ id: 'ui-inventory.selectToContinue' }) : undefined)}
       dataOptions={statisticalCodeOptions}
       disabled={!canEdit}
+      onFilter={onFilter}
     />
   );
 

From 6b5f3e0ac8633c24bc0bab1f626308dae0a11677 Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Tue, 27 Jun 2023 15:57:03 +0300
Subject: [PATCH 53/68] Release v9.2.9 (#2188)

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84ca5092f..c12605a68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -163,6 +163,12 @@
 * Rename `hrid` qindex for item to avoid collisions with holdings and instances. Fixes UIIN-2443.
 * Reset `<BoundWithModal>` when modal is closed. Fixes UIIN-2401.
 
+## [9.2.9](https://github.com/folio-org/ui-inventory/tree/v9.2.9) (2023-06-27)
+[Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.2.8...v9.2.9)
+
+* Use correct reference to item resource. Fixes UIIN-2418.
+* When duplicating an item, the circulation history is duplicated when it should not be. Fixes UIIN-2470.
+
 ## [9.2.0](https://github.com/folio-org/ui-inventory/tree/v9.2.0) (2022-10-27)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.1.0...v9.2.0)
 

From b309e29593ed40e3cb3e1edb652fff9c26908121 Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Tue, 27 Jun 2023 18:05:55 +0300
Subject: [PATCH 54/68] Release v9.4.7 (#2189)

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c12605a68..f0a6fa728 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,11 @@
 * Inventory: Retain Search/Browse query/options/filter and facet selections UNLESS user resets/clear selections. Refs UIIN-2433.
 * Statistical Code dropdown "contains" type ahead functionality needed (Instance/Holdings/Items). Refs UIIN-2466.
 
+## [9.4.7](https://github.com/folio-org/ui-inventory/tree/v9.4.7) (2023-06-27)
+[Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.6...v9.4.7)
+
+* When duplicating an item, the circulation history is duplicated when it should not be. Fixes UIIN-2469.
+
 ## [9.4.6](https://github.com/folio-org/ui-inventory/tree/v9.4.6) (2023-06-19)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.5...v9.4.6)
 

From eeb34b6abbb6009fe0334f0b39e18c63a6da2a03 Mon Sep 17 00:00:00 2001
From: FOLIO Translations Bot
 <38661258+folio-translations@users.noreply.github.com>
Date: Thu, 29 Jun 2023 16:30:24 -0400
Subject: [PATCH 55/68] Lokalise: updates

---
 translations/ui-inventory/ar.json     |  3 ++-
 translations/ui-inventory/ber.json    |  9 +++++----
 translations/ui-inventory/ca.json     |  9 +++++----
 translations/ui-inventory/cs_CZ.json  |  3 ++-
 translations/ui-inventory/da.json     |  9 +++++----
 translations/ui-inventory/de.json     | 19 ++++++++++---------
 translations/ui-inventory/en_GB.json  |  9 +++++----
 translations/ui-inventory/en_SE.json  |  9 +++++----
 translations/ui-inventory/en_US.json  |  9 +++++----
 translations/ui-inventory/es.json     |  5 +++--
 translations/ui-inventory/es_419.json |  3 ++-
 translations/ui-inventory/es_ES.json  |  3 ++-
 translations/ui-inventory/fr.json     |  9 +++++----
 translations/ui-inventory/fr_FR.json  |  5 +++--
 translations/ui-inventory/he.json     |  9 +++++----
 translations/ui-inventory/hi_IN.json  |  9 +++++----
 translations/ui-inventory/hu.json     |  9 +++++----
 translations/ui-inventory/it_IT.json  |  5 +++--
 translations/ui-inventory/ja.json     |  7 ++++---
 translations/ui-inventory/ko.json     |  9 +++++----
 translations/ui-inventory/nb.json     |  9 +++++----
 translations/ui-inventory/nn.json     |  9 +++++----
 translations/ui-inventory/pl.json     |  5 +++--
 translations/ui-inventory/pt_BR.json  |  3 ++-
 translations/ui-inventory/pt_PT.json  |  7 ++++---
 translations/ui-inventory/ru.json     |  9 +++++----
 translations/ui-inventory/sv.json     |  9 +++++----
 translations/ui-inventory/ur.json     |  9 +++++----
 translations/ui-inventory/zh_CN.json  | 13 +++++++------
 translations/ui-inventory/zh_TW.json  |  5 +++--
 30 files changed, 130 insertions(+), 100 deletions(-)

diff --git a/translations/ui-inventory/ar.json b/translations/ui-inventory/ar.json
index 46568a3bc..8fdfa3c3c 100644
--- a/translations/ui-inventory/ar.json
+++ b/translations/ui-inventory/ar.json
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ber.json b/translations/ui-inventory/ber.json
index 693536147..ef997d1ff 100644
--- a/translations/ui-inventory/ber.json
+++ b/translations/ui-inventory/ber.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ca.json b/translations/ui-inventory/ca.json
index 1981aebe0..0f3d70b39 100644
--- a/translations/ui-inventory/ca.json
+++ b/translations/ui-inventory/ca.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/cs_CZ.json b/translations/ui-inventory/cs_CZ.json
index 43bce6267..f768218c8 100644
--- a/translations/ui-inventory/cs_CZ.json
+++ b/translations/ui-inventory/cs_CZ.json
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevantnost",
     "actions.menuSection.sortBy.title": "Název",
     "actions.menuSection.sortBy.contributors": "Autoři",
-    "exportInstanceInMARC": "Export titulu (MARC)"
+    "exportInstanceInMARC": "Export titulu (MARC)",
+    "editInstance.title": "Upravit titul • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/da.json b/translations/ui-inventory/da.json
index f0f7f5d9b..9004f1e13 100644
--- a/translations/ui-inventory/da.json
+++ b/translations/ui-inventory/da.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Tilføj modtagelseshistorik",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/de.json b/translations/ui-inventory/de.json
index 617ef6254..67358947e 100644
--- a/translations/ui-inventory/de.json
+++ b/translations/ui-inventory/de.json
@@ -190,7 +190,7 @@
     "resourceTypeCode": "Ressourcentypcode ",
     "resourceTypeSource": "Ressourcentypquelle",
     "locations": "Standorte",
-    "holdingsDetails": "Details zum Bestand",
+    "holdingsDetails": "Bestandsdetails",
     "acquisitions": "Erwerbungen",
     "receivingHistory": "Inventarisierungsverlauf",
     "shelvingOrder": "Regalordnung",
@@ -724,9 +724,9 @@
     "search.oclc": "OCLC-Nummer, normalisiert",
     "newOrder.modal.create": "Erstellen",
     "newOrder.modal.label": "Bestellung erstellen",
-    "newOrder.modal.message": "Die Auswahl einer bestehenden Bestellung vor klick auf \"Erstellen\" fügt einen neuen Bestellposten für diesen Titel zur ausgewählten Bestellung hinzu. Das leer lassen der Bestellnummer und ein klick auf \"Erstellen\" ermöglicht das erstellen einer neuen Bestellung und eines neuen Bestellpostens für diesen Titel.",
-    "newOrder.modal.PONumber": "Bestellpostennummer",
-    "newOrder.modal.PONumber.doesNotExist": "Bestellpostennummer existiert nicht",
+    "newOrder.modal.message": "Die Auswahl einer bestehenden Bestellung vor klick auf \"Erstellen\" fügt einen neuen Bestellposten für diesen Titel zur ausgewählten Bestellung hinzu. Das leer lassen der Bestellnummer und ein klick auf \"Erstellen\" ermöglicht das Erstellen einer neuen Bestellung und eines neuen Bestellpostens für diesen Titel.",
+    "newOrder.modal.PONumber": "Bestellnummer",
+    "newOrder.modal.PONumber.doesNotExist": "Bestellnummer existiert nicht",
     "instances.columns.contributor": "Mitwirkende/-r",
     "instances.columns.contributorType": "Typ",
     "instances.columns.relatorTerm": "Beziehungskennzeichnung",
@@ -780,9 +780,10 @@
     "boundWithTitles.add": "Konvoluttitel hinzufügen",
     "boundWithTitles.enterHoldingsHrid": "Bestands-HRID eingeben",
     "selectCode": "Code auswählen",
-    "actions.menuSection.sortBy": "Sort by",
-    "actions.menuSection.sortBy.relevance": "Relevance",
-    "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "actions.menuSection.sortBy": "Sortieren nach",
+    "actions.menuSection.sortBy.relevance": "Relevanz",
+    "actions.menuSection.sortBy.title": "Titel",
+    "actions.menuSection.sortBy.contributors": "Mitwirkende",
+    "exportInstanceInMARC": "Instanz exportieren (MARC)",
+    "editInstance.title": "Instanz bearbeiten • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_GB.json b/translations/ui-inventory/en_GB.json
index 693536147..ef997d1ff 100644
--- a/translations/ui-inventory/en_GB.json
+++ b/translations/ui-inventory/en_GB.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_SE.json b/translations/ui-inventory/en_SE.json
index 693536147..ef997d1ff 100644
--- a/translations/ui-inventory/en_SE.json
+++ b/translations/ui-inventory/en_SE.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_US.json b/translations/ui-inventory/en_US.json
index 693536147..ef997d1ff 100644
--- a/translations/ui-inventory/en_US.json
+++ b/translations/ui-inventory/en_US.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es.json b/translations/ui-inventory/es.json
index 184e54fab..8920ca58b 100644
--- a/translations/ui-inventory/es.json
+++ b/translations/ui-inventory/es.json
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_419.json b/translations/ui-inventory/es_419.json
index 4861282a7..57c53eae9 100644
--- a/translations/ui-inventory/es_419.json
+++ b/translations/ui-inventory/es_419.json
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevancia",
     "actions.menuSection.sortBy.title": "Título",
     "actions.menuSection.sortBy.contributors": "Colaboradores",
-    "exportInstanceInMARC": "Instancia de exportación (MARC)"
+    "exportInstanceInMARC": "Instancia de exportación (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_ES.json b/translations/ui-inventory/es_ES.json
index 4d93c39f8..c5cd91173 100644
--- a/translations/ui-inventory/es_ES.json
+++ b/translations/ui-inventory/es_ES.json
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr.json b/translations/ui-inventory/fr.json
index f22ae60cb..e84addd93 100644
--- a/translations/ui-inventory/fr.json
+++ b/translations/ui-inventory/fr.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr_FR.json b/translations/ui-inventory/fr_FR.json
index b9da8386f..bd008a6c3 100644
--- a/translations/ui-inventory/fr_FR.json
+++ b/translations/ui-inventory/fr_FR.json
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Collections • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Dernière mise à jour : {updatedDate}",
     "instance.saveError": "La sauvegarde de l'instance a échoué",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Statut de la commande",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/he.json b/translations/ui-inventory/he.json
index 2fbefd325..86530317f 100644
--- a/translations/ui-inventory/he.json
+++ b/translations/ui-inventory/he.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hi_IN.json b/translations/ui-inventory/hi_IN.json
index 693536147..ef997d1ff 100644
--- a/translations/ui-inventory/hi_IN.json
+++ b/translations/ui-inventory/hi_IN.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hu.json b/translations/ui-inventory/hu.json
index fdf0f161f..982a83554 100644
--- a/translations/ui-inventory/hu.json
+++ b/translations/ui-inventory/hu.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/it_IT.json b/translations/ui-inventory/it_IT.json
index a9f9519e2..da786ddec 100644
--- a/translations/ui-inventory/it_IT.json
+++ b/translations/ui-inventory/it_IT.json
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Stato dell'ordine",
     "acq.orderStatus.Closed": "Chiuso",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ja.json b/translations/ui-inventory/ja.json
index f9775e1b0..84d421d9c 100644
--- a/translations/ui-inventory/ja.json
+++ b/translations/ui-inventory/ja.json
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "バーコード<strong> {barcode} </strong>のアイテムHRID <strong> {hrid} </strong>にリクエストがいっぱいになったか、リクエストがキャンセルされたリクエストが関連付けられています。",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "プライマリにする",
     "holdingsNoteTypes": "所蔵ノートタイプ",
     "itemNoteTypes": "アイテムノートタイプ",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "発注明細番号",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ko.json b/translations/ui-inventory/ko.json
index 9304b0e62..f8f5411b5 100644
--- a/translations/ui-inventory/ko.json
+++ b/translations/ui-inventory/ko.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "ILL 정책 선택",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nb.json b/translations/ui-inventory/nb.json
index 693536147..ef997d1ff 100644
--- a/translations/ui-inventory/nb.json
+++ b/translations/ui-inventory/nb.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nn.json b/translations/ui-inventory/nn.json
index 693536147..ef997d1ff 100644
--- a/translations/ui-inventory/nn.json
+++ b/translations/ui-inventory/nn.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pl.json b/translations/ui-inventory/pl.json
index 7faee11c1..58f05a928 100644
--- a/translations/ui-inventory/pl.json
+++ b/translations/ui-inventory/pl.json
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_BR.json b/translations/ui-inventory/pt_BR.json
index 363143be9..aa231ac29 100644
--- a/translations/ui-inventory/pt_BR.json
+++ b/translations/ui-inventory/pt_BR.json
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevância",
     "actions.menuSection.sortBy.title": "Título",
     "actions.menuSection.sortBy.contributors": "Colaboradores",
-    "exportInstanceInMARC": "Exportar instâncias (MARC)"
+    "exportInstanceInMARC": "Exportar instâncias (MARC)",
+    "editInstance.title": "Editar instância • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_PT.json b/translations/ui-inventory/pt_PT.json
index a984085b2..7009ca50e 100644
--- a/translations/ui-inventory/pt_PT.json
+++ b/translations/ui-inventory/pt_PT.json
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ru.json b/translations/ui-inventory/ru.json
index 45f6bac17..b24d4d000 100644
--- a/translations/ui-inventory/ru.json
+++ b/translations/ui-inventory/ru.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Добавить историю получения",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Язык",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/sv.json b/translations/ui-inventory/sv.json
index 693536147..ef997d1ff 100644
--- a/translations/ui-inventory/sv.json
+++ b/translations/ui-inventory/sv.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ur.json b/translations/ui-inventory/ur.json
index b0f8d282d..f6742ab76 100644
--- a/translations/ui-inventory/ur.json
+++ b/translations/ui-inventory/ur.json
@@ -301,7 +301,7 @@
     "publicDisplay": "Public display",
     "addReceivingHistory": "Add receiving history",
     "selectIllPolicy": "Select ILL policy",
-    "newRequest": "New Request",
+    "newRequest": "New request",
     "instances.resourceType": "Resource Type",
     "instances.language": "Language",
     "holdingsRecord.awaitingResources": "Awaiting resources",
@@ -337,7 +337,7 @@
     "noItemDeleteModal.requestMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> has a request associated and cannot be deleted until the request has been fulfilled, or the request has been cancelled. If you want to continue with the deletion of the item record, go to the Request app and clear the dependency.",
     "noItemDeleteModal.orderMessage": "Item HRID <strong>{hrid}</strong> with barcode <strong>{barcode}</strong> is on order and cannot be <strong>deleted</strong> until all dependencies with the Order app have been cleared. If you want to continue with the deletion of the item record, go to the Order app and clear the dependencies.",
     "holdingRecord": "Holding record {location} {callNumber}",
-    "instanceRecordTitle": "Instance • {title} •  {publisherAndDate}",
+    "instanceRecordTitle": "Instance • {title} {publisherAndDate}",
     "makePrimary": "Make primary",
     "holdingsNoteTypes": "Holdings note types",
     "itemNoteTypes": "Item note types",
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_CN.json b/translations/ui-inventory/zh_CN.json
index 9445728ff..52f79a2e2 100644
--- a/translations/ui-inventory/zh_CN.json
+++ b/translations/ui-inventory/zh_CN.json
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "馆藏 • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • 上次更新：{updatedDate}",
     "instance.saveError": "保存实例失败",
-    "itemRecordWithDescriptionBW": "单件记录（ {materialType} ， {status} ，绑定）",
+    "itemRecordWithDescriptionBW": "单件记录（ {materialType} ， {status} ，合订）",
     "acq.polNumber": "订单行号",
     "acq.orderStatus": "订单状态",
     "acq.orderStatus.Closed": "已关闭",
@@ -780,9 +780,10 @@
     "boundWithTitles.add": "添加合订与分析",
     "boundWithTitles.enterHoldingsHrid": "输入馆藏HRID",
     "selectCode": "选择代码",
-    "actions.menuSection.sortBy": "Sort by",
-    "actions.menuSection.sortBy.relevance": "Relevance",
-    "actions.menuSection.sortBy.title": "Title",
-    "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "actions.menuSection.sortBy": "排序方式",
+    "actions.menuSection.sortBy.relevance": "相关性",
+    "actions.menuSection.sortBy.title": "题名",
+    "actions.menuSection.sortBy.contributors": "贡献者",
+    "exportInstanceInMARC": "导出实例（MARC）",
+    "editInstance.title": "编辑实例 • {title}"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_TW.json b/translations/ui-inventory/zh_TW.json
index c521aeba2..15028040b 100644
--- a/translations/ui-inventory/zh_TW.json
+++ b/translations/ui-inventory/zh_TW.json
@@ -654,7 +654,7 @@
     "holdingsPaneTitle": "Holdings • {location} • {callNumber}",
     "instanceRecordSubtitle": "{hrid} • Last updated: {updatedDate}",
     "instance.saveError": "Saving instance failed",
-    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, Bound with)",
+    "itemRecordWithDescriptionBW": "Item record ({materialType}, {status}, bound with)",
     "acq.polNumber": "POL number",
     "acq.orderStatus": "Order status",
     "acq.orderStatus.Closed": "Closed",
@@ -784,5 +784,6 @@
     "actions.menuSection.sortBy.relevance": "Relevance",
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
-    "exportInstanceInMARC": "Export instance (MARC)"
+    "exportInstanceInMARC": "Export instance (MARC)",
+    "editInstance.title": "Edit instance • {title}"
 }
\ No newline at end of file

From fc7bf7002ac25eb550df685569b1f6a7693f28fb Mon Sep 17 00:00:00 2001
From: Maccabee Levine <31278545+maccabeelevine@users.noreply.github.com>
Date: Fri, 30 Jun 2023 11:53:13 -0400
Subject: [PATCH 56/68] UIIN-2478: Fix useBoundWithHoldings for 100+ items
 (#2193)

---
 CHANGELOG.md                                  |  1 +
 .../HoldingBoundWith/useBoundWithHoldings.js  | 26 +++---
 src/hooks/useChunkedCQLFetch.js               | 84 +++++++++++++++++++
 3 files changed, 97 insertions(+), 14 deletions(-)
 create mode 100644 src/hooks/useChunkedCQLFetch.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0a6fa728..946e9fe25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 * Adjust the Instance Edit screen header. Refs UIIN-2437.
 * Inventory: Retain Search/Browse query/options/filter and facet selections UNLESS user resets/clear selections. Refs UIIN-2433.
 * Statistical Code dropdown "contains" type ahead functionality needed (Instance/Holdings/Items). Refs UIIN-2466.
+* Fix problem with a large number of items on a single holdings record. Refs UIIN-2478.
 
 ## [9.4.7](https://github.com/folio-org/ui-inventory/tree/v9.4.7) (2023-06-27)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.6...v9.4.7)
diff --git a/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.js b/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.js
index 820dbae45..9a9080605 100644
--- a/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.js
+++ b/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.js
@@ -1,23 +1,21 @@
-import { useQuery } from 'react-query';
-
-import { useOkapiKy, useNamespace } from '@folio/stripes/core';
+import useChunkedCQLFetch from '../../../hooks/useChunkedCQLFetch';
 
 const useBoundWithHoldings = (boundWithItems) => {
-  const ky = useOkapiKy();
-  const [namespace] = useNamespace({ key: 'boundWithHoldings' });
-
-  const holdingRecordIds = boundWithItems?.map(x => x.holdingsRecordId);
-  const queryIds = holdingRecordIds.join(' or ');
+  const holdingsRecordIds = boundWithItems?.map(x => x.holdingsRecordId);
 
-  const { data, isLoading } = useQuery(
-    [namespace, queryIds],
-    () => ky.get(`holdings-storage/holdings?query=id=(${queryIds})`).json(),
-    { enabled: Boolean(queryIds) }
-  );
+  const { items: holdingsRecords, isLoading } = useChunkedCQLFetch({
+    ids: holdingsRecordIds,
+    endpoint: 'holdings-storage/holdings',
+    reduceFunction: (holdingQueries) => (
+      holdingQueries.reduce((acc, curr) => {
+        return [...acc, ...(curr?.data?.holdingsRecords ?? [])];
+      }, [])
+    )
+  });
 
   return {
     isLoading,
-    boundWithHoldings: data?.holdingsRecords || [],
+    boundWithHoldings: holdingsRecords,
   };
 };
 
diff --git a/src/hooks/useChunkedCQLFetch.js b/src/hooks/useChunkedCQLFetch.js
new file mode 100644
index 000000000..6b86a457a
--- /dev/null
+++ b/src/hooks/useChunkedCQLFetch.js
@@ -0,0 +1,84 @@
+import { useCallback, useEffect, useState } from 'react';
+import { useQueries } from 'react-query';
+
+import { chunk } from 'lodash';
+
+import { useOkapiKy } from '@folio/stripes/core';
+
+// When fetching from a potentially large list of items,
+// make sure to chunk the request to avoid hitting limits.
+const useChunkedCQLFetch = ({
+  endpoint, // endpoint to hit to fetch items
+  ids, // List of ids to fetch
+  reduceFunction // Function to reduce fetched objects at the end into single array
+}) => {
+  const ky = useOkapiKy();
+
+  const CONCURRENT_REQUESTS = 5; // Number of requests to make concurrently
+  const STEP_SIZE = 60; // Number of ids to request for per concurrent request
+
+  const chunkedItems = chunk(ids, STEP_SIZE);
+  // chunkedItems will be an array of arrays of size CONCURRENT_REQUESTS * STEP_SIZE
+  // We need to parallelise CONCURRENT_REQUESTS at a time,
+  // and ensure we only fire the next lot once the previous lot are through
+
+  const [isLoading, setIsLoading] = useState(ids?.length > 0);
+
+  // Set up query array, and only enable the first CONCURRENT_REQUESTS requests
+  const getQueryArray = useCallback(() => {
+    const queryArray = [];
+    chunkedItems.forEach((chunkedItem, chunkedItemIndex) => {
+      const query = chunkedItem.map(item => `id==${item}`).join(' or ');
+      queryArray.push({
+        queryKey: ['ERM', endpoint, chunkedItem],
+        queryFn: () => ky.get(`${endpoint}?limit=1000&query=${query}`).json(),
+        // Only enable once the previous slice has all been fetched
+        enabled: chunkedItemIndex < CONCURRENT_REQUESTS
+      });
+    });
+
+    return queryArray;
+  }, [chunkedItems, endpoint, ky]);
+
+  const itemQueries = useQueries(getQueryArray());
+
+  // Once chunk has finished fetching, fetch next chunk
+  useEffect(() => {
+    const chunkedQuery = chunk(itemQueries, CONCURRENT_REQUESTS);
+    chunkedQuery.forEach((q, i) => {
+      // Check that all previous chunk are fetched,
+      // and that all of our current chunk are not fetched and not loading
+      if (
+        i !== 0 &&
+        chunkedQuery[i - 1]?.every(pq => pq.isFetched === true) &&
+        q.every(req => req.isFetched === false) &&
+        q.every(req => req.isLoading === false)
+      ) {
+        // Trigger fetch for each request in the chunk
+        q.forEach(req => {
+          req.refetch();
+        });
+      }
+    });
+  }, [itemQueries]);
+
+  // Keep easy track of whether this hook is all loaded or not
+  // (This slightly flattens the "isLoading/isFetched" distinction, but it's an ease of use prop)
+  useEffect(() => {
+    const newLoading = ids?.length > 0 && (!itemQueries?.length || itemQueries?.some(uq => !uq.isFetched));
+
+    if (isLoading !== newLoading) {
+      setIsLoading(newLoading);
+    }
+  }, [isLoading, itemQueries, ids?.length]);
+
+
+  return {
+    itemQueries,
+    isLoading,
+    // Offer all fetched orderLines in flattened array once ready
+    items: isLoading ? [] : reduceFunction(itemQueries)
+  };
+};
+
+export default useChunkedCQLFetch;
\ No newline at end of file

From a05b29e062d95e56fbfdf850d1563cbcce37c3d1 Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Fri, 30 Jun 2023 21:50:40 +0300
Subject: [PATCH 57/68] Release v9.4.8 (#2194)

---
 CHANGELOG.md                    | 5 +++++
 src/hooks/useChunkedCQLFetch.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 946e9fe25..c4a14958f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,11 @@
 * Statistical Code dropdown "contains" type ahead functionality needed (Instance/Holdings/Items). Refs UIIN-2466.
 * Fix problem with a large number of items on a single holdings record. Refs UIIN-2478.
 
+## [9.4.8](https://github.com/folio-org/ui-inventory/tree/v9.4.8) (2023-06-30)
+[Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.7...v9.4.8)
+
+* Fix useBoundWithHoldings for 100+ items. Fixes UIIN-2478.
+
 ## [9.4.7](https://github.com/folio-org/ui-inventory/tree/v9.4.7) (2023-06-27)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.6...v9.4.7)
 
diff --git a/src/hooks/useChunkedCQLFetch.js b/src/hooks/useChunkedCQLFetch.js
index 6b86a457a..34ede67ce 100644
--- a/src/hooks/useChunkedCQLFetch.js
+++ b/src/hooks/useChunkedCQLFetch.js
@@ -81,4 +81,4 @@ const useChunkedCQLFetch = ({
   };
 };
 
-export default useChunkedCQLFetch;
\ No newline at end of file
+export default useChunkedCQLFetch;

From a4546abd17795e7c9a518e3c125c6bd83a3df819 Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Mon, 3 Jul 2023 14:26:20 +0300
Subject: [PATCH 58/68] UIIN-1392: When removing the dead icons in the Item
 record, then the displayed text looks inconsistent (#2190)

---
 .../ItemViewSubheader/ItemViewSubheader.js    | 106 ++++++++++++++++++
 .../ItemViewSubheader.test.js                 |  50 +++++++++
 .../ItemViewSubheader/LinkedHoldingDetails.js |  38 +++++++
 .../LinkedHoldingDetails.test.js              |  57 ++++++++++
 .../LinkedInstanceDetails.js                  |  56 +++++++++
 .../LinkedInstanceDetails.test.js             |  63 +++++++++++
 src/components/ItemViewSubheader/index.js     |   1 +
 src/components/index.js                       |   1 +
 src/views/ItemView.js                         |  82 ++------------
 translations/ui-inventory/en.json             |  21 ++++
 10 files changed, 400 insertions(+), 75 deletions(-)
 create mode 100644 src/components/ItemViewSubheader/ItemViewSubheader.js
 create mode 100644 src/components/ItemViewSubheader/ItemViewSubheader.test.js
 create mode 100644 src/components/ItemViewSubheader/LinkedHoldingDetails.js
 create mode 100644 src/components/ItemViewSubheader/LinkedHoldingDetails.test.js
 create mode 100644 src/components/ItemViewSubheader/LinkedInstanceDetails.js
 create mode 100644 src/components/ItemViewSubheader/LinkedInstanceDetails.test.js
 create mode 100644 src/components/ItemViewSubheader/index.js

diff --git a/src/components/ItemViewSubheader/ItemViewSubheader.js b/src/components/ItemViewSubheader/ItemViewSubheader.js
new file mode 100644
index 000000000..89f076f5f
--- /dev/null
+++ b/src/components/ItemViewSubheader/ItemViewSubheader.js
@@ -0,0 +1,106 @@
+import React from 'react';
+import {
+  FormattedMessage,
+  useIntl,
+} from 'react-intl';
+import PropTypes from 'prop-types';
+
+import {
+  Col,
+  Row,
+} from '@folio/stripes/components';
+import { AppIcon } from '@folio/stripes/core';
+
+import LinkedInstanceDetails from './LinkedInstanceDetails';
+import LinkedHoldingDetails from './LinkedHoldingDetails';
+
+import { itemStatusesMap } from '../../constants';
+
+const ITEM_STATUS_TRANSLATIONS_ID_MAP = {
+  [itemStatusesMap.AGED_TO_LOST]: 'ui-inventory.item.status.agedToLost.lowercase',
+  [itemStatusesMap.AVAILABLE]: 'ui-inventory.item.status.available.lowercase',
+  [itemStatusesMap.AWAITING_PICKUP]: 'ui-inventory.item.status.awaitingPickup.lowercase',
+  [itemStatusesMap.AWAITING_DELIVERY]: 'ui-inventory.item.status.awaitingDelivery.lowercase',
+  [itemStatusesMap.CHECKED_OUT]: 'ui-inventory.item.status.checkedOut.lowercase',
+  [itemStatusesMap.CLAIMED_RETURNED]: 'ui-inventory.item.status.claimedReturned.lowercase',
+  [itemStatusesMap.DECLARED_LOST]: 'ui-inventory.item.status.declaredLost.lowercase',
+  [itemStatusesMap.IN_PROCESS]: 'ui-inventory.item.status.inProcess.lowercase',
+  [itemStatusesMap.IN_PROCESS_NON_REQUESTABLE]: 'ui-inventory.item.status.inProcessNonRequestable.lowercase',
+  [itemStatusesMap.IN_TRANSIT]: 'ui-inventory.item.status.inTransit.lowercase',
+  [itemStatusesMap.INTELLECTUAL_ITEM]: 'ui-inventory.item.status.intellectualItem.lowercase',
+  [itemStatusesMap.LONG_MISSING]: 'ui-inventory.item.status.longMissing.lowercase',
+  [itemStatusesMap.LOST_AND_PAID]: 'ui-inventory.item.status.lostAndPaid.lowercase',
+  [itemStatusesMap.MISSING]: 'ui-inventory.item.status.missing.lowercase',
+  [itemStatusesMap.ON_ORDER]: 'ui-inventory.item.status.onOrder.lowercase',
+  [itemStatusesMap.ORDER_CLOSED]: 'ui-inventory.item.status.paged.lowercase',
+  [itemStatusesMap.PAGED]: 'ui-inventory.item.status.restricted.lowercase',
+  [itemStatusesMap.RESTRICTED]: 'ui-inventory.item.status.orderClosed.lowercase',
+  [itemStatusesMap.UNAVAILABLE]: 'ui-inventory.item.status.unavailable.lowercase',
+  [itemStatusesMap.UNKNOWN]: 'ui-inventory.item.status.unknown.lowercase',
+  [itemStatusesMap.WITHDRAWN]: 'ui-inventory.item.status.withdrawn.lowercase',
+};
+
+const ItemViewSubheader = ({
+  item,
+  instance,
+  holdingsRecord,
+  holdingLocation,
+}) => {
+  const { formatMessage } = useIntl();
+
+  const itemMaterialType = item?.materialType?.name || '';
+  const itemStatus = item?.status?.name || '';
+
+  const itemStatusValue = itemStatus in ITEM_STATUS_TRANSLATIONS_ID_MAP
+    ? formatMessage({ id: ITEM_STATUS_TRANSLATIONS_ID_MAP[itemStatus] })
+    : itemStatus;
+
+  return (
+    <>
+      <Row center="xs">
+        <Col sm={6}>
+          <LinkedInstanceDetails
+            item={item}
+            instance={instance}
+          />
+          <LinkedHoldingDetails
+            instance={instance}
+            holdingsRecord={holdingsRecord}
+            holdingLocation={holdingLocation}
+          />
+        </Col>
+      </Row>
+      <hr />
+      <Row>
+        <Col sm={12}>
+          <AppIcon
+            app="inventory"
+            iconKey="item"
+            size="small"
+          />
+          {' '}
+          <FormattedMessage
+            id={
+              item?.isBoundWith
+                ? 'ui-inventory.itemRecordWithDescriptionBW'
+                : 'ui-inventory.itemRecordWithDescription'
+            }
+            values={{
+              materialType: itemMaterialType,
+              status: itemStatusValue,
+            }}
+          />
+        </Col>
+      </Row>
+    </>
+  );
+};
+
+ItemViewSubheader.propTypes = {
+  item: PropTypes.object,
+  instance: PropTypes.object,
+  holdingsRecord: PropTypes.object,
+  holdingLocation: PropTypes.object,
+};
+
+export default ItemViewSubheader;
diff --git a/src/components/ItemViewSubheader/ItemViewSubheader.test.js b/src/components/ItemViewSubheader/ItemViewSubheader.test.js
new file mode 100644
index 000000000..90e2a5bb1
--- /dev/null
+++ b/src/components/ItemViewSubheader/ItemViewSubheader.test.js
@@ -0,0 +1,50 @@
+import '../../../test/jest/__mock__';
+
+import ItemViewSubheader from './ItemViewSubheader';
+
+import {
+  renderWithIntl,
+  translationsProperties,
+} from '../../../test/jest/helpers';
+
+jest.mock('./LinkedInstanceDetails', () => () => <span>LinkedInstanceDetails</span>);
+jest.mock('./LinkedHoldingDetails', () => () => <span>LinkedHoldingDetails</span>);
+
+const itemMock = {
+  materialType: { name: 'book' },
+  status: { name: 'Available' },
+  isBoundWith: true,
+};
+
+const renderItemViewSubheader = () => {
+  const component = (
+    <ItemViewSubheader
+      item={itemMock}
+      instance={{}}
+      holdingsRecord={{}}
+      holdingLocation={{}}
+    />
+  );
+
+  return renderWithIntl(component, translationsProperties);
+};
+
+describe('ItemViewSubheader', () => {
+  it('should display linked instance details', () => {
+    const { getByText } = renderItemViewSubheader();
+
+    expect(getByText('LinkedInstanceDetails')).toBeInTheDocument();
+  });
+
+  it('should display linked holdings details', () => {
+    const { getByText } = renderItemViewSubheader();
+
+    expect(getByText('LinkedHoldingDetails')).toBeInTheDocument();
+  });
+
+  it('should display item record with material type, status, and bound with in lower case in parentheses', () => {
+    const { getByText } = renderItemViewSubheader();
+
+    expect(getByText('Item record (book, available, bound with)')).toBeInTheDocument();
+  });
+});
diff --git a/src/components/ItemViewSubheader/LinkedHoldingDetails.js b/src/components/ItemViewSubheader/LinkedHoldingDetails.js
new file mode 100644
index 000000000..e1afde536
--- /dev/null
+++ b/src/components/ItemViewSubheader/LinkedHoldingDetails.js
@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+import { Link } from 'react-router-dom';
+
+import { callNumberLabel } from '../../utils';
+
+const LinkedHoldingDetails = ({
+  instance,
+  holdingsRecord,
+  holdingLocation,
+}) => {
+  const inactiveLabel = (
+    <span>
+      {' '}
+      <em><FormattedMessage id="ui-inventory.inactive" /></em>
+    </span>
+  );
+  const holdingsPermanentLocationLabel = ` ${holdingLocation.permanentLocation.name} > ${callNumberLabel(holdingsRecord)}`;
+
+  return (
+    <div>
+      <FormattedMessage id="ui-inventory.holdingsLabelShort" />
+      <Link to={`/inventory/view/${instance.id}/${holdingsRecord.id}`}>
+        {!holdingLocation.permanentLocation.isActive && inactiveLabel}
+        {holdingsPermanentLocationLabel}
+      </Link>
+    </div>
+  );
+};
+
+LinkedHoldingDetails.propTypes = {
+  instance: PropTypes.object,
+  holdingsRecord: PropTypes.object,
+  holdingLocation: PropTypes.object,
+};
+
+export default LinkedHoldingDetails;
diff --git a/src/components/ItemViewSubheader/LinkedHoldingDetails.test.js b/src/components/ItemViewSubheader/LinkedHoldingDetails.test.js
new file mode 100644
index 000000000..dd4bb2ef5
--- /dev/null
+++ b/src/components/ItemViewSubheader/LinkedHoldingDetails.test.js
@@ -0,0 +1,57 @@
+import { BrowserRouter as Router } from 'react-router-dom';
+
+import '../../../test/jest/__mock__';
+
+import LinkedHoldingDetails from './LinkedHoldingDetails';
+
+import {
+  renderWithIntl,
+  translationsProperties,
+} from '../../../test/jest/helpers';
+
+const holdingsRecordMock = {
+  id: 'holdingsRecordId',
+  callNumberPrefix: 'callNumberPrefix',
+  callNumber: 'callNumber',
+  callNumberSuffix: 'callNumberSuffix',
+};
+const holdingLocationMock = {
+  permanentLocation: {
+    name: 'permanentLocationName',
+    isActive: true,
+  },
+};
+
+const renderLinkedHoldingDetails = () => {
+  const component = (
+    <Router>
+      <LinkedHoldingDetails
+        instance={{ id: 'instanceId' }}
+        holdingsRecord={holdingsRecordMock}
+        holdingLocation={holdingLocationMock}
+      />
+    </Router>
+  );
+
+  return renderWithIntl(component, translationsProperties);
+};
+
+describe('LinkedHoldingDetails', () => {
+  it('should display linked holdings details', () => {
+    const {
+      getByText,
+      getByRole,
+    } = renderLinkedHoldingDetails();
+
+    expect(getByText(/holdings:/i)).toBeInTheDocument();
+    expect(getByRole('link', { name: /permanentLocationName > callNumberPrefix callNumber callNumberSuffix/i })).toBeInTheDocument();
+  });
+
+  it('location should be displayed as a link', () => {
+    const { getByText } = renderLinkedHoldingDetails();
+
+    const location = getByText('permanentLocationName > callNumberPrefix callNumber callNumberSuffix');
+
+    expect(location.href).toContain('/inventory/view/instanceId/holdingsRecordId');
+  });
+});
diff --git a/src/components/ItemViewSubheader/LinkedInstanceDetails.js b/src/components/ItemViewSubheader/LinkedInstanceDetails.js
new file mode 100644
index 000000000..738287943
--- /dev/null
+++ b/src/components/ItemViewSubheader/LinkedInstanceDetails.js
@@ -0,0 +1,56 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { FormattedMessage } from 'react-intl';
+import PropTypes from 'prop-types';
+
+import css from '../../View.css';
+
+const LinkedInstanceDetails = ({
+  item,
+  instance,
+}) => {
+  const boundWithCount = item?.boundWithTitles?.length ?? 0;
+  const instancePublicationCount = instance.publication?.length ?? 0;
+  const linkedInstanceTitle = (
+    <Link to={`/inventory/view/${instance.id}`}>
+      {instance.title}
+    </Link>
+  );
+
+  return (
+    <>
+      <FormattedMessage
+        id="ui-inventory.instanceTitle"
+        values={{ title: linkedInstanceTitle }}
+      />
+
+      {instancePublicationCount > 0 && (
+        <span>
+          <em>
+            {` ${instance.publication[0].publisher}`}
+            {instance.publication[0].dateOfPublication ? `, ${instance.publication[0].dateOfPublication}` : ''}
+          </em>
+        </span>
+      )}
+
+      {boundWithCount > 0 && (
+        <>
+          {' '}
+          <span className={css.multiTitle}>
+            <FormattedMessage
+              id="ui-inventory.boundWith"
+              values={{ boundWithCount }}
+            />
+          </span>
+        </>
+      )}
+    </>
+  );
+};
+
+LinkedInstanceDetails.propTypes = {
+  item: PropTypes.object,
+  instance: PropTypes.object,
+};
+
+export default LinkedInstanceDetails;
diff --git a/src/components/ItemViewSubheader/LinkedInstanceDetails.test.js b/src/components/ItemViewSubheader/LinkedInstanceDetails.test.js
new file mode 100644
index 000000000..ff4cf6834
--- /dev/null
+++ b/src/components/ItemViewSubheader/LinkedInstanceDetails.test.js
@@ -0,0 +1,63 @@
+import { BrowserRouter as Router } from 'react-router-dom';
+
+import '../../../test/jest/__mock__';
+
+import LinkedInstanceDetails from './LinkedInstanceDetails';
+
+import {
+  renderWithIntl,
+  translationsProperties,
+} from '../../../test/jest/helpers';
+
+const itemMock = {
+  boundWithTitles: new Array(2),
+  isBoundWith: true,
+};
+const instanceMock = {
+  id: 'instanceId',
+  title: 'instanceTitle',
+  publication: [{
+    publisher: 'instancePublisher',
+    dateOfPublication: '2023-12-12'
+  }],
+};
+
+const renderLinkedInstanceDetails = () => {
+  const component = (
+    <Router>
+      <LinkedInstanceDetails
+        item={itemMock}
+        instance={instanceMock}
+      />
+    </Router>
+  );
+
+  return renderWithIntl(component, translationsProperties);
+};
+
+describe('LinkedInstanceDetails', () => {
+  it('should display linked indtance details', () => {
+    const { getByText } = renderLinkedInstanceDetails();
+
+    expect(getByText(/instance: \./i)).toBeInTheDocument();
+  });
+
+  it('should display instance title as a link', () => {
+    const { getByRole } = renderLinkedInstanceDetails();
+
+    expect(getByRole('link', { name: /instancetitle/i })).toBeInTheDocument();
+  });
+
+  it('should display publisher information', () => {
+    const { getByText } = renderLinkedInstanceDetails();
+
+    expect(getByText(/instancepublisher/i)).toBeInTheDocument();
+    expect(getByText(/, 2023-12-12/i)).toBeInTheDocument();
+  });
+
+  it('should display "and other titles" is there are bound-with titles', () => {
+    const { getByText } = renderLinkedInstanceDetails();
+
+    expect(getByText(/and other titles/i)).toBeInTheDocument();
+  });
+});
diff --git a/src/components/ItemViewSubheader/index.js b/src/components/ItemViewSubheader/index.js
new file mode 100644
index 000000000..f6a2ffda7
--- /dev/null
+++ b/src/components/ItemViewSubheader/index.js
@@ -0,0 +1 @@
+export { default } from './ItemViewSubheader';
diff --git a/src/components/index.js b/src/components/index.js
index 3e2ac0035..1810e029d 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -2,6 +2,7 @@ export { default as FilterNavigation } from './FilterNavigation';
 export { default as InstanceFilters, InstanceFiltersBrowse, instanceFilterRenderer } from './InstanceFilters';
 export { default as HoldingsRecordFilters, holdingsRecordFilterRenderer } from './HoldingsRecordFilters';
 export { default as ItemFilters, itemFilterRenderer } from './ItemFilters';
+export { default as ItemViewSubheader } from './ItemViewSubheader';
 export { default as InstancePlugin } from './InstancePlugin';
 export { default as ConnectedTitle } from './ConnectedTitle';
 export { default as UnconnectedTitle } from './UnconnectedTitle';
diff --git a/src/views/ItemView.js b/src/views/ItemView.js
index a11f407ee..bddf57d8e 100644
--- a/src/views/ItemView.js
+++ b/src/views/ItemView.js
@@ -56,7 +56,6 @@ import ModalContent from '../components/ModalContent';
 import { ItemAcquisition } from '../Item/ViewItem/ItemAcquisition';
 import {
   craftLayerUrl,
-  callNumberLabel,
   canMarkItemAsMissing,
   canMarkItemAsWithdrawn,
   canMarkItemWithStatus,
@@ -84,8 +83,8 @@ import ItemStatus from './ItemStatus';
 import {
   WarningMessage,
   AdministrativeNoteList,
+  ItemViewSubheader,
 } from '../components';
-import css from '../View.css';
 
 export const requestStatusFiltersString = map(REQUEST_OPEN_STATUSES, requestStatus => `requestStatus.${requestStatus}`).join(',');
 
@@ -758,13 +757,6 @@ class ItemView extends React.Component {
       </Col>
     );
 
-    const boundWithCount = item?.boundWithTitles?.length;
-    const linkedInstanceTitle = (
-      <Link to={`/inventory/view/${instance.id}`}>
-        {` ${instance.title}. `}
-      </Link>
-    );
-
     const shortcuts = [
       {
         name: 'edit',
@@ -917,72 +909,12 @@ class ItemView extends React.Component {
                   />
                 </Modal>
                 )}
-
-                <Row center="xs">
-                  <Col sm={6}>
-                    <FormattedMessage
-                      id="ui-inventory.instanceTitle"
-                      values={{ title: linkedInstanceTitle }}
-                    />
-                    {(instance.publication && instance.publication.length > 0) && (
-                    <span>
-                      <em>
-                        {` ${instance.publication[0].publisher}`}
-                        {instance.publication[0].dateOfPublication ? `, ${instance.publication[0].dateOfPublication}` : ''}
-                      </em>
-                    </span>
-                    )}
-                    { boundWithCount > 0 &&
-                      <>
-                        {' '}
-                        <span className={css.multiTitle}>
-                          <FormattedMessage
-                            id="ui-inventory.boundWith"
-                            values={{
-                              boundWithCount,
-                            }}
-                          />
-                        </span>
-                      </>
-                    }
-                    <div>
-                      <FormattedMessage id="ui-inventory.holdingsLabelShort" />
-                      <Link to={`/inventory/view/${instance.id}/${holdingsRecord.id}`}>
-                        {(!holdingLocation.permanentLocation.isActive) &&
-                          <span>
-                            {' '}
-                            <em><FormattedMessage id="ui-inventory.inactive" /></em>
-                          </span>
-                        }
-                        {
-                          ` ${holdingLocation.permanentLocation.name} > ${callNumberLabel(holdingsRecord)}`
-                        }
-                      </Link>
-                    </div>
-                  </Col>
-                </Row>
-                <hr />
-                <Row>
-                  <Col sm={12}>
-                    <AppIcon
-                      app="inventory"
-                      iconKey="item"
-                      size="small"
-                    />
-                    {' '}
-                    <FormattedMessage
-                      id={
-                        item?.isBoundWith ?
-                          'ui-inventory.itemRecordWithDescriptionBW' :
-                          'ui-inventory.itemRecordWithDescription'
-                      }
-                      values={{
-                        materialType: item?.materialType?.name.toLowerCase(),
-                        status: item?.status?.name.toLowerCase(),
-                      }}
-                    />
-                  </Col>
-                </Row>
+                <ItemViewSubheader
+                  item={item}
+                  instance={instance}
+                  holdingsRecord={holdingsRecord}
+                  holdingLocation={holdingLocation}
+                />
                 <br />
                 <AccordionStatus ref={this.accordionStatusRef}>
                   <Row>
diff --git a/translations/ui-inventory/en.json b/translations/ui-inventory/en.json
index fe140948e..1bac9429a 100644
--- a/translations/ui-inventory/en.json
+++ b/translations/ui-inventory/en.json
@@ -562,6 +562,27 @@
   "item.status.unavailable": "Unavailable",
   "item.status.unknown": "Unknown",
   "item.status.withdrawn": "Withdrawn",
+  "item.status.agedToLost.lowercase": "aged to lost",
+  "item.status.available.lowercase": "available",
+  "item.status.awaitingPickup.lowercase": "awaiting pickup",
+  "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+  "item.status.checkedOut.lowercase": "checked out",
+  "item.status.claimedReturned.lowercase": "claimed returned",
+  "item.status.declaredLost.lowercase": "declared lost",
+  "item.status.inProcess.lowercase": "in process",
+  "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+  "item.status.inTransit.lowercase": "in transit",
+  "item.status.intellectualItem.lowercase": "intellectual item",
+  "item.status.longMissing.lowercase": "long missing",
+  "item.status.lostAndPaid.lowercase": "lost and paid",
+  "item.status.missing.lowercase": "missing",
+  "item.status.onOrder.lowercase": "on order",
+  "item.status.paged.lowercase": "paged",
+  "item.status.restricted.lowercase": "restricted",
+  "item.status.orderClosed.lowercase": "order closed",
+  "item.status.unavailable.lowercase": "unavailable",
+  "item.status.unknown.lowercase": "unknown",
+  "item.status.withdrawn.lowercase": "withdrawn",
   "item.status.statusUpdatedLabel": "status updated {statusDate}",
   "item.status.inTransitTo": "In transit to {servicePoint}",
   "exportInProgress": "Export in progress",

From 338f41275d9ee57d17e5ebdf3681c9c8a07a1039 Mon Sep 17 00:00:00 2001
From: Oleksandr Hladchenko
 <85172747+OleksandrHladchenko1@users.noreply.github.com>
Date: Mon, 3 Jul 2023 16:40:10 +0300
Subject: [PATCH 59/68] UIIN-2467: Decrease rerenders for TargetProfileDetail
 component (#2191)

* UIIN-2467: Initial commit

* UIIN-2467: Refactor TargetProfileDetail component as the functional one

* UIIN-2467: Fix tests

* UIIN-2467: Fixes after review

* UIIN-2467: Remove destructuring to avoid warnings

* UIIN-2467: Move getJobProfilesFormatter out of TargetProfileDetail

* UIIN-2467: Fixes after review

* UIIN-2467: Check if allowedJobProfileIds is empty
---
 CHANGELOG.md                                  |   1 +
 src/common/hooks/index.js                     |   3 +
 src/common/hooks/useAllowedJobProfiles.js     |  36 ++
 .../hooks/useAllowedJobProfiles.test.js       |  42 ++
 src/common/hooks/useDefaultJobProfile.js      |  28 ++
 src/common/hooks/useDefaultJobProfile.test.js |  42 ++
 src/settings/TargetProfileDetail.js           | 441 +++++++-----------
 src/settings/TargetProfileDetail.test.js      | 119 +++--
 8 files changed, 407 insertions(+), 305 deletions(-)
 create mode 100644 src/common/hooks/useAllowedJobProfiles.js
 create mode 100644 src/common/hooks/useAllowedJobProfiles.test.js
 create mode 100644 src/common/hooks/useDefaultJobProfile.js
 create mode 100644 src/common/hooks/useDefaultJobProfile.test.js

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4a14958f..b26869a8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@
 * Inventory: Retain Search/Browse query/options/filter and facet selections UNLESS user resets/clear selections. Refs UIIN-2433.
 * Statistical Code dropdown "contains" type ahead functionality needed (Instance/Holdings/Items). Refs UIIN-2466.
 * Fix problem with a large number of items on a single holdings record. Refs UIIN-2478.
+* Decrease rerenders for TargetProfileDetail component to avoid errors when view the target profile. Fixes UIIN-2467.
 
 ## [9.4.8](https://github.com/folio-org/ui-inventory/tree/v9.4.8) (2023-06-30)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.7...v9.4.8)
diff --git a/src/common/hooks/index.js b/src/common/hooks/index.js
index 2a1564652..4b6765dd1 100644
--- a/src/common/hooks/index.js
+++ b/src/common/hooks/index.js
@@ -4,6 +4,9 @@ export { default as useGoBack } from './useGoBack';
 export { default as useFacets } from './useFacets';
 export { default as useHolding } from './useHolding';
 export { default as useInstanceQuery } from './useInstanceQuery';
+export { default as useDefaultJobProfile } from './useDefaultJobProfile';
+export { default as useAllowedJobProfiles } from './useAllowedJobProfiles';
+
 export * from './useConfirmationModal';
 export * from './useMoveItemsMutation';
 export default {};
diff --git a/src/common/hooks/useAllowedJobProfiles.js b/src/common/hooks/useAllowedJobProfiles.js
new file mode 100644
index 000000000..b2764a4dc
--- /dev/null
+++ b/src/common/hooks/useAllowedJobProfiles.js
@@ -0,0 +1,36 @@
+import { useQuery } from 'react-query';
+import { isEmpty } from 'lodash';
+
+import {
+  useOkapiKy,
+  useNamespace,
+} from '@folio/stripes/core';
+
+import {
+  DATA_IMPORT_JOB_PROFILES_ROUTE,
+  LIMIT_MAX,
+} from '../../constants';
+
+const useAllowedJobProfiles = (allowedJobProfileIds) => {
+  const ky = useOkapiKy();
+  const [namespace] = useNamespace({ key: 'allowedJobProfiles' });
+
+  const DATA_TYPE_MARC_QUERY = 'dataType==("MARC")';
+
+  const ids = allowedJobProfileIds.join(' or ');
+  const allowedIdsQuery = `id==(${ids})`;
+  const path = `${DATA_IMPORT_JOB_PROFILES_ROUTE}?limit=${LIMIT_MAX}&query=${DATA_TYPE_MARC_QUERY} and ${allowedIdsQuery} sortBy name`;
+
+  const { isLoading, data: allowedJobProfiles = {} } = useQuery({
+    queryKey: [namespace, allowedJobProfileIds],
+    queryFn: () => ky.get(path).json(),
+    enabled: !isEmpty(allowedJobProfileIds),
+  });
+
+  return ({
+    isLoading,
+    allowedJobProfiles: allowedJobProfiles.jobProfiles,
+  });
+};
+
+export default useAllowedJobProfiles;
diff --git a/src/common/hooks/useAllowedJobProfiles.test.js b/src/common/hooks/useAllowedJobProfiles.test.js
new file mode 100644
index 000000000..95a2aead3
--- /dev/null
+++ b/src/common/hooks/useAllowedJobProfiles.test.js
@@ -0,0 +1,42 @@
+import React from 'react';
+import {
+  QueryClient,
+  QueryClientProvider,
+} from 'react-query';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
+
+import '../../../test/jest/__mock__';
+import { useOkapiKy } from '@folio/stripes/core';
+
+import useAllowedJobProfiles from './useAllowedJobProfiles';
+
+const queryClient = new QueryClient();
+
+// eslint-disable-next-line react/prop-types
+const wrapper = ({ children }) => (
+  <QueryClientProvider client={queryClient}>
+    {children}
+  </QueryClientProvider>
+);
+
+const allowedJobProfileIds = ['testId'];
+
+describe('useAllowedJobProfiles', () => {
+  it('should fetch default job profile', async () => {
+    useOkapiKy.mockClear().mockReturnValue({
+      get: () => ({
+        json: () => ({
+          jobProfiles: allowedJobProfileIds,
+        }),
+      }),
+    });
+
+    const { result, waitFor } = renderHook(() => useAllowedJobProfiles(allowedJobProfileIds), { wrapper });
+
+    await waitFor(() => {
+      return !result.current.isLoading;
+    });
+
+    expect(result.current.allowedJobProfiles).toBe(allowedJobProfileIds);
+  });
+});
diff --git a/src/common/hooks/useDefaultJobProfile.js b/src/common/hooks/useDefaultJobProfile.js
new file mode 100644
index 000000000..e485ee353
--- /dev/null
+++ b/src/common/hooks/useDefaultJobProfile.js
@@ -0,0 +1,28 @@
+import { useQuery } from 'react-query';
+
+import {
+  useOkapiKy,
+  useNamespace,
+} from '@folio/stripes/core';
+
+import { DATA_IMPORT_JOB_PROFILES_ROUTE } from '../../constants';
+
+const useDefaultJobProfile = (jobProfileId) => {
+  const ky = useOkapiKy();
+  const [namespace] = useNamespace({ key: 'defaultJobProfileId' });
+
+  const path = `${DATA_IMPORT_JOB_PROFILES_ROUTE}/${jobProfileId}`;
+
+  const { isLoading, data: defaultJobProfile = {} } = useQuery({
+    queryKey: [namespace, jobProfileId],
+    queryFn: () => ky.get(path).json(),
+    enabled: !!jobProfileId,
+  });
+
+  return ({
+    isLoading,
+    defaultJobProfile,
+  });
+};
+
+export default useDefaultJobProfile;
diff --git a/src/common/hooks/useDefaultJobProfile.test.js b/src/common/hooks/useDefaultJobProfile.test.js
new file mode 100644
index 000000000..2fd93b991
--- /dev/null
+++ b/src/common/hooks/useDefaultJobProfile.test.js
@@ -0,0 +1,42 @@
+import React from 'react';
+import {
+  QueryClient,
+  QueryClientProvider,
+} from 'react-query';
+import { renderHook } from '@folio/jest-config-stripes/testing-library/react-hooks';
+
+import '../../../test/jest/__mock__';
+import { useOkapiKy } from '@folio/stripes/core';
+
+import useDefaultJobProfile from './useDefaultJobProfile';
+
+const queryClient = new QueryClient();
+
+// eslint-disable-next-line react/prop-types
+const wrapper = ({ children }) => (
+  <QueryClientProvider client={queryClient}>
+    {children}
+  </QueryClientProvider>
+);
+
+const jobProfileId = 'jobProfileId';
+
+describe('useDefaultJobProfile', () => {
+  it('should fetch default job profile', async () => {
+    useOkapiKy.mockClear().mockReturnValue({
+      get: () => ({
+        json: () => ({
+          id: jobProfileId,
+        }),
+      }),
+    });
+
+    const { result, waitFor } = renderHook(() => useDefaultJobProfile(jobProfileId), { wrapper });
+
+    await waitFor(() => {
+      return !result.current.isLoading;
+    });
+
+    expect(result.current.defaultJobProfile.id).toBe(jobProfileId);
+  });
+});
diff --git a/src/settings/TargetProfileDetail.js b/src/settings/TargetProfileDetail.js
index c07f28763..ff0890f5c 100644
--- a/src/settings/TargetProfileDetail.js
+++ b/src/settings/TargetProfileDetail.js
@@ -11,119 +11,52 @@ import {
   Row,
   TextLink,
 } from '@folio/stripes/components';
-
 import {
-  DATA_IMPORT_JOB_PROFILES_ROUTE,
-  LIMIT_MAX,
-} from '../constants';
+  useAllowedJobProfiles,
+  useDefaultJobProfile,
+} from '../common/hooks';
 
 const JOB_PROFILES_COLUMNS_NAME = {
   ID: 'id',
   IS_DEFAULT: 'isDefault',
 };
-const DATA_TYPE_MARC_QUERY = 'dataType==("MARC")';
-
-class TargetProfileDetail extends React.Component {
-  static propTypes = {
-    initialValues: PropTypes.object.isRequired,
-    resources: PropTypes.shape({
-      identifierType: PropTypes.shape({
-        records: PropTypes.arrayOf(
-          PropTypes.shape({
-            name: PropTypes.string,
-          }).isRequired,
-        ),
-      }).isRequired,
-      defaultCreateJobProfile: PropTypes.shape({
-        records: PropTypes.arrayOf(
-          PropTypes.shape({
-            id: PropTypes.string.isRequired,
-            name: PropTypes.string.isRequired,
-          }).isRequired,
-        ),
-      }).isRequired,
-      defaultUpdateJobProfile: PropTypes.shape({
-        records: PropTypes.arrayOf(
-          PropTypes.shape({
-            id: PropTypes.string.isRequired,
-            name: PropTypes.string.isRequired,
-          }).isRequired,
-        ),
-      }).isRequired,
-      allowedCreateJobProfiles: PropTypes.shape({
-        records: PropTypes.arrayOf(
-          PropTypes.shape({
-            id: PropTypes.string.isRequired,
-            name: PropTypes.string.isRequired,
-          }).isRequired,
-        ),
-      }).isRequired,
-      allowedUpdateJobProfiles: PropTypes.shape({
-        records: PropTypes.arrayOf(
-          PropTypes.shape({
-            id: PropTypes.string.isRequired,
-            name: PropTypes.string.isRequired,
-          }).isRequired,
-        ),
-      }).isRequired,
-    }).isRequired,
-  };
-
-  static manifest = Object.freeze({
-    identifierType: {
-      type: 'okapi',
-      path: 'identifier-types?query=id=!{initialValues.externalIdentifierType}',
-      records: 'identifierTypes',
-    },
-    defaultCreateJobProfile: {
-      type: 'okapi',
-      path: (_queryParams, _pathComponents, _resourceData, _logger, props) => {
-        const {
-          initialValues: { createJobProfileId } = {},
-        } = props;
-
-        return `${DATA_IMPORT_JOB_PROFILES_ROUTE}/${createJobProfileId}`;
-      },
-    },
-    defaultUpdateJobProfile: {
-      type: 'okapi',
-      path: (_queryParams, _pathComponents, _resourceData, _logger, props) => {
-        const {
-          initialValues: { updateJobProfileId } = {},
-        } = props;
-
-        return `${DATA_IMPORT_JOB_PROFILES_ROUTE}/${updateJobProfileId}`;
-      },
-    },
-    allowedCreateJobProfiles: {
-      type: 'okapi',
-      records: 'jobProfiles',
-      path: (_queryParams, _pathComponents, _resourceData, _logger, props) => {
-        const {
-          initialValues: { allowedCreateJobProfileIds = [] } = {},
-        } = props;
-        const ids = allowedCreateJobProfileIds.join(' or ');
-        const allowedIdsQuery = `id==(${ids})`;
-
-        return `${DATA_IMPORT_JOB_PROFILES_ROUTE}?limit=${LIMIT_MAX}&query=${DATA_TYPE_MARC_QUERY} and ${allowedIdsQuery} sortBy name`;
-      },
-    },
-    allowedUpdateJobProfiles: {
-      type: 'okapi',
-      records: 'jobProfiles',
-      path: (_queryParams, _pathComponents, _resourceData, _logger, props) => {
-        const {
-          initialValues: { allowedUpdateJobProfileIds = [] } = {},
-        } = props;
-        const ids = allowedUpdateJobProfileIds.join(' or ');
-        const allowedIdsQuery = `id==(${ids})`;
 
-        return `${DATA_IMPORT_JOB_PROFILES_ROUTE}?limit=${LIMIT_MAX}&query=${DATA_TYPE_MARC_QUERY} and ${allowedIdsQuery} sortBy name`;
-      },
-    },
-  });
-
-  getJobProfilesContent = (defaultJobProfileRecord, allowedJobProfilesRecords) => {
+const getJobProfilesFormatter = defaultProfileId => ({
+  [JOB_PROFILES_COLUMNS_NAME.ID]: jobProfile => (
+    <>
+      <TextLink
+        to={`/settings/data-import/job-profiles/view/${jobProfile.id}`}
+        target="_blank"
+      >
+        {jobProfile.name}
+      </TextLink>
+      <span>{`(${jobProfile.id})`}</span>
+    </>
+  ),
+  [JOB_PROFILES_COLUMNS_NAME.IS_DEFAULT]: jobProfile => {
+    return defaultProfileId === jobProfile.id
+      ? <FormattedMessage id="ui-inventory.defaultJobProfile" />
+      : null;
+  },
+});
+
+const TargetProfileDetail = props => {
+  const {
+    initialValues,
+    initialValues: {
+      createJobProfileId = '',
+      updateJobProfileId = '',
+      allowedCreateJobProfileIds = [],
+      allowedUpdateJobProfileIds = [],
+    }
+  } = props;
+
+  const { allowedJobProfiles: allowedCreateJobProfiles = [] } = useAllowedJobProfiles(allowedCreateJobProfileIds);
+  const { allowedJobProfiles: allowedUpdateJobProfiles = [] } = useAllowedJobProfiles(allowedUpdateJobProfileIds);
+  const { defaultJobProfile: defaultCreateJobProfile } = useDefaultJobProfile(createJobProfileId);
+  const { defaultJobProfile: defaultUpdateJobProfile } = useDefaultJobProfile(updateJobProfileId);
+
+  const getJobProfilesContent = (defaultJobProfileRecord, allowedJobProfilesRecords) => {
     const content = [
       defaultJobProfileRecord,
       ...allowedJobProfilesRecords.filter(jobProfile => jobProfile?.id !== defaultJobProfileRecord?.id),
@@ -133,162 +66,148 @@ class TargetProfileDetail extends React.Component {
       id: jobProfile?.id,
       name: jobProfile?.name,
     }));
-  }
-
-  getJobProfilesFormatter = defaultProfileId => ({
-    [JOB_PROFILES_COLUMNS_NAME.ID]: ({ name, id }) => (
-      <>
-        <TextLink
-          to={`/settings/data-import/job-profiles/view/${id}`}
-          target="_blank"
-        >
-          {name}
-        </TextLink>
-        <span>{`(${id})`}</span>
-      </>
-    ),
-    [JOB_PROFILES_COLUMNS_NAME.IS_DEFAULT]: ({ id }) => {
-      return defaultProfileId === id
-        ? <FormattedMessage id="ui-inventory.defaultJobProfile" />
-        : null;
-    },
-  });
-
-  render() {
-    const {
-      initialValues,
-      initialValues: {
-        createJobProfileId = '',
-        updateJobProfileId = '',
-      },
-      resources: {
-        defaultCreateJobProfile: { records: [defaultCreateJobProfileRecord] },
-        defaultUpdateJobProfile: { records: [defaultUpdateJobProfileRecord] },
-        allowedCreateJobProfiles: { records: allowedCreateJobProfilesRecords },
-        allowedUpdateJobProfiles: { records: allowedUpdateJobProfilesRecords },
-      },
-    } = this.props;
-
-    const t = initialValues.targetOptions;
-    const targetOptions = !t ? null : (
-      <ul>
-        {Object.keys(t).sort().map(key => <li key={key}>{key}: {t[key]}</li>)}
-      </ul>
-    );
+  };
 
-    const jobProfilesVisibleColumns = [JOB_PROFILES_COLUMNS_NAME.ID, JOB_PROFILES_COLUMNS_NAME.IS_DEFAULT];
-    const createJobProfilesContent = this.getJobProfilesContent(defaultCreateJobProfileRecord, allowedCreateJobProfilesRecords);
-    const updateJobProfilesContent = this.getJobProfilesContent(defaultUpdateJobProfileRecord, allowedUpdateJobProfilesRecords);
-    const createJobProfilesFormatter = this.getJobProfilesFormatter(createJobProfileId);
-    const updateJobProfilesFormatter = this.getJobProfilesFormatter(updateJobProfileId);
+  const t = initialValues.targetOptions;
+  const targetOptions = !t ? null : (
+    <ul>
+      {Object.keys(t).sort().map(key => <li key={key}>{key}: {t[key]}</li>)}
+    </ul>
+  );
+
+  const jobProfilesVisibleColumns = [JOB_PROFILES_COLUMNS_NAME.ID, JOB_PROFILES_COLUMNS_NAME.IS_DEFAULT];
+  const createJobProfilesContent = getJobProfilesContent(defaultCreateJobProfile, allowedCreateJobProfiles);
+  const updateJobProfilesContent = getJobProfilesContent(defaultUpdateJobProfile, allowedUpdateJobProfiles);
+  const createJobProfilesFormatter = getJobProfilesFormatter(createJobProfileId);
+  const updateJobProfilesFormatter = getJobProfilesFormatter(updateJobProfileId);
+
+  return (
+    <div>
+      <Row>
+        <Col xs={12}>
+          <KeyValue
+            label={<FormattedMessage id="ui-inventory.name" />}
+            value={initialValues.name}
+          />
+        </Col>
+      </Row>
+      <Row>
+        <Col xs={12}>
+          <KeyValue
+            label={<FormattedMessage id="ui-inventory.url" />}
+            value={initialValues.url}
+          />
+        </Col>
+      </Row>
+      <Row>
+        <Col xs={12}>
+          <KeyValue
+            label={<FormattedMessage id="ui-inventory.authentication" />}
+            value={initialValues.authentication}
+          />
+        </Col>
+      </Row>
+      <Row>
+        <Col xs={12}>
+          <KeyValue
+            label={<FormattedMessage id="ui-inventory.externalIdQueryMap" />}
+            value={initialValues.externalIdQueryMap}
+          />
+        </Col>
+      </Row>
+      <Row>
+        <Col xs={12}>
+          <KeyValue
+            label={<FormattedMessage id="ui-inventory.internalIdEmbedPath" />}
+            value={initialValues.internalIdEmbedPath}
+          />
+        </Col>
+      </Row>
+      <Row>
+        <Col xs={12}>
+          {isEmpty(createJobProfilesContent)
+            ? <KeyValue label={<FormattedMessage id="ui-inventory.createJobProfileIds" />} />
+            : (
+              <MultiColumnList
+                contentData={createJobProfilesContent}
+                columnMapping={{
+                  [JOB_PROFILES_COLUMNS_NAME.ID]: <FormattedMessage id="ui-inventory.createJobProfileIds" />,
+                  [JOB_PROFILES_COLUMNS_NAME.IS_DEFAULT]: <FormattedMessage id="ui-inventory.defaultJobProfile" />,
+                }}
+                formatter={createJobProfilesFormatter}
+                visibleColumns={jobProfilesVisibleColumns}
+                columnIdPrefix="create-job-profiles"
+              />
+            )
+          }
+        </Col>
+      </Row>
+      <Row>
+        <Col xs={12}>
+          {isEmpty(updateJobProfilesContent)
+            ? <KeyValue label={<FormattedMessage id="ui-inventory.updateJobProfileIds" />} />
+            : (
+              <MultiColumnList
+                contentData={updateJobProfilesContent}
+                columnMapping={{
+                  [JOB_PROFILES_COLUMNS_NAME.ID]: <FormattedMessage id="ui-inventory.updateJobProfileIds" />,
+                  [JOB_PROFILES_COLUMNS_NAME.IS_DEFAULT]: <FormattedMessage id="ui-inventory.defaultJobProfile" />,
+                }}
+                formatter={updateJobProfilesFormatter}
+                visibleColumns={jobProfilesVisibleColumns}
+                columnIdPrefix="update-job-profiles"
+              />
+            )
+          }
+        </Col>
+      </Row>
+      <Row>
+        <Col xs={12}>
+          <KeyValue
+            label={<FormattedMessage id="ui-inventory.targetOptions" />}
+            value={targetOptions}
+          />
+        </Col>
+      </Row>
+      <Row>
+        <Col xs={12}>
+          <KeyValue
+            label={<FormattedMessage id="ui-inventory.externalIdentifierType" />}
+            value={props.resources.identifierType.records?.[0]?.name}
+          />
+        </Col>
+      </Row>
+      <Row>
+        <Col xs={12}>
+          <KeyValue
+            label={<FormattedMessage id="ui-inventory.enabled" />}
+            value={initialValues.enabled ? '✓' : '✕'}
+          />
+        </Col>
+      </Row>
+    </div>
+  );
+};
 
-    return (
-      <div>
-        <Row>
-          <Col xs={12}>
-            <KeyValue
-              label={<FormattedMessage id="ui-inventory.name" />}
-              value={initialValues.name}
-            />
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12}>
-            <KeyValue
-              label={<FormattedMessage id="ui-inventory.url" />}
-              value={initialValues.url}
-            />
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12}>
-            <KeyValue
-              label={<FormattedMessage id="ui-inventory.authentication" />}
-              value={initialValues.authentication}
-            />
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12}>
-            <KeyValue
-              label={<FormattedMessage id="ui-inventory.externalIdQueryMap" />}
-              value={initialValues.externalIdQueryMap}
-            />
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12}>
-            <KeyValue
-              label={<FormattedMessage id="ui-inventory.internalIdEmbedPath" />}
-              value={initialValues.internalIdEmbedPath}
-            />
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12}>
-            {isEmpty(createJobProfilesContent)
-              ? <KeyValue label={<FormattedMessage id="ui-inventory.createJobProfileIds" />} />
-              : (
-                <MultiColumnList
-                  contentData={createJobProfilesContent}
-                  columnMapping={{
-                    [JOB_PROFILES_COLUMNS_NAME.ID]: <FormattedMessage id="ui-inventory.createJobProfileIds" />,
-                    [JOB_PROFILES_COLUMNS_NAME.IS_DEFAULT]: <FormattedMessage id="ui-inventory.defaultJobProfile" />,
-                  }}
-                  formatter={createJobProfilesFormatter}
-                  visibleColumns={jobProfilesVisibleColumns}
-                  columnIdPrefix="create-job-profiles"
-                />
-              )
-            }
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12}>
-            {isEmpty(updateJobProfilesContent)
-              ? <KeyValue label={<FormattedMessage id="ui-inventory.updateJobProfileIds" />} />
-              : (
-                <MultiColumnList
-                  contentData={updateJobProfilesContent}
-                  columnMapping={{
-                    [JOB_PROFILES_COLUMNS_NAME.ID]: <FormattedMessage id="ui-inventory.updateJobProfileIds" />,
-                    [JOB_PROFILES_COLUMNS_NAME.IS_DEFAULT]: <FormattedMessage id="ui-inventory.defaultJobProfile" />,
-                  }}
-                  formatter={updateJobProfilesFormatter}
-                  visibleColumns={jobProfilesVisibleColumns}
-                  columnIdPrefix="update-job-profiles"
-                />
-              )
-            }
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12}>
-            <KeyValue
-              label={<FormattedMessage id="ui-inventory.targetOptions" />}
-              value={targetOptions}
-            />
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12}>
-            <KeyValue
-              label={<FormattedMessage id="ui-inventory.externalIdentifierType" />}
-              value={this.props.resources.identifierType.records?.[0]?.name}
-            />
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12}>
-            <KeyValue
-              label={<FormattedMessage id="ui-inventory.enabled" />}
-              value={initialValues.enabled ? '✓' : '✕'}
-            />
-          </Col>
-        </Row>
-      </div>
-    );
-  }
-}
+TargetProfileDetail.manifest = Object.freeze({
+  identifierType: {
+    type: 'okapi',
+    path: 'identifier-types?query=id=!{initialValues.externalIdentifierType}',
+    records: 'identifierTypes',
+  },
+});
+
+TargetProfileDetail.propTypes = {
+  initialValues: PropTypes.object.isRequired,
+  resources: PropTypes.shape({
+    identifierType: PropTypes.shape({
+      records: PropTypes.arrayOf(
+        PropTypes.shape({
+          name: PropTypes.string,
+        }).isRequired,
+      ),
+    }).isRequired,
+  }).isRequired,
+};
 
 export default stripesConnect(TargetProfileDetail);
diff --git a/src/settings/TargetProfileDetail.test.js b/src/settings/TargetProfileDetail.test.js
index b0a15f314..76f64ac47 100644
--- a/src/settings/TargetProfileDetail.test.js
+++ b/src/settings/TargetProfileDetail.test.js
@@ -1,5 +1,9 @@
 import React from 'react';
 import { BrowserRouter } from 'react-router-dom';
+import {
+  QueryClient,
+  QueryClientProvider,
+} from 'react-query';
 
 import '../../test/jest/__mock__';
 
@@ -8,8 +12,19 @@ import {
   translationsProperties,
 } from '../../test/jest/helpers';
 
+import {
+  useAllowedJobProfiles,
+  useDefaultJobProfile,
+} from '../common/hooks';
+
 import TargetProfileDetail from './TargetProfileDetail';
 
+jest.mock('../common/hooks', () => ({
+  ...jest.requireActual('../common/hooks'),
+  useDefaultJobProfile: jest.fn(),
+  useAllowedJobProfiles: jest.fn(),
+}));
+
 const identifierTypeResources = {
   identifierType: {
     records: [{ name: 'identifierTypeTestName' }],
@@ -17,48 +32,46 @@ const identifierTypeResources = {
     hasLoaded: true,
   },
 };
-const defaultCreateJobProfileResources = {
-  records: [{
-    id: 'createJobProfileTestId',
-    name: 'create name',
-  }],
-  other: { totalRecords: null },
-  hasLoaded: true,
+
+const allowedCreateJobProfilesMock = {
+  isLoading: false,
+  allowedJobProfiles: [{
+    id: 'testCreateId1',
+    name: 'Create job porfile 1',
+  }, {
+    id: 'testCreateId2',
+    name: 'Create job porfile 2',
+  }]
 };
-const defaultUpdateJobProfileResources = {
-  records: [{
-    id: 'updateJobProfileTestId',
-    name: 'update name',
-  }],
-  other: { totalRecords: null },
-  hasLoaded: true,
+const allowedUpdateJobProfilesMock = {
+  isLoading: false,
+  allowedJobProfiles: [{
+    id: 'testUpdateId1',
+    name: 'Update job porfile 1',
+  }, {
+    id: 'testUpdateId2',
+    name: 'Update job porfile 2',
+  }]
 };
-const allowedCreateJobProfilesResources = {
-  jobProfiles: {
-    records: [{
-      id: 'createJobProfileTestId',
-      name: 'create name',
-    }],
-    other: { totalRecords: 1 },
-    hasLoaded: true,
-  },
+
+const defaultCreateJobProfileMock = {
+  isLoading: false,
+  defaultJobProfile: {
+    id: 'testCreateId1',
+    name: 'Create job porfile 1',
+  }
 };
-const allowedUpdateJobProfilesResources = {
-  jobProfiles: {
-    records: [{
-      id: 'updateJobProfileTestId',
-      name: 'update name',
-    }],
-    other: { totalRecords: 1 },
-    hasLoaded: true,
-  },
+
+const defaultUpdateJobProfileMock = {
+  isLoading: false,
+  defaultJobProfile: {
+    id: 'testUpdateId1',
+    name: 'Update job porfile 1',
+  }
 };
+
 const resources = {
   identifierType: identifierTypeResources.identifierType,
-  defaultCreateJobProfile: defaultCreateJobProfileResources,
-  defaultUpdateJobProfile: defaultUpdateJobProfileResources,
-  allowedCreateJobProfiles: allowedCreateJobProfilesResources.jobProfiles,
-  allowedUpdateJobProfiles: allowedUpdateJobProfilesResources.jobProfiles,
 };
 
 const defaultInitialValues = {
@@ -76,17 +89,35 @@ const defaultInitialValues = {
   updateJobProfileId: 'updateJobProfileTestId',
 };
 
+const queryClient = new QueryClient();
+
 const renderTargetProfileDetail = (initialValues = defaultInitialValues) => renderWithIntl(
-  <BrowserRouter>
-    <TargetProfileDetail
-      initialValues={initialValues}
-      resources={resources}
-    />
-  </BrowserRouter>,
+  <QueryClientProvider client={queryClient}>
+    <BrowserRouter>
+      <TargetProfileDetail
+        initialValues={initialValues}
+        resources={resources}
+      />
+    </BrowserRouter>
+  </QueryClientProvider>,
   translationsProperties,
 );
 
 describe('TargetProfileDetail', () => {
+  beforeEach(() => {
+    useAllowedJobProfiles
+      .mockReturnValueOnce(allowedCreateJobProfilesMock)
+      .mockReturnValueOnce(allowedUpdateJobProfilesMock);
+    useDefaultJobProfile
+      .mockReturnValueOnce(defaultCreateJobProfileMock)
+      .mockReturnValueOnce(defaultUpdateJobProfileMock);
+  });
+
+  afterEach(() => {
+    useAllowedJobProfiles.mockClear();
+    useDefaultJobProfile.mockClear();
+  });
+
   it('should display correct profile name', () => {
     const { getByText } = renderTargetProfileDetail();
 
@@ -144,8 +175,8 @@ describe('TargetProfileDetail', () => {
   it('names of job profiles should be displayed as a hotlink', () => {
     const { getByText } = renderTargetProfileDetail();
 
-    expect(getByText('create name').href).toContain('/settings/data-import/job-profiles/view/createJobProfileTestId');
-    expect(getByText('update name').href).toContain('/settings/data-import/job-profiles/view/updateJobProfileTestId');
+    expect(getByText('Create job porfile 1').href).toContain('/settings/data-import/job-profiles/view/testCreateId1');
+    expect(getByText('Update job porfile 1').href).toContain('/settings/data-import/job-profiles/view/testUpdateId1');
   });
 
   it('should display correct Target options', () => {

From 12e9f4bc392ce7514048a99ec526994fcc3b303e Mon Sep 17 00:00:00 2001
From: Mariia Aloshyna <55138456+mariia-aloshyna@users.noreply.github.com>
Date: Wed, 5 Jul 2023 16:54:38 +0300
Subject: [PATCH 60/68] UIIN-2282: leverage cookie-based authentication in all
 API requests (#2196)

---
 CHANGELOG.md               | 1 +
 src/edit/items/ItemForm.js | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b26869a8d..0d348c547 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
 * Statistical Code dropdown "contains" type ahead functionality needed (Instance/Holdings/Items). Refs UIIN-2466.
 * Fix problem with a large number of items on a single holdings record. Refs UIIN-2478.
 * Decrease rerenders for TargetProfileDetail component to avoid errors when view the target profile. Fixes UIIN-2467.
+* leverage cookie-based authentication in all API requests. Refs UIIN-2282.
 
 ## [9.4.8](https://github.com/folio-org/ui-inventory/tree/v9.4.8) (2023-06-30)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.7...v9.4.8)
diff --git a/src/edit/items/ItemForm.js b/src/edit/items/ItemForm.js
index 19061a580..423d9d522 100644
--- a/src/edit/items/ItemForm.js
+++ b/src/edit/items/ItemForm.js
@@ -92,9 +92,12 @@ function validate(values) {
 function checkUniqueBarcode(okapi, barcode) {
   return fetch(`${okapi.url}/inventory/items?query=(barcode=="${barcode}")`,
     {
-      headers: { 'X-Okapi-Tenant': okapi.tenant,
-        'X-Okapi-Token': okapi.token,
-        'Content-Type': 'application/json' }
+      headers: {
+        'X-Okapi-Tenant': okapi.tenant,
+        'Content-Type': 'application/json',
+        ...(okapi.token && { 'X-Okapi-Token': okapi.token }),
+      },
+      credentials: 'include',
     });
 }
 

From 2279e9da1587889ad07c9a400db8f6868a91db1f Mon Sep 17 00:00:00 2001
From: Dmytro-Melnyshyn <77053927+Dmytro-Melnyshyn@users.noreply.github.com>
Date: Thu, 6 Jul 2023 11:48:24 +0300
Subject: [PATCH 61/68] UIIN-2385: Restrict modifying and deleting system call
 number types. (#2198)

---
 CHANGELOG.md                                  |  1 +
 .../FilterNavigation/FilterNavigation.js      | 26 +++++++++----------
 .../InstancesList/InstancesList.test.js       | 11 ++++----
 src/settings/CallNumberTypes.js               |  8 ++++++
 src/settings/CallNumberTypes.test.js          | 19 ++++++++++++++
 .../__mock__/stripesSmartComponents.mock.js   |  2 +-
 6 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d348c547..05a61f594 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@
 * Fix problem with a large number of items on a single holdings record. Refs UIIN-2478.
 * Decrease rerenders for TargetProfileDetail component to avoid errors when view the target profile. Fixes UIIN-2467.
 * leverage cookie-based authentication in all API requests. Refs UIIN-2282.
+* Restrict modifying and deleting system call number types. Refs UIIN-2385.
 
 ## [9.4.8](https://github.com/folio-org/ui-inventory/tree/v9.4.8) (2023-06-30)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.7...v9.4.8)
diff --git a/src/components/FilterNavigation/FilterNavigation.js b/src/components/FilterNavigation/FilterNavigation.js
index 92fd20f55..5f16087d3 100644
--- a/src/components/FilterNavigation/FilterNavigation.js
+++ b/src/components/FilterNavigation/FilterNavigation.js
@@ -26,20 +26,18 @@ const FilterNavigation = ({ segment, onChange }) => {
           searchParams.segment = name;
 
           return (
-            <>
-              <Button
-                key={`${name}`}
-                to={{
-                  pathname: '/inventory',
-                  search: queryString.stringify(searchParams),
-                }}
-                buttonStyle={`${segment === name ? 'primary' : 'default'}`}
-                id={`segment-navigation-${name}`}
-                onClick={() => onChange(name)}
-              >
-                <FormattedMessage id={`ui-inventory.filters.${name}`} />
-              </Button>
-            </>
+            <Button
+              key={`${name}`}
+              to={{
+                pathname: '/inventory',
+                search: queryString.stringify(searchParams),
+              }}
+              buttonStyle={`${segment === name ? 'primary' : 'default'}`}
+              id={`segment-navigation-${name}`}
+              onClick={() => onChange(name)}
+            >
+              <FormattedMessage id={`ui-inventory.filters.${name}`} />
+            </Button>
           );
         })
       }
diff --git a/src/components/InstancesList/InstancesList.test.js b/src/components/InstancesList/InstancesList.test.js
index f4635470a..299b74dee 100644
--- a/src/components/InstancesList/InstancesList.test.js
+++ b/src/components/InstancesList/InstancesList.test.js
@@ -8,7 +8,6 @@ import {
   cleanup,
   fireEvent,
   screen,
-  waitFor,
   within,
 } from '@folio/jest-config-stripes/testing-library/react';
 
@@ -130,6 +129,7 @@ const renderInstancesList = ({
             getLastSearchOffset={mockGetLastSearchOffset}
             storeLastSearch={mockStoreLastSearch}
             storeLastSearchOffset={mockStoreLastSearchOffset}
+            storeLastSegment={noop}
             {...rest}
           />
         </ModuleHierarchyProvider>
@@ -291,10 +291,9 @@ describe('InstancesList', () => {
 
           const button = screen.getByRole('button', { name: 'New MARC Bib Record' });
 
-          waitFor(() => {
-            fireEvent.click(button);
-            expect(history.push).toHaveBeenCalledWith('/?layer=create-bib');
-          });
+          fireEvent.click(button);
+
+          expect(history.push).toHaveBeenCalledWith('/inventory/quick-marc/create-bib?');
         });
       });
 
@@ -341,7 +340,7 @@ describe('InstancesList', () => {
         });
 
         it('should select option value "Contributors" after column "Contributors" click', async () => {
-          await act(async () => userEvent.click(document.querySelector('#clickable-list-column-contributors')));
+          await act(async () => fireEvent.click(document.querySelector('#clickable-list-column-contributors')));
 
           expect((screen.getByRole('option', { name: 'Contributors' })).selected).toBeTruthy();
         });
diff --git a/src/settings/CallNumberTypes.js b/src/settings/CallNumberTypes.js
index ab68744e8..c6b54c1f9 100644
--- a/src/settings/CallNumberTypes.js
+++ b/src/settings/CallNumberTypes.js
@@ -5,6 +5,8 @@ import { FormattedMessage } from 'react-intl';
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
 
+import { sourceSuppressor } from '../utils';
+
 class CallNumberTypes extends React.Component {
   static propTypes = {
     stripes: PropTypes.shape({
@@ -19,6 +21,11 @@ class CallNumberTypes extends React.Component {
     this.connectedControlledVocab = props.stripes.connect(ControlledVocab);
   }
 
+  actionSuppressor = {
+    edit: sourceSuppressor('system'),
+    delete: sourceSuppressor('system'),
+  }
+
   render() {
     const hasPerm = this.props.stripes.hasPerm('ui-inventory.settings.call-number-types');
 
@@ -27,6 +34,7 @@ class CallNumberTypes extends React.Component {
         {intl => (
           <this.connectedControlledVocab
             {...this.props}
+            actionSuppressor={this.actionSuppressor}
             baseUrl="call-number-types"
             records="callNumberTypes"
             label={<FormattedMessage id="ui-inventory.callNumberTypes" />}
diff --git a/src/settings/CallNumberTypes.test.js b/src/settings/CallNumberTypes.test.js
index e07437497..f23e91d60 100644
--- a/src/settings/CallNumberTypes.test.js
+++ b/src/settings/CallNumberTypes.test.js
@@ -3,6 +3,10 @@ import { MemoryRouter } from 'react-router-dom';
 
 import '../../test/jest/__mock__';
 
+import { ControlledVocab } from '@folio/stripes/smart-components';
+
+import * as utils from '../utils';
+
 import {
   renderWithIntl,
   stripesStub,
@@ -11,6 +15,8 @@ import {
 
 import CallNumberTypes from './CallNumberTypes';
 
+jest.mock('../utils');
+
 const defaultProps = {
   stripes: {
     ...stripesStub,
@@ -34,4 +40,17 @@ describe('CallNumberTypes', () => {
     const { getByText } = renderCallNumberTypes();
     expect(getByText('ControlledVocab')).toBeInTheDocument();
   });
+
+  describe('when call number type is "system"', () => {
+    it('should hide the "edit" and "delete" buttons', () => {
+      renderCallNumberTypes();
+
+      const actionSuppressor = {
+        delete: expect(utils.sourceSuppressor).toHaveBeenCalledWith('system'),
+        edit: expect(utils.sourceSuppressor).toHaveBeenCalledWith('system'),
+      };
+
+      expect(ControlledVocab).toHaveBeenCalledWith(expect.objectContaining({ actionSuppressor }), {});
+    });
+  });
 });
diff --git a/test/jest/__mock__/stripesSmartComponents.mock.js b/test/jest/__mock__/stripesSmartComponents.mock.js
index bd2f50bfa..2e9c59be5 100644
--- a/test/jest/__mock__/stripesSmartComponents.mock.js
+++ b/test/jest/__mock__/stripesSmartComponents.mock.js
@@ -4,7 +4,7 @@ jest.mock('@folio/stripes/smart-components', () => ({
   ...jest.requireActual('@folio/stripes/smart-components'),
   LocationLookup: () => <div>LocationLookup</div>,
   ViewMetaData: () => <div>ViewMetaData</div>,
-  ControlledVocab: () => <div>ControlledVocab</div>,
+  ControlledVocab: jest.fn(() => <div>ControlledVocab</div>),
   ConfigManager: (props) => {
     const { getInitialValues, onBeforeSave, children } = props;
     const component =

From 05c58a076fad9103056a025184f7c80703246437 Mon Sep 17 00:00:00 2001
From: Maccabee Levine <31278545+maccabeelevine@users.noreply.github.com>
Date: Fri, 7 Jul 2023 10:58:40 -0400
Subject: [PATCH 62/68] UIIN-2478 De-dup holdingsRecordIds fetched (#2200)

---
 .../ViewHolding/HoldingBoundWith/useBoundWithHoldings.js     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.js b/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.js
index 9a9080605..448627f80 100644
--- a/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.js
+++ b/src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.js
@@ -1,7 +1,10 @@
 import useChunkedCQLFetch from '../../../hooks/useChunkedCQLFetch';
 
 const useBoundWithHoldings = (boundWithItems) => {
-  const holdingsRecordIds = boundWithItems?.map(x => x.holdingsRecordId);
+  let holdingsRecordIds = boundWithItems?.map(x => x.holdingsRecordId);
+
+  // De-dup the list of holdingsRecordIds for efficiency
+  holdingsRecordIds = [...new Set(holdingsRecordIds)];
 
   const { items: holdingsRecords, isLoading } = useChunkedCQLFetch({
     ids: holdingsRecordIds,

From 1657f41a004099620be681e7afd741a7cc3b37b5 Mon Sep 17 00:00:00 2001
From: Yury Saukou <yury_saukou@epam.com>
Date: Mon, 10 Jul 2023 09:49:38 +0400
Subject: [PATCH 63/68] UIIN-2482 Prevent editing of shared settings from
 outside "Consortium manager" (#2199)

* UIIN-2482 Prevent editing of shared settings from outside 'Consortium manager'

* UIIN-2482 fix unit test

* UIIN-2482 code review
---
 CHANGELOG.md                                  |  1 +
 src/constants.js                              | 13 +++++++++++++
 src/settings/AlternativeTitleTypesSettings.js |  7 +++++++
 src/settings/CallNumberTypes.js               |  7 ++++---
 src/settings/CallNumberTypes.test.js          | 11 +++++------
 src/settings/ClassificationTypesSettings.js   |  8 ++++++--
 src/settings/ContributorTypesSettings.js      |  8 ++++++--
 src/settings/FormatsSettings.js               |  9 ++++++---
 src/settings/HoldingsNoteTypesSettings.js     |  7 +++++++
 src/settings/HoldingsSourcesSettings.js       |  5 +++--
 src/settings/HoldingsTypeSettings.js          |  7 +++++++
 src/settings/IdentifierTypesSettings.js       |  8 ++++++--
 src/settings/InstanceNoteTypesSettings.js     |  7 +++++++
 src/settings/InstanceStatusTypesSettings.js   |  9 ++++++---
 src/settings/ItemNoteTypesSettings.js         |  7 +++++++
 src/settings/LoanTypesSettings.js             |  7 +++++++
 src/settings/MaterialTypesSettings.js         |  7 +++++++
 src/settings/ModesOfIssuanceSettings.js       |  8 ++++++--
 src/settings/NatureOfContentTermsSettings.js  |  8 ++++++--
 src/settings/ResourceTypesSettings.js         |  9 ++++++---
 src/settings/StatisticalCodeSettings.js       |  5 +++++
 src/settings/StatisticalCodeTypes.js          |  7 +++++++
 src/settings/URLRelationshipSettings.js       |  7 +++++++
 src/utils.js                                  |  2 --
 24 files changed, 142 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05a61f594..006cd1d03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 * Decrease rerenders for TargetProfileDetail component to avoid errors when view the target profile. Fixes UIIN-2467.
 * leverage cookie-based authentication in all API requests. Refs UIIN-2282.
 * Restrict modifying and deleting system call number types. Refs UIIN-2385.
+* Prevent editing of shared settings from outside "Consortium manager". Refs UIIN-2482.
 
 ## [9.4.8](https://github.com/folio-org/ui-inventory/tree/v9.4.8) (2023-06-30)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.7...v9.4.8)
diff --git a/src/constants.js b/src/constants.js
index e2d1c7fe2..cc20643f0 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -439,3 +439,16 @@ export const SINGLE_ITEM_QUERY_TEMPLATES = {
   itemHrid: 'hrid==%{query}',
   iid: 'id==%{query}',
 };
+
+export const RECORD_SOURCE = {
+  CONSORTIUM: 'consortium',
+  FOLIO: 'folio',
+  INN_REACH: 'inn-reach',
+  LOCAL: 'local',
+  MARC_RELATOR: 'marcrelator',
+  RDA_CARRIER: 'rdacarrier',
+  RDA_CONTENT: 'rdacontent',
+  RDA_MODE_ISSUE: 'rdamodeissue',
+  SYSTEM: 'system',
+  UC: 'UC',
+};
diff --git a/src/settings/AlternativeTitleTypesSettings.js b/src/settings/AlternativeTitleTypesSettings.js
index 409fd9cf3..1176d4c4d 100644
--- a/src/settings/AlternativeTitleTypesSettings.js
+++ b/src/settings/AlternativeTitleTypesSettings.js
@@ -4,6 +4,12 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
+
+import { RECORD_SOURCE } from '../constants';
+
+const suppress = getSourceSuppressor(RECORD_SOURCE.CONSORTIUM);
+const actionSuppressor = { edit: suppress, delete: suppress };
 
 class AlternativeTitleTypesSettings extends React.Component {
   static propTypes = {
@@ -37,6 +43,7 @@ class AlternativeTitleTypesSettings extends React.Component {
               name: intl.formatMessage({ id: 'ui-inventory.name' }),
               source: intl.formatMessage({ id: 'ui-inventory.source' }),
             }}
+            actionSuppressor={actionSuppressor}
             readOnlyFields={['source']}
             itemTemplate={{ source: 'local' }}
             hiddenFields={['description', 'numberOfObjects']}
diff --git a/src/settings/CallNumberTypes.js b/src/settings/CallNumberTypes.js
index c6b54c1f9..a2488588a 100644
--- a/src/settings/CallNumberTypes.js
+++ b/src/settings/CallNumberTypes.js
@@ -4,8 +4,9 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
-import { sourceSuppressor } from '../utils';
+import { RECORD_SOURCE } from '../constants';
 
 class CallNumberTypes extends React.Component {
   static propTypes = {
@@ -22,8 +23,8 @@ class CallNumberTypes extends React.Component {
   }
 
   actionSuppressor = {
-    edit: sourceSuppressor('system'),
-    delete: sourceSuppressor('system'),
+    edit: getSourceSuppressor(RECORD_SOURCE.SYSTEM),
+    delete: getSourceSuppressor(RECORD_SOURCE.SYSTEM),
   }
 
   render() {
diff --git a/src/settings/CallNumberTypes.test.js b/src/settings/CallNumberTypes.test.js
index f23e91d60..82ea0f527 100644
--- a/src/settings/CallNumberTypes.test.js
+++ b/src/settings/CallNumberTypes.test.js
@@ -4,18 +4,17 @@ import { MemoryRouter } from 'react-router-dom';
 import '../../test/jest/__mock__';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
-
-import * as utils from '../utils';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
 import {
   renderWithIntl,
   stripesStub,
   translationsProperties
 } from '../../test/jest/helpers';
-
+import { RECORD_SOURCE } from '../constants';
 import CallNumberTypes from './CallNumberTypes';
 
-jest.mock('../utils');
+jest.mock('@folio/stripes/util');
 
 const defaultProps = {
   stripes: {
@@ -46,8 +45,8 @@ describe('CallNumberTypes', () => {
       renderCallNumberTypes();
 
       const actionSuppressor = {
-        delete: expect(utils.sourceSuppressor).toHaveBeenCalledWith('system'),
-        edit: expect(utils.sourceSuppressor).toHaveBeenCalledWith('system'),
+        delete: expect(getSourceSuppressor).toHaveBeenNthCalledWith(1, RECORD_SOURCE.SYSTEM),
+        edit: expect(getSourceSuppressor).toHaveBeenNthCalledWith(2, RECORD_SOURCE.SYSTEM),
       };
 
       expect(ControlledVocab).toHaveBeenCalledWith(expect.objectContaining({ actionSuppressor }), {});
diff --git a/src/settings/ClassificationTypesSettings.js b/src/settings/ClassificationTypesSettings.js
index 3f92b0ca3..d98ca2f25 100644
--- a/src/settings/ClassificationTypesSettings.js
+++ b/src/settings/ClassificationTypesSettings.js
@@ -4,8 +4,9 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
-import { sourceSuppressor } from '../utils';
+import { RECORD_SOURCE } from '../constants';
 
 class ClassificationTypesSettings extends React.Component {
   static propTypes = {
@@ -23,7 +24,10 @@ class ClassificationTypesSettings extends React.Component {
 
   render() {
     const hasPerm = this.props.stripes.hasPerm('ui-inventory.settings.classification-types');
-    const suppress = sourceSuppressor('folio');
+    const suppress = getSourceSuppressor([
+      RECORD_SOURCE.FOLIO,
+      RECORD_SOURCE.CONSORTIUM,
+    ]);
 
     return (
       <IntlConsumer>
diff --git a/src/settings/ContributorTypesSettings.js b/src/settings/ContributorTypesSettings.js
index 8c41f026d..65d79f583 100644
--- a/src/settings/ContributorTypesSettings.js
+++ b/src/settings/ContributorTypesSettings.js
@@ -4,10 +4,11 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
+import { RECORD_SOURCE } from '../constants';
 import validateNameAndCode from './validateNameAndCode';
 
-import { sourceSuppressor } from '../utils';
 
 class ContributorTypesSettings extends React.Component {
   static propTypes = {
@@ -25,7 +26,10 @@ class ContributorTypesSettings extends React.Component {
 
   render() {
     const hasPerm = this.props.stripes.hasPerm('ui-inventory.settings.contributor-types');
-    const suppress = sourceSuppressor('marcrelator');
+    const suppress = getSourceSuppressor([
+      RECORD_SOURCE.MARC_RELATOR,
+      RECORD_SOURCE.CONSORTIUM,
+    ]);
 
     return (
       <IntlConsumer>
diff --git a/src/settings/FormatsSettings.js b/src/settings/FormatsSettings.js
index 89cffc504..bf5f8655f 100644
--- a/src/settings/FormatsSettings.js
+++ b/src/settings/FormatsSettings.js
@@ -4,11 +4,11 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
+import { RECORD_SOURCE } from '../constants';
 import validateNameAndCode from './validateNameAndCode';
 
-import { sourceSuppressor } from '../utils';
-
 class FormatSettings extends React.Component {
   static propTypes = {
     stripes: PropTypes.shape({
@@ -25,7 +25,10 @@ class FormatSettings extends React.Component {
 
   render() {
     const hasPerm = this.props.stripes.hasPerm('ui-inventory.settings.instance-formats');
-    const suppress = sourceSuppressor('rdacarrier');
+    const suppress = getSourceSuppressor([
+      RECORD_SOURCE.RDA_CARRIER,
+      RECORD_SOURCE.CONSORTIUM,
+    ]);
 
     return (
       <IntlConsumer>
diff --git a/src/settings/HoldingsNoteTypesSettings.js b/src/settings/HoldingsNoteTypesSettings.js
index 570f2a587..371ba8309 100644
--- a/src/settings/HoldingsNoteTypesSettings.js
+++ b/src/settings/HoldingsNoteTypesSettings.js
@@ -4,6 +4,12 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
+
+import { RECORD_SOURCE } from '../constants';
+
+const suppress = getSourceSuppressor(RECORD_SOURCE.CONSORTIUM);
+const actionSuppressor = { edit: suppress, delete: suppress };
 
 class HoldingsNoteTypesSettings extends React.Component {
   static propTypes = {
@@ -37,6 +43,7 @@ class HoldingsNoteTypesSettings extends React.Component {
               name: intl.formatMessage({ id: 'ui-inventory.name' }),
               source: intl.formatMessage({ id: 'ui-inventory.source' }),
             }}
+            actionSuppressor={actionSuppressor}
             readOnlyFields={['source']}
             itemTemplate={{ source: 'local' }}
             hiddenFields={['description', 'numberOfObjects']}
diff --git a/src/settings/HoldingsSourcesSettings.js b/src/settings/HoldingsSourcesSettings.js
index 487f0ef0a..ed31fa979 100644
--- a/src/settings/HoldingsSourcesSettings.js
+++ b/src/settings/HoldingsSourcesSettings.js
@@ -4,8 +4,9 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
-import { sourceSuppressor } from '../utils';
+import { RECORD_SOURCE } from '../constants';
 
 class HoldingsSourcesSettings extends React.Component {
   static propTypes = {
@@ -23,7 +24,7 @@ class HoldingsSourcesSettings extends React.Component {
 
   render() {
     const hasPerm = this.props.stripes.hasPerm('ui-inventory.settings.holdings-sources');
-    const suppress = sourceSuppressor('folio');
+    const suppress = getSourceSuppressor(RECORD_SOURCE.FOLIO);
 
     return (
       <IntlConsumer>
diff --git a/src/settings/HoldingsTypeSettings.js b/src/settings/HoldingsTypeSettings.js
index f08345c2c..930b4789c 100644
--- a/src/settings/HoldingsTypeSettings.js
+++ b/src/settings/HoldingsTypeSettings.js
@@ -4,6 +4,12 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
+
+import { RECORD_SOURCE } from '../constants';
+
+const suppress = getSourceSuppressor(RECORD_SOURCE.CONSORTIUM);
+const actionSuppressor = { edit: suppress, delete: suppress };
 
 class HoldingsTypeSettings extends React.Component {
   static propTypes = {
@@ -37,6 +43,7 @@ class HoldingsTypeSettings extends React.Component {
               name: intl.formatMessage({ id: 'ui-inventory.name' }),
               source: intl.formatMessage({ id: 'ui-inventory.source' }),
             }}
+            actionSuppressor={actionSuppressor}
             readOnlyFields={['source']}
             itemTemplate={{ source: 'local' }}
             hiddenFields={['description', 'numberOfObjects']}
diff --git a/src/settings/IdentifierTypesSettings.js b/src/settings/IdentifierTypesSettings.js
index 78ab83e72..f2506177e 100644
--- a/src/settings/IdentifierTypesSettings.js
+++ b/src/settings/IdentifierTypesSettings.js
@@ -4,8 +4,9 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
-import { sourceSuppressor } from '../utils';
+import { RECORD_SOURCE } from '../constants';
 
 class IdentifierTypesSettings extends React.Component {
   static propTypes = {
@@ -23,7 +24,10 @@ class IdentifierTypesSettings extends React.Component {
 
   render() {
     const hasPerm = this.props.stripes.hasPerm('ui-inventory.settings.identifier-types');
-    const suppress = sourceSuppressor('folio');
+    const suppress = getSourceSuppressor([
+      RECORD_SOURCE.FOLIO,
+      RECORD_SOURCE.CONSORTIUM,
+    ]);
 
     return (
       <IntlConsumer>
diff --git a/src/settings/InstanceNoteTypesSettings.js b/src/settings/InstanceNoteTypesSettings.js
index 0d53b585a..aeeb91eab 100644
--- a/src/settings/InstanceNoteTypesSettings.js
+++ b/src/settings/InstanceNoteTypesSettings.js
@@ -4,6 +4,12 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
+
+import { RECORD_SOURCE } from '../constants';
+
+const suppress = getSourceSuppressor(RECORD_SOURCE.CONSORTIUM);
+const actionSuppressor = { edit: suppress, delete: suppress };
 
 class InstanceNoteTypesSettings extends React.Component {
   static propTypes = {
@@ -37,6 +43,7 @@ class InstanceNoteTypesSettings extends React.Component {
               name: intl.formatMessage({ id: 'ui-inventory.name' }),
               source: intl.formatMessage({ id: 'ui-inventory.source' }),
             }}
+            actionSuppressor={actionSuppressor}
             readOnlyFields={['source']}
             itemTemplate={{ source: 'local' }}
             hiddenFields={['description', 'numberOfObjects']}
diff --git a/src/settings/InstanceStatusTypesSettings.js b/src/settings/InstanceStatusTypesSettings.js
index 5625e21e7..604370d17 100644
--- a/src/settings/InstanceStatusTypesSettings.js
+++ b/src/settings/InstanceStatusTypesSettings.js
@@ -4,11 +4,11 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
+import { RECORD_SOURCE } from '../constants';
 import validateNameAndCode from './validateNameAndCode';
 
-import { sourceSuppressor } from '../utils';
-
 class InstanceStatusTypesSettings extends React.Component {
   static propTypes = {
     stripes: PropTypes.shape({
@@ -25,7 +25,10 @@ class InstanceStatusTypesSettings extends React.Component {
 
   render() {
     const hasPerm = this.props.stripes.hasPerm('ui-inventory.settings.instance-statuses');
-    const suppress = sourceSuppressor('marcrelator');
+    const suppress = getSourceSuppressor([
+      RECORD_SOURCE.MARC_RELATOR,
+      RECORD_SOURCE.CONSORTIUM,
+    ]);
 
     return (
       <IntlConsumer>
diff --git a/src/settings/ItemNoteTypesSettings.js b/src/settings/ItemNoteTypesSettings.js
index 5c3c7dd5c..941159e6b 100644
--- a/src/settings/ItemNoteTypesSettings.js
+++ b/src/settings/ItemNoteTypesSettings.js
@@ -4,6 +4,12 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
+
+import { RECORD_SOURCE } from '../constants';
+
+const suppress = getSourceSuppressor(RECORD_SOURCE.CONSORTIUM);
+const actionSuppressor = { edit: suppress, delete: suppress };
 
 class ItemNoteTypesSettings extends React.Component {
   static propTypes = {
@@ -37,6 +43,7 @@ class ItemNoteTypesSettings extends React.Component {
               name: intl.formatMessage({ id: 'ui-inventory.name' }),
               source: intl.formatMessage({ id: 'ui-inventory.source' }),
             }}
+            actionSuppressor={actionSuppressor}
             readOnlyFields={['source']}
             itemTemplate={{ source: 'local' }}
             hiddenFields={['description', 'numberOfObjects']}
diff --git a/src/settings/LoanTypesSettings.js b/src/settings/LoanTypesSettings.js
index 90c3752ff..7dda03812 100644
--- a/src/settings/LoanTypesSettings.js
+++ b/src/settings/LoanTypesSettings.js
@@ -4,6 +4,12 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
+
+import { RECORD_SOURCE } from '../constants';
+
+const suppress = getSourceSuppressor(RECORD_SOURCE.CONSORTIUM);
+const actionSuppressor = { edit: suppress, delete: suppress };
 
 class LoanTypesSettings extends React.Component {
   static propTypes = {
@@ -32,6 +38,7 @@ class LoanTypesSettings extends React.Component {
             label={<FormattedMessage id="ui-inventory.loanTypes" />}
             labelSingular={intl.formatMessage({ id: 'ui-inventory.loanType' })}
             objectLabel={<FormattedMessage id="ui-inventory.loans" />}
+            actionSuppressor={actionSuppressor}
             hiddenFields={['description', 'numberOfObjects']}
             nameKey="name"
             id="loantypes"
diff --git a/src/settings/MaterialTypesSettings.js b/src/settings/MaterialTypesSettings.js
index a01e54bda..5393cbcc3 100644
--- a/src/settings/MaterialTypesSettings.js
+++ b/src/settings/MaterialTypesSettings.js
@@ -4,6 +4,12 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
+
+import { RECORD_SOURCE } from '../constants';
+
+const suppress = getSourceSuppressor(RECORD_SOURCE.CONSORTIUM);
+const actionSuppressor = { edit: suppress, delete: suppress };
 
 class MaterialTypesSettings extends React.Component {
   static propTypes = {
@@ -37,6 +43,7 @@ class MaterialTypesSettings extends React.Component {
               name: intl.formatMessage({ id: 'ui-inventory.name' }),
               source: intl.formatMessage({ id: 'ui-inventory.source' }),
             }}
+            actionSuppressor={actionSuppressor}
             readOnlyFields={['source']}
             itemTemplate={{ source: 'local' }}
             hiddenFields={['description', 'numberOfObjects']}
diff --git a/src/settings/ModesOfIssuanceSettings.js b/src/settings/ModesOfIssuanceSettings.js
index dd8af1087..7136b8555 100644
--- a/src/settings/ModesOfIssuanceSettings.js
+++ b/src/settings/ModesOfIssuanceSettings.js
@@ -4,8 +4,9 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
-import { sourceSuppressor } from '../utils';
+import { RECORD_SOURCE } from '../constants';
 
 class ModesOfIssuanceSettings extends React.Component {
   static propTypes = {
@@ -23,7 +24,10 @@ class ModesOfIssuanceSettings extends React.Component {
 
   render() {
     const hasPerm = this.props.stripes.hasPerm('ui-inventory.settings.modes-of-issuance');
-    const suppress = sourceSuppressor('rdamodeissue');
+    const suppress = getSourceSuppressor([
+      RECORD_SOURCE.RDA_MODE_ISSUE,
+      RECORD_SOURCE.CONSORTIUM,
+    ]);
 
     return (
       <IntlConsumer>
diff --git a/src/settings/NatureOfContentTermsSettings.js b/src/settings/NatureOfContentTermsSettings.js
index 205068959..bd7a48196 100644
--- a/src/settings/NatureOfContentTermsSettings.js
+++ b/src/settings/NatureOfContentTermsSettings.js
@@ -4,8 +4,9 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
-import { sourceSuppressor } from '../utils';
+import { RECORD_SOURCE } from '../constants';
 
 class NatureOfContentTermsSettings extends React.Component {
   static propTypes = {
@@ -23,7 +24,10 @@ class NatureOfContentTermsSettings extends React.Component {
 
   render() {
     const hasPerm = this.props.stripes.hasPerm('ui-inventory.settings.nature-of-content-terms');
-    const suppress = sourceSuppressor('folio');
+    const suppress = getSourceSuppressor([
+      RECORD_SOURCE.FOLIO,
+      RECORD_SOURCE.CONSORTIUM,
+    ]);
 
     return (
       <IntlConsumer>
diff --git a/src/settings/ResourceTypesSettings.js b/src/settings/ResourceTypesSettings.js
index 07b3bf3c8..4c7dd0fe8 100644
--- a/src/settings/ResourceTypesSettings.js
+++ b/src/settings/ResourceTypesSettings.js
@@ -4,11 +4,11 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
+import { RECORD_SOURCE } from '../constants';
 import validateNameAndCode from './validateNameAndCode';
 
-import { sourceSuppressor } from '../utils';
-
 class ResourceTypesSettings extends React.Component {
   static propTypes = {
     stripes: PropTypes.shape({
@@ -25,7 +25,10 @@ class ResourceTypesSettings extends React.Component {
 
   render() {
     const hasPerm = this.props.stripes.hasPerm('ui-inventory.settings.instance-types');
-    const suppress = sourceSuppressor('rdacontent');
+    const suppress = getSourceSuppressor([
+      RECORD_SOURCE.RDA_CONTENT,
+      RECORD_SOURCE.CONSORTIUM,
+    ]);
 
     return (
       <IntlConsumer>
diff --git a/src/settings/StatisticalCodeSettings.js b/src/settings/StatisticalCodeSettings.js
index 4c3605574..bc88f772a 100644
--- a/src/settings/StatisticalCodeSettings.js
+++ b/src/settings/StatisticalCodeSettings.js
@@ -7,9 +7,13 @@ import { FormattedMessage } from 'react-intl';
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { Select } from '@folio/stripes/components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
 
+import { RECORD_SOURCE } from '../constants';
 import validateNameAndCode from './validateNameAndCode';
 
+const suppress = getSourceSuppressor(RECORD_SOURCE.CONSORTIUM);
+const actionSuppressor = { edit: suppress, delete: suppress };
 
 export const validate = (item, index, items) => {
   const errors = validateNameAndCode(item);
@@ -130,6 +134,7 @@ class StatisticalCodeSettings extends React.Component {
               statisticalCodeTypeId: intl.formatMessage({ id: 'ui-inventory.statisticalCodeTypes' }),
               source: intl.formatMessage({ id: 'ui-inventory.source' }),
             }}
+            actionSuppressor={actionSuppressor}
             readOnlyFields={['source']}
             itemTemplate={{ source: 'local' }}
             hiddenFields={['description', 'numberOfObjects']}
diff --git a/src/settings/StatisticalCodeTypes.js b/src/settings/StatisticalCodeTypes.js
index f9c7ff9a2..0bf5b4f75 100644
--- a/src/settings/StatisticalCodeTypes.js
+++ b/src/settings/StatisticalCodeTypes.js
@@ -4,6 +4,12 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
+
+import { RECORD_SOURCE } from '../constants';
+
+const suppress = getSourceSuppressor(RECORD_SOURCE.CONSORTIUM);
+const actionSuppressor = { edit: suppress, delete: suppress };
 
 class StatisticalCodeTypes extends React.Component {
   static propTypes = {
@@ -37,6 +43,7 @@ class StatisticalCodeTypes extends React.Component {
               name: intl.formatMessage({ id: 'ui-inventory.name' }),
               source: intl.formatMessage({ id: 'ui-inventory.source' }),
             }}
+            actionSuppressor={actionSuppressor}
             readOnlyFields={['source']}
             itemTemplate={{ source: 'local' }}
             hiddenFields={['description', 'numberOfObjects']}
diff --git a/src/settings/URLRelationshipSettings.js b/src/settings/URLRelationshipSettings.js
index bf8280c74..31203c6e6 100644
--- a/src/settings/URLRelationshipSettings.js
+++ b/src/settings/URLRelationshipSettings.js
@@ -4,6 +4,12 @@ import { FormattedMessage } from 'react-intl';
 
 import { ControlledVocab } from '@folio/stripes/smart-components';
 import { IntlConsumer } from '@folio/stripes/core';
+import { getSourceSuppressor } from '@folio/stripes/util';
+
+import { RECORD_SOURCE } from '../constants';
+
+const suppress = getSourceSuppressor(RECORD_SOURCE.CONSORTIUM);
+const actionSuppressor = { edit: suppress, delete: suppress };
 
 class URLRelationshipSettings extends React.Component {
   static propTypes = {
@@ -37,6 +43,7 @@ class URLRelationshipSettings extends React.Component {
               name: intl.formatMessage({ id: 'ui-inventory.name' }),
               source: intl.formatMessage({ id: 'ui-inventory.source' }),
             }}
+            actionSuppressor={actionSuppressor}
             readOnlyFields={['source']}
             itemTemplate={{ source: 'local' }}
             hiddenFields={['description', 'numberOfObjects']}
diff --git a/src/utils.js b/src/utils.js
index c1c3ebcfa..389e4414f 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -652,8 +652,6 @@ export const unmarshalInstance = (instance, identifierTypesById) => {
  */
 export const omitFromArray = (array, path) => array.map(title => omit(title, path));
 
-export const sourceSuppressor = sourceValue => term => term.source === sourceValue;
-
 export const getNextSelectedRowsState = (selectedRows, row) => {
   const { id } = row;
   const isRowSelected = Boolean(selectedRows[id]);

From e43f50dfe0cfa7af07bcb52b6ea218f0383515b7 Mon Sep 17 00:00:00 2001
From: Dmytro-Melnyshyn <77053927+Dmytro-Melnyshyn@users.noreply.github.com>
Date: Tue, 11 Jul 2023 14:35:38 +0300
Subject: [PATCH 64/68] UIIN-2358: Add new browse options to limit browse by
 call number type. (#2195)

---
 CHANGELOG.md                                  |  1 +
 .../BrowseResultsList/BrowseResultsList.js    |  2 +-
 src/components/BrowseResultsList/constants.js |  6 +++
 src/components/BrowseResultsList/utils.js     | 24 +++++++++
 .../BrowseResultsPane/BrowseResultsPane.js    |  2 +-
 src/constants.js                              | 27 ++++++++++
 src/filterConfig.js                           | 14 ++++-
 src/hooks/useInventoryBrowse/constants.js     | 18 +++++++
 .../useInventoryBrowse/useInventoryBrowse.js  |  2 +
 src/providers/LastSearchTermsProvider.js      |  2 +-
 src/routes/buildManifestObject.js             |  5 --
 src/utils.js                                  |  8 ++-
 src/utils.test.js                             | 36 +++++++++++++
 src/views/BrowseInventory/BrowseInventory.css |  9 ++++
 src/views/BrowseInventory/BrowseInventory.js  | 52 ++++++++++++++++---
 .../BrowseInventory/BrowseInventory.test.js   | 41 ++++++++++++++-
 translations/ui-inventory/en.json             |  7 +++
 17 files changed, 238 insertions(+), 18 deletions(-)
 create mode 100644 src/views/BrowseInventory/BrowseInventory.css

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 006cd1d03..4ae25f596 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@
 * leverage cookie-based authentication in all API requests. Refs UIIN-2282.
 * Restrict modifying and deleting system call number types. Refs UIIN-2385.
 * Prevent editing of shared settings from outside "Consortium manager". Refs UIIN-2482.
+* Add new browse options to limit browse by call number type. Fixes UIIN-2467.
 
 ## [9.4.8](https://github.com/folio-org/ui-inventory/tree/v9.4.8) (2023-06-30)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.7...v9.4.8)
diff --git a/src/components/BrowseResultsList/BrowseResultsList.js b/src/components/BrowseResultsList/BrowseResultsList.js
index 08640c719..9a3f068d5 100644
--- a/src/components/BrowseResultsList/BrowseResultsList.js
+++ b/src/components/BrowseResultsList/BrowseResultsList.js
@@ -100,7 +100,7 @@ const BrowseResultsList = ({
 };
 
 BrowseResultsList.propTypes = {
-  browseData: PropTypes.arrayOf(PropTypes.object).isRequired,
+  browseData: PropTypes.arrayOf(PropTypes.object),
   isEmptyMessage: PropTypes.node.isRequired,
   isLoading: PropTypes.bool,
   pagination: PropTypes.shape({
diff --git a/src/components/BrowseResultsList/constants.js b/src/components/BrowseResultsList/constants.js
index eb762f1f0..8a1b5517d 100644
--- a/src/components/BrowseResultsList/constants.js
+++ b/src/components/BrowseResultsList/constants.js
@@ -4,6 +4,12 @@ import { browseModeOptions } from '../../constants';
 export const VISIBLE_COLUMNS_MAP = {
   [browseModeOptions.SUBJECTS]: ['subject', 'numberOfTitles'],
   [browseModeOptions.CALL_NUMBERS]: ['callNumber', 'title', 'numberOfTitles'],
+  [browseModeOptions.DEWEY]: ['callNumber', 'title', 'numberOfTitles'],
+  [browseModeOptions.LIBRARY_OF_CONGRESS]: ['callNumber', 'title', 'numberOfTitles'],
+  [browseModeOptions.LOCAL]: ['callNumber', 'title', 'numberOfTitles'],
+  [browseModeOptions.NATIONAL_LIBRARY_OF_MEDICINE]: ['callNumber', 'title', 'numberOfTitles'],
+  [browseModeOptions.OTHER]: ['callNumber', 'title', 'numberOfTitles'],
+  [browseModeOptions.SUPERINTENDENT]: ['callNumber', 'title', 'numberOfTitles'],
   [browseModeOptions.CONTRIBUTORS]: ['contributor', 'contributorType', 'relatorTerm', 'numberOfTitles'],
 };
 
diff --git a/src/components/BrowseResultsList/utils.js b/src/components/BrowseResultsList/utils.js
index c5ad1c78d..ab55c744d 100644
--- a/src/components/BrowseResultsList/utils.js
+++ b/src/components/BrowseResultsList/utils.js
@@ -20,6 +20,30 @@ export const getSearchParams = (row, qindex) => {
       qindex: queryIndexes.CALL_NUMBER,
       query: row.shelfKey,
     },
+    [browseModeOptions.DEWEY]: {
+      qindex: queryIndexes.CALL_NUMBER,
+      query: row.shelfKey,
+    },
+    [browseModeOptions.LIBRARY_OF_CONGRESS]: {
+      qindex: queryIndexes.CALL_NUMBER,
+      query: row.shelfKey,
+    },
+    [browseModeOptions.LOCAL]: {
+      qindex: queryIndexes.CALL_NUMBER,
+      query: row.shelfKey,
+    },
+    [browseModeOptions.NATIONAL_LIBRARY_OF_MEDICINE]: {
+      qindex: queryIndexes.CALL_NUMBER,
+      query: row.shelfKey,
+    },
+    [browseModeOptions.OTHER]: {
+      qindex: queryIndexes.CALL_NUMBER,
+      query: row.shelfKey,
+    },
+    [browseModeOptions.SUPERINTENDENT]: {
+      qindex: queryIndexes.CALL_NUMBER,
+      query: row.shelfKey,
+    },
     [browseModeOptions.CONTRIBUTORS]: {
       qindex: queryIndexes.CONTRIBUTOR,
       query: row.name,
diff --git a/src/components/BrowseResultsPane/BrowseResultsPane.js b/src/components/BrowseResultsPane/BrowseResultsPane.js
index abdc888a7..3c93d14b3 100644
--- a/src/components/BrowseResultsPane/BrowseResultsPane.js
+++ b/src/components/BrowseResultsPane/BrowseResultsPane.js
@@ -97,7 +97,7 @@ const BrowseResultsPane = ({
 };
 
 BrowseResultsPane.propTypes = {
-  browseData: PropTypes.arrayOf(PropTypes.object).isRequired,
+  browseData: PropTypes.arrayOf(PropTypes.object),
   filters: PropTypes.object.isRequired,
   isFetching: PropTypes.bool,
   isFiltersOpened: PropTypes.bool.isRequired,
diff --git a/src/constants.js b/src/constants.js
index cc20643f0..87c252c42 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -107,16 +107,37 @@ export const segments = {
 
 export const browseModeOptions = {
   CALL_NUMBERS: 'callNumbers',
+  DEWEY: 'dewey',
+  LIBRARY_OF_CONGRESS: 'lc',
+  LOCAL: 'local',
+  NATIONAL_LIBRARY_OF_MEDICINE: 'nlm',
+  OTHER: 'other',
+  SUPERINTENDENT: 'sudoc',
   CONTRIBUTORS: 'contributors',
   SUBJECTS: 'browseSubjects',
 };
 
 export const browseModeMap = {
   callNumbers: 'callNumbers',
+  dewey: 'dewey',
+  lc: 'lc',
+  local: 'local',
+  nlm: 'nlm',
+  other: 'other',
+  sudoc: 'sudoc',
   contributors: 'contributors',
   browseSubjects: 'browseSubjects',
 };
 
+export const INDEXES_WITH_CALL_NUMBER_TYPE_PARAM = [
+  browseModeOptions.DEWEY,
+  browseModeOptions.LIBRARY_OF_CONGRESS,
+  browseModeOptions.LOCAL,
+  browseModeOptions.NATIONAL_LIBRARY_OF_MEDICINE,
+  browseModeOptions.OTHER,
+  browseModeOptions.SUPERINTENDENT,
+];
+
 export const undefinedAsString = 'undefined';
 
 export const CQL_FIND_ALL = 'cql.allRecords=1';
@@ -170,6 +191,12 @@ export const queryIndexes = {
   SUBJECT: 'subject',
   QUERY_SEARCH: 'querySearch',
   CALL_NUMBER: 'callNumber',
+  DEWEY: 'dewey',
+  LIBRARY_OF_CONGRESS: 'lc',
+  LOCAL: 'local',
+  NATIONAL_LIBRARY_OF_MEDICINE: 'nlm',
+  OTHER: 'other',
+  SUPERINTENDENT: 'sudoc',
   CONTRIBUTOR: 'contributor',
 };
 
diff --git a/src/filterConfig.js b/src/filterConfig.js
index f009ae712..e29bf717c 100644
--- a/src/filterConfig.js
+++ b/src/filterConfig.js
@@ -150,7 +150,19 @@ export const browseFiltersConfig = [
 ];
 
 export const browseInstanceIndexes = [
-  { label: 'ui-inventory.browse.callNumbers', value: `${browseModeOptions.CALL_NUMBERS}`, queryTemplate: '%{query.query}' },
+  {
+    label: 'ui-inventory.browse.callNumbers',
+    queryTemplate: '%{query.query}',
+    subIndexes: [
+      { label: 'ui-inventory.browse.callNumbersAll', value: browseModeOptions.CALL_NUMBERS },
+      { label: 'ui-inventory.browse.dewey', value: browseModeOptions.DEWEY },
+      { label: 'ui-inventory.browse.libOfCongress', value: browseModeOptions.LIBRARY_OF_CONGRESS },
+      { label: 'ui-inventory.browse.local', value: browseModeOptions.LOCAL },
+      { label: 'ui-inventory.browse.natLibOfMed', value: browseModeOptions.NATIONAL_LIBRARY_OF_MEDICINE },
+      { label: 'ui-inventory.browse.other', value: browseModeOptions.OTHER },
+      { label: 'ui-inventory.browse.superintendent', value: browseModeOptions.SUPERINTENDENT },
+    ],
+  },
   { label: 'ui-inventory.browse.contributors', value: `${browseModeOptions.CONTRIBUTORS}`, queryTemplate: '%{query.query}' },
   { label: 'ui-inventory.browse.subjects', value: `${browseModeOptions.SUBJECTS}`, queryTemplate: '%{query.query}' },
 ];
diff --git a/src/hooks/useInventoryBrowse/constants.js b/src/hooks/useInventoryBrowse/constants.js
index 94257cc21..70eaab45e 100644
--- a/src/hooks/useInventoryBrowse/constants.js
+++ b/src/hooks/useInventoryBrowse/constants.js
@@ -10,17 +10,35 @@ export const FIVE_MINUTES = 5 * 60 * 1000;
 export const PATH_MAP = {
   [browseModeOptions.SUBJECTS]: 'browse/subjects/instances',
   [browseModeOptions.CALL_NUMBERS]: 'browse/call-numbers/instances',
+  [browseModeOptions.DEWEY]: 'browse/call-numbers/instances',
+  [browseModeOptions.LIBRARY_OF_CONGRESS]: 'browse/call-numbers/instances',
+  [browseModeOptions.LOCAL]: 'browse/call-numbers/instances',
+  [browseModeOptions.NATIONAL_LIBRARY_OF_MEDICINE]: 'browse/call-numbers/instances',
+  [browseModeOptions.OTHER]: 'browse/call-numbers/instances',
+  [browseModeOptions.SUPERINTENDENT]: 'browse/call-numbers/instances',
   [browseModeOptions.CONTRIBUTORS]: 'browse/contributors/instances',
 };
 
 export const INITIAL_SEARCH_PARAMS_MAP = {
   [browseModeOptions.SUBJECTS]: 'value',
   [browseModeOptions.CALL_NUMBERS]: 'callNumber',
+  [browseModeOptions.DEWEY]: 'typedCallNumber',
+  [browseModeOptions.LIBRARY_OF_CONGRESS]: 'typedCallNumber',
+  [browseModeOptions.LOCAL]: 'typedCallNumber',
+  [browseModeOptions.NATIONAL_LIBRARY_OF_MEDICINE]: 'typedCallNumber',
+  [browseModeOptions.OTHER]: 'typedCallNumber',
+  [browseModeOptions.SUPERINTENDENT]: 'typedCallNumber',
   [browseModeOptions.CONTRIBUTORS]: 'name',
 };
 
 export const PAGINATION_SEARCH_PARAMS_MAP = {
   [browseModeOptions.SUBJECTS]: INITIAL_SEARCH_PARAMS_MAP[browseModeOptions.SUBJECTS],
   [browseModeOptions.CALL_NUMBERS]: 'itemEffectiveShelvingOrder',
+  [browseModeOptions.DEWEY]: 'itemEffectiveShelvingOrder',
+  [browseModeOptions.LIBRARY_OF_CONGRESS]: 'itemEffectiveShelvingOrder',
+  [browseModeOptions.LOCAL]: 'itemEffectiveShelvingOrder',
+  [browseModeOptions.NATIONAL_LIBRARY_OF_MEDICINE]: 'itemEffectiveShelvingOrder',
+  [browseModeOptions.OTHER]: 'itemEffectiveShelvingOrder',
+  [browseModeOptions.SUPERINTENDENT]: 'itemEffectiveShelvingOrder',
   [browseModeOptions.CONTRIBUTORS]: INITIAL_SEARCH_PARAMS_MAP[browseModeOptions.CONTRIBUTORS],
 };
diff --git a/src/hooks/useInventoryBrowse/useInventoryBrowse.js b/src/hooks/useInventoryBrowse/useInventoryBrowse.js
index bd11599cc..e29aae97a 100644
--- a/src/hooks/useInventoryBrowse/useInventoryBrowse.js
+++ b/src/hooks/useInventoryBrowse/useInventoryBrowse.js
@@ -66,6 +66,7 @@ const useInventoryBrowse = ({
   const {
     qindex,
     query: searchQuery,
+    callNumberType,
     ...otherFilters
   } = normalizedFilters;
 
@@ -73,6 +74,7 @@ const useInventoryBrowse = ({
     highlightMatch: !!searchQuery && !regExp.test(searchQuery),
     limit: BROWSE_RESULTS_COUNT,
     precedingRecordsCount: PRECEDING_RECORDS_COUNT,
+    ...(callNumberType && { callNumberType }),
   };
 
   const path = PATH_MAP[qindex];
diff --git a/src/providers/LastSearchTermsProvider.js b/src/providers/LastSearchTermsProvider.js
index dd733148e..ff52b15af 100644
--- a/src/providers/LastSearchTermsProvider.js
+++ b/src/providers/LastSearchTermsProvider.js
@@ -58,7 +58,7 @@ const LastSearchTermsProvider = ({ children }) => {
 };
 
 LastSearchTermsProvider.propTypes = {
-  children: PropTypes.object,
+  children: PropTypes.node,
 };
 
 export default LastSearchTermsProvider;
diff --git a/src/routes/buildManifestObject.js b/src/routes/buildManifestObject.js
index cc244d18c..efc909afb 100644
--- a/src/routes/buildManifestObject.js
+++ b/src/routes/buildManifestObject.js
@@ -19,7 +19,6 @@ const INITIAL_RESULT_COUNT = 100;
 const DEFAULT_SORT = 'title';
 
 const getQueryTemplateContributor = (queryValue) => `contributors.name==/string "${queryValue}"`;
-const getQueryTemplateCallNumber = (queryValue) => `itemEffectiveShelvingOrder==/string "${queryValue}"`;
 
 export function buildQuery(queryParams, pathComponents, resourceData, logger, props) {
   const { indexes, sortMap, filters } = getFilterConfig(queryParams.segment);
@@ -29,10 +28,6 @@ export function buildQuery(queryParams, pathComponents, resourceData, logger, pr
   let queryTemplate = getQueryTemplate(queryIndex, indexes);
 
   if (queryParams?.selectedBrowseResult) {
-    if (queryIndex === queryIndexes.CALL_NUMBER) {
-      queryTemplate = getQueryTemplateCallNumber(queryValue);
-    }
-
     if (queryIndex === queryIndexes.CONTRIBUTOR) {
       const escapedQueryValue = queryValue.replaceAll('"', '\\"');
 
diff --git a/src/utils.js b/src/utils.js
index 389e4414f..614166046 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -255,7 +255,13 @@ export function filterItemsBy(name) {
 }
 
 export function getQueryTemplate(queryIndex, indexes) {
-  const searchableIndex = indexes.find(({ value }) => value === queryIndex);
+  const searchableIndex = indexes.find(({ value, subIndexes }) => {
+    if (subIndexes) {
+      return subIndexes.some(subIndex => subIndex.value === queryIndex);
+    }
+
+    return value === queryIndex;
+  });
 
   return get(searchableIndex, 'queryTemplate');
 }
diff --git a/src/utils.test.js b/src/utils.test.js
index 17cfe76a8..c23523ebb 100644
--- a/src/utils.test.js
+++ b/src/utils.test.js
@@ -6,7 +6,9 @@ import {
   validateFieldLength,
   validateNumericField,
   validateAlphaNumericField,
+  getQueryTemplate,
 } from './utils';
+import { browseModeOptions } from './constants';
 
 describe('validateRequiredField', () => {
   const expectedResult = <FormattedMessage id="ui-inventory.hridHandling.validation.enterValue" />;
@@ -107,3 +109,37 @@ describe('validateAlphaNumericField', () => {
     expect(validateAlphaNumericField(nonAlphaNumeric)).toEqual(expectedResult);
   });
 });
+
+describe('getQueryTemplate', () => {
+  const indexes = [
+    {
+      label: 'ui-inventory.browse.callNumbers',
+      queryTemplate: '%{query.query}',
+      subIndexes: [
+        { label: 'ui-inventory.browse.callNumbersAll', value: browseModeOptions.CALL_NUMBERS },
+        { label: 'ui-inventory.browse.dewey', value: browseModeOptions.DEWEY },
+        { label: 'ui-inventory.browse.libOfCongress', value: browseModeOptions.LIBRARY_OF_CONGRESS },
+        { label: 'ui-inventory.browse.local', value: browseModeOptions.LOCAL },
+        { label: 'ui-inventory.browse.natLibOfMed', value: browseModeOptions.NATIONAL_LIBRARY_OF_MEDICINE },
+        { label: 'ui-inventory.browse.other', value: browseModeOptions.OTHER },
+        { label: 'ui-inventory.browse.superintendent', value: browseModeOptions.SUPERINTENDENT },
+      ],
+    },
+    { label: 'ui-inventory.browse.contributors', value: browseModeOptions.CONTRIBUTORS, queryTemplate: '%{query.query}' },
+    { label: 'ui-inventory.browse.subjects', value: browseModeOptions.SUBJECTS, queryTemplate: '%{query.query}' },
+  ];
+
+  describe('when a searchable index is in sub indexes', () => {
+    it('should return a queryTemplate', () => {
+      const queryIndex = browseModeOptions.DEWEY;
+      expect(getQueryTemplate(queryIndex, indexes)).toBe('%{query.query}');
+    });
+  });
+
+  describe('when a searchable index is not in sub indexes', () => {
+    it('should return a queryTemplate', () => {
+      const queryIndex = browseModeOptions.CONTRIBUTORS;
+      expect(getQueryTemplate(queryIndex, indexes)).toBe('%{query.query}');
+    });
+  });
+});
diff --git a/src/views/BrowseInventory/BrowseInventory.css b/src/views/BrowseInventory/BrowseInventory.css
new file mode 100644
index 000000000..1b7ecb137
--- /dev/null
+++ b/src/views/BrowseInventory/BrowseInventory.css
@@ -0,0 +1,9 @@
+.optgroup {
+  color: #bababa;
+  font-weight: 400;
+  background-color: #fff;
+
+  & option {
+      color: initial;
+    }
+}
diff --git a/src/views/BrowseInventory/BrowseInventory.js b/src/views/BrowseInventory/BrowseInventory.js
index 1f08e2c00..35dafcc1c 100644
--- a/src/views/BrowseInventory/BrowseInventory.js
+++ b/src/views/BrowseInventory/BrowseInventory.js
@@ -1,4 +1,4 @@
-import { useCallback, useState, useEffect } from 'react';
+import React, { useCallback, useState, useEffect, useMemo } from 'react';
 import { useIntl } from 'react-intl';
 import { useHistory, useLocation } from 'react-router-dom';
 
@@ -29,6 +29,8 @@ import {
   useLastSearchTerms,
 } from '../../hooks';
 import { INIT_PAGE_CONFIG } from '../../hooks/useInventoryBrowse';
+import { INDEXES_WITH_CALL_NUMBER_TYPE_PARAM } from '../../constants';
+import css from './BrowseInventory.css';
 
 const BrowseInventory = () => {
   const history = useHistory();
@@ -64,13 +66,24 @@ const BrowseInventory = () => {
     setPageConfig(INIT_PAGE_CONFIG);
   });
 
+  const withExtraFilters = useMemo(() => {
+    if (filters.query && INDEXES_WITH_CALL_NUMBER_TYPE_PARAM.includes(filters.qindex)) {
+      return {
+        ...filters,
+        callNumberType: filters.qindex,
+      };
+    }
+
+    return filters;
+  }, [filters]);
+
   const {
     data,
     isFetching,
     pagination,
     totalRecords,
   } = useInventoryBrowse({
-    filters,
+    filters: withExtraFilters,
     pageParams: { pageConfig, setPageConfig },
     options: { onSettled: deleteItemToView },
   });
@@ -80,10 +93,35 @@ const BrowseInventory = () => {
   const searchableIndexesPlaceholder = intl.formatMessage({ id: 'ui-inventory.browse.searchableIndexesPlaceholder' });
   const isResetButtonDisabled = !location.search && !searchQuery;
 
-  const formattedSearchableIndexes = browseInstanceIndexes.map(({ label, ...rest }) => ({
-    label: intl.formatMessage({ id: label }),
-    ...rest,
-  }));
+  const searchableOptions = browseInstanceIndexes.map((searchableIndex) => {
+    if (searchableIndex.subIndexes) {
+      return (
+        <optgroup
+          key={searchableIndex.label}
+          label={intl.formatMessage({ id: searchableIndex.label })}
+          className={css.optgroup}
+        >
+          {searchableIndex.subIndexes.map((subOption) => (
+            <option
+              key={subOption.value}
+              value={subOption.value}
+            >
+              {intl.formatMessage({ id: subOption.label })}
+            </option>
+          ))}
+        </optgroup>
+      );
+    }
+
+    return (
+      <option
+        key={searchableIndex.value}
+        value={searchableIndex.value}
+      >
+        {intl.formatMessage({ id: searchableIndex.label })}
+      </option>
+    );
+  });
 
   const onApplySearch = useCallback(() => {
     const isSearchQueryValid = validateDataQuery(searchQuery);
@@ -117,7 +155,7 @@ const BrowseInventory = () => {
             searchQuery={searchQuery}
             isLoading={isFetching}
             ariaLabelId="ui-inventory.browse"
-            searchableIndexes={formattedSearchableIndexes}
+            searchableOptions={searchableOptions}
             changeSearchIndex={onChangeSearchIndex}
             selectedIndex={searchIndex}
             searchableIndexesPlaceholder={searchableIndexesPlaceholder}
diff --git a/src/views/BrowseInventory/BrowseInventory.test.js b/src/views/BrowseInventory/BrowseInventory.test.js
index 619f93c4b..22e1fe432 100644
--- a/src/views/BrowseInventory/BrowseInventory.test.js
+++ b/src/views/BrowseInventory/BrowseInventory.test.js
@@ -15,7 +15,10 @@ import { browseModeOptions } from '../../constants';
 import BrowseInventory from './BrowseInventory';
 import { SearchModeNavigation } from '../../components';
 import { INIT_PAGE_CONFIG } from '../../hooks/useInventoryBrowse';
-import { useLastSearchTerms } from '../../hooks';
+import {
+  useLastSearchTerms,
+  useInventoryBrowse,
+} from '../../hooks';
 
 const mockGetLastSearch = jest.fn();
 const mockGetLastBrowseOffset = jest.fn().mockImplementation(() => INIT_PAGE_CONFIG);
@@ -178,4 +181,40 @@ describe('BrowseInventory', () => {
 
     expect(applySearch).not.toHaveBeenCalled();
   });
+
+  describe('when the selected qindex is one of those that should comprise the callNumberType param', () => {
+    it('should be added to the useInventoryBrowse filters', () => {
+      const filters = {
+        query: 'fakeQuery',
+        qindex: browseModeOptions.DEWEY,
+      };
+
+      useLocationFilters.mockReturnValue(getFiltersUtils({
+        filters,
+      }));
+
+      renderBrowseInventory();
+
+      const expectedFilters = {
+        ...filters,
+        callNumberType: filters.qindex,
+      };
+
+      expect(useInventoryBrowse).toHaveBeenCalledWith(expect.objectContaining({ filters: expectedFilters }));
+    });
+  });
+
+  it('should display search indexes', () => {
+    const { getByText } = renderBrowseInventory();
+
+    expect(getByText('Call numbers (all)')).toBeDefined();
+    expect(getByText('Dewey Decimal classification')).toBeDefined();
+    expect(getByText('Library of Congress classification')).toBeDefined();
+    expect(getByText('Local')).toBeDefined();
+    expect(getByText('National Library of Medicine classification')).toBeDefined();
+    expect(getByText('Other scheme')).toBeDefined();
+    expect(getByText('Superintendent of Documents classification')).toBeDefined();
+    expect(getByText('Contributors')).toBeDefined();
+    expect(getByText('Subjects')).toBeDefined();
+  });
 });
diff --git a/translations/ui-inventory/en.json b/translations/ui-inventory/en.json
index 1bac9429a..d5a7cb7ec 100644
--- a/translations/ui-inventory/en.json
+++ b/translations/ui-inventory/en.json
@@ -647,6 +647,13 @@
   "precedingField.connected": "Connected",
   "browse": "Browse",
   "browse.callNumbers": "Call numbers",
+  "browse.callNumbersAll": "Call numbers (all)",
+  "browse.dewey": "Dewey Decimal classification",
+  "browse.libOfCongress": "Library of Congress classification",
+  "browse.local": "Local",
+  "browse.natLibOfMed": "National Library of Medicine classification",
+  "browse.other": "Other scheme",
+  "browse.superintendent": "Superintendent of Documents classification",
   "browse.contributors": "Contributors",
   "browse.searchableIndexesPlaceholder": "Select a browse option",
   "browse.subjects": "Subjects",

From feefa83faf3a19800e70a563da95712bbd7a87ad Mon Sep 17 00:00:00 2001
From: Zak Burke <zburke@ebsco.com>
Date: Tue, 11 Jul 2023 09:42:57 -0400
Subject: [PATCH 65/68] UIIN-2489 use all available CPUs in CI (#2201)

Use all available CPU cores in CI. Note: this is not a code change.
All it does is adjust the CI pipeline to take better advantage of
available resources.

Refs UIIN-2489
---
 .github/workflows/build-npm-release.yml | 6 +++++-
 .github/workflows/build-npm.yml         | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-npm-release.yml b/.github/workflows/build-npm-release.yml
index c875a6d08..7a93a2ef0 100644
--- a/.github/workflows/build-npm-release.yml
+++ b/.github/workflows/build-npm-release.yml
@@ -87,8 +87,12 @@ jobs:
         run: yarn lint
         continue-on-error: true
 
+      - name: Get number of CPU cores
+        id: cpu-cores
+        uses: SimenB/github-actions-cpu-cores@v1
+
       - name: Run yarn test
-        run: xvfb-run --server-args="-screen 0 1024x768x24" yarn test $YARN_TEST_OPTIONS
+        run: xvfb-run --server-args="-screen 0 1024x768x24" yarn test $YARN_TEST_OPTIONS --max-workers ${{ steps.cpu-cores.outputs.count }}
 
       - name: Run yarn formatjs-compile
         if : ${{ env.COMPILE_TRANSLATION_FILES == 'true' }}
diff --git a/.github/workflows/build-npm.yml b/.github/workflows/build-npm.yml
index 4fa336254..ac084bd68 100644
--- a/.github/workflows/build-npm.yml
+++ b/.github/workflows/build-npm.yml
@@ -69,8 +69,12 @@ jobs:
         run: yarn lint
         continue-on-error: true
 
+      - name: Get number of CPU cores
+        id: cpu-cores
+        uses: SimenB/github-actions-cpu-cores@v1
+
       - name: Run yarn test
-        run: xvfb-run --server-args="-screen 0 1024x768x24" yarn test $YARN_TEST_OPTIONS
+        run: xvfb-run --server-args="-screen 0 1024x768x24" yarn test $YARN_TEST_OPTIONS --max-workers ${{ steps.cpu-cores.outputs.count }}
 
       - name: Run yarn formatjs-compile
         if: ${{ env.COMPILE_TRANSLATION_FILES == 'true' }}

From 7710c422a38d57c8d6a956f1274b6175875e73e4 Mon Sep 17 00:00:00 2001
From: FOLIO Translations Bot
 <38661258+folio-translations@users.noreply.github.com>
Date: Wed, 12 Jul 2023 09:30:07 -0400
Subject: [PATCH 66/68] Lokalise: updates

---
 translations/ui-inventory/ar.json     | 30 ++++++++++++++++-
 translations/ui-inventory/ber.json    | 30 ++++++++++++++++-
 translations/ui-inventory/ca.json     | 30 ++++++++++++++++-
 translations/ui-inventory/cs_CZ.json  | 46 +++++++++++++++++++++------
 translations/ui-inventory/da.json     | 30 ++++++++++++++++-
 translations/ui-inventory/de.json     | 30 ++++++++++++++++-
 translations/ui-inventory/en_GB.json  | 30 ++++++++++++++++-
 translations/ui-inventory/en_SE.json  | 30 ++++++++++++++++-
 translations/ui-inventory/en_US.json  | 30 ++++++++++++++++-
 translations/ui-inventory/es.json     | 30 ++++++++++++++++-
 translations/ui-inventory/es_419.json | 30 ++++++++++++++++-
 translations/ui-inventory/es_ES.json  | 30 ++++++++++++++++-
 translations/ui-inventory/fr.json     | 30 ++++++++++++++++-
 translations/ui-inventory/fr_FR.json  | 30 ++++++++++++++++-
 translations/ui-inventory/he.json     | 30 ++++++++++++++++-
 translations/ui-inventory/hi_IN.json  | 30 ++++++++++++++++-
 translations/ui-inventory/hu.json     | 30 ++++++++++++++++-
 translations/ui-inventory/it_IT.json  | 30 ++++++++++++++++-
 translations/ui-inventory/ja.json     | 30 ++++++++++++++++-
 translations/ui-inventory/ko.json     | 30 ++++++++++++++++-
 translations/ui-inventory/nb.json     | 30 ++++++++++++++++-
 translations/ui-inventory/nn.json     | 30 ++++++++++++++++-
 translations/ui-inventory/pl.json     | 30 ++++++++++++++++-
 translations/ui-inventory/pt_BR.json  | 40 +++++++++++++++++++----
 translations/ui-inventory/pt_PT.json  | 30 ++++++++++++++++-
 translations/ui-inventory/ru.json     | 30 ++++++++++++++++-
 translations/ui-inventory/sv.json     | 30 ++++++++++++++++-
 translations/ui-inventory/ur.json     | 30 ++++++++++++++++-
 translations/ui-inventory/zh_CN.json  | 30 ++++++++++++++++-
 translations/ui-inventory/zh_TW.json  | 30 ++++++++++++++++-
 30 files changed, 883 insertions(+), 43 deletions(-)

diff --git a/translations/ui-inventory/ar.json b/translations/ui-inventory/ar.json
index 8fdfa3c3c..001124d88 100644
--- a/translations/ui-inventory/ar.json
+++ b/translations/ui-inventory/ar.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ber.json b/translations/ui-inventory/ber.json
index ef997d1ff..5553d590c 100644
--- a/translations/ui-inventory/ber.json
+++ b/translations/ui-inventory/ber.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ca.json b/translations/ui-inventory/ca.json
index 0f3d70b39..aa526488f 100644
--- a/translations/ui-inventory/ca.json
+++ b/translations/ui-inventory/ca.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/cs_CZ.json b/translations/ui-inventory/cs_CZ.json
index f768218c8..98b025c67 100644
--- a/translations/ui-inventory/cs_CZ.json
+++ b/translations/ui-inventory/cs_CZ.json
@@ -243,7 +243,7 @@
     "statisticalCodeType": "Typ statistického kódu",
     "callNumberTypes": "Typy signatury",
     "holdingsItems": "Holdingy, Jednotky",
-    "holdingsType": "Typ holdingů",
+    "holdingsType": "Typ holdingu",
     "holdingsTypes": "Typy holdingů",
     "ILLPolicy": "Pravidla MVS",
     "illPolicy": "Pravidla MVS",
@@ -281,7 +281,7 @@
     "holdingsTitle": "Holdingy: {location} > {callNumber}",
     "addContributor": "Přidat autora",
     "selectIdentifierType": "Vyberte typ identifikátoru",
-    "selectAlternativeTitleType": "Vybrat alternativní typ titulku",
+    "selectAlternativeTitleType": "Vybrat alternativní typ názvu",
     "parentInstances": "Nadřazený titul",
     "addParentInstance": "Přidat nadřazený titul",
     "selectType": "Vybrat typ",
@@ -297,7 +297,7 @@
     "addFormerId": "Přidat dřívější identifikátor",
     "accessionNumber": "Přístupové číslo",
     "addStatisticalCode": "Přidání statistického kódu",
-    "selectHoldingsType": "Vybrat typ holdingů",
+    "selectHoldingsType": "Vybrat typ holdingu",
     "publicDisplay": "Veřejné vystavení",
     "addReceivingHistory": "Přidat historii příjmu",
     "selectIllPolicy": "Vybrat pravidla MVS",
@@ -355,7 +355,7 @@
     "classificationIdentifierTypes": "Typy identifikátorů klasifikace",
     "instanceNoteType": "Typ poznámky titulu",
     "natureOfContentTerms": "Povaha obsahu",
-    "natureOfContentTerm": "Povaha obsahu termínu",
+    "natureOfContentTerm": "Povaha termínu obsahu",
     "instanceTitle": "Titul: {title}.",
     "items.damageStatus.damaged": "Poškozená",
     "items.damageStatus.notdamaged": "Nepoškozeno",
@@ -420,7 +420,7 @@
     "reports.inTransitItem.checkInServicePoint": "Pult služeb pro Návrat",
     "reports.inTransitItem.checkInDateTime": "Datum a čas Návratu",
     "reports.inTransitItem.destinationServicePoint": "Cílový pult služeb",
-    "reports.inTransitItem.requestType": "Typ žádanek",
+    "reports.inTransitItem.requestType": "Typ žádanky",
     "reports.inTransitItem.requesterPatronGroup": "Kategorie čtenáře",
     "reports.inTransitItem.requestCreationDate": "Datum vytvoření žádanky",
     "reports.inTransitItem.requestExpirationDate": "Datum platnosti žádanky",
@@ -502,7 +502,7 @@
     "permission.settings.identifier-types": "Nastavení (Katalog): Vytvoření, úprava, smazání typů identifikátorů prostředků",
     "permission.settings.instance-statuses": "Nastavení (Katalog): Vytvoření, úprava, smazání typů stavu titulu",
     "permission.settings.statistical-codes": "Nastavení (Katalog): Vytváření, úpravy, mazání statistických kódů",
-    "permission.settings.alternative-title-types": "Nastavení (Katalog): Vytváření, úpravy, mazání alternativních typů názvech",
+    "permission.settings.alternative-title-types": "Nastavení (Katalog): Vytváření, úpravy, mazání alternativních typů názvů",
     "permission.settings.instance-types": "Nastavení (Katalog): Vytvoření, úprava, smazání místně definovaných typů prostředků",
     "permission.settings.nature-of-content-terms": "Nastavení (Katalog): Vytváření, úpravy, mazání povahy obsahu",
     "permission.settings.modes-of-issuance": "Nastavení (Katalog): Vytvoření, úprava, mazání místně definovaných režimů vystavování",
@@ -591,7 +591,7 @@
     "itemRecordWithDescription": "Záznam jednotky ({materialType}, {status})",
     "instanceRecordWithType": "Záznam titulu ({instanceTypeName})",
     "item.status.inProcessNonRequestable": "Ve zpracování (nelze vyžádat)",
-    "item.status.intellectualItem": "Fiktivní jednotka",
+    "item.status.intellectualItem": "Duševní jednotka",
     "item.status.longMissing": "Dlouho chybí",
     "item.status.restricted": "Omezeno",
     "item.status.unavailable": "Nedostupná",
@@ -600,7 +600,7 @@
     "instances.selectedRecords": "Vybrané záznamy",
     "communicationProblem": "Problém komunikace se serverem. Prosím zkuste to znovu",
     "itemStatusModal.heading": "Potvrdit stav jednotky: {itemStatus}",
-    "permission.items.mark-intellectual-item": "Katalog: Označení jednotek duševní jednotky",
+    "permission.items.mark-intellectual-item": "Katalog: Označit jednotky jako duševní jednotky",
     "permission.items.mark-restricted": "Katalog: Označení jednotek jako omezené přístupem",
     "actions": "Akce",
     "showColumns": "Zobrazit sloupce",
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Název",
     "actions.menuSection.sortBy.contributors": "Autoři",
     "exportInstanceInMARC": "Export titulu (MARC)",
-    "editInstance.title": "Upravit titul • {title}"
+    "editInstance.title": "Upravit titul • {title}",
+    "item.status.agedToLost.lowercase": "považováno za ztracené",
+    "item.status.available.lowercase": "dostupná",
+    "item.status.awaitingPickup.lowercase": "čeká na vyzvednutí",
+    "item.status.awaitingDelivery.lowercase": "čeká na doručení",
+    "item.status.checkedOut.lowercase": "vypůjčeno",
+    "item.status.claimedReturned.lowercase": "údajně vráceno",
+    "item.status.declaredLost.lowercase": "prohlášeno za ztracené",
+    "item.status.inProcess.lowercase": "ve zpracování",
+    "item.status.inProcessNonRequestable.lowercase": "ve zpracování (nelze vyžádat)",
+    "item.status.inTransit.lowercase": "v přepravě",
+    "item.status.intellectualItem.lowercase": "duševní jednotka",
+    "item.status.longMissing.lowercase": "dlouho chybějící",
+    "item.status.lostAndPaid.lowercase": "ztraceno a zaplaceno",
+    "item.status.missing.lowercase": "chybějící",
+    "item.status.onOrder.lowercase": "objednáno",
+    "item.status.paged.lowercase": "vyžádáno",
+    "item.status.restricted.lowercase": "omezeno",
+    "item.status.orderClosed.lowercase": "objednávka uzavřena",
+    "item.status.unavailable.lowercase": "nedostupný",
+    "item.status.unknown.lowercase": "neznámý",
+    "item.status.withdrawn.lowercase": "staženo",
+    "browse.callNumbersAll": "Signatury (všechny)",
+    "browse.dewey": "Deweyho desítková klasifikace",
+    "browse.libOfCongress": "Klasifikace Kongresové knihovny",
+    "browse.local": "Místní",
+    "browse.natLibOfMed": "Klasifikace Národní lékařské knihovny",
+    "browse.other": "Jiné schéma",
+    "browse.superintendent": "Vedoucí klasifikace dokumentů"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/da.json b/translations/ui-inventory/da.json
index 9004f1e13..f689fd649 100644
--- a/translations/ui-inventory/da.json
+++ b/translations/ui-inventory/da.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/de.json b/translations/ui-inventory/de.json
index 67358947e..d81c81c50 100644
--- a/translations/ui-inventory/de.json
+++ b/translations/ui-inventory/de.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Titel",
     "actions.menuSection.sortBy.contributors": "Mitwirkende",
     "exportInstanceInMARC": "Instanz exportieren (MARC)",
-    "editInstance.title": "Instanz bearbeiten • {title}"
+    "editInstance.title": "Instanz bearbeiten • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_GB.json b/translations/ui-inventory/en_GB.json
index ef997d1ff..5553d590c 100644
--- a/translations/ui-inventory/en_GB.json
+++ b/translations/ui-inventory/en_GB.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_SE.json b/translations/ui-inventory/en_SE.json
index ef997d1ff..5553d590c 100644
--- a/translations/ui-inventory/en_SE.json
+++ b/translations/ui-inventory/en_SE.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_US.json b/translations/ui-inventory/en_US.json
index ef997d1ff..5553d590c 100644
--- a/translations/ui-inventory/en_US.json
+++ b/translations/ui-inventory/en_US.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es.json b/translations/ui-inventory/es.json
index 8920ca58b..85ec4f4fb 100644
--- a/translations/ui-inventory/es.json
+++ b/translations/ui-inventory/es.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_419.json b/translations/ui-inventory/es_419.json
index 57c53eae9..490aefadd 100644
--- a/translations/ui-inventory/es_419.json
+++ b/translations/ui-inventory/es_419.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Título",
     "actions.menuSection.sortBy.contributors": "Colaboradores",
     "exportInstanceInMARC": "Instancia de exportación (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Editar instancia - {title}",
+    "item.status.agedToLost.lowercase": "Envejecido a perdido",
+    "item.status.available.lowercase": "disponible",
+    "item.status.awaitingPickup.lowercase": "en espera de recogida",
+    "item.status.awaitingDelivery.lowercase": "a la espera de la entrega",
+    "item.status.checkedOut.lowercase": "comprobado",
+    "item.status.claimedReturned.lowercase": "reclamado devuelto",
+    "item.status.declaredLost.lowercase": "declarado perdido",
+    "item.status.inProcess.lowercase": "en curso",
+    "item.status.inProcessNonRequestable.lowercase": "en curso (no solicitable)",
+    "item.status.inTransit.lowercase": "en tránsito",
+    "item.status.intellectualItem.lowercase": "objeto intelectual",
+    "item.status.longMissing.lowercase": "falta mucho",
+    "item.status.lostAndPaid.lowercase": "perdido y pagado",
+    "item.status.missing.lowercase": "falta",
+    "item.status.onOrder.lowercase": "por encargo",
+    "item.status.paged.lowercase": "paginado",
+    "item.status.restricted.lowercase": "restringido",
+    "item.status.orderClosed.lowercase": "pedido cerrado",
+    "item.status.unavailable.lowercase": "no disponible",
+    "item.status.unknown.lowercase": "desconocido",
+    "item.status.withdrawn.lowercase": "retirado",
+    "browse.callNumbersAll": "Números de clasificación",
+    "browse.dewey": "Clasificación decimal Dewey",
+    "browse.libOfCongress": "Clasificación de la Biblioteca del Congreso",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "Clasificación de la Biblioteca Nacional de Medicina",
+    "browse.other": "Otro régimen",
+    "browse.superintendent": "Clasificación del Superintendente de Documentos"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_ES.json b/translations/ui-inventory/es_ES.json
index c5cd91173..97936eead 100644
--- a/translations/ui-inventory/es_ES.json
+++ b/translations/ui-inventory/es_ES.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr.json b/translations/ui-inventory/fr.json
index e84addd93..d35eac93f 100644
--- a/translations/ui-inventory/fr.json
+++ b/translations/ui-inventory/fr.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr_FR.json b/translations/ui-inventory/fr_FR.json
index bd008a6c3..a5acba81c 100644
--- a/translations/ui-inventory/fr_FR.json
+++ b/translations/ui-inventory/fr_FR.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/he.json b/translations/ui-inventory/he.json
index 86530317f..36b13f67d 100644
--- a/translations/ui-inventory/he.json
+++ b/translations/ui-inventory/he.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hi_IN.json b/translations/ui-inventory/hi_IN.json
index ef997d1ff..5553d590c 100644
--- a/translations/ui-inventory/hi_IN.json
+++ b/translations/ui-inventory/hi_IN.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hu.json b/translations/ui-inventory/hu.json
index 982a83554..22c14a562 100644
--- a/translations/ui-inventory/hu.json
+++ b/translations/ui-inventory/hu.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/it_IT.json b/translations/ui-inventory/it_IT.json
index da786ddec..f9212dfa2 100644
--- a/translations/ui-inventory/it_IT.json
+++ b/translations/ui-inventory/it_IT.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ja.json b/translations/ui-inventory/ja.json
index 84d421d9c..61d3bd1d2 100644
--- a/translations/ui-inventory/ja.json
+++ b/translations/ui-inventory/ja.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ko.json b/translations/ui-inventory/ko.json
index f8f5411b5..5460f40ad 100644
--- a/translations/ui-inventory/ko.json
+++ b/translations/ui-inventory/ko.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nb.json b/translations/ui-inventory/nb.json
index ef997d1ff..5553d590c 100644
--- a/translations/ui-inventory/nb.json
+++ b/translations/ui-inventory/nb.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nn.json b/translations/ui-inventory/nn.json
index ef997d1ff..5553d590c 100644
--- a/translations/ui-inventory/nn.json
+++ b/translations/ui-inventory/nn.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pl.json b/translations/ui-inventory/pl.json
index 58f05a928..f379478c4 100644
--- a/translations/ui-inventory/pl.json
+++ b/translations/ui-inventory/pl.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_BR.json b/translations/ui-inventory/pt_BR.json
index aa231ac29..4a7237985 100644
--- a/translations/ui-inventory/pt_BR.json
+++ b/translations/ui-inventory/pt_BR.json
@@ -26,7 +26,7 @@
     "selectClassification": "Selecione o tipo de classificação",
     "number": "Número",
     "type": "Tipo",
-    "contributors": "Contribuidores",
+    "contributors": "Colaboradores",
     "physicalDescription": "Descrição física",
     "physicalDescriptions": "Descrições físicas",
     "addDescription": "Adicionar descrição",
@@ -173,7 +173,7 @@
     "instanceStatusUpdatedDate": "Data de atualização do status",
     "hridTaken": "Este HRID já foi usado",
     "instances.columns.title": "Título",
-    "instances.columns.contributors": "Contribuidores",
+    "instances.columns.contributors": "Colaboradores",
     "instances.columns.publishers": "Editoras",
     "instances.columns.relation": "Relação",
     "editions": "Edições",
@@ -279,7 +279,7 @@
     "createItem": "Criar item",
     "updateItem": "Atualizar item",
     "holdingsTitle": "Coleções: {location} > {callNumber}",
-    "addContributor": "Adicionar contribuidor",
+    "addContributor": "Adicionar colaborador",
     "selectIdentifierType": "Selecione o tipo de identificador",
     "selectAlternativeTitleType": "Selecione o tipo de título alternativo",
     "parentInstances": "Instâncias pai",
@@ -727,7 +727,7 @@
     "newOrder.modal.message": "Ao selecionar um pedido existente antes de clicar em \"Criar\", será adicionada uma nova linha de pedido ao pedido selecionado para este título. Deixando o campo do número do pedido em branco e clicando em \"Criar\", será possível criar um novo pedido e uma nova linha de pedido para este título.",
     "newOrder.modal.PONumber": "Número do pedido de compra",
     "newOrder.modal.PONumber.doesNotExist": "O número do pedido de compra não existe",
-    "instances.columns.contributor": "Contribuidor",
+    "instances.columns.contributor": "Colaborador",
     "instances.columns.contributorType": "Tipo",
     "instances.columns.relatorTerm": "Termo Relator",
     "search.holdings.uuid": "UUID das coleções",
@@ -740,7 +740,7 @@
     "search": "Buscar",
     "linkedToMarcAuthority": "Link para registro MARC de Autoridade",
     "browse.callNumbers": "Números de chamada",
-    "browse.contributors": "Contribuidores",
+    "browse.contributors": "Colaboradores",
     "browse.searchableIndexesPlaceholder": "Selecione uma opção de navegação",
     "browse.subjects": "Assuntos",
     "noItemDeleteModal.awaitingPickupMessage": "O item HRID <strong> {hrid} </strong> com código de barras <strong> {barcode} </strong> está em empréstimo e não pode ser excluído até ser devolvido novamente, e o status do item estar 'Disponível'",
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Título",
     "actions.menuSection.sortBy.contributors": "Colaboradores",
     "exportInstanceInMARC": "Exportar instâncias (MARC)",
-    "editInstance.title": "Editar instância • {title}"
+    "editInstance.title": "Editar instância • {title}",
+    "item.status.agedToLost.lowercase": "com tempo para ser considerado perdido",
+    "item.status.available.lowercase": "disponível",
+    "item.status.awaitingPickup.lowercase": "aguardando retirada",
+    "item.status.awaitingDelivery.lowercase": "aguardando entrega",
+    "item.status.checkedOut.lowercase": "emprestado",
+    "item.status.claimedReturned.lowercase": "alegou ter devolvido",
+    "item.status.declaredLost.lowercase": "declarado perdido",
+    "item.status.inProcess.lowercase": "em processo",
+    "item.status.inProcessNonRequestable.lowercase": "em processo (não solicitável)",
+    "item.status.inTransit.lowercase": "em trânsito",
+    "item.status.intellectualItem.lowercase": "item intelectual",
+    "item.status.longMissing.lowercase": "desaparecido há muito tempo",
+    "item.status.lostAndPaid.lowercase": "perdido e pago",
+    "item.status.missing.lowercase": "desaparecido",
+    "item.status.onOrder.lowercase": "encomendado",
+    "item.status.paged.lowercase": "solicitado",
+    "item.status.restricted.lowercase": "restrito",
+    "item.status.orderClosed.lowercase": "pedido fechado",
+    "item.status.unavailable.lowercase": "indisponível",
+    "item.status.unknown.lowercase": "desconhecido",
+    "item.status.withdrawn.lowercase": "retirado",
+    "browse.callNumbersAll": "Números de chamada (todos)",
+    "browse.dewey": "Classificação decimal de Dewey",
+    "browse.libOfCongress": "Classificação da Biblioteca do Congresso (LC)",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "Classificação da Biblioteca Nacional de Medicina (NLM)",
+    "browse.other": "Outro esquema",
+    "browse.superintendent": "Superintendente de Classificação de Documentos"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_PT.json b/translations/ui-inventory/pt_PT.json
index 7009ca50e..5e186514b 100644
--- a/translations/ui-inventory/pt_PT.json
+++ b/translations/ui-inventory/pt_PT.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ru.json b/translations/ui-inventory/ru.json
index b24d4d000..190af0970 100644
--- a/translations/ui-inventory/ru.json
+++ b/translations/ui-inventory/ru.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/sv.json b/translations/ui-inventory/sv.json
index ef997d1ff..5553d590c 100644
--- a/translations/ui-inventory/sv.json
+++ b/translations/ui-inventory/sv.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ur.json b/translations/ui-inventory/ur.json
index f6742ab76..49866b89c 100644
--- a/translations/ui-inventory/ur.json
+++ b/translations/ui-inventory/ur.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_CN.json b/translations/ui-inventory/zh_CN.json
index 52f79a2e2..9ec7f354a 100644
--- a/translations/ui-inventory/zh_CN.json
+++ b/translations/ui-inventory/zh_CN.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "题名",
     "actions.menuSection.sortBy.contributors": "贡献者",
     "exportInstanceInMARC": "导出实例（MARC）",
-    "editInstance.title": "编辑实例 • {title}"
+    "editInstance.title": "编辑实例 • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_TW.json b/translations/ui-inventory/zh_TW.json
index 15028040b..e756d5dc2 100644
--- a/translations/ui-inventory/zh_TW.json
+++ b/translations/ui-inventory/zh_TW.json
@@ -785,5 +785,33 @@
     "actions.menuSection.sortBy.title": "Title",
     "actions.menuSection.sortBy.contributors": "Contributors",
     "exportInstanceInMARC": "Export instance (MARC)",
-    "editInstance.title": "Edit instance • {title}"
+    "editInstance.title": "Edit instance • {title}",
+    "item.status.agedToLost.lowercase": "aged to lost",
+    "item.status.available.lowercase": "available",
+    "item.status.awaitingPickup.lowercase": "awaiting pickup",
+    "item.status.awaitingDelivery.lowercase": "awaiting delivery",
+    "item.status.checkedOut.lowercase": "checked out",
+    "item.status.claimedReturned.lowercase": "claimed returned",
+    "item.status.declaredLost.lowercase": "declared lost",
+    "item.status.inProcess.lowercase": "in process",
+    "item.status.inProcessNonRequestable.lowercase": "in process (non-requestable)",
+    "item.status.inTransit.lowercase": "in transit",
+    "item.status.intellectualItem.lowercase": "intellectual item",
+    "item.status.longMissing.lowercase": "long missing",
+    "item.status.lostAndPaid.lowercase": "lost and paid",
+    "item.status.missing.lowercase": "missing",
+    "item.status.onOrder.lowercase": "on order",
+    "item.status.paged.lowercase": "paged",
+    "item.status.restricted.lowercase": "restricted",
+    "item.status.orderClosed.lowercase": "order closed",
+    "item.status.unavailable.lowercase": "unavailable",
+    "item.status.unknown.lowercase": "unknown",
+    "item.status.withdrawn.lowercase": "withdrawn",
+    "browse.callNumbersAll": "Call numbers (all)",
+    "browse.dewey": "Dewey Decimal classification",
+    "browse.libOfCongress": "Library of Congress classification",
+    "browse.local": "Local",
+    "browse.natLibOfMed": "National Library of Medicine classification",
+    "browse.other": "Other scheme",
+    "browse.superintendent": "Superintendent of Documents classification"
 }
\ No newline at end of file

From 5e4984702a0b472ce639903084f24d708bcbd0b0 Mon Sep 17 00:00:00 2001
From: Denys Bohdan <denys_bohdan@epam.com>
Date: Fri, 14 Jul 2023 14:20:03 +0300
Subject: [PATCH 67/68] UIIN-1920 Implement Advanced Search modal (#2197)

* UIIN-1920 Implement Advanced Search modal

* UIIN-1920 Move some utility to utils

* UIIN-1920 Test advanced search usage

* UIIN-1920 Fix crashes

* UIIN-1920 Fix not parsing of match option by changing format of advanced search query

* UIIN-1920 Fix comments

* UIIN-1920 Fix page crash

* UIIN-1920 Added tests for build advanced search query
---
 CHANGELOG.md                                  |   1 +
 src/components/InstancesList/InstancesList.js |  51 ++++--
 .../InstancesList/InstancesList.test.js       |  18 ++-
 src/constants.js                              | 149 ++++++++++++++++++
 src/filterConfig.js                           |  49 ++++++
 src/routes/buildManifestObject.js             |  52 ++++++
 src/routes/buildManifestObject.test.js        |  28 ++++
 translations/ui-inventory/en.json             |   1 +
 8 files changed, 337 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ae25f596..31992a792 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 * Restrict modifying and deleting system call number types. Refs UIIN-2385.
 * Prevent editing of shared settings from outside "Consortium manager". Refs UIIN-2482.
 * Add new browse options to limit browse by call number type. Fixes UIIN-2467.
+* Implement Advanced search modal. Refs UIIN-1920.
 
 ## [9.4.8](https://github.com/folio-org/ui-inventory/tree/v9.4.8) (2023-06-30)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.7...v9.4.8)
diff --git a/src/components/InstancesList/InstancesList.js b/src/components/InstancesList/InstancesList.js
index ff1954f4b..26bd224a7 100644
--- a/src/components/InstancesList/InstancesList.js
+++ b/src/components/InstancesList/InstancesList.js
@@ -54,11 +54,12 @@ import {
   omitFromArray,
   isTestEnv,
   handleKeyCommand,
-  buildSingleItemQuery
+  buildSingleItemQuery,
 } from '../../utils';
 import {
   INSTANCES_ID_REPORT_TIMEOUT,
   SORTABLE_SEARCH_RESULT_LIST_COLUMNS,
+  queryIndexes,
   segments,
 } from '../../constants';
 import {
@@ -69,16 +70,16 @@ import ErrorModal from '../ErrorModal';
 import CheckboxColumn from './CheckboxColumn';
 import SelectedRecordsModal from '../SelectedRecordsModal';
 import ImportRecordModal from '../ImportRecordModal';
-
 import { buildQuery } from '../../routes/buildManifestObject';
 import {
   getItem,
   setItem,
 } from '../../storage';
 import facetsStore from '../../stores/facetsStore';
+import registerLogoutListener from '../../hooks/useLogout/utils';
+import { advancedSearchIndexes } from '../../filterConfig';
 
 import css from './instances.css';
-import registerLogoutListener from '../../hooks/useLogout/utils';
 
 const INITIAL_RESULT_COUNT = 30;
 const RESULT_COUNT_INCREMENT = 30;
@@ -968,6 +969,18 @@ class InstancesList extends React.Component {
     return `${defaultCellStyle} ${css.cellAlign}`;
   }
 
+  formatSearchableIndex = (index) => {
+    const { intl } = this.props;
+
+    const { prefix = '' } = index;
+    let label = index.label;
+    if (index.label.includes('ui-inventory')) {
+      label = prefix + intl.formatMessage({ id: index.label });
+    }
+
+    return { ...index, label };
+  }
+
   findAndOpenItem = async (instance) => {
     const {
       parentResources,
@@ -1121,15 +1134,28 @@ class InstancesList extends React.Component {
       this.setState({ isSingleResult: true });
     };
 
-    const formattedSearchableIndexes = searchableIndexes.map(index => {
-      const { prefix = '' } = index;
-      let label = index.label;
-      if (index.label.includes('ui-inventory')) {
-        label = prefix + intl.formatMessage({ id: index.label });
-      }
+    const formattedSearchableIndexes = searchableIndexes.map(this.formatSearchableIndex);
 
-      return { ...index, label };
-    });
+    const advancedSearchOptions = advancedSearchIndexes[segment].map(this.formatSearchableIndex);
+
+    const advancedSearchQueryBuilder = (rows) => {
+      const formatRowCondition = (row) => {
+        // use default row formatter, but wrap each search term with parentheses
+
+        const query = `${row.searchOption} ${row.match} ${row.query}`;
+        return query;
+      };
+
+      return rows.reduce((formattedQuery, row, index) => {
+        const rowCondition = formatRowCondition(row);
+
+        if (index === 0) {
+          return rowCondition;
+        }
+
+        return `${formattedQuery} ${row.bool} ${rowCondition}`;
+      }, '');
+    };
 
     const shortcuts = [
       {
@@ -1157,6 +1183,9 @@ class InstancesList extends React.Component {
             maxSortKeys={1}
             renderNavigation={this.renderNavigation}
             searchableIndexes={formattedSearchableIndexes}
+            advancedSearchIndex={queryIndexes.ADVANCED_SEARCH}
+            advancedSearchOptions={advancedSearchOptions}
+            advancedSearchQueryBuilder={advancedSearchQueryBuilder}
             selectedIndex={get(data.query, 'qindex')}
             searchableIndexesPlaceholder={null}
             initialResultCount={INITIAL_RESULT_COUNT}
diff --git a/src/components/InstancesList/InstancesList.test.js b/src/components/InstancesList/InstancesList.test.js
index 299b74dee..073c66259 100644
--- a/src/components/InstancesList/InstancesList.test.js
+++ b/src/components/InstancesList/InstancesList.test.js
@@ -234,7 +234,7 @@ describe('InstancesList', () => {
     describe('when clicking on the `Browse` tab', () => {
       it('should pass the correct search by clicking on the `Browse` tab', () => {
         cleanup();
-        const search = '?qindex=subjects&query=book';
+        const search = '?qindex=subject&query=book';
 
         jest.spyOn(history, 'push');
 
@@ -361,6 +361,22 @@ describe('InstancesList', () => {
         expect(screen.getByRole('searchbox', { name: 'Search' })).toHaveValue('search query');
       });
     });
+
+    describe('when using advanced search', () => {
+      beforeEach(() => {
+        userEvent.click(screen.getByRole('button', { name: 'Advanced search' }));
+        fireEvent.change(screen.getAllByRole('textbox', { name: 'Search for' })[0], {
+          target: { value: 'test' }
+        });
+
+        const advancedSearchSubmit = screen.getAllByRole('button', { name: 'Search' })[0];
+        userEvent.click(advancedSearchSubmit);
+      });
+
+      it('should set advanced search query in search input', () => {
+        expect(screen.getAllByLabelText('Search')[0].value).toEqual('keyword containsAll test');
+      });
+    });
   });
 
   describe('rendering InstancesList with holdings segment', () => {
diff --git a/src/constants.js b/src/constants.js
index 87c252c42..81b8e2ff7 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -198,6 +198,7 @@ export const queryIndexes = {
   OTHER: 'other',
   SUPERINTENDENT: 'sudoc',
   CONTRIBUTOR: 'contributor',
+  ADVANCED_SEARCH: 'advancedSearch',
 };
 
 export const indentifierTypeNames = {
@@ -467,6 +468,154 @@ export const SINGLE_ITEM_QUERY_TEMPLATES = {
   iid: 'id==%{query}',
 };
 
+export const fieldSearchConfigurations = {
+  keyword: {
+    exactPhrase: 'keyword==/string "%{query.query}"',
+    containsAll: 'keyword all "%{query.query}"',
+    startsWith: 'keyword all "%{query.query}*"',
+  },
+  contributor: {
+    exactPhrase: 'contributors.name==/string "%{query.query}"',
+    containsAll: 'contributors.name="*%{query.query}*"',
+    startsWith: 'contributors.name="%{query.query}*"',
+  },
+  title: {
+    exactPhrase: 'title==/string "%{query.query}"',
+    containsAll: 'title all "%{query.query}"',
+    startsWith: 'title all "%{query.query}*"',
+  },
+  isbn: {
+    exactPhrase: 'isbn=="%{query.query}"',
+    containsAll: 'isbn="*%{query.query}*"',
+    startsWith: 'isbn="%{query.query}*"',
+  },
+  issn: {
+    exactPhrase: 'issn=="%{query.query}"',
+    containsAll: 'issn="*%{query.query}*"',
+    startsWith: 'issn="%{query.query}*"',
+  },
+  identifier: {
+    exactPhrase: 'identifiers.value=="%{query.query}" or isbn=="%{query.query}"',
+    containsAll: 'identifiers.value="*%{query.query}*" or isbn="*%{query.query}*"',
+    startsWith: 'identifiers.value="%{query.query}*" or isbn="%{query.query}*"',
+  },
+  oclc: {
+    exactPhrase: 'oclc=="%{query.query}"',
+    containsAll: 'oclc="*%{query.query}*"',
+    startsWith: 'oclc="%{query.query}*"',
+  },
+  instanceNotes: {
+    exactPhrase: 'notes.note==/string "%{query.query}" or administrativeNotes==/string "%{query.query}"',
+    containsAll: 'notes.note all "%{query.query}" or administrativeNotes all "%{query.query}"',
+    startsWith: 'notes.note all "%{query.query}*" or administrativeNotes all "%{query.query}*"',
+  },
+  instanceAdministrativeNotes: {
+    exactPhrase: 'administrativeNotes==/string "%{query.query}"',
+    containsAll: 'administrativeNotes all "%{query.query}"',
+    startsWith: 'administrativeNotes all "%{query.query}*"',
+  },
+  subject: {
+    exactPhrase: 'subjects.value==/string "%{query.query}"',
+    containsAll: 'subjects.value all "%{query.query}"',
+    startsWith: 'subjects.value==/string "%{query.query}*"',
+  },
+  callNumber: {
+    exactPhrase: 'itemEffectiveShelvingOrder==/string "%{query.query}"',
+    containsAll: 'itemEffectiveShelvingOrder all "%{query.query}"',
+    startsWith: 'itemEffectiveShelvingOrder==/string "%{query.query}*"',
+  },
+  hrid: {
+    exactPhrase: 'hrid=="%{query.query}"',
+    containsAll: 'hrid=="*%{query.query}*"',
+    startsWith: 'hrid=="%{query.query}*"',
+  },
+  id: {
+    exactPhrase: 'id=="%{query.query}"',
+    containsAll: 'id="*%{query.query}*"',
+    startsWith: 'id="%{query.query}*"',
+  },
+  authorityId: {
+    exactPhrase: 'authorityId == %{query.query}',
+    containsAll: 'authorityId=="*%{query.query}*"',
+    startsWith: 'authorityId=="%{query.query}*"',
+  },
+  allFields: {
+    exactPhrase: 'cql.all==/string "%{query.query}"',
+    containsAll: 'cql.all all "%{query.query}"',
+    startsWith: 'cql.all all "%{query.query}*"',
+  },
+  holdingsFullCallNumbers: {
+    exactPhrase: 'holdingsFullCallNumbers=="%{query.query}"',
+    containsAll: 'holdingsFullCallNumbers="*%{query.query}*"',
+    startsWith: 'holdingsFullCallNumbers="%{query.query}*"',
+  },
+  holdingsNormalizedCallNumbers: {
+    exactPhrase: 'holdingsNormalizedCallNumbers=="%{query.query}"',
+    containsAll: 'holdingsNormalizedCallNumbers="*%{query.query}*"',
+    startsWith: 'holdingsNormalizedCallNumbers="%{query.query}*"',
+  },
+  holdingsNotes: {
+    exactPhrase: 'holdings.notes.note==/string "%{query.query}" or holdings.administrativeNotes==/string "%{query.query}"',
+    containsAll: 'holdings.notes.note all "%{query.query}" or holdings.administrativeNotes all "%{query.query}"',
+    startsWith: 'holdings.notes.note all "%{query.query}*" or holdings.administrativeNotes all "%{query.query}*"',
+  },
+  holdingsAdministrativeNotes: {
+    exactPhrase: 'holdings.administrativeNotes==/string "%{query.query}"',
+    containsAll: 'holdings.administrativeNotes all "%{query.query}"',
+    startsWith: 'holdings.administrativeNotes all "%{query.query}*"',
+  },
+  holdingsHrid: {
+    exactPhrase: 'holdings.hrid=="%{query.query}"',
+    containsAll: 'holdings.hrid=="*%{query.query}*"',
+    startsWith: 'holdings.hrid=="%{query.query}*"',
+  },
+  hid: {
+    exactPhrase: 'holdings.id=="%{query.query}"',
+    containsAll: 'holdings.id="*%{query.query}*"',
+    startsWith: 'holdings.id="%{query.query}*"',
+  },
+  barcode: {
+    exactPhrase: 'items.barcode=="%{query.query}"',
+    containsAll: 'items.barcode="*%{query.query}*"',
+    startsWith: 'items.barcode="%{query.query}*"',
+  },
+  itemFullCallNumbers: {
+    exactPhrase: 'itemFullCallNumbers=="%{query.query}"',
+    containsAll: 'itemFullCallNumbers="*%{query.query}*"',
+    startsWith: 'itemFullCallNumbers="%{query.query}*"',
+  },
+  itemNormalizedCallNumbers: {
+    exactPhrase: 'itemNormalizedCallNumbers=="%{query.query}"',
+    containsAll: 'itemNormalizedCallNumbers="*%{query.query}*"',
+    startsWith: 'itemNormalizedCallNumbers="%{query.query}*"',
+  },
+  itemNotes: {
+    exactPhrase: 'item.notes.note==/string "%{query.query}" or item.administrativeNotes==/string "%{query.query}"',
+    containsAll: 'item.notes.note all "%{query.query}" or item.administrativeNotes all "%{query.query}"',
+    startsWith: 'item.notes.note all "%{query.query}*" or item.administrativeNotes all "%{query.query}*"',
+  },
+  itemAdministrativeNotes: {
+    exactPhrase: 'item.administrativeNotes==/string "%{query.query}"',
+    containsAll: 'item.administrativeNotes all "%{query.query}"',
+    startsWith: 'item.administrativeNotes all "%{query.query}*"',
+  },
+  itemCirculationNotes: {
+    exactPhrase: 'item.circulationNotes.note==/string "%{query.query}"',
+    containsAll: 'item.circulationNotes.note all "%{query.query}"',
+    startsWith: 'item.circulationNotes.note all "%{query.query}*"',
+  },
+  itemHrid: {
+    exactPhrase: 'items.hrid=="%{query.query}"',
+    containsAll: 'items.hrid="*%{query.query}*"',
+    startsWith: 'items.hrid="%{query.query}*"',
+  },
+  iid: {
+    exactPhrase: 'item.id=="%{query.query}"',
+    containsAll: 'item.id="*%{query.query}*"',
+    startsWith: 'item.id="%{query.query}*"',
+  },
+};
+
 export const RECORD_SOURCE = {
   CONSORTIUM: 'consortium',
   FOLIO: 'folio',
diff --git a/src/filterConfig.js b/src/filterConfig.js
index e29bf717c..fe855ae9f 100644
--- a/src/filterConfig.js
+++ b/src/filterConfig.js
@@ -113,6 +113,52 @@ export const instanceFilterConfig = [
   },
 ];
 
+export const advancedSearchIndexes = {
+  instances: [
+    { label: 'ui-inventory.search.all', value: 'keyword' },
+    { label: 'ui-inventory.contributor', value: 'contributor' },
+    { label: 'ui-inventory.title', value: 'title' },
+    { label: 'ui-inventory.identifierAll', value: 'identifier' },
+    { label: 'ui-inventory.isbn', value: 'isbn' },
+    { label: 'ui-inventory.issn', value: 'issn' },
+    { label: 'ui-inventory.search.oclc', value: 'oclc' },
+    { label: 'ui-inventory.search.instanceNotes', value: 'isntanceNotes' },
+    { label: 'ui-inventory.search.instanceAdministrativeNotes', value: 'instanceAdministrativeNotes' },
+    { label: 'ui-inventory.subject', value: 'subject' },
+    { label: 'ui-inventory.effectiveCallNumberShelving', value: 'callNumber' },
+    { label: 'ui-inventory.instanceHrid', value: 'hrid' },
+    { label: 'ui-inventory.instanceId', value: 'id' },
+    { label: 'ui-inventory.authorityId', value: 'authorityId' },
+    { label: 'ui-inventory.search.allFields', value: 'allFields' },
+  ],
+  holdings: [
+    { label: 'ui-inventory.search.all', value: 'keyword' },
+    { label: 'ui-inventory.isbn', value: 'isbn' },
+    { label: 'ui-inventory.issn', value: 'issn' },
+    { label: 'ui-inventory.callNumberEyeReadable', value: 'holdingsFullCallNumbers' },
+    { label: 'ui-inventory.callNumberNormalized', value: 'callNumberNormalized' },
+    { label: 'ui-inventory.search.holdingsNotes', value: 'holdingsNotes' },
+    { label: 'ui-inventory.search.holdingsAdministrativeNotes', value: 'holdingsAdministrativeNotes' },
+    { label: 'ui-inventory.holdingsHrid', value: 'hrid' },
+    { label: 'ui-inventory.search.holdings.uuid', value: 'hid' },
+    { label: 'ui-inventory.search.allFields', value: 'allFields' },
+  ],
+  items: [
+    { label: 'ui-inventory.search.all', value: 'keyword' },
+    { label: 'ui-inventory.barcode', value: 'barcode' },
+    { label: 'ui-inventory.isbn', value: 'isbn' },
+    { label: 'ui-inventory.issn', value: 'issn' },
+    { label: 'ui-inventory.itemEffectiveCallNumberEyeReadable', value: 'itemFullCallNumbers' },
+    { label: 'ui-inventory.itemEffectiveCallNumberNormalized', value: 'itemNormalizedCallNumbers' },
+    { label: 'ui-inventory.search.itemNotes', value: 'itemNotes' },
+    { label: 'ui-inventory.search.itemAdministrativeNotes', value: 'itemAdministrativeNotes' },
+    { label: 'ui-inventory.search.itemCirculationNotes', value: 'itemCirculationNotes' },
+    { label: 'ui-inventory.itemHrid', value: 'itemHrid' },
+    { label: 'ui-inventory.search.item.uuid', value: 'iid' },
+    { label: 'ui-inventory.search.allFields', value: 'allFields' },
+  ],
+};
+
 export const instanceIndexes = [
   // NOTE: the 'all' value was first used for a 'keyword all' query, but then
   // a *real* 'all' query option was added ('allInstances any'). That was given the value `allFields`
@@ -134,6 +180,7 @@ export const instanceIndexes = [
   { label: 'ui-inventory.authorityId', value: 'authorityId', queryTemplate: 'authorityId == %{query.query}' },
   { label: 'ui-inventory.search.allFields', value: 'allFields', queryTemplate: 'cql.all all "%{query.query}"' },
   { label: 'ui-inventory.querySearch', value: 'querySearch', queryTemplate: '%{query.query}' },
+  { label: 'ui-inventory.advancedSearch', value: 'advancedSearch', queryTemplate: '%{query.query}' },
 ];
 
 export const browseFiltersConfig = [
@@ -196,6 +243,7 @@ export const holdingIndexes = [
   { label: 'ui-inventory.search.holdings.uuid', value: 'hid', queryTemplate: 'holdings.id=="%{query.query}"' },
   { label: 'ui-inventory.search.allFields', value: 'allFields', queryTemplate: 'cql.all all "%{query.query}"' },
   { label: 'ui-inventory.querySearch', value: 'querySearch', queryTemplate: '%{query.query}' },
+  { label: 'ui-inventory.advancedSearch', value: 'advancedSearch', queryTemplate: '%{query.query}' },
 ];
 
 export const holdingSortMap = {};
@@ -269,6 +317,7 @@ export const itemIndexes = [
   { label: 'ui-inventory.search.item.uuid', value: 'iid', queryTemplate: 'item.id=="%{query.query}"' },
   { label: 'ui-inventory.search.allFields', value: 'allFields', queryTemplate: 'cql.all all "%{query.query}"' },
   { label: 'ui-inventory.querySearch', value: 'querySearch', queryTemplate: '%{query.query}' },
+  { label: 'ui-inventory.advancedSearch', value: 'advancedSearch', queryTemplate: '%{query.query}' },
 ];
 
 export const itemFilterConfig = [
diff --git a/src/routes/buildManifestObject.js b/src/routes/buildManifestObject.js
index efc909afb..9c5f4892c 100644
--- a/src/routes/buildManifestObject.js
+++ b/src/routes/buildManifestObject.js
@@ -6,6 +6,7 @@ import {
 import { makeQueryFunction } from '@folio/stripes/smart-components';
 import {
   CQL_FIND_ALL,
+  fieldSearchConfigurations,
   queryIndexes
 } from '../constants';
 import {
@@ -19,6 +20,53 @@ const INITIAL_RESULT_COUNT = 100;
 const DEFAULT_SORT = 'title';
 
 const getQueryTemplateContributor = (queryValue) => `contributors.name==/string "${queryValue}"`;
+const getAdvancedSearchQueryTemplate = (queryIndex, matchOption) => fieldSearchConfigurations[queryIndex]?.[matchOption];
+
+const getAdvancedSearchTemplate = (queryValue) => {
+  const splitIntoRowsRegex = /(?=\sor\s|\sand\s|\snot\s)/g;
+
+  // split will return array of strings:
+  // ['keyword==test', 'or issn=123', ...]
+  const rows = queryValue.split(splitIntoRowsRegex).map(i => i.trim());
+
+  return rows.map((match, index) => {
+    let bool = '';
+    let query = match;
+
+    // first row doesn't have a bool operator
+    if (index !== 0) {
+      bool = match.substr(0, match.indexOf(' '));
+      query = match.substr(bool.length);
+    }
+
+    const splitIndexAndQueryRegex = /([^=]+)(exactPhrase|containsAll|startsWith)(.+)/g;
+
+
+    const rowParts = [...query.matchAll(splitIndexAndQueryRegex)]?.[0] || [];
+    // eslint-disable-next-line no-unused-vars
+    const [, option, _match, value] = rowParts
+      .map(i => i.trim())
+      .map(i => i.replaceAll('"', ''));
+
+    return {
+      query: value,
+      bool,
+      searchOption: option,
+      match: _match,
+    };
+  }).reduce((acc, row) => {
+    const rowTemplate = getAdvancedSearchQueryTemplate(row.searchOption, row.match);
+
+    if (!rowTemplate) {
+      return acc;
+    }
+
+    const rowQuery = rowTemplate.replaceAll('%{query.query}', row.query);
+
+    const formattedRow = `${row.bool} ${rowQuery}`.trim();
+    return `${acc} ${formattedRow}`;
+  }, '').trim();
+};
 
 export function buildQuery(queryParams, pathComponents, resourceData, logger, props) {
   const { indexes, sortMap, filters } = getFilterConfig(queryParams.segment);
@@ -37,6 +85,10 @@ export function buildQuery(queryParams, pathComponents, resourceData, logger, pr
     query.selectedBrowseResult = null; // reset this parameter so the next search uses `=` instead of `==/string`
   }
 
+  if (queryIndex === queryIndexes.ADVANCED_SEARCH) {
+    queryTemplate = getAdvancedSearchTemplate(queryValue);
+  }
+
   if (queryIndex.match(/isbn|issn/)) {
     // eslint-disable-next-line camelcase
     const identifierTypes = resourceData?.identifier_types?.records ?? [];
diff --git a/src/routes/buildManifestObject.test.js b/src/routes/buildManifestObject.test.js
index aee1ce7f6..00867bbae 100644
--- a/src/routes/buildManifestObject.test.js
+++ b/src/routes/buildManifestObject.test.js
@@ -68,6 +68,34 @@ describe('buildQuery', () => {
         });
       });
     });
+
+    describe('Advanced search option', () => {
+      it('should build query with correct format', () => {
+        const qindex = queryIndexes.ADVANCED_SEARCH;
+        const queryParams = {
+          qindex,
+          query: 'keyword containsAll test or title exactPhrase hello',
+        };
+        const cql = buildQuery(...getBuildQueryArgs({ queryParams }));
+
+        expect(cql).toContain(
+          '(keyword all "test" or title==/string "hello")'
+        );
+      });
+
+      describe('when not valid query is passed', () => {
+        const qindex = queryIndexes.ADVANCED_SEARCH;
+        const queryParams = {
+          qindex,
+          query: 'keyword containsAll test or invalidOption exactPhrase hello',
+        };
+        const cql = buildQuery(...getBuildQueryArgs({ queryParams }));
+
+        expect(cql).toContain(
+          '(keyword all "test")'
+        );
+      });
+    });
   });
 
   describe('build query based on selected browse record', () => {
diff --git a/translations/ui-inventory/en.json b/translations/ui-inventory/en.json
index d5a7cb7ec..24a191978 100644
--- a/translations/ui-inventory/en.json
+++ b/translations/ui-inventory/en.json
@@ -326,6 +326,7 @@
   "subjects": "Subjects",
   "subject": "Subject",
   "querySearch": "Query search",
+  "advancedSearch": "Advanced search",
   "addSubject": "Add subject",
   "url": "URL",
   "authentication": "Authentication",

From 20cbb48a36a02335476093c581fdf568e2f2c32d Mon Sep 17 00:00:00 2001
From: FOLIO Translations Bot
 <38661258+folio-translations@users.noreply.github.com>
Date: Sun, 16 Jul 2023 11:27:34 -0400
Subject: [PATCH 68/68] Lokalise: updates

---
 translations/ui-inventory/ar.json     | 3 ++-
 translations/ui-inventory/ber.json    | 3 ++-
 translations/ui-inventory/ca.json     | 3 ++-
 translations/ui-inventory/cs_CZ.json  | 9 +++++----
 translations/ui-inventory/da.json     | 3 ++-
 translations/ui-inventory/de.json     | 3 ++-
 translations/ui-inventory/en_GB.json  | 3 ++-
 translations/ui-inventory/en_SE.json  | 3 ++-
 translations/ui-inventory/en_US.json  | 3 ++-
 translations/ui-inventory/es.json     | 3 ++-
 translations/ui-inventory/es_419.json | 3 ++-
 translations/ui-inventory/es_ES.json  | 3 ++-
 translations/ui-inventory/fr.json     | 3 ++-
 translations/ui-inventory/fr_FR.json  | 3 ++-
 translations/ui-inventory/he.json     | 3 ++-
 translations/ui-inventory/hi_IN.json  | 3 ++-
 translations/ui-inventory/hu.json     | 3 ++-
 translations/ui-inventory/it_IT.json  | 3 ++-
 translations/ui-inventory/ja.json     | 3 ++-
 translations/ui-inventory/ko.json     | 3 ++-
 translations/ui-inventory/nb.json     | 3 ++-
 translations/ui-inventory/nn.json     | 3 ++-
 translations/ui-inventory/pl.json     | 3 ++-
 translations/ui-inventory/pt_BR.json  | 3 ++-
 translations/ui-inventory/pt_PT.json  | 3 ++-
 translations/ui-inventory/ru.json     | 3 ++-
 translations/ui-inventory/sv.json     | 3 ++-
 translations/ui-inventory/ur.json     | 3 ++-
 translations/ui-inventory/zh_CN.json  | 3 ++-
 translations/ui-inventory/zh_TW.json  | 3 ++-
 30 files changed, 63 insertions(+), 33 deletions(-)

diff --git a/translations/ui-inventory/ar.json b/translations/ui-inventory/ar.json
index 001124d88..1593dd13b 100644
--- a/translations/ui-inventory/ar.json
+++ b/translations/ui-inventory/ar.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ber.json b/translations/ui-inventory/ber.json
index 5553d590c..23d4060ac 100644
--- a/translations/ui-inventory/ber.json
+++ b/translations/ui-inventory/ber.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ca.json b/translations/ui-inventory/ca.json
index aa526488f..4003f6ca9 100644
--- a/translations/ui-inventory/ca.json
+++ b/translations/ui-inventory/ca.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/cs_CZ.json b/translations/ui-inventory/cs_CZ.json
index 98b025c67..4025116a0 100644
--- a/translations/ui-inventory/cs_CZ.json
+++ b/translations/ui-inventory/cs_CZ.json
@@ -349,7 +349,7 @@
     "isbn": "ISBN",
     "issn": "ISSN",
     "marcSourceRecord.notFoundError": "Nelze najít MARC bibliografický záznam pro titul \"{name}\"!",
-    "instanceNoteTypes": "Typy poznámek k titulu",
+    "instanceNoteTypes": "Typy poznámek titulů",
     "modesOfIssuance": "Způsoby vydání",
     "resourceIdentifierTypes": "Typy identifikátorů zdrojů",
     "classificationIdentifierTypes": "Typy identifikátorů klasifikace",
@@ -503,10 +503,10 @@
     "permission.settings.instance-statuses": "Nastavení (Katalog): Vytvoření, úprava, smazání typů stavu titulu",
     "permission.settings.statistical-codes": "Nastavení (Katalog): Vytváření, úpravy, mazání statistických kódů",
     "permission.settings.alternative-title-types": "Nastavení (Katalog): Vytváření, úpravy, mazání alternativních typů názvů",
-    "permission.settings.instance-types": "Nastavení (Katalog): Vytvoření, úprava, smazání místně definovaných typů prostředků",
+    "permission.settings.instance-types": "Nastavení (Katalog): Vytvoření, úprava, smazání místně definovaných typů zdrojů",
     "permission.settings.nature-of-content-terms": "Nastavení (Katalog): Vytváření, úpravy, mazání povahy obsahu",
     "permission.settings.modes-of-issuance": "Nastavení (Katalog): Vytvoření, úprava, mazání místně definovaných režimů vystavování",
-    "permission.settings.instance-note-types": "Nastavení (Katalog): Vytváření, úpravy a smazání typů poznámek k titulům",
+    "permission.settings.instance-note-types": "Nastavení (Katalog): Vytváření, úpravy a mazání typů poznámek titulů",
     "permission.settings.ill-policies": "Nastavení (Katalog): Vytváření, úpravy, mazání pravidel MVS",
     "permission.settings.contributor-types": "Nastavení (Katalog): Vytváření, úpravy, mazání typů autorů",
     "permission.settings.call-number-types": "Nastavení (Katalog): Vytvoření, úprava a smazání typů signatur",
@@ -813,5 +813,6 @@
     "browse.local": "Místní",
     "browse.natLibOfMed": "Klasifikace Národní lékařské knihovny",
     "browse.other": "Jiné schéma",
-    "browse.superintendent": "Vedoucí klasifikace dokumentů"
+    "browse.superintendent": "Vedoucí klasifikace dokumentů",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/da.json b/translations/ui-inventory/da.json
index f689fd649..4e8dfb04f 100644
--- a/translations/ui-inventory/da.json
+++ b/translations/ui-inventory/da.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/de.json b/translations/ui-inventory/de.json
index d81c81c50..68c9a3d62 100644
--- a/translations/ui-inventory/de.json
+++ b/translations/ui-inventory/de.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_GB.json b/translations/ui-inventory/en_GB.json
index 5553d590c..23d4060ac 100644
--- a/translations/ui-inventory/en_GB.json
+++ b/translations/ui-inventory/en_GB.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_SE.json b/translations/ui-inventory/en_SE.json
index 5553d590c..23d4060ac 100644
--- a/translations/ui-inventory/en_SE.json
+++ b/translations/ui-inventory/en_SE.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/en_US.json b/translations/ui-inventory/en_US.json
index 5553d590c..23d4060ac 100644
--- a/translations/ui-inventory/en_US.json
+++ b/translations/ui-inventory/en_US.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es.json b/translations/ui-inventory/es.json
index 85ec4f4fb..d5fa47ea7 100644
--- a/translations/ui-inventory/es.json
+++ b/translations/ui-inventory/es.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_419.json b/translations/ui-inventory/es_419.json
index 490aefadd..80ddc330a 100644
--- a/translations/ui-inventory/es_419.json
+++ b/translations/ui-inventory/es_419.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "Clasificación de la Biblioteca Nacional de Medicina",
     "browse.other": "Otro régimen",
-    "browse.superintendent": "Clasificación del Superintendente de Documentos"
+    "browse.superintendent": "Clasificación del Superintendente de Documentos",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/es_ES.json b/translations/ui-inventory/es_ES.json
index 97936eead..03db51f1e 100644
--- a/translations/ui-inventory/es_ES.json
+++ b/translations/ui-inventory/es_ES.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr.json b/translations/ui-inventory/fr.json
index d35eac93f..f03eb20da 100644
--- a/translations/ui-inventory/fr.json
+++ b/translations/ui-inventory/fr.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/fr_FR.json b/translations/ui-inventory/fr_FR.json
index a5acba81c..8d3a3bafc 100644
--- a/translations/ui-inventory/fr_FR.json
+++ b/translations/ui-inventory/fr_FR.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/he.json b/translations/ui-inventory/he.json
index 36b13f67d..59841c404 100644
--- a/translations/ui-inventory/he.json
+++ b/translations/ui-inventory/he.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hi_IN.json b/translations/ui-inventory/hi_IN.json
index 5553d590c..23d4060ac 100644
--- a/translations/ui-inventory/hi_IN.json
+++ b/translations/ui-inventory/hi_IN.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/hu.json b/translations/ui-inventory/hu.json
index 22c14a562..879efdb22 100644
--- a/translations/ui-inventory/hu.json
+++ b/translations/ui-inventory/hu.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/it_IT.json b/translations/ui-inventory/it_IT.json
index f9212dfa2..589d10b99 100644
--- a/translations/ui-inventory/it_IT.json
+++ b/translations/ui-inventory/it_IT.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ja.json b/translations/ui-inventory/ja.json
index 61d3bd1d2..657ba9411 100644
--- a/translations/ui-inventory/ja.json
+++ b/translations/ui-inventory/ja.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ko.json b/translations/ui-inventory/ko.json
index 5460f40ad..572dc8bea 100644
--- a/translations/ui-inventory/ko.json
+++ b/translations/ui-inventory/ko.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nb.json b/translations/ui-inventory/nb.json
index 5553d590c..23d4060ac 100644
--- a/translations/ui-inventory/nb.json
+++ b/translations/ui-inventory/nb.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/nn.json b/translations/ui-inventory/nn.json
index 5553d590c..23d4060ac 100644
--- a/translations/ui-inventory/nn.json
+++ b/translations/ui-inventory/nn.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pl.json b/translations/ui-inventory/pl.json
index f379478c4..4f59f849e 100644
--- a/translations/ui-inventory/pl.json
+++ b/translations/ui-inventory/pl.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_BR.json b/translations/ui-inventory/pt_BR.json
index 4a7237985..21a554401 100644
--- a/translations/ui-inventory/pt_BR.json
+++ b/translations/ui-inventory/pt_BR.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "Classificação da Biblioteca Nacional de Medicina (NLM)",
     "browse.other": "Outro esquema",
-    "browse.superintendent": "Superintendente de Classificação de Documentos"
+    "browse.superintendent": "Superintendente de Classificação de Documentos",
+    "advancedSearch": "Busca avançada"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/pt_PT.json b/translations/ui-inventory/pt_PT.json
index 5e186514b..b42dde834 100644
--- a/translations/ui-inventory/pt_PT.json
+++ b/translations/ui-inventory/pt_PT.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ru.json b/translations/ui-inventory/ru.json
index 190af0970..5153e7008 100644
--- a/translations/ui-inventory/ru.json
+++ b/translations/ui-inventory/ru.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/sv.json b/translations/ui-inventory/sv.json
index 5553d590c..23d4060ac 100644
--- a/translations/ui-inventory/sv.json
+++ b/translations/ui-inventory/sv.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/ur.json b/translations/ui-inventory/ur.json
index 49866b89c..7a2309ee2 100644
--- a/translations/ui-inventory/ur.json
+++ b/translations/ui-inventory/ur.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_CN.json b/translations/ui-inventory/zh_CN.json
index 9ec7f354a..a67cdac92 100644
--- a/translations/ui-inventory/zh_CN.json
+++ b/translations/ui-inventory/zh_CN.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file
diff --git a/translations/ui-inventory/zh_TW.json b/translations/ui-inventory/zh_TW.json
index e756d5dc2..ec531ccce 100644
--- a/translations/ui-inventory/zh_TW.json
+++ b/translations/ui-inventory/zh_TW.json
@@ -813,5 +813,6 @@
     "browse.local": "Local",
     "browse.natLibOfMed": "National Library of Medicine classification",
     "browse.other": "Other scheme",
-    "browse.superintendent": "Superintendent of Documents classification"
+    "browse.superintendent": "Superintendent of Documents classification",
+    "advancedSearch": "Advanced search"
 }
\ No newline at end of file