Merge branch 'master' into UIQM-724

folio-org · Oct 31, 2024 · 6a56448 · 6a56448
2 parents 54926a7 + fc3424b
commit 6a56448
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,7 +41,8 @@
 * [UIQM-711](https://issues.folio.org/browse/UIQM-711) Update `validateFixedFieldPositions` to display all 008 field errors instead of one in Bibliographic records.
 * [UIQM-712](https://issues.folio.org/browse/UIQM-712) In field 007 for Projected Graphic type: change the `MfS` field type to `Byte` to allow only 1 character to be entered.
 * [UIQM-715](https://issues.folio.org/browse/UIQM-715) Reuse existing ids for fields after saving a record to avoid re-rendering and be able to focus on a field by ref.
-* [UIQM-724](https://issues.folio.org/browse/UIQM-724) Do not group together subfields during linking.
+* [UIQM-723](https://issues.folio.org/browse/UIQM-723) Rename permissions.
+* * [UIQM-724](https://issues.folio.org/browse/UIQM-724) Do not group together subfields during linking.
 
 ## [8.0.1] (https://github.com/folio-org/ui-quick-marc/tree/v8.0.1) (2024-04-18)
 

diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
           "marc-records-editor.status.item.get",
           "marc-specifications.item.get",
           "mod-settings.entries.collection.get",
-          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check",
+          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check.manage",
           "marc-records-editor.validate.post"
         ],
         "visible": true
@@ -62,7 +62,7 @@
           "instance-authority-links.instances.collection.put",
           "marc-specifications.item.get",
           "mod-settings.entries.collection.get",
-          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check",
+          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check.manage",
           "marc-records-editor.validate.post"
         ],
         "visible": true
@@ -99,8 +99,9 @@
         "visible": true
       },
       {
-        "permissionName": "ui-quick-marc.quick-marc-editor.duplicate",
+        "permissionName": "ui-quick-marc.quick-marc-editor.derive.execute",
         "displayName": "quickMARC: Derive new MARC bibliographic record",
+        "replaces": ["ui-quick-marc.quick-marc-editor.duplicate"],
         "subPermissions": [
           "ui-quick-marc.quick-marc-editor.view",
           "marc-records-editor.status.item.get",
@@ -110,7 +111,7 @@
           "instance-authority-links.instances.collection.put",
           "marc-specifications.item.get",
           "mod-settings.entries.collection.get",
-          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check",
+          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check.manage",
           "marc-records-editor.validate.post"
         ],
         "visible": true
@@ -127,7 +128,7 @@
           "marc-records-editor.status.item.get",
           "marc-specifications.item.get",
           "mod-settings.entries.collection.get",
-          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check",
+          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check.manage",
           "marc-records-editor.validate.post"
         ],
         "visible": true
@@ -142,14 +143,15 @@
           "marc-specifications.item.get",
           "search.authorities.collection.get",
           "mod-settings.entries.collection.get",
-          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check",
+          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check.manage",
           "marc-records-editor.validate.post"
         ],
         "visible": true
       },
       {
-        "permissionName": "ui-quick-marc.quick-marc-authority-records.linkUnlink",
+        "permissionName": "ui-quick-marc.quick-marc-authority-records.link-unlink.execute",
         "displayName": "quickMARC: Can Link/unlink authority records to bib records",
+        "replaces": ["ui-quick-marc.quick-marc-authority-records.linkUnlink"],
         "subPermissions": [
           "instance-authority.linking-rules.collection.get",
           "inventory-storage.authority-source-files.collection.get",
@@ -162,20 +164,20 @@
         "displayName": "Edit, View: Enable duplicate LCCN (010 $a) checking of MARC bibliographic and authority records",
         "subPermissions": [
           "mod-settings.entries.collection.get",
-          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check",
+          "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check.manage",
           "mod-settings.entries.item.post",
           "mod-settings.entries.item.put",
-          "mod-settings.global.write.ui-quick-marc.lccn-duplicate-check"
+          "mod-settings.global.write.ui-quick-marc.lccn-duplicate-check.manage"
         ],
         "visible": false
       },
       {
-        "permissionName": "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check",
+        "permissionName": "mod-settings.global.read.ui-quick-marc.lccn-duplicate-check.manage",
         "displayName": "Settings (MARC): read LCCN duplicate check settings",
         "visible": false
       },
       {
-        "permissionName": "mod-settings.global.write.ui-quick-marc.lccn-duplicate-check",
+        "permissionName": "mod-settings.global.write.ui-quick-marc.lccn-duplicate-check.manage",
         "displayName": "Settings (MARC): write LCCN duplicate check settings",
         "visible": false
       }

diff --git a/src/QuickMarc.js b/src/QuickMarc.js
@@ -36,7 +36,7 @@ const QuickMarc = ({
     },
     {
       path: `${basePath}/duplicate-bib/:externalId`,
-      permission: 'ui-quick-marc.quick-marc-editor.duplicate',
+      permission: 'ui-quick-marc.quick-marc-editor.derive.execute',
       props: {
         action: QUICK_MARC_ACTIONS.DERIVE,
         wrapper: QuickMarcDeriveWrapper,

diff --git a/src/QuickMarcEditor/AutoLinkingButton/AutoLinkingButton.js b/src/QuickMarcEditor/AutoLinkingButton/AutoLinkingButton.js
@@ -134,7 +134,7 @@ const AutoLinkingButton = ({
   }
 
   return (
-    <IfPermission perm="ui-quick-marc.quick-marc-authority-records.linkUnlink">
+    <IfPermission perm="ui-quick-marc.quick-marc-authority-records.link-unlink.execute">
       <Button
         marginBottom0
         disabled={!hasAutoLinkableRecord || isLoadingLinkSuggestions}

diff --git a/src/QuickMarcEditor/QuickMarcEditor.js b/src/QuickMarcEditor/QuickMarcEditor.js
@@ -580,7 +580,7 @@ const QuickMarcEditor = ({
       />
       {
         confirmRemoveAuthorityLinking && (
-          <IfPermission perm="ui-quick-marc.quick-marc-authority-records.linkUnlink">
+          <IfPermission perm="ui-quick-marc.quick-marc-authority-records.link-unlink.execute">
             <ConfirmationModal
               id="quick-marc-remove-authority-linking-confirm-modal"
               open={isUnlinkRecordsModalOpen}

diff --git a/src/QuickMarcEditor/utils.js b/src/QuickMarcEditor/utils.js
@@ -601,7 +601,7 @@ export const isRecordForManualLinking = (
   isRequestToCentralTenantFromMember,
   onCheckCentralTenantPerm,
 ) => {
-  const permission = 'ui-quick-marc.quick-marc-authority-records.linkUnlink';
+  const permission = 'ui-quick-marc.quick-marc-authority-records.link-unlink.execute';
 
   return (
     marcType === MARC_TYPES.BIB

diff --git a/src/queries/useLccnDuplicateConfig/useLccnDuplicateConfig.js b/src/queries/useLccnDuplicateConfig/useLccnDuplicateConfig.js
@@ -7,7 +7,7 @@ import {
 import { MARC_TYPES } from '../../common/constants';
 
 const KEY = 'lccn-duplicate-check';
-const SCOPE = 'ui-quick-marc.lccn-duplicate-check';
+const SCOPE = 'ui-quick-marc.lccn-duplicate-check.manage';
 
 const useLccnDuplicateConfig = ({ marcType }) => {
   const ky = useOkapiKy();

diff --git a/translations/ui-quick-marc/en.json b/translations/ui-quick-marc/en.json
@@ -7,11 +7,11 @@
   "permission.quick-marc-holdings-editor.view": "quickMARC: View MARC holdings record",
   "permission.quick-marc-holdings-editor.all": "quickMARC: View, edit MARC holdings record",
   "permission.quick-marc-holdings-editor.create": "quickMARC: Create a new MARC holdings record",
-  "permission.quick-marc-editor.duplicate": "quickMARC: Derive new MARC bibliographic record",
+  "permission.quick-marc-editor.derive.execute": "quickMARC: Derive new MARC bibliographic record",
   "permission.quick-marc-editor.create": "quickMARC: Create a new MARC bibliographic record",
   "permission.quick-marc-authorities-editor.create": "quickMARC: Create a new MARC authority record",
   "permission.quick-marc-authorities-editor.all": "quickMARC: View, edit MARC authorities record",
-  "permission.quick-marc-authority-records.linkUnlink": "quickMARC: Can Link/unlink authority records to bib records",
+  "permission.quick-marc-authority-records.link-unlink.execute": "quickMARC: Can Link/unlink authority records to bib records",
 
   "holdings-record.create.title": "Create a new MARC Holdings record",
   "bibliographic-record.create.title": "Create a new {shared, select, true {shared} false {local} other {}} MARC bib record",