diff --git a/src/components/ViewPatronRequest/sections/EventHistory/EventHistoryDetails.js b/src/components/ViewPatronRequest/sections/EventHistory/EventHistoryDetails.js index f4570cc7..a7aa134e 100644 --- a/src/components/ViewPatronRequest/sections/EventHistory/EventHistoryDetails.js +++ b/src/components/ViewPatronRequest/sections/EventHistory/EventHistoryDetails.js @@ -114,6 +114,14 @@ const EventHistoryDetails = ({ event }) => { /> )} + {eventData.user && ( + + } + value={eventData.user} + /> + + )} {/* 2. Problem / Error */} diff --git a/src/components/ViewPatronRequest/sections/EventHistory/EventHistoryRow.js b/src/components/ViewPatronRequest/sections/EventHistory/EventHistoryRow.js index a91bd2b0..ed9ff80e 100644 --- a/src/components/ViewPatronRequest/sections/EventHistory/EventHistoryRow.js +++ b/src/components/ViewPatronRequest/sections/EventHistory/EventHistoryRow.js @@ -1,4 +1,4 @@ -import { useIntl } from 'react-intl'; +import { FormattedMessage, useIntl } from 'react-intl'; import { Accordion, Badge, Layout } from '@folio/stripes/components'; import formattedDateTime from '../../../../util/formattedDateTime'; import EventHistoryDetails from './EventHistoryDetails'; @@ -110,12 +110,17 @@ const EventHistoryRow = ({ event }) => { const statusLabel = getStatusLabel(intl, event.eventStatus); const summary = getEventSummary(intl, event); const badgeColor = STATUS_BADGE_COLOR[event.eventStatus] || 'default'; + const actor = event.eventData?.user; const summaryRow = ( <> - {summary && ( + {(summary || actor) && ( {summary} + {summary && actor && ' ยท '} + {actor && ( + + )} )} diff --git a/translations/ui-rs/en.json b/translations/ui-rs/en.json index 91bcb365..25d9d143 100644 --- a/translations/ui-rs/en.json +++ b/translations/ui-rs/en.json @@ -118,6 +118,8 @@ "eventHistory.summary.supplierMessageConfirmation": "Supplier message confirmation", "eventHistory.summary.patronRequestMessage": "Patron request message", "eventHistory.summary.eventRecorded": "Event recorded", + "eventHistory.summary.byActor": "by {actor}", + "eventHistory.actor": "Actor", "eventHistory.rawEvent": "Raw event data", "information.heading.partDetails": "Part details", "information.heading.publicationDetails": "Publication details",