UIIN-2452: Enable/disable consortial holdings/item actions based on User permissions

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change history for ui-inventory
 
+## 10.0.1 IN PROGRESS
+
+* Enable/disable consortial holdings/item actions based on User permissions. Refs UIIN-2452.
+
 ## [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)
 

src/Holding/CreateHolding/CreateHolding.js

@@ -19,26 +19,28 @@ import {
 } from '../../common/hooks';
 import useCallout from '../../hooks/useCallout';
 import HoldingsForm from '../../edit/holdings/HoldingsForm';
+import { switchAffiliation } from '../../utils';
 
 const CreateHolding = ({
-  history,
   location,
   instanceId,
   referenceData,
   stripes,
   mutator,
+  tenantFrom,
 }) => {
   const callout = useCallout();
   const { instance, isLoading: isInstanceLoading } = useInstance(instanceId);
   const sourceId = referenceData.holdingsSourcesByName?.FOLIO?.id;
 
-  const onCancel = useCallback(() => {
-    history.push({
-      pathname: `/inventory/view/${instanceId}`,
-      search: location.search,
-    });
+  const goBack = useCallback(() => {
+    window.location.href = `/inventory/view/${instanceId}${location.search}`;
   }, [location.search, instanceId]);
 
+  const onCancel = useCallback(() => {
+    switchAffiliation(stripes.okapi, tenantFrom, goBack).then();
+  }, [stripes.okapi, tenantFrom, goBack]);
+
   const onSubmit = useCallback((newHolding) => {
     return mutator.holding.POST(newHolding)
       .then((holdingsRecord) => {
@@ -92,12 +94,11 @@ CreateHolding.manifest = Object.freeze({
 
 CreateHolding.propTypes = {
   location: PropTypes.object.isRequired,
-  history: PropTypes.object.isRequired,
-
   instanceId: PropTypes.string.isRequired,
   mutator: PropTypes.object.isRequired,
   referenceData: PropTypes.object.isRequired,
   stripes: stripesShape.isRequired,
+  tenantFrom: PropTypes.string,
 };
 
 export default withRouter(stripesConnect(CreateHolding));

src/Holding/ViewHolding/HoldingBoundWith/HoldingBoundWith.js

@@ -8,15 +8,19 @@ import {
   MultiColumnList,
 } from '@folio/stripes/components';
 
-import { IntlConsumer } from '@folio/stripes/core';
+import {
+  IntlConsumer,
+  useStripes,
+} from '@folio/stripes/core';
 import { noValue } from '../../../constants';
 import { checkIfArrayIsEmpty } from '../../../utils';
 import useBoundWithItems from './useBoundWithItems';
 import useBoundWithHoldings from './useBoundWithHoldings';
 
 const HoldingBoundWith = ({ boundWithParts }) => {
+  const { okapi: { tenant: tenantId } } = useStripes();
   const { boundWithItems } = useBoundWithItems(boundWithParts);
-  const { isLoading, boundWithHoldings } = useBoundWithHoldings(boundWithItems);
+  const { isLoading, boundWithHoldings } = useBoundWithHoldings(boundWithItems, tenantId);
   const boundWithHoldingsMapById = keyBy(boundWithHoldings, 'id');
   const data = boundWithItems?.map(boundWithItem => ({
     item: boundWithItem,

src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.js

@@ -1,6 +1,6 @@
 import useChunkedCQLFetch from '../../../hooks/useChunkedCQLFetch';
 
-const useBoundWithHoldings = (boundWithItems) => {
+const useBoundWithHoldings = (boundWithItems, tenantId) => {
   let holdingsRecordIds = boundWithItems?.map(x => x.holdingsRecordId);
 
   // De-dup the list of holdingsRecordIds for efficiency
@@ -13,7 +13,8 @@ const useBoundWithHoldings = (boundWithItems) => {
       holdingQueries.reduce((acc, curr) => {
         return [...acc, ...(curr?.data?.holdingsRecords ?? [])];
       }, [])
-    )
+    ),
+    tenantId,
   });
 
   return {

src/Holding/ViewHolding/HoldingBoundWith/useBoundWithHoldings.test.js

@@ -7,10 +7,14 @@ import { renderHook, act } from '@folio/jest-config-stripes/testing-library/reac
 
 import '../../../../test/jest/__mock__';
 
-import { useOkapiKy } from '@folio/stripes/core';
-
 import { boundWithHoldingsRecords } from './fixtures';
 import useBoundWithHoldings from './useBoundWithHoldings';
+import { useTenantKy } from '../../../common';
+
+jest.mock('../../../common', () => ({
+  ...jest.requireActual('../../../common'),
+  useTenantKy: jest.fn(),
+}));
 
 const queryClient = new QueryClient();
 const wrapper = ({ children }) => (
@@ -21,7 +25,7 @@ const wrapper = ({ children }) => (
 
 describe('useBoundWithHoldings', () => {
   beforeEach(() => {
-    useOkapiKy.mockClear().mockReturnValue({
+    useTenantKy.mockClear().mockReturnValue({
       get: () => ({
         json: () => Promise.resolve({ holdingsRecords: boundWithHoldingsRecords }),
       }),
@@ -31,15 +35,15 @@ describe('useBoundWithHoldings', () => {
   it('should fetch bound-with holdings', async () => {
     const boundWithItems = [{ hrid: 'BW-ITEM-1', holdingsRecordId: '9e8dc8ce-68f3-4e75-8479-d548ce521157' }];
 
-    const { result } = renderHook(() => useBoundWithHoldings(boundWithItems), { wrapper });
+    const { result } = renderHook(() => useBoundWithHoldings(boundWithItems, 'testTenantId'), { wrapper });
 
     await act(() => !result.current.isLoading);
 
     expect(result.current.boundWithHoldings).toEqual(boundWithHoldingsRecords);
   });
 
   it('should not fetch bound-with holdings', async () => {
-    const { result } = renderHook(() => useBoundWithHoldings([]), { wrapper });
+    const { result } = renderHook(() => useBoundWithHoldings([], 'testTenantId'), { wrapper });
 
     expect(result.current.isLoading).toBe(false);
     expect(result.current.boundWithHoldings).toEqual([]);

src/Instance/HoldingsList/Holding/Holding.js

@@ -4,7 +4,10 @@ import { FormattedMessage } from 'react-intl';
 
 import { Checkbox } from '@folio/stripes/components';
 
-import { ItemsListContainer, DropZone } from '../../ItemsList';
+import {
+  ItemsListContainer,
+  DropZone,
+} from '../../ItemsList';
 
 import HoldingAccordion from './HoldingAccordion';
 
@@ -20,6 +23,9 @@ const Holding = ({
   isDraggable,
   isItemsDroppable,
   tenantId,
+  isViewHoldingsDisabled,
+  isAddItemDisabled,
+  isBarcodeAsHotlink,
 }) => {
   return (
     <div>
@@ -49,12 +55,15 @@ const Holding = ({
           onViewHolding={onViewHolding}
           onAddItem={onAddItem}
           tenantId={tenantId}
+          isViewHoldingsDisabled={isViewHoldingsDisabled}
+          isAddItemDisabled={isAddItemDisabled}
         >
           <ItemsListContainer
             holding={holding}
             draggable={draggable}
             droppable={droppable}
             tenantId={tenantId}
+            isBarcodeAsHotlink={isBarcodeAsHotlink}
           />
         </HoldingAccordion>
       </DropZone>
@@ -74,6 +83,9 @@ Holding.propTypes = {
   isHoldingDragSelected: PropTypes.func,
   isItemsDroppable: PropTypes.bool,
   tenantId: PropTypes.string,
+  isViewHoldingsDisabled: PropTypes.bool,
+  isAddItemDisabled: PropTypes.bool,
+  isBarcodeAsHotlink: PropTypes.bool,
 };
 
 Holding.defaultProps = {

src/Instance/HoldingsList/Holding/HoldingAccordion.js

@@ -11,9 +11,12 @@ import {
 } from '@folio/stripes/components';
 
 import { callNumberLabel } from '../../../utils';
+import {
+  useLocationsQuery,
+  useHoldingItemsQuery,
+} from '../../../hooks';
+
 import HoldingButtonsGroup from './HoldingButtonsGroup';
-import useHoldingItemsQuery from '../../../hooks/useHoldingItemsQuery';
-import { useLocationsQuery } from '../../../hooks';
 
 const HoldingAccordion = ({
   children,
@@ -23,6 +26,8 @@ const HoldingAccordion = ({
   onAddItem,
   withMoveDropdown,
   tenantId,
+  isViewHoldingsDisabled,
+  isAddItemDisabled,
 }) => {
   const searchParams = {
     limit: 0,
@@ -57,6 +62,9 @@ const HoldingAccordion = ({
     onAddItem={onAddItem}
     withMoveDropdown={withMoveDropdown}
     isOpen={open}
+    tenantId={tenantId}
+    isViewHoldingsDisabled={isViewHoldingsDisabled}
+    isAddItemDisabled={isAddItemDisabled}
   />;
 
   const location = labelLocation?.isActive ?
@@ -117,6 +125,8 @@ HoldingAccordion.propTypes = {
   withMoveDropdown: PropTypes.bool,
   children: PropTypes.object,
   tenantId: PropTypes.string,
+  isViewHoldingsDisabled: PropTypes.bool,
+  isAddItemDisabled: PropTypes.bool,
 };
 
 export default HoldingAccordion;

src/Instance/HoldingsList/Holding/HoldingAccordion.test.js

@@ -9,8 +9,9 @@ import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
 import translations from '../../../../test/jest/helpers/translationsProperties';
 import { items as itemsFixture } from '../../../../test/fixtures/items';
+import { useHoldingItemsQuery } from '../../../hooks';
+
 import HoldingAccordion from './HoldingAccordion';
-import useHoldingItemsQuery from '../../../hooks/useHoldingItemsQuery';
 
 jest.mock('../../../hooks/useHoldingItemsQuery', () => jest.fn());
 jest.mock('../../../hooks', () => ({
@@ -23,7 +24,8 @@ jest.mock('../../../hooks', () => ({
         isActive: false,
       },
     ],
-  })
+  }),
+  useHoldingItemsQuery: jest.fn(),
 }));
 
 const HoldingAccordionSetup = () => (

src/Instance/HoldingsList/Holding/HoldingButtonsGroup.js

@@ -13,6 +13,8 @@ import {
   Icon,
 } from '@folio/stripes/components';
 
+import { switchAffiliation } from '../../../utils';
+
 import { MoveToDropdown } from './MoveToDropdown';
 
 const HoldingButtonsGroup = ({
@@ -24,6 +26,9 @@ const HoldingButtonsGroup = ({
   onAddItem,
   itemCount,
   isOpen,
+  tenantId,
+  isViewHoldingsDisabled,
+  isAddItemDisabled,
 }) => {
   const stripes = useStripes();
   const isUserInCentralTenant = checkIfUserInCentralTenant(stripes);
@@ -42,7 +47,8 @@ const HoldingButtonsGroup = ({
       <Button
         id={`clickable-view-holdings-${holding.id}`}
         data-test-view-holdings
-        onClick={onViewHolding}
+        onClick={() => switchAffiliation(stripes.okapi, tenantId, onViewHolding)}
+        disabled={isViewHoldingsDisabled}
       >
         <FormattedMessage id="ui-inventory.viewHoldings" />
       </Button>
@@ -52,8 +58,9 @@ const HoldingButtonsGroup = ({
           <Button
             id={`clickable-new-item-${holding.id}`}
             data-test-add-item
-            onClick={onAddItem}
+            onClick={() => switchAffiliation(stripes.okapi, tenantId, onAddItem)}
             buttonStyle="primary paneHeaderNewButton"
+            disabled={isAddItemDisabled}
           >
             <FormattedMessage id="ui-inventory.addItem" />
           </Button>
@@ -73,6 +80,9 @@ HoldingButtonsGroup.propTypes = {
   onAddItem: PropTypes.func.isRequired,
   onViewHolding: PropTypes.func.isRequired,
   withMoveDropdown: PropTypes.bool,
+  isViewHoldingsDisabled: PropTypes.bool,
+  isAddItemDisabled: PropTypes.bool,
+  tenantId: PropTypes.string,
 };
 
 

src/Instance/HoldingsList/Holding/HoldingButtonsGroup.test.js

@@ -7,13 +7,20 @@ import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
 import translations from '../../../../test/jest/helpers/translationsProperties';
 
+import { switchAffiliation } from '../../../utils';
+
 import HoldingButtonsGroup from './HoldingButtonsGroup';
 
+jest.mock('../../../utils', () => ({
+  ...jest.requireActual('../../../utils'),
+  updateAffiliation: jest.fn(),
+}));
+
 const mockItemCount = 3;
 const mockOnAddItem = jest.fn();
 const mockOnViewHolding = jest.fn();
 
-const HoldingButtonsGroupSetup = () => (
+const HoldingButtonsGroupSetup = props => (
   <Router>
     <HoldingButtonsGroup
       withMoveDropdown={false}
@@ -24,14 +31,17 @@ const HoldingButtonsGroupSetup = () => (
       onAddItem={mockOnAddItem}
       itemCount={mockItemCount}
       isOpen={false}
+      isViewHoldingsDisabled={false}
+      isAddItemDisabled={false}
+      {...props}
     >
       {() => null}
     </HoldingButtonsGroup>
   </Router>
 );
 
-const renderHoldingButtonsGroup = () => renderWithIntl(
-  <HoldingButtonsGroupSetup />,
+const renderHoldingButtonsGroup = props => renderWithIntl(
+  <HoldingButtonsGroupSetup {...props} />,
   translations
 );
 
@@ -53,22 +63,39 @@ describe('HoldingButtonsGroup', () => {
     expect(getByRole('button', { name:  'Add item' })).toBeDefined();
   });
 
+  describe('when user has no permissions to view holdings', () => {
+    it('should render "View Holdings" button as disabled', () => {
+      const { getByRole } = renderHoldingButtonsGroup({ isViewHoldingsDisabled: true });
+
+      expect(getByRole('button', { name:  'View holdings' })).toBeDisabled();
+    });
+  });
+
+  describe('when user has no permissions to create items', () => {
+    it('should render "Add item" button as disabled', () => {
+      const { getByRole } = renderHoldingButtonsGroup({ isAddItemDisabled: true });
+
+      expect(getByRole('button', { name:  'Add item' })).toBeDisabled();
+    });
+  });
+
   describe('when user click on View holdings button', () => {
-    it('should calls callback', () => {
+    it('should call function to update user\'s affiliation', () => {
       const { getByRole } = renderHoldingButtonsGroup();
 
       fireEvent.click(getByRole('button', { name:  'View holdings' }));
 
-      expect(mockOnViewHolding.mock.calls.length).toBe(1);
+      expect(switchAffiliation.mock.calls.length).toBe(1);
     });
   });
+
   describe('when user click on Add item button', () => {
-    it('should calls callback', () => {
+    it('should call function to update user\'s affiliation', () => {
       const { getByRole } = renderHoldingButtonsGroup();
 
       fireEvent.click(getByRole('button', { name:  'Add item' }));
 
-      expect(mockOnAddItem.mock.calls.length).toBe(1);
+      expect(switchAffiliation.mock.calls.length).toBe(1);
     });
   });
 });