UIREC-306 Add CSV export options for new piece statuses (#472)

* UIREC-306 Add CSV export options for new piece statuses * UIREC-306 Add note fields to the export CSV * UIREC-302 Add receiving status column for pieces list
folio-org · Jan 3, 2024 · 2893c3b · 2893c3b
1 parent 7d1f01a
commit 2893c3b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * Add unreceivable accordion to receiving title view. Refs UIREC-302.
 * Add validation for the `claimingInterval` field. Refs UIREC-308.
 * View piece status change log. Refs UIREC-305.
+* Add CSV export options for new piece statuses. Refs UIREC-306.
 
 ## [4.0.0](https://github.com/folio-org/ui-receiving/tree/v4.0.0) (2023-10-12)
 [Full Changelog](https://github.com/folio-org/ui-receiving/compare/v3.0.0...v4.0.0)

diff --git a/src/ReceivingList/ExportSettingsModal/constants.js b/src/ReceivingList/ExportSettingsModal/constants.js
@@ -27,6 +27,9 @@ export const EXPORT_PIECE_FIELDS = {
   supplement: 'Supplement',
   displayOnHolding: 'Display on holding',
   itemHRID: 'Item HRID',
+  receivingStatus: 'Receiving status',
+  internalNote: 'Internal note',
+  externalNote: 'External note',
 };
 
 export const EXPORT_SETTINGS_FIELDS = {

diff --git a/src/ReceivingList/ExportSettingsModal/utils/createExportReport.js b/src/ReceivingList/ExportSettingsModal/utils/createExportReport.js
@@ -89,6 +89,9 @@ export const createExportReport = (
       supplement: Boolean(pieceData.supplement),
       displayOnHolding: pieceData.displayOnHolding,
       itemHRID: item?.hrid,
+      receivingStatus: pieceData.receivingStatus,
+      internalNote: pieceData.internalNote,
+      externalNote: pieceData.externalNote,
     };
   };
 

diff --git a/src/TitleDetails/PiecesList/PiecesList.js b/src/TitleDetails/PiecesList/PiecesList.js
@@ -1,6 +1,5 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
 import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
 import { noop } from 'lodash';
 
 import {
@@ -12,31 +11,23 @@ import {
   acqRowFormatter,
   FolioFormattedDate,
   PrevNextPagination,
-  PIECE_FORMAT_LABELS,
   useSorting,
 } from '@folio/stripes-acq-components';
 
 import {
+  PIECE_COLUMN_BASE_FORMATTER,
   PIECE_COLUMNS,
   PIECE_COLUMN_MAPPING,
   SORTABLE_COLUMNS,
 } from '../constants';
 
 const formatter = {
-  [PIECE_COLUMNS.copyNumber]: piece => piece.copyNumber || <NoValue />,
-  [PIECE_COLUMNS.caption]: piece => piece.caption || <NoValue />,
+  ...PIECE_COLUMN_BASE_FORMATTER,
   [PIECE_COLUMNS.enumeration]: piece => piece.enumeration || <NoValue />,
   [PIECE_COLUMNS.chronology]: piece => piece.chronology || <NoValue />,
-  [PIECE_COLUMNS.format]: piece => PIECE_FORMAT_LABELS[piece.format],
   [PIECE_COLUMNS.receiptDate]: piece => <FolioFormattedDate value={piece.receiptDate} />,
   [PIECE_COLUMNS.receivedDate]: piece => <FolioFormattedDate value={piece.receivedDate} utc={false} />,
   [PIECE_COLUMNS.comment]: piece => piece.comment || <NoValue />,
-  [PIECE_COLUMNS.barcode]: piece => piece.barcode || <NoValue />,
-  [PIECE_COLUMNS.request]: piece => (
-    piece.request
-      ? <FormattedMessage id="ui-receiving.piece.request.isOpened" />
-      : <NoValue />
-  ),
   selection: () => <Icon icon="caret-right" />,
   arrow: (record) => <Icon data-testid={`arrow-${record.rowIndex}`} icon="caret-right" />,
 };

diff --git a/src/TitleDetails/constants.js b/src/TitleDetails/constants.js
@@ -45,6 +45,7 @@ export const PIECE_COLUMNS = {
   request: 'request',
   barcode: 'barcode',
   location: 'location',
+  status: 'status',
 };
 
 const PIECE_VISIBLE_COLUMNS = [
@@ -59,7 +60,9 @@ const PIECE_VISIBLE_COLUMNS = [
 export const SORTABLE_COLUMNS = [PIECE_COLUMNS.enumeration, PIECE_COLUMNS.receiptDate, PIECE_COLUMNS.receivedDate];
 
 export const EXPECTED_PIECE_VISIBLE_COLUMNS = [
-  ...PIECE_VISIBLE_COLUMNS,
+  PIECE_COLUMNS.caption,
+  PIECE_COLUMNS.status,
+  ...PIECE_VISIBLE_COLUMNS.slice(1),
   PIECE_COLUMNS.receiptDate,
   PIECE_COLUMNS.request,
 ];
@@ -86,6 +89,7 @@ export const PIECE_COLUMN_MAPPING = {
   request: <FormattedMessage id="ui-receiving.piece.request" />,
   selection: null,
   arrow: null,
+  [PIECE_COLUMNS.status]: <FormattedMessage id="ui-receiving.piece.status" />,
 };
 
 export const PIECE_COLUMN_BASE_FORMATTER = {
@@ -95,6 +99,7 @@ export const PIECE_COLUMN_BASE_FORMATTER = {
   [PIECE_COLUMNS.caption]: record => record.caption || <NoValue />,
   [PIECE_COLUMNS.copyNumber]: record => record.copyNumber || <NoValue />,
   [PIECE_COLUMNS.barcode]: record => record.barcode || <NoValue />,
+  [PIECE_COLUMNS.status]: record => record.receivingStatus || <NoValue />,
 };
 
 export const EXPECTED_PIECE_COLUMN_MAPPING = pick(PIECE_COLUMN_MAPPING, EXPECTED_PIECE_VISIBLE_COLUMNS);

diff --git a/translations/ui-receiving/en.json b/translations/ui-receiving/en.json
@@ -209,6 +209,7 @@
   "piece.receivingNoteModal.title": "Receiving note",
   "piece.request": "Request",
   "piece.request.isOpened": "Yes",
+  "piece.status":"Status",
   "piece.statusChangeLog.column.date":"Date",
   "piece.statusChangeLog.column.status":"Status change",
   "piece.statusChangeLog.column.updatedBy":"Updated by",