From ba704bbef3b2161637712a2eef51994c42765d44 Mon Sep 17 00:00:00 2001
From: Artem Blazhko <artem_blazhko@epam.com>
Date: Tue, 21 Jan 2025 14:24:12 +0200
Subject: [PATCH] Update UserForm.js

---
 .../components/ItemDetail/ItemDetail.js                    | 2 +-
 .../components/UserDetail/UserDetail.js                    | 7 ++++++-
 .../components/UserForm/UserForm.js                        | 2 +-
 src/utils.js                                               | 2 +-
 translations/ui-requests-mediated/en.json                  | 4 ++--
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/MediatedRequestsActivities/components/ItemDetail/ItemDetail.js b/src/components/MediatedRequestsActivities/components/ItemDetail/ItemDetail.js
index cb170f3..8cbaf29 100644
--- a/src/components/MediatedRequestsActivities/components/ItemDetail/ItemDetail.js
+++ b/src/components/MediatedRequestsActivities/components/ItemDetail/ItemDetail.js
@@ -43,7 +43,7 @@ const ItemDetail = ({
   const itemLabel = item.barcode ? 'ui-requests-mediated.itemDetails.barcode' : 'ui-requests-mediated.itemDetails.id';
   const recordLink = itemId ?
     <Link
-      aria-label={formatMessage({ id: 'ui-requests-mediated.form.item.ariaLabel' })}
+      aria-label={formatMessage({ id: 'ui-requests-mediated.itemDetails.barcode.ariaLabel' })}
       to={`/inventory/view/${instanceId}/${holdingsRecordId}/${itemId}`}
       className={css.itemLink}
     >
diff --git a/src/components/MediatedRequestsActivities/components/UserDetail/UserDetail.js b/src/components/MediatedRequestsActivities/components/UserDetail/UserDetail.js
index f4366bb..d45631b 100644
--- a/src/components/MediatedRequestsActivities/components/UserDetail/UserDetail.js
+++ b/src/components/MediatedRequestsActivities/components/UserDetail/UserDetail.js
@@ -1,5 +1,8 @@
 import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
+import {
+  FormattedMessage,
+  useIntl,
+} from 'react-intl';
 
 import {
   Col,
@@ -21,6 +24,7 @@ const UserDetail = ({
   proxy,
   patronGroup = '',
 }) => {
+  const { formatMessage } = useIntl();
   const id = user?.id ?? request.requesterId;
   const name = getRequesterName(user);
   const proxyInformation = getProxyInformation(proxy, request.proxyUserId);
@@ -40,6 +44,7 @@ const UserDetail = ({
         name={name}
         id={id}
         barcode={user.barcode}
+        ariaLabel={formatMessage({ id: 'ui-requests-mediated.requesterDetails.barcode.ariaLabel' })}
       />
       <Row>
         <Col xs={4}>
diff --git a/src/components/MediatedRequestsActivities/components/UserForm/UserForm.js b/src/components/MediatedRequestsActivities/components/UserForm/UserForm.js
index a9910e4..b721dd3 100644
--- a/src/components/MediatedRequestsActivities/components/UserForm/UserForm.js
+++ b/src/components/MediatedRequestsActivities/components/UserForm/UserForm.js
@@ -44,7 +44,7 @@ const UserForm = ({
       name={name}
       id={user.id}
       barcode={user.barcode}
-      ariaLabel={formatMessage({ id: 'ui-requests-mediated.form.requester.ariaLabel' }) }
+      ariaLabel={formatMessage({ id: 'ui-requests-mediated.requesterDetails.barcode.ariaLabel' })}
     />;
   const proxySection = (isProxyAvailable && proxyInformation.id) ?
     <UserHighlightBox
diff --git a/src/utils.js b/src/utils.js
index 826ae43..a97b294 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -285,7 +285,7 @@ export const formatNoteReferrerEntityData = (entityData) => {
 
 export const getUserHighlightBoxLink = (linkText, id, ariaLabel) => {
   const additionalProps = {
-    ...(ariaLabel ? { ariaLabel } : {}),
+    ...(ariaLabel ? { 'aria-label': ariaLabel } : {}),
   };
 
   return linkText ?
diff --git a/translations/ui-requests-mediated/en.json b/translations/ui-requests-mediated/en.json
index d21428b..138bfef 100644
--- a/translations/ui-requests-mediated/en.json
+++ b/translations/ui-requests-mediated/en.json
@@ -97,13 +97,11 @@
   "form.item.accordionLabel": "Item information",
   "form.item.inputPlaceholder": "Scan or enter item barcode",
   "form.item.inputLabel": "Item barcode",
-  "form.item.ariaLabel": "View item record",
 
   "form.requester.accordionLabel": "Requester information",
   "form.requester.inputPlaceholder": "Scan or enter requester barcode",
   "form.requester.inputLabel": "Requester barcode",
   "form.requester.lookupLabel": "Requester look-up",
-  "form.requester.ariaLabel": "View requester record",
 
   "form.request.accordionLabel": "Request information",
   "form.request.requestType": "Request type",
@@ -147,6 +145,7 @@
   "itemDetails.callNumber": "Effective call number string",
   "itemDetails.status": "Item status",
   "itemDetails.dueDate": "Current due date",
+  "itemDetails.barcode.ariaLabel": "View item record",
 
   "itemsDialog.barcode": "Barcode",
   "itemsDialog.status": "Item status",
@@ -171,6 +170,7 @@
   "requesterDetails.deliveryAddress": "Delivery address",
   "requesterDetails.pickupServicePoint": "Pickup service point",
   "requesterDetails.fulfillmentPreference": "Fulfillment preference",
+  "requesterDetails.barcode.ariaLabel": "View requester record",
 
   "item.status.agedToLost": "Aged to lost",
   "item.status.available": "Available",