Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UIORGS-382 Add a message indicating future functionality for EDI naming convention #569

Merged
merged 1 commit into from
Sep 20, 2023
Merged

UIORGS-382 Add a message indicating future functionality for EDI naming convention #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* *BREAKING* Upgrade React to v18. Refs UIORGS-377.
* Upgrade `Node.js` to `18` version in GitHub Actions. Refs UIORGS-378.
* *BREAKING* bump `react-intl` to `v6.4.4`. Refs UIORGS-386.
* Add a message indicating future functionality for EDI naming convention. Refs UIORGS-382.

## [4.0.0](https://github.com/folio-org/ui-organizations/tree/v4.0.0) (2023-02-22)
[Full Changelog](https://github.com/folio-org/ui-organizations/compare/v3.3.1...v4.0.0)
Expand Down
13 changes: 9 additions & 4 deletions src/OrganizationIntegration/OrganizationIntegrationForm/EdiForm/EdiForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,15 @@ export const EdiForm = ({
<>
<FormattedMessage id="ui-organizations.integration.edi.ediNamingConvention" />
<InfoPopover content={(
<FormattedMessage
id="ui-organizations.integration.edi.ediNamingConvention.info"
values={{ tokens: Object.values(EDI_NAMING_TOKENS).join(', ') }}
/>)}
<>
<FormattedMessage id="ui-organizations.comingSoon" />
<FormattedMessage
id="ui-organizations.integration.edi.ediNamingConvention.info"
values={{ tokens: <p>{Object.values(EDI_NAMING_TOKENS).join(', ')}</p> }}
tagName="p"
/>
</>
)}
/>
</>
)}
Expand Down
2 changes: 2 additions & 0 deletions translations/ui-organizations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"notes.entity": "Organization",
"notes.entityPlural": "Organizations",

"comingSoon": "Coming in a future release.",

"data.contactTypes.address": "Address",
"data.contactTypes.addressLine1": "Address 1",
"data.contactTypes.addressLine2": "Address 2",
Expand Down
Loading