Merge branch 'master' into UIU-3301

folio-org · Jan 4, 2025 · 759bacb · 759bacb
2 parents 0dae3b9 + 6f603c1
commit 759bacb
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 110 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,8 +3,14 @@
 ## [11.1.0] In progress
 * `useUserTenantRoles` supplies `tenantId` in all its queries. Refs UIU-3279.
 * Leverage API supported sorting of columns on pre-registrations records list. Refs UIU-3249.
-* Add permission to access users-keycloak delete method. Refs UIU-3282.
 * Fix issue with `Proxy borrower` field value. Refs UIU-3290.
+* Remove duplicates from the keyboard shortcut modal. Refs UIU-3026.
+* Add sub permission `manual-block-templates.collection.get` to permission `Users: Can create, edit and remove patron blocks`. Refs UIU-3305.
+
+## [11.0.9](https://github.com/folio-org/ui-users/tree/v11.0.9) (2024-12-13)
+[Full Changelog](https://github.com/folio-org/ui-users/compare/v11.0.8...v11.0.9)
+
+* Add permission to access users-keycloak delete method. Refs UIU-3282.
 * Check if userId is present in withUserRoles HOC. Refs UIU-3273.
 * Add missed permissions for endpoints used in withUserRoles HOC. UIU-3294.
 * Add view/manage roles permissions. Refs UIU-3301.
@@ -20,6 +26,13 @@
 * Update permissions for mod-patron. Ref UIU-3259.
 * Update permission after BE permission changes. Refs UIU-3288.
 
+## [11.0.6](https://github.com/folio-org/ui-users/tree/v11.0.6) (2024-11-28)
+[Full Changelog](https://github.com/folio-org/ui-users/compare/v11.0.5...v11.0.6)
+
+* `useUserTenantRoles` supplies `tenantId` in all its queries. Refs UIU-3279.
+* Leverage API supported sorting of columns on pre-registrations records list. Refs UIU-3249.
+* Show all patron notice print jobs (not just ten random ones), in correct order. Fixes UIU-3269.
+
 ## [11.0.5](https://github.com/folio-org/ui-users/tree/v11.0.5) (2024-11-20)
 [Full Changelog](https://github.com/folio-org/ui-users/compare/v11.0.3...v11.0.5)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@folio/users",
-  "version": "11.0.5",
+  "version": "11.0.9",
   "description": "User management",
   "repository": "folio-org/ui-users",
   "publishConfig": {
@@ -613,6 +613,7 @@
         "replaces": ["ui-users.patron_blocks"],
         "subPermissions": [
           "manualblocks.collection.get",
+          "manual-block-templates.collection.get",
           "manualblocks.item.delete",
           "manualblocks.item.get",
           "manualblocks.item.post",

diff --git a/src/commands.js b/src/commands.js
@@ -36,6 +36,10 @@ const commands = [
     name: 'openShortcutModal',
     label: (<FormattedMessage id="ui-users.shortcut.openShortcutModal" />),
     shortcut: 'mod+alt+k',
+  },
+  {
+    label: (<FormattedMessage id="ui-users.shortcut.expandCollapse" />),
+    shortcut: 'spacebar'
   }
 ];
 

diff --git a/src/commandsGeneral.js b/src/commandsGeneral.js
diff --git a/src/index.js b/src/index.js
@@ -17,7 +17,6 @@ import * as Routes from './routes';
 
 import pkg from '../package';
 import commands from './commands';
-import commandsGeneral from './commandsGeneral';
 import Settings from './settings';
 import sections from './settings/sections';
 import {
@@ -241,7 +240,7 @@ class UsersRouting extends React.Component {
           <KeyboardShortcutsModal
             open
             onClose={() => { this.changeKeyboardShortcutsModal(false); }}
-            allCommands={commands.concat(commandsGeneral)}
+            allCommands={commands}
           />
         )}
       </ >

diff --git a/translations/ui-users/pt_BR.json b/translations/ui-users/pt_BR.json
@@ -1210,7 +1210,7 @@
     "permission.fee-fine-actions.all": "Detalhes de taxas/multas: Pode criar, editar e remover ações de taxa/multa",
     "permission.loans-anonymize.execute": "Usuários: Anomnimizar empréstimos de usuário",
     "permission.loans-due-date.edit": "Usuários: Empréstimos de usuários - alterar a data de vencimento",
-    "permission.loans-claim-item-returned.execute": "Usuários: Reivindicação de empréstimos de usuários devolvida",
+    "permission.loans-claim-item-returned.execute": "Usuários: Reclamação de empréstimos de usuários devolvida",
     "permission.loans-declare-claimed-returned-item-as-missing.execute": "Usuários: Empréstimos de usuários - marcados como reivindicados, devolvidos como desaparecidos",
     "permission.loans-declare-item-lost.execute": "Usuários: declarar como perdido empréstimos de usuários",
     "permission.loans-renew-override.create": "Usuários: Renovação de empréstimos de usuários por meio de sobreposição",