From 271dd57a3a116d178fe51eb8e57bb6b88e11e2a5 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Mon, 20 Jan 2025 16:54:48 +0000 Subject: [PATCH 1/2] UITEN-317 False FC value is displayed as Not as "disabled" --- src/settings/LocationLocations/LocationDetail.js | 6 +++++- translations/ui-tenant-settings/en.json | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/settings/LocationLocations/LocationDetail.js b/src/settings/LocationLocations/LocationDetail.js index 3059b11..17c61d6 100644 --- a/src/settings/LocationLocations/LocationDetail.js +++ b/src/settings/LocationLocations/LocationDetail.js @@ -14,6 +14,7 @@ import { KeyValue, Row, List, + NoValue, Pane, Button, Icon, @@ -282,7 +283,10 @@ const LocationDetail = ({ } > - + {loc.isFloatingCollection ? + : + + } diff --git a/translations/ui-tenant-settings/en.json b/translations/ui-tenant-settings/en.json index 27f0036..257fc36 100644 --- a/translations/ui-tenant-settings/en.json +++ b/translations/ui-tenant-settings/en.json @@ -63,7 +63,6 @@ "settings.location.code": "Code", "settings.location.floating": "Floating collection", "settings.location.floating.enabled": "Enabled", - "settings.location.floating.disabled": "Disabled", "settings.location.institutions": "Institutions", "settings.location.institutions.institution": "Institution", From 87a0f4738df993b03b98f1f37dac3731ac5029cc Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Mon, 20 Jan 2025 17:28:02 +0000 Subject: [PATCH 2/2] UITEN-318 Permissions to view and set floating collection This commit merely declares the permissions. Tomorrow I will do the work to test them in the UI: I can't do that until they come into existence, which will happen on the next build of snapshot. Part of UITEN-318. --- CHANGELOG.md | 1 + package.json | 16 ++++++++++++++++ translations/ui-tenant-settings/en.json | 2 ++ 3 files changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd3ba9a..5aabfd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * [UITEN-316](https://folio-org.atlassian.net/browse/UITEN-316) Fix code to pass ESLint successfully. * [UITEN-314](https://folio-org.atlassian.net/browse/UITEN-314) Settings > Tenant > Locations setup > Locations. Enable and Display floating collection. * [UITEN-317](https://folio-org.atlassian.net/browse/UITEN-317) Settings > Tenant > Locations setup > Locations. Display in detailed view when floating collection is enabled or not enabled. +* [UITEN-318](https://folio-org.atlassian.net/browse/UITEN-318) Permissions. Settings (tenant). View and be able to enable to set floating collection ## [9.0.0](https://github.com/folio-org/ui-tenant-settings/tree/v9.0.0)(2024-10-30) diff --git a/package.json b/package.json index d98776c..7b0f9e9 100644 --- a/package.json +++ b/package.json @@ -181,6 +181,22 @@ ], "visible": true }, + { + "permissionName": "ui-tenant-settings.settings.location.floating.view", + "displayName": "Settings (tenant): Can view floating collection flag", + "subPermissions": [ + "ui-tenant-settings.settings.location.view" + ], + "visible": true + }, + { + "permissionName": "ui-tenant-settings.settings.location.floating.edit", + "displayName": "Settings (tenant): Can view and edit floating collection flag", + "subPermissions": [ + "ui-tenant-settings.settings.location" + ], + "visible": true + }, { "permissionName": "ui-tenant-settings.settings.servicepoints.view", "displayName": "Settings (tenant): Can view service points", diff --git a/translations/ui-tenant-settings/en.json b/translations/ui-tenant-settings/en.json index 257fc36..0b15e12 100644 --- a/translations/ui-tenant-settings/en.json +++ b/translations/ui-tenant-settings/en.json @@ -227,6 +227,8 @@ "permission.settings.sso.view": "Settings (tenant): Can view SSO settings", "permission.settings.location": "Settings (tenant): Can create, edit and remove locations", "permission.settings.location.view": "Settings (Tenant): View locations", + "permission.settings.location.floating.view": "Settings (tenant): Can view floating collection flag", + "permission.settings.location.floating.edit": "Settings (tenant): Can view and edit floating collection flag", "permission.settings.servicepoints": "Settings (tenant): Can create and edit service points", "permission.settings.servicepoints.view": "Settings (tenant): Can view service points", "permission.settings.bursar-exports": "Settings (tenant): Bursar admin",