UIREQ-960: TLRs check circulation rules before request is placed.

CHANGELOG.md

@@ -38,6 +38,7 @@
 * Cover InstanceInformation by jest/RTL tests. Refs UIREQ-950.
 * Fix inconsistency in RTL/Jest tests. Refs UIREQ-979.
 * Remove redundant ariaLabel prop. Refs UIREQ-972.
+* TLRs check circulation rules before request is placed. Refs UIREQ-960.
 
 ## [8.0.2](https://github.com/folio-org/ui-requests/tree/v8.0.2) (2023-03-29)
 [Full Changelog](https://github.com/folio-org/ui-requests/compare/v8.0.1...v8.0.2)

src/routes/RequestsRoute.js

@@ -159,6 +159,25 @@ export const buildHoldRecords = (records) => {
  });
 };
 
+export const REQUEST_ERROR_MESSAGE_CODE = {
+ REQUEST_NOT_ALLOWED_FOR_PATRON_TITLE_COMBINATION: 'REQUEST_NOT_ALLOWED_FOR_PATRON_TITLE_COMBINATION',
+};
+
+export const REQUEST_ERROR_MESSAGE_TRANSLATION_KEYS = {
+ [REQUEST_ERROR_MESSAGE_CODE.REQUEST_NOT_ALLOWED_FOR_PATRON_TITLE_COMBINATION]: 'ui-requests.errors.requestNotAllowedForPatronTitleCombination',
+};
+
+export const getRequestErrorMessage = (error, intl) => {
+ const {
+ code = '',
+ message = '',
+ } = error;
+
+ return code && REQUEST_ERROR_MESSAGE_TRANSLATION_KEYS[code]
+ ? intl.formatMessage({ id: REQUEST_ERROR_MESSAGE_TRANSLATION_KEYS[code] })
+ : message;
+};
+
 class RequestsRoute extends React.Component {
  static contextType = CalloutContext;
 
@@ -813,8 +832,15 @@ class RequestsRoute extends React.Component {
  }
 
  handleJsonError({ errors }) {
+ const {
+ intl,
+ } = this.props;
  const errorMessages = [];
- errors.forEach(({ message }) => errorMessages.push(message));
+
+ errors.forEach((error) => (
+ errorMessages.push(getRequestErrorMessage(error, intl))
+ ));
+
  this.setState({ errorMessage: errorMessages.join(';') });
  }
 

src/routes/RequestsRoute.test.js

@@ -16,6 +16,9 @@ import { CommandList, defaultKeyboardShortcuts } from '@folio/stripes/components
 
 import RequestsRoute, {
  buildHoldRecords,
+ REQUEST_ERROR_MESSAGE_CODE,
+ REQUEST_ERROR_MESSAGE_TRANSLATION_KEYS,
+ getRequestErrorMessage,
 } from './RequestsRoute';
 
 import {
@@ -300,4 +303,50 @@ describe('RequestsRoute', () => {
  expect(buildHoldRecords(records)).toEqual(expectedResult);
  });
  });
+
+ describe('getRequestErrorMessage', () => {
+ const formatMessage = jest.fn(({ id }) => id);
+ const intl = {
+ formatMessage,
+ };
+ const message = 'test message';
+
+ it('should have same count of code and translation keys', () => {
+ expect(Object.keys(REQUEST_ERROR_MESSAGE_CODE).length).toEqual(Object.keys(REQUEST_ERROR_MESSAGE_TRANSLATION_KEYS).length);
+ });
+
+ describe('should have translation key for each code', () => {
+ Object.keys(REQUEST_ERROR_MESSAGE_CODE).forEach((key) => {
+ it(`should have translation key for code: ${key}`, () => {
+ expect(!!REQUEST_ERROR_MESSAGE_TRANSLATION_KEYS[key]).toBeTruthy();
+ });
+ });
+ });
+
+ it('should return translation key for code', () => {
+ expect(getRequestErrorMessage({
+ code: REQUEST_ERROR_MESSAGE_CODE.REQUEST_NOT_ALLOWED_FOR_PATRON_TITLE_COMBINATION,
+ }, intl)).toEqual(REQUEST_ERROR_MESSAGE_TRANSLATION_KEYS.REQUEST_NOT_ALLOWED_FOR_PATRON_TITLE_COMBINATION);
+ });
+
+ it('should trigger formatMessage with correct props', () => {
+ getRequestErrorMessage({
+ code: REQUEST_ERROR_MESSAGE_CODE.REQUEST_NOT_ALLOWED_FOR_PATRON_TITLE_COMBINATION,
+ }, intl);
+
+ expect(formatMessage).toHaveBeenCalledWith({
+ id: REQUEST_ERROR_MESSAGE_TRANSLATION_KEYS.REQUEST_NOT_ALLOWED_FOR_PATRON_TITLE_COMBINATION,
+ });
+ });
+
+ it('should return message when code empty', () => {
+ expect(getRequestErrorMessage({
+ message,
+ }, intl)).toEqual(message);
+ });
+
+ it('should return default message when code and message empty', () => {
+ expect(getRequestErrorMessage({}, intl)).toEqual('');
+ });
+ });
 });

translations/ui-requests/en.json

@@ -83,6 +83,7 @@
  "errors.unknown.requestQueueLabel": "Request queue error",
  "errors.unknown.requestQueueBody": "Request queue reorder failed",
  "errors.closingAlreadyClosedRequest": "Error: The Request has already been closed.",
+ "errors.requestNotAllowedForPatronTitleCombination": "Hold requests are not allowed for this patron and title combination",
 
  "actions.label": "Actions",
  "actions.edit": "Edit",