From 1a129d15b7e432295b9b31c00514c90def4bae0b Mon Sep 17 00:00:00 2001 From: Alex Lusk Date: Fri, 10 Jan 2025 17:32:43 +0000 Subject: [PATCH 1/2] correct 'destination' to 'delivery' in move history and use consistent ordinals --- src/constants/MoveHistory/Database/FieldMappings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/constants/MoveHistory/Database/FieldMappings.js b/src/constants/MoveHistory/Database/FieldMappings.js index 5b9ece8b735..6ba6b0793d4 100644 --- a/src/constants/MoveHistory/Database/FieldMappings.js +++ b/src/constants/MoveHistory/Database/FieldMappings.js @@ -44,14 +44,14 @@ export default { shipment_type: 'Shipment type', pickup_address: 'Pickup Address', secondary_pickup_address: 'Second Pickup Address', - has_secondary_pickup_address: 'Secondary Pickup Address', + has_secondary_pickup_address: 'Second Pickup Address', tertiary_pickup_address: 'Third Pickup Address', has_tertiary_pickup_address: 'Third Pickup Address', destination_address: 'Delivery Address', secondary_destination_address: 'Second Delivery Address', - has_secondary_delivery_address: 'Secondary Delivery Address', + has_secondary_delivery_address: 'Second Delivery Address', tertiary_destination_address: 'Third Delivery Address', - has_tertiary_destination_address: 'Third Delivery Address', + has_tertiary_delivery_address: 'Third Delivery Address', receiving_agent: 'Receiving agent', releasing_agent: 'Releasing agent', tio_remarks: 'Max billable weight remark', From d4d2b4490e6ae0e57bbb536df46cd8869ab412f0 Mon Sep 17 00:00:00 2001 From: Alex Lusk Date: Fri, 10 Jan 2025 17:34:05 +0000 Subject: [PATCH 2/2] tests for has_blankary_blank_address values in move history --- .../UpdateMTOShipment/updateMTOShipment.test.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/constants/MoveHistory/EventTemplates/UpdateMTOShipment/updateMTOShipment.test.jsx b/src/constants/MoveHistory/EventTemplates/UpdateMTOShipment/updateMTOShipment.test.jsx index 2a09119bedf..189bb9802ac 100644 --- a/src/constants/MoveHistory/EventTemplates/UpdateMTOShipment/updateMTOShipment.test.jsx +++ b/src/constants/MoveHistory/EventTemplates/UpdateMTOShipment/updateMTOShipment.test.jsx @@ -37,7 +37,10 @@ describe('when given an mto shipment update with mto shipment table history reco status: 'SUBMITTED', tac_type: 'NTS', uses_external_vendor: true, - + has_secondary_pickup_address: true, + has_secondary_delivery_address: true, + has_tertiary_pickup_address: false, + has_tertiary_delivery_address: true, advance_amount_requested: 100, destination_postal_code: '29102', estimated_incentive: 2252814, @@ -103,6 +106,10 @@ describe('when given an mto shipment update with mto shipment table history reco [FieldMappings.sit_estimated_entry_date, formatCustomerDate(changedValues.sit_estimated_entry_date)], [FieldMappings.sit_estimated_weight, formatWeight(Number(changedValues.sit_estimated_weight))], [FieldMappings.spouse_pro_gear_weight, formatWeight(Number(changedValues.spouse_pro_gear_weight))], + [FieldMappings.has_secondary_pickup_address, changedValues.has_secondary_pickup_address ? 'Yes' : 'No'], + [FieldMappings.has_secondary_delivery_address, changedValues.has_secondary_delivery_address ? 'Yes' : 'No'], + [FieldMappings.has_tertiary_pickup_address, changedValues.has_tertiary_pickup_address ? 'Yes' : 'No'], + [FieldMappings.has_tertiary_delivery_address, changedValues.has_tertiary_delivery_address ? 'Yes' : 'No'], ])('displays the correct details value for %s', async (label, value) => { const targetItem = Object.fromEntries( Object.entries(changedValues).filter(([key]) => FieldMappings[key] === label),