folio-org · OleksandrHladchenko1 · Oct 27, 2023 · Sep 22, 2023 · Sep 25, 2023 · Sep 27, 2023
diff --git a/src/Holding/CreateHolding/CreateHolding.js b/src/Holding/CreateHolding/CreateHolding.js
@@ -30,7 +30,7 @@ const CreateHolding = ({
   const callout = useCallout();
   const { instance, isLoading: isInstanceLoading } = useInstance(instanceId);
   const sourceId = referenceData.holdingsSourcesByName?.FOLIO?.id;
-  const { location: { state: { tenantFrom } } } = history;
+  const tenantFrom = location?.state?.tenantFrom || stripes.okapi.tenant;
 
   const goBack = useCallback(() => {
     history.push({
@@ -39,21 +39,22 @@ const CreateHolding = ({
     });
   }, [location.search, instanceId]);
 
-  const onCancel = useCallback(() => {
-    switchAffiliation(stripes, tenantFrom, goBack);
+  const onCancel = useCallback(async () => {
+    await switchAffiliation(stripes, tenantFrom, goBack);
   }, [stripes, tenantFrom, goBack]);
 
   const onSubmit = useCallback((newHolding) => {
     return mutator.holding.POST(newHolding)
-      .then((holdingsRecord) => {
+      .then(async (holdingsRecord) => {
+        await onCancel();
+
         callout.sendCallout({
           type: 'success',
           message: <FormattedMessage
             id="ui-inventory.holdingsRecord.successfullySaved"
             values={{ hrid: holdingsRecord.hrid }}
           />,
         });
-        onCancel();
       });
   }, [onCancel, callout]);
 

diff --git a/src/Instance/HoldingsList/Holding/HoldingButtonsGroup.js b/src/Instance/HoldingsList/Holding/HoldingButtonsGroup.js
@@ -48,7 +48,9 @@ const HoldingButtonsGroup = ({
         <Button
           id={`clickable-view-holdings-${holding.id}`}
           data-test-view-holdings
-          onClick={() => switchAffiliation(stripes, tenantId, onViewHolding)}
+          onClick={async () => {
+            await switchAffiliation(stripes, tenantId, onViewHolding);
+          }}
         >
           <FormattedMessage id="ui-inventory.viewHoldings" />
         </Button>
@@ -58,7 +60,9 @@ const HoldingButtonsGroup = ({
           <Button
             id={`clickable-new-item-${holding.id}`}
             data-test-add-item
-            onClick={() => switchAffiliation(stripes, tenantId, onAddItem)}
+            onClick={async () => {
+              await switchAffiliation(stripes, tenantId, onAddItem);
+            }}
             buttonStyle="primary paneHeaderNewButton"
           >
             <FormattedMessage id="ui-inventory.addItem" />

diff --git a/src/Instance/HoldingsList/HoldingsListContainer.js b/src/Instance/HoldingsList/HoldingsListContainer.js
@@ -18,9 +18,9 @@ const HoldingsListContainer = ({
   const stripes = useStripes();
   const { holdingsRecords: holdings, isLoading } = useInstanceHoldingsQuery(instance.id, { tenantId });
 
-  const canViewHoldings = stripes.hasPerm('ui-inventory.instance.view');
-  const canCreateItem = stripes.hasPerm('ui-inventory.item.edit');
-  const canViewItems = stripes.hasPerm('ui-inventory.instance.view');
+  const canViewHoldings = stripes.hasPerm('ui-inventory.holdings.create');
+  const canCreateItem = stripes.hasPerm('ui-inventory.item.create');
+  const canViewItems = stripes.hasPerm('ui-inventory.item.create');
 
   if (isLoading) return <Loading size="large" />;
 

diff --git a/src/Instance/InstanceDetails/InstanceDetails.js b/src/Instance/InstanceDetails/InstanceDetails.js
@@ -88,7 +88,7 @@ const InstanceDetails = forwardRef(({
   const tags = instance?.tags?.tagList;
   const isUserInCentralTenant = checkIfUserInCentralTenant(stripes);
 
-  const canCreateHoldings = stripes.hasPerm('ui-inventory.holdings.edit');
+  const canCreateHoldings = stripes.hasPerm('ui-inventory.holdings.create');
 
   const detailsLastMenu = useMemo(() => {
     return (

diff --git a/src/Instance/InstanceDetails/InstanceNewHolding/InstanceNewHolding.js b/src/Instance/InstanceDetails/InstanceNewHolding/InstanceNewHolding.js
@@ -47,7 +47,9 @@ const InstanceNewHolding = ({
             aria-label={label}
             buttonStyle="primary"
             fullWidth
-            onClick={() => switchAffiliation(stripes, tenantId, onNewHolding)}
+            onClick={async () => {
+              await switchAffiliation(stripes, tenantId, onNewHolding);
+            }}
           >
             {label}
           </Button>

diff --git a/src/Instance/InstanceDetails/MemberTenantHoldings/MemberTenantHoldings.js b/src/Instance/InstanceDetails/MemberTenantHoldings/MemberTenantHoldings.js
@@ -40,10 +40,10 @@ const MemberTenantHoldings = ({
   const { holdingsRecords, isLoading } = useInstanceHoldingsQuery(instance?.id, { tenantId: id });
   const isUserInCentralTenant = checkIfUserInCentralTenant(stripes);
 
-  const canViewHoldings = hasMemberTenantPermission('ui-inventory.instance.view', id, userTenantPermissions);
-  const canCreateItem = hasMemberTenantPermission('ui-inventory.item.edit', id, userTenantPermissions);
-  const canCreateHoldings = hasMemberTenantPermission('ui-inventory.holdings.edit', id, userTenantPermissions);
-  const canViewItems = hasMemberTenantPermission('ui-inventory.instance.view', id, userTenantPermissions);
+  const canViewHoldings = hasMemberTenantPermission('ui-inventory.holdings.create', id, userTenantPermissions);
+  const canCreateItem = hasMemberTenantPermission('ui-inventory.item.create', id, userTenantPermissions);
+  const canCreateHoldings = hasMemberTenantPermission('ui-inventory.holdings.create', id, userTenantPermissions);
+  const canViewItems = hasMemberTenantPermission('ui-inventory.item.create', id, userTenantPermissions);
 
   if (isEmpty(holdingsRecords)) return null;
 

diff --git a/src/Instance/InstanceDetails/MemberTenantHoldings/MemberTenantHoldings.test.js b/src/Instance/InstanceDetails/MemberTenantHoldings/MemberTenantHoldings.test.js
@@ -33,7 +33,7 @@ const mockMemberTenant = {
 const userTenantPermissions = [{
   tenantId: 'college',
   permissionNames: [{
-    permissionName: 'ui-inventory.holdings.edit',
+    permissionName: 'ui-inventory.holdings.create',
     subPermissions: ['test subPermission 1']
   }],
 }];

diff --git a/src/Instance/ItemsList/ItemBarcode.js b/src/Instance/ItemsList/ItemBarcode.js
@@ -76,7 +76,9 @@ const ItemBarcode = ({
         <Button
           buttonStyle="link"
           buttonClass={css.linkWithoutBorder}
-          onClick={() => switchAffiliation(stripes, tenantId, onViewItem)}
+          onClick={async () => {
+            await switchAffiliation(stripes, tenantId, onViewItem);
+          }}
         >
           {itemBarcode}
         </Button>

diff --git a/src/Item/CreateItem/CreateItem.js b/src/Item/CreateItem/CreateItem.js
@@ -30,8 +30,8 @@ const CreateItem = ({
       state: {
         tenantTo,
         tenantFrom,
-      },
-    },
+      } = {},
+    } = {},
   } = useHistory();
 
   const { isLoading: isInstanceLoading, instance } = useInstanceQuery(instanceId, { tenantId: tenantTo });
@@ -51,14 +51,14 @@ const CreateItem = ({
     });
   }, [instanceId, search]);
 
-  const onCancel = useCallback(() => {
-    switchAffiliation(stripes, tenantFrom, goBack);
+  const onCancel = useCallback(async () => {
+    await switchAffiliation(stripes, tenantFrom, goBack);
   }, [stripes, tenantFrom]);
 
   const onSuccess = useCallback(async (response) => {
     const { hrid } = await response.json();
 
-    onCancel();
+    await onCancel();
 
     return callout.sendCallout({
       type: 'success',

diff --git a/src/ViewHoldingsRecord.js b/src/ViewHoldingsRecord.js
@@ -727,7 +727,9 @@ class ViewHoldingsRecord extends React.Component {
                     updatedDate: getDate(holdingsRecord?.metadata?.updatedDate),
                   })}
                   dismissible
-                  onClose={() => switchAffiliation(stripes, tenantFrom, this.onClose)}
+                  onClose={async () => {
+                    await switchAffiliation(stripes, tenantFrom, this.onClose);
+                  }}
                   actionMenu={this.getPaneHeaderActionMenu}
                 >
                   <Row center="xs">

diff --git a/src/routes/ItemRoute.js b/src/routes/ItemRoute.js
@@ -171,14 +171,14 @@ class ItemRoute extends React.Component {
     });
   }
 
-  onClose = () => {
+  onClose = async () => {
     const {
       stripes,
       location,
     } = this.props;
     const tenantFrom = location?.state?.tenantFrom || stripes.okapi.tenant;
 
-    switchAffiliation(stripes, tenantFrom, this.goBack);
+    await switchAffiliation(stripes, tenantFrom, this.goBack);
   }
 
   isLoading = () => {

diff --git a/src/utils.js b/src/utils.js
@@ -834,7 +834,7 @@ export const switchAffiliation = async (stripes, tenantId, move) => {
   if (stripes.okapi.tenant !== tenantId) {
     await updateTenant(stripes.okapi, tenantId);
 
-    validateUser(
+    await validateUser(
       stripes.okapi.url,
       stripes.store,
       tenantId,