From e70e3618543dccf3049a8531b51d1c3cc1357bb8 Mon Sep 17 00:00:00 2001
From: Jack Golding <jack.golding@k-int.com>
Date: Tue, 7 Jan 2025 15:04:40 +0000
Subject: [PATCH 1/4] fix: Combination pieces do not get allocated a date

* fix: Initial combination piece sorting work

Added initial work for sorted combination piece's recurrence pieces (bit confusing)

* refactor: New generate fetch handling

Updated some functions to handle new generate predicted pieces fetch (Object) whilst still supporting older version (Array), also updated some variable names for easier parsing

* revert: Array/Object endpoint handling

Reverted work for generated piece set handling or new/deprectaed endpoint responses, this is in a new ticket so should be part of a new PR

* fix: Piece list sort

Fixed the piece list so that now the pieces are correctly sorted regardless of class, additionally all combination pieces recurrence pieces are correctly sorted

* fix: Sorted pieces

Moved piece sorting to pieceset view, may need to be used outside of this component in the future, also resolved issue with the internalPieceClasses constants

* refactor: Implement internal piece classes constants

Added internal piece class constants to areas where omissionOrigins or combinationOrigins were used previously

* fix: First/last piece information

First/last piece information within the genrate receiving modal should now correctly handle combination pieces

* fix: Predicted pieces information labelling

Fixed an issue in which predicted pieces first/last date were not displaying correctly

* refactor: Piece publication date

As we've implemented the internal piece classes, seemed like a good time to refactor the piece publication date to use them aswell

* test: Fixed tests

Due to updated backend logic, alot of the tests needed to be updated
---
 .../GenerateReceivingModal.js                 | 59 ++++++++++++++-----
 .../PiecePublicationDate.js                   | 54 ++++++++++-------
 .../PiecePublicationDate.test.js              | 51 ++++++++--------
 .../PieceSetSections/PiecesList/PiecesList.js |  7 ++-
 .../PiecesList/PiecesList.test.js             |  8 +--
 .../PiecesPreviewModal/PiecesPreviewModal.js  |  6 +-
 .../views/PieceSetView/PieceSetView.js        | 35 ++++++++++-
 src/constants/internalPieceClasses.js         |  3 +
 test/resources/pieceSet.js                    | 12 ++++
 9 files changed, 161 insertions(+), 74 deletions(-)
 create mode 100644 src/constants/internalPieceClasses.js

diff --git a/src/components/GenerateReceivingModal/GenerateReceivingModal.js b/src/components/GenerateReceivingModal/GenerateReceivingModal.js
index d605d5fe..71c6d69e 100644
--- a/src/components/GenerateReceivingModal/GenerateReceivingModal.js
+++ b/src/components/GenerateReceivingModal/GenerateReceivingModal.js
@@ -29,6 +29,11 @@ import {
   PIECE_SET_ENDPOINT,
   RECEIVING_PIECES_ENDPOINT,
 } from '../../constants/endpoints';
+import {
+  INTERNAL_COMBINATION_PIECE,
+  INTERNAL_OMISSION_PIECE,
+  INTERNAL_RECURRENCE_PIECE,
+} from '../../constants/internalPieceClasses';
 
 import css from './GenerateReceivingModal.css';
 
@@ -64,7 +69,12 @@ const GenerateReceivingModal = ({
       'submitReceivingPiece',
     ],
     (data) => {
-      return ky.post(`${RECEIVING_PIECES_ENDPOINT}${data?.createItem ? '?createItem=true' : ''}`, { json: data?.receiving }).json();
+      return ky
+        .post(
+          `${RECEIVING_PIECES_ENDPOINT}${data?.createItem ? '?createItem=true' : ''}`,
+          { json: data?.receiving }
+        )
+        .json();
     }
   );
 
@@ -145,19 +155,20 @@ const GenerateReceivingModal = ({
   };
 
   const formatReceivingPiece = (piece, values) => {
-    if (!piece?.omissionOrigins) {
-      const pieceInfo = piece?.combinationOrigins
-        ? {
-          date: addDays(piece?.recurrencePieces[0]?.date, values?.interval),
-          label: piece?.recurrencePieces[0]?.label,
-        }
-        : {
-          date: addDays(piece?.date, values?.interval),
-          label: piece?.label,
-        };
+    if (piece?.class !== INTERNAL_OMISSION_PIECE) {
+      const pieceInfo =
+        piece?.class === INTERNAL_COMBINATION_PIECE
+          ? {
+            date: addDays(piece?.recurrencePieces[0]?.date, values?.interval),
+            label: piece?.recurrencePieces[0]?.label,
+          }
+          : {
+            date: addDays(piece?.date, values?.interval),
+            label: piece?.label,
+          };
 
       return {
-        ...values?.createItem && { createItem: values.createItem },
+        ...(values?.createItem && { createItem: values.createItem }),
         receiving: {
           poLineId: serial?.orderLine?.remoteId,
           titleId: serial?.orderLine?.titleId,
@@ -222,6 +233,20 @@ const GenerateReceivingModal = ({
   };
 
   const renderPredictedPiecesInformation = () => {
+    // Format piece information based on class
+    const renderPieceDateLabel = (piece) => {
+      switch (piece?.class) {
+        case INTERNAL_RECURRENCE_PIECE:
+          return `${piece?.date}, ${piece?.label}`;
+        case INTERNAL_OMISSION_PIECE:
+          return `${piece?.date}`;
+        case INTERNAL_COMBINATION_PIECE:
+          return `${piece?.recurrencePieces[0]?.date}, ${piece?.label}`;
+        default:
+          return null;
+      }
+    };
+
     return (
       <>
         {!serial?.orderLine?.remoteId_object?.locations?.length && (
@@ -278,7 +303,7 @@ const GenerateReceivingModal = ({
                   <FormattedMessage id="ui-serials-management.pieceSets.firstPiece" />
                 }
               >
-                {pieceSet?.pieces[0]?.date}, {pieceSet?.pieces[0]?.label}
+                {renderPieceDateLabel(pieceSet?.pieces[0])}
               </KeyValue>
             </Col>
             <Col xs={3}>
@@ -287,8 +312,9 @@ const GenerateReceivingModal = ({
                   <FormattedMessage id="ui-serials-management.pieceSets.lastPiece" />
                 }
               >
-                {pieceSet?.pieces[pieceSet?.pieces?.length - 1]?.date},{' '}
-                {pieceSet?.pieces[pieceSet?.pieces?.length - 1]?.label}
+                {renderPieceDateLabel(
+                  pieceSet?.pieces?.[pieceSet?.pieces?.length - 1]
+                )}
               </KeyValue>
             </Col>
           </Row>
@@ -354,7 +380,8 @@ const GenerateReceivingModal = ({
               )}
             </FormattedMessage>
           </Col>
-          {serial?.orderLine?.remoteId_object?.physical?.createInventory === 'Instance, Holding, Item' && (
+          {serial?.orderLine?.remoteId_object?.physical?.createInventory ===
+            'Instance, Holding, Item' && (
             <Col xs={3}>
               <Label>
                 <FormattedMessage id="ui-serials-management.pieceSets.createItem" />
diff --git a/src/components/PiecePublicationDate/PiecePublicationDate.js b/src/components/PiecePublicationDate/PiecePublicationDate.js
index 0165b485..9d40886e 100644
--- a/src/components/PiecePublicationDate/PiecePublicationDate.js
+++ b/src/components/PiecePublicationDate/PiecePublicationDate.js
@@ -2,34 +2,44 @@ import PropTypes from 'prop-types';
 import { FormattedMessage, FormattedDate } from 'react-intl';
 
 import { InfoBox } from '@folio/stripes-erm-components';
+import {
+  INTERNAL_COMBINATION_PIECE,
+  INTERNAL_OMISSION_PIECE,
+  INTERNAL_RECURRENCE_PIECE,
+} from '../../constants/internalPieceClasses';
 
 const propTypes = {
   piece: PropTypes.object,
 };
 
 const PiecePublicationDate = ({ piece }) => {
-  if (piece?.recurrencePieces) {
-    return (
-      <>
-        <FormattedDate value={piece?.recurrencePieces[0].date} />
-        <br />
-        <FormattedMessage
-          id="ui-serials-management.pieceSets.combinedPieces"
-          values={{ length: piece?.recurrencePieces.length }}
-        />
-      </>
-    );
-  } else {
-    return (
-      <>
-        <FormattedDate value={piece?.date} />
-        {piece?.omissionOrigins && (
-          <InfoBox type="success">
-            <FormattedMessage id="ui-serials-management.pieceSets.omitted" />
-          </InfoBox>
-        )}
-      </>
-    );
+  switch (piece?.class) {
+    case INTERNAL_RECURRENCE_PIECE:
+      return <FormattedDate value={piece?.date} />;
+    case INTERNAL_OMISSION_PIECE:
+      return (
+        <>
+          <FormattedDate value={piece?.date} />
+          {piece?.class === INTERNAL_OMISSION_PIECE && (
+            <InfoBox type="success">
+              <FormattedMessage id="ui-serials-management.pieceSets.omitted" />
+            </InfoBox>
+          )}
+        </>
+      );
+    case INTERNAL_COMBINATION_PIECE:
+      return (
+        <>
+          <FormattedDate value={piece?.recurrencePieces[0].date} />
+          <br />
+          <FormattedMessage
+            id="ui-serials-management.pieceSets.combinedPieces"
+            values={{ length: piece?.recurrencePieces.length }}
+          />
+        </>
+      );
+    default:
+      return null;
   }
 };
 
diff --git a/src/components/PiecePublicationDate/PiecePublicationDate.test.js b/src/components/PiecePublicationDate/PiecePublicationDate.test.js
index 53e5a721..1400e78d 100644
--- a/src/components/PiecePublicationDate/PiecePublicationDate.test.js
+++ b/src/components/PiecePublicationDate/PiecePublicationDate.test.js
@@ -2,33 +2,26 @@ import { renderWithIntl } from '@folio/stripes-erm-testing';
 import PiecePublicationDate from './PiecePublicationDate';
 import { translationsProperties } from '../../../test/helpers';
 
-function getCurrentFormattedDate() {
-  const date = new Date();
-  const formattedDate = `${date.getMonth() + 1}/${date.getDate()}/${date.getFullYear()}`;
-  return formattedDate;
-}
-
-const expectedDate = getCurrentFormattedDate();
-
 const recurrencePiece = {
-  piece: {
-    id: '582683dd-e971-44e6-bb4e-45b07fb06291',
-    date: '2024-04-01',
-    owner: {
-      id: '10e19919-dd8e-4a18-8846-14824100d853',
-    },
-    templateString: 'Volume: {{enumeration1.level1}} {{enumeration1.level2}}',
-    recurrenceRule: {
-      id: '7255a1d0-e7c3-4f9b-bd65-f3b28476ee88',
-    },
-    receivingPieces: '[]',
-    label: 'Volume: 25 1',
-    rowIndex: 0,
+  id: '582683dd-e971-44e6-bb4e-45b07fb06291',
+  date: '2024-04-01',
+  owner: {
+    id: '10e19919-dd8e-4a18-8846-14824100d853',
   },
+  class: 'org.olf.internalPiece.InternalRecurrencePiece',
+  templateString: 'Volume: {{enumeration1.level1}} {{enumeration1.level2}}',
+  recurrenceRule: {
+    id: '7255a1d0-e7c3-4f9b-bd65-f3b28476ee88',
+  },
+  receivingPieces: '[]',
+  label: 'Volume: 25 1',
+  rowIndex: 0,
 };
 
 const omissionPiece = {
   id: 'e549636a-af5f-4249-88dc-f2d33e759d8c',
+  class: 'org.olf.internalPiece.InternalOmissionPiece',
+  date: '2024-04-01',
   omissionOrigins: '[]',
   owner: {
     id: '5e63a7aa-953d-4f31-9eee-5b2782ca7b5c',
@@ -37,20 +30,23 @@ const omissionPiece = {
   label: 'test',
   rowIndex: 0,
 };
-// FIXME This needs to be fixed, dates arenot currently working
+
 describe('PiecePublicationDate', () => {
   describe('PiecePublicationDate with recurrence pieces ', () => {
     let renderComponent;
     beforeEach(() => {
       renderComponent = renderWithIntl(
-        <PiecePublicationDate id="piece-set-section-info" piece={recurrencePiece} />,
+        <PiecePublicationDate
+          id="piece-set-section-info"
+          piece={recurrencePiece}
+        />,
         translationsProperties
       );
     });
 
     test('renders the expected date value', async () => {
       const { getByText } = renderComponent;
-      expect(getByText(expectedDate)).toBeInTheDocument();
+      expect(getByText('4/1/2024')).toBeInTheDocument();
     });
   });
 
@@ -58,14 +54,17 @@ describe('PiecePublicationDate', () => {
     let renderComponent;
     beforeEach(() => {
       renderComponent = renderWithIntl(
-        <PiecePublicationDate id="piece-set-section-info" piece={omissionPiece} />,
+        <PiecePublicationDate
+          id="piece-set-section-info"
+          piece={omissionPiece}
+        />,
         translationsProperties
       );
     });
 
     test('renders the expected date value', async () => {
       const { getByText } = renderComponent;
-      expect(getByText(expectedDate)).toBeInTheDocument();
+      expect(getByText('4/1/2024')).toBeInTheDocument();
     });
 
     test('renders the Omitted', async () => {
diff --git a/src/components/PieceSetSections/PiecesList/PiecesList.js b/src/components/PieceSetSections/PiecesList/PiecesList.js
index 54e6f5b4..8df6f342 100644
--- a/src/components/PieceSetSections/PiecesList/PiecesList.js
+++ b/src/components/PieceSetSections/PiecesList/PiecesList.js
@@ -2,6 +2,9 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 
 import { Row, Col, MultiColumnList } from '@folio/stripes/components';
+
+import { INTERNAL_OMISSION_PIECE } from '../../../constants/internalPieceClasses';
+
 import PiecePublicationDate from '../../PiecePublicationDate';
 
 const propTypes = {
@@ -16,7 +19,7 @@ const PiecesList = ({ pieceSet, id }) => {
   /* istanbul ignore next */
   const formatter = {
     issueCount: (e) => {
-      return e?.omissionOrigins ? '-' : e.rowIndex + 1;
+      return e?.class === INTERNAL_OMISSION_PIECE ? '-' : e.rowIndex + 1;
     },
     publicationDate: (e) => renderPublicationDate(e),
     displaySummary: (e) => {
@@ -47,7 +50,7 @@ const PiecesList = ({ pieceSet, id }) => {
             columnWidths={{
               publicationDate: { min: 100, max: 165 },
             }}
-            contentData={pieceSet?.pieces.sort((a, b) => (a?.date < b?.date ? -1 : 1))}
+            contentData={pieceSet?.pieces}
             formatter={formatter}
             interactive={false}
             visibleColumns={[
diff --git a/src/components/PieceSetSections/PiecesList/PiecesList.test.js b/src/components/PieceSetSections/PiecesList/PiecesList.test.js
index 16f26b39..b54e059c 100644
--- a/src/components/PieceSetSections/PiecesList/PiecesList.test.js
+++ b/src/components/PieceSetSections/PiecesList/PiecesList.test.js
@@ -38,19 +38,19 @@ describe('PiecesList', () => {
         content: '1',
       }),
       await MultiColumnListCell({ row: 0, columnIndex: 1 }).has({
-        content: '2/1/2024',
+        content: '10/1/2024',
       }),
       await MultiColumnListCell({ row: 0, columnIndex: 2 }).has({
-        content: '1 1',
+        content: '5 9',
       }),
       await MultiColumnListCell({ row: 1, columnIndex: 0 }).has({
         content: '2',
       }),
       await MultiColumnListCell({ row: 1, columnIndex: 1 }).has({
-        content: '3/1/2024',
+        content: '7/1/2024',
       }),
       await MultiColumnListCell({ row: 1, columnIndex: 2 }).has({
-        content: '1 2',
+        content: '3 6',
       }),
     ]);
   });
diff --git a/src/components/PiecesPreviewModal/PiecesPreviewModal.js b/src/components/PiecesPreviewModal/PiecesPreviewModal.js
index bdafc4d6..f919ba57 100644
--- a/src/components/PiecesPreviewModal/PiecesPreviewModal.js
+++ b/src/components/PiecesPreviewModal/PiecesPreviewModal.js
@@ -33,6 +33,8 @@ import {
   CREATE_PREDICTED_PIECES,
   GENERATE_PIECES_PREVIEW,
 } from '../../constants/endpoints';
+import { INTERNAL_OMISSION_PIECE } from '../../constants/internalPieceClasses';
+
 import PiecePublicationDate from '../PiecePublicationDate';
 
 const propTypes = {
@@ -128,9 +130,9 @@ const PiecesPreviewModal = ({
 
   /* istanbul ignore next */
   const formatter = {
-    // If omissionOrigins exist then piece is omitted
+    // If pieces class is internal omission piece then piece is omitted
     issueCount: (e) => {
-      return e?.omissionOrigins ? '-' : e.rowIndex + 1;
+      return e?.class === INTERNAL_OMISSION_PIECE ? '-' : e.rowIndex + 1;
     },
     publicationDate: (e) => renderPublicationDate(e),
     displaySummary: (e) => {
diff --git a/src/components/views/PieceSetView/PieceSetView.js b/src/components/views/PieceSetView/PieceSetView.js
index e60fccc6..b0fb9222 100644
--- a/src/components/views/PieceSetView/PieceSetView.js
+++ b/src/components/views/PieceSetView/PieceSetView.js
@@ -5,6 +5,8 @@ import { useOkapiKy } from '@folio/stripes/core';
 import { FormattedMessage } from 'react-intl';
 import { Pane, LoadingPane, Button, Icon } from '@folio/stripes/components';
 import { DEFAULT_VIEW_PANE_WIDTH } from '../../../constants/config';
+import { INTERNAL_COMBINATION_PIECE } from '../../../constants/internalPieceClasses';
+
 import { PieceSetInfo, PiecesList } from '../../PieceSetSections';
 
 import GenerateReceivingModal from '../../GenerateReceivingModal/GenerateReceivingModal';
@@ -44,10 +46,39 @@ const PieceSetView = ({
     }
   };
 
+  const sortedPieces = pieceSet?.pieces
+    // Itereate through the pieces and find combination pieces
+    ?.map((p) => {
+      return p?.class === INTERNAL_COMBINATION_PIECE
+        ? {
+          ...p,
+          // Sort combination piece's recurrence pieces by date
+          recurrencePieces: p?.recurrencePieces?.sort((a, b) => (a?.date < b?.date ? -1 : 1)),
+        }
+        : p;
+    })
+    .sort((a, b) => {
+      // Sort all pieces by date or by the recurrence pieces of a combination piece
+      return (a?.class === INTERNAL_COMBINATION_PIECE
+        ? a?.recurrencePieces[0]?.date
+        : a?.date) <
+        (b?.class === INTERNAL_COMBINATION_PIECE
+          ? b?.recurrencePieces[0]?.date
+          : b?.date)
+        ? -1
+        : 1;
+    });
+
   const getSectionProps = (name) => {
     return {
       id: `piece-set-section-${name}`,
-      pieceSet: { ...pieceSet, titleId: serial?.orderLine?.titleId },
+      pieceSet: {
+        ...pieceSet,
+        // This is a bit annoying with regard to the sorting that needs to be done
+        // Grails doesnt like attempting to sort uniderectional one to many relationships
+        pieces: sortedPieces,
+        titleId: serial?.orderLine?.titleId,
+      },
     };
   };
 
@@ -92,8 +123,8 @@ const PieceSetView = ({
         <PiecesList key="pieces-list" {...getSectionProps('pieces-list')} />
       </Pane>
       <GenerateReceivingModal
+        {...getSectionProps('generate-receiving-modal')}
         holdingIds={getHoldingIds()}
-        pieceSet={pieceSet}
         serial={serial}
         setShowModal={setShowReceivingModal}
         showModal={showReceivingModal}
diff --git a/src/constants/internalPieceClasses.js b/src/constants/internalPieceClasses.js
new file mode 100644
index 00000000..411fa2cf
--- /dev/null
+++ b/src/constants/internalPieceClasses.js
@@ -0,0 +1,3 @@
+export const INTERNAL_RECURRENCE_PIECE = 'org.olf.internalPiece.InternalRecurrencePiece';
+export const INTERNAL_OMISSION_PIECE = 'org.olf.internalPiece.InternalOmissionPiece';
+export const INTERNAL_COMBINATION_PIECE = 'org.olf.internalPiece.InternalCombinationPiece';
diff --git a/test/resources/pieceSet.js b/test/resources/pieceSet.js
index 02fba0c2..b6a0807a 100644
--- a/test/resources/pieceSet.js
+++ b/test/resources/pieceSet.js
@@ -102,6 +102,7 @@ const pieceSet = {
   pieces: [
     {
       id: '6882640f-7110-4dc5-9617-29ad06736adf',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2024-10-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '5 9',
@@ -121,6 +122,7 @@ const pieceSet = {
     },
     {
       id: '40b2ddbb-76d5-48bd-a97a-5e6a198ae5ce',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2024-07-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '3 6',
@@ -140,6 +142,7 @@ const pieceSet = {
     },
     {
       id: '42b0f812-f00d-4311-aaed-0dc93f11ded8',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2025-01-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '6 12',
@@ -159,6 +162,7 @@ const pieceSet = {
     },
     {
       id: '7afc653e-63c3-4481-a0fd-b6bf0aa3b7cb',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2024-04-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '2 3',
@@ -178,6 +182,7 @@ const pieceSet = {
     },
     {
       id: '8e6ac19f-39cd-401a-86a5-b721ca9ecf62',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2024-09-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '4 8',
@@ -197,6 +202,7 @@ const pieceSet = {
     },
     {
       id: 'e445eccb-d7f1-49c1-b5e0-eceb8c3788c1',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2024-06-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '3 5',
@@ -216,6 +222,7 @@ const pieceSet = {
     },
     {
       id: 'dad2d359-ec4d-4823-8fc7-d79e3124ca79',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2024-03-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '1 2',
@@ -235,6 +242,7 @@ const pieceSet = {
     },
     {
       id: 'de5b189f-925f-4d98-9dd9-8a908b561c40',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2024-02-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '1 1',
@@ -254,6 +262,7 @@ const pieceSet = {
     },
     {
       id: '7e0d1860-9c10-4138-8a82-93882d90b0e9',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2024-12-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '6 11',
@@ -273,6 +282,7 @@ const pieceSet = {
     },
     {
       id: '7bd11cf1-0099-4cb0-bca0-ec87c7ce4b4a',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2024-08-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '4 7',
@@ -292,6 +302,7 @@ const pieceSet = {
     },
     {
       id: '4a7d8a23-84af-4d67-a4af-6d6c3323c810',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2024-11-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '5 10',
@@ -311,6 +322,7 @@ const pieceSet = {
     },
     {
       id: 'ebab9957-0780-48a3-a190-f1004317daf1',
+      class: 'org.olf.internalPiece.InternalRecurrencePiece',
       date: '2024-05-01',
       templateString: '{{enumeration1.level1}} {{enumeration1.level2}}',
       label: '2 4',

From 01c6ac3b4f7c3766b36af78f5fd0b800f31b3f1f Mon Sep 17 00:00:00 2001
From: Jack Golding <jack.golding@k-int.com>
Date: Tue, 7 Jan 2025 15:06:03 +0000
Subject: [PATCH 2/4] fix: Receiving pieces for combined pieces do not include
 correct display summary

Fixed minor issue in which the display sumary was being incorrectly set

UISER-172
---
 src/components/GenerateReceivingModal/GenerateReceivingModal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/GenerateReceivingModal/GenerateReceivingModal.js b/src/components/GenerateReceivingModal/GenerateReceivingModal.js
index 71c6d69e..95b4f856 100644
--- a/src/components/GenerateReceivingModal/GenerateReceivingModal.js
+++ b/src/components/GenerateReceivingModal/GenerateReceivingModal.js
@@ -160,7 +160,7 @@ const GenerateReceivingModal = ({
         piece?.class === INTERNAL_COMBINATION_PIECE
           ? {
             date: addDays(piece?.recurrencePieces[0]?.date, values?.interval),
-            label: piece?.recurrencePieces[0]?.label,
+            label: piece?.label,
           }
           : {
             date: addDays(piece?.date, values?.interval),

From e8a367983413398d63f8ca1e431d2b3f8d6bb1c7 Mon Sep 17 00:00:00 2001
From: Jack Golding <jack.golding@k-int.com>
Date: Tue, 7 Jan 2025 15:13:57 +0000
Subject: [PATCH 3/4] chore: Release 1.0.6

Added section to CHANGELOG.md and bumped version to 1.0.6

UISER-173
---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dcd8872..3147b06b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # change history for ui-serials-management
 
+## 1.0.6 2025-01-07
+  * UISER-172 Receiving pieces for combined pieces do not include correct display summary
+  * MODSER-54 Combination pieces do not get allocated a `date`
+
 ## 1.0.5 2024-08-23
   * UISER-129 Add "Create item" checkbox to "Generate in receiving" dialog
 
diff --git a/package.json b/package.json
index c55ebb8a..31a528b9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@folio/serials-management",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "FOLIO app for serials-management",
   "main": "src/index.js",
   "repository": "folio-org/ui-serials-management",

From b359b4f91a0c9d0c5d16fdb8e2bde07031772cfb Mon Sep 17 00:00:00 2001
From: Jack-Golding <94838251+Jack-Golding@users.noreply.github.com>
Date: Wed, 11 Sep 2024 11:01:21 +0100
Subject: [PATCH 4/4] fix: Upload artifact version bump (#301)

Bumped actions/upload-artifact to v4 due to failing tests when running against deprecated v2
---
 .github/workflows/build-npm-release.yml | 4 ++--
 .github/workflows/build-npm.yml         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-npm-release.yml b/.github/workflows/build-npm-release.yml
index 9613432d..7cd4d10f 100644
--- a/.github/workflows/build-npm-release.yml
+++ b/.github/workflows/build-npm-release.yml
@@ -154,7 +154,7 @@ jobs:
           comment_title: Jest Unit Test Statistics
 
       - name: Publish Jest coverage report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: jest-coverage-report
@@ -162,7 +162,7 @@ jobs:
           retention-days: 30
 
       - name: Publish yarn.lock
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: yarn.lock
diff --git a/.github/workflows/build-npm.yml b/.github/workflows/build-npm.yml
index 60bb1a0c..5bbdc284 100644
--- a/.github/workflows/build-npm.yml
+++ b/.github/workflows/build-npm.yml
@@ -97,7 +97,7 @@ jobs:
           comment_title: Jest Unit Test Statistics
 
       - name: Publish Jest coverage report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: jest-coverage-report
@@ -105,7 +105,7 @@ jobs:
           retention-days: 30
 
       - name: Publish yarn.lock
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: yarn.lock