UIIN-2628: Optimistic locking message not working for instances in no…

…n-consortial tenant (#2316)
folio-org · Oct 23, 2023 · 33589f7 · 33589f7
1 parent f0c4b11
commit 33589f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * Enable/disable consortial holdings/item actions based on User permissions. Refs UIIN-2452.
 * User receives an error when searching for an item in the Inventory app. Fixes UIIN-2634.
 * Create new instance success toast no longer shows the instance HRID. Fixes UIIN-2635.
+* Optimistic locking message not working for instances in non-consortial tenant. Fixes UIIN-2628.
 
 ## [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)

diff --git a/src/Instance/InstanceEdit/InstanceEdit.js b/src/Instance/InstanceEdit/InstanceEdit.js
@@ -72,22 +72,20 @@ const InstanceEdit = ({
   }, [callout, goBack]);
 
   const onError = async error => {
-    const parsedError = await parseHttpError(error);
+    const response = await error.response;
+    const parsedError = await parseHttpError(response);
     setHttpError(parsedError);
   };
 
   const isMemberTenant = checkIfUserInMemberTenant(stripes);
   const tenantId = (isMemberTenant && instance?.shared) ? stripes.user.user.consortium.centralTenantId : stripes.okapi.tenant;
 
-  const { mutateInstance } = useInstanceMutation({
-    options: { onSuccess, onError },
-    tenantId,
-  });
+  const { mutateInstance } = useInstanceMutation({ tenantId });
 
   const onSubmit = useCallback((initialInstance) => {
     const updatedInstance = marshalInstance(initialInstance, identifierTypesByName);
 
-    return mutateInstance(updatedInstance);
+    return mutateInstance(updatedInstance, { onSuccess, onError });
   }, [mutateInstance]);
 
   if (isInstanceLoading) return <LoadingView />;

diff --git a/src/hooks/useInstanceMutation/useInstanceMutation.js b/src/hooks/useInstanceMutation/useInstanceMutation.js
@@ -5,18 +5,18 @@ import { useTenantKy } from '../../common';
 const useInstanceMutation = ({ tenantId, options = {} }) => {
   const ky = useTenantKy({ tenantId });
 
-  const { mutateAsync } = useMutation({
+  const { mutate } = useMutation({
     mutationFn: (instance) => {
       const kyMethod = instance.id ? 'put' : 'post';
       const kyPath = instance.id ? `inventory/instances/${instance.id}` : 'inventory/instances';
 
-      return ky[kyMethod](kyPath, { json: instance });
+      return ky[kyMethod](kyPath, { json: instance }).json();
     },
     ...options,
   });
 
   return {
-    mutateInstance: mutateAsync,
+    mutateInstance: mutate,
   };
 };