From 671d1c841adbae5dc622b395adfcfb206b80ef48 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Fri, 15 Jul 2022 11:29:54 +0100
Subject: [PATCH 01/21] feat: Number Generator Barcode

Added a setting "use number generator for user barcode", which disables the user input field "Barcode" on user create. Offered instead is a button to select from a list of Number Generator Sequences under the Generator "Patron", set up in the ui-service-interaction settings page.

Linting
---
 package.json                                  |  6 +-
 .../EditSections/EditUserInfo/EditUserInfo.js | 38 ++++++++---
 src/routes/UserRecordContainer.js             |  2 +-
 src/settings/NumberGeneratorOptions.js        | 68 +++++++++++++++++++
 src/settings/sections.js                      |  6 ++
 src/views/Notes/NoteViewPage.test.js          |  8 +--
 src/views/UserEdit/UserEdit.js                |  1 +
 src/views/UserEdit/UserForm.js                |  1 +
 translations/ui-users/en.json                 |  2 +
 9 files changed, 117 insertions(+), 15 deletions(-)
 create mode 100644 src/settings/NumberGeneratorOptions.js

diff --git a/package.json b/package.json
index 92817e8f7..657e7aefa 100644
--- a/package.json
+++ b/package.json
@@ -894,7 +894,8 @@
     "react-router-dom": "^5.2.0",
     "redux": "^4.0.0",
     "regenerator-runtime": "^0.13.9",
-    "sinon": "^7.1.1"
+    "sinon": "^7.1.1",
+    "@folio/service-interaction": "^1.0.0"
   },
   "dependencies": {
     "final-form-set-field-data": "^1.0.2",
@@ -917,7 +918,8 @@
     "react": "^17.0.2",
     "react-intl": "^5.8.0",
     "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0"
+    "react-router-dom": "^5.2.0",
+    "@folio/service-interaction": "^1.0.0"
   },
   "optionalDependencies": {
     "@folio/plugin-find-user": "^6.0.0"
diff --git a/src/components/EditSections/EditUserInfo/EditUserInfo.js b/src/components/EditSections/EditUserInfo/EditUserInfo.js
index f0b91d46d..60304161a 100644
--- a/src/components/EditSections/EditUserInfo/EditUserInfo.js
+++ b/src/components/EditSections/EditUserInfo/EditUserInfo.js
@@ -7,6 +7,8 @@ import moment from 'moment-timezone';
 import { OnChange } from 'react-final-form-listeners';
 
 import { ViewMetaData } from '@folio/stripes/smart-components';
+import { NumberGeneratorModalButton } from '@folio/service-interaction';
+
 import {
   Button,
   Select,
@@ -32,6 +34,7 @@ class EditUserInfo extends React.Component {
     intl: PropTypes.object.isRequired,
     onToggle: PropTypes.func,
     patronGroups: PropTypes.arrayOf(PropTypes.object),
+    settings: PropTypes.arrayOf(PropTypes.object),
     stripes: PropTypes.shape({
       timezone: PropTypes.string.isRequired,
       store: PropTypes.shape({
@@ -111,8 +114,14 @@ class EditUserInfo extends React.Component {
       accordionId,
       intl,
       uniquenessValidator,
+      form: { change },
+      settings
     } = this.props;
 
+    const useGeneratorForBarcode = JSON.parse(
+      (settings.find(sett => sett.configName === 'number_generator') ?? { value: '{}' }).value
+    )?.useGeneratorForBarcode ?? true;
+
     const { barcode } = initialValues;
 
     const isUserExpired = () => {
@@ -305,14 +314,27 @@ class EditUserInfo extends React.Component {
               )}
             </Col>
             <Col xs={12} md={3}>
-              <Field
-                label={<FormattedMessage id="ui-users.information.barcode" />}
-                name="barcode"
-                id="adduser_barcode"
-                component={TextField}
-                validate={asyncValidateField('barcode', barcode, uniquenessValidator)}
-                fullWidth
-              />
+              <Row>
+                <Col xs={12}>
+                  <Field
+                    disabled={useGeneratorForBarcode}
+                    label={<FormattedMessage id="ui-users.information.barcode" />}
+                    name="barcode"
+                    id="adduser_barcode"
+                    component={TextField}
+                    validate={asyncValidateField('barcode', barcode, uniquenessValidator)}
+                    fullWidth
+                  />
+                </Col>
+                {useGeneratorForBarcode &&
+                  <Col xs={12}>
+                    <NumberGeneratorModalButton
+                      callback={(generated) => change('barcode', generated)}
+                      generator="Patron"
+                    />
+                  </Col>
+                }
+              </Row>
             </Col>
           </Row>
         </Accordion>
diff --git a/src/routes/UserRecordContainer.js b/src/routes/UserRecordContainer.js
index bda59bec3..94245a738 100644
--- a/src/routes/UserRecordContainer.js
+++ b/src/routes/UserRecordContainer.js
@@ -159,7 +159,7 @@ class UserRecordContainer extends React.Component {
     settings: {
       type: 'okapi',
       records: 'configs',
-      path: 'configurations/entries?query=(module==USERS and configName==profile_pictures)',
+      path: 'configurations/entries?query=(module==USERS and (configName==profile_pictures or configName==number_generator))',
     },
     requestPreferences: {
       type: 'okapi',
diff --git a/src/settings/NumberGeneratorOptions.js b/src/settings/NumberGeneratorOptions.js
new file mode 100644
index 000000000..951589611
--- /dev/null
+++ b/src/settings/NumberGeneratorOptions.js
@@ -0,0 +1,68 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { FormattedMessage } from 'react-intl';
+import { Field } from 'react-final-form';
+
+import { stripesConnect, withStripes } from '@folio/stripes/core';
+import { ConfigManager } from '@folio/stripes/smart-components';
+
+import { Checkbox, Col, Row } from '@folio/stripes-components';
+
+class NumberGeneratorOptions extends React.Component {
+  static propTypes = {
+    stripes: PropTypes.object,
+  };
+
+  constructor(props) {
+    super(props);
+    this.connectedConfigManager = stripesConnect(ConfigManager);
+  }
+
+  defaultValues = {
+    useGeneratorForBarcode: true
+  };
+
+  beforeSave(data) {
+    return JSON.stringify(data);
+  }
+
+  getInitialValues = (settings) => {
+    let loadedValues = {};
+    try {
+      const value = settings.length === 0 ? '' : settings[0].value;
+      loadedValues = JSON.parse(value);
+    } catch (e) { } // eslint-disable-line no-empty
+    return {
+      ...this.defaultValues,
+      ...loadedValues,
+    };
+  }
+
+  render() {
+    return (
+      <this.connectedConfigManager
+        configName="number_generator"
+        getInitialValues={this.getInitialValues}
+        label={<FormattedMessage id="ui-users.settings.numberGeneratorOptions" />}
+        moduleName="USERS"
+        onBeforeSave={this.beforeSave}
+        stripes={this.props.stripes}
+        formType="final-form"
+      >
+        <Row>
+          <Col xs={12}>
+            <Field
+              component={Checkbox}
+              type="checkbox"
+              id="useGeneratorForBarcode"
+              name="useGeneratorForBarcode"
+              label={<FormattedMessage id="ui-users.settings.numberGeneratorOptions.useGeneratorForBarcode" />}
+            />
+          </Col>
+        </Row>
+      </this.connectedConfigManager>
+    );
+  }
+}
+
+export default withStripes(NumberGeneratorOptions);
diff --git a/src/settings/sections.js b/src/settings/sections.js
index beaef9de1..f486832af 100644
--- a/src/settings/sections.js
+++ b/src/settings/sections.js
@@ -18,6 +18,7 @@ import LimitsSettings from './LimitsSettings';
 import DepartmentsSettings from './DepartmentsSettings';
 import BlockTemplates from './patronBlocks/BlockTemplates';
 import TransferCriteriaSettings from './TransferCriteriaSettings';
+import NumberGeneratorOptions from './NumberGeneratorOptions';
 
 const settingsGeneral = [
   {
@@ -44,6 +45,11 @@ const settingsGeneral = [
     component: DepartmentsSettings,
     perm: 'ui-users.settings.departments.view'
   },
+  {
+    route: 'numbergeneratoroptions',
+    label: <FormattedMessage id="ui-users.settings.numberGeneratorOptions" />,
+    component: NumberGeneratorOptions
+  },
   //   Profile pictures are currently unsupported in Folio and the existence of this setting has
   //   confused implementers. Commenting out for now as opposed to deleting it so the existing
   //   files and components aren't orphaned.
diff --git a/src/views/Notes/NoteViewPage.test.js b/src/views/Notes/NoteViewPage.test.js
index 8695217ba..362d13f7a 100644
--- a/src/views/Notes/NoteViewPage.test.js
+++ b/src/views/Notes/NoteViewPage.test.js
@@ -1,8 +1,8 @@
-import { fireEvent } from '@testing-library/react';
-import { createMemoryHistory } from 'history';
 import {
-  render,
+  fireEvent,
+  render
 } from '@testing-library/react';
+import { createMemoryHistory } from 'history';
 
 import NoteViewPage from './NoteViewPage';
 
@@ -13,7 +13,7 @@ jest.mock('@folio/stripes/smart-components', () => ({
       onEdit,
     }) => (
       <>
-        <button 
+        <button
           type="button"
           onClick={navigateBack}
           data-testid="navigateBack"
diff --git a/src/views/UserEdit/UserEdit.js b/src/views/UserEdit/UserEdit.js
index a6addcc35..cd640c81c 100644
--- a/src/views/UserEdit/UserEdit.js
+++ b/src/views/UserEdit/UserEdit.js
@@ -117,6 +117,7 @@ class UserEdit extends React.Component {
       'addressTypes',
       'servicePoints',
       'departments',
+      'settings'
     );
 
     return formData;
diff --git a/src/views/UserEdit/UserForm.js b/src/views/UserEdit/UserForm.js
index 339cbd1a1..222e2f874 100644
--- a/src/views/UserEdit/UserForm.js
+++ b/src/views/UserEdit/UserForm.js
@@ -362,6 +362,7 @@ class UserForm extends React.Component {
                     accordionId="editUserInfo"
                     initialValues={initialValues}
                     patronGroups={formData.patronGroups}
+                    settings={formData.settings}
                     stripes={stripes}
                     form={form}
                     selectedPatronGroup={selectedPatronGroup}
diff --git a/translations/ui-users/en.json b/translations/ui-users/en.json
index 33c5ba50f..d3cdd3147 100644
--- a/translations/ui-users/en.json
+++ b/translations/ui-users/en.json
@@ -151,6 +151,8 @@
   "settings.departments.users": "Users",
   "settings.manualBlockTemplates": "Templates",
   "settings.manualBlockTemplates.paneTitle": "Patron block templates",
+  "settings.numberGeneratorOptions": "Number generator options",
+  "settings.numberGeneratorOptions.useGeneratorForBarcode": "Use number generator for user barcode",
   "manualBlockTemplates.templateInformation": "Template information",
   "manualBlockTemplates.templateName": "Template name",
   "manualBlockTemplates.blockCode": "Block code",

From 53f376fa9dd7c658b186e235418c2431fedc5afe Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Thu, 8 Sep 2022 16:02:37 +0100
Subject: [PATCH 02/21] feat: NumberGen Settings

Added 3 options, useGenerator/useTextField/useBoth under settings, and utilised those in the Form itself
---
 package.json                                  |  8 ++++++
 .../EditSections/EditUserInfo/EditUserInfo.js | 13 +++++----
 src/settings/NumberGeneratorOptions.js        | 27 +++++++++++++++----
 src/settings/sections.js                      |  3 ++-
 translations/ui-users/en.json                 |  4 ++-
 5 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index ca2da738d..0b880a2bf 100644
--- a/package.json
+++ b/package.json
@@ -847,6 +847,14 @@
           "ui-inventory.instance.view"
         ],
         "visible": true
+      },
+      {
+        "permissionName": "ui-users.settings.numberGenerator.manage",
+        "displayName": "Settings (Users): Manage number generator options",
+        "subPermissions": [
+          "settings.users.enabled"
+        ],
+        "visible": true
       }
     ]
   },
diff --git a/src/components/EditSections/EditUserInfo/EditUserInfo.js b/src/components/EditSections/EditUserInfo/EditUserInfo.js
index 60304161a..2a7b14662 100644
--- a/src/components/EditSections/EditUserInfo/EditUserInfo.js
+++ b/src/components/EditSections/EditUserInfo/EditUserInfo.js
@@ -118,9 +118,9 @@ class EditUserInfo extends React.Component {
       settings
     } = this.props;
 
-    const useGeneratorForBarcode = JSON.parse(
-      (settings.find(sett => sett.configName === 'number_generator') ?? { value: '{}' }).value
-    )?.useGeneratorForBarcode ?? true;
+
+    const numberGeneratorSettings = JSON.parse((settings?.find(sett => sett.configName === 'number_generator') ?? { value: '{}' }).value);
+    const barcodeGeneratorSetting = numberGeneratorSettings?.barcodeGeneratorSetting;
 
     const { barcode } = initialValues;
 
@@ -317,7 +317,7 @@ class EditUserInfo extends React.Component {
               <Row>
                 <Col xs={12}>
                   <Field
-                    disabled={useGeneratorForBarcode}
+                    disabled={barcodeGeneratorSetting === 'useGenerator'}
                     label={<FormattedMessage id="ui-users.information.barcode" />}
                     name="barcode"
                     id="adduser_barcode"
@@ -326,7 +326,10 @@ class EditUserInfo extends React.Component {
                     fullWidth
                   />
                 </Col>
-                {useGeneratorForBarcode &&
+                {(
+                  barcodeGeneratorSetting === 'useGenerator' ||
+                  barcodeGeneratorSetting === 'useBoth'
+                ) &&
                   <Col xs={12}>
                     <NumberGeneratorModalButton
                       callback={(generated) => change('barcode', generated)}
diff --git a/src/settings/NumberGeneratorOptions.js b/src/settings/NumberGeneratorOptions.js
index 951589611..a6bc508d1 100644
--- a/src/settings/NumberGeneratorOptions.js
+++ b/src/settings/NumberGeneratorOptions.js
@@ -6,7 +6,7 @@ import { Field } from 'react-final-form';
 import { stripesConnect, withStripes } from '@folio/stripes/core';
 import { ConfigManager } from '@folio/stripes/smart-components';
 
-import { Checkbox, Col, Row } from '@folio/stripes-components';
+import { Col, RadioButton, Row } from '@folio/stripes-components';
 
 class NumberGeneratorOptions extends React.Component {
   static propTypes = {
@@ -52,11 +52,28 @@ class NumberGeneratorOptions extends React.Component {
         <Row>
           <Col xs={12}>
             <Field
-              component={Checkbox}
-              type="checkbox"
-              id="useGeneratorForBarcode"
-              name="useGeneratorForBarcode"
+              component={RadioButton}
+              id="useGenerator"
+              name="barcodeGeneratorSetting"
               label={<FormattedMessage id="ui-users.settings.numberGeneratorOptions.useGeneratorForBarcode" />}
+              type="radio"
+              value="useGenerator"
+            />
+            <Field
+              component={RadioButton}
+              id="useTextField"
+              name="barcodeGeneratorSetting"
+              label={<FormattedMessage id="ui-users.settings.numberGeneratorOptions.useTextFieldForBarcode" />}
+              type="radio"
+              value="useTextField"
+            />
+            <Field
+              component={RadioButton}
+              id="useBoth"
+              name="barcodeGeneratorSetting"
+              label={<FormattedMessage id="ui-users.settings.numberGeneratorOptions.useBothForBarcode" />}
+              type="radio"
+              value="useBoth"
             />
           </Col>
         </Row>
diff --git a/src/settings/sections.js b/src/settings/sections.js
index f486832af..8601b09b0 100644
--- a/src/settings/sections.js
+++ b/src/settings/sections.js
@@ -48,7 +48,8 @@ const settingsGeneral = [
   {
     route: 'numbergeneratoroptions',
     label: <FormattedMessage id="ui-users.settings.numberGeneratorOptions" />,
-    component: NumberGeneratorOptions
+    component: NumberGeneratorOptions,
+    perm: 'ui-users.settings.numberGenerator.manage'
   },
   //   Profile pictures are currently unsupported in Folio and the existence of this setting has
   //   confused implementers. Commenting out for now as opposed to deleting it so the existing
diff --git a/translations/ui-users/en.json b/translations/ui-users/en.json
index ed5d640fc..d46bd87b1 100644
--- a/translations/ui-users/en.json
+++ b/translations/ui-users/en.json
@@ -154,7 +154,9 @@
   "settings.manualBlockTemplates": "Templates",
   "settings.manualBlockTemplates.paneTitle": "Patron block templates",
   "settings.numberGeneratorOptions": "Number generator options",
-  "settings.numberGeneratorOptions.useGeneratorForBarcode": "Use number generator for user barcode",
+  "settings.numberGeneratorOptions.useGeneratorForBarcode": "Use number generator for user barcode.",
+  "settings.numberGeneratorOptions.useTextFieldForBarcode": "Use text field for user barcode.",
+  "settings.numberGeneratorOptions.useBothForBarcode": "Use number generator for user barcode but allow editing via text field.",
   "manualBlockTemplates.templateInformation": "Template information",
   "manualBlockTemplates.templateName": "Template name",
   "manualBlockTemplates.blockCode": "Block code",

From 3d7a406d9c1a5899994084e4ff480496d2a68197 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Thu, 15 Sep 2022 10:00:58 +0100
Subject: [PATCH 03/21] test: Added test

Added test for settings page (Untested so far as I can't run the tests locally rn)
---
 src/settings/NumberGeneratorOptions.test.js | 23 +++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 src/settings/NumberGeneratorOptions.test.js

diff --git a/src/settings/NumberGeneratorOptions.test.js b/src/settings/NumberGeneratorOptions.test.js
new file mode 100644
index 000000000..7d7916500
--- /dev/null
+++ b/src/settings/NumberGeneratorOptions.test.js
@@ -0,0 +1,23 @@
+import React from 'react';
+
+import { screen } from '@testing-library/react';
+
+import '__mock__/stripesCore.mock';
+import '__mock__/stripesSmartComponent.mock';
+import '__mock__/intl.mock';
+
+import renderWithRouter from 'helpers/renderWithRouter';
+import NumberGeneratorOptions from './NumberGeneratorOptions';
+
+jest.unmock('@folio/stripes/components');
+
+const renderNumberGeneratorSettings = (props) => renderWithRouter(<NumberGeneratorOptions {...props} />);
+
+describe('Number generator settings', () => {
+  it('renders all options', () => {
+    renderNumberGeneratorSettings();
+    expect(screen.getByText('Use number generator for user barcode.')).toBeTruthy();
+    expect(screen.getByText('Use text field for user barcode.')).toBeTruthy();
+    expect(screen.getByText('Use number generator for user barcode but allow editing via text field.')).toBeTruthy();
+  });
+});

From 45b527fc93413c028f89125ba04f152b88d1b5a9 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Thu, 15 Sep 2022 10:10:57 +0100
Subject: [PATCH 04/21] test: Test tweak

---
 .../EditSections/EditUserInfo/EditUserInfo.test.js         | 4 ++++
 src/settings/NumberGeneratorOptions.test.js                | 7 +++----
 test/jest/__mock__/stripesSmartComponent.mock.js           | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/EditSections/EditUserInfo/EditUserInfo.test.js b/src/components/EditSections/EditUserInfo/EditUserInfo.test.js
index fdab7d7a9..e07bd79ff 100644
--- a/src/components/EditSections/EditUserInfo/EditUserInfo.test.js
+++ b/src/components/EditSections/EditUserInfo/EditUserInfo.test.js
@@ -8,6 +8,10 @@ import '__mock__/stripesComponents.mock';
 import renderWithRouter from 'helpers/renderWithRouter';
 import EditUserInfo from './EditUserInfo';
 
+jest.mock('@folio/service-interaction', () => ({
+  NumberGeneratorModalButton: () => <div>NumberGeneratorModalButton</div>
+}));
+
 const onSubmit = jest.fn();
 
 const arrayMutators = {
diff --git a/src/settings/NumberGeneratorOptions.test.js b/src/settings/NumberGeneratorOptions.test.js
index 7d7916500..9678b4d2e 100644
--- a/src/settings/NumberGeneratorOptions.test.js
+++ b/src/settings/NumberGeneratorOptions.test.js
@@ -14,10 +14,9 @@ jest.unmock('@folio/stripes/components');
 const renderNumberGeneratorSettings = (props) => renderWithRouter(<NumberGeneratorOptions {...props} />);
 
 describe('Number generator settings', () => {
-  it('renders all options', () => {
+  it('renders', () => {
     renderNumberGeneratorSettings();
-    expect(screen.getByText('Use number generator for user barcode.')).toBeTruthy();
-    expect(screen.getByText('Use text field for user barcode.')).toBeTruthy();
-    expect(screen.getByText('Use number generator for user barcode but allow editing via text field.')).toBeTruthy();
+
+    expect(screen.getByTestId('config-manager')).toBeTruthy();
   });
 });
diff --git a/test/jest/__mock__/stripesSmartComponent.mock.js b/test/jest/__mock__/stripesSmartComponent.mock.js
index 1292a9588..3c692af83 100644
--- a/test/jest/__mock__/stripesSmartComponent.mock.js
+++ b/test/jest/__mock__/stripesSmartComponent.mock.js
@@ -47,6 +47,7 @@ jest.mock('@folio/stripes/smart-components', () => {
     ...jest.requireActual('@folio/stripes/smart-components'),
     AddressEditList: () => <div data-testid="address-edit-list">AddressEditList</div>,
     ChangeDueDateDialog: (props) => <div data-testid="change-duedate-dialog">ChangeDueDateDialog</div>,
+    ConfigManager: () => <div data-testid="config-manager">ConfigManager</div>,
     ControlledVocab: ({ validate }) => <div data-testid="controlled-vocab">ControlledVocab</div>,
     DueDatePicker: () => <div data-testid="due-date-picker">DueDatePicker</div>,
     LocationLookup: () => <div>LocationLookup</div>,

From 2df4c66f9e567afdc328558abc8782f6b4e97ffb Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Thu, 15 Sep 2022 15:13:34 +0100
Subject: [PATCH 05/21] chore: Quick tweak to default

---
 src/settings/NumberGeneratorOptions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/settings/NumberGeneratorOptions.js b/src/settings/NumberGeneratorOptions.js
index a6bc508d1..a9c0b077a 100644
--- a/src/settings/NumberGeneratorOptions.js
+++ b/src/settings/NumberGeneratorOptions.js
@@ -6,7 +6,7 @@ import { Field } from 'react-final-form';
 import { stripesConnect, withStripes } from '@folio/stripes/core';
 import { ConfigManager } from '@folio/stripes/smart-components';
 
-import { Col, RadioButton, Row } from '@folio/stripes-components';
+import { Col, RadioButton, Row } from '@folio/stripes/components';
 
 class NumberGeneratorOptions extends React.Component {
   static propTypes = {
@@ -19,7 +19,7 @@ class NumberGeneratorOptions extends React.Component {
   }
 
   defaultValues = {
-    useGeneratorForBarcode: true
+    barcodeGeneratorSetting: 'useTextField'
   };
 
   beforeSave(data) {

From 65f4bc7897108b24b7618d01f34b34db9d66816d Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Fri, 16 Sep 2022 10:21:41 +0100
Subject: [PATCH 06/21] chore: Interface stuff

Added optional Okapi interface dependency on servint and made setting page render conditionally on that interface, as well as only displaying
---
 package.json                                         |  3 ++-
 .../EditSections/EditUserInfo/EditUserInfo.js        | 12 ++++++++----
 src/settings/sections.js                             |  1 +
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0b880a2bf..e5f7c88c1 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,8 @@
       "loan-policy-storage": "1.0 2.0",
       "loan-storage": "4.0 5.0 6.0 7.0",
       "notes": "2.0 3.0",
-      "request-storage": "2.5 3.0 4.0"
+      "request-storage": "2.5 3.0 4.0",
+      "servint": "2.0"
     },
     "permissionSets": [
       {
diff --git a/src/components/EditSections/EditUserInfo/EditUserInfo.js b/src/components/EditSections/EditUserInfo/EditUserInfo.js
index 2a7b14662..d6ffa1f98 100644
--- a/src/components/EditSections/EditUserInfo/EditUserInfo.js
+++ b/src/components/EditSections/EditUserInfo/EditUserInfo.js
@@ -36,6 +36,7 @@ class EditUserInfo extends React.Component {
     patronGroups: PropTypes.arrayOf(PropTypes.object),
     settings: PropTypes.arrayOf(PropTypes.object),
     stripes: PropTypes.shape({
+      hasInterface: PropTypes.func.isRequired,
       timezone: PropTypes.string.isRequired,
       store: PropTypes.shape({
         dispatch: PropTypes.func.isRequired,
@@ -115,12 +116,15 @@ class EditUserInfo extends React.Component {
       intl,
       uniquenessValidator,
       form: { change },
-      settings
+      settings,
+      stripes
     } = this.props;
 
-
-    const numberGeneratorSettings = JSON.parse((settings?.find(sett => sett.configName === 'number_generator') ?? { value: '{}' }).value);
-    const barcodeGeneratorSetting = numberGeneratorSettings?.barcodeGeneratorSetting;
+    let barcodeGeneratorSetting = 'useTextField';
+    if (stripes.hasInterface('servint')) {
+      const numberGeneratorSettings = JSON.parse((settings?.find(sett => sett.configName === 'number_generator') ?? { value: '{}' }).value);
+      barcodeGeneratorSetting = numberGeneratorSettings?.barcodeGeneratorSetting ?? 'useTextField';
+    }
 
     const { barcode } = initialValues;
 
diff --git a/src/settings/sections.js b/src/settings/sections.js
index 8601b09b0..090ce97f8 100644
--- a/src/settings/sections.js
+++ b/src/settings/sections.js
@@ -49,6 +49,7 @@ const settingsGeneral = [
     route: 'numbergeneratoroptions',
     label: <FormattedMessage id="ui-users.settings.numberGeneratorOptions" />,
     component: NumberGeneratorOptions,
+    interface: 'servint',
     perm: 'ui-users.settings.numberGenerator.manage'
   },
   //   Profile pictures are currently unsupported in Folio and the existence of this setting has

From de4008229d5305e3789febab7fb6e4a4d5331c4f Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Fri, 16 Sep 2022 10:32:11 +0100
Subject: [PATCH 07/21] build: package rejig

Let yarn do the deps to avoid big switchups later down the line
---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index e5f7c88c1..88b02eb0e 100644
--- a/package.json
+++ b/package.json
@@ -881,6 +881,7 @@
     "@bigtest/mocha": "^0.5.2",
     "@bigtest/react": "^0.1.2",
     "@folio/eslint-config-stripes": "^6.0.0",
+    "@folio/service-interaction": "^1.0.0",
     "@folio/stripes": "^7.0.0",
     "@folio/stripes-cli": "^2.4.0",
     "@folio/stripes-components": "^10.0.0",
@@ -914,8 +915,7 @@
     "react-router-dom": "^5.2.0",
     "redux": "^4.0.0",
     "regenerator-runtime": "^0.13.9",
-    "sinon": "^7.1.1",
-    "@folio/service-interaction": "^1.0.0"
+    "sinon": "^7.1.1"
   },
   "dependencies": {
     "final-form-set-field-data": "^1.0.2",
@@ -933,13 +933,13 @@
     "uuid": "^8.3.2"
   },
   "peerDependencies": {
+    "@folio/service-interaction": "^1.0.0",
     "@folio/stripes": "^7.0.0",
     "moment": "^2.24.0",
     "react": "^17.0.2",
     "react-intl": "^5.8.0",
     "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0",
-    "@folio/service-interaction": "^1.0.0"
+    "react-router-dom": "^5.2.0"
   },
   "optionalDependencies": {
     "@folio/plugin-find-user": "^6.0.0"

From 792a410711f5a0e9465f50690ec42b2e6f0511fa Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Fri, 3 Feb 2023 10:10:37 +0000
Subject: [PATCH 08/21] chore: Tweaks

Tweaks after pulling from latest master, edited translations and fixed small bug with ConfigManager usage.

refs UIU-2729, UIU-2730
---
 src/components/EditSections/EditUserInfo/EditUserInfo.js | 1 +
 src/settings/NumberGeneratorOptions.js                   | 6 +++++-
 translations/ui-users/en.json                            | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/EditSections/EditUserInfo/EditUserInfo.js b/src/components/EditSections/EditUserInfo/EditUserInfo.js
index 658c4236a..2b54d41ae 100644
--- a/src/components/EditSections/EditUserInfo/EditUserInfo.js
+++ b/src/components/EditSections/EditUserInfo/EditUserInfo.js
@@ -339,6 +339,7 @@ class EditUserInfo extends React.Component {
                   <Col xs={12}>
                     <NumberGeneratorModalButton
                       callback={(generated) => change('barcode', generated)}
+                      id="userbarcode"
                       generator="Patron"
                     />
                   </Col>
diff --git a/src/settings/NumberGeneratorOptions.js b/src/settings/NumberGeneratorOptions.js
index a9c0b077a..3af9766f4 100644
--- a/src/settings/NumberGeneratorOptions.js
+++ b/src/settings/NumberGeneratorOptions.js
@@ -31,7 +31,11 @@ class NumberGeneratorOptions extends React.Component {
     try {
       const value = settings.length === 0 ? '' : settings[0].value;
       loadedValues = JSON.parse(value);
-    } catch (e) { } // eslint-disable-line no-empty
+    } catch (e) {
+      // Make sure we return _something_ because ConfigManager no longer has a safety check here
+      return {};
+    }
+
     return {
       ...this.defaultValues,
       ...loadedValues,
diff --git a/translations/ui-users/en.json b/translations/ui-users/en.json
index 42107b4df..aad33c7c5 100644
--- a/translations/ui-users/en.json
+++ b/translations/ui-users/en.json
@@ -155,9 +155,9 @@
   "settings.manualBlockTemplates": "Templates",
   "settings.manualBlockTemplates.paneTitle": "Patron block templates",
   "settings.numberGeneratorOptions": "Number generator options",
-  "settings.numberGeneratorOptions.useGeneratorForBarcode": "Use number generator for user barcode.",
-  "settings.numberGeneratorOptions.useTextFieldForBarcode": "Use text field for user barcode.",
-  "settings.numberGeneratorOptions.useBothForBarcode": "Use number generator for user barcode but allow editing via text field.",
+  "settings.numberGeneratorOptions.useGeneratorForBarcode": "Number generator on, fixed: the barcode can be filled using the generator only.",
+  "settings.numberGeneratorOptions.useTextFieldForBarcode": "Number generator off: the barcode can be filled manually only.",
+  "settings.numberGeneratorOptions.useBothForBarcode": "Number generator on, editable: the barcode can be filled using the generator and be edited, or filled manually.",
   "manualBlockTemplates.templateInformation": "Template information",
   "manualBlockTemplates.templateName": "Template name",
   "manualBlockTemplates.blockCode": "Block code",

From 586034e8f1e898ec66c1e76ed0b829a17cd04945 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Thu, 16 Feb 2023 16:33:44 +0000
Subject: [PATCH 09/21] fix: Generator code

Update generator code to use the new codes defined in this PR:

https://github.com/folio-org/mod-service-interaction/pull/72
---
 src/components/EditSections/EditUserInfo/EditUserInfo.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/EditSections/EditUserInfo/EditUserInfo.js b/src/components/EditSections/EditUserInfo/EditUserInfo.js
index 2b54d41ae..8d6aa2f8d 100644
--- a/src/components/EditSections/EditUserInfo/EditUserInfo.js
+++ b/src/components/EditSections/EditUserInfo/EditUserInfo.js
@@ -340,7 +340,7 @@ class EditUserInfo extends React.Component {
                     <NumberGeneratorModalButton
                       callback={(generated) => change('barcode', generated)}
                       id="userbarcode"
-                      generator="Patron"
+                      generator="users_patronBarcode"
                     />
                   </Col>
                 }

From 24e58e30bdf1334ca829b8b20b25eb1dd8ad220d Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Tue, 20 Jun 2023 09:27:00 +0100
Subject: [PATCH 10/21] build: OptionalOkapiInterfaces

Update to use servint 3
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c48b22946..f18508cb0 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
       "loan-storage": "4.0 5.0 6.0 7.0",
       "notes": "2.0 3.0",
       "request-storage": "2.5 3.0 4.0 5.0 6.0",
-      "servint": "2.0"
+      "servint": "2.0 3.0"
     },
     "permissionSets": [
       {

From 74ebca300e8865a9e3a418c02e82172bd49c7cc4 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Mon, 7 Aug 2023 17:43:00 +0100
Subject: [PATCH 11/21] build: use new service-interaction

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index eefdb3c4b..0f67a49e7 100644
--- a/package.json
+++ b/package.json
@@ -1045,7 +1045,7 @@
     "@babel/preset-react": "^7.9.0",
     "@folio/eslint-config-stripes": "^6.0.0",
     "@folio/jest-config-stripes": "^1.0.0",
-    "@folio/service-interaction": "^1.0.0",
+    "@folio/service-interaction": "^2.0.0",
     "@folio/stripes": "^8.0.0",
     "@folio/stripes-cli": "^2.4.0",
     "@formatjs/cli": "^6.0.4",
@@ -1081,7 +1081,7 @@
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@folio/service-interaction": "^1.0.0",
+    "@folio/service-interaction": "^2.0.0",
     "@folio/stripes": "^8.0.0",
     "moment": "^2.24.0",
     "react": "^17.0.2",

From ab09c0e13b394c01c43a3158216b85dc17119e9a Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Fri, 8 Sep 2023 11:15:30 +0100
Subject: [PATCH 12/21] chore: UX Tweaks

Added some translations and brought button UX in line with other implementations
---
 .../EditSections/EditUserInfo/EditUserInfo.js    |  6 ++++++
 src/settings/NumberGeneratorOptions.js           | 16 ++++++++--------
 translations/ui-users/en.json                    |  2 ++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/EditSections/EditUserInfo/EditUserInfo.js b/src/components/EditSections/EditUserInfo/EditUserInfo.js
index 0883d51a6..0674e8e7c 100644
--- a/src/components/EditSections/EditUserInfo/EditUserInfo.js
+++ b/src/components/EditSections/EditUserInfo/EditUserInfo.js
@@ -365,9 +365,15 @@ class EditUserInfo extends React.Component {
                 ) &&
                   <Col xs={12}>
                     <NumberGeneratorModalButton
+                      buttonLabel={<FormattedMessage id="ui-users.numberGenerator.generateUserBarcode" />}
                       callback={(generated) => change('barcode', generated)}
+                      fullWidth
                       id="userbarcode"
+                      generateButtonLabel={<FormattedMessage id="ui-users.numberGenerator.generateUserBarcode" />}
                       generator="users_patronBarcode"
+                      modalProps={{
+                        label: <FormattedMessage id="ui-users.numberGenerator.userBarcodeGenerator" />
+                      }}
                     />
                   </Col>
                 }
diff --git a/src/settings/NumberGeneratorOptions.js b/src/settings/NumberGeneratorOptions.js
index 3af9766f4..0928dbc41 100644
--- a/src/settings/NumberGeneratorOptions.js
+++ b/src/settings/NumberGeneratorOptions.js
@@ -55,14 +55,6 @@ class NumberGeneratorOptions extends React.Component {
       >
         <Row>
           <Col xs={12}>
-            <Field
-              component={RadioButton}
-              id="useGenerator"
-              name="barcodeGeneratorSetting"
-              label={<FormattedMessage id="ui-users.settings.numberGeneratorOptions.useGeneratorForBarcode" />}
-              type="radio"
-              value="useGenerator"
-            />
             <Field
               component={RadioButton}
               id="useTextField"
@@ -79,6 +71,14 @@ class NumberGeneratorOptions extends React.Component {
               type="radio"
               value="useBoth"
             />
+            <Field
+              component={RadioButton}
+              id="useGenerator"
+              name="barcodeGeneratorSetting"
+              label={<FormattedMessage id="ui-users.settings.numberGeneratorOptions.useGeneratorForBarcode" />}
+              type="radio"
+              value="useGenerator"
+            />
           </Col>
         </Row>
       </this.connectedConfigManager>
diff --git a/translations/ui-users/en.json b/translations/ui-users/en.json
index d48f585fa..1d0b52654 100644
--- a/translations/ui-users/en.json
+++ b/translations/ui-users/en.json
@@ -169,6 +169,8 @@
   "settings.numberGeneratorOptions.useGeneratorForBarcode": "Number generator on, fixed: the barcode can be filled using the generator only.",
   "settings.numberGeneratorOptions.useTextFieldForBarcode": "Number generator off: the barcode can be filled manually only.",
   "settings.numberGeneratorOptions.useBothForBarcode": "Number generator on, editable: the barcode can be filled using the generator and be edited, or filled manually.",
+  "numberGenerator.generateUserBarcode": "Generate user barcode",
+  "numberGenerator.userBarcodeGenerator": "User barcode generator",
   "manualBlockTemplates.templateInformation": "Template information",
   "manualBlockTemplates.templateName": "Template name",
   "manualBlockTemplates.blockCode": "Block code",

From 3afb721d69bbfddc14b0369b56d1d5c5920e7179 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Fri, 8 Sep 2023 11:17:37 +0100
Subject: [PATCH 13/21] chore: Change test import

---
 src/settings/NumberGeneratorOptions.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/settings/NumberGeneratorOptions.test.js b/src/settings/NumberGeneratorOptions.test.js
index 9678b4d2e..316d4e746 100644
--- a/src/settings/NumberGeneratorOptions.test.js
+++ b/src/settings/NumberGeneratorOptions.test.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { screen } from '@testing-library/react';
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
 
 import '__mock__/stripesCore.mock';
 import '__mock__/stripesSmartComponent.mock';

From a8ab57aba5fa463409a652690564357e5e80f77d Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Fri, 8 Sep 2023 11:37:51 +0100
Subject: [PATCH 14/21] test: Fixes

Fixes to tests
---
 src/views/UserEdit/UserEdit.test.js | 74 +++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)

diff --git a/src/views/UserEdit/UserEdit.test.js b/src/views/UserEdit/UserEdit.test.js
index 2bf812f7c..870d84e20 100644
--- a/src/views/UserEdit/UserEdit.test.js
+++ b/src/views/UserEdit/UserEdit.test.js
@@ -1,5 +1,7 @@
 import userEvent from '@folio/jest-config-stripes/testing-library/user-event';
 
+import { screen } from '@folio/jest-config-stripes/testing-library/react';
+
 import renderWithRouter from 'helpers/renderWithRouter';
 
 import UserForm from './UserForm';
@@ -73,6 +75,9 @@ describe('UserEdit', () => {
       servicePoints: {
         records: [],
       },
+      settings: {
+        records: [],
+      },
       departments: {
         records: [],
       },
@@ -152,6 +157,17 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
+        settings: {
+          records: [
+            {
+              id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
+              module: 'USERS',
+              configName: 'number_generator',
+              enabled: true,
+              value: '{"barcodeGeneratorSetting":"useBoth"}',
+            }
+          ],
+        }
       },
     };
     const { container } = renderWithRouter(<UserEdit {...props} />);
@@ -184,6 +200,17 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
+        settings: {
+          records: [
+            {
+              id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
+              module: 'USERS',
+              configName: 'number_generator',
+              enabled: true,
+              value: '{"barcodeGeneratorSetting":"useBoth"}',
+            }
+          ],
+        }
       },
     };
     const { container } = renderWithRouter(<UserEdit {...props} />);
@@ -214,6 +241,17 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
+        settings: {
+          records: [
+            {
+              id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
+              module: 'USERS',
+              configName: 'number_generator',
+              enabled: true,
+              value: '{"barcodeGeneratorSetting":"useBoth"}',
+            }
+          ],
+        }
       },
     };
     const { container } = renderWithRouter(<UserEdit {...props} />);
@@ -258,6 +296,17 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
+        settings: {
+          records: [
+            {
+              id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
+              module: 'USERS',
+              configName: 'number_generator',
+              enabled: true,
+              value: '{"barcodeGeneratorSetting":"useBoth"}',
+            }
+          ],
+        }
       },
     };
     const { container } = renderWithRouter(<UserEdit {...props} />);
@@ -288,6 +337,17 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
+        settings: {
+          records: [
+            {
+              id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
+              module: 'USERS',
+              configName: 'number_generator',
+              enabled: true,
+              value: '{"barcodeGeneratorSetting":"useBoth"}',
+            }
+          ],
+        }
       },
     };
     const { container } = renderWithRouter(<UserEdit {...props} />);
@@ -318,6 +378,17 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
+        settings: {
+          records: [
+            {
+              id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
+              module: 'USERS',
+              configName: 'number_generator',
+              enabled: true,
+              value: '{"barcodeGeneratorSetting":"useBoth"}',
+            }
+          ],
+        }
       },
     };
     const { container } = renderWithRouter(<UserEdit {...props} />);
@@ -424,6 +495,9 @@ describe('UserEdit', () => {
         departments: {
           records: [],
         },
+        settings: {
+          records: [],
+        },
       },
       history: {
         push: jest.fn(),

From f5835c751c67ef7a61280f9978cee88899d36225 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Fri, 29 Sep 2023 12:43:13 +0100
Subject: [PATCH 15/21] chore: Button UX

Changed Button from fullWidth to scale with text
---
 src/components/EditSections/EditUserInfo/EditUserInfo.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/EditSections/EditUserInfo/EditUserInfo.js b/src/components/EditSections/EditUserInfo/EditUserInfo.js
index b132abc5e..81b2e10d2 100644
--- a/src/components/EditSections/EditUserInfo/EditUserInfo.js
+++ b/src/components/EditSections/EditUserInfo/EditUserInfo.js
@@ -375,7 +375,6 @@ class EditUserInfo extends React.Component {
                     <NumberGeneratorModalButton
                       buttonLabel={<FormattedMessage id="ui-users.numberGenerator.generateUserBarcode" />}
                       callback={(generated) => change('barcode', generated)}
-                      fullWidth
                       id="userbarcode"
                       generateButtonLabel={<FormattedMessage id="ui-users.numberGenerator.generateUserBarcode" />}
                       generator="users_patronBarcode"

From 611495a0337af217e88df85c274248826819e8e2 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Thu, 2 Nov 2023 16:30:16 +0000
Subject: [PATCH 16/21] chore: Perm visible

Ensure num gen perm is visible
---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 60bf9f543..22cf006a0 100644
--- a/package.json
+++ b/package.json
@@ -985,7 +985,8 @@
         "displayName": "Settings (Users): Manage number generator options",
         "subPermissions": [
           "settings.users.enabled"
-        ]
+        ],
+        "visible": true
       },
       {
         "permissionName": "ui-users.settings.general.view",

From 97a3c2ba237bc7aa55d84d9e6a288acec14a952a Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Fri, 1 Mar 2024 11:22:20 +0000
Subject: [PATCH 17/21] chore: Console logs

Accidentally left console logs in place
---
 src/components/EditSections/EditUserInfo/EditUserInfo.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/EditSections/EditUserInfo/EditUserInfo.js b/src/components/EditSections/EditUserInfo/EditUserInfo.js
index 0da593200..bef7e44bd 100644
--- a/src/components/EditSections/EditUserInfo/EditUserInfo.js
+++ b/src/components/EditSections/EditUserInfo/EditUserInfo.js
@@ -140,9 +140,7 @@ class EditUserInfo extends React.Component {
 
     let barcodeGeneratorSetting = 'useTextField';
     if (stripes.hasInterface('servint')) {
-      console.log("SETTINGS: %o", settings);
       const numberGeneratorSettings = JSON.parse((settings?.find(sett => sett.configName === 'number_generator') ?? { value: '{}' }).value);
-      console.log("NGS: %o", numberGeneratorSettings);
       barcodeGeneratorSetting = numberGeneratorSettings?.barcodeGeneratorSetting ?? 'useTextField';
     }
 

From 77142f05c34fe0ac1cb745a7d741894958b179b6 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Fri, 1 Mar 2024 11:32:15 +0000
Subject: [PATCH 18/21] fix: Whoopsie

Accidentally committed local change
---
 .../EditSections/EditExtendedInfo/EditExtendedInfo.js        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/EditSections/EditExtendedInfo/EditExtendedInfo.js b/src/components/EditSections/EditExtendedInfo/EditExtendedInfo.js
index dce9804a4..dd98c3e5a 100644
--- a/src/components/EditSections/EditExtendedInfo/EditExtendedInfo.js
+++ b/src/components/EditSections/EditExtendedInfo/EditExtendedInfo.js
@@ -171,15 +171,14 @@ class EditExtendedInfo extends Component {
             md={6}
           >
             <Row>
-              {/* FIXME this is only commented because of some stripes-connect weirdness */}
-              {/* <RequestPreferencesEdit
+              <RequestPreferencesEdit
                 addressTypes={addressTypes}
                 addresses={addresses}
                 defaultDeliveryAddressTypeId={defaultDeliveryAddressTypeId}
                 deliveryAvailable={deliveryAvailable}
                 setFieldValue={change}
                 disabled={disabled}
-              /> */}
+              />
             </Row>
           </Col>
           {departments.length

From ab6bfceb50c150d38746e48fb7374c53180a8858 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Fri, 1 Mar 2024 11:36:12 +0000
Subject: [PATCH 19/21] test: Test fix

---
 src/views/UserEdit/UserEdit.js      |  1 -
 src/views/UserEdit/UserEdit.test.js | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/UserEdit/UserEdit.js b/src/views/UserEdit/UserEdit.js
index 17bdac775..6474f7882 100644
--- a/src/views/UserEdit/UserEdit.js
+++ b/src/views/UserEdit/UserEdit.js
@@ -120,7 +120,6 @@ class UserEdit extends React.Component {
       'addressTypes',
       'servicePoints',
       'departments',
-      'settings',
       'configSettings'
     );
 
diff --git a/src/views/UserEdit/UserEdit.test.js b/src/views/UserEdit/UserEdit.test.js
index 870d84e20..5819345fc 100644
--- a/src/views/UserEdit/UserEdit.test.js
+++ b/src/views/UserEdit/UserEdit.test.js
@@ -75,7 +75,7 @@ describe('UserEdit', () => {
       servicePoints: {
         records: [],
       },
-      settings: {
+      configSettings: {
         records: [],
       },
       departments: {
@@ -157,7 +157,7 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
-        settings: {
+        configSettings: {
           records: [
             {
               id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
@@ -200,7 +200,7 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
-        settings: {
+        configSettings: {
           records: [
             {
               id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
@@ -241,7 +241,7 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
-        settings: {
+        configSettings: {
           records: [
             {
               id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
@@ -296,7 +296,7 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
-        settings: {
+        configSettings: {
           records: [
             {
               id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
@@ -337,7 +337,7 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
-        settings: {
+        configSettings: {
           records: [
             {
               id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
@@ -378,7 +378,7 @@ describe('UserEdit', () => {
         permissions: {
           records: [{ id: '4', group: 'tst', desc: 'description' }],
         },
-        settings: {
+        configSettings: {
           records: [
             {
               id: 'f2b84177-d85a-4b0c-93dd-279e8f9d1d42',
@@ -495,7 +495,7 @@ describe('UserEdit', () => {
         departments: {
           records: [],
         },
-        settings: {
+        configSettings: {
           records: [],
         },
       },

From e492651b829fe10da491aef6def2a8a92ccb7233 Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Thu, 28 Mar 2024 10:37:01 +0000
Subject: [PATCH 20/21] build: Change service interaction dependency to ^3.0.0

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 28bcb8903..a9745985d 100644
--- a/package.json
+++ b/package.json
@@ -1087,7 +1087,7 @@
     "@babel/preset-react": "^7.9.0",
     "@folio/eslint-config-stripes": "^7.0.0",
     "@folio/jest-config-stripes": "^2.0.0",
-    "@folio/service-interaction": "^2.0.0",
+    "@folio/service-interaction": "^3.0.0",
     "@folio/stripes": "^9.0.0",
     "@folio/stripes-cli": "^3.0.0",
     "@formatjs/cli": "^6.1.3",
@@ -1127,7 +1127,7 @@
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@folio/service-interaction": "^2.0.0",
+    "@folio/service-interaction": "^3.0.0",
     "@folio/stripes": "^9.0.0",
     "moment": "^2.24.0",
     "react": "^18.2.0",

From 5d46ddc3950fb9d0f2ea65d56b866ae4a2b2c46b Mon Sep 17 00:00:00 2001
From: Ethan Freestone <ethan.freestone@k-int.co.uk>
Date: Tue, 7 May 2024 13:01:26 +0100
Subject: [PATCH 21/21] chore: MessageBanner

Added messageBanner to settings page explaining the number generator options
---
 src/settings/NumberGeneratorOptions.css |  5 +++++
 src/settings/NumberGeneratorOptions.js  | 13 ++++++++++++-
 translations/ui-users/en.json           |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 src/settings/NumberGeneratorOptions.css

diff --git a/src/settings/NumberGeneratorOptions.css b/src/settings/NumberGeneratorOptions.css
new file mode 100644
index 000000000..78ddf8414
--- /dev/null
+++ b/src/settings/NumberGeneratorOptions.css
@@ -0,0 +1,5 @@
+@import '@folio/stripes-components/lib/variables';
+
+.marginBottomGutter {
+  margin-bottom: var(--gutter);
+}
diff --git a/src/settings/NumberGeneratorOptions.js b/src/settings/NumberGeneratorOptions.js
index 0928dbc41..2ecb10f0e 100644
--- a/src/settings/NumberGeneratorOptions.js
+++ b/src/settings/NumberGeneratorOptions.js
@@ -6,7 +6,9 @@ import { Field } from 'react-final-form';
 import { stripesConnect, withStripes } from '@folio/stripes/core';
 import { ConfigManager } from '@folio/stripes/smart-components';
 
-import { Col, RadioButton, Row } from '@folio/stripes/components';
+import { Col, MessageBanner, RadioButton, Row } from '@folio/stripes/components';
+
+import css from './NumberGeneratorOptions.css';
 
 class NumberGeneratorOptions extends React.Component {
   static propTypes = {
@@ -53,6 +55,15 @@ class NumberGeneratorOptions extends React.Component {
         stripes={this.props.stripes}
         formType="final-form"
       >
+        <Row>
+          <Col xs={12}>
+            <div className={css.marginBottomGutter}>
+              <MessageBanner>
+                <FormattedMessage id="ui-users.settings.numberGeneratorOptions.info" />
+              </MessageBanner>
+            </div>
+          </Col>
+        </Row>
         <Row>
           <Col xs={12}>
             <Field
diff --git a/translations/ui-users/en.json b/translations/ui-users/en.json
index 29d91b7ab..84a9f566b 100644
--- a/translations/ui-users/en.json
+++ b/translations/ui-users/en.json
@@ -168,6 +168,7 @@
   "settings.manualBlockTemplates": "Templates",
   "settings.manualBlockTemplates.paneTitle": "Patron block templates",
   "settings.numberGeneratorOptions": "Number generator options",
+  "settings.numberGeneratorOptions.info": "Fields which are usually filled using a numeric sequence can use the number generator. When the generator is switched on the field can either be fixed to prevent manual update, or made fully editable. When switched off, the field must be filled manually.",
   "settings.numberGeneratorOptions.useGeneratorForBarcode": "Number generator on, fixed: the barcode can be filled using the generator only.",
   "settings.numberGeneratorOptions.useTextFieldForBarcode": "Number generator off: the barcode can be filled manually only.",
   "settings.numberGeneratorOptions.useBothForBarcode": "Number generator on, editable: the barcode can be filled using the generator and be edited, or filled manually.",