UIU-2701: Return appropriate error message when item for manual fee/f…

…ine can't be found (#2847)
folio-org · Jan 25, 2025 · eedb997 · eedb997
1 parent 7d0fc72
commit eedb997
Show file tree

Hide file tree

Showing 9 changed files with 397 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * Update fee/fine actions column UX for accessibility. Refs UIU-3027.
 * Change import of `exportToCsv` from `stripes-util` to `stripes-components`. Refs UIU-3202.
 * Provide `itemToString` to create unique `key` attributes. Refs UIU-3312.
+* Return appropriate error message when item for manual fee/fine can't be found. Refs UIU-2701.
 
 ## [11.0.11](https://github.com/folio-org/ui-users/tree/v11.0.11) (2025-01-15)
 [Full Changelog](https://github.com/folio-org/ui-users/compare/v11.0.10...v11.0.11)

diff --git a/src/components/Accounts/ChargeFeeFine/ChargeFeeFine.js b/src/components/Accounts/ChargeFeeFine/ChargeFeeFine.js
@@ -21,7 +21,10 @@ import {
   loadServicePoints,
   deleteOptionalActionFields,
 } from '../accountFunctions';
-import { SHARED_OWNER } from '../../../constants';
+import {
+  SHARED_OWNER,
+  NEW_FEE_FINE_FIELD_NAMES,
+} from '../../../constants';
 
 class ChargeFeeFine extends React.Component {
   static propTypes = {
@@ -72,6 +75,7 @@ class ChargeFeeFine extends React.Component {
       showConfirmDialog: false,
       notify: null,
       paymentNotify: null,
+      itemBarcode: '',
     };
     this.chargeAction = this.chargeAction.bind(this);
     this.payAction = this.payAction.bind(this);
@@ -232,7 +236,10 @@ class ChargeFeeFine extends React.Component {
 
   onClickSelectItem(barcode) {
     if (barcode !== '') {
-      this.props.mutator.activeRecord.update({ barcode });
+      this.props.mutator.activeRecord.update({
+        barcode,
+        isBarcodeValidated: true,
+      });
       if ((this.props.resources.activeRecord || {}).barcode === barcode) {
         this.setState({
           lookup: true,
@@ -241,7 +248,7 @@ class ChargeFeeFine extends React.Component {
     }
   }
 
-  onChangeOwner(ownerId) {
+  onChangeOwner(ownerId, itemBarcode = '') {
     const {
       resources,
       mutator,
@@ -253,7 +260,11 @@ class ChargeFeeFine extends React.Component {
       mutator.activeRecord.update({ shared });
     }
     mutator.activeRecord.update({ ownerId });
-    this.setState({ ownerId });
+
+    this.setState({
+      ownerId,
+      itemBarcode,
+    });
   }
 
   onChangeItem(item) {
@@ -395,7 +406,12 @@ class ChargeFeeFine extends React.Component {
     );
   }
 
-  onSubmitCharge = (data) => {
+  onSubmitCharge = (dataToSend) => {
+    const data = _.cloneDeep(dataToSend);
+
+    _.unset(data, NEW_FEE_FINE_FIELD_NAMES.ITEM_BARCODE);
+    _.unset(data, NEW_FEE_FINE_FIELD_NAMES.KEY_OF_ITEM_BARCODE);
+
     if (data.pay) {
       delete data.pay;
       this.type.remaining = data.amount;
@@ -433,6 +449,7 @@ class ChargeFeeFine extends React.Component {
       ownerId,
       feeFineTypeId,
       pay,
+      itemBarcode,
     } = this.state;
     this.item = _.get(resources, ['items', 'records', [0]], {});
     const feefines = _.get(resources, ['allfeefines', 'records'], []);
@@ -461,7 +478,7 @@ class ChargeFeeFine extends React.Component {
     parseFloat(selected).toFixed(2);
     let item;
 
-    if (this.item && (loanid || barcode)) {
+    if (this.item && (loanid || barcode || !resources.activeRecord?.isBarcodeValidated)) {
       item = {
         id: this.item.id || '',
         instance: this.item.title || '',
@@ -490,7 +507,8 @@ class ChargeFeeFine extends React.Component {
       ownerId: initialOwnerId,
       notify: !!(selectedFeeFine?.chargeNoticeId || selectedOwner?.defaultChargeNoticeId),
       feeFineId: '',
-      amount: ''
+      amount: '',
+      itemBarcode,
     };
 
     const initialActionValues = {

diff --git a/src/components/Accounts/ChargeFeeFine/ChargeFeeFine.test.js b/src/components/Accounts/ChargeFeeFine/ChargeFeeFine.test.js
@@ -0,0 +1,77 @@
+import {
+  screen,
+  render,
+} from '@folio/jest-config-stripes/testing-library/react';
+import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
+
+import ChargeFeeFine from './ChargeFeeFine';
+import ChargeForm from './ChargeForm';
+
+const basicProps = {
+  resources: {
+    activeRecord: {
+      isBarcodeValidated: true,
+    },
+  },
+  mutator: {
+    activeRecord: {
+      update: jest.fn(),
+    },
+  },
+  user: {},
+  stripes: {},
+  location: {},
+  history: {},
+  intl: {},
+  match: {
+    params: {},
+  },
+  okapi: {
+    currentUser: {},
+  },
+};
+const testIds = {
+  selectItem: 'selectItem',
+};
+const itemBarcode = 'itemBarcode';
+
+jest.mock('./ChargeForm', () => jest.fn(({
+  onClickSelectItem,
+}) => (
+  <>
+    <button
+      type="button"
+      data-testid={testIds.selectItem}
+      onClick={() => onClickSelectItem(itemBarcode)}
+    >
+      Enter
+    </button>
+  </>
+)));
+jest.mock('./ItemLookup', () => jest.fn(() => <div />));
+jest.mock('../Actions/ActionModal', () => jest.fn(() => <div />));
+
+describe('ChargeFeeFine', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  beforeEach(() => {
+    render(<ChargeFeeFine {...basicProps} />);
+  });
+
+  it('should trigger ChargeForm', () => {
+    expect(ChargeForm).toHaveBeenCalled();
+  });
+
+  it('should update activeRecord', async () => {
+    const selectItemButton = screen.getByTestId(testIds.selectItem);
+
+    await userEvent.click(selectItemButton);
+
+    expect(basicProps.mutator.activeRecord.update).toHaveBeenCalledWith({
+      barcode: itemBarcode,
+      isBarcodeValidated: true,
+    });
+  });
+});
diff --git a/src/components/Accounts/ChargeFeeFine/ChargeForm.js b/src/components/Accounts/ChargeFeeFine/ChargeForm.js
@@ -22,7 +22,10 @@ import { effectiveCallNumber } from '@folio/stripes/util';
 import UserInfo from './UserInfo';
 import FeeFineInfo from './FeeFineInfo';
 import ItemInfo from './ItemInfo';
-import { SHARED_OWNER } from '../../../constants';
+import {
+  SHARED_OWNER,
+  NEW_FEE_FINE_FIELD_NAMES,
+} from '../../../constants';
 import { formatCurrencyAmount } from '../../util';
 
 function showValidationErrors({ feeFineId, ownerId, amount }) {
@@ -62,6 +65,7 @@ class ChargeForm extends React.Component {
     handleSubmit: PropTypes.func.isRequired,
     onClickSelectItem: PropTypes.func.isRequired,
     onFindShared: PropTypes.func.isRequired,
+    values: PropTypes.object.isRequired,
     pristine: PropTypes.bool,
     submitting: PropTypes.bool,
     invalid: PropTypes.bool,
@@ -122,9 +126,17 @@ class ChargeForm extends React.Component {
   }
 
   onChangeOwner(ownerId) {
-    const { form: { change, reset } } = this.props;
+    const {
+      form: {
+        change,
+        reset,
+      },
+      values,
+      onChangeOwner,
+    } = this.props;
+
     reset();
-    this.props.onChangeOwner(ownerId);
+    onChangeOwner(ownerId, values[NEW_FEE_FINE_FIELD_NAMES.ITEM_BARCODE]);
     let showNotify = false;
     const owner = this.props.owners.find(o => o.id === ownerId) || {};
     if (owner?.defaultChargeNoticeId) {

diff --git a/src/components/Accounts/ChargeFeeFine/ChargeForm.test.js b/src/components/Accounts/ChargeFeeFine/ChargeForm.test.js
@@ -139,6 +139,9 @@ const propData = {
     ownerId: '109155d9-3b60-4a3d-a6b1-066cf1b1356b',
     metadata: { createdDate: '2022-03-01T03:22:48.262+00:00', updatedDate: '2022-03-01T03:22:48.262+00:00' },
   }],
+  resources: {
+    items: {},
+  },
 };
 
 describe('ChargeForm component', () => {