UIIN-2452: Fixes in CreateHoldings component

folio-org · Oct 24, 2023 · 1523490 · 1523490
1 parent fd7e0ce
commit 1523490
Showing 1 changed file with 4 additions and 3 deletions.
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({
@@ -45,15 +45,16 @@ const CreateHolding = ({
 
   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]);