Merge remote-tracking branch 'origin/UIIN-2617' into UIIN-2617

CHANGELOG.md

@@ -15,6 +15,9 @@
 * Instance. Series heading has vanished in detailed view. Fixes UIIN-2601.
 * Remove error message after switch from Instance Edit screen to another app. Fixes UIIN-2600.
 * 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.
 * Add immediate warning message when a local instance is shared. Refs UIIN-2617.
 
 ## [10.0.0](https://github.com/folio-org/ui-inventory/tree/v10.0.0) (2023-10-13)

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 />;

src/ViewHoldingsRecord.js

@@ -479,9 +479,10 @@ class ViewHoldingsRecord extends React.Component {
       referenceTables,
       goTo,
       stripes,
-      location: { state: { tenantFrom } },
+      location,
     } = this.props;
     const { instance } = this.state;
+    const tenantFrom = location?.state?.tenantFrom || stripes.okapi.tenant;
 
     if (this.isAwaitingResource()) return <LoadingView />;
 

src/ViewInstance.js

@@ -965,9 +965,9 @@ class ViewInstance extends React.Component {
 
             <Callout ref={this.calloutRef} />
 
-            {this.state.afterCreate &&
+            {this.state.afterCreate && !isEmpty(instance) &&
               <CalloutRenderer
-                message={<FormattedMessage id="ui-inventory.instance.successfullySaved" values={{ hrid: instance?.hrid }} />}
+                message={<FormattedMessage id="ui-inventory.instance.successfullySaved" values={{ hrid: instance.hrid }} />}
               />
             }
 

src/components/InstancesList/InstancesList.js

@@ -16,6 +16,7 @@ import {
 import saveAs from 'file-saver';
 import moment from 'moment';
 import classnames from 'classnames';
+import { stringify } from 'query-string';
 
 import {
   Pluggable,
@@ -134,6 +135,7 @@ class InstancesList extends React.Component {
     }),
     stripes: PropTypes.object.isRequired,
     history: PropTypes.shape({
+      push: PropTypes.func,
       listen: PropTypes.func,
       replace: PropTypes.func,
     }),
@@ -956,8 +958,9 @@ class InstancesList extends React.Component {
     const {
       parentResources,
       parentMutator: { itemsByQuery },
-      goTo,
       getParams,
+      stripes,
+      history,
     } = this.props;
     const { query, qindex } = parentResources?.query ?? {};
     const { searchInProgress } = this.state;
@@ -973,7 +976,10 @@ class InstancesList extends React.Component {
     }
 
     itemsByQuery.reset();
-    const items = await itemsByQuery.GET({ params: { query: itemQuery } });
+    const items = await itemsByQuery.GET({
+      params: { query: itemQuery },
+      tenant: stripes.okapi.tenant,
+    });
 
     this.setState({ searchInProgress: false });
 
@@ -984,7 +990,13 @@ class InstancesList extends React.Component {
     }
 
     const { id, holdingsRecordId } = items[0];
-    goTo(`/inventory/view/${instance.id}/${holdingsRecordId}/${id}`, getParams());
+    const search = stringify(getParams());
+
+    history.push({
+      pathname: `/inventory/view/${instance.id}/${holdingsRecordId}/${id}`,
+      search,
+      state: { tenantTo: stripes.okapi.tenant },
+    });
 
     return null;
   }

src/components/InstancesList/InstancesList.test.js

@@ -559,6 +559,7 @@ describe('InstancesList', () => {
             params: {
               query: `${option}=="${_query}"`,
             },
+            tenant: 'diku',
           });
         });
       });

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,
   };
 };
 

src/routes/ItemRoute.js

@@ -174,8 +174,9 @@ class ItemRoute extends React.Component {
   onClose = () => {
     const {
       stripes,
-      location: { state: { tenantFrom } },
+      location,
     } = this.props;
+    const tenantFrom = location?.state?.tenantFrom || stripes.okapi.tenant;
 
     switchAffiliation(stripes, tenantFrom, this.goBack);
   }