UIIN-2546/UIIN-2548/UIIN-2549/UIIN-2556/UIIN-2557 Number generator implementation

package.json

@@ -101,6 +101,7 @@
       "orders.holding-summary": "1.0",
       "order-lines": "2.0 3.0",
       "organizations.organizations": "1.0",
+      "servint": "2.0 3.0",
       "pieces": "3.0",
       "titles": "1.2"
     },
@@ -484,6 +485,14 @@
         ],
         "visible": true
       },
+      {
+        "permissionName": "ui-inventory.settings.numberGenerator.manage",
+        "displayName": "Settings (Inventory): Manage number generator options",
+        "subPermissions": [
+          "settings.users.enabled"
+        ],
+        "visible": true
+      },
       {
         "permissionName": "ui-inventory.instance.view",
         "displayName": "Inventory: View instances, holdings, and items",
@@ -868,6 +877,7 @@
     "@babel/preset-react": "^7.9.0",
     "@folio/eslint-config-stripes": "^7.0.0",
     "@folio/jest-config-stripes": "^2.0.0",
+    "@folio/service-interaction": "^3.0.0",
     "@folio/stripes": "^9.0.0",
     "@folio/stripes-cli": "^3.0.0",
     "@folio/stripes-components": "^12.0.0",
@@ -915,6 +925,7 @@
     "use-session-storage-state": "^18.2.0"
   },
   "peerDependencies": {
+    "@folio/service-interaction": "^3.0.0",
     "@folio/stripes": "^9.0.0",
     "@folio/stripes-marc-components": "^1.0.0",
     "react": "^18.2.0",

src/Holding/CreateHolding/CreateHolding.js

@@ -13,7 +13,7 @@ import {
 import { LoadingView } from '@folio/stripes/components';
 
 import { useInstance } from '../../common/hooks';
-import { useCallout } from '../../hooks';
+import { useCallout, useConfigurationQuery } from '../../hooks';
 import HoldingsForm from '../../edit/holdings/HoldingsForm';
 import { switchAffiliation } from '../../utils';
 
@@ -26,6 +26,8 @@ const CreateHolding = ({
   mutator,
 }) => {
   const callout = useCallout();
+  const { configs } = useConfigurationQuery('number_generator');
+
   const { instance, isLoading: isInstanceLoading } = useInstance(instanceId);
   const sourceId = referenceData.holdingsSourcesByName?.FOLIO?.id;
   const tenantFrom = location?.state?.tenantFrom || stripes.okapi.tenant;
@@ -65,6 +67,7 @@ const CreateHolding = ({
 
   return (
     <HoldingsForm
+      configs={configs}
       form={instance.id}
       id={instance.id}
       initialValues={initialValues}

src/Holding/CreateHolding/CreateHolding.test.js

@@ -15,6 +15,7 @@ import CreateHolding from './CreateHolding';
 jest.mock('../../hooks', () => ({
   ...jest.requireActual('../../hooks'),
   useCallout: () => ({ sendCallout: jest.fn() }),
+  useConfigurationQuery: () => ({ configs: {} })
 }));
 
 jest.mock('../../common/hooks', () => ({

src/Holding/EditHolding/EditHolding.js

@@ -12,6 +12,7 @@ import {
 } from '../../common/hooks';
 import {
   useCallout,
+  useConfigurationQuery,
   useHoldingItemsQuery,
   useHoldingMutation,
 } from '../../hooks';
@@ -31,13 +32,16 @@ const EditHolding = ({
   referenceTables,
 }) => {
   const callout = useCallout();
+  const { configs } = useConfigurationQuery('number_generator');
+
   const {
     search,
     state: {
       backPathname: locationState,
       tenantFrom,
     } = {},
   } = location;
+
   const stripes = useStripes();
   const [httpError, setHttpError] = useState();
   const { instance, isLoading: isInstanceLoading } = useInstanceQuery(instanceId);
@@ -46,7 +50,6 @@ const EditHolding = ({
     searchParams: { limit: 1 },
   });
 
-
   const isMARCRecord = useMemo(() => (
     referenceTables?.holdingsSources?.find(source => source.id === holding?.sourceId)?.name === 'MARC'
   ), [holding]);
@@ -95,6 +98,7 @@ const EditHolding = ({
   return (
     <>
       <HoldingsForm
+        configs={configs}
         httpError={httpError}
         location={location}
         initialValues={holding}

src/Holding/EditHolding/EditHolding.test.js

@@ -20,6 +20,7 @@ jest.mock('../../edit/holdings/HoldingsForm', () => jest.fn().mockReturnValue('H
 jest.mock('../../hooks', () => ({
   ...jest.requireActual('../../hooks'),
   useCallout: () => jest.fn().mockReturnValue({ sendCallout: jest.fn() }),
+  useConfigurationQuery: () => ({ configs: {} }),
   useHoldingItemsQuery: jest.fn().mockReturnValue({ totalRecords: 1, isLoading: false }),
   useHoldingMutation: jest.fn().mockReturnValue({ mutateHolding: jest.fn() }),
 }));

src/Item/CreateItem/CreateItem.js

@@ -14,8 +14,8 @@ import {
   useHolding,
 } from '../../common';
 import ItemForm from '../../edit/items/ItemForm';
-import useCallout from '../../hooks/useCallout';
 import { useItemMutation } from '../hooks';
+import { useCallout, useConfigurationQuery } from '../../hooks';
 import { switchAffiliation } from '../../utils';
 
 const CreateItem = ({
@@ -38,6 +38,7 @@ const CreateItem = ({
   const { isLoading: isHoldingLoading, holding } = useHolding(holdingId, { tenantId: tenantTo });
   const callout = useCallout();
   const stripes = useStripes();
+  const { configs } = useConfigurationQuery('number_generator');
 
   const initialValues = useMemo(() => ({
     status: { name: 'Available' },
@@ -79,6 +80,7 @@ const CreateItem = ({
 
   return (
     <ItemForm
+      configs={configs}
       form={`itemform_${holding.id}`}
       id={holding.id}
       key={holding.id}

src/Item/CreateItem/CreateItem.test.js

@@ -13,7 +13,13 @@ import {
 import CreateItem from './CreateItem';
 
 jest.mock('../../edit/items/ItemForm', () => jest.fn().mockReturnValue('ItemForm'));
-jest.mock('../../hooks/useCallout', () => jest.fn().mockReturnValue({ sendCallout: jest.fn() }));
+
+jest.mock('../../hooks', () => ({
+  ...jest.requireActual('../../hooks'),
+  useCallout: () => jest.fn().mockReturnValue({ sendCallout: jest.fn() }),
+  useConfigurationQuery: () => ({ configs: {} }),
+}));
+
 jest.mock('../../common/hooks', () => ({
   ...jest.requireActual('../../common/hooks'),
   useInstanceQuery: jest.fn().mockReturnValue({ instance: {}, isLoading: false }),

src/Item/EditItem/EditItem.js

@@ -17,13 +17,13 @@ import {
   useHolding,
 } from '../../common';
 import ItemForm from '../../edit/items/ItemForm';
-import useCallout from '../../hooks/useCallout';
 import { parseHttpError, switchAffiliation } from '../../utils';
 import {
   useItem,
   useItemMutation,
   useBoundWithsMutation,
 } from '../hooks';
+import { useCallout, useConfigurationQuery } from '../../hooks';
 
 const EditItem = ({
   referenceData,
@@ -39,6 +39,7 @@ const EditItem = ({
   const { isLoading: isItemLoading, item } = useItem(itemId);
   const callout = useCallout();
   const stripes = useStripes();
+  const { configs } = useConfigurationQuery('number_generator');
 
   const goBack = useCallback(() => {
     history.push({
@@ -114,6 +115,7 @@ const EditItem = ({
   return (
     <>
       <ItemForm
+        configs={configs}
         httpError={httpError}
         form={`itemform_${holding.id}`}
         id={holding.id}

src/Item/EditItem/EditItem.test.js

@@ -14,7 +14,12 @@ import EditItem from './EditItem';
 import ItemForm from '../../edit/items/ItemForm';
 
 jest.mock('../../edit/items/ItemForm', () => jest.fn().mockReturnValue('ItemForm'));
-jest.mock('../../hooks/useCallout', () => jest.fn().mockReturnValue({ sendCallout: jest.fn() }));
+jest.mock('../../hooks', () => ({
+  ...jest.requireActual('../../hooks'),
+  useCallout: () => jest.fn().mockReturnValue({ sendCallout: jest.fn() }),
+  useConfigurationQuery: () => ({ configs: {} }),
+}));
+
 jest.mock('../../common/hooks', () => ({
   ...jest.requireActual('../../common/hooks'),
   useInstanceQuery: jest.fn().mockReturnValue({ instance: {}, isLoading: false }),

src/edit/holdings/HoldingsForm.js

@@ -33,6 +33,8 @@ import { ViewMetaData } from '@folio/stripes/smart-components';
 
 import stripesFinalForm from '@folio/stripes/final-form';
 
+import { NumberGeneratorModalButton } from '@folio/service-interaction';
+
 import OptimisticLockingBanner from '../../components/OptimisticLockingBanner';
 import ElectronicAccessFields from '../electronicAccessFields';
 import { handleKeyCommand, validateOptionalField } from '../../utils';
@@ -115,6 +117,9 @@ class HoldingsForm extends React.Component {
     }),
     goTo: PropTypes.func.isRequired,
     httpError: PropTypes.object,
+    configs: PropTypes.shape({
+      callNumberGeneratorSettingHoldings: PropTypes.string
+    })
   };
 
   static defaultProps = {
@@ -189,6 +194,8 @@ class HoldingsForm extends React.Component {
 
   render() {
     const {
+      configs,
+      form: { change },
       onCancel,
       initialValues,
       instance,
@@ -225,6 +232,10 @@ class HoldingsForm extends React.Component {
       }),
     ) : [];
 
+    const {
+      callNumberGeneratorSettingHoldings,
+    } = configs;
+
     const holdingsTypeOptions = referenceTables.holdingsTypes ? referenceTables.holdingsTypes.map(
       it => ({
         label: it.name,
@@ -538,15 +549,36 @@ class HoldingsForm extends React.Component {
                         />
                       </Col>
                       <Col sm={2}>
-                        <Field
-                          label={<FormattedMessage id="ui-inventory.callNumber" />}
-                          name="callNumber"
-                          id="additem_callnumber"
-                          component={TextArea}
-                          rows={1}
-                          fullWidth
-                          disabled={this.isFieldBlocked('callNumber')}
-                        />
+                        <Row>
+                          <Field
+                            label={<FormattedMessage id="ui-inventory.callNumber" />}
+                            name="callNumber"
+                            id="additem_callnumber"
+                            component={TextArea}
+                            rows={1}
+                            fullWidth
+                            disabled={this.isFieldBlocked('callNumber') || callNumberGeneratorSettingHoldings === 'useGenerator'}
+                          />
+                        </Row>
+                        <Row>
+                          {(
+                            callNumberGeneratorSettingHoldings === 'useGenerator' ||
+                            callNumberGeneratorSettingHoldings === 'useBoth'
+                          ) &&
+                            <Col xs={12}>
+                              <NumberGeneratorModalButton
+                                buttonLabel={<FormattedMessage id="ui-inventory.numberGenerator.generateCallNumber" />}
+                                callback={(generated) => change('callNumber', generated)}
+                                id="inventoryCallNumber"
+                                generateButtonLabel={<FormattedMessage id="ui-inventory.numberGenerator.generateCallNumber" />}
+                                generator="inventory_callNumber"
+                                modalProps={{
+                                  label: <FormattedMessage id="ui-inventory.numberGenerator.callNumberGenerator" />
+                                }}
+                              />
+                            </Col>
+                          }
+                        </Row>
                       </Col>
                       <Col sm={2}>
                         <Field

src/edit/holdings/HoldingsForm.test.js

@@ -19,6 +19,10 @@ import { DataContext } from '../../contexts';
 
 import HoldingsForm from './HoldingsForm';
 
+jest.mock('@folio/service-interaction', () => ({
+  NumberGeneratorModalButton: () => <div>NumberGeneratorModalButton</div>
+}));
+
 jest.mock('../common', () => ({
   LocationSelectionWithCheck: () => <div>LocationSelection</div>,
 }));
@@ -76,6 +80,7 @@ const HoldingsFormSetup = (props = {}) => (
         >
           <HoldingsForm
             initialValues={mockInitialValues}
+            configs={{}}
             onSubmit={mockOnSubmit}
             onCancel={mockOnCancel}
             instance={mockInstance}

src/edit/items/ItemForm.js

@@ -51,6 +51,8 @@ import { LocationSelectionWithCheck } from '../common';
 import AdministrativeNoteFields from '../administrativeNoteFields';
 import styles from './ItemForm.css';
 import { RemoteStorageWarning } from './RemoteStorageWarning';
+import getNumberGeneratorModals from './getNumberGeneratorModals';
+
 import {
   BoundWithTitlesFields,
   CirculationNotesFields,
@@ -197,6 +199,8 @@ class ItemForm extends React.Component {
 
   render() {
     const {
+      configs,
+      form: { change },
       onCancel,
       initialValues,
       instance,
@@ -312,6 +316,15 @@ class ItemForm extends React.Component {
       },
     ];
 
+    const {
+      disableAccessionNumberField,
+      disableBarcodeField,
+      disableCallNumberField,
+      renderAccessionNumberGenerator,
+      renderBarcodeGenerator,
+      renderCallNumberGenerator
+    } = getNumberGeneratorModals(configs, change);
+
     return (
       <form
         data-test-item-page-type={initialValues.id ? 'edit' : 'create'}
@@ -437,6 +450,7 @@ class ItemForm extends React.Component {
                       </Col>
                       <Col sm={2}>
                         <Field
+                          disabled={disableBarcodeField}
                           label={<FormattedMessage id="ui-inventory.barcode" />}
                           name="barcode"
                           id="additem_barcode"
@@ -445,15 +459,18 @@ class ItemForm extends React.Component {
                           autoFocus
                           fullWidth
                         />
+                        {renderBarcodeGenerator()}
                       </Col>
                       <Col sm={2}>
                         <Field
+                          disabled={disableAccessionNumberField}
                           label={<FormattedMessage id="ui-inventory.accessionNumber" />}
                           name="accessionNumber"
                           id="additem_accessionnumber"
                           component={TextField}
                           fullWidth
                         />
+                        {renderAccessionNumberGenerator()}
                       </Col>
                       <Col sm={2}>
                         <Field
@@ -547,13 +564,15 @@ class ItemForm extends React.Component {
                       </Col>
                       <Col sm={2}>
                         <Field
+                          disabled={disableCallNumberField}
                           label={<FormattedMessage id="ui-inventory.callNumber" />}
                           name="itemLevelCallNumber"
                           id="additem_callnumber"
                           component={TextArea}
                           rows={1}
                           fullWidth
                         />
+                        {renderCallNumberGenerator()}
                       </Col>
                       <Col sm={2}>
                         <Field
@@ -852,6 +871,7 @@ class ItemForm extends React.Component {
 }
 
 ItemForm.propTypes = {
+  configs: PropTypes.object,
   onClose: PropTypes.func, // eslint-disable-line react/no-unused-prop-types
   newItem: PropTypes.bool, // eslint-disable-line react/no-unused-prop-types
   handleSubmit: PropTypes.func.isRequired,