UIU-2906 - Cleanup User Settings permissions – Part 1 (#2505)

* UIU-2907 - Cleanup User Settings permissions – Part 2 * UIU-2907 - Update permissions * UIU-2906 - Add two new permissions and edit one permission
folio-org · Jul 7, 2023 · 59dd8f0 · 59dd8f0
1 parent e851e9d
commit 59dd8f0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@
 * Handle sparse data in "Overdue loans report". Fixes UIU-2901.
 * Update translations text for permission.settings.manual-charges.all. Fixes UIU-2908.
 * Rename user setting permissions disaplay name and update their visibility. Refs UIU-2907.
+* Cleanup User Settings permissions – Part 1. Refs UIU-2906
 
 ## [9.0.0](https://github.com/folio-org/ui-users/tree/v9.0.0) (2023-02-20)
 [Full Changelog](https://github.com/folio-org/ui-users/compare/v8.1.0...v9.0.0)

diff --git a/package.json b/package.json
@@ -294,7 +294,6 @@
         "permissionName": "ui-users.settings.feefines.view",
         "displayName": "Settings (Users): Can view feefines-related entries",
         "subPermissions": [
-          "settings.users.enabled",
           "ui-users.settings.owners.view",
           "ui-users.settings.manual-charges.view",
           "ui-users.settings.waives.view",
@@ -617,6 +616,7 @@
         "permissionName": "ui-users.settings.patron-block-templates.view",
         "displayName": "Settings (Users): Can view patron blocks templates",
         "subPermissions": [
+          "settings.users.enabled",
           "manual-block-templates.collection.get",
           "manual-block-templates.item.get"
         ],
@@ -1007,21 +1007,38 @@
         "visible": true
       },
       {
-        "permissionName": "ui-users.settings.view",
-        "displayName": "Settings (Users): View all settings",
+        "permissionName": "ui-users.settings.general.view",
+        "displayName": "Settings (Users): Can view general entries",
+        "description": "Permission to view all general entries of settings",
         "subPermissions": [
-          "settings.users.enabled",
-          "ui-users.settings.permsets.view",
-          "ui-users.settings.usergroups.view",
           "ui-users.settings.addresstypes.view",
-          "ui-users.settings.departments.view",
           "ui-users.settings.customfields.view",
-          "ui-users.settings.feefines.view",
+          "ui-users.settings.usergroups.view",
+          "ui-users.settings.permsets.view",
+          "ui-users.settings.departments.view"
+        ],
+        "visible": true
+      },
+      {
+        "permissionName": "ui-users.settings.patron-blocks.view",
+        "displayName": "Settings (Users): Can view all patron blocks entries",
+        "description": "Permission to view conditions, limits and templated in patron block section of settings",
+        "subPermissions": [
           "ui-users.settings.conditions.view",
           "ui-users.settings.limits.view",
           "ui-users.settings.patron-block-templates.view"
         ],
         "visible": true
+      },
+      {
+        "permissionName": "ui-users.settings.view",
+        "displayName": "Settings (Users): View all settings",
+        "subPermissions": [
+          "ui-users.settings.general.view",
+          "ui-users.settings.feefines.view",
+          "ui-users.settings.patron-blocks.view"
+        ],
+        "visible": true
       }
     ]
   },

diff --git a/translations/ui-users/en.json b/translations/ui-users/en.json
@@ -992,6 +992,8 @@
   "permission.requests.all": "Users: View requests",
   "permission.reset.password": "Users: Create/reset password",
   "permission.settings.view": "Settings (Users): View all settings",
+  "permission.settings.general.view": "Settings (Users): Can view general entries",
+  "permission.settings.patron-blocks.view": "Settings (Users): Can view all patron blocks entries",
   "permission.settings.addresstypes.view": "Settings (Users): Can view address types",
   "permission.settings.addresstypes.all": "Settings (Users): Can create, edit and remove address types",
   "permission.settings.comments.view": "Settings (Users): Can view if comment required",
@@ -1004,6 +1006,7 @@
   "permission.settings.customfields.edit": "Settings (Users): Can create, edit, and view custom fields",
   "permission.settings.customfields.view": "Settings (Users): Can view custom fields",
   "permission.settings.feefine": "Settings (Users): Can create, edit and remove fee/fine settings",
+  "permission.settings.feefines.view": "Settings (Users): Can view feefines-related entries",
   "permission.settings.manual-charges.view": "Settings (Users): Can view manual charges",
   "permission.settings.manual-charges.all": "Settings (Users): Can create, edit and remove manual charges",
   "permission.settings.owners.view": "Settings (Users): Can view owners",