Merge branch 'master' into UIREQ-1190

folio-org · Dec 20, 2024 · 8da07ff · 8da07ff
2 parents 61fd169 + a6d0fe2
commit 8da07ff
Show file tree

Hide file tree

Showing 44 changed files with 96 additions and 89 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,9 @@
 * Increase code coverage for src/ChooseRequestTypeDialog.js by Jest/RTL tests. Refs UIREQ-1044.
 * Cleanup retrieval service point implementation from deprecated folder. Refs UIREQ-1211.
 * Increase code coverage for src/ViewRequest.js by Jest/RTL tests. Refs UIREQ-1046.
+* React v19: refactor away from default props for functional components. Refs UIREQ-1101.
 * Add "Retrieval service point" filter. Refs UIREQ-1190.
+* Include `Retrieval service point` column in csv exports. Refs UIREQ-1191.
 
 ## [11.0.2] (https://github.com/folio-org/ui-requests/tree/v11.0.2) (2024-12-10)
 [Full Changelog](https://github.com/folio-org/ui-requests/compare/v11.0.1...v11.0.2)

diff --git a/src/ItemsDialog.js b/src/ItemsDialog.js
@@ -79,7 +79,7 @@ const ItemsDialog = ({
   onRowClick = noop,
   mutator,
   skippedItemId,
-  title,
+  title = '',
   instanceId,
 }) => {
   const [areItemsBeingLoaded, setAreItemsBeingLoaded] = useState(false);
@@ -233,10 +233,6 @@ ItemsDialog.manifest = {
   },
 };
 
-ItemsDialog.defaultProps = {
-  title: '',
-};
-
 ItemsDialog.propTypes = {
   open: PropTypes.bool.isRequired,
   onClose: PropTypes.func.isRequired,

diff --git a/src/components/FulfilmentPreference/FulfilmentPreference.js b/src/components/FulfilmentPreference/FulfilmentPreference.js
@@ -26,11 +26,11 @@ const {
 
 const FulfilmentPreference = ({
   isEditForm,
-  deliverySelected,
-  deliveryAddress,
+  deliverySelected = false,
+  deliveryAddress = '',
   onChangeAddress,
-  deliveryLocations,
-  fulfillmentTypeOptions,
+  deliveryLocations = [],
+  fulfillmentTypeOptions = [],
   defaultDeliveryAddressTypeId,
   changeDeliveryAddress,
   requestTypes,
@@ -167,11 +167,4 @@ FulfilmentPreference.propTypes = {
   deliverySelected: PropTypes.bool,
 };
 
-FulfilmentPreference.defaultProps = {
-  deliveryAddress: '',
-  deliveryLocations: [],
-  fulfillmentTypeOptions: [],
-  deliverySelected: false,
-};
-
 export default FulfilmentPreference;
diff --git a/src/components/PrintContent/PrintContent.js b/src/components/PrintContent/PrintContent.js
@@ -10,7 +10,7 @@ import css from './PrintContent.css';
 const PrintContent = forwardRef(({
   dataSource,
   template,
-  id,
+  id = 'printContent',
 }, ref) => {
   const templateFn = useMemo(() => buildTemplate(template), [template]);
 
@@ -43,8 +43,4 @@ PrintContent.propTypes = {
   template: PropTypes.string.isRequired,
 };
 
-PrintContent.defaultProps = {
-  id: 'printContent',
-};
-
 export default memo(PrintContent, isEqual);
diff --git a/src/components/RequestsFilters/PickupServicePointFilter/PickupServicePointFilter.js b/src/components/RequestsFilters/PickupServicePointFilter/PickupServicePointFilter.js
@@ -19,8 +19,8 @@ import {
 } from '../../../constants';
 
 const PickupServicePointFilter = ({
-  activeValues,
-  servicePoints,
+  activeValues = [],
+  servicePoints = [],
   onChange,
   onClear,
 }) => {
@@ -67,9 +67,4 @@ PickupServicePointFilter.propTypes = {
   onClear: PropTypes.func.isRequired,
 };
 
-PickupServicePointFilter.defaultProps = {
-  activeValues: [],
-  servicePoints: [],
-};
-
 export default PickupServicePointFilter;
diff --git a/src/components/RequestsFilters/RequestLevelFilter/RequestLevelFilter.js b/src/components/RequestsFilters/RequestLevelFilter/RequestLevelFilter.js
@@ -18,7 +18,7 @@ import {
 } from '../../../constants';
 
 const RequestLevelFilter = ({
-  activeValues,
+  activeValues = [],
   onChange,
   onClear,
 }) => {
@@ -63,8 +63,4 @@ RequestLevelFilter.propTypes = {
   onClear: PropTypes.func.isRequired,
 };
 
-RequestLevelFilter.defaultProps = {
-  activeValues: [],
-};
-
 export default RequestLevelFilter;
diff --git a/src/components/SortableList/SortableList.js b/src/components/SortableList/SortableList.js
@@ -14,10 +14,10 @@ import draggableRowFormatter from './draggableRowFormatter';
 
 export default function SortableList(props) {
   const {
-    droppableId,
+    droppableId = uniqueId('droppable'),
     onDragEnd,
-    rowFormatter,
-    isRowDraggable,
+    rowFormatter = draggableRowFormatter,
+    isRowDraggable = () => true,
     rowProps,
     visibleColumns: originalVisibleColumns,
     columnWidths: originalColumnWidths,
@@ -73,12 +73,6 @@ export default function SortableList(props) {
   );
 }
 
-SortableList.defaultProps = {
-  droppableId: uniqueId('droppable'),
-  rowFormatter: draggableRowFormatter,
-  isRowDraggable: () => true,
-};
-
 SortableList.propTypes = {
   droppableId: PropTypes.string,
   onDragEnd: PropTypes.func,

diff --git a/src/components/TitleInformation/TitleInformation.js b/src/components/TitleInformation/TitleInformation.js
@@ -33,15 +33,15 @@ export const getIdentifiers = (data, separator, limit) => data.slice(0, limit).m
 
 const TitleInformation = (props) => {
   const {
-    titleLevelRequestsLink,
+    titleLevelRequestsLink = true,
     holdingsRecordId,
     instanceId,
     titleLevelRequestsCount,
     title,
-    contributors,
-    publications,
-    editions,
-    identifiers,
+    contributors = [],
+    publications = [],
+    editions = [],
+    identifiers = [],
     intl:{
       formatMessage,
     },
@@ -95,14 +95,6 @@ const TitleInformation = (props) => {
   );
 };
 
-TitleInformation.defaultProps = {
-  contributors: [],
-  publications: [],
-  editions: [],
-  identifiers: [],
-  titleLevelRequestsLink: true,
-};
-
 TitleInformation.propTypes = {
   titleLevelRequestsLink: PropTypes.bool,
   titleLevelRequestsCount: PropTypes.number.isRequired,

diff --git a/src/constants.js b/src/constants.js
@@ -187,6 +187,7 @@ export const reportHeaders = [
   'holdShelfExpirationDate',
   'position',
   'item.barcode',
+  'item.retrievalServicePointName',
   'instance.title',
   'instance.contributorNames',
   'item.location.libraryName',
@@ -219,6 +220,7 @@ export const reportHeaders = [
 export const expiredHoldsReportHeaders = [
   'requester.name',
   'requester.barcode',
+  'item.retrievalServicePointName',
   'instance.title',
   'item.barcode',
   'item.callNumberComponents.prefix',

diff --git a/src/routes/RequestsRoute.js b/src/routes/RequestsRoute.js
@@ -1002,6 +1002,9 @@ class RequestsRoute extends React.Component {
         const { addressLine1, city, region, postalCode, countryId } = record.deliveryAddress;
         record.deliveryAddress = `${addressLine1 || ''} ${city || ''} ${region || ''} ${countryId || ''} ${postalCode || ''}`;
       }
+      if (record.item.retrievalServicePointName) {
+        record.retrievalServicePointName = record.item.retrievalServicePointName;
+      }
       record.instance.contributorNames = contributorNamesMap.join('; ');
       if (record.tags) record.tags.tagList = tagListMap.join('; ');
     });

diff --git a/src/routes/RequestsRoute.test.js b/src/routes/RequestsRoute.test.js
@@ -234,6 +234,8 @@ const mockedRequest = {
   instanceId: 'instanceId',
   item: {
     barcode: 'itemBarcode',
+    retrievalServicePointId: '3a40852d-49fd-4df2-a1f9-6e2641a6e91f',
+    retrievalServicePointName: 'Circ Desk 1',
   },
   requester: {
     barcode: 'requesterBarcode',
@@ -357,6 +359,10 @@ describe('RequestsRoute', () => {
           }
         ],
       },
+      item: {
+        retrievalServicePointId: '3a40852d-49fd-4df2-a1f9-6e2641a6e91f',
+        retrievalServicePointName: 'Circ Desk 1',
+      },
       tags: {
         tagList: ['tag1', 'tag2'],
       },
@@ -628,7 +634,7 @@ describe('RequestsRoute', () => {
       expect(printContent).toBeInTheDocument();
     });
 
-    it('should trigger "exportCsv"', async () => {
+    it("should trigger 'exportCsv'", async () => {
       await userEvent.click(screen.getByRole('button', { name: 'ui-requests.exportSearchResultsToCsv' }));
 
       await waitFor(() => {

diff --git a/translations/ui-requests/ar.json b/translations/ui-requests/ar.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/ber.json b/translations/ui-requests/ber.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/ca.json b/translations/ui-requests/ca.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/cs_CZ.json b/translations/ui-requests/cs_CZ.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Kopie",
     "permission.moveRequest.execute": "Požadavky: Přejít na novou jednotku, změnit pořadí fronty",
     "permission.reorderQueue.execute": "Žádanky: Změna pořadí ve frontě",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/da.json b/translations/ui-requests/da.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/de.json b/translations/ui-requests/de.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Exemplare",
     "permission.moveRequest.execute": "Bestandsanfragen: Verschieben zu neuem Exemplar, Warteliste neu anordnen",
     "permission.reorderQueue.execute": "Bestandsanfragen: Warteliste neu anordnen",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/en.json b/translations/ui-requests/en.json
@@ -198,7 +198,7 @@
   "deliveryAddress": "Delivery address",
   "requester.pickupLocation": "Pickup location",
   "pickupServicePoint.name": "Pickup service point",
-  "retrievalServicePoint.name": "Retrieval service point",
+  "item.retrievalServicePointName": "Retrieval service point",
   "requester.patronGroup.group": "Requester patron group",
   "tags.tagList": "Tags",
   "printDetails.printCount": "# Copies",

diff --git a/translations/ui-requests/en_GB.json b/translations/ui-requests/en_GB.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/en_SE.json b/translations/ui-requests/en_SE.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/en_US.json b/translations/ui-requests/en_US.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/es.json b/translations/ui-requests/es.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/es_419.json b/translations/ui-requests/es_419.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/es_ES.json b/translations/ui-requests/es_ES.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/fr.json b/translations/ui-requests/fr.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/fr_FR.json b/translations/ui-requests/fr_FR.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/he.json b/translations/ui-requests/he.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/hi_IN.json b/translations/ui-requests/hi_IN.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }
diff --git a/translations/ui-requests/hu.json b/translations/ui-requests/hu.json
@@ -300,5 +300,6 @@
     "printDetails.printCount": "# Copies",
     "permission.moveRequest.execute": "Requests: Move to new item, reorder queue",
     "permission.reorderQueue.execute": "Requests: Reorder queue",
-    "requests.retrievalServicePoint": "Retrieval service point"
+    "requests.retrievalServicePoint": "Retrieval service point",
+    "retrievalServicePoint.name": "Retrieval service point"
 }