diff --git a/src/Item/ViewItem/components/ItemVersionHistory/ItemVersionHistory.js b/src/Item/ViewItem/components/ItemVersionHistory/ItemVersionHistory.js index f77209f80..40a100d66 100644 --- a/src/Item/ViewItem/components/ItemVersionHistory/ItemVersionHistory.js +++ b/src/Item/ViewItem/components/ItemVersionHistory/ItemVersionHistory.js @@ -137,9 +137,45 @@ const ItemVersionHistory = ({ typeId: formatMessage({ id: 'ui-inventory.callNumberType' }), volume: formatMessage({ id: 'ui-inventory.volume' }), yearCaption: formatMessage({ id: 'ui-inventory.yearCaption' }), + additionalCallNumbers: formatMessage({ id: 'ui-inventory.additionalCallNumbers' }), + 'additionalCallNumbers.prefix': formatMessage({ id: 'ui-inventory.additionalCallNumberPrefix' }), + 'additionalCallNumbers.suffix': formatMessage({ id: 'ui-inventory.additionalCallNumberSuffix' }), + 'additionalCallNumbers.typeId': formatMessage({ id: 'ui-inventory.additionalCallNumberType' }), + 'additionalCallNumbers.callNumber': formatMessage({ id: 'ui-inventory.additionalCallNumber' }), + 'circulationNotes.noteType': formatMessage({ id: 'ui-inventory.noteType' }), + 'circulationNotes.note': formatMessage({ id: 'ui-inventory.note' }), + 'circulationNotes.id': formatMessage({ id: 'ui-inventory.identifier' }), + 'circulationNotes.date': formatMessage({ id: 'ui-inventory.date' }), + 'circulationNotes.staffOnly': formatMessage({ id: 'ui-inventory.staffOnly' }), + 'circulationNotes.source': formatMessage({ id: 'ui-inventory.source' }), }; const fieldFormatter = createFieldFormatter(referenceData, circulationHistory); + + const itemFormatter = (item, i) => { + if (!item) return null; + + const { name: fieldName, value, collectionName } = item; + const compositeKey = collectionName && fieldName + ? `${collectionName}.${fieldName}` + : null; + + const label = (compositeKey && fieldLabelsMap?.[compositeKey]) + || fieldLabelsMap?.[fieldName] + || fieldLabelsMap?.[collectionName]; + + const formattedValue = (compositeKey && fieldFormatter?.[compositeKey]?.(value)) + || fieldFormatter?.[fieldName]?.(value) + || fieldFormatter?.[collectionName]?.(value) + || value; + + return ( +
  • + {fieldName && {label}: } + {formattedValue} +
  • + ); + }; return ( diff --git a/src/edit/items/ItemForm.test.js b/src/edit/items/ItemForm.test.js index f821c680e..5967a0716 100644 --- a/src/edit/items/ItemForm.test.js +++ b/src/edit/items/ItemForm.test.js @@ -291,9 +291,9 @@ describe('ItemForm', () => { 'itemLevelCallNumberTypeId': { value: '2' }, 'additionalCallNumbers': { value: [{ - callNumber: 'cn1', - prefix: 'prefix1', - suffix: 'suffix1', + additionalCallNumber: 'cn1', + additionalCallNumberPrefix: 'prefix1', + additionalCallNumberSuffix: 'suffix1', typeId: '1' }] } diff --git a/translations/ui-inventory/en.json b/translations/ui-inventory/en.json index 535167122..374287ba0 100644 --- a/translations/ui-inventory/en.json +++ b/translations/ui-inventory/en.json @@ -213,7 +213,11 @@ "callNumberPrefix": "Call number prefix", "callNumberSuffix": "Call number suffix", "primaryItemCallNumber": "Primary item call number", - "additionalItemCallNumbers": "Additional item call numbers", + "additionalCallNumbers": "Additional call numbers", + "additionalCallNumber": "Additional call number", + "additionalCallNumberPrefix": "Additional call number prefix", + "additionalCallNumberSuffix": "Additional call number suffix", + "additionalCallNumberType": "Additional call number type", "primaryHoldingsCallNumber": "Primary holdings call number", "additionalHoldingsCallNumbers": "Additional holdings call numbers", "addAdditionalCallNumber": "Add additional call number",