Merge branch 'master' into UIREQMED-27

folio-org · Jul 11, 2024 · 2e7dbb9 · 2e7dbb9
2 parents 008d18a + 038128b
commit 2e7dbb9
Show file tree

Hide file tree

Showing 36 changed files with 133 additions and 146 deletions.
diff --git a/src/components/MediatedRequestsActivities/components/ItemDetail/ItemDetail.js b/src/components/MediatedRequestsActivities/components/ItemDetail/ItemDetail.js
@@ -12,7 +12,6 @@ import {
 import { effectiveCallNumber } from '@folio/stripes/util';
 import { ClipCopy } from '@folio/stripes/smart-components';
 
-import { isValidRequest } from '../../../../utils';
 import {
   ITEM_STATUS_TRANSLATIONS,
   OPEN_REQUEST_STATUS_FILTERS,
@@ -51,16 +50,7 @@ const ItemDetail = ({
     )
     : count;
   const itemLabel = item.barcode ? 'ui-requests-mediated.itemDetails.barcode' : 'ui-requests-mediated.itemDetails.id';
-  const isRequestValid = isValidRequest({ instanceId, holdingsRecordId });
-  const getRecordLink = () => {
-    if (itemId) {
-      return isRequestValid
-        ? <Link to={`/inventory/view/${instanceId}/${holdingsRecordId}/${itemId}`}>{item.barcode || itemId}</Link>
-        : (item.barcode || itemId);
-    }
-
-    return <NoValue />;
-  };
+  const recordLink = itemId ? <Link to={`/inventory/view/${instanceId}/${holdingsRecordId}/${itemId}`}>{item.barcode || itemId}</Link> : <NoValue />;
 
   return (
     <>
@@ -71,7 +61,7 @@ const ItemDetail = ({
             label={<FormattedMessage id={itemLabel} />}
             value={
               <>
-                {getRecordLink()}
+                {recordLink}
                 {
                   Boolean(item.barcode) && (
                     <ClipCopy text={item.barcode} />

diff --git a/src/constants/base.js b/src/constants/base.js
@@ -45,8 +45,6 @@ export const REQUEST_FORM_FIELD_NAMES = {
   KEY_OF_USER_BARCODE_FIELD: 'keyOfUserBarcodeField',
 };
 
-export const INVALID_REQUEST_HARDCODED_ID = '00000000-0000-4000-8000-000000000000';
-
 export const REQUEST_STATUSES = {
   AWAITING_DELIVERY: 'Open - Awaiting delivery',
   AWAITING_PICKUP: 'Open - Awaiting pickup',

diff --git a/src/utils.js b/src/utils.js
@@ -3,8 +3,6 @@ import {
   isObject,
 } from 'lodash';
 
-import { INVALID_REQUEST_HARDCODED_ID } from './constants';
-
 export const transformRequestFilterOptions = (formatMessage, source = []) => (
   source.map(({ label, value }) => ({
     label: formatMessage({ id: label }),
@@ -54,11 +52,6 @@ export const memoizeValidation = (fn) => {
   };
 };
 
-export const isValidRequest = ({
-  instanceId,
-  holdingsRecordId,
-}) => instanceId !== INVALID_REQUEST_HARDCODED_ID && holdingsRecordId !== INVALID_REQUEST_HARDCODED_ID;
-
 export const getInstanceQueryString = (hrid, id) => `("hrid"=="${hrid}" or "id"=="${id || hrid}")`;
 
 export const getStatusQuery = (statuses = []) => statuses.reduce((acc, val) => `${acc ? acc + ' or ' : acc}status=="${val}"`, '');

diff --git a/src/utils.test.js b/src/utils.test.js
@@ -3,7 +3,6 @@ import {
   handleKeyCommand,
   isFormEditing,
   memoizeValidation,
-  isValidRequest,
   getTlrSettings,
   getPatronGroup,
   isSubmittingButtonDisabled,
@@ -12,7 +11,6 @@ import {
   getInstanceQueryString,
   getFullName,
 } from './utils';
-import { INVALID_REQUEST_HARDCODED_ID } from './constants';
 
 describe('utils', () => {
   describe('transformRequestFilterOptions', () => {
@@ -137,30 +135,6 @@ describe('utils', () => {
     });
   });
 
-  describe('isValidRequest', () => {
-    describe('When request is valid', () => {
-      it('should return true', () => {
-        const request = {
-          instanceId: 'instanceId',
-          holdingsRecordId: 'holdingRecordId',
-        };
-
-        expect(isValidRequest(request)).toBe(true);
-      });
-    });
-
-    describe('When request is not valid', () => {
-      it('should return false', () => {
-        const request = {
-          instanceId: INVALID_REQUEST_HARDCODED_ID,
-          holdingsRecordId: INVALID_REQUEST_HARDCODED_ID,
-        };
-
-        expect(isValidRequest(request)).toBe(false);
-      });
-    });
-  });
-
   describe('getInstanceQueryString', () => {
     const hrid = 'hrid';
     const id = 'instanceId';

diff --git a/translations/ui-requests-mediated/ar.json b/translations/ui-requests-mediated/ar.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }
diff --git a/translations/ui-requests-mediated/ber.json b/translations/ui-requests-mediated/ber.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }
diff --git a/translations/ui-requests-mediated/ca.json b/translations/ui-requests-mediated/ca.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }
diff --git a/translations/ui-requests-mediated/cs_CZ.json b/translations/ui-requests-mediated/cs_CZ.json
@@ -4,8 +4,7 @@
     "settings.general": "Obecné",
     "settings.general.message": "Toto jsou obecná nastavení aplikace.",
     "permission.view": "Zprostředkované žádanky: Zobrazit",
-    "permission.view-create": "Zprostředkované žádanky: Zobrazit, vytvořit",
-    "permission.view-create-edit": "Zprostředkované žádanky: Zobrazit, upravit, zrušit",
+    "permission.view-create-edit": "Zprostředkované žádanky: Zobrazit, vytvořit, upravit",
     "permission.all": "Zprostředkované žádanky: Všechna oprávnění",
     "app.filterPane.selectActivity": "Zvolte aktivitu",
     "app.confirmItemArrival.navigation": "Potvrdit příchod jednotky",
@@ -14,15 +13,17 @@
     "app.confirmItemArrival.paneTitle": "Potvrdit příchod jednotky",
     "app.mediatedRequestsActivities.paneTitle": "Zprostředkované žádanky",
     "app.sendItemInTransit.paneTitle": "Odeslat jednotku v přepravě",
-    "filters.mediatedRequestStatus.accordionTitle": "Mediated request status",
-    "filters.mediatedRequestStatus.closedDeclined": "Closed - Declined",
+    "filters.mediatedRequestStatus.accordionTitle": "Stav zprostředkované žádanky",
+    "filters.mediatedRequestStatus.closedDeclined": "Uzavřeno - odmítnuto",
     "filters.mediatedRequestStatus.closedFilled": "Uzavřená - Vyřízená",
     "filters.mediatedRequestStatus.newAwaitingConfirmation": "New - Awaiting confirmation",
-    "filters.mediatedRequestStatus.openAwaitingPickup": "Open - Awaiting pickup",
-    "filters.mediatedRequestStatus.openInProgress": "Open - In progress",
-    "filters.mediatedRequestStatus.openInTransit": "Open - In transits",
+    "filters.mediatedRequestStatus.openAwaitingPickup": "Otevřená - Čeká na vyzvednutí",
+    "filters.mediatedRequestStatus.openInProgress": "Otevřená – probíhá",
+    "filters.mediatedRequestStatus.openInTransit": "Otevřená - V přepravách",
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Jednotka",
-    "filters.mediatedRequestLevel.title": "Název"
+    "filters.mediatedRequestLevel.title": "Název",
+    "permission.view-decline": "Zprostředkované žádanky: Zobrazit, odmítnout",
+    "permission.view-edit-decline": "Zprostředkované žádanky: Zobrazit, upravit, odmítnout"
 }
diff --git a/translations/ui-requests-mediated/da.json b/translations/ui-requests-mediated/da.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }
diff --git a/translations/ui-requests-mediated/de.json b/translations/ui-requests-mediated/de.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }
diff --git a/translations/ui-requests-mediated/en_GB.json b/translations/ui-requests-mediated/en_GB.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }
diff --git a/translations/ui-requests-mediated/en_SE.json b/translations/ui-requests-mediated/en_SE.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }
diff --git a/translations/ui-requests-mediated/en_US.json b/translations/ui-requests-mediated/en_US.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }
diff --git a/translations/ui-requests-mediated/es.json b/translations/ui-requests-mediated/es.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }
diff --git a/translations/ui-requests-mediated/es_419.json b/translations/ui-requests-mediated/es_419.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }
diff --git a/translations/ui-requests-mediated/es_ES.json b/translations/ui-requests-mediated/es_ES.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }
diff --git a/translations/ui-requests-mediated/fr.json b/translations/ui-requests-mediated/fr.json
@@ -4,8 +4,7 @@
     "settings.general": "General",
     "settings.general.message": "These are your general app settings.",
     "permission.view": "Mediated requests: View",
-    "permission.view-create": "Mediated requests: View, create",
-    "permission.view-create-edit": "Mediated requests: View, edit, cancel",
+    "permission.view-create-edit": "Mediated requests: View, create, edit",
     "permission.all": "Mediated requests: All permissions",
     "app.filterPane.selectActivity": "Select activity",
     "app.confirmItemArrival.navigation": "Confirm item arrival",
@@ -24,5 +23,7 @@
     "filters.mediatedRequestStatus.openItemArrived": "Open - Item arrived",
     "filters.mediatedRequestLevel.accordionTitle": "Mediated request level",
     "filters.mediatedRequestLevel.item": "Item",
-    "filters.mediatedRequestLevel.title": "Title"
+    "filters.mediatedRequestLevel.title": "Title",
+    "permission.view-decline": "Mediated requests: View, decline",
+    "permission.view-edit-decline": "Mediated requests: View, edit, decline"
 }