diff --git a/CHANGELOG.md b/CHANGELOG.md index 1025981fc..256b7ce79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ * Refactor CSS away from `color()` function. Refs UIU-3013. * Add `reminderFee` to loan action map. Fixes UIU-3014. * Create new permission 'Users: Can view profile pictures'. Refs UIU-3018. +* Show country name in user address instead of country id. Refs UIU-2976. ## [10.0.4](https://github.com/folio-org/ui-users/tree/v10.0.4) (2023-11-10) [Full Changelog](https://github.com/folio-org/ui-users/compare/v10.0.3...v10.0.4) diff --git a/src/components/UserAddresses/UserAddresses.js b/src/components/UserAddresses/UserAddresses.js index cb93d4cc5..ece4984c3 100644 --- a/src/components/UserAddresses/UserAddresses.js +++ b/src/components/UserAddresses/UserAddresses.js @@ -80,13 +80,18 @@ class UserAddresses extends React.Component { }, }; + const updatedAddresses = addresses.map(addr => { + addr.country = intl.formatDisplayName(addr.country, { type: 'region' }); + return addr; + }); + return (} onUpdate={this.onUpdate} onCreate={this.onUpdate} onDelete={this.onDelete} fieldComponents={addressFields} - addresses={addresses} + addresses={updatedAddresses} expanded={expanded} canEdit={editable} canDelete={editable} diff --git a/src/components/UserAddresses/UserAddresses.test.js b/src/components/UserAddresses/UserAddresses.test.js index 4a4976b7a..b7e84c2ee 100644 --- a/src/components/UserAddresses/UserAddresses.test.js +++ b/src/components/UserAddresses/UserAddresses.test.js @@ -15,6 +15,7 @@ const props = { onUpdate: updateMock, intl: { formatMessage: jest.fn(), + formatDisplayName: jest.fn(), }, expanded: false, editable: true, diff --git a/test/jest/__mock__/intl.mock.js b/test/jest/__mock__/intl.mock.js index ba8fac8c8..9bd0438ad 100644 --- a/test/jest/__mock__/intl.mock.js +++ b/test/jest/__mock__/intl.mock.js @@ -3,6 +3,7 @@ import React from 'react'; jest.mock('react-intl', () => { const intl = { formatMessage: ({ id }) => id, + formatDisplayName: (value) => value, }; return {