Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UIIN-2629: Consortial holdings accordion is not appearing after the sharing of Instance #2312

Merged
merged 1 commit into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 10.0.1 IN PROGRESS

* Instance 3rd pane: Adjust behavior when returning to instance from holdings/item full screen. Refs UIIN-2453.
* Consortial holdings accordion is not appearing after the sharing of Instance. Fixes UIIN-2629.

## [10.0.0](https://github.com/folio-org/ui-inventory/tree/v10.0.0) (2023-10-13)
[Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.12...v10.0.0)
Expand Down
4 changes: 3 additions & 1 deletion src/Instance/InstanceDetails/InstanceDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ const InstanceDetails = forwardRef(({
);
}

const isConsortialHoldingsVisible = instance?.shared || isInstanceShadowCopy(instance?.source);

const renderPaneTitle = () => {
const isInstanceShared = Boolean(isShared || isInstanceShadowCopy(instance?.source));

Expand Down Expand Up @@ -196,7 +198,7 @@ const InstanceDetails = forwardRef(({
<InstanceNewHolding instance={instance} />
)}

{instance?.shared && (
{isConsortialHoldingsVisible && (
<ConsortialHoldings instance={instance} />
)}

Expand Down
157 changes: 66 additions & 91 deletions src/Instance/InstanceDetails/InstanceDetails.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@ jest.mock('../InstanceDetails/ControllableDetail/ControllableDetail', () => jest
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('./ConsortialHoldings', () => ({
...jest.requireActual('./ConsortialHoldings'),
ConsortialHoldings: () => <button type="button">Consortial holdings</button>,
}));

const instance = {
title: 'Test Title',
source: 'FOLIO',
contributors: [],
identifiers: [],
instanceTypeId: '1234',
Expand All @@ -30,6 +35,7 @@ const instance = {
notes: [],
staffSuppress: false,
discoverySuppress: false,
shared: false,
};

const mockReferenceData = {
Expand All @@ -48,23 +54,31 @@ const queryClient = new QueryClient();
const actionMenu = jest.fn();
const onClose = jest.fn();
const tagsEnabled = true;

const renderInstanceDetails = (props) => {
const component = (
<QueryClientProvider client={queryClient}>
<DataContext.Provider value={mockReferenceData}>
<MemoryRouter>
<InstanceDetails
instance={instance}
onClose={onClose}
tagsEnabled={tagsEnabled}
actionMenu={actionMenu}
{...props}
/>
</MemoryRouter>
</DataContext.Provider>
</QueryClientProvider>
);

return renderWithIntl(component, translationsProperties);
};

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
);
renderInstanceDetails();

expect(screen.getByText('InstanceTitle')).toBeInTheDocument();
expect(screen.getByText('Add holdings')).toBeInTheDocument();
expect(screen.getByText('Administrative data')).toBeInTheDocument();
Expand Down Expand Up @@ -103,21 +117,7 @@ describe('InstanceDetails', () => {
...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
);
renderInstanceDetails({ instance: staffSuppressedInstance });

expect(screen.getByText('Warning: Instance is marked staff suppressed')).toBeInTheDocument();
expect(screen.getByText('Staff suppressed')).toBeInTheDocument();
Expand All @@ -128,21 +128,7 @@ describe('InstanceDetails', () => {
...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
);
renderInstanceDetails({ instance: discoverySuppressedInstance });

expect(screen.getByText('Warning: Instance is marked suppressed from discovery')).toBeInTheDocument();
expect(screen.getByText('Suppressed from discovery')).toBeInTheDocument();
Expand All @@ -153,48 +139,21 @@ describe('InstanceDetails', () => {
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
);
renderInstanceDetails({ instance: bothSuppressedInstance });

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
);
renderInstanceDetails();

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');
// Administrative data is open because it has initial data inside it
expect(firstAccordionSection.getAttribute('aria-expanded')).toBe('true');
expect(secondAccordionSection.getAttribute('aria-expanded')).toBe('false');
expect(thirdAccordionSection.getAttribute('aria-expanded')).toBe('false');
expect(fourthAccordionSection.getAttribute('aria-expanded')).toBe('false');
Expand All @@ -212,23 +171,39 @@ describe('InstanceDetails', () => {
});

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
);
renderInstanceDetails();

const button = screen.getAllByRole('button', { id: 'clickable-show-tags' });
fireEvent.click(button[1]);
expect(button[1]).toBeEnabled();
});

describe('Consortial holdings accordion', () => {
it('should be visible for shared instances', () => {
const sharedInstance = {
...instance,
shared: true,
};
renderInstanceDetails({ instance: sharedInstance });

expect(screen.getByRole('button', { name: 'Consortial holdings' })).toBeInTheDocument();
});

it('should be visible for shadow instances', () => {
const shadowInstance = {
...instance,
shared: false,
source: 'CONSORTIUM-FOLIO',
};
renderInstanceDetails({ instance: shadowInstance });

expect(screen.getByRole('button', { name: 'Consortial holdings' })).toBeInTheDocument();
});

it('should not be visible for local instances', () => {
renderInstanceDetails();

expect(screen.queryByRole('button', { name: 'Consortial holdings' })).not.toBeInTheDocument();
});
});
});
Loading