merge master branch into RRA-Settings

CHANGELOG.md

@@ -1,11 +1,12 @@
 # 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.
+## 9.0.0 (IN PROGRESS)
 
 * [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.
+* [UITEN-286](https://folio-org.atlassian.net/browse/UITEN-286) *BREAKING* Add new interface. Add new permission to view reading room access in tenant settings.
+* [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.
 
 ## [8.1.0](https://github.com/folio-org/ui-tenant-settings/tree/v8.1.0)(2024-03-19)
 [Full Changelog](https://github.com/folio-org/ui-tenant-settings/compare/v8.0.0...v8.1.0)

jest.config.js

@@ -19,6 +19,7 @@ module.exports = {
   moduleNameMapper: {
     '^.+\\.(css)$': 'identity-obj-proxy',
     '^.+\\.(svg)$': 'identity-obj-proxy',
+    '^.+\\.(png)$': 'identity-obj-proxy',
     'ky': 'ky/umd',
   },
   testMatch: ['**/(lib|src)/**/?(*.)test.{js,jsx}'],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@folio/tenant-settings",
-  "version": "8.1.0",
+  "version": "9.0.0",
   "description": "Tenant settings",
   "main": "src/index.js",
   "repository": "folio-org/ui-tenant-settings",
@@ -17,7 +17,8 @@
     "route": "/tenant-settings",
     "okapiInterfaces": {
       "configuration": "2.0",
-      "users": "15.0 16.0"
+      "users": "15.0 16.0",
+      "reading-room": "1.0"
     },
     "optionalOkapiInterfaces": {
       "location-units": "2.0",
@@ -207,6 +208,15 @@
           "inventory-storage.service-points.item.delete"
         ],
         "visible": true
+      },
+      {
+        "permissionName": "ui-tenant-settings.settings.reading-room-access.view",
+        "displayName": "Settings (tenant): Can view reading room access",
+        "subPermissions": [
+          "reading-room.collection.get",
+          "settings.tenant-settings.enabled"
+        ],
+        "visible": true
       }
     ]
   },

translations/ui-tenant-settings/en.json

@@ -226,6 +226,7 @@
   "permission.settings.servicepoints": "Settings (tenant):  Can create, edit and remove service points",
   "permission.settings.servicepoints.view": "Settings (tenant): Can view service points",
   "permission.settings.bursar-exports": "Settings (tenant): Bursar admin",
+  "permission.settings.reading-room-access.view": "Settings (tenant): Can view reading room access",
 
   "settings.confirmPickupLocationChangeModal.title": "Confirm Pickup location change",
   "settings.confirmPickupLocationChangeModal.message": "Changing this Pickup location from \"Yes\" to \"No\" will remove it from existing Request policies and affect all Circulation rules using the policies.",