UINV-498: add inactive status for account numbers

src/invoices/InvoiceLineForm/InvoiceLineForm.js

@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo, useRef } from 'react';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 import { Field } from 'react-final-form';
 import { useHistory } from 'react-router';
@@ -45,12 +45,11 @@ import { useFundDistributionValidation } from '../../common/hooks';
 import { StatusValue } from '../../common/components';
 import {
   calculateTotalAmount,
-  getAccountNumberOptions,
   IS_EDIT_POST_APPROVAL,
 } from '../../common/utils';
 import {
   convertToInvoiceLineFields,
-  getActiveAccountNumbers,
+  getActiveAccountNumberOptions,
 } from '../utils';
 import AdjustmentsForm from '../AdjustmentsForm';
 import {
@@ -74,6 +73,7 @@ const InvoiceLineForm = ({
 }) => {
   const history = useHistory();
   const accordionStatusRef = useRef();
+  const { formatMessage } = useIntl();
   const { validateFundDistributionTotal } = useFundDistributionValidation({
     formValues,
     currency: invoice.currency,
@@ -169,16 +169,13 @@ const InvoiceLineForm = ({
     />
   );
 
-  const accountNumbers = useMemo(() => {
-    return getActiveAccountNumbers({
+  const activeAccountOptions = useMemo(() => {
+    return getActiveAccountNumberOptions({
       accounts,
       initialAccountNumber: accountNumber,
+      formatMessage,
     });
-  }, [accounts, accountNumber]);
-
-  const activeAccountOptions = useMemo(() => {
-    return getAccountNumberOptions(accountNumbers);
-  }, [accountNumbers]);
+  }, [accounts, accountNumber, formatMessage]);
 
   const accountNumberDisabled = useMemo(() => {
     const hasCurrentAccountNumber = accounts.some(({ accountNo }) => accountNo === currentAccountNumber);

src/invoices/utils.js

@@ -8,8 +8,11 @@ import {
   PAYMENT_STATUS,
   RECEIPT_STATUS,
 } from '@folio/stripes-acq-components';
+
 import { ACCOUNT_STATUS } from './constants';
 
+const { ACTIVE, INACTIVE } = ACCOUNT_STATUS;
+
 export const getAdjustmentFromPreset = ({
   description,
   prorate,
@@ -120,10 +123,14 @@ export const getCommonInvoiceLinesFormatter = (currency, ordersMap, orderlinesMa
   ),
 });
 
-export const getActiveAccountNumbers = ({ accounts = [], initialAccountNumber }) => {
+export const getActiveAccountNumberOptions = ({ accounts = [], initialAccountNumber, formatMessage }) => {
+  const message = ` - ${formatMessage({ id: 'ui-invoice.inactive' })}`;
   const activeAccounts = accounts.filter(({ accountStatus, accountNo }) => {
-    return accountStatus === ACCOUNT_STATUS.ACTIVE || accountNo === initialAccountNumber;
+    return accountStatus === ACTIVE || accountNo === initialAccountNumber;
   });
 
-  return uniq(activeAccounts.map(({ accountNo }) => accountNo).filter(Boolean));
+  return uniq(activeAccounts.map(({ name, accountNo, accountStatus }) => ({
+    label: `${name} (${accountNo}) ${accountStatus === INACTIVE ? message : ''}`,
+    value: accountNo,
+  })));
 };

src/invoices/utils.test.js

@@ -1,8 +1,10 @@
 import {
   convertToInvoiceLineFields,
-  getActiveAccountNumbers,
+  getActiveAccountNumberOptions,
 } from './utils';
 
+const mockFormatMessage = jest.fn(({ id }) => id);
+
 const mockAccounts = [
   {
     'name': 'Monographic ordering unit account',
@@ -65,16 +67,23 @@ describe('Invoice utils', () => {
     });
   });
 
-  describe('getActiveAccountNumbers', () => {
+  describe('getActiveAccountNumberOptions', () => {
     it('should return active account numbers', () => {
       const initialAccountNumber = mockAccounts[1].accountNo;
 
-      expect(getActiveAccountNumbers({
+      expect(getActiveAccountNumberOptions({
         accounts: mockAccounts,
         initialAccountNumber,
+        formatMessage: mockFormatMessage,
       })).toEqual([
-        mockAccounts[0].accountNo,
-        initialAccountNumber,
+        {
+          'label': 'Monographic ordering unit account (1234) ',
+          'value': '1234',
+        },
+        {
+          'label': 'Amazon Test account (00000001)  - ui-invoice.inactive',
+          'value': '00000001',
+        },
       ]);
     });
   });

translations/ui-invoice/en.json

@@ -44,6 +44,7 @@
 
   "showTags": "Show tags",
   "addTagFor": "Add tag for: {filterValue}",
+  "inactive": "Inactive",
 
   "invoiceLine.adminData": "Invoice line admin data",
   "invoiceLine.adjustments": "Invoice line adjustments",