Skip to content

Commit

Permalink
Update UserForm.js
Browse files Browse the repository at this point in the history
  • Loading branch information
artem-blazhko committed Jan 21, 2025
1 parent 881671c commit ba704bb
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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}
>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import {
FormattedMessage,
useIntl,
} from 'react-intl';

import {
Col,
Expand All @@ -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);
Expand All @@ -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}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ export const formatNoteReferrerEntityData = (entityData) => {

export const getUserHighlightBoxLink = (linkText, id, ariaLabel) => {
const additionalProps = {
...(ariaLabel ? { ariaLabel } : {}),
...(ariaLabel ? { 'aria-label': ariaLabel } : {}),
};

return linkText ?
Expand Down
4 changes: 2 additions & 2 deletions translations/ui-requests-mediated/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down

0 comments on commit ba704bb

Please sign in to comment.