Skip to content

Commit

Permalink
Merge branch 'RRA-Settings' into UITEN-278
Browse files Browse the repository at this point in the history
  • Loading branch information
Terala-Priyanka committed Apr 23, 2024
2 parents 4a8c63f + 6617a1d commit 232c3b4
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Change history for ui-tenant-settings

## 8.2.0 (IN PROGRESS)
* [UITEN-277](https://issues.folio.org/browse/UITEN-277) Ensure Reading Room Access settings page is wrapped by `Title Manager`.
* [UITEN-276](https://issues.folio.org/browse/UITEN-276) Reading Room Access (settings): Basic Layout.

* [UITEN-274](https://folio-org.atlassian.net/browse/UITEN-274) Use Save & close button label stripes-component translation key.
* [UITEN-280](https://folio-org.atlassian.net/browse/UITEN-280) Conditionally include SSO Settings based on login-saml interface.
Expand Down
1 change: 1 addition & 0 deletions src/settings/ReadingRoomAccess/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { default } from './ReadingRoomAccess';
7 changes: 7 additions & 0 deletions src/settings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import PropTypes from 'prop-types';
import Addresses from './Addresses';
import Locale from './Locale';
import Plugins from './Plugins';
import ReadingRoomAccess from './ReadingRoomAccess';
import SSOSettings from './SSOSettings';
import LocationCampuses from './LocationCampuses';
import LocationInstitutions from './LocationInstitutions';
Expand Down Expand Up @@ -57,6 +58,12 @@ class Organization extends React.Component {
perm: 'ui-tenant-settings.settings.sso.view',
iface: 'login-saml'
},
{
route: 'reading-room',
label: <FormattedMessage id="ui-tenant-settings.settings.reading-room-access.label" />,
component: ReadingRoomAccess,
// perm: 'ui-tenant-settings.settings.sso.view', # TO BE UPDATED
},
{
route: 'servicePoints',
label: <FormattedMessage id="ui-tenant-settings.settings.servicePoints.label" />,
Expand Down
11 changes: 11 additions & 0 deletions translations/ui-tenant-settings/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"settings.address.title": "Tenant settings - Addresses",
"settings.locale.title": "Tenant settings - Language and localization",
"settings.plugins.title": "Tenant settings - Preferred plugins",
"settings.reading-room.title": "Tenant settings - Reading room access",
"settings.sso.title": "Tenant settings - SSO settings",
"settings.service.title": "Tenant settings - Service points",
"settings.location.institutions.title": "Tenant settings - Institutions",
Expand Down Expand Up @@ -199,6 +200,16 @@
"settings.addresses.termWillBeDeleted": "The address <b>{term}</b> will be <b>deleted.</b>",
"settings.save.error.network": "Record not saved",

"settings.reading-room-access.label": "Reading room access",
"settings.reading-room-access.name": "Room name",
"settings.reading-room-access.public": "Public",
"settings.reading-room-access.asp": "Associated service points",
"settings.reading-room-access.cannotDeleteTermHeader": "Cannot delete reading room access",
"settings.reading-room-access.cannotDeleteTermMessage": "This reading room access cannot be deleted, as it is in use by one or more records.",
"settings.reading-room-access.deleteEntry": "Delete reading room access",
"settings.reading-room-access.termDeleted": "The reading room access <b>{term}</b> was successfully <b>deleted</b>",
"settings.reading-room-access.termWillBeDeleted": "The reading room <b>{term}</b> will be <b>deleted</b>",

"permission.module.enabled": "UI: Tenant-settings module is enabled",
"permission.settings.tenant-settings.view": "Settings (tenant): View",
"permission.settings.addresses": "Settings (tenant): Can manage tenant addresses",
Expand Down

0 comments on commit 232c3b4

Please sign in to comment.