Merge branch 'master' into UIREQMED-51

CHANGELOG.md

@@ -8,6 +8,7 @@
 * Add circulation-storage.staff-slips.collection.get for get staff-slips on Send item in transit. Refs UIREQMED-55.
 * Add Decline Action for Mediated request with status of New - Awaiting confirmation. Refs UIREQMED-42.
 * Fix DOMPurify import. Refs UIREQMED-56.
+* Hide proxy functionality. Refs UIREQMED-59.
 * Add functionality for managing missing data related to item, instance, requester. Refs UIREQMED-51.
 
 ## [1.1.0](https://github.com/folio-org/ui-requests-mediated/tree/v1.1.0) (2024-10-30)

src/components/MediatedRequestsActivities/MediatedRequestsActivities.js

@@ -51,6 +51,7 @@ import {
 import {
   getTotalCount,
   modifyRecordsToExport,
+  isProxyFunctionalityAvailable,
 } from '../../utils';
 
 export const getActionMenu = ({
@@ -146,7 +147,11 @@ export const getActionMenu = ({
     const queryString = queryParams.join(' and ');
     const records = await getRecords(queryString);
     const recordsToCSV = buildRecords(records);
-    const columns = getColumnHeaders(REPORT_HEADERS);
+    const columnHeaders = [
+      ...REPORT_HEADERS,
+      ...(isProxyFunctionalityAvailable() ? ['proxy.name', 'proxy.barcode'] : []),
+    ];
+    const columns = getColumnHeaders(columnHeaders);
 
     exportToCsv(recordsToCSV, {
       onlyFields: columns,

src/components/MediatedRequestsActivities/components/RequestForm/RequestForm.js

@@ -55,6 +55,7 @@ import {
   getDeliveryInformation,
   getResourceTypeId,
   getRequestInformation,
+  isProxyFunctionalityAvailable,
 } from '../../../../utils';
 
 import css from './RequestForm.css';
@@ -198,7 +199,7 @@ class RequestForm extends React.Component {
           });
         }
 
-        if (request.proxy) {
+        if (isProxyFunctionalityAvailable() && request.proxy) {
           form.change(MEDIATED_REQUEST_FORM_FIELD_NAMES.PROXY_USER_ID, request.proxyUserId);
           onSetSelectedProxy(request.proxy);
         }
@@ -299,20 +300,28 @@ class RequestForm extends React.Component {
       onSetSelectedUser,
       onSetSelectedProxy,
     } = this.props;
+    const isProxyAvailable = isProxyFunctionalityAvailable();
 
     this.setState({
       isUserLoading: true,
       requestTypes: {},
       isRequestTypesReceived: false,
       isUserPreselected: false,
     });
-    onSetSelectedProxy(EMPTY_RESOURCE_VALUE);
+
+    if (isProxyAvailable) {
+      onSetSelectedProxy(EMPTY_RESOURCE_VALUE);
+    }
+
     onSetSelectedUser(EMPTY_RESOURCE_VALUE);
 
     form.change(MEDIATED_REQUEST_FORM_FIELD_NAMES.REQUEST_TYPE, DEFAULT_REQUEST_TYPE_VALUE);
     form.change(MEDIATED_REQUEST_FORM_FIELD_NAMES.PICKUP_SERVICE_POINT_ID, EMPTY_MEDIATED_REQUEST_FORM_VALUE);
     form.change(MEDIATED_REQUEST_FORM_FIELD_NAMES.DELIVERY_ADDRESS_TYPE_ID, EMPTY_MEDIATED_REQUEST_FORM_VALUE);
-    form.change(MEDIATED_REQUEST_FORM_FIELD_NAMES.PROXY_USER_ID, EMPTY_MEDIATED_REQUEST_FORM_VALUE);
+
+    if (isProxyAvailable) {
+      form.change(MEDIATED_REQUEST_FORM_FIELD_NAMES.PROXY_USER_ID, EMPTY_MEDIATED_REQUEST_FORM_VALUE);
+    }
 
     return findResource(RESOURCE_TYPES.USER, value, fieldName)
       .then((result) => {

src/components/MediatedRequestsActivities/components/RequestForm/RequestForm.test.js

@@ -23,6 +23,7 @@ import {
   getRequestInformation,
   getFulfillmentPreference,
   getDefaultRequestPreferences,
+  isProxyFunctionalityAvailable,
 } from '../../../../utils';
 
 const basicProps = {
@@ -169,6 +170,7 @@ jest.mock('../../../../utils', () => ({
   getRequestInformation: jest.fn((isTlr, instance, item) => {
     return isTlr ? instance : item;
   }),
+  isProxyFunctionalityAvailable: jest.fn(),
 }));
 
 describe('RequestForm', () => {
@@ -253,6 +255,7 @@ describe('RequestForm', () => {
         };
 
         beforeEach(() => {
+          isProxyFunctionalityAvailable.mockReturnValue(true);
           props.findResource
             .mockResolvedValueOnce(foundInstance)
             .mockResolvedValueOnce(user);

src/components/MediatedRequestsActivities/components/RequesterInformation/RequesterInformation.js

@@ -17,7 +17,10 @@ import {
 } from '@folio/stripes/core';
 
 import UserForm from '../UserForm';
-import { memoizeValidation } from '../../../../utils';
+import {
+  memoizeValidation,
+  isProxyFunctionalityAvailable,
+} from '../../../../utils';
 import {
   MEDIATED_REQUEST_FORM_FIELD_NAMES,
   RESOURCE_KEYS,
@@ -170,7 +173,10 @@ class RequesterInformation extends Component {
       form,
     } = this.props;
 
-    onSetSelectedProxy(null);
+    if (isProxyFunctionalityAvailable()) {
+      onSetSelectedProxy(null);
+    }
+
     onSetSelectedUser(null);
     form.change(MEDIATED_REQUEST_FORM_FIELD_NAMES.REQUEST_TYPE, DEFAULT_REQUEST_TYPE_VALUE);
   };

src/components/MediatedRequestsActivities/components/RequesterInformation/RequesterInformation.test.js

@@ -25,10 +25,12 @@ import {
   ENTER_EVENT_KEY,
   BASE_SPINNER_PROPS,
 } from '../../../../constants';
+import { isProxyFunctionalityAvailable } from '../../../../utils';
 
 jest.mock('../../../../utils', () => ({
   ...jest.requireActual('../../../../utils'),
   memoizeValidation: (fn) => () => fn,
+  isProxyFunctionalityAvailable: jest.fn(),
 }));
 jest.mock('../UserForm', () => jest.fn(() => <div />));
 
@@ -391,6 +393,18 @@ describe('RequesterInformation', () => {
   describe('handleBlur', () => {
     const onBlur = jest.fn();
 
+    it('should reset proxy if proxy functionality is available', () => {
+      isProxyFunctionalityAvailable.mockReturnValueOnce(true);
+      renderRequesterInfoWithBarcode(onBlur);
+
+      const requesterBarcodeField = screen.getByTestId(testIds.requesterBarcodeField);
+
+      fireEvent.click(requesterBarcodeField);
+      fireEvent.blur(requesterBarcodeField);
+
+      expect(basicProps.onSetSelectedProxy).toHaveBeenCalledWith(null);
+    });
+
     it('should trigger "input.onBlur" if requester barcode is presented', () => {
       renderRequesterInfoWithBarcode(onBlur);
 

src/components/MediatedRequestsActivities/components/UserDetail/UserDetail.js

@@ -10,6 +10,7 @@ import {
 import {
   getRequesterName,
   getProxyInformation,
+  isProxyFunctionalityAvailable,
 } from '../../../../utils';
 import UserHighlightBox from '../UserHighlightBox';
 
@@ -23,7 +24,7 @@ const UserDetail = ({
   const id = user?.id ?? request.requesterId;
   const name = getRequesterName(user);
   const proxyInformation = getProxyInformation(proxy, request.proxyUserId);
-  const proxySection = proxyInformation.id ?
+  const proxySection = (isProxyFunctionalityAvailable() && proxyInformation.id) ?
     <UserHighlightBox
       title={<FormattedMessage id="ui-requests-mediated.requesterDetails.proxy" />}
       name={proxyInformation.name}

src/components/MediatedRequestsActivities/components/UserDetail/UserDetail.test.js

@@ -35,6 +35,7 @@ const proxy = {
 jest.mock('../../../../utils', () => ({
   getRequesterName: jest.fn((user) => user.lastName),
   getProxyInformation: jest.fn(() => proxy),
+  isProxyFunctionalityAvailable: jest.fn(() => true),
 }));
 jest.mock('../UserHighlightBox', () => jest.fn(({
   title,

src/components/MediatedRequestsActivities/components/UserForm/UserForm.js

@@ -14,6 +14,7 @@ import UserHighlightBox from '../UserHighlightBox';
 import {
   getProxyInformation,
   getRequesterName,
+  isProxyFunctionalityAvailable,
 } from '../../../../utils';
 
 const UserForm = ({
@@ -31,15 +32,16 @@ const UserForm = ({
   const name = getRequesterName(user);
   const ConnectedProxyManager = useMemo(() => stripes.connect(ProxyManager), [stripes]);
   const proxyInformation = getProxyInformation(proxy, request?.proxyUserId);
-  const isProxyManagerAvailable = !isEditMode || (!isUserPreselected && isEditPermission);
+  const isProxyAvailable = isProxyFunctionalityAvailable();
+  const isProxyManagerAvailable = (!isEditMode || (!isUserPreselected && isEditPermission)) && isProxyAvailable;
   const userSection =
     <UserHighlightBox
       title={<FormattedMessage id="ui-requests-mediated.requesterDetails.requester" />}
       name={name}
       id={user.id}
       barcode={user.barcode}
     />;
-  const proxySection = proxyInformation.id ?
+  const proxySection = (isProxyAvailable && proxyInformation.id) ?
     <UserHighlightBox
       title={<FormattedMessage id="ui-requests-mediated.requesterDetails.proxy" />}
       name={proxyInformation.name}

src/components/MediatedRequestsActivities/components/UserForm/UserForm.test.js

@@ -37,6 +37,7 @@ const labelIds = {
 jest.mock('../../../../utils', () => ({
   getProxyInformation: jest.fn(() => proxy),
   getRequesterName: jest.fn((user) => user.lastName),
+  isProxyFunctionalityAvailable: jest.fn(() => true),
 }));
 jest.mock('../UserHighlightBox', () => jest.fn(({
   title,

src/constants/mediatedRequestsActivities.js

@@ -344,7 +344,7 @@ export const REPORT_HEADERS = [
   'fulfillmentPreference',
   'pickupServicePoint.name',
   'deliveryAddress',
-  'proxy.name',
-  'proxy.barcode',
   'patronComments',
 ];
+
+export const IS_PROXY_AVAILABLE = false;

src/utils.js

@@ -26,6 +26,7 @@ import {
   REQUEST_PARAMS,
   USER_NAMES,
   STAFF_SLIPS_TYPE,
+  IS_PROXY_AVAILABLE,
 } from './constants';
 
 export const transformRequestFilterOptions = (formatMessage, source = []) => (
@@ -337,7 +338,7 @@ export const modifyRecordsToExport = (records) => {
       instance.contributorNames = '';
     }
 
-    if (proxy) {
+    if (isProxyFunctionalityAvailable() && proxy) {
       proxy.name = getFullNameForCsvRecords(proxy);
     }
 
@@ -517,3 +518,5 @@ export const convertToSlipData = (source, intl, timeZone, locale) => {
 
   return slipData;
 };
+
+export const isProxyFunctionalityAvailable = () => IS_PROXY_AVAILABLE;

src/utils.test.js

@@ -54,7 +54,8 @@ import {
   buildTemplate,
   shouldProcessNode,
   buildLocaleDateAndTime,
-  convertToSlipData, processNode,
+  convertToSlipData,
+  processNode,
 } from './utils';
 import {
   FULFILMENT_TYPES,
@@ -931,10 +932,6 @@ describe('utils', () => {
             ...records[0].instance,
             contributorNames: records[0].instance.contributorNames[0].name,
           },
-          proxy: {
-            ...records[0].proxy,
-            name: records[0].proxy.lastName,
-          },
           requester: {
             ...records[0].requester,
             name: records[0].requester.lastName,

translations/ui-requests-mediated/pl.json

@@ -9,7 +9,7 @@
     "filters.mediatedRequestStatus.accordionTitle": "Mediated request status",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title",
+    "filters.mediatedRequestLevel.title": "Tytuł",
     "form.tlrCheckboxLabel": "Create title level request",
     "form.enterButton": "Enter",
     "form.cancelButton": "Anuluj",
@@ -37,7 +37,7 @@
     "form.errors.userDoesNotExist": "User with this barcode does not exist",
     "itemDetails.barcode": "Item barcode",
     "itemDetails.id": "Item id",
-    "itemDetails.title": "Title",
+    "itemDetails.title": "Tytuł",
     "itemDetails.contributor": "Contributor",
     "itemDetails.effectiveLocation": "Effective location",
     "itemDetails.callNumber": "Aktualna sygnatura całkowita",
@@ -52,7 +52,7 @@
     "itemsDialog.instanceItems": "Other items in {title}",
     "itemsDialog.noItems": "No items found",
     "itemsDialog.resultCount": "{count, number} {count, plural, one {Record found} other {Records found}}",
-    "instanceDetails.title": "Title",
+    "instanceDetails.title": "Tytuł",
     "instanceDetails.contributor": "Contributor",
     "instanceDetails.publicationDate": "Publication date",
     "instanceDetails.edition": "Edition",
@@ -64,7 +64,7 @@
     "item.status.awaitingDelivery": "Awaiting delivery",
     "item.status.awaitingPickup": "Awaiting pickup",
     "item.status.checkedOut": "Checked out",
-    "item.status.claimedReturned": "Claimed returned",
+    "item.status.claimedReturned": "Zapewniony że zwrócony",
     "item.status.declaredLost": "Declared lost",
     "item.status.inProcess": "In process",
     "item.status.inProcessNonRequestable": "In process (non-requestable)",
@@ -85,7 +85,7 @@
     "item.status.orderClosed": "Order closed",
     "item.status.restricted": "Restricted",
     "mediatedRequestList.columnName.mediatedRequestDate": "Mediated request date",
-    "mediatedRequestList.columnName.title": "Title",
+    "mediatedRequestList.columnName.title": "Tytuł",
     "mediatedRequestList.columnName.itemBarcode": "Item barcode",
     "mediatedRequestList.columnName.effectiveCallNumber": "Aktualna sygnatura całkowita",
     "mediatedRequestList.columnName.mediatedRequestStatus": "Mediated request status",
@@ -124,7 +124,7 @@
     "requesterDetails.pickupServicePoint": "Pickup service point",
     "requesterDetails.fulfillmentPreference": "Fulfillment preference",
     "mediatedRequestInformation.level.item": "Item",
-    "mediatedRequestInformation.level.title": "Title",
+    "mediatedRequestInformation.level.title": "Tytuł",
     "mediatedRequestInformation.requestType": "Mediated request type",
     "mediatedRequestInformation.status": "Mediated request status",
     "mediatedRequestInformation.level": "Mediated request level",
@@ -156,7 +156,7 @@
     "report.status": "Mediated request status",
     "report.requestDate": "Mediated request date",
     "report.item.barcode": "Item barcode",
-    "report.instance.title": "Title",
+    "report.instance.title": "Tytuł",
     "report.instance.contributorNames": "Contributor",
     "report.item.location.libraryName": "Library",
     "report.item.callNumberComponents.prefix": "Effective call number prefix",
@@ -191,7 +191,7 @@
     "confirmItem.errorModal.close": "Close",
     "confirmItemList.columnName.arrivalDate": "Arrival date",
     "confirmItemList.columnName.inTransitDate": "In transit date",
-    "confirmItemList.columnName.title": "Title",
+    "confirmItemList.columnName.title": "Tytuł",
     "confirmItemList.columnName.itemBarcode": "Item barcode",
     "confirmItemList.columnName.effectiveCallNumber": "Aktualna sygnatura całkowita",
     "confirmItemList.columnName.mediatedRequestStatus": "Mediated request status",

translations/ui-requests-mediated/pt_BR.json

@@ -206,7 +206,7 @@
     "form.create.title": "Nova requisição mediada",
     "form.edit.title": "Editar requisição mediada",
     "form.createRequest.error": "A requisição não foi criada com sucesso",
-    "declineModal.title": "Confirmar recusa de solicitação mediada",
+    "declineModal.title": "Confirmar recusa de requisição mediada",
     "declineModal.message": "<b>{title}</b> será <b>recusado</b>",
     "declineModal.confirm": "Confirmar",
     "declineModal.back": "Voltar"