Skip to content

Commit

Permalink
UIIN-2938: Use facets and the function for building a search query fr…
Browse files Browse the repository at this point in the history
…om `stripes-inventory-components`. (#2507)
  • Loading branch information
Dmytro-Melnyshyn committed Jun 18, 2024
1 parent 483cb8c commit e9fd5ab
Show file tree
Hide file tree
Showing 39 changed files with 158 additions and 2,026 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
* Prevent users from editing tags when Instance/Holdings/Item is updated. Fixes UIIN-2941.
* Instance record > Classification accordion > Display a clipboard icon next to classification number. Refs UIIN-2580.
* Populate Acquisitions accordion on item when central ordering is active. Refs UIIN-2818.
* Import facets and the function for building a search query from `stripes-inventory-components`.

## [11.0.4](https://github.com/folio-org/ui-inventory/tree/v11.0.4) (2024-04-30)
[Full Changelog](https://github.com/folio-org/ui-inventory/compare/v11.0.3...v11.0.4)
Expand Down
2 changes: 1 addition & 1 deletion src/Instance/InstanceEdit/InstanceEdit.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const InstanceEdit = ({
};

const isMemberTenant = checkIfUserInMemberTenant(stripes);
const tenantId = (isMemberTenant && instance?.shared) ? stripes.user.user.consortium.centralTenantId : stripes.okapi.tenant;
const tenantId = (isMemberTenant && instance?.shared) ? stripes.user.user.consortium?.centralTenantId : stripes.okapi.tenant;

const { mutateInstance } = useInstanceMutation({ tenantId });

Expand Down
5 changes: 5 additions & 0 deletions src/ViewHoldingsRecord.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ import {

import ViewHoldingsRecord from './ViewHoldingsRecord';

jest.mock('./Holding/ViewHolding/HoldingReceivingHistory/useReceivingHistory', () => jest.fn(() => ({
isFetching: false,
receivingHistory: [],
})));

const mockPush = jest.fn();

const history = createMemoryHistory();
Expand Down
12 changes: 3 additions & 9 deletions src/components/BrowseInventoryFilters/BrowseInventoryFilters.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,18 @@ import PropTypes from 'prop-types';
import { useContext } from 'react';

import { DataContext } from '../../contexts';
import { InstanceFiltersBrowse } from '../InstanceFilters';
import { browseConfig } from '../../filterConfig';
import InstanceFiltersBrowse from '../InstanceFiltersBrowse';

const BrowseInventoryFilters = ({
query,
applyFilters,
}) => {
const data = useContext(DataContext);

const filtersData = {
...data,
query,
};

return (
<InstanceFiltersBrowse
filterConfig={browseConfig}
data={filtersData}
data={data}
query={query}
onChange={({ name, values }) => applyFilters(name, values)}
onClear={(name) => applyFilters(name, [])}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@ import {
} from '../../../test/jest/helpers';
import BrowseInventoryFilters from './BrowseInventoryFilters';
import { DataContext } from '../../contexts';
import { browseConfig } from '../../filterConfig';
import { InstanceFiltersBrowse } from '../InstanceFilters';
import InstanceFiltersBrowse from '../InstanceFiltersBrowse';

jest.mock('../InstanceFilters', () => ({
InstanceFiltersBrowse: jest.fn(() => <div>InstanceFiltersBrowse</div>),
}));
jest.mock('../InstanceFiltersBrowse', () => jest.fn(() => <div>InstanceFiltersBrowse</div>));

const data = {
consortiaTenants: [],
Expand Down Expand Up @@ -39,8 +36,8 @@ describe('BrowseInventoryFilters', () => {
renderBrowseInventoryFilters();

expect(InstanceFiltersBrowse).toHaveBeenCalledWith({
filterConfig: browseConfig,
data: { ...data, query },
data,
query,
onChange: expect.any(Function),
onClear: expect.any(Function),
}, {});
Expand Down
183 changes: 0 additions & 183 deletions src/components/HoldingsRecordFilters/HoldingsRecordFilters.js

This file was deleted.

Loading

0 comments on commit e9fd5ab

Please sign in to comment.