Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,14 @@ const EventHistoryDetails = ({ event }) => {
/>
</Col>
)}
{eventData.user && (
<Col xs={2}>
<KeyValue
label={<FormattedMessage id="ui-rs.eventHistory.actor" />}
value={eventData.user}
/>
</Col>
)}
Comment thread
skomorokh marked this conversation as resolved.
</Row>

{/* 2. Problem / Error */}
Expand Down
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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) && (
<span className={css.summaryText}>
{summary}
{summary && actor && ' · '}
{actor && (
<FormattedMessage id="ui-rs.eventHistory.summary.byActor" values={{ actor }} />
)}
</span>
)}
<Layout element="span" className="padding-end-gutter">
Expand Down
2 changes: 2 additions & 0 deletions translations/ui-rs/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading