Fix some comments

CHANGELOG.md

@@ -100,6 +100,7 @@
 * Instance 3rd pane: Add consortial holdings/item accordion. Refs UIIN-2410.
 * Consortial Central Tenant: Handling Holdings and Item actions on the Instance detail view. Refs UIIN-2523.
 * Hide Held by facet in Inventory contributor and subject browse. Refs UIIN-2591.
+* Enable/disable consortial holdings/item actions based on User permissions. Refs UIIN-2452.
 
 ## [9.4.12](https://github.com/folio-org/ui-inventory/tree/v9.4.12) (2023-09-21)
 [Full Changelog](https://github.com/folio-org/ui-inventory/compare/v9.4.11...v9.4.12)

src/Holding/CreateHolding/CreateHolding.js

@@ -19,7 +19,7 @@ import {
 } from '../../common/hooks';
 import useCallout from '../../hooks/useCallout';
 import HoldingsForm from '../../edit/holdings/HoldingsForm';
-import { updateAffiliation } from '../../utils';
+import { switchAffiliation } from '../../utils';
 
 const CreateHolding = ({
   location,
@@ -38,7 +38,7 @@ const CreateHolding = ({
   }, [location.search, instanceId]);
 
   const onCancel = useCallback(() => {
-    updateAffiliation(stripes.okapi, tenantFrom, goBack);
+    switchAffiliation(stripes.okapi, tenantFrom, goBack).then();
   }, [stripes.okapi, tenantFrom, goBack]);
 
   const onSubmit = useCallback((newHolding) => {

src/Instance/HoldingsList/Holding/HoldingButtonsGroup.js

@@ -13,7 +13,7 @@ import {
   Icon,
 } from '@folio/stripes/components';
 
-import { updateAffiliation } from '../../../utils';
+import { switchAffiliation } from '../../../utils';
 
 import { MoveToDropdown } from './MoveToDropdown';
 
@@ -47,7 +47,7 @@ const HoldingButtonsGroup = ({
       <Button
         id={`clickable-view-holdings-${holding.id}`}
         data-test-view-holdings
-        onClick={() => updateAffiliation(stripes.okapi, tenantId, onViewHolding)}
+        onClick={() => switchAffiliation(stripes.okapi, tenantId, onViewHolding)}
         disabled={isViewHoldingsDisabled}
       >
         <FormattedMessage id="ui-inventory.viewHoldings" />
@@ -58,7 +58,7 @@ const HoldingButtonsGroup = ({
           <Button
             id={`clickable-new-item-${holding.id}`}
             data-test-add-item
-            onClick={() => updateAffiliation(stripes.okapi, tenantId, onAddItem)}
+            onClick={() => switchAffiliation(stripes.okapi, tenantId, onAddItem)}
             buttonStyle="primary paneHeaderNewButton"
             disabled={isAddItemDisabled}
           >

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

@@ -7,7 +7,7 @@ import '../../../../test/jest/__mock__';
 import renderWithIntl from '../../../../test/jest/helpers/renderWithIntl';
 import translations from '../../../../test/jest/helpers/translationsProperties';
 
-import { updateAffiliation } from '../../../utils';
+import { switchAffiliation } from '../../../utils';
 
 import HoldingButtonsGroup from './HoldingButtonsGroup';
 
@@ -85,7 +85,7 @@ describe('HoldingButtonsGroup', () => {
 
       fireEvent.click(getByRole('button', { name:  'View holdings' }));
 
-      expect(updateAffiliation.mock.calls.length).toBe(1);
+      expect(switchAffiliation.mock.calls.length).toBe(1);
     });
   });
 
@@ -95,7 +95,7 @@ describe('HoldingButtonsGroup', () => {
 
       fireEvent.click(getByRole('button', { name:  'Add item' }));
 
-      expect(updateAffiliation.mock.calls.length).toBe(1);
+      expect(switchAffiliation.mock.calls.length).toBe(1);
     });
   });
 });

src/Instance/InstanceDetails/InstanceDetails.js

@@ -66,9 +66,9 @@ const InstanceDetails = forwardRef(({
   ...rest
 }, ref) => {
   const stripes = useStripes();
+  const { okapi: { tenant: tenantId } } = stripes;
   const intl = useIntl();
   const location = useLocation();
-  const { okapi: { tenant: tenantId } } = useStripes();
   const searchParams = new URLSearchParams(location.search);
 
   const referenceData = useContext(DataContext);

src/Instance/InstanceDetails/InstanceNewHolding/InstanceNewHolding.js

@@ -13,7 +13,7 @@ import {
   Button,
 } from '@folio/stripes/components';
 
-import { updateAffiliation } from '../../../utils';
+import { switchAffiliation } from '../../../utils';
 
 const InstanceNewHolding = ({
   location,
@@ -39,7 +39,7 @@ const InstanceNewHolding = ({
             aria-label={label}
             buttonStyle="primary"
             fullWidth
-            onClick={() => updateAffiliation(stripes.okapi, tenantId, onNewHolding)}
+            onClick={() => switchAffiliation(stripes.okapi, tenantId, onNewHolding)}
             disabled={disabled}
           >
             {label}

src/Instance/ItemsList/ItemBarcode.js

@@ -20,7 +20,7 @@ import {
 } from '@folio/stripes/components';
 import css from '../../View.css';
 import { QUERY_INDEXES } from '../../constants';
-import { updateAffiliation } from '../../utils';
+import { switchAffiliation } from '../../utils';
 
 const ItemBarcode = ({
   location,
@@ -67,7 +67,7 @@ const ItemBarcode = ({
         <Button
           buttonStyle="link"
           buttonClass={css.linkWithoutBorder}
-          onClick={() => updateAffiliation(stripes.okapi, tenantId, onViewItem)}
+          onClick={() => switchAffiliation(stripes.okapi, tenantId, onViewItem)}
           data-test-item-link
         >
           {itemBarcode}

src/Item/CreateItem/CreateItem.js

@@ -18,7 +18,7 @@ import {
 import ItemForm from '../../edit/items/ItemForm';
 import useCallout from '../../hooks/useCallout';
 import { useItemMutation } from '../hooks';
-import { updateAffiliation } from '../../utils';
+import { switchAffiliation } from '../../utils';
 
 const CreateItem = ({
   referenceData,
@@ -44,7 +44,7 @@ const CreateItem = ({
   }, [instanceId, location.search]);
 
   const onCancel = useCallback(() => {
-    updateAffiliation(stripes.okapi, tenantFrom, goBack);
+    switchAffiliation(stripes.okapi, tenantFrom, goBack).then();
   }, [stripes.okapi, tenantFrom, goBack]);
 
   const onSuccess = useCallback(async (response) => {

src/ViewHoldingsRecord.js

@@ -52,7 +52,7 @@ import {
   getSortedNotes,
   handleKeyCommand,
   getDate,
-  updateAffiliation,
+  switchAffiliation,
 } from './utils';
 import withLocation from './withLocation';
 import {
@@ -213,7 +213,7 @@ class ViewHoldingsRecord extends React.Component {
 
     const { stripes, tenantFrom } = this.props;
 
-    updateAffiliation(stripes.okapi, tenantFrom, this.goBack);
+    switchAffiliation(stripes.okapi, tenantFrom, this.goBack);
   }
 
   // Edit Holdings records handlers

src/ViewHoldingsRecord.test.js

@@ -17,7 +17,7 @@ import {
   translationsProperties,
 } from '../test/jest/helpers';
 
-import { updateAffiliation } from './utils';
+import { switchAffiliation } from './utils';
 import ViewHoldingsRecord from './ViewHoldingsRecord';
 
 jest.mock('./withLocation', () => jest.fn(c => c));
@@ -118,7 +118,7 @@ describe('ViewHoldingsRecord actions', () => {
   it('should close view holding page', async () => {
     renderViewHoldingsRecord();
     fireEvent.click(await screen.findByRole('button', { name: 'confirm' }));
-    expect(updateAffiliation).toHaveBeenCalled();
+    expect(switchAffiliation).toHaveBeenCalled();
   });
 
   it('should translate to edit holding form page', async () => {

src/routes/ItemRoute.js

@@ -16,7 +16,7 @@ import { DataContext } from '../contexts';
 import { getItem } from '../storage';
 import {
   TENANT_IDS_KEY,
-  updateAffiliation,
+  switchAffiliation,
 } from '../utils';
 
 const getRequestsPath = `circulation/requests?query=(itemId==:{itemid}) and status==(${requestsStatusString}) sortby requestDate desc&limit=1`;
@@ -175,7 +175,7 @@ class ItemRoute extends React.Component {
 
     const tenantFrom = tenantIds ? tenantIds.tenantFrom : okapi.tenant;
 
-    updateAffiliation(okapi, tenantFrom, this.goBack);
+    switchAffiliation(okapi, tenantFrom, this.goBack).then();
   }
 
   isLoading = () => {

src/utils.js

@@ -830,7 +830,7 @@ export const hasMemberTenantPermission = (permissions, permissionName, tenantId)
 
 export const TENANT_IDS_KEY = 'tenantIds';
 
-export const updateAffiliation = async (okapi, tenantId, move) => {
+export const switchAffiliation = async (okapi, tenantId, move) => {
   if (okapi.tenant !== tenantId) {
     await updateTenant(okapi, tenantId);