Merge branch 'master' into UXPROD-4559-ECS

folio-org · Oct 28, 2024 · 7dc9c19 · 7dc9c19
2 parents 039115a + 6f75f10
commit 7dc9c19
Show file tree

Hide file tree

Showing 36 changed files with 210 additions and 207 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,7 @@
 * Also support okapiInterfaces `inventory` `14.0`. Refs UIREQ-1160.
 * Use `instanceId` param for ILR from items response. Refs UIREQ-1149.
 * Send `holdingsRecordId` param for Item level requests. Refs UIREQ-1167.
+* Review and cleanup Module Descriptor. Refs UIREQ-1156.
 * Add `tlr.settings.get` permission. Refs UIREQ-1169.
 
 ## [9.1.2] (https://github.com/folio-org/ui-requests/tree/v9.1.2) (2024-09-13)

diff --git a/package.json b/package.json
@@ -40,18 +40,20 @@
         "displayName": "UI: Requests module is enabled"
       },
       {
-        "permissionName": "ui-requests.moveRequest",
+        "permissionName": "ui-requests.moveRequest.execute",
         "displayName": "Requests: Move to new item, reorder queue",
+        "replaces": ["ui-requests.moveRequest"],
         "visible": true,
         "subPermissions": [
           "circulation.requests.item.move.post",
           "circulation.rules.request-policy.get",
-          "ui-requests.reorderQueue"
+          "ui-requests.reorderQueue.execute"
         ]
       },
       {
-        "permissionName": "ui-requests.reorderQueue",
+        "permissionName": "ui-requests.reorderQueue.execute",
         "displayName": "Requests: Reorder queue",
+        "replaces": ["ui-requests.reorderQueue"],
         "visible": true,
         "subPermissions": [
           "circulation.requests.queue.collection.get",
@@ -68,8 +70,8 @@
           "ui-requests.view",
           "ui-requests.create",
           "ui-requests.edit",
-          "ui-requests.moveRequest",
-          "ui-requests.reorderQueue"
+          "ui-requests.moveRequest.execute",
+          "ui-requests.reorderQueue.execute"
         ],
         "visible": true
       },

diff --git a/src/ViewRequest.js b/src/ViewRequest.js
@@ -554,8 +554,8 @@ class ViewRequest extends React.Component {
       const isEditButtonVisible = isValidNotDCBTransaction && stripes.hasPerm('ui-requests.edit');
       const isCancelButtonVisible = stripes.hasPerm('ui-requests.edit');
       const isDuplicateButtonVisible = isValidNotDCBTransaction && !isMoveAndDuplicateHidden && stripes.hasPerm('ui-requests.create');
-      const isMoveButtonVisible = item && isRequestNotFilled && isValidNotDCBTransaction && !isMoveAndDuplicateHidden && stripes.hasPerm('ui-requests.moveRequest');
-      const isReorderQueueButtonVisible = isRequestOpen && isValidNotDCBTransaction && stripes.hasPerm('ui-requests.reorderQueue');
+      const isMoveButtonVisible = item && isRequestNotFilled && isValidNotDCBTransaction && !isMoveAndDuplicateHidden && stripes.hasPerm('ui-requests.moveRequest.execute');
+      const isReorderQueueButtonVisible = isRequestOpen && isValidNotDCBTransaction && stripes.hasPerm('ui-requests.reorderQueue.execute');
       const isActionMenuVisible = isAnyActionButtonVisible([isEditButtonVisible, isCancelButtonVisible, isDuplicateButtonVisible, isMoveButtonVisible, isReorderQueueButtonVisible]);
 
       if (isActionMenuVisible) {

diff --git a/translations/ui-requests/ar.json b/translations/ui-requests/ar.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "رقم الاستدعاء الفعلي",
     "item.callNumberComponents.suffix": "لاحقة رقم الاستدعاء الفعلي",
     "item.chronology": "التسلسل الزمني",
-    "permission.moveRequest": "الطلبات: انقل إلى مادة جديدة، أعد ترتيب الصف",
-    "permission.reorderQueue": "الطلبات: أعد ترتيب الصف",
     "permission.all": "الطلبات: كل الصلاحيات",
     "permission.view": "الطلبات: اعرض",
     "permission.create": "الطلبات: اعرض، أنشئ",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Print status",
     "filters.printStatus.printed": "Printed",
     "filters.printStatus.notPrinted": "Not printed",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/ber.json b/translations/ui-requests/ber.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Effective call number",
     "item.callNumberComponents.suffix": "Effective call number suffix",
     "item.chronology": "Chronology",
-    "permission.moveRequest": "Requests: Move to new item, reorder queue",
-    "permission.reorderQueue": "Requests: Reorder queue",
     "permission.all": "Requests: All permissions",
     "permission.view": "Requests: View",
     "permission.create": "Requests: View, create",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Print status",
     "filters.printStatus.printed": "Printed",
     "filters.printStatus.notPrinted": "Not printed",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/ca.json b/translations/ui-requests/ca.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Effective call number",
     "item.callNumberComponents.suffix": "Effective call number suffix",
     "item.chronology": "Chronology",
-    "permission.moveRequest": "Requests: Move to new item, reorder queue",
-    "permission.reorderQueue": "Requests: Reorder queue",
     "permission.all": "Requests: All permissions",
     "permission.view": "Requests: View",
     "permission.create": "Requests: View, create",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Print status",
     "filters.printStatus.printed": "Printed",
     "filters.printStatus.notPrinted": "Not printed",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/cs_CZ.json b/translations/ui-requests/cs_CZ.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Efektivní signatura",
     "item.callNumberComponents.suffix": "Suffix efektivní signatury",
     "item.chronology": "Chronologie",
-    "permission.moveRequest": "Požadavky: Přejít na novou jednotku, změnit pořadí fronty",
-    "permission.reorderQueue": "Žádanky: Změna pořadí ve frontě",
     "permission.all": "Žádanky: Všechna oprávnění",
     "permission.view": "Žádanky: Zobrazit",
     "permission.create": "Žádanky: Zobrazit, vytvořit",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Stav tisku",
     "filters.printStatus.printed": "Tištěno",
     "filters.printStatus.notPrinted": "Nevytištěno",
-    "printDetails.printCount": "# Kopie"
+    "printDetails.printCount": "# Kopie",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/da.json b/translations/ui-requests/da.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Effective call number",
     "item.callNumberComponents.suffix": "Effective call number suffix",
     "item.chronology": "Chronology",
-    "permission.moveRequest": "Requests: Move to new item, reorder queue",
-    "permission.reorderQueue": "Requests: Reorder queue",
     "permission.all": "Requests: All permissions",
     "permission.view": "Requests: View",
     "permission.create": "Requests: View, create",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Print status",
     "filters.printStatus.printed": "Printed",
     "filters.printStatus.notPrinted": "Not printed",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/de.json b/translations/ui-requests/de.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Effektive Signatur",
     "item.callNumberComponents.suffix": "Effektive Signatur Suffix",
     "item.chronology": "Chronologie",
-    "permission.moveRequest": "Bestandsanfragen: Verschieben zu neuem Exemplar, Warteliste neu anordnen",
-    "permission.reorderQueue": "Bestandsanfragen: Warteliste neu anordnen",
     "permission.all": "Bestandsanfragen: Alle Berechtigungen",
     "permission.view": "Bestandsanfragen: Anzeigen",
     "permission.create": "Bestandsanfragen: Anzeigen, erstellen",
@@ -250,7 +248,7 @@
     "item.status.availableInASR": "Im automatischen Magazin verfügbar",
     "item.status.retrievingFromASR": "Aus dem automatischen Magazin abgerufen",
     "item.status.missingFromASR": "Im automatischen Magazin vermisst",
-    "item.status.orderClosed": "Bestellung abgeschlossen",
+    "item.status.orderClosed": "Erwerbungsvorgang abgeschlossen",
     "item.status.restricted": "Beschränkt",
     "appMenu.keyboardShortcuts": "Tastenkürzel",
     "navigation.app": "Suche in Bestandsanfragen",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Status Druckausgabe",
     "filters.printStatus.printed": "Druck abgeschlossen",
     "filters.printStatus.notPrinted": "Nicht gedruckt",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/en.json b/translations/ui-requests/en.json
@@ -305,8 +305,8 @@
   "filters.printStatus.printed": "Printed",
   "filters.printStatus.notPrinted": "Not printed",
 
-  "permission.moveRequest": "Requests: Move to new item, reorder queue",
-  "permission.reorderQueue": "Requests: Reorder queue",
+  "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+  "permission.reorderQueue.execute": "Requests: Reorder queue",
   "permission.all": "Requests: All permissions",
   "permission.view": "Requests: View",
   "permission.create": "Requests: View, create",

diff --git a/translations/ui-requests/en_GB.json b/translations/ui-requests/en_GB.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Effective call number",
     "item.callNumberComponents.suffix": "Effective call number suffix",
     "item.chronology": "Chronology",
-    "permission.moveRequest": "Requests: Move to new item, reorder queue",
-    "permission.reorderQueue": "Requests: Reorder queue",
     "permission.all": "Requests: All permissions",
     "permission.view": "Requests: View",
     "permission.create": "Requests: View, create",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Print status",
     "filters.printStatus.printed": "Printed",
     "filters.printStatus.notPrinted": "Not printed",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/en_SE.json b/translations/ui-requests/en_SE.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Effective call number",
     "item.callNumberComponents.suffix": "Effective call number suffix",
     "item.chronology": "Chronology",
-    "permission.moveRequest": "Requests: Move to new item, reorder queue",
-    "permission.reorderQueue": "Requests: Reorder queue",
     "permission.all": "Requests: All permissions",
     "permission.view": "Requests: View",
     "permission.create": "Requests: View, create",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Print status",
     "filters.printStatus.printed": "Printed",
     "filters.printStatus.notPrinted": "Not printed",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/en_US.json b/translations/ui-requests/en_US.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Effective call number",
     "item.callNumberComponents.suffix": "Effective call number suffix",
     "item.chronology": "Chronology",
-    "permission.moveRequest": "Requests: Move to new item, reorder queue",
-    "permission.reorderQueue": "Requests: Reorder queue",
     "permission.all": "Requests: All permissions",
     "permission.view": "Requests: View",
     "permission.create": "Requests: View, create",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Print status",
     "filters.printStatus.printed": "Printed",
     "filters.printStatus.notPrinted": "Not printed",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/es.json b/translations/ui-requests/es.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Número de llamada efectivo",
     "item.callNumberComponents.suffix": "Sufijo de número de llamada efectivo",
     "item.chronology": "Cronología",
-    "permission.moveRequest": "Solicitudes: mover a un ítem nuevo, reordenar la cola",
-    "permission.reorderQueue": "Solicitudes: Reordenar la cola",
     "permission.all": "Solicitudes: Todos los permisos",
     "permission.view": "Solicitudes: Ver",
     "permission.create": "Solicitudes: Ver, crear",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Print status",
     "filters.printStatus.printed": "Printed",
     "filters.printStatus.notPrinted": "Not printed",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/es_419.json b/translations/ui-requests/es_419.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Número de llamada efectivo",
     "item.callNumberComponents.suffix": "Sufijo de número de llamada efectivo",
     "item.chronology": "Cronología",
-    "permission.moveRequest": "Solicitudes: mover a un ítem nuevo, reordenar la cola",
-    "permission.reorderQueue": "Solicitudes: Reordenar la cola",
     "permission.all": "Solicitudes: Todos los permisos",
     "permission.view": "Solicitudes: Ver",
     "permission.create": "Solicitudes: Ver, crear",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Print status",
     "filters.printStatus.printed": "Printed",
     "filters.printStatus.notPrinted": "Not printed",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/es_ES.json b/translations/ui-requests/es_ES.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Número de llamada efectivo",
     "item.callNumberComponents.suffix": "Sufijo de número de llamada efectivo",
     "item.chronology": "Cronología",
-    "permission.moveRequest": "Solicitudes: mover a un ítem nuevo, reordenar la cola",
-    "permission.reorderQueue": "Solicitudes: Reordenar la cola",
     "permission.all": "Solicitudes: Todos los permisos",
     "permission.view": "Solicitudes: Ver",
     "permission.create": "Solicitudes: Ver, crear",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Print status",
     "filters.printStatus.printed": "Printed",
     "filters.printStatus.notPrinted": "Not printed",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }
diff --git a/translations/ui-requests/fr.json b/translations/ui-requests/fr.json
@@ -150,8 +150,6 @@
     "item.callNumberComponents.callNumber": "Effective call number",
     "item.callNumberComponents.suffix": "Effective call number suffix",
     "item.chronology": "Chronology",
-    "permission.moveRequest": "Requests: Move to new item, reorder queue",
-    "permission.reorderQueue": "Requests: Reorder queue",
     "permission.all": "Requests: All permissions",
     "permission.view": "Requests: View",
     "permission.create": "Requests: View, create",
@@ -299,5 +297,7 @@
     "requestMeta.printStatus": "Print status",
     "filters.printStatus.printed": "Printed",
     "filters.printStatus.notPrinted": "Not printed",
-    "printDetails.printCount": "# Copies"
+    "printDetails.printCount": "# Copies",
+    "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
+    "permission.reorderQueue.execute": "Requests: Reorder queue"
 }