From 4e38955248ee4c10134030e1cce74b5b1530646a Mon Sep 17 00:00:00 2001 From: KonstanceH <146969726+KonstanceH@users.noreply.github.com> Date: Thu, 15 Feb 2024 15:01:36 +0000 Subject: [PATCH 1/4] added frontend logic back --- .envrc | 2 +- .../ShipmentDetails/ShipmentDetailsMain.jsx | 11 ++++++++++ .../ShipmentDetailsMain.test.jsx | 22 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/.envrc b/.envrc index 5c974409b81..303c426c98e 100644 --- a/.envrc +++ b/.envrc @@ -122,7 +122,7 @@ export DB_SSL_MODE=disable # Experimental feature flags, these will be replaced by the config/env/*.env files for live deployments # Multi Move feature flag # This is utilized if flipt config does not receive a URL -export FEATURE_FLAG_MULTI_MOVE=true +export FEATURE_FLAG_MULTI_MOVE=false # Okta.mil configuration diff --git a/src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx b/src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx index 16a1a33236e..e45f01a24c4 100644 --- a/src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx +++ b/src/components/Office/ShipmentDetails/ShipmentDetailsMain.jsx @@ -56,6 +56,7 @@ const ShipmentDetailsMain = ({ requiredDeliveryDate, pickupAddress, destinationAddress, + ppmShipment, primeEstimatedWeight, primeActualWeight, counselorRemarks, @@ -124,6 +125,7 @@ const ShipmentDetailsMain = ({ let displayedPickupAddress; let displayedDeliveryAddress; + let actualMoveDate; switch (shipmentType) { case SHIPMENT_OPTIONS.HHG: @@ -138,6 +140,9 @@ const ShipmentDetailsMain = ({ displayedPickupAddress = storageFacility ? storageFacility.address : null; displayedDeliveryAddress = destinationAddress; break; + case SHIPMENT_OPTIONS.PPM: + actualMoveDate = ppmShipment.actualMoveDate; + break; default: displayedPickupAddress = pickupAddress; displayedDeliveryAddress = destinationAddress || destinationDutyLocationAddress; @@ -182,6 +187,12 @@ const ShipmentDetailsMain = ({ openConvertModalButton={openConvertModalButton} /> )} + {shipmentType === SHIPMENT_OPTIONS.PPM && ( + + )} { expect(screen.queryByText('SIT (STORAGE IN TRANSIT)')).not.toBeInTheDocument(); }); }); +it('does display PPM shipment', () => { + const ppmShipment = createPPMShipmentWithFinalIncentive({ + ppmShipment: { + expectedDepartureDate: '2024-01-01', + actualMoveDate: '2024-02-22', + estimatedWeight: 100, + shipment: { + estimatedIncentive: 2000, + }, + }, + }); + render( + + + , + ); + + expect(screen.queryByText('1/1/2024')).toBeInTheDocument(); + expect(screen.queryByText('2/22/2024')).toBeInTheDocument(); + expect(screen.queryByText('100 lbs')).toBeInTheDocument(); +}); From 5efd76fccd7ae17f01919b32ef38ba4b2483f1fe Mon Sep 17 00:00:00 2001 From: KonstanceH <146969726+KonstanceH@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:09:19 +0000 Subject: [PATCH 2/4] fixing client error --- .../Office/ShipmentDetails/ShipmentDetailsMain.test.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx b/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx index 8abf11c3259..0c61faf47e7 100644 --- a/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx +++ b/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx @@ -69,7 +69,6 @@ it('does display PPM shipment', () => { , ); - expect(screen.queryByText('1/1/2024')).toBeInTheDocument(); expect(screen.queryByText('2/22/2024')).toBeInTheDocument(); expect(screen.queryByText('100 lbs')).toBeInTheDocument(); }); From 4fbdcb4ea46b0e8000c659de8236fefc87b21e24 Mon Sep 17 00:00:00 2001 From: KonstanceH <146969726+KonstanceH@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:18:08 +0000 Subject: [PATCH 3/4] fixing client error 2 --- .../Office/ShipmentDetails/ShipmentDetailsMain.test.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx b/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx index 0c61faf47e7..94092baaa62 100644 --- a/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx +++ b/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx @@ -70,5 +70,4 @@ it('does display PPM shipment', () => { ); expect(screen.queryByText('2/22/2024')).toBeInTheDocument(); - expect(screen.queryByText('100 lbs')).toBeInTheDocument(); }); From d81e2263eaa317f7e5ffd3140e46691870f9e97f Mon Sep 17 00:00:00 2001 From: KonstanceH <146969726+KonstanceH@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:56:41 +0000 Subject: [PATCH 4/4] reverted envrc and added formateUTC to test --- .envrc | 2 +- .../Office/ShipmentDetails/ShipmentDetailsMain.test.jsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.envrc b/.envrc index 303c426c98e..5c974409b81 100644 --- a/.envrc +++ b/.envrc @@ -122,7 +122,7 @@ export DB_SSL_MODE=disable # Experimental feature flags, these will be replaced by the config/env/*.env files for live deployments # Multi Move feature flag # This is utilized if flipt config does not receive a URL -export FEATURE_FLAG_MULTI_MOVE=false +export FEATURE_FLAG_MULTI_MOVE=true # Okta.mil configuration diff --git a/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx b/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx index 94092baaa62..7ce173e4613 100644 --- a/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx +++ b/src/components/Office/ShipmentDetails/ShipmentDetailsMain.test.jsx @@ -7,6 +7,7 @@ import ShipmentDetailsMain from './ShipmentDetailsMain'; import { createPPMShipmentWithFinalIncentive } from 'utils/test/factories/ppmShipment'; import { MockProviders } from 'testUtils'; +import { formatDateWithUTC } from 'shared/dates'; const shipmentDetailsMainParams = { handleDivertShipment: () => {}, @@ -69,5 +70,5 @@ it('does display PPM shipment', () => { , ); - expect(screen.queryByText('2/22/2024')).toBeInTheDocument(); + expect(screen.queryByText(formatDateWithUTC('2-22-2024'))).toBeInTheDocument(); });