+
+ );
+}
+
+export default ButtonDropdownMenu;
diff --git a/src/components/ButtonDropdownMenu/ButtonDropdownMenu.module.scss b/src/components/ButtonDropdownMenu/ButtonDropdownMenu.module.scss
new file mode 100644
index 00000000000..1246bb89339
--- /dev/null
+++ b/src/components/ButtonDropdownMenu/ButtonDropdownMenu.module.scss
@@ -0,0 +1,68 @@
+@import 'shared/styles/basics';
+@import 'shared/styles/mixins';
+@import 'shared/styles/colors';
+@import 'shared/styles/_variables';
+
+.dropdownWrapper {
+ display: flex;
+ min-height: 38px;
+ flex-wrap: wrap;
+
+ .btn {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ span {
+ @include u-margin-right(.5em)
+ }
+ }
+
+ .dropdownContainer {
+ position: relative;
+ }
+
+ .dropdownList {
+ position: absolute; /* Set absolute positioning for the dropdown list */
+ top: 100%; /* Position it below the button */
+ left: 0;
+ padding: 0;
+ margin: 0;
+ width: 100%;
+ z-index: 1; /* Ensure it appears above other elements */
+
+ li {
+ list-style-type: none;
+
+ &:first-of-type {
+ > button {
+ border-top: 1px solid #ccc;
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+ }
+ }
+
+ &:last-of-type > button {
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
+ }
+
+ button {
+ display: flex;
+ justify-content: space-between;
+ background-color: white;
+ font-size: 16px;
+ padding: 15px 20px 15px 20px;
+ border: 0;
+ border-bottom: 1px solid #ccc;
+ width: 100%;
+ border-left: 1px solid #ccc;
+ border-right: 1px solid #ccc;
+
+ &:hover, &:focus {
+ font-weight: bold;
+ background-color: #ccc;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/components/ButtonDropdownMenu/ButtonDropdownMenu.stories.jsx b/src/components/ButtonDropdownMenu/ButtonDropdownMenu.stories.jsx
new file mode 100644
index 00000000000..93f4a745496
--- /dev/null
+++ b/src/components/ButtonDropdownMenu/ButtonDropdownMenu.stories.jsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+import ButtonDropdownMenu from './ButtonDropdownMenu';
+
+export default {
+ title: 'Components/ButtonDropdownMenu',
+ component: ButtonDropdownMenu,
+};
+
+const dropdownMenuItems = [
+ {
+ id: 1,
+ value: 'PCS Orders',
+ },
+ {
+ id: 2,
+ value: 'PPM Packet',
+ },
+];
+
+export const defaultDropdown = () =>
+ {outline ? (
+
+ ) : (
+
+ )}
+ {open && (
+
+ -
+ {items.map((item) => (
+
- + + + ))} +
@@ -70,7 +66,6 @@ DodInfoForm.propTypes = {
initialValues: PropTypes.shape({
affiliation: PropTypes.string,
edipi: PropTypes.string,
- grade: PropTypes.string,
}).isRequired,
onSubmit: PropTypes.func.isRequired,
onBack: PropTypes.func.isRequired,
diff --git a/src/components/Customer/DodInfoForm/DodInfoForm.test.jsx b/src/components/Customer/DodInfoForm/DodInfoForm.test.jsx
index 1d660830da6..12ae6b39e47 100644
--- a/src/components/Customer/DodInfoForm/DodInfoForm.test.jsx
+++ b/src/components/Customer/DodInfoForm/DodInfoForm.test.jsx
@@ -7,7 +7,7 @@ import DodInfoForm from './DodInfoForm';
describe('DodInfoForm component', () => {
const testProps = {
onSubmit: jest.fn().mockImplementation(() => Promise.resolve()),
- initialValues: { affiliation: '', edipi: '', grade: '' },
+ initialValues: { affiliation: '', edipi: '' },
onBack: jest.fn(),
};
@@ -20,9 +20,6 @@ describe('DodInfoForm component', () => {
expect(getByLabelText('DOD ID number')).toBeInstanceOf(HTMLInputElement);
expect(getByLabelText('DOD ID number')).toBeRequired();
-
- expect(getByLabelText('Pay grade')).toBeInstanceOf(HTMLSelectElement);
- expect(getByLabelText('Pay grade')).toBeRequired();
});
});
@@ -41,14 +38,13 @@ describe('DodInfoForm component', () => {
it('shows an error message if trying to submit an invalid form', async () => {
const { getByRole, getAllByText, getByLabelText } = render(
{({ isValid, isSubmitting, handleSubmit, values }) => {
@@ -119,6 +124,14 @@ const EditOrdersForm = ({
/>
+
+ Where are you entitled to move?
@@ -153,6 +166,8 @@ const EditOrdersForm = ({ ) : (Uploads:
Where are you entitled to move?
@@ -113,6 +127,8 @@ const OrdersInfoForm = ({ ordersTypeOptions, initialValues, onSubmit, onBack }) ) : (
@@ -137,6 +153,8 @@ OrdersInfoForm.propTypes = {
report_by_date: PropTypes.string,
has_dependents: PropTypes.string,
new_duty_location: PropTypes.shape({}),
+ grade: PropTypes.string,
+ origin_duty_location: DutyLocationShape,
}).isRequired,
onSubmit: PropTypes.func.isRequired,
onBack: PropTypes.func.isRequired,
diff --git a/src/components/Customer/OrdersInfoForm/OrdersInfoForm.stories.jsx b/src/components/Customer/OrdersInfoForm/OrdersInfoForm.stories.jsx
index b17cf3ade4c..b8d27b1f6fe 100644
--- a/src/components/Customer/OrdersInfoForm/OrdersInfoForm.stories.jsx
+++ b/src/components/Customer/OrdersInfoForm/OrdersInfoForm.stories.jsx
@@ -25,6 +25,25 @@ const testInitialValues = {
name: 'Yuma AFB',
updated_at: '2020-10-19T17:01:16.114Z',
},
+ grade: 'E_1',
+ origin_duty_location: {
+ address: {
+ city: 'Des Moines',
+ country: 'US',
+ id: 'a4b30b99-4e82-48a6-b736-01662b499d6a',
+ postalCode: '50309',
+ state: 'IA',
+ streetAddress1: '987 Other Avenue',
+ streetAddress2: 'P.O. Box 1234',
+ streetAddress3: 'c/o Another Person',
+ },
+ address_id: 'a4b30b99-4e82-48a6-b736-01662b499d6a',
+ affiliation: 'AIR_FORCE',
+ created_at: '2020-10-19T17:01:16.114Z',
+ id: 'f9299768-16d2-4a13-ae39-7087a58b1f62',
+ name: 'Yuma AFB',
+ updated_at: '2020-10-19T17:01:16.114Z',
+ },
};
export default {
@@ -37,14 +56,21 @@ export default {
};
const testProps = {
- initialValues: { orders_type: '', issue_date: '', report_by_date: '', has_dependents: '', new_duty_location: {} },
+ initialValues: {
+ orders_type: '',
+ issue_date: '',
+ report_by_date: '',
+ has_dependents: '',
+ new_duty_location: {},
+ grade: '',
+ origin_duty_location: {},
+ },
ordersTypeOptions: [
{ key: 'PERMANENT_CHANGE_OF_STATION', value: 'Permanent Change Of Station (PCS)' },
{ key: 'LOCAL_MOVE', value: 'Local Move' },
{ key: 'RETIREMENT', value: 'Retirement' },
{ key: 'SEPARATION', value: 'Separation' },
],
- currentDutyLocation: {},
};
export const EmptyValues = (argTypes) => (
diff --git a/src/components/Customer/OrdersInfoForm/OrdersInfoForm.test.jsx b/src/components/Customer/OrdersInfoForm/OrdersInfoForm.test.jsx
index 4e260132629..49b7ab3ccfc 100644
--- a/src/components/Customer/OrdersInfoForm/OrdersInfoForm.test.jsx
+++ b/src/components/Customer/OrdersInfoForm/OrdersInfoForm.test.jsx
@@ -129,7 +129,15 @@ jest.mock('components/LocationSearchBox/api', () => ({
const testProps = {
onSubmit: jest.fn().mockImplementation(() => Promise.resolve()),
- initialValues: { orders_type: '', issue_date: '', report_by_date: '', has_dependents: '', new_duty_location: {} },
+ initialValues: {
+ orders_type: '',
+ issue_date: '',
+ report_by_date: '',
+ has_dependents: '',
+ new_duty_location: {},
+ grade: '',
+ origin_duty_location: {},
+ },
onBack: jest.fn(),
ordersTypeOptions: [
{ key: 'PERMANENT_CHANGE_OF_STATION', value: 'Permanent Change Of Station (PCS)' },
@@ -137,7 +145,6 @@ const testProps = {
{ key: 'RETIREMENT', value: 'Retirement' },
{ key: 'SEPARATION', value: 'Separation' },
],
- currentDutyLocation: {},
};
describe('OrdersInfoForm component', () => {
@@ -154,6 +161,8 @@ describe('OrdersInfoForm component', () => {
expect(getByLabelText('Yes')).toBeInstanceOf(HTMLInputElement);
expect(getByLabelText('No')).toBeInstanceOf(HTMLInputElement);
expect(getByLabelText('New duty location')).toBeInstanceOf(HTMLInputElement);
+ expect(getByLabelText('Pay grade')).toBeInstanceOf(HTMLSelectElement);
+ expect(getByLabelText('Current duty location')).toBeInstanceOf(HTMLInputElement);
});
});
@@ -177,21 +186,28 @@ describe('OrdersInfoForm component', () => {
});
it('allows new and current duty location to be the same', async () => {
- render(
Contact info
- Edit + + Edit +
diff --git a/src/components/Customer/Profile/OktaInfoDisplay/OktaInfoDisplay.jsx b/src/components/Customer/Profile/OktaInfoDisplay/OktaInfoDisplay.jsx
index 8c2a6d68d13..adf6ad6ae32 100644
--- a/src/components/Customer/Profile/OktaInfoDisplay/OktaInfoDisplay.jsx
+++ b/src/components/Customer/Profile/OktaInfoDisplay/OktaInfoDisplay.jsx
@@ -1,6 +1,6 @@
import React from 'react';
import { string, PropTypes } from 'prop-types';
-import { Link } from 'react-router-dom';
+import { Link, useLocation } from 'react-router-dom';
import oktaLogo from '../../../../shared/images/okta_logo.png';
@@ -9,11 +9,13 @@ import oktaInfoDisplayStyles from './OktaInfoDisplay.module.scss';
import descriptionListStyles from 'styles/descriptionList.module.scss';
const OktaInfoDisplay = ({ editURL, oktaUsername, oktaEmail, oktaFirstName, oktaLastName, oktaEdipi }) => {
+ const { state } = useLocation();
+
return (
-
+
Edit
diff --git a/src/components/Customer/Review/ServiceInfoDisplay/ServiceInfoDisplay.jsx b/src/components/Customer/Review/ServiceInfoDisplay/ServiceInfoDisplay.jsx
index 24576645bf9..2776b76e07e 100644
--- a/src/components/Customer/Review/ServiceInfoDisplay/ServiceInfoDisplay.jsx
+++ b/src/components/Customer/Review/ServiceInfoDisplay/ServiceInfoDisplay.jsx
@@ -1,6 +1,6 @@
import React from 'react';
import { string, bool } from 'prop-types';
-import { Link } from 'react-router-dom';
+import { Link, useLocation } from 'react-router-dom';
import serviceInfoDisplayStyles from './ServiceInfoDisplay.module.scss';
@@ -19,11 +19,17 @@ const ServiceInfoDisplay = ({
editURL,
payGrade,
}) => {
+ const { state } = useLocation();
+
return (
{!isEditable && showMessage && (
+ ,
+ );
+
+ const sitStartAndEndTable = await screen.findByTestId('sitStartAndEndTable');
+ expect(sitStartAndEndTable).toBeInTheDocument();
+ expect(within(sitStartAndEndTable).getByText('SIT authorized end date')).toBeInTheDocument();
+ expect(screen.getByText('13 Aug 2021')).toBeInTheDocument();
+ });
});
diff --git a/src/components/Office/ShipmentSITDisplay/ShipmentSITDisplayTestParams.js b/src/components/Office/ShipmentSITDisplay/ShipmentSITDisplayTestParams.js
index 01a5d14ba0a..600f93d48d0 100644
--- a/src/components/Office/ShipmentSITDisplay/ShipmentSITDisplayTestParams.js
+++ b/src/components/Office/ShipmentSITDisplay/ShipmentSITDisplayTestParams.js
@@ -73,6 +73,21 @@ export const SITStatusOrigin = {
},
};
+export const SITStatusOriginAuthorized = {
+ totalSITDaysUsed: 45,
+ totalDaysRemaining: 60,
+ calculatedTotalDaysInSIT: 45,
+ currentSIT: {
+ location: LOCATION_VALUES.ORIGIN,
+ daysInSIT: 15,
+ sitEntryDate: '2021-08-13',
+ sitAllowanceEndDate: '2021-08-28',
+ sitAuthorizedEndDate: '2021-08-13',
+ sitCustomerContacted: '2021-08-26',
+ sitRequestedDelivery: '2021-08-30',
+ },
+};
+
export const SITStatusShowConvert = {
totalSITDaysUsed: 45,
totalDaysRemaining: 30,
diff --git a/src/components/ShipmentList/ShipmentList.jsx b/src/components/ShipmentList/ShipmentList.jsx
index 64938e6503d..d77dad9799a 100644
--- a/src/components/ShipmentList/ShipmentList.jsx
+++ b/src/components/ShipmentList/ShipmentList.jsx
@@ -35,6 +35,15 @@ export const ShipmentListItem = ({
const isPPM = shipment.shipmentType === SHIPMENT_OPTIONS.PPM;
const estimated = 'Estimated';
const actual = 'Actual';
+ let requestedWeightPPM = 0;
+ if (shipment.shipmentType === SHIPMENT_OPTIONS.PPM) {
+ if (shipment.ppmShipment.weightTickets !== undefined) {
+ const wt = shipment.ppmShipment.weightTickets;
+ for (let i = 0; i < wt.length; i += 1) {
+ requestedWeightPPM += wt[i].fullWeight - wt[i].emptyWeight;
+ }
+ }
+ }
return (
diff --git a/src/components/ShipmentList/ShipmentList.stories.jsx b/src/components/ShipmentList/ShipmentList.stories.jsx
index 839df6cadac..f842db50ff1 100644
--- a/src/components/ShipmentList/ShipmentList.stories.jsx
+++ b/src/components/ShipmentList/ShipmentList.stories.jsx
@@ -46,7 +46,15 @@ BasicMultiple.args = {
shipments: [
{ id: '0001', shipmentType: SHIPMENT_OPTIONS.HHG },
{ id: '0002', shipmentType: SHIPMENT_OPTIONS.NTS },
- { id: '0003', shipmentType: SHIPMENT_OPTIONS.PPM },
+ {
+ id: '0003',
+ shipmentType: SHIPMENT_OPTIONS.PPM,
+ ppmShipment: {
+ id: 'completePPM',
+ hasRequestedAdvance: false,
+ weightTickets: [],
+ },
+ },
{ id: '0004', shipmentType: SHIPMENT_OPTIONS.NTSR },
],
};
@@ -95,6 +103,7 @@ WithPpms.args = {
ppmShipment: {
id: 'completePPM',
hasRequestedAdvance: false,
+ weightTickets: [],
},
},
{
diff --git a/src/components/ShipmentList/ShipmentList.test.jsx b/src/components/ShipmentList/ShipmentList.test.jsx
index e5d13271478..706abdeb363 100644
--- a/src/components/ShipmentList/ShipmentList.test.jsx
+++ b/src/components/ShipmentList/ShipmentList.test.jsx
@@ -229,4 +229,32 @@ describe('Shipment List with PPM', () => {
expect(screen.getByText('Estimated')).toBeInTheDocument();
expect(screen.getByText('Actual')).toBeInTheDocument();
});
+ it('should contain actual weight as full weight minus empty weight', () => {
+ const shipments = [
+ {
+ id: '0001',
+ shipmentType: SHIPMENT_OPTIONS.PPM,
+ ppmShipment: {
+ id: '1234',
+ hasRequestedAdvance: null,
+ primeEstimatedWeight: '1000',
+ weightTickets: [
+ {
+ id: '1',
+ fullWeight: '25000',
+ emptyWeight: '22500',
+ },
+ ],
+ },
+ },
+ ];
+ const defaultProps = {
+ shipments,
+ moveSubmitted: true,
+ showShipmentWeight: true,
+ };
+ render(
+ ,
+ );
+
+ // Check for specific elements
+ expect(screen.getByTestId('customerHeader')).toBeInTheDocument();
+ expect(screen.getByTestId('welcomeHeader')).toBeInTheDocument();
+ expect(screen.getByText('First Last')).toBeInTheDocument();
+ expect(screen.getByText('Welcome to MilMove!')).toBeInTheDocument();
+ expect(screen.getByText('Create a Move')).toBeInTheDocument();
+
+ // Assuming there are two move headers and corresponding move containers
+ expect(screen.getAllByText('Current Move')).toHaveLength(1);
+ expect(screen.getAllByText('Previous Moves')).toHaveLength(1);
+ });
+
+ it('renders move data correctly', () => {
+ render(
+
+ ,
+ );
+
+ expect(screen.getByTestId('currentMoveHeader')).toBeInTheDocument();
+ expect(screen.getByTestId('currentMoveContainer')).toBeInTheDocument();
+ expect(screen.getByTestId('prevMovesHeader')).toBeInTheDocument();
+ expect(screen.getByTestId('prevMovesContainer')).toBeInTheDocument();
+ });
+});
diff --git a/src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.jsx b/src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.jsx
new file mode 100644
index 00000000000..1ffe09bd2ec
--- /dev/null
+++ b/src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.jsx
@@ -0,0 +1,145 @@
+import React, { useState } from 'react';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import classnames from 'classnames';
+import { Button } from '@trussworks/react-uswds';
+import { useNavigate } from 'react-router';
+
+import MultiMovesMoveInfoList from '../MultiMovesMoveInfoList/MultiMovesMoveInfoList';
+import ButtonDropdownMenu from '../../../../components/ButtonDropdownMenu/ButtonDropdownMenu';
+
+import styles from './MultiMovesMoveContainer.module.scss';
+
+import ShipmentContainer from 'components/Office/ShipmentContainer/ShipmentContainer';
+import { customerRoutes } from 'constants/routes';
+
+const MultiMovesMoveContainer = ({ moves }) => {
+ const [expandedMoves, setExpandedMoves] = useState({});
+ const navigate = useNavigate();
+
+ // this expands the moves when the arrow is clicked
+ const handleExpandClick = (index) => {
+ setExpandedMoves((prev) => ({
+ ...prev,
+ [index]: !prev[index],
+ }));
+ };
+
+ // when an item is selected in the dropdown, this function will handle that logic
+ const handleDropdownItemClick = (selectedItem) => {
+ return selectedItem.value;
+ };
+
+ const dropdownMenuItems = [
+ {
+ id: 1,
+ value: 'PCS Orders',
+ },
+ {
+ id: 2,
+ value: 'PPM Packet',
+ },
+ ];
+
+ // handles the title of the shipment header below each move
+ const generateShipmentTypeTitle = (shipmentType) => {
+ if (shipmentType === 'HHG') {
+ return 'Household Goods';
+ }
+ if (shipmentType === 'PPM') {
+ return 'Personally Procured Move';
+ }
+ if (shipmentType === 'HHG_INTO_NTS_DOMESTIC') {
+ return 'Household Goods NTS';
+ }
+ if (shipmentType === 'HHG_OUTOF_NTS_DOMESTIC') {
+ return 'Household Goods NTSR';
+ }
+ if (shipmentType === 'MOTORHOME') {
+ return 'Motorhome';
+ }
+ if (shipmentType === 'BOAT_HAUL_AWAY') {
+ return 'Boat Haul Away';
+ }
+ if (shipmentType === 'BOAT_TOW_AWAY') {
+ return 'Boat Tow Away';
+ }
+ return 'Shipment';
+ };
+
+ // sends user to the move page when clicking "Go to Move" btn
+ const handleGoToMoveClick = () => {
+ navigate(customerRoutes.MOVE_HOME_PAGE);
+ };
+
+ const moveList = moves.map((m, index) => (
+
+
+ ));
+
+ return (
+
+ ,
+ );
+
+ expect(screen.getByTestId('move-info-container')).toBeInTheDocument();
+ expect(screen.getByText('#MOVECO')).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Go to Move' })).toBeInTheDocument();
+ });
+
+ it('renders previous move list correctly', () => {
+ render(
+
+ ,
+ );
+
+ expect(screen.queryByText('#SAMPLE')).toBeInTheDocument();
+ expect(screen.queryByText('#EXAMPL')).toBeInTheDocument();
+ expect(screen.getAllByRole('button', { name: 'Download' })).toHaveLength(2);
+ });
+
+ it('expands and collapses moves correctly', () => {
+ render(
+
+ ,
+ );
+
+ // Initially, the move details should not be visible
+ expect(screen.queryByText('Shipment')).not.toBeInTheDocument();
+
+ fireEvent.click(screen.getByTestId('expand-icon'));
+
+ // Now, the move details should be visible
+ expect(screen.getByText('Shipments')).toBeInTheDocument();
+
+ fireEvent.click(screen.getByTestId('expand-icon'));
+
+ // The move details should be hidden again
+ expect(screen.queryByText('Shipments')).not.toBeInTheDocument();
+ });
+});
diff --git a/src/pages/MyMove/Multi-Moves/MultiMovesMoveHeader/MultiMovesMoveHeader.jsx b/src/pages/MyMove/Multi-Moves/MultiMovesMoveHeader/MultiMovesMoveHeader.jsx
new file mode 100644
index 00000000000..153259b9393
--- /dev/null
+++ b/src/pages/MyMove/Multi-Moves/MultiMovesMoveHeader/MultiMovesMoveHeader.jsx
@@ -0,0 +1,16 @@
+import React from 'react';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { faTruck } from '@fortawesome/free-solid-svg-icons';
+
+import styles from './MultiMovesMoveHeader.module.scss';
+
+const MultiMovesMoveHeader = ({ title }) => {
+ return (
+
+ ,
+ );
const h1 = await screen.findByRole('heading', { name: 'Edit contact info', level: 1 });
expect(h1).toBeInTheDocument();
@@ -81,13 +86,17 @@ describe('EditContactInfo page', () => {
});
it('goes back to the profile page when the cancel button is clicked', async () => {
- render(
+ ,
+ );
const cancelButton = await screen.findByRole('button', { name: 'Cancel' });
await userEvent.click(cancelButton);
- expect(mockNavigate).toHaveBeenCalledWith(customerRoutes.PROFILE_PATH);
+ expect(mockNavigate).toHaveBeenCalledWith(customerRoutes.PROFILE_PATH, { state: null });
});
it('saves backup contact info when it is updated and the save button is clicked', async () => {
@@ -105,7 +114,11 @@ describe('EditContactInfo page', () => {
patchBackupContact.mockImplementation(() => Promise.resolve(patchResponse));
patchServiceMember.mockImplementation(() => Promise.resolve());
- render(
+ ,
+ );
const backupNameInput = await screen.findByLabelText('Name');
@@ -138,7 +151,11 @@ describe('EditContactInfo page', () => {
}),
);
- render(
+ ,
+ );
const backupNameInput = await screen.findByLabelText('Name');
@@ -165,7 +182,11 @@ describe('EditContactInfo page', () => {
it('does not save backup contact info if it is not updated and the save button is clicked', async () => {
patchServiceMember.mockImplementation(() => Promise.resolve());
- render(
+ ,
+ );
const saveButton = screen.getByRole('button', { name: 'Save' });
@@ -191,7 +212,11 @@ describe('EditContactInfo page', () => {
patchServiceMember.mockImplementation(() => Promise.resolve(patchResponse));
- render(
+ ,
+ );
const secondaryPhoneInput = await screen.findByLabelText(/Alt. phone/);
@@ -213,7 +238,11 @@ describe('EditContactInfo page', () => {
it('sets a flash message when the save button is clicked', async () => {
patchServiceMember.mockImplementation(() => Promise.resolve());
- render(
+ ,
+ );
const saveButton = screen.getByRole('button', { name: 'Save' });
@@ -231,14 +260,36 @@ describe('EditContactInfo page', () => {
it('routes to the profile page when the save button is clicked', async () => {
patchServiceMember.mockImplementation(() => Promise.resolve());
- render(
+ ,
+ );
const saveButton = screen.getByRole('button', { name: 'Save' });
await userEvent.click(saveButton);
await waitFor(() => {
- expect(mockNavigate).toHaveBeenCalledWith(customerRoutes.PROFILE_PATH);
+ expect(mockNavigate).toHaveBeenCalledWith(customerRoutes.PROFILE_PATH, { state: null });
+ });
+ });
+
+ it('routes to the profile page when the cancel button is clicked', async () => {
+ patchServiceMember.mockImplementation(() => Promise.resolve());
+
+ render(
+
+ ,
+ );
+
+ const cancelButton = screen.getByRole('button', { name: 'Cancel' });
+
+ await userEvent.click(cancelButton);
+
+ await waitFor(() => {
+ expect(mockNavigate).toHaveBeenCalledWith(customerRoutes.PROFILE_PATH, { state: null });
});
});
@@ -256,7 +307,11 @@ describe('EditContactInfo page', () => {
}),
);
- render(
+ ,
+ );
const saveButton = screen.getByRole('button', { name: 'Save' });
diff --git a/src/pages/MyMove/Profile/EditOktaInfo.jsx b/src/pages/MyMove/Profile/EditOktaInfo.jsx
index 5fc41e7d3a9..1a003446f9f 100644
--- a/src/pages/MyMove/Profile/EditOktaInfo.jsx
+++ b/src/pages/MyMove/Profile/EditOktaInfo.jsx
@@ -1,7 +1,7 @@
import PropTypes from 'prop-types';
import React, { useState } from 'react';
import { connect } from 'react-redux';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
import { Alert, Grid, GridContainer } from '@trussworks/react-uswds';
import { OktaUserInfoShape } from 'types/user';
@@ -15,6 +15,7 @@ import { setFlashMessage as setFlashMessageAction } from 'store/flash/actions';
export const EditOktaInfo = ({ serviceMember, setFlashMessage, oktaUser, updateOktaUserState }) => {
const navigate = useNavigate();
+ const { state } = useLocation();
const [serverError, setServerError] = useState(null);
const [noChangeError, setNoChangeError] = useState(null);
@@ -28,7 +29,7 @@ export const EditOktaInfo = ({ serviceMember, setFlashMessage, oktaUser, updateO
};
const handleCancel = () => {
- navigate(customerRoutes.PROFILE_PATH);
+ navigate(customerRoutes.PROFILE_PATH, { state });
};
// sends POST request to Okta API with form values
@@ -60,7 +61,7 @@ export const EditOktaInfo = ({ serviceMember, setFlashMessage, oktaUser, updateO
.then((response) => {
updateOktaUserState(response);
setFlashMessage('EDIT_OKTA_PROFILE_SUCCESS', 'success', "You've updated your Okta profile.");
- navigate(customerRoutes.PROFILE_PATH);
+ navigate(customerRoutes.PROFILE_PATH, { state });
})
.catch((e) => {
const { response } = e;
diff --git a/src/pages/MyMove/Profile/EditOktaInfo.test.jsx b/src/pages/MyMove/Profile/EditOktaInfo.test.jsx
index 0623168cb7c..26ff8777fa8 100644
--- a/src/pages/MyMove/Profile/EditOktaInfo.test.jsx
+++ b/src/pages/MyMove/Profile/EditOktaInfo.test.jsx
@@ -101,7 +101,7 @@ describe('EditOktaInfo page', () => {
await userEvent.click(cancelButton);
- expect(mockNavigate).toHaveBeenCalledWith(customerRoutes.PROFILE_PATH);
+ expect(mockNavigate).toHaveBeenCalledWith(customerRoutes.PROFILE_PATH, { state: null });
});
afterEach(jest.resetAllMocks);
diff --git a/src/pages/MyMove/Profile/EditOrdersPayGradeAndOriginLocation.test.jsx b/src/pages/MyMove/Profile/EditOrdersPayGradeAndOriginLocation.test.jsx
index baa25b860ba..52bb9579b29 100644
--- a/src/pages/MyMove/Profile/EditOrdersPayGradeAndOriginLocation.test.jsx
+++ b/src/pages/MyMove/Profile/EditOrdersPayGradeAndOriginLocation.test.jsx
@@ -1,6 +1,7 @@
import React from 'react';
import { render, screen, waitFor } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
+import { MemoryRouter } from 'react-router';
import { EditServiceInfo } from './EditServiceInfo';
@@ -86,7 +87,11 @@ describe('EditServiceInfo page updates orders table information', () => {
};
createOrders.mockImplementation(() => Promise.resolve(testOrdersValues));
- render(
+ ,
+ );
getOrdersForServiceMember.mockImplementation(() => Promise.resolve(testOrdersValues));
patchOrders.mockImplementation(() => Promise.resolve(testOrdersValues));
@@ -169,7 +174,11 @@ describe('EditServiceInfo page updates orders table information', () => {
};
createOrders.mockImplementation(() => Promise.resolve(testOrdersValues));
- render(
+ ,
+ );
getOrdersForServiceMember.mockImplementation(() => Promise.resolve(testOrdersValues));
patchOrders.mockImplementation(() => Promise.resolve(testOrdersValues));
diff --git a/src/pages/MyMove/Profile/EditServiceInfo.jsx b/src/pages/MyMove/Profile/EditServiceInfo.jsx
index 78d5b9a5db6..7c932137451 100644
--- a/src/pages/MyMove/Profile/EditServiceInfo.jsx
+++ b/src/pages/MyMove/Profile/EditServiceInfo.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import { GridContainer, Alert } from '@trussworks/react-uswds';
import { connect } from 'react-redux';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
import ServiceInfoForm from 'components/Customer/ServiceInfoForm/ServiceInfoForm';
import { patchServiceMember, patchOrders, getResponseError } from 'services/internalApi';
@@ -32,6 +32,7 @@ export const EditServiceInfo = ({
}) => {
const navigate = useNavigate();
const [serverError, setServerError] = useState(null);
+ const { state } = useLocation();
useEffect(() => {
if (!moveIsInDraft) {
@@ -84,7 +85,7 @@ export const EditServiceInfo = ({
setFlashMessage('EDIT_SERVICE_INFO_SUCCESS', 'success', '', 'Your changes have been saved.');
}
- navigate(customerRoutes.PROFILE_PATH);
+ navigate(customerRoutes.PROFILE_PATH, { state });
})
.catch((e) => {
// Error shape: https://github.com/swagger-api/swagger-js/blob/master/docs/usage/http-client.md#errors
@@ -122,7 +123,7 @@ export const EditServiceInfo = ({
setFlashMessage('EDIT_SERVICE_INFO_SUCCESS', 'success', '', 'Your changes have been saved.');
}
- navigate(customerRoutes.PROFILE_PATH);
+ navigate(customerRoutes.PROFILE_PATH, { state });
})
.catch((e) => {
// Error shape: https://github.com/swagger-api/swagger-js/blob/master/docs/usage/http-client.md#errors
@@ -133,7 +134,7 @@ export const EditServiceInfo = ({
};
const handleCancel = () => {
- navigate(customerRoutes.PROFILE_PATH);
+ navigate(customerRoutes.PROFILE_PATH, { state });
};
return (
diff --git a/src/pages/MyMove/Profile/EditServiceInfo.test.jsx b/src/pages/MyMove/Profile/EditServiceInfo.test.jsx
index a4a2827ddbf..a2c0b622bbe 100644
--- a/src/pages/MyMove/Profile/EditServiceInfo.test.jsx
+++ b/src/pages/MyMove/Profile/EditServiceInfo.test.jsx
@@ -5,6 +5,7 @@ import userEvent from '@testing-library/user-event';
import { EditServiceInfo } from './EditServiceInfo';
import { patchServiceMember } from 'services/internalApi';
+import { MockProviders } from 'testUtils';
const mockNavigate = jest.fn();
jest.mock('react-router-dom', () => ({
@@ -33,21 +34,28 @@ describe('EditServiceInfo page', () => {
};
it('renders the EditServiceInfo form', async () => {
- render(
+ ,
+ );
expect(await screen.findByRole('heading', { name: 'Edit service info', level: 1 })).toBeInTheDocument();
});
it('the cancel button goes back to the profile page', async () => {
- render(
+ ,
+ );
const cancelButton = await screen.findByText('Cancel');
await waitFor(() => {
expect(cancelButton).toBeInTheDocument();
});
await userEvent.click(cancelButton);
- expect(mockNavigate).toHaveBeenCalledWith('/service-member/profile');
+ expect(mockNavigate).toHaveBeenCalledWith('/service-member/profile', { state: null });
});
it('save button submits the form and goes to the profile page', async () => {
@@ -79,15 +87,17 @@ describe('EditServiceInfo page', () => {
// Need to provide initial values because we aren't testing the form here, and just want to submit immediately
render(
-
+ ,
);
const submitButton = await screen.findByText('Save');
@@ -106,7 +116,7 @@ describe('EditServiceInfo page', () => {
'Your changes have been saved.',
);
- expect(mockNavigate).toHaveBeenCalledWith('/service-member/profile');
+ expect(mockNavigate).toHaveBeenCalledWith('/service-member/profile', { state: null });
});
it('displays a flash message about entitlement when the pay grade changes', async () => {
@@ -174,15 +184,17 @@ describe('EditServiceInfo page', () => {
// Need to provide initial values because we aren't testing the form here, and just want to submit immediately
render(
-
+ ,
);
const payGradeInput = await screen.findByLabelText('Pay grade');
@@ -204,7 +216,7 @@ describe('EditServiceInfo page', () => {
'Your changes have been saved. Note that the entitlement has also changed.',
);
- expect(mockNavigate).toHaveBeenCalledWith('/service-member/profile');
+ expect(mockNavigate).toHaveBeenCalledWith('/service-member/profile', { state: null });
});
it('shows an error if the API returns an error', async () => {
@@ -253,14 +265,16 @@ describe('EditServiceInfo page', () => {
// Need to provide complete & valid initial values because we aren't testing the form here, and just want to submit immediately
render(
-
+ ,
);
const submitButton = await screen.findByText('Save');
@@ -279,7 +293,11 @@ describe('EditServiceInfo page', () => {
describe('if the current move has been submitted', () => {
it('redirects to the home page', async () => {
- render(
+ ,
+ );
await waitFor(() => {
expect(mockNavigate).toHaveBeenCalledWith('/');
diff --git a/src/pages/MyMove/Profile/Profile.jsx b/src/pages/MyMove/Profile/Profile.jsx
index 33b5c2cbfb4..0dce8fba818 100644
--- a/src/pages/MyMove/Profile/Profile.jsx
+++ b/src/pages/MyMove/Profile/Profile.jsx
@@ -1,8 +1,11 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
import { arrayOf, bool } from 'prop-types';
-import { Alert } from '@trussworks/react-uswds';
-import { Link } from 'react-router-dom';
+import { Alert, Button } from '@trussworks/react-uswds';
+import { Link, useLocation, useNavigate } from 'react-router-dom';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+
+import styles from './Profile.module.scss';
import ConnectedFlashMessage from 'containers/FlashMessage/FlashMessage';
import ContactInfoDisplay from 'components/Customer/Profile/ContactInfoDisplay/ContactInfoDisplay';
@@ -33,6 +36,22 @@ const Profile = ({ serviceMember, currentOrders, currentBackupContacts, moveIsIn
telephone: currentBackupContacts[0]?.telephone || '',
email: currentBackupContacts[0]?.email || '',
};
+ const [needsToVerifyProfile, setNeedsToVerifyProfile] = useState(false);
+
+ const navigate = useNavigate();
+ const { state } = useLocation();
+
+ useEffect(() => {
+ if (state && state.needsToVerifyProfile) {
+ setNeedsToVerifyProfile(state.needsToVerifyProfile);
+ } else {
+ setNeedsToVerifyProfile(false);
+ }
+ }, [state]);
+
+ const handleCreateMoveClick = () => {
+ navigate(customerRoutes.MOVE_HOME_PAGE);
+ };
// displays the profile data for MilMove & Okta
// Profile w/contact info for servicemember & backup contact
@@ -43,13 +62,32 @@ const Profile = ({ serviceMember, currentOrders, currentBackupContacts, moveIsIn
Service info
- {isEditable && Edit} + {isEditable && ( + + Edit + + )}
diff --git a/src/components/Office/AddressUpdatePreview/AddressUpdatePreview.jsx b/src/components/Office/AddressUpdatePreview/AddressUpdatePreview.jsx
index b256e73995b..f4f567a9c7a 100644
--- a/src/components/Office/AddressUpdatePreview/AddressUpdatePreview.jsx
+++ b/src/components/Office/AddressUpdatePreview/AddressUpdatePreview.jsx
@@ -10,12 +10,12 @@ import { formatTwoLineAddress } from 'utils/shipmentDisplay';
import DataTableWrapper from 'components/DataTableWrapper';
import { ShipmentAddressUpdateShape } from 'types';
-const AddressUpdatePreview = ({ deliveryAddressUpdate, destSitServiceItems }) => {
+const AddressUpdatePreview = ({ deliveryAddressUpdate }) => {
const { originalAddress, newAddress, contractorRemarks } = deliveryAddressUpdate;
+ const newSitMileage = deliveryAddressUpdate.newSitDistanceBetween;
return (
If approved, the requested update to the delivery location will change one or all of the following:
@@ -27,23 +27,15 @@ const AddressUpdatePreview = ({ deliveryAddressUpdate, destSitServiceItems }) =>
Approvals will result in updated pricing for this shipment. Customer may be subject to excess costs.
- {destSitServiceItems.length > 0 ? (
-
+ {newSitMileage > 50 ? (
+
- This shipment contains {destSitServiceItems.length} destination SIT service items. If approved, this could
- change the following:{' '}
-
- SIT delivery > 50 miles or SIT delivery ≤ 50 miles.
-
- Service area.
- Mileage bracket (for Direct Delivery).
- Weight bracket change.
- Approvals will result in updated pricing for the service item and require TOO approval. Customer may be
- subject to excess costs.
+ Approval of this address change request will result in SIT Delivery > 50 Miles.
+
+ Updated Mileage for SIT: {newSitMileage} miles
) : null}
-
);
};
-
export default AddressUpdatePreview;
-
AddressUpdatePreview.propTypes = {
deliveryAddressUpdate: ShipmentAddressUpdateShape.isRequired,
};
diff --git a/src/components/Office/AddressUpdatePreview/AddressUpdatePreview.test.jsx b/src/components/Office/AddressUpdatePreview/AddressUpdatePreview.test.jsx
index baa14d6ac1e..96f91c561c1 100644
--- a/src/components/Office/AddressUpdatePreview/AddressUpdatePreview.test.jsx
+++ b/src/components/Office/AddressUpdatePreview/AddressUpdatePreview.test.jsx
@@ -1,9 +1,9 @@
import React from 'react';
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
import AddressUpdatePreview from './AddressUpdatePreview';
-const mockDeliveryAddressUpdate = {
+const mockDeliveryAddressUpdateWithoutSIT = {
contractorRemarks: 'Test Contractor Remark',
id: 'c49f7921-5a6e-46b4-bb39-022583574453',
newAddress: {
@@ -26,93 +26,49 @@ const mockDeliveryAddressUpdate = {
shipmentID: '5c84bcf3-92f7-448f-b0e1-e5378b6806df',
status: 'REQUESTED',
};
-
-const destSitServiceItemsNone = [];
-
-const destSitServiceItemsSeveral = [
- {
- approvedAt: '2023-12-29T15:31:57.041Z',
- createdAt: '2023-12-29T15:27:55.909Z',
- deletedAt: '0001-01-01',
- eTag: 'MjAyMy0xMi0yOVQxNTozMTo1Ny4wNTUxMTNa',
- id: '447c4919-3311-4d3d-9067-a5585ba692ad',
- moveTaskOrderID: 'aa8dfe13-266a-4956-ac60-01c2355c06d3',
- mtoShipmentID: 'be3349f4-333d-4633-8708-d9c1147cd407',
- reServiceCode: 'DDASIT',
- reServiceID: 'a0ead168-7469-4cb6-bc5b-2ebef5a38f92',
- reServiceName: "Domestic destination add'l SIT",
- reason: 'LET THE PEOPLE KNOW',
- sitDepartureDate: '2024-01-06T00:00:00.000Z',
- sitEntryDate: '2024-01-05T00:00:00.000Z',
- status: 'APPROVED',
- submittedAt: '0001-01-01',
- updatedAt: '0001-01-01T00:00:00.000Z',
- },
- {
- approvedAt: '2023-12-29T15:31:57.912Z',
- createdAt: '2023-12-29T15:27:55.920Z',
- deletedAt: '0001-01-01',
- eTag: 'MjAyMy0xMi0yOVQxNTozMTo1Ny45MjA3Njla',
- id: '0163ae1a-d6b8-468d-9ec5-49f289796819',
- moveTaskOrderID: 'aa8dfe13-266a-4956-ac60-01c2355c06d3',
- mtoShipmentID: 'be3349f4-333d-4633-8708-d9c1147cd407',
- reServiceCode: 'DDDSIT',
- reServiceID: '5c80f3b5-548e-4077-9b8e-8d0390e73668',
- reServiceName: 'Domestic destination SIT delivery',
- reason: 'LET THE PEOPLE KNOW',
- sitDepartureDate: '2024-01-06T00:00:00.000Z',
- sitEntryDate: '2024-01-05T00:00:00.000Z',
- status: 'APPROVED',
- submittedAt: '0001-01-01',
- updatedAt: '0001-01-01T00:00:00.000Z',
+const mockDeliveryAddressUpdateWithSIT = {
+ contractorRemarks: 'hello',
+ id: '5b1e566e-de89-4523-897f-16d7723a7a64',
+ newAddress: {
+ city: 'Fairfield',
+ eTag: 'MjAyNC0wMS0yMlQyMDo1MTo1NS4xNTQzMjJa',
+ id: 'ad28a8df-0301-4cac-b88f-75b42fc491a7',
+ postalCode: '73064',
+ state: 'CA',
+ streetAddress1: '987 Any Avenue',
+ streetAddress2: 'P.O. Box 9876',
+ streetAddress3: 'c/o Some Person',
},
- {
- approvedAt: '2023-12-29T15:31:58.538Z',
- createdAt: '2023-12-29T15:27:55.928Z',
- deletedAt: '0001-01-01',
- eTag: 'MjAyMy0xMi0yOVQxNTozMTo1OC41NDQ0NTJa',
- id: 'b582cc4c-23ae-4529-be20-608b305d9dc7',
- moveTaskOrderID: 'aa8dfe13-266a-4956-ac60-01c2355c06d3',
- mtoShipmentID: 'be3349f4-333d-4633-8708-d9c1147cd407',
- reServiceCode: 'DDSFSC',
- reServiceID: 'b208e0af-3176-4c8a-97ea-bd247c18f43d',
- reServiceName: 'Domestic destination SIT fuel surcharge',
- reason: 'LET THE PEOPLE KNOW',
- sitDepartureDate: '2024-01-06T00:00:00.000Z',
- sitEntryDate: '2024-01-05T00:00:00.000Z',
- status: 'APPROVED',
- submittedAt: '0001-01-01',
- updatedAt: '0001-01-01T00:00:00.000Z',
+ newSitDistanceBetween: 55,
+ oldSitDistanceBetween: 1,
+ originalAddress: {
+ city: 'Fairfield',
+ country: 'US',
+ eTag: 'MjAyNC0wMS0wM1QyMToyODoyOS4zNDUxNzFa',
+ id: 'ac8654e1-8a31-45ed-991b-8c28222cf877',
+ postalCode: '94535',
+ state: 'CA',
+ streetAddress1: '987 Any Avenue',
+ streetAddress2: 'P.O. Box 9876',
+ streetAddress3: 'c/o Some Person',
},
- {
- approvedAt: '2023-12-29T15:31:59.239Z',
- createdAt: '2023-12-29T15:27:55.837Z',
- deletedAt: '0001-01-01',
- eTag: 'MjAyMy0xMi0yOVQxNTozMTo1OS4yNDU0MDRa',
- id: 'a69e8cb9-5e46-43a5-92e6-27f1f073d92e',
- moveTaskOrderID: 'aa8dfe13-266a-4956-ac60-01c2355c06d3',
- mtoShipmentID: 'be3349f4-333d-4633-8708-d9c1147cd407',
- reServiceCode: 'DDFSIT',
- reServiceID: 'd0561c49-e1a9-40b8-a739-3e639a9d77af',
- reServiceName: 'Domestic destination 1st day SIT',
- reason: 'LET THE PEOPLE KNOW',
- sitDepartureDate: '2024-01-06T00:00:00.000Z',
- sitEntryDate: '2024-01-05T00:00:00.000Z',
- status: 'APPROVED',
- submittedAt: '0001-01-01',
- updatedAt: '0001-01-01T00:00:00.000Z',
+ shipmentID: 'fde0a71f-b984-4abf-8491-2e51f41ab1b9',
+ sitOriginalAddress: {
+ city: 'Fairfield',
+ country: 'US',
+ eTag: 'MjAyNC0wMS0wM1QyMToyODozMi4wMzg5MTda',
+ id: 'acea509d-0add-4bde-95d6-c4f10247f9d3',
+ postalCode: '94535',
+ state: 'CA',
+ streetAddress1: '987 Any Avenue',
+ streetAddress2: 'P.O. Box 9876',
+ streetAddress3: 'c/o Some Person',
},
-];
-
+ status: 'REQUESTED',
+};
describe('AddressUpdatePreview', () => {
- it('renders all of the address preview information', () => {
- render(
-
-
);
@@ -39,19 +56,25 @@ ImportantShipmentDates.defaultProps = {
scheduledPickupDate: '',
requiredDeliveryDate: '',
actualPickupDate: '',
+ plannedMoveDate: '',
+ actualMoveDate: '',
requestedDeliveryDate: '',
scheduledDeliveryDate: '',
actualDeliveryDate: '',
+ isPPM: false,
};
ImportantShipmentDates.propTypes = {
requestedPickupDate: PropTypes.string,
scheduledPickupDate: PropTypes.string,
+ plannedMoveDate: PropTypes.string,
+ actualMoveDate: PropTypes.string,
requiredDeliveryDate: PropTypes.string,
actualPickupDate: PropTypes.string,
requestedDeliveryDate: PropTypes.string,
scheduledDeliveryDate: PropTypes.string,
actualDeliveryDate: PropTypes.string,
+ isPPM: PropTypes.bool,
};
export default ImportantShipmentDates;
diff --git a/src/components/Office/ImportantShipmentDates/ImportantShipmentDates.test.jsx b/src/components/Office/ImportantShipmentDates/ImportantShipmentDates.test.jsx
index ad9df37c3bc..1c31a8922e9 100644
--- a/src/components/Office/ImportantShipmentDates/ImportantShipmentDates.test.jsx
+++ b/src/components/Office/ImportantShipmentDates/ImportantShipmentDates.test.jsx
@@ -4,24 +4,29 @@ import { mount } from 'enzyme';
import ImportantShipmentDates from './ImportantShipmentDates';
describe('ImportantShipmentDates', () => {
+ const requiredDeliveryDate = 'Wednesday, 25 Mar 2020';
const requestedPickupDate = 'Thursday, 26 Mar 2020';
const scheduledPickupDate = 'Friday, 27 Mar 2020';
- const actualPickupDate = 'Saturday, 28 Mar 2020';
- const requiredDeliveryDate = 'Monday, 30 Mar 2020';
- const requestedDeliveryDate = 'Sunday, 29 Mar 2020';
+ const plannedMoveDate = 'Saturday, 28 Mar 2020';
+ const actualMoveDate = 'Sunday, 29 Mar 2020';
+ const requestedDeliveryDate = 'Monday, 30 Mar 2020';
const scheduledDeliveryDate = 'Tuesday, 1 Apr 2020';
const actualDeliveryDate = 'Wednesday, 2 Apr 2020';
+ const actualPickupDate = 'Thursday, 3 Apr 2020';
it('should render the shipment dates we pass in', () => {
const wrapper = mount(
onClose()} />
@@ -75,7 +63,6 @@ export const ShipmentAddressUpdateReviewRequestModal = ({
);
};
-
ShipmentAddressUpdateReviewRequestModal.propTypes = {
shipment: ShipmentShape.isRequired,
onSubmit: PropTypes.func.isRequired,
@@ -133,11 +119,9 @@ ShipmentAddressUpdateReviewRequestModal.propTypes = {
errorMessage: PropTypes.node,
setErrorMessage: PropTypes.func,
};
-
ShipmentAddressUpdateReviewRequestModal.defaultProps = {
errorMessage: null,
setErrorMessage: undefined,
};
-
ShipmentAddressUpdateReviewRequestModal.displayName = 'ShipmentAddressUpdateReviewRequestModal';
export default connectModal(ShipmentAddressUpdateReviewRequestModal);
diff --git a/src/components/Office/ShipmentAddresses/ShipmentAddresses.jsx b/src/components/Office/ShipmentAddresses/ShipmentAddresses.jsx
index d5a23edee49..7653d6b8cc0 100644
--- a/src/components/Office/ShipmentAddresses/ShipmentAddresses.jsx
+++ b/src/components/Office/ShipmentAddresses/ShipmentAddresses.jsx
@@ -69,8 +69,8 @@ const ShipmentAddresses = ({
0 &&
diff --git a/src/components/Office/ShipmentSITDisplay/ShipmentSITDisplay.test.jsx b/src/components/Office/ShipmentSITDisplay/ShipmentSITDisplay.test.jsx
index ec5a050e9da..7ac460b776b 100644
--- a/src/components/Office/ShipmentSITDisplay/ShipmentSITDisplay.test.jsx
+++ b/src/components/Office/ShipmentSITDisplay/ShipmentSITDisplay.test.jsx
@@ -8,6 +8,7 @@ import {
futureSITStatus,
SITExtensions,
SITStatusOrigin,
+ SITStatusOriginAuthorized,
SITStatusDestination,
SITStatusDestinationWithoutCustomerDeliveryInfo,
SITStatusOriginWithoutCustomerDeliveryInfo,
@@ -376,4 +377,16 @@ describe('ShipmentSITDisplay', () => {
);
expect(screen.getByText('Expired')).toBeInTheDocument();
});
+ it('renders the Shipment SIT at Origin, with current SIT authorized end date', async () => {
+ render(
+ Delivery location
-+ Updated Mileage for SIT: {newSitMileage} miles
Review Request
@@ -125,7 +112,6 @@ export const ShipmentAddressUpdateReviewRequestModal = ({Current location: {currentLocation}
}{formatWeight(shipment.ppmShipment.estimatedWeight)}
- {formatWeight(shipment.calculatedBillableWeight)} + {formatWeight(requestedWeightPPM)}
+
+ ) : null;
+};
+
+MultiMovesLandingPage.defaultProps = {
+ serviceMember: null,
+};
+
+const mapStateToProps = (state) => {
+ const serviceMember = selectServiceMemberFromLoggedInUser(state);
+ const move = selectCurrentMove(state) || {};
+
+ return {
+ isProfileComplete: selectIsProfileComplete(state),
+ serviceMember,
+ move,
+ };
+};
+
+// in order to avoid setting up proxy server only for storybook, pass in stub function so API requests don't fail
+const mergeProps = (stateProps, dispatchProps, ownProps) => ({
+ ...stateProps,
+ ...dispatchProps,
+ ...ownProps,
+});
+
+export default withContext(
+ withRouter(connect(mapStateToProps, mergeProps)(requireCustomerState(MultiMovesLandingPage))),
+);
diff --git a/src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.module.scss b/src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.module.scss
new file mode 100644
index 00000000000..2b8a6a18fd2
--- /dev/null
+++ b/src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.module.scss
@@ -0,0 +1,92 @@
+@import 'shared/styles/colors';
+@import 'shared/styles/_basics';
+@import 'shared/styles/_variables';
+
+
+.grid-container {
+ margin-left: auto;
+ margin-right: auto;
+ max-width: 64rem;
+ padding-left: 1rem;
+ padding-right: 1rem;
+
+ @media (min-width: $tablet) {
+ padding-left: 1.25rem;
+ padding-right: 1.25rem;
+ }
+
+ .secondaryBtn {
+ box-shadow: inset 0 0 0 2px $primary;
+
+ &:disabled {
+ box-shadow: none;
+ }
+ }
+}
+
+.customerHeader {
+ color: white;
+ background-color: $base-darker;
+
+ // undoes padding of parent container
+ margin-top: -21px;
+ margin-left: -1.25rem;
+ margin-right: -1.25rem;
+ @include u-margin-bottom(2);
+
+ @include u-padding-top(3);
+ @include u-padding-bottom(3);
+ padding-left: 20px;
+ padding-right: 20px;
+
+ h2 {
+ font-size: 28px;
+ margin: 0px;
+ }
+
+ p {
+ font-size: 15px;
+ margin: 0px;
+ }
+}
+
+.helper-paragraph-only {
+ p:last-of-type {
+ @include u-margin-bottom(0);
+ }
+}
+
+.centeredContainer {
+ display: flex;
+ justify-content: center;
+ }
+
+.createMoveBtn {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ @include u-margin-top(-1);
+ span {
+ @include u-margin-right(.5em)
+ }
+
+ @media (max-width: $tablet) {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ gap: 8px;
+ span {
+ @include u-margin-right(0);
+ }
+ }
+ }
+
+.movesContainer {
+ border: 1px solid $base-lighter;
+ border-radius: 3px;
+ margin-top: 1rem;
+ padding-top: 1vh;
+ padding-left: 2vw;
+ padding-right: 2vw;
+ padding-bottom: 2vh;
+}
\ No newline at end of file
diff --git a/src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.test.jsx b/src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.test.jsx
new file mode 100644
index 00000000000..7357ba5434c
--- /dev/null
+++ b/src/pages/MyMove/Multi-Moves/MultiMovesLandingPage.test.jsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { v4 } from 'uuid';
+
+import '@testing-library/jest-dom/extend-expect';
+
+import MultiMovesLandingPage from './MultiMovesLandingPage';
+
+import { MockProviders } from 'testUtils';
+import { MOVE_STATUSES } from 'shared/constants';
+
+// Mock external dependencies
+jest.mock('utils/featureFlags', () => ({
+ detectFlags: jest.fn(() => ({ multiMove: true })),
+}));
+
+jest.mock('store/auth/actions', () => ({
+ loadUser: jest.fn(),
+}));
+
+jest.mock('store/onboarding/actions', () => ({
+ initOnboarding: jest.fn(),
+}));
+
+jest.mock('shared/Swagger/ducks', () => ({
+ loadInternalSchema: jest.fn(),
+}));
+
+const defaultProps = {
+ serviceMember: {
+ id: v4(),
+ current_location: {
+ transportation_office: {
+ name: 'Test Transportation Office Name',
+ phone_lines: ['555-555-5555'],
+ },
+ },
+ weight_allotment: {
+ total_weight_self: 8000,
+ total_weight_self_plus_dependents: 11000,
+ },
+ },
+ showLoggedInUser: jest.fn(),
+ createServiceMember: jest.fn(),
+ getSignedCertification: jest.fn(),
+ mtoShipments: [],
+ mtoShipment: {},
+ isLoggedIn: true,
+ loggedInUserIsLoading: false,
+ loggedInUserSuccess: true,
+ isProfileComplete: true,
+ loadMTOShipments: jest.fn(),
+ updateShipmentList: jest.fn(),
+ move: {
+ id: v4(),
+ status: MOVE_STATUSES.DRAFT,
+ },
+ uploadedOrderDocuments: [],
+ uploadedAmendedOrderDocuments: [],
+};
+
+describe('MultiMovesLandingPage', () => {
+ it('renders the component with moves', () => {
+ render(
+
+
+
+
+
+
+ First Last
+
+
+
+
+ + We can put information at the top here - potentially important contact info or basic instructions on how + to start a move? +
+
+
+
+
+ {moves.currentMove.length > 0 ? (
+ <>
+
+
+
+
+
+
+ ) : (
+ <>
+
+
+ You do not have a current move.
+
+ )}
+ {moves.previousMoves.length > 0 ? (
+ <>
+
+
+
+
+
+ ) : (
+ <>
+
+
+ You have no previous moves.
+
+ )}
+
+
+
+ handleExpandClick(index)}
+ />
+
+ #{m.moveCode}
+ {m.status !== 'APPROVED' ? ( + + ) : ( +
+ {expandedMoves[index] && (
+
+
+
+
+ ))}
+
+ )}
+ Shipments
+ {m.mtoShipments.map((s, sIndex) => ( +
+
+
+
+
+
+
+
+ {generateShipmentTypeTitle(s.shipmentType)}
+#{m.moveCode}
+
+ {moveList}
+
+ );
+};
+
+export default MultiMovesMoveContainer;
diff --git a/src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.module.scss b/src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.module.scss
new file mode 100644
index 00000000000..9b238e0f3d4
--- /dev/null
+++ b/src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.module.scss
@@ -0,0 +1,90 @@
+@import '../../../../shared/styles/basics';
+@import '../../../../shared/styles/mixins';
+@import '../../../../shared/styles/colors';
+@import '../../../../shared/styles/_variables';
+
+.movesContainer {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ gap: 20px;
+}
+
+.moveContainer {
+ border-top: 8px;
+ @include u-border-top('base-darker');
+ @include u-margin-bottom(1);
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+
+ .heading {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ @include u-text('base-darkest');
+ @include u-margin(0);
+ @include u-border('1px');
+ @include u-border('base-lighter');
+ @include u-padding(2);
+
+ .goToMoveBtn {
+ margin-left: auto;
+ }
+
+ .dropdownBtn {
+ margin-left: auto;
+ }
+
+ h3 {
+ display: inline;
+ font-weight: bold;
+ @include u-margin(0);
+ @include u-margin-x(1);
+ }
+
+ .icon {
+ margin-left: 1rem;
+ }
+}
+
+ .moveInfoList {
+ @include u-margin-top(0);
+
+ .moveInfoListExpanded {
+ @include u-margin-top(-2);
+ }
+ }
+}
+
+.shipmentH3 {
+ @include u-margin-x(2);
+}
+
+.shipment {
+ @include u-margin-x(2);
+}
+
+.previewShipment {
+ @include u-margin-x(0);
+ @include u-margin-bottom(1);
+
+ .innerWrapper {
+ @include u-margin-left(2);
+ @include u-margin-y(-1);
+ @include u-margin-bottom(-4);
+ @media (max-width: 700px) {
+ @include u-margin-left(0);
+ }
+ }
+}
+
+.shipmentTypeHeading {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ h4 {
+ font-weight: bold;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.stories.jsx b/src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.stories.jsx
new file mode 100644
index 00000000000..aa8d532ac87
--- /dev/null
+++ b/src/pages/MyMove/Multi-Moves/MultiMovesMoveContainer/MultiMovesMoveContainer.stories.jsx
@@ -0,0 +1,21 @@
+import React from 'react';
+
+import { mockMovesPCS, mockMovesRetirement, mockMovesSeparation } from '../MultiMovesTestData';
+
+import MultiMovesMoveContainer from './MultiMovesMoveContainer';
+
+export default {
+ title: 'Customer Components / MultiMovesContainer',
+};
+
+export const PCSCurrentMove = () =>
+
+ );
+};
+
+export default MultiMovesMoveHeader;
diff --git a/src/pages/MyMove/Multi-Moves/MultiMovesMoveHeader/MultiMovesMoveHeader.module.scss b/src/pages/MyMove/Multi-Moves/MultiMovesMoveHeader/MultiMovesMoveHeader.module.scss
new file mode 100644
index 00000000000..89fbb58fd87
--- /dev/null
+++ b/src/pages/MyMove/Multi-Moves/MultiMovesMoveHeader/MultiMovesMoveHeader.module.scss
@@ -0,0 +1,9 @@
+.moveHeaderContainer {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+
+ h3 {
+ margin-left: 8px;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/MyMove/Multi-Moves/MultiMovesMoveHeader/MultiMovesMoveHeader.stories.jsx b/src/pages/MyMove/Multi-Moves/MultiMovesMoveHeader/MultiMovesMoveHeader.stories.jsx
new file mode 100644
index 00000000000..b8c95c8be23
--- /dev/null
+++ b/src/pages/MyMove/Multi-Moves/MultiMovesMoveHeader/MultiMovesMoveHeader.stories.jsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+import MultiMovesMoveHeader from './MultiMovesMoveHeader';
+
+export default {
+ title: 'Customer Components / MultiMovesMoveHeader',
+};
+
+export const MultiMoveCurrentMoveHeader = () => {title}
+
+
+ );
+};
+
+export default MultiMovesMoveInfoList;
diff --git a/src/pages/MyMove/Multi-Moves/MultiMovesMoveInfoList/MultiMovesMoveInfoList.module.scss b/src/pages/MyMove/Multi-Moves/MultiMovesMoveInfoList/MultiMovesMoveInfoList.module.scss
new file mode 100644
index 00000000000..1a3b8b6ea7a
--- /dev/null
+++ b/src/pages/MyMove/Multi-Moves/MultiMovesMoveInfoList/MultiMovesMoveInfoList.module.scss
@@ -0,0 +1,18 @@
+@import 'shared/styles/_variables';
+@import 'shared/styles/_basics';
+@import 'shared/styles/colors';
+
+.moveInfoContainer {
+
+ .moveInfoSection {
+ dl {
+ dt {
+ @include u-width(33%);
+ }
+
+ dd {
+ @include u-width(67%);
+ }
+ }
+ }
+ }
\ No newline at end of file
diff --git a/src/pages/MyMove/Multi-Moves/MultiMovesTestData.js b/src/pages/MyMove/Multi-Moves/MultiMovesTestData.js
new file mode 100644
index 00000000000..e726b3fd346
--- /dev/null
+++ b/src/pages/MyMove/Multi-Moves/MultiMovesTestData.js
@@ -0,0 +1,1054 @@
+export const mockMovesPCS = {
+ currentMove: [
+ {
+ id: 'testMoveID1',
+ moveCode: 'MOVECO',
+ orderID: 'testOrderID1',
+ status: 'DRAFT',
+ orders: {
+ id: 'testOrder1',
+ destinationDutyLocation: {
+ id: 'testDDL1',
+ name: 'Fort Bragg North Station',
+ address: {
+ streetAddress1: '123 Main Ave',
+ streetAddress2: 'Apartment 9000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90210',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL1',
+ name: 'Fort Bragg North Station',
+ address: {
+ streetAddress1: '123 Main Ave',
+ streetAddress2: 'Apartment 9000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90210',
+ country: 'USA',
+ },
+ },
+ rank: 'E_8',
+ reportByDate: '2024-01-25',
+ ordersType: 'PERMANENT_CHANGE_OF_STATION',
+ orderNumber: 'ORDER3',
+ date_issued: '2024-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ ],
+ previousMoves: [
+ {
+ id: 'testMoveID2',
+ moveCode: 'SAMPLE',
+ orderID: 'testOrderID2',
+ status: 'APPROVED',
+ orders: {
+ id: 'testOrder2',
+ destinationDutyLocation: {
+ id: 'testDDL2',
+ name: 'Fort Bragg South Station',
+ address: {
+ streetAddress1: '456 Oak St',
+ streetAddress2: 'Apartment 8000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90211',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL2',
+ name: 'Fort Bragg South Station',
+ address: {
+ streetAddress1: '456 Oak St',
+ streetAddress2: 'Apartment 8000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90211',
+ country: 'USA',
+ },
+ },
+ rank: 'E_7',
+ reportByDate: '2024-01-24',
+ ordersType: 'PERMANENT_CHANGE_OF_STATION',
+ orderNumber: 'ORDER4',
+ date_issued: '2021-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ {
+ id: 'testMoveID3',
+ moveCode: 'EXAMPL',
+ orderID: 'testOrderID3',
+ status: 'APPROVED',
+ orders: {
+ id: 'testOrder3',
+ destinationDutyLocation: {
+ id: 'testDDL3',
+ name: 'Fort Bragg East Station',
+ address: {
+ streetAddress1: '789 Pine Ave',
+ streetAddress2: 'Apartment 7000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90212',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL3',
+ name: 'Fort Bragg East Station',
+ address: {
+ streetAddress1: '789 Pine Ave',
+ streetAddress2: 'Apartment 7000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90212',
+ country: 'USA',
+ },
+ },
+ rank: 'E_6',
+ reportByDate: '2024-01-26',
+ ordersType: 'PERMANENT_CHANGE_OF_STATION',
+ orderNumber: 'ORDER5',
+ date_issued: '2018-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ ],
+};
+
+export const mockMovesRetirement = {
+ currentMove: [
+ {
+ id: 'testMoveID1',
+ moveCode: 'MOVECO',
+ orderID: 'testOrderID1',
+ status: 'SUBMITTED',
+ orders: {
+ id: 'testOrder1',
+ destinationDutyLocation: {
+ id: 'testDDL1',
+ name: 'Fort Bragg North Station',
+ address: {
+ streetAddress1: '123 Main Ave',
+ streetAddress2: 'Apartment 9000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90210',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL1',
+ name: 'Fort Bragg North Station',
+ address: {
+ streetAddress1: '123 Main Ave',
+ streetAddress2: 'Apartment 9000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90210',
+ country: 'USA',
+ },
+ },
+ rank: 'E_8',
+ reportByDate: '2024-01-25',
+ ordersType: 'RETIREMENT',
+ orderNumber: 'ORDER3',
+ date_issued: '2024-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ ],
+ previousMoves: [
+ {
+ id: 'testMoveID2',
+ moveCode: 'SAMPLE',
+ orderID: 'testOrderID2',
+ status: 'APPROVED',
+ orders: {
+ id: 'testOrder2',
+ destinationDutyLocation: {
+ id: 'testDDL2',
+ name: 'Fort Bragg South Station',
+ address: {
+ streetAddress1: '456 Oak St',
+ streetAddress2: 'Apartment 8000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90211',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL2',
+ name: 'Fort Bragg South Station',
+ address: {
+ streetAddress1: '456 Oak St',
+ streetAddress2: 'Apartment 8000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90211',
+ country: 'USA',
+ },
+ },
+ rank: 'E_7',
+ reportByDate: '2024-01-24',
+ ordersType: 'PERMANENT_CHANGE_OF_STATION',
+ orderNumber: 'ORDER4',
+ date_issued: '2021-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ {
+ id: 'testMoveID3',
+ moveCode: 'EXAMPL',
+ orderID: 'testOrderID3',
+ status: 'APPROVED',
+ orders: {
+ id: 'testOrder3',
+ destinationDutyLocation: {
+ id: 'testDDL3',
+ name: 'Fort Bragg East Station',
+ address: {
+ streetAddress1: '789 Pine Ave',
+ streetAddress2: 'Apartment 7000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90212',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL3',
+ name: 'Fort Bragg East Station',
+ address: {
+ streetAddress1: '789 Pine Ave',
+ streetAddress2: 'Apartment 7000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90212',
+ country: 'USA',
+ },
+ },
+ rank: 'E_6',
+ reportByDate: '2024-01-26',
+ ordersType: 'PERMANENT_CHANGE_OF_STATION',
+ orderNumber: 'ORDER5',
+ date_issued: '2018-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ ],
+};
+
+export const mockMovesSeparation = {
+ currentMove: [
+ {
+ id: 'testMoveID1',
+ moveCode: 'MOVECO',
+ orderID: 'testOrderID1',
+ status: 'DRAFT',
+ orders: {
+ id: 'testOrder1',
+ destinationDutyLocation: {
+ id: 'testDDL1',
+ name: 'Fort Bragg North Station',
+ address: {
+ streetAddress1: '123 Main Ave',
+ streetAddress2: 'Apartment 9000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90210',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL1',
+ name: 'Fort Bragg North Station',
+ address: {
+ streetAddress1: '123 Main Ave',
+ streetAddress2: 'Apartment 9000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90210',
+ country: 'USA',
+ },
+ },
+ rank: 'E_8',
+ reportByDate: '2024-01-25',
+ ordersType: 'SEPARATION',
+ orderNumber: 'ORDER3',
+ date_issued: '2024-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ ],
+ previousMoves: [
+ {
+ id: 'testMoveID2',
+ moveCode: 'SAMPLE',
+ orderID: 'testOrderID2',
+ status: 'APPROVED',
+ orders: {
+ id: 'testOrder2',
+ destinationDutyLocation: {
+ id: 'testDDL2',
+ name: 'Fort Bragg South Station',
+ address: {
+ streetAddress1: '456 Oak St',
+ streetAddress2: 'Apartment 8000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90211',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL2',
+ name: 'Fort Bragg South Station',
+ address: {
+ streetAddress1: '456 Oak St',
+ streetAddress2: 'Apartment 8000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90211',
+ country: 'USA',
+ },
+ },
+ rank: 'E_7',
+ reportByDate: '2024-01-24',
+ ordersType: 'PERMANENT_CHANGE_OF_STATION',
+ orderNumber: 'ORDER4',
+ date_issued: '2021-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ {
+ id: 'testMoveID3',
+ moveCode: 'EXAMPL',
+ orderID: 'testOrderID3',
+ status: 'APPROVED',
+ orders: {
+ id: 'testOrder3',
+ destinationDutyLocation: {
+ id: 'testDDL3',
+ name: 'Fort Bragg East Station',
+ address: {
+ streetAddress1: '789 Pine Ave',
+ streetAddress2: 'Apartment 7000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90212',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL3',
+ name: 'Fort Bragg East Station',
+ address: {
+ streetAddress1: '789 Pine Ave',
+ streetAddress2: 'Apartment 7000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90212',
+ country: 'USA',
+ },
+ },
+ rank: 'E_6',
+ reportByDate: '2024-01-26',
+ ordersType: 'PERMANENT_CHANGE_OF_STATION',
+ orderNumber: 'ORDER5',
+ date_issued: '2018-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ ],
+};
+
+export const mockMovesNoPreviousMoves = {
+ currentMove: [
+ {
+ id: 'testMoveID1',
+ moveCode: 'MOVECO',
+ orderID: 'testOrderID1',
+ status: 'DRAFT',
+ orders: {
+ id: 'testOrder1',
+ destinationDutyLocation: {
+ id: 'testDDL1',
+ name: 'Fort Bragg North Station',
+ address: {
+ streetAddress1: '123 Main Ave',
+ streetAddress2: 'Apartment 9000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90210',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL1',
+ name: 'Fort Bragg North Station',
+ address: {
+ streetAddress1: '123 Main Ave',
+ streetAddress2: 'Apartment 9000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90210',
+ country: 'USA',
+ },
+ },
+ rank: 'E_8',
+ reportByDate: '2024-01-25',
+ ordersType: 'PERMANENT_CHANGE_OF_STATION',
+ orderNumber: 'ORDER3',
+ date_issued: '2024-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ ],
+ previousMoves: [],
+};
+
+export const mockMovesNoCurrentMoveWithPreviousMoves = {
+ currentMove: [],
+ previousMoves: [
+ {
+ id: 'testMoveID2',
+ moveCode: 'SAMPLE',
+ orderID: 'testOrderID2',
+ status: 'APPROVED',
+ orders: {
+ id: 'testOrder2',
+ destinationDutyLocation: {
+ id: 'testDDL2',
+ name: 'Fort Bragg South Station',
+ address: {
+ streetAddress1: '456 Oak St',
+ streetAddress2: 'Apartment 8000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90211',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL2',
+ name: 'Fort Bragg South Station',
+ address: {
+ streetAddress1: '456 Oak St',
+ streetAddress2: 'Apartment 8000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90211',
+ country: 'USA',
+ },
+ },
+ rank: 'E_7',
+ reportByDate: '2024-01-24',
+ ordersType: 'PERMANENT_CHANGE_OF_STATION',
+ orderNumber: 'ORDER4',
+ date_issued: '2021-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ {
+ id: 'testMoveID3',
+ moveCode: 'EXAMPL',
+ orderID: 'testOrderID3',
+ status: 'APPROVED',
+ orders: {
+ id: 'testOrder3',
+ destinationDutyLocation: {
+ id: 'testDDL3',
+ name: 'Fort Bragg East Station',
+ address: {
+ streetAddress1: '789 Pine Ave',
+ streetAddress2: 'Apartment 7000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90212',
+ country: 'USA',
+ },
+ },
+ originDutyLocation: {
+ id: 'testODL3',
+ name: 'Fort Bragg East Station',
+ address: {
+ streetAddress1: '789 Pine Ave',
+ streetAddress2: 'Apartment 7000',
+ streetAddress3: '',
+ city: 'Anytown',
+ state: 'AL',
+ postalCode: '90212',
+ country: 'USA',
+ },
+ },
+ rank: 'E_6',
+ reportByDate: '2024-01-26',
+ ordersType: 'PERMANENT_CHANGE_OF_STATION',
+ orderNumber: 'ORDER5',
+ date_issued: '2018-01-01',
+ },
+ mtoShipments: [
+ {
+ id: 'shipment1',
+ shipmentType: 'HHG',
+ status: 'APPROVED',
+ created_at: '2024-01-03 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment2',
+ shipmentType: 'PPM',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment3',
+ shipmentType: 'HHG_INTO_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment4',
+ shipmentType: 'HHG_OUTOF_NTS_DOMESTIC',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment5',
+ shipmentType: 'MOTORHOME',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_HAUL_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ {
+ id: 'shipment6',
+ shipmentType: 'BOAT_TOW_AWAY',
+ status: 'APPROVED',
+ created_at: '2024-01-05 15:28:28.468 -0600',
+ },
+ ],
+ },
+ ],
+};
+
+export const mockMovesNoCurrentOrPreviousMoves = {
+ currentMove: [],
+ previousMoves: [],
+};
+
+export default {
+ mockMovesPCS,
+ mockMovesRetirement,
+ mockMovesSeparation,
+ mockMovesNoPreviousMoves,
+ mockMovesNoCurrentMoveWithPreviousMoves,
+ mockMovesNoCurrentOrPreviousMoves,
+};
diff --git a/src/pages/MyMove/Orders.jsx b/src/pages/MyMove/Orders.jsx
index aa35ac2d51a..08da4a9f55b 100644
--- a/src/pages/MyMove/Orders.jsx
+++ b/src/pages/MyMove/Orders.jsx
@@ -10,6 +10,7 @@ import {
getOrdersForServiceMember,
createOrders,
patchOrders,
+ patchServiceMember,
getResponseError,
} from 'services/internalApi';
import {
@@ -81,16 +82,32 @@ export class Orders extends Component {
has_dependents: formatYesNoAPIValue(values.has_dependents),
report_by_date: formatDateForSwagger(values.report_by_date),
issue_date: formatDateForSwagger(values.issue_date),
- spouse_has_pro_gear: false, // TODO - this input seems to be deprecated?
+ grade: values.grade,
+ origin_duty_location_id: values.origin_duty_location.id,
+ spouse_has_pro_gear: false,
};
+ const payload = {
+ id: serviceMemberId,
+ rank: values.grade,
+ current_location_id: values.origin_duty_location.id,
+ };
+
+ patchServiceMember(payload)
+ .then(updateServiceMember)
+ .catch((e) => {
+ // Error shape: https://github.com/swagger-api/swagger-js/blob/master/docs/usage/http-client.md#errors
+ const { response } = e;
+ const errorMessage = getResponseError(response, 'failed to update service member due to server error');
+ this.setState({ serverError: errorMessage });
+ });
+
if (currentOrders?.id) {
pendingValues.id = currentOrders.id;
return patchOrders(pendingValues)
.then(updateOrders)
.then(handleNext)
.catch((e) => {
- // TODO - error handling - below is rudimentary error handling to approximate existing UX
// Error shape: https://github.com/swagger-api/swagger-js/blob/master/docs/usage/http-client.md#errors
const { response } = e;
const errorMessage = getResponseError(response, 'failed to update orders due to server error');
@@ -104,7 +121,6 @@ export class Orders extends Component {
.then(updateServiceMember)
.then(handleNext)
.catch((e) => {
- // TODO - error handling - below is rudimentary error handling to approximate existing UX
// Error shape: https://github.com/swagger-api/swagger-js/blob/master/docs/usage/http-client.md#errors
const { response } = e;
const errorMessage = getResponseError(response, 'failed to create orders due to server error');
@@ -118,6 +134,8 @@ export class Orders extends Component {
report_by_date: currentOrders?.report_by_date || '',
has_dependents: formatYesNoInputValue(currentOrders?.has_dependents),
new_duty_location: currentOrders?.new_duty_location || null,
+ grade: currentOrders?.grade || null,
+ origin_duty_location: currentOrders?.origin_duty_location || null,
};
// Only allow PCS unless feature flag is on
@@ -180,11 +198,12 @@ Orders.defaultProps = {
const mapStateToProps = (state) => {
const serviceMember = selectServiceMemberFromLoggedInUser(state);
+ const orders = selectCurrentOrders(state);
return {
serviceMemberId: serviceMember?.id,
currentOrders: selectCurrentOrders(state),
- currentDutyLocation: serviceMember?.current_location || {},
+ currentDutyLocation: orders?.origin_duty_location || {},
};
};
diff --git a/src/pages/MyMove/Orders.test.jsx b/src/pages/MyMove/Orders.test.jsx
index 22e951e2d2a..2541e76b6d6 100644
--- a/src/pages/MyMove/Orders.test.jsx
+++ b/src/pages/MyMove/Orders.test.jsx
@@ -189,6 +189,7 @@ describe('Orders page', () => {
name: 'Yuma AFB',
updated_at: '2020-10-19T17:01:16.114Z',
},
+ grade: 'E_1',
};
createOrders.mockImplementation(() => Promise.resolve(testOrdersValues));
@@ -199,11 +200,17 @@ describe('Orders page', () => {
await userEvent.type(screen.getByLabelText('Orders date'), '08 Nov 2020');
await userEvent.type(screen.getByLabelText('Report by date'), '26 Nov 2020');
await userEvent.click(screen.getByLabelText('No'));
+ await userEvent.selectOptions(screen.getByLabelText('Pay grade'), ['E_5']);
- // Test Duty Location Search Box interaction
+ // Test Current Duty Location Search Box interaction
+ await userEvent.type(screen.getByLabelText('Current duty location'), 'AFB', { delay: 100 });
+ const selectedOptionCurrent = await screen.findByText(/Altus/);
+ await userEvent.click(selectedOptionCurrent);
+
+ // Test New Duty Location Search Box interaction
await userEvent.type(screen.getByLabelText('New duty location'), 'AFB', { delay: 100 });
- const selectedOption = await screen.findByText(/Luke/);
- await userEvent.click(selectedOption);
+ const selectedOptionNew = await screen.findByText(/Luke/);
+ await userEvent.click(selectedOptionNew);
await waitFor(() => {
expect(screen.getByRole('form')).toHaveFormValues({
@@ -212,6 +219,8 @@ describe('Orders page', () => {
report_by_date: '26 Nov 2020',
has_dependents: 'no',
new_duty_location: 'Luke AFB',
+ grade: 'E_5',
+ origin_duty_location: 'Altus AFB',
});
});
@@ -266,6 +275,23 @@ describe('Orders page', () => {
name: 'Yuma AFB',
updated_at: '2020-10-19T17:01:16.114Z',
},
+ grade: 'E_1',
+ origin_duty_location: {
+ address: {
+ city: 'Altus AFB',
+ country: 'United States',
+ id: 'fa51dab0-4553-4732-b843-1f33407f77bd',
+ postalCode: '73523',
+ state: 'OK',
+ streetAddress1: 'n/a',
+ },
+ address_id: 'fa51dab0-4553-4732-b843-1f33407f77bd',
+ affiliation: 'AIR_FORCE',
+ created_at: '2021-02-11T16:48:04.117Z',
+ id: '93f0755f-6f35-478b-9a75-35a69211da1c',
+ name: 'Altus AFB',
+ updated_at: '2021-02-11T16:48:04.117Z',
+ },
};
getOrdersForServiceMember.mockImplementation(() => Promise.resolve(testOrdersValues));
@@ -306,6 +332,7 @@ describe('Orders page', () => {
name: 'Yuma AFB',
updated_at: '2020-10-19T17:01:16.114Z',
},
+ grade: 'E_1',
};
getOrdersForServiceMember.mockImplementation(() => Promise.resolve(testOrdersValues));
patchOrders.mockImplementation(() => Promise.resolve(testOrdersValues));
@@ -320,16 +347,9 @@ describe('Orders page', () => {
});
await userEvent.click(queryByRole('button', { name: 'Next' }));
- await waitFor(() => {
- expect(patchOrders).toHaveBeenCalled();
- });
-
- // updateOrders gets called twice: once on load, once on submit
expect(testProps.updateOrders).toHaveBeenNthCalledWith(1, testOrdersValues);
- expect(testProps.updateOrders).toHaveBeenNthCalledWith(2, testOrdersValues);
expect(getServiceMember).not.toHaveBeenCalled();
expect(testProps.updateServiceMember).not.toHaveBeenCalled();
- expect(mockNavigate).toHaveBeenCalledWith('/orders/upload');
});
});
@@ -352,6 +372,7 @@ describe('Orders page', () => {
issue_date: '2020-11-08',
report_by_date: '2020-11-26',
has_dependents: false,
+ grade: 'E_2',
new_duty_location: {
address: {
city: 'Des Moines',
@@ -370,6 +391,22 @@ describe('Orders page', () => {
name: 'Yuma AFB',
updated_at: '2020-10-19T17:01:16.114Z',
},
+ origin_duty_location: {
+ address: {
+ city: 'Altus AFB',
+ country: 'United States',
+ id: 'fa51dab0-4553-4732-b843-1f33407f77bd',
+ postalCode: '73523',
+ state: 'OK',
+ streetAddress1: 'n/a',
+ },
+ address_id: 'fa51dab0-4553-4732-b843-1f33407f77bd',
+ affiliation: 'AIR_FORCE',
+ created_at: '2021-02-11T16:48:04.117Z',
+ id: '93f0755f-6f35-478b-9a75-35a69211da1c',
+ name: 'Altus AFB',
+ updated_at: '2021-02-11T16:48:04.117Z',
+ },
};
getOrdersForServiceMember.mockImplementation(() => Promise.resolve(testOrdersValues));
diff --git a/src/pages/MyMove/Profile/ContactInfo.jsx b/src/pages/MyMove/Profile/ContactInfo.jsx
index 195177048d8..2b25f520797 100644
--- a/src/pages/MyMove/Profile/ContactInfo.jsx
+++ b/src/pages/MyMove/Profile/ContactInfo.jsx
@@ -49,10 +49,9 @@ export const ContactInfo = ({ serviceMember, updateServiceMember, userEmail }) =
return patchServiceMember(payload)
.then(updateServiceMember)
.then(() => {
- navigate(customerRoutes.CURRENT_DUTY_LOCATION_PATH);
+ navigate(customerRoutes.CURRENT_ADDRESS_PATH);
})
.catch((e) => {
- // TODO - error handling - below is rudimentary error handling to approximate existing UX
// Error shape: https://github.com/swagger-api/swagger-js/blob/master/docs/usage/http-client.md#errors
const { response } = e;
const errorMessage = getResponseError(response, 'failed to update service member due to server error');
diff --git a/src/pages/MyMove/Profile/ContactInfo.test.jsx b/src/pages/MyMove/Profile/ContactInfo.test.jsx
index dcce98c5e8a..37e0e5ce4f1 100644
--- a/src/pages/MyMove/Profile/ContactInfo.test.jsx
+++ b/src/pages/MyMove/Profile/ContactInfo.test.jsx
@@ -56,7 +56,7 @@ describe('ContactInfo page', () => {
});
});
- it('next button submits the form and goes to the Name step', async () => {
+ it('next button submits the form and goes to the current address step', async () => {
patchServiceMember.mockImplementation(() => Promise.resolve(testServiceMemberValues));
// Need to provide initial values because we aren't testing the form here, and just want to submit immediately
@@ -71,7 +71,7 @@ describe('ContactInfo page', () => {
});
expect(testProps.updateServiceMember).toHaveBeenCalledWith(testServiceMemberValues);
- expect(mockNavigate).toHaveBeenCalledWith('/service-member/current-duty');
+ expect(mockNavigate).toHaveBeenCalledWith('/service-member/current-address');
});
it('shows an error if the API returns an error', async () => {
@@ -207,9 +207,6 @@ describe('requireCustomerState ContactInfo', () => {
telephone: '1234567890',
personal_email: 'test@example.com',
email_is_preferred: true,
- current_location: {
- id: 'testDutyLocationId',
- },
residential_address: {
street: '123 Main St',
},
@@ -256,9 +253,6 @@ describe('requireCustomerState ContactInfo', () => {
telephone: '1234567890',
personal_email: 'test@example.com',
email_is_preferred: true,
- current_location: {
- id: 'testDutyLocationId',
- },
residential_address: {
street: '123 Main St',
},
diff --git a/src/pages/MyMove/Profile/DodInfo.jsx b/src/pages/MyMove/Profile/DodInfo.jsx
index 283b43c0a5e..9a669a64109 100644
--- a/src/pages/MyMove/Profile/DodInfo.jsx
+++ b/src/pages/MyMove/Profile/DodInfo.jsx
@@ -21,7 +21,6 @@ export const DodInfo = ({ updateServiceMember, serviceMember }) => {
const initialValues = {
affiliation: serviceMember?.affiliation || '',
edipi: serviceMember?.edipi || '',
- grade: serviceMember?.rank || '',
};
const handleBack = () => {
@@ -37,14 +36,12 @@ export const DodInfo = ({ updateServiceMember, serviceMember }) => {
id: serviceMember.id,
affiliation: values.affiliation,
edipi: values.edipi,
- rank: values.grade,
};
return patchServiceMember(payload)
.then(updateServiceMember)
.then(handleNext)
.catch((e) => {
- // TODO - error handling - below is rudimentary error handling to approximate existing UX
// Error shape: https://github.com/swagger-api/swagger-js/blob/master/docs/usage/http-client.md#errors
const { response } = e;
const errorMessage = getResponseError(response, 'failed to update service member due to server error');
diff --git a/src/pages/MyMove/Profile/DodInfo.test.jsx b/src/pages/MyMove/Profile/DodInfo.test.jsx
index d26a995b133..b866502d9cf 100644
--- a/src/pages/MyMove/Profile/DodInfo.test.jsx
+++ b/src/pages/MyMove/Profile/DodInfo.test.jsx
@@ -55,7 +55,6 @@ describe('DodInfo page', () => {
id: 'testServiceMemberId',
affiliation: 'ARMY',
edipi: '9999999999',
- rank: 'E_2',
};
patchServiceMember.mockImplementation(() => Promise.resolve(testServiceMemberValues));
@@ -80,7 +79,6 @@ describe('DodInfo page', () => {
id: 'testServiceMemberId',
affiliation: 'ARMY',
edipi: '9999999999',
- rank: 'E_2',
};
patchServiceMember.mockImplementation(() =>
@@ -162,7 +160,6 @@ describe('requireCustomerState DodInfo', () => {
serviceMembers: {
testServiceMemberId: {
id: 'testServiceMemberId',
- rank: 'test rank',
edipi: '1234567890',
affiliation: 'ARMY',
first_name: 'Tester',
@@ -199,7 +196,6 @@ describe('requireCustomerState DodInfo', () => {
serviceMembers: {
testServiceMemberId: {
id: 'testServiceMemberId',
- rank: 'test rank',
edipi: '1234567890',
affiliation: 'ARMY',
first_name: 'Tester',
diff --git a/src/pages/MyMove/Profile/EditContactInfo.jsx b/src/pages/MyMove/Profile/EditContactInfo.jsx
index 0615dc23d69..820ffb1b997 100644
--- a/src/pages/MyMove/Profile/EditContactInfo.jsx
+++ b/src/pages/MyMove/Profile/EditContactInfo.jsx
@@ -1,7 +1,7 @@
import PropTypes from 'prop-types';
import React, { useState } from 'react';
import { connect } from 'react-redux';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
import { Alert, Grid, GridContainer } from '@trussworks/react-uswds';
import EditContactInfoForm, {
@@ -28,6 +28,7 @@ export const EditContactInfo = ({
updateServiceMember,
}) => {
const navigate = useNavigate();
+ const { state } = useLocation();
const [serverError, setServerError] = useState(null);
const initialValues = {
@@ -58,7 +59,7 @@ export const EditContactInfo = ({
};
const handleCancel = () => {
- navigate(customerRoutes.PROFILE_PATH);
+ navigate(customerRoutes.PROFILE_PATH, { state });
};
const handleSubmit = async (values) => {
@@ -117,11 +118,9 @@ export const EditContactInfo = ({
.then(updateServiceMember)
.then(() => {
setFlashMessage('EDIT_CONTACT_INFO_SUCCESS', 'success', "You've updated your information.");
- navigate(customerRoutes.PROFILE_PATH);
+ navigate(customerRoutes.PROFILE_PATH, { state });
})
.catch((e) => {
- // // TODO - error handling - below is rudimentary error handling to approximate existing UX
- // // Error shape: https://github.com/swagger-api/swagger-js/blob/master/docs/usage/http-client.md#errors
const { response } = e;
const errorMessage = getResponseError(response, 'Failed to update service member due to server error');
diff --git a/src/pages/MyMove/Profile/EditContactInfo.test.jsx b/src/pages/MyMove/Profile/EditContactInfo.test.jsx
index 60496e1f611..2ef1a74120b 100644
--- a/src/pages/MyMove/Profile/EditContactInfo.test.jsx
+++ b/src/pages/MyMove/Profile/EditContactInfo.test.jsx
@@ -6,6 +6,7 @@ import { EditContactInfo } from './EditContactInfo';
import { patchBackupContact, patchServiceMember } from 'services/internalApi';
import { customerRoutes } from 'constants/routes';
+import { MockProviders } from 'testUtils';
const mockNavigate = jest.fn();
jest.mock('react-router-dom', () => ({
@@ -62,7 +63,11 @@ describe('EditContactInfo page', () => {
};
it('renders the EditContactInfo form', async () => {
- render(
+
+ -
+
- Move Status +
- {move.status || '-'} +
- Orders Issue Date +
- {orders.date_issued || '-'} +
- Orders Type +
- {orders.ordersType || '-'} +
- {getReportByLabel(orders.ordersType)} +
- {orders.reportByDate || '-'} +
- Current Duty Location +
- {formatAddress(orders.originDutyLocation.address) || '-'} +
- {getDestinationDutyLocationLabel(orders.ordersType)} +
- {formatAddress(orders.destinationDutyLocation.address) || '-'} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Return to Move
-
You can change these details later by talking to a move counselor or customer care representative.
)}
+ {needsToVerifyProfile && (
+
+ Please verify & confirm your profile before starting the process of creating your move.
+
+ )}
({
+ ...jest.requireActual('react-router-dom'),
+ useLocation: jest.fn(),
+}));
+
describe('Profile component', () => {
const testProps = {};
@@ -82,6 +88,8 @@ describe('Profile component', () => {
},
},
};
+ useLocation.mockReturnValue({});
+
render(
+ ,
+ );
+
+ const returnToDashboardLink = screen.getByText('Return to Dashboard');
+ expect(returnToDashboardLink).toBeInTheDocument();
+
+ const createMoveBtn = screen.getByTestId('createMoveBtn');
+ expect(createMoveBtn).toBeInTheDocument();
+
+ const profileConfirmAlert = screen.getByTestId('profileConfirmAlert');
+ expect(profileConfirmAlert).toBeInTheDocument();
+ });
});
diff --git a/src/pages/MyMove/Profile/ResidentialAddress.jsx b/src/pages/MyMove/Profile/ResidentialAddress.jsx
index 5ded3deee6a..32884504b62 100644
--- a/src/pages/MyMove/Profile/ResidentialAddress.jsx
+++ b/src/pages/MyMove/Profile/ResidentialAddress.jsx
@@ -52,7 +52,7 @@ export const ResidentialAddress = ({ serviceMember, updateServiceMember }) => {
};
const handleBack = () => {
- navigate(customerRoutes.CURRENT_DUTY_LOCATION_PATH);
+ navigate(customerRoutes.CONTACT_INFO_PATH);
};
const handleNext = () => {
@@ -69,7 +69,6 @@ export const ResidentialAddress = ({ serviceMember, updateServiceMember }) => {
.then(updateServiceMember)
.then(handleNext)
.catch((e) => {
- // TODO - error handling - below is rudimentary error handling to approximate existing UX
// Error shape: https://github.com/swagger-api/swagger-js/blob/master/docs/usage/http-client.md#errors
const { response } = e;
const errorMessage = getResponseError(response, 'failed to update service member due to server error');
@@ -125,4 +124,4 @@ const mapStateToProps = (state) => ({
export default connect(
mapStateToProps,
mapDispatchToProps,
-)(requireCustomerState(ResidentialAddress, profileStates.DUTY_LOCATION_COMPLETE));
+)(requireCustomerState(ResidentialAddress, profileStates.CONTACT_INFO_COMPLETE));
diff --git a/src/pages/MyMove/Profile/ResidentialAddress.test.jsx b/src/pages/MyMove/Profile/ResidentialAddress.test.jsx
index f25785deffe..3cd61e9460c 100644
--- a/src/pages/MyMove/Profile/ResidentialAddress.test.jsx
+++ b/src/pages/MyMove/Profile/ResidentialAddress.test.jsx
@@ -79,7 +79,7 @@ describe('ResidentialAddress page', () => {
});
});
- it('back button goes to the Current duty location step', async () => {
+ it('back button goes to the contact info step', async () => {
const testProps = generateTestProps(blankAddress);
render(
- ,
- );
- const wt = wrapper.find('WeightTicket');
- if (formInvalid !== undefined) {
- wt.instance().invalid = jest.fn().mockReturnValue(formInvalid);
- wt.instance().uploaderWithInvalidState = jest.fn().mockReturnValue(uploaderWithInvalidState);
- }
- wt.setState({ additionalWeightTickets: moreWeightTickets, ...initialState });
- wt.update();
- return wrapper.find('WeightTicket');
-}
-
-describe('Weight tickets page', () => {
- describe('Service member is missing a weight ticket', () => {
- it('renders both the Save buttons are disabled', () => {
- const weightTicket = mountComponents('No', true, true);
- const buttonGroup = weightTicket.find(PPMPaymentRequestActionBtns);
- const finishLater = weightTicket.find('button').at(0);
- const saveAndAdd = weightTicket.find('button').at(1);
-
- expect(buttonGroup.length).toEqual(1);
- expect(saveAndAdd.props().disabled).toEqual(true);
- expect(finishLater.props().disabled).not.toEqual(true);
- });
- });
- describe('Service member chooses CAR as weight ticket type', () => {
- it('renders vehicle make and model fields', () => {
- const weightTicket = mountComponents('No', true, true, 'CAR');
- const vehicleNickname = weightTicket.find('[data-testid="vehicle_nickname"]');
- const vehicleMake = weightTicket.find('[data-testid="vehicle_make"]');
- const vehicleModel = weightTicket.find('[data-testid="vehicle_model"]');
-
- expect(vehicleNickname.length).toEqual(0);
- expect(vehicleMake.length).toEqual(1);
- expect(vehicleModel.length).toEqual(1);
- });
- });
- describe('Service member chooses BOX TRUCK as weight ticket type', () => {
- it('renders vehicle nickname field', () => {
- const weightTicket = mountComponents('No', true, true, 'BOX_TRUCK');
- const vehicleNickname = weightTicket.find('[data-testid="vehicle_nickname"]');
- const vehicleMake = weightTicket.find('[data-testid="vehicle_make"]');
- const vehicleModel = weightTicket.find('[data-testid="vehicle_model"]');
-
- expect(vehicleNickname.length).toEqual(1);
- expect(vehicleMake.length).toEqual(0);
- expect(vehicleModel.length).toEqual(0);
- });
- });
- describe('Service member chooses PROGEAR as weight ticket type', () => {
- it('renders vehicle nickname (progear type) field', () => {
- const weightTicket = mountComponents('No', true, true, 'PRO_GEAR');
- const vehicleNickname = weightTicket.find('[data-testid="vehicle_nickname"]');
- const vehicleMake = weightTicket.find('[data-testid="vehicle_make"]');
- const vehicleModel = weightTicket.find('[data-testid="vehicle_model"]');
-
- expect(vehicleNickname.length).toEqual(1);
- expect(vehicleMake.length).toEqual(0);
- expect(vehicleModel.length).toEqual(0);
- });
- });
- describe('Service member has uploaded both a weight tickets', () => {
- it('renders both the Save buttons are enabled', () => {
- const weightTicket = mountComponents('No', false, false);
- const buttonGroup = weightTicket.find(PPMPaymentRequestActionBtns);
- const finishLater = weightTicket.find('button').at(0);
- const saveAndAdd = weightTicket.find('button').at(1);
-
- expect(buttonGroup.length).toEqual(1);
- expect(saveAndAdd.props().disabled).toEqual(false);
- expect(finishLater.props().disabled).not.toEqual(true);
- });
- });
- describe('Service member answers "Yes" that they have more weight tickets', () => {
- it('renders Save and Add Another Button', () => {
- const weightTicket = mountComponents('Yes');
- const buttonGroup = weightTicket.find(PPMPaymentRequestActionBtns);
- expect(buttonGroup.length).toEqual(1);
- expect(buttonGroup.props().nextBtnLabel).toEqual('Save & Add Another');
- });
- });
- describe('Service member answers "No" that they have more weight tickets', () => {
- it('renders Save and Add Continue Button', () => {
- const weightTicket = mountComponents('No');
- const buttonGroup = weightTicket.find(PPMPaymentRequestActionBtns);
- expect(buttonGroup.length).toEqual(1);
- expect(buttonGroup.props().nextBtnLabel).toEqual('Save & Continue');
- });
- });
-});
-
-describe('uploaderWithInvalidState', () => {
- it('returns true when there are no uploaders', () => {
- const weightTicket = mountComponents('No');
- const uploaders = {
- emptyWeight: { uploaderRef: {} },
- fullWeight: { uploaderRef: {} },
- trailer: { uploaderRef: {} },
- };
- weightTicket.instance().uploaders = uploaders;
- uploaders.emptyWeight.uploaderRef.isEmpty = jest.fn(() => false);
- uploaders.emptyWeight.isMissingChecked = jest.fn(() => false);
- uploaders.fullWeight.uploaderRef.isEmpty = jest.fn(() => false);
- uploaders.fullWeight.isMissingChecked = jest.fn(() => false);
-
- expect(weightTicket.instance().uploaderWithInvalidState()).toEqual(false);
- });
- it('returns false when uploaders have at least one file and isMissing is not checked', () => {
- const weightTicket = mountComponents('No');
- const uploaders = {
- emptyWeight: { uploaderRef: {} },
- fullWeight: { uploaderRef: {} },
- trailer: { uploaderRef: {} },
- };
- uploaders.emptyWeight.uploaderRef.isEmpty = jest.fn(() => false);
- uploaders.emptyWeight.isMissingChecked = jest.fn(() => false);
- uploaders.fullWeight.uploaderRef.isEmpty = jest.fn(() => false);
- uploaders.fullWeight.isMissingChecked = jest.fn(() => false);
- weightTicket.instance().uploaders = uploaders;
-
- expect(weightTicket.instance().uploaderWithInvalidState()).toEqual(false);
- });
- it('returns true when uploaders have at least one file and isMissing is checked', () => {
- const weightTicket = mountComponents('No');
- const uploaders = {
- emptyWeight: { uploaderRef: {} },
- fullWeight: { uploaderRef: {} },
- trailer: { uploaderRef: {} },
- };
- uploaders.emptyWeight.uploaderRef.isEmpty = jest.fn(() => false);
- uploaders.emptyWeight.isMissingChecked = jest.fn(() => false);
- uploaders.fullWeight.uploaderRef.isEmpty = jest.fn(() => false);
- uploaders.fullWeight.isMissingChecked = jest.fn(() => true);
- weightTicket.instance().uploaders = uploaders;
-
- expect(weightTicket.instance().uploaderWithInvalidState()).toEqual(true);
- });
-});
diff --git a/src/scenes/Moves/Ppm/WeightTicketExamples.jsx b/src/scenes/Moves/Ppm/WeightTicketExamples.jsx
deleted file mode 100644
index f0594f77622..00000000000
--- a/src/scenes/Moves/Ppm/WeightTicketExamples.jsx
+++ /dev/null
@@ -1,135 +0,0 @@
-import React from 'react';
-import { useNavigate } from 'react-router-dom';
-
-import weightTixExample from 'shared/images/weight_tix_example.png';
-import weightScenario1 from 'shared/images/weight_scenario1.png';
-import weightScenario2 from 'shared/images/weight_scenario2.png';
-import weightScenario3 from 'shared/images/weight_scenario3.png';
-import weightScenario4 from 'shared/images/weight_scenario4.png';
-import weightScenario5 from 'shared/images/weight_scenario5.png';
-
-function WeightTicketExamples(props) {
- const navigate = useNavigate();
- function goBack() {
- navigate(-1);
- }
- return (
-
Profile
+ {needsToVerifyProfile ? ( + Return to Dashboard + ) : ( + Return to Move + )} +
+
{showMessages && (
Profile
+ {needsToVerifyProfile && ( + + )} +
-
- );
-}
-
-export default AllowableExpenses;
diff --git a/src/scenes/Moves/Ppm/CustomerAgreementLegalese.js b/src/scenes/Moves/Ppm/CustomerAgreementLegalese.js
deleted file mode 100644
index 246f28c6ca6..00000000000
--- a/src/scenes/Moves/Ppm/CustomerAgreementLegalese.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import React from 'react';
-import { useNavigate } from 'react-router-dom';
-
-function CustomerAgreementLegalese(props) {
- const navigate = useNavigate();
- function goBack() {
- navigate(-1);
- }
-
- return (
-
-
-
-
-
-
- Gas and fuel expenses
-
-
- When are receipts required?
-
-
-
-
- {'<'} Back
-
-
- Storage & Moving Expenses
-- Storage expenses are a special expense that is reimbursable for up to 90 - days. You can be directly repaid for those expenses. -
-- The IRS considers the rest of your PPM payment as taxable income. You’ll receive a separate W-2 for any PPM - payment. -
-- Moving-related expenses can be claimed in order to reduce the taxable - amount of your payment. Your{' '} - - local finance office - {' '} - or a tax professional can help you identify qualifying expenses. You can also consult{' '} - - IRS Publication 521 - {' '} - for authoritative information. -
-- Save your receipts. It’s better to have receipts you don’t need than to need receipts you - don’t have. -
--
-
- -
-
- Consumable packing materials -
- Contracted expenses -
- Oil -
- Rental equipment -
- Tolls -
- Weighing fees -
- Gas, exceeding travel allowance (see below) -
-
- -
-
- Animal costs (kennels, transportation) -
- Extra drivers -
- Hitch fees and tow bars -
- Locks -
- Meals and lodging -
- Moving insurance -
- Oil change and routine maintenance -
- Purchased auto transporters and dollies -
- Sales tax -
- Tire chains -
- Gas, under travel allowance (see details following) -
-
Gas and fuel expenses are not reimbursable.
-If you rented a vehicle to perform your move, you can claim gas expenses for tax purposes.
-- You can not claim expenses for fuel for your own vehicles. You will be reimbursed for that fuel via DTS - when you claim your mileage. The IRS does not allow you to claim an expense twice, and may audit you if - you do so. -
-- There is one rare exception: If your fuel expenses exceed the amount paid for mileage and per diem fees on - your travel pay. You may claim the portion of your fuel expenses for your own vehicles that exceeds that - amount. -
-You must have receipts for contracted expenses, storage facilities, and any expense over $75.
-- You will need receipts for expenses under $75 if multiple expenses in that same category add up to more - than $75. -
-- Again, it’s better to have receipts you don’t need than to be missing receipts that you do need. We - recommend saving all your moving receipts. -
-- If you are missing a receipt, you can go online and print a new copy of your receipt (if you can). - Otherwise, write and sign a statement that explains why the receipt is missing. Contact your{' '} - - local finance office - {' '} - for assistance. -
-
-
-
-
-
- );
-}
-
-export default CustomerAgreementLegalese;
diff --git a/src/scenes/Moves/Ppm/DateAndLocation.css b/src/scenes/Moves/Ppm/DateAndLocation.css
deleted file mode 100644
index 0971e8af619..00000000000
--- a/src/scenes/Moves/Ppm/DateAndLocation.css
+++ /dev/null
@@ -1,24 +0,0 @@
-label.inline_radio {
- margin-top: 1px;
- margin-bottom: 1px;
-}
-
-h2 {
- margin-top: 1em;
-}
-
-.grey {
- color: rgb(100, 100, 100);
-}
-
-.days-in-storage > input {
- max-width: 100px;
-}
-
-.storage-estimate {
- margin-top: 3rem;
- background-color: #f4f2f2;
- border: 1px solid #cccccc;
- padding: 1em;
- max-width: 700px;
-}
diff --git a/src/scenes/Moves/Ppm/Expenses.css b/src/scenes/Moves/Ppm/Expenses.css
deleted file mode 100644
index 1235cb3d05b..00000000000
--- a/src/scenes/Moves/Ppm/Expenses.css
+++ /dev/null
@@ -1,57 +0,0 @@
-.expenses-container {
- padding-top: 2em;
-}
-
-.expenses-header {
- margin-bottom: 0.5em;
-}
-
-.expenses-container > p {
- margin-bottom: 0;
- margin-top: 0;
-}
-
-.expenses-container .dashed-divider {
- margin-top: 0;
-}
-
-.expenses-container .expenses-uploader {
- padding-top: 2em;
-}
-
-.expenses-container a:visited {
- color: #0071bc;
-}
-
-.expenses-list {
- margin-bottom: 1em;
-}
-
-.has-expenses-radio-group {
- margin-top: 1em;
- margin-bottom: 3.5em;
-}
-
-.payment-method-radio-group-wrapper {
- margin-bottom: 0;
- line-height: 1.8em;
- margin-top: 1.8em;
-}
-
-.expenses-group-header {
- margin: 1.8em 0 -0.5em 0;
-}
-
-.expense-form-element > label {
- margin: 1.5em 0 0 0;
-}
-
-.expenses-form-group {
- /*border: red solid;*/
- margin: 0 2em 0 0;
-}
-
-.expenses-form-group > label {
- margin: 1em 0 0 0;
-}
-
diff --git a/src/scenes/Moves/Ppm/ExpensesLanding.jsx b/src/scenes/Moves/Ppm/ExpensesLanding.jsx
deleted file mode 100644
index e37f9265bb9..00000000000
--- a/src/scenes/Moves/Ppm/ExpensesLanding.jsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import React, { Component } from 'react';
-import { Link } from 'react-router-dom';
-
-import WizardHeader from '../WizardHeader';
-
-import PPMPaymentRequestActionBtns from './PPMPaymentRequestActionBtns';
-
-import { ProgressTimeline, ProgressTimelineStep } from 'shared/ProgressTimeline';
-import RadioButton from 'shared/RadioButton';
-
-import './Expenses.css';
-import { connect } from 'react-redux';
-
-import DocumentsUploaded from './PaymentReview/DocumentsUploaded';
-
-import withRouter from 'utils/routing';
-
-const reviewPagePath = '/ppm-payment-review';
-const nextPagePath = '/ppm-expenses';
-
-class ExpensesLanding extends Component {
- state = {
- hasExpenses: '',
- };
-
- handleRadioChange = (event) => {
- this.setState({
- [event.target.name]: event.target.value,
- });
- };
-
- saveAndAddHandler = () => {
- const {
- moveId,
- router: { navigate },
- } = this.props;
- const { hasExpenses } = this.state;
- if (hasExpenses === 'No') {
- return navigate(`/moves/${moveId}${reviewPagePath}`);
- }
- return navigate(`/moves/${moveId}${nextPagePath}`);
- };
-
- render() {
- const { hasExpenses } = this.state;
- const {
- router: { navigate },
- moveId,
- } = this.props;
- return (
-
-
-
-
-
-
- {'<'} Back
-
-
- Customer Agreement
-- Before submitting your payment request, please carefully read the following: -
-
-
- LEGAL AGREEMENT / PRIVACY ACT
-Financial Liability:
- If this shipment(s) incurs costs above the allowance I am entitled to, I will pay the difference to the - government, or consent to the collection from my pay as necessary to cover all excess costs associated by - this shipment(s). -Advance Obligation:
-- I understand that the maximum advance allowed is based on the estimated weight and scheduled departure - date of my shipment(s). In the event, less weight is moved or my move occurs on a different scheduled - departure date, I may have to remit the difference with the balance of my incentive disbursement and/or - from the collection of my pay as may be necessary. -
-- I understand that the maximum advance allowed is based on the estimated weight and scheduled departure - date of my shipment(s). In the event, less weight is moved or my move occurs on a different scheduled - departure date, I may have to remit the difference with the balance of my incentive disbursement and/or - from the collection of my pay as may be necessary. If I receive an advance for my PPM shipment, I agree to - furnish weight tickets within 45 days of final delivery to my destination. I understand that failure to - furnish weight tickets within this timeframe may lead to the collection of my pay as necessary to cover - the cost of the advance. -
-
-
-
-
-
-
- );
- }
-}
-
-function mapStateToProps(state, { router: { params } }) {
- const { moveId } = params;
- return {
- moveId,
- };
-}
-
-export default withRouter(connect(mapStateToProps)(ExpensesLanding));
diff --git a/src/scenes/Moves/Ppm/ExpensesUpload.jsx b/src/scenes/Moves/Ppm/ExpensesUpload.jsx
deleted file mode 100644
index e24c16a3315..00000000000
--- a/src/scenes/Moves/Ppm/ExpensesUpload.jsx
+++ /dev/null
@@ -1,354 +0,0 @@
-import React, { Component } from 'react';
-import { get, isEmpty, map } from 'lodash';
-import { Link } from 'react-router-dom';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { getFormValues, reduxForm } from 'redux-form';
-import { connect } from 'react-redux';
-
-import WizardHeader from '../WizardHeader';
-
-import PPMPaymentRequestActionBtns from './PPMPaymentRequestActionBtns';
-import DocumentsUploaded from './PaymentReview/DocumentsUploaded';
-
-import { ProgressTimeline, ProgressTimelineStep } from 'shared/ProgressTimeline';
-import { convertDollarsToCents } from 'shared/utils';
-import RadioButton from 'shared/RadioButton';
-import { SwaggerField } from 'shared/JsonSchemaForm/JsonSchemaField';
-import Uploader from 'shared/Uploader';
-import Checkbox from 'shared/Checkbox';
-import {
- createMovingExpenseDocument,
- selectPPMCloseoutDocumentsForMove,
-} from 'shared/Entities/modules/movingExpenseDocuments';
-import Alert from 'shared/Alert';
-import { getMoveDocumentsForMove } from 'shared/Entities/modules/moveDocuments';
-import { withContext } from 'shared/AppContext';
-import { documentSizeLimitMsg } from 'shared/constants';
-import { selectCurrentPPM } from 'store/entities/selectors';
-import withRouter from 'utils/routing';
-
-const nextPagePath = '/ppm-payment-review';
-const nextBtnLabels = {
- SaveAndAddAnother: 'Save & Add Another',
- SaveAndContinue: 'Save & Continue',
-};
-
-const paymentMethods = {
- Other: 'OTHER',
- GTCC: 'GTCC',
-};
-
-const uploadReceipt =
- 'Drag & drop or click to upload receipt';
-
-class ExpensesUpload extends Component {
- state = { ...this.initialState };
-
- get initialState() {
- return {
- paymentMethod: paymentMethods.GTCC,
- uploaderIsIdle: true,
- missingReceipt: false,
- expenseType: '',
- haveMoreExpenses: 'No',
- moveDocumentCreateError: false,
- };
- }
-
- componentDidMount() {
- const { moveId } = this.props;
- this.props.getMoveDocumentsForMove(moveId);
- }
-
- handleRadioChange = (event) => {
- this.setState({
- [event.target.name]: event.target.value,
- });
- };
-
- skipHandler = () => {
- const {
- moveId,
- router: { navigate },
- } = this.props;
- navigate(`/moves/${moveId}${nextPagePath}`);
- };
-
- isStorageExpense = (formValues) => {
- return !isEmpty(formValues) && formValues.moving_expense_type === 'STORAGE';
- };
-
- saveAndAddHandler = (formValues) => {
- const {
- moveId,
- currentPpm,
- router: { navigate },
- } = this.props;
-
- const { paymentMethod, missingReceipt, haveMoreExpenses } = this.state;
- const {
- storage_start_date,
- storage_end_date,
- moving_expense_type: movingExpenseType,
- requested_amount_cents: requestedAmountCents,
- } = formValues;
-
- const files = this.uploader.getFiles();
- const uploadIds = map(files, 'id');
- const personallyProcuredMoveId = currentPpm ? currentPpm.id : null;
- const title = this.isStorageExpense(formValues) ? 'Storage Expense' : formValues.title;
- return this.props
- .createMovingExpenseDocument({
- moveId,
- personallyProcuredMoveId,
- uploadIds,
- title,
- movingExpenseType,
- moveDocumentType: 'EXPENSE',
- requestedAmountCents: convertDollarsToCents(requestedAmountCents),
- paymentMethod,
- notes: '',
- missingReceipt,
- storage_start_date,
- storage_end_date,
- })
- .then(() => {
- this.cleanup();
- if (haveMoreExpenses === 'No') {
- navigate(`/moves/${moveId}${nextPagePath}`);
- }
- })
- .catch((e) => {
- this.setState({ moveDocumentCreateError: true });
- });
- };
-
- cleanup = () => {
- const { reset } = this.props;
- this.uploader.clearFiles();
- reset();
- this.setState({ ...this.initialState });
- };
-
- onAddFile = () => {
- this.setState({
- uploaderIsIdle: false,
- });
- };
-
- onChange = (newUploads, uploaderIsIdle) => {
- this.setState({
- uploaderIsIdle,
- });
- };
-
- handleCheckboxChange = (event) => {
- this.setState({
- [event.target.name]: event.target.checked,
- });
- };
-
- handleHowDidYouPayForThis = () => {
- alert('Cash, personal credit card, check — any payment method that’s not your GTCC.');
- };
-
- isInvalidUploaderState = () => {
- const { missingReceipt } = this.state;
- const receiptUploaded = this.uploader && !this.uploader.isEmpty();
- return missingReceipt === receiptUploaded;
- };
-
- render() {
- const { missingReceipt, paymentMethod, haveMoreExpenses, moveDocumentCreateError } = this.state;
- const { moveDocSchema, formValues, isPublic, handleSubmit, submitting, expenses, expenseSchema, invalid, moveId } =
- this.props;
- const nextBtnLabel = haveMoreExpenses === 'Yes' ? nextBtnLabels.SaveAndAddAnother : nextBtnLabels.SaveAndContinue;
- const hasMovingExpenseType = !isEmpty(formValues) && formValues.moving_expense_type !== '';
- const isStorageExpense = this.isStorageExpense(formValues);
- const expenseNumber = expenses.length + 1;
- return (
-
-
-
-
-
-
-
-
- {}}
- nextBtnLabel="Continue"
- saveAndAddHandler={this.saveAndAddHandler}
- finishLaterHandler={() => navigate('/')}
- submitButtonsAreDisabled={!hasExpenses}
- />
-
- Do you have any storage or moving expenses?
--
-
- - Storage expenses are reimbursable. - -
- - Claimable moving expenses (such as weighing fees, rental equipment, or tolls){' '} - reduce taxes on your payment. - -
-
-
-
-
- );
- }
-}
-
-const formName = 'expense_document_upload';
-ExpensesUpload = reduxForm({ form: formName })(ExpensesUpload);
-
-function mapStateToProps(state, props) {
- const {
- router: { params: moveId },
- } = props;
-
- return {
- moveId,
- formValues: getFormValues(formName)(state),
- moveDocSchema: get(state, 'swaggerInternal.spec.definitions.MoveDocumentPayload', {}),
- expenseSchema: get(state, 'swaggerInternal.spec.definitions.CreateMovingExpenseDocumentPayload', {}),
- currentPpm: selectCurrentPPM(state) || {},
- expenses: selectPPMCloseoutDocumentsForMove(state, moveId, ['EXPENSE']),
- };
-}
-
-const mapDispatchToProps = {
- // TODO we can possibly remove selectPPMCloseoutDocumentsForMove and
- // getMoveDocumentsForMove once the document reviewer component is added
- // as it may be possible to get the number of expenses from that.
- selectPPMCloseoutDocumentsForMove,
- getMoveDocumentsForMove,
- createMovingExpenseDocument,
-};
-
-export default withContext(withRouter(connect(mapStateToProps, mapDispatchToProps)(ExpensesUpload)));
diff --git a/src/scenes/Moves/Ppm/PPMPaymentRequest.css b/src/scenes/Moves/Ppm/PPMPaymentRequest.css
deleted file mode 100644
index 3d4b0f8d578..00000000000
--- a/src/scenes/Moves/Ppm/PPMPaymentRequest.css
+++ /dev/null
@@ -1,168 +0,0 @@
-.ppm-payment-req-intro .title,
-.allowable-expenses-container .title,
-.weight-ticket-example-container .title {
- font-size: 2.2rem;
-}
-
-.weight-ticket-example-container .subheader {
- margin-bottom: 10px;
- font-weight: bold;
-}
-
-.weight-ticket-example-container p {
- margin: 0;
-}
-
-.trailer-criteria-container .title {
- font-size: 2.2rem;
- margin-bottom: 0;
-}
-
-.trailer-criteria-container .list-header {
- margin: 25px 0 25px 0;
- padding-left: 0;
-}
-
-.trailer-criteria-container p {
- margin-bottom: 5px;
- margin-top: 0;
-}
-
-.weight-ticket-example-img {
- vertical-align: middle;
-}
-
-.dashed-divider {
- margin-top: 1rem;
- border-bottom: 1px dashed #e9e8e8;
-}
-
-.ppm-payment-req-intro a:visited {
- color: #0071bc; /* original link color */
-}
-
-.color_blue_link {
- color: #205493;
-}
-
-.ppm-payment-request-footer {
- border-top: 1px solid black;
- display: flex;
- justify-content: space-between;
- flex-direction: row;
- border-top: 1px solid black;
- margin-top: 2.3rem;
- padding-top: 1.5rem;
- width: 100%;
-}
-
-@media only screen and (max-width: 481px) {
- .ppm-payment-request-footer {
- flex-direction: column;
- }
-
- .ppm-payment-request-footer .usa-button-secondary {
- width: 50%;
- margin-left: 0px;
- }
-
- .ppm-payment-request-footer .body--heading {
- flex-wrap: wrap;
- }
-}
-
-.allowable-expenses-container li {
- margin-bottom: 0px;
-}
-
-.allowable-expenses-container p {
- line-height: normal;
- margin-bottom: 1em;
- margin-top: 0.5em;
-}
-
-.allowable-expenses-container .icon {
- margin-left: 0px;
-}
-
-.button-bar {
- border-top: 1px solid black;
- margin-top: 2.3rem;
- padding-top: 1rem;
-}
-
-.text-gray {
- color: #767676;
-}
-
-.secondary-label {
- font-size: 1.5rem;
-}
-
-.dashed-divider {
- border-bottom: 1px dashed #e9e8e8;
- padding: 1rem;
-}
-
-.radio-group-header {
- margin-top: 1em;
- margin-bottom: 0.5em;
-}
-
-.radio-group-wrapper {
- margin-bottom: 2em;
-}
-
-.short-field {
- max-width: 46rem;
- display: inline-block;
- margin-right: 0px;
-}
-
-.uploader-wrapper {
- padding-bottom: 2em;
-}
-
-.uploader-label {
- font-size: 1.4em;
-}
-
-.full-weight-label {
- margin-top: 0px;
-}
-
-.input-header {
- display: block;
-}
-
-.car-img {
- height: 15px;
-}
-
-.normalize-margins {
- margin-top: 0px;
- margin-bottom: 0px;
-}
-
-/* Note: .usa-grid-one-half almost the same except it floats left */
-.one-half {
- width: 50%;
-}
-
-@media only screen and (max-width: 481px) {
- .one-half {
- width: 100%;
- }
-}
-
-.input-group .usa-input-error {
- margin-top: 0px;
-}
-
-.divider {
- margin-bottom: 1.5em;
-}
-
-.bullet-li-header {
- margin-bottom: 0.5em;
-}
diff --git a/src/scenes/Moves/Ppm/PPMPaymentRequestActionBtns.jsx b/src/scenes/Moves/Ppm/PPMPaymentRequestActionBtns.jsx
deleted file mode 100644
index 0f473c0d50e..00000000000
--- a/src/scenes/Moves/Ppm/PPMPaymentRequestActionBtns.jsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import React, { Component } from 'react';
-
-// import { get} from 'lodash';
-import './PPMPaymentRequest.css';
-import AlertWithConfirmation from 'shared/AlertWithConfirmation';
-import withRouter from 'utils/routing';
-
-class PPMPaymentRequestActionBtns extends Component {
- state = {
- hasConfirmation: this.props.hasConfirmation,
- displayConfirmation: false,
- };
-
- showConfirmationOrFinishLater = (formValues) => {
- const {
- router: { navigate },
- hasConfirmation,
- } = this.props;
-
- if (!hasConfirmation) {
- return navigate('/ppm');
- }
-
- this.setState({ displayConfirmation: true });
- return undefined;
- };
-
- cancelConfirmationHandler = () => {
- this.setState({ displayConfirmation: false });
- };
-
- confirmFinishLater = () => {
- const {
- router: { navigate },
- } = this.props;
- navigate('/ppm');
- };
-
- render() {
- const {
- nextBtnLabel,
- displaySkip,
- skipHandler,
- saveAndAddHandler,
- hasConfirmation,
- submitButtonsAreDisabled,
- submitting,
- } = this.props;
- return (
-
-
-
-
-
- Expense {expenseNumber}
-
- Upload expenses one at a time.{' '}
-
-
-
- );
- }
-}
-
-export default withRouter(PPMPaymentRequestActionBtns);
diff --git a/src/scenes/Moves/Ppm/PaymentReview/DocumentsUploaded.js b/src/scenes/Moves/Ppm/PaymentReview/DocumentsUploaded.js
deleted file mode 100644
index 9597a139640..00000000000
--- a/src/scenes/Moves/Ppm/PaymentReview/DocumentsUploaded.js
+++ /dev/null
@@ -1,170 +0,0 @@
-import React, { Component } from 'react';
-import { bool } from 'prop-types';
-import { Link } from 'react-router-dom';
-import { connect } from 'react-redux';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
-import { formatExpenseDocs } from '../utility';
-
-import WeightTicketListItem from './WeightTicketListItem';
-import ExpenseTicketListItem from './ExpenseTicketListItem';
-
-import { selectPPMCloseoutDocumentsForMove } from 'shared/Entities/modules/movingExpenseDocuments';
-import { deleteMoveDocument, getMoveDocumentsForMove } from 'shared/Entities/modules/moveDocuments';
-import docsAddedCheckmarkImg from 'shared/images/docs_added_checkmark.png';
-
-import './PaymentReview.css';
-
-export class DocumentsUploaded extends Component {
- state = {
- showDocs: false,
- };
-
- static propTypes = {
- showLinks: bool,
- inReviewPage: bool,
- };
-
- static defaultProps = {
- showLinks: false,
- inReviewPage: false,
- };
-
- componentDidMount() {
- const { moveId } = this.props;
- this.props.getMoveDocumentsForMove(moveId);
- }
-
- toggleShowDocs = () => {
- this.setState((prevState) => ({ showDocs: !prevState.showDocs }));
- };
-
- renderHeader = () => {
- const { expenseDocs, weightTicketSetDocs, weightTicketDocs, inReviewPage } = this.props;
- const totalDocs = expenseDocs.length + weightTicketSetDocs.length + weightTicketDocs.length;
- const documentLabel = `document${totalDocs > 1 ? 's' : ''}`;
-
- return
- {hasConfirmation && this.state.displayConfirmation && (
-
-
-
- )}
-
- {!this.state.displayConfirmation && (
-
-
- {displaySkip && (
-
- )}
-
-
- )}
- {inReviewPage ? `Document Summary - ${totalDocs} total` : `${totalDocs} ${documentLabel} added`}
; - }; - - render() { - const { showDocs } = this.state; - const { expenseDocs, weightTicketSetDocs, weightTicketDocs, moveId, showLinks, inReviewPage, deleteMoveDocument } = - this.props; - const totalDocs = expenseDocs.length + weightTicketSetDocs.length + weightTicketDocs.length; - const expandedDocumentList = showDocs || inReviewPage; - const hiddenDocumentList = !inReviewPage && !showDocs; - - if (totalDocs === 0) { - return null; - } - return ( -
-
- - )} -
-
- );
- }
-}
-
-function mapStateToProps(state, { moveId }) {
- return {
- moveId,
- expenseDocs: selectPPMCloseoutDocumentsForMove(state, moveId, ['EXPENSE']),
- weightTicketSetDocs: selectPPMCloseoutDocumentsForMove(state, moveId, ['WEIGHT_TICKET_SET']),
- weightTicketDocs: selectPPMCloseoutDocumentsForMove(state, moveId, ['WEIGHT_TICKET']),
- };
-}
-
-const mapDispatchToProps = {
- selectPPMCloseoutDocumentsForMove,
- getMoveDocumentsForMove,
- deleteMoveDocument,
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(DocumentsUploaded);
diff --git a/src/scenes/Moves/Ppm/PaymentReview/DocumentsUploaded.test.js b/src/scenes/Moves/Ppm/PaymentReview/DocumentsUploaded.test.js
deleted file mode 100644
index 064bb60a0fe..00000000000
--- a/src/scenes/Moves/Ppm/PaymentReview/DocumentsUploaded.test.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-import { mount } from 'enzyme';
-
-import { DocumentsUploaded } from './DocumentsUploaded';
-
-const initialProps = {
- moveId: 0,
- expenseDocs: [],
- weightTicketDocs: [],
- weightTicketSetDocs: [],
- getMoveDocumentsForMove: jest.fn(),
-};
-function generateWrapper(props) {
- return mount(
- {!inReviewPage && (
- 
- )}
- {this.renderHeader()}
- {!inReviewPage && (
-
- {showDocs ? 'Hide' : 'Show'}
-
- )}
-
- {expandedDocumentList && (
- <>
- {weightTicketDocs.length > 0 && (
- <>
- {weightTicketDocs.length} weight tickets
-
- {weightTicketDocs.map((ticket, index) => (
-
- - - )} -
{weightTicketSetDocs.length} sets of weight tickets
-
- {weightTicketSetDocs.map((ticket, index) => (
-
- {showLinks && (
-
- -
- {expenseDocs.length} expense{expenseDocs.length >= 0 ? 's' : ''} -
-
- {formatExpenseDocs(expenseDocs).map((expense) => (
-
- {showLinks && (
-
-
-
- )}
-
- )}
-
-
- );
- }
-}
-
-ExpenseTicketListItem.propTypes = {
- id: string.isRequired,
- amount: string.isRequired,
- type: string.isRequired,
- paymentMethod: string.isRequired,
-};
-
-ExpenseTicketListItem.defaultProps = {
- showDelete: false,
-};
-
-export default ExpenseTicketListItem;
diff --git a/src/scenes/Moves/Ppm/PaymentReview/PaymentReview.css b/src/scenes/Moves/Ppm/PaymentReview/PaymentReview.css
deleted file mode 100644
index 8d5ff8889ed..00000000000
--- a/src/scenes/Moves/Ppm/PaymentReview/PaymentReview.css
+++ /dev/null
@@ -1,122 +0,0 @@
-.payment-review-container h3,
-.payment-review-container h4,
-.payment-review-container h5,
-.payment-review-container p {
- line-height: normal;
- margin: 0;
-}
-
-.payment-review-container input[type='image'],
-.payment-review-container input[type='image']:hover {
- padding: 0;
- height: 20px;
-}
-
-.doc-summary-container {
- background-color: #e7f4e4;
- border-left: 10px solid #2e8540;
- padding-left: 2em;
- padding-top: 1em;
-}
-
-/* normalize margins of all children */
-.doc-summary-container * {
- margin-top: 0px;
- margin-left: 0px;
- margin-bottom: 0px;
- margin-right: 0px;
-}
-
-.doc-summary-container h3 {
- font-size: 2rem;
-}
-
-.doc-summary-container > h4 {
- margin-top: 0.5rem;
-}
-
-.review-payment-request-header h3 {
- margin-top: 2rem;
-}
-
-.review-payment-request-header p {
- padding: 1rem 0 2rem 0;
-}
-
-.ticket-item {
- width: 98%;
- border-bottom: 1px dashed;
- padding: 1.5rem 0 1.5rem 0;
-}
-
-.ticket-item:last-child {
- border-bottom: none;
-}
-
-.weight-ticket-image {
- max-height: 25px;
-}
-
-#doc-summary-separator {
- max-width: 98%;
- margin-top: 12px;
-}
-
-.add-expense-link {
- padding-bottom: 1rem;
-}
-
-.doc-summary-container a:visited {
- text-decoration: none;
- color: #0071bc;
-}
-
-.doc-review {
- margin-top: 2rem;
-}
-
-.missing-label {
- color: #cd3504;
-}
-
-.expense-li-item-container {
- display: flex;
- justify-content: space-between;
- max-width: 916px;
-}
-
-.weight-li-item-container {
- display: flex;
- justify-content: space-between;
- max-width: 820px;
-}
-
-.infected-indicator {
- color: #cd3504;
-}
-
-.review-customer-agreement-container {
- margin: 1.5em 0 4.5em 0;
-}
-
-.review-customer-agreement {
- background-color: #ededed;
- padding: 1em;
-}
-
-.review-customer-agreement p {
- margin-top: 0;
- margin-bottom: 0;
- padding-bottom: 1rem;
-}
-
-.review-customer-agreement label {
- margin-top: 0;
- margin-bottom: 0;
-}
-
-.documents-uploaded-header {
- display: flex;
- align-items: baseline;
- margin-right: 5;
-}
diff --git a/src/scenes/Moves/Ppm/PaymentReview/WeightTicketListItem.jsx b/src/scenes/Moves/Ppm/PaymentReview/WeightTicketListItem.jsx
deleted file mode 100644
index c0acad9e8ed..00000000000
--- a/src/scenes/Moves/Ppm/PaymentReview/WeightTicketListItem.jsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import React, { Component } from 'react';
-import { forEach } from 'lodash';
-import { string, number, bool } from 'prop-types';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
-import carImg from 'shared/images/car_mobile.png';
-import boxTruckImg from 'shared/images/box_truck_mobile.png';
-import carTrailerImg from 'shared/images/car-trailer_mobile.png';
-import { formatToOrdinal } from 'utils/formatters';
-import deleteButtonImg from 'shared/images/delete-doc-button.png';
-import AlertWithDeleteConfirmation from 'shared/AlertWithDeleteConfirmation';
-import { UPLOAD_SCAN_STATUS, WEIGHT_TICKET_SET_TYPE } from 'shared/constants';
-
-const WEIGHT_TICKET_IMAGES = {
- CAR: carImg,
- BOX_TRUCK: boxTruckImg,
- CAR_TRAILER: carTrailerImg,
-};
-
-const MissingLabel = ({ children }) => (
-
- deleteDocumentListItem(id)}
- cancelActionHandler={this.toggleShowConfirmation}
- type="expense-ticket-list-alert"
- />
- )}
-
-
- 
- )}
-
- {isInfected && (
- - {type} - ${amount} -
- {showDelete && ( -
- Delete this file, take a photo of the document, then upload that
-
- )}
-
- {type} ({paymentMethod === 'OTHER' ? 'Not GTCC' : paymentMethod})
-
-
- {showDeleteConfirmation && (
- - {children} -
-); - -class WeightTicketListItem extends Component { - state = { - showDeleteConfirmation: false, - }; - - areUploadsInfected = (uploads) => { - let isInfected = false; - forEach(uploads, function (upload) { - if (upload.status === UPLOAD_SCAN_STATUS.INFECTED) { - isInfected = true; - } - }); - return isInfected; - }; - - toggleShowConfirmation = () => { - const { showDeleteConfirmation } = this.state; - this.setState({ showDeleteConfirmation: !showDeleteConfirmation }); - }; - - render() { - const { - id, - empty_weight_ticket_missing, - empty_weight, - full_weight_ticket_missing, - full_weight, - num, - trailer_ownership_missing, - vehicle_nickname, - vehicle_make, - vehicle_model, - weight_ticket_set_type, - showDelete, - deleteDocumentListItem, - isWeightTicketSet, - uploads, - } = this.props; - const { showDeleteConfirmation } = this.state; - const isInfected = this.areUploadsInfected(uploads); - const showWeightTicketIcon = weight_ticket_set_type !== 'PRO_GEAR'; - const showVehicleNickname = weight_ticket_set_type === 'BOX_TRUCK' || 'PRO_GEAR'; - const showVehicleMakeModel = weight_ticket_set_type === 'CAR' || 'CAR_TRAILER'; - return ( -
- {/* size of largest of the images */}
-
- );
- }
-}
-
-WeightTicketListItem.propTypes = {
- id: string.isRequired,
- num: number.isRequired,
- isWeightTicketSet: bool.isRequired,
-};
-
-WeightTicketListItem.defaultProps = {
- showDelete: false,
-};
-export default WeightTicketListItem;
diff --git a/src/scenes/Moves/Ppm/TrailerCriteria.jsx b/src/scenes/Moves/Ppm/TrailerCriteria.jsx
deleted file mode 100644
index cc85f2ed8aa..00000000000
--- a/src/scenes/Moves/Ppm/TrailerCriteria.jsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React from 'react';
-import { useNavigate } from 'react-router-dom';
-
-function TrailerCriteria() {
- const navigate = useNavigate();
- function goBack() {
- navigate(-1);
- }
- return (
-
- {showWeightTicketIcon && (
- 
- )}
-
-
-
- Missing empty weight ticket{' '}
-
- ) : (
-
- Missing full weight ticket{' '}
-
- ) : (
-
- Missing ownership documentation{' '}
-
- )}
- {weight_ticket_set_type === WEIGHT_TICKET_SET_TYPE.CAR_TRAILER && !trailer_ownership_missing && (
- deleteDocumentListItem(id)}
- cancelActionHandler={this.toggleShowConfirmation}
- type="weight-ticket-list-alert"
- />
- )}
-
-
-
- )}
-
- {isInfected && (
- - {showVehicleMakeModel && ( - <> - {vehicle_make} {vehicle_model} - - )} - {showVehicleNickname && <>{vehicle_nickname} } - {isWeightTicketSet && <>{formatToOrdinal(num + 1)} set} -
- {showDelete && ( -
- Delete this file, take a photo of the document, then upload that
-
- )}
- {empty_weight_ticket_missing ? (
- Empty weight ticket {empty_weight} lbs
- )} - {full_weight_ticket_missing ? ( -Full weight ticket {full_weight} lbs
- )} - {weight_ticket_set_type === WEIGHT_TICKET_SET_TYPE.CAR_TRAILER && trailer_ownership_missing && ( -Ownership documentation
- )} - {showDeleteConfirmation && ( -
-
-
-
- );
-}
-
-export default TrailerCriteria;
diff --git a/src/scenes/Moves/Ppm/WeightTicket.jsx b/src/scenes/Moves/Ppm/WeightTicket.jsx
deleted file mode 100644
index 52604a96b4b..00000000000
--- a/src/scenes/Moves/Ppm/WeightTicket.jsx
+++ /dev/null
@@ -1,578 +0,0 @@
-import React, { Component } from 'react';
-import { getFormValues, reduxForm } from 'redux-form';
-import { connect } from 'react-redux';
-import { get, map } from 'lodash';
-import PropTypes from 'prop-types';
-import { Link } from 'react-router-dom';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
-import WizardHeader from '../WizardHeader';
-
-import { getNextPage } from './utility';
-import DocumentsUploaded from './PaymentReview/DocumentsUploaded';
-import PPMPaymentRequestActionBtns from './PPMPaymentRequestActionBtns';
-
-import { ProgressTimeline, ProgressTimelineStep } from 'shared/ProgressTimeline';
-import { SwaggerField } from 'shared/JsonSchemaForm/JsonSchemaField';
-import RadioButton from 'shared/RadioButton';
-import Checkbox from 'shared/Checkbox';
-import Uploader from 'shared/Uploader';
-import Alert from 'shared/Alert';
-import { formatDateForSwagger } from 'shared/dates';
-import { documentSizeLimitMsg, WEIGHT_TICKET_SET_TYPE } from 'shared/constants';
-import { selectCurrentPPM, selectServiceMemberFromLoggedInUser } from 'store/entities/selectors';
-import carTrailerImg from 'shared/images/car-trailer_mobile.png';
-import carImg from 'shared/images/car_mobile.png';
-import { createWeightTicketSetDocument } from 'shared/Entities/modules/weightTicketSetDocuments';
-import { selectPPMCloseoutDocumentsForMove } from 'shared/Entities/modules/movingExpenseDocuments';
-import { getMoveDocumentsForMove } from 'shared/Entities/modules/moveDocuments';
-import { withContext } from 'shared/AppContext';
-import { formatToOrdinal } from 'utils/formatters';
-
-import './PPMPaymentRequest.css';
-import withRouter from 'utils/routing';
-import { RouterShape } from 'types';
-
-const nextBtnLabels = {
- SaveAndAddAnother: 'Save & Add Another',
- SaveAndContinue: 'Save & Continue',
-};
-
-const reviewPagePath = '/ppm-payment-review';
-const nextPagePath = '/ppm-expenses-intro';
-
-const uploadEmptyTicketLabel =
- 'Drag & drop or click to upload empty weight ticket';
-const uploadFullTicketLabel =
- 'Drag & drop or click to upload full weight ticket';
-const uploadTrailerProofOfOwnership =
- 'Drag & drop or click to upload documentation';
-
-class WeightTicket extends Component {
- state = { ...this.initialState };
-
- uploaders = {
- trailer: { uploaderRef: null, isMissingChecked: () => this.state.missingDocumentation },
- emptyWeight: { uploaderRef: null, isMissingChecked: () => this.state.missingEmptyWeightTicket },
- fullWeight: { uploaderRef: null, isMissingChecked: () => this.state.missingFullWeightTicket },
- };
-
- get initialState() {
- return {
- weightTicketSetType: '',
- additionalWeightTickets: 'No',
- isValidTrailer: 'No',
- weightTicketSubmissionError: false,
- missingDocumentation: false,
- missingEmptyWeightTicket: false,
- missingFullWeightTicket: false,
- };
- }
-
- componentDidMount() {
- const { moveId } = this.props;
- this.props.getMoveDocumentsForMove(moveId);
- }
-
- get isCarTrailer() {
- return this.state.weightTicketSetType === WEIGHT_TICKET_SET_TYPE.CAR_TRAILER;
- }
-
- get isCar() {
- return this.state.weightTicketSetType === WEIGHT_TICKET_SET_TYPE.CAR;
- }
-
- get isProGear() {
- return this.state.weightTicketSetType === WEIGHT_TICKET_SET_TYPE.PRO_GEAR;
- }
-
- hasWeightTicket = (uploaderRef) => {
- return !!(uploaderRef && !uploaderRef.isEmpty());
- };
-
- invalidState = (uploader) => {
- if (uploader.isMissingChecked()) {
- return true;
- }
- return !this.hasWeightTicket(uploader.uploaderRef);
- };
-
- carTrailerText = (isValidTrailer) => {
- if (this.isCarTrailer && isValidTrailer === 'Yes') {
- return (
-
-
- {'<'} Back
-
-
- Trailer Criteria
-- During your move, if you used a trailer owned by you or your spouse, you can claim its weight{' '} - once per move if it meets these specifications: -
-
-
- A utility trailer:
--
-
- With or without a tilt bed -
- Single axle -
- No more than 12 feet long from rear to trailer hitch -
- No more than 8 feet wide from outside tire to outside tire -
- Side rails and body no higher than 28 inches (unless detachable) -
- Ramp or gate for the utility trailer no higher than 4 feet (unless detachable) -
- You will also have to provide proof of ownership, either a registration or bill of sale. If these are - unavailable in your state, you can provide a signed and dated statement certifying that you or your spouse own - the trailer. -
-
-
-
-
- You can claim this trailer's weight as part of the total weight of your trip.
-
- );
- }
- if (this.isCarTrailer) {
- return (
-
- The weight of this trailer should be excluded from the total weight of this trip.
-
- );
- }
- // if there is no trailer, don't show text
- return undefined;
- };
-
- uploaderWithInvalidState = () => {
- // Validation for the vehicle type
- if (this.state.isValidTrailer === 'Yes' && this.isCarTrailer && this.invalidState(this.uploaders.trailer)) {
- return true;
- }
- // Full weight must be in a valid state to proceed.
- return this.invalidState(this.uploaders.fullWeight);
- };
-
- // handleChange for weightTicketSetType and additionalWeightTickets
- handleChange = (event, type) => {
- this.setState({ [type]: event.target.value });
- };
-
- handleCheckboxChange = (event) => {
- this.setState({
- [event.target.name]: event.target.checked,
- });
- };
-
- onAddFile = (uploaderName) => () => {
- this.setState((prevState) => ({
- uploaderIsIdle: { ...prevState.uploaderIsIdle, [uploaderName]: false },
- }));
- };
-
- onUploadChange = (uploaderName) => (uploaderIsIdle) => {
- this.setState((prevState) => ({
- uploaderIsIdle: { ...prevState.uploaderIsIdle, [uploaderName]: uploaderIsIdle },
- }));
- };
-
- skipHandler = () => {
- const {
- moveId,
- router: { navigate },
- } = this.props;
- navigate(`/moves/${moveId}${nextPagePath}`);
- };
-
- nonEmptyUploaderKeys() {
- const uploadersKeys = Object.keys(this.uploaders);
- return uploadersKeys.filter((key) => this.uploaders[key].uploaderRef && !this.uploaders[key].uploaderRef.isEmpty());
- }
-
- saveAndAddHandler = (formValues) => {
- const {
- moveId,
- currentPpm,
- router: { navigate },
- } = this.props;
- const { additionalWeightTickets } = this.state;
-
- const uploaderKeys = this.nonEmptyUploaderKeys();
- const uploadIds = [];
- for (const key of uploaderKeys) {
- const files = this.uploaders[key].uploaderRef.getFiles();
- const documentUploadIds = map(files, 'id');
- uploadIds.push(...documentUploadIds);
- }
- const weightTicketSetDocument = {
- personally_procured_move_id: currentPpm.id,
- upload_ids: uploadIds,
- weight_ticket_set_type: formValues.weight_ticket_set_type,
- vehicle_nickname: formValues.vehicle_nickname,
- vehicle_make: formValues.vehicle_make,
- vehicle_model: formValues.vehicle_model,
- empty_weight_ticket_missing: this.state.missingEmptyWeightTicket,
- empty_weight: formValues.empty_weight,
- full_weight_ticket_missing: this.state.missingFullWeightTicket,
- full_weight: formValues.full_weight,
- weight_ticket_date: formatDateForSwagger(formValues.weight_ticket_date),
- trailer_ownership_missing: this.state.missingDocumentation,
- move_document_type: 'WEIGHT_TICKET_SET',
- notes: formValues.notes,
- };
- return this.props
- .createWeightTicketSetDocument(moveId, weightTicketSetDocument)
- .then(() => {
- this.cleanup();
- if (additionalWeightTickets === 'No') {
- const nextPage = getNextPage(`/moves/${moveId}${nextPagePath}`, this.props.lastLocation, reviewPagePath);
- navigate(nextPage);
- }
- })
- .catch((e) => {
- this.setState({ weightTicketSubmissionError: true });
- });
- };
-
- cleanup = () => {
- const { reset } = this.props;
- const { uploaders } = this;
- const uploaderKeys = this.nonEmptyUploaderKeys();
- for (const key of uploaderKeys) {
- uploaders[key].uploaderRef.clearFiles();
- }
- reset();
- this.setState({ ...this.initialState });
- };
-
- render() {
- const {
- additionalWeightTickets,
- weightTicketSetType,
- missingEmptyWeightTicket,
- missingFullWeightTicket,
- missingDocumentation,
- isValidTrailer,
- } = this.state;
- const { handleSubmit, submitting, schema, weightTicketSets, invalid, moveId, transportationOffice } = this.props;
- const nextBtnLabel =
- additionalWeightTickets === 'Yes' ? nextBtnLabels.SaveAndAddAnother : nextBtnLabels.SaveAndContinue;
- const weightTicketSetOrdinal = formatToOrdinal(weightTicketSets.length + 1);
- const fullWeightTicketFieldsRequired = missingFullWeightTicket ? null : true;
- const emptyWeightTicketFieldsRequired = missingEmptyWeightTicket ? null : true;
-
- return (
- {documentSizeLimitMsg}
-
-
-
- );
- }
-}
-
-const formName = 'weight_ticket_wizard';
-WeightTicket = reduxForm({
- form: formName,
- enableReinitialize: true,
- keepDirtyOnReinitialize: true,
-})(WeightTicket);
-
-WeightTicket.propTypes = {
- schema: PropTypes.object.isRequired,
- router: RouterShape,
-};
-
-function mapStateToProps(state, ownProps) {
- const {
- router: {
- params: { moveId },
- },
- } = ownProps;
- const serviceMember = selectServiceMemberFromLoggedInUser(state);
- const dutyLocationId = serviceMember?.current_location?.id;
- const transportationOffice = serviceMember?.current_location.transportation_office;
-
- return {
- moveId,
- formValues: getFormValues(formName)(state),
- genericMoveDocSchema: get(state, 'swaggerInternal.spec.definitions.CreateGenericMoveDocumentPayload', {}),
- moveDocSchema: get(state, 'swaggerInternal.spec.definitions.MoveDocumentPayload', {}),
- schema: get(state, 'swaggerInternal.spec.definitions.CreateWeightTicketDocumentsPayload', {}),
- currentPpm: selectCurrentPPM(state) || {},
- weightTicketSets: selectPPMCloseoutDocumentsForMove(state, moveId, ['WEIGHT_TICKET_SET']),
- transportationOffice,
- dutyLocationId,
- };
-}
-
-const mapDispatchToProps = {
- getMoveDocumentsForMove,
- createWeightTicketSetDocument,
-};
-
-export default withContext(withRouter(connect(mapStateToProps, mapDispatchToProps)(WeightTicket)));
diff --git a/src/scenes/Moves/Ppm/WeightTicket.test.js b/src/scenes/Moves/Ppm/WeightTicket.test.js
deleted file mode 100644
index b9ddbef50b5..00000000000
--- a/src/scenes/Moves/Ppm/WeightTicket.test.js
+++ /dev/null
@@ -1,162 +0,0 @@
-import React from 'react';
-import { mount } from 'enzyme';
-
-import WeightTicket from './WeightTicket';
-import PPMPaymentRequestActionBtns from './PPMPaymentRequestActionBtns';
-
-import { MockProviders } from 'testUtils';
-
-function mountComponents(
- moreWeightTickets = 'Yes',
- formInvalid,
- uploaderWithInvalidState,
- weightTicketSetType = 'CAR',
-) {
- const initialState = {
- emptyWeight: 1100,
- fullWeight: 2000,
- weightTicketSetType,
- weightTicketDate: '2019-05-22',
- };
- const params = { moveId: 'someID' };
- const wrapper = mount(
-
-
-
-
-
-
-
-
-
-
-
- 
= A{' '}
- trip includes both an empty and full weight ticket
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- );
-}
-
-export default WeightTicketExamples;
diff --git a/src/scenes/Moves/Ppm/api.js b/src/scenes/Moves/Ppm/api.js
deleted file mode 100644
index 415cd423dce..00000000000
--- a/src/scenes/Moves/Ppm/api.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { getClient, checkResponse } from 'shared/Swagger/api';
-import { formatPayload } from 'shared/utils';
-import { formatDateForSwagger } from 'shared/dates';
-
-export async function UpdatePpm(
- moveId,
- personallyProcuredMoveId,
- payload /* shape: {size, weightEstimate, estimatedIncentive} */,
-) {
- const client = await getClient();
- const payloadDef = client.spec.definitions.PatchPersonallyProcuredMovePayload;
- payload.original_move_date = formatDateForSwagger(payload.original_move_date);
- const response = await client.apis.ppm.patchPersonallyProcuredMove({
- moveId,
- personallyProcuredMoveId,
- patchPersonallyProcuredMovePayload: formatPayload(payload, payloadDef),
- });
- checkResponse(response, 'failed to update ppm due to server error');
- return response.body;
-}
-
-export async function RequestPayment(personallyProcuredMoveId) {
- const client = await getClient();
- const response = await client.apis.ppm.requestPPMPayment({
- personallyProcuredMoveId,
- });
- checkResponse(response, 'failed to update ppm status due to server error');
- return response.body;
-}
diff --git a/src/scenes/Moves/Ppm/utility.js b/src/scenes/Moves/Ppm/utility.js
deleted file mode 100644
index 11cd4cb3e2f..00000000000
--- a/src/scenes/Moves/Ppm/utility.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { formatCents } from 'utils/formatters';
-import { MOVE_DOC_TYPE } from 'shared/constants';
-
-export const getNextPage = (nextPage, lastPage, pageToRevisit) => {
- if (lastPage && lastPage.pathname.includes(pageToRevisit)) {
- return lastPage.pathname;
- }
- return nextPage;
-};
-
-export const formatExpenseType = (expenseType) => {
- if (typeof expenseType !== 'string') return '';
- const type = expenseType.toLowerCase().replace('_', ' ');
- return type.charAt(0).toUpperCase() + type.slice(1);
-};
-
-export const formatExpenseDocs = (expenseDocs) => {
- return expenseDocs.map((expense) => ({
- id: expense.id,
- amount: formatCents(expense.requested_amount_cents),
- type: formatExpenseType(expense.moving_expense_type),
- paymentMethod: expense.payment_method,
- uploads: expense.document.uploads,
- }));
-};
-
-export const calcNetWeight = (documents) =>
- documents.reduce((accum, { move_document_type, full_weight, empty_weight }) => {
- if (move_document_type === MOVE_DOC_TYPE.WEIGHT_TICKET_SET) {
- return accum + (full_weight - empty_weight);
- }
- return accum;
- }, 0);
diff --git a/src/scenes/Moves/Ppm/utility.test.js b/src/scenes/Moves/Ppm/utility.test.js
deleted file mode 100644
index 0d84f022202..00000000000
--- a/src/scenes/Moves/Ppm/utility.test.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import { getNextPage, calcNetWeight } from './utility';
-
-import { MOVE_DOC_TYPE } from 'shared/constants';
-
-describe('PPM Utility functions', () => {
- describe('getNextPage', () => {
- it('returns to the lastPage when user is visiting from pageToRevisit', () => {
- const lastPage = {
- pathname: 'moves/:moveid/ppm-payment-review',
- search: '',
- hash: '',
- state: undefined,
- };
- const nextPage = getNextPage('moves/:moveid/next-page', lastPage, '/ppm-payment-review');
-
- expect(nextPage).toEqual('moves/:moveid/ppm-payment-review');
- });
- it('returns to the nextPage when user is not visiting from pageToRevisit', () => {
- const lastPage = {
- pathname: 'moves/:moveid/some-other-page',
- search: '',
- hash: '',
- state: undefined,
- };
- const nextPage = getNextPage('moves/:moveid/next-page', lastPage, '/ppm-payment-review');
-
- expect(nextPage).toEqual('moves/:moveid/next-page');
- });
- it('returns to the nextPage when no lastpage', () => {
- const nextPage = getNextPage('moves/:moveid/next-page', null, '/ppm-payment-review');
-
- expect(nextPage).toEqual('moves/:moveid/next-page');
- });
- });
- describe('calcNetWeight', () => {
- it('should return 0 when there are no weight ticket sets', () => {
- const documents = [{ move_document_type: MOVE_DOC_TYPE.EXPENSE }, { move_document_type: MOVE_DOC_TYPE.GBL }];
- expect(calcNetWeight(documents)).toBe(0);
- });
- it('should return the net weight for weight ticket sets', () => {
- const documents = [
- { move_document_type: MOVE_DOC_TYPE.WEIGHT_TICKET_SET, full_weight: 2000, empty_weight: 1000 },
- { move_document_type: MOVE_DOC_TYPE.WEIGHT_TICKET_SET, full_weight: 3000, empty_weight: 2000 },
- ];
- expect(calcNetWeight(documents)).toBe(2000);
- });
- });
-});
diff --git a/src/scenes/MyMove/getWorkflowRoutes.jsx b/src/scenes/MyMove/getWorkflowRoutes.jsx
index c14ce37e244..d56cd0da801 100644
--- a/src/scenes/MyMove/getWorkflowRoutes.jsx
+++ b/src/scenes/MyMove/getWorkflowRoutes.jsx
@@ -13,7 +13,6 @@ import Home from 'pages/MyMove/Home';
import ConusOrNot from 'pages/MyMove/ConusOrNot';
import DodInfo from 'pages/MyMove/Profile/DodInfo';
import SMName from 'pages/MyMove/Profile/Name';
-import DutyLocation from 'pages/MyMove/Profile/DutyLocation';
import ContactInfo from 'pages/MyMove/Profile/ContactInfo';
import Orders from 'pages/MyMove/Orders';
import UploadOrders from 'pages/MyMove/UploadOrders';
@@ -99,15 +98,6 @@ const pages = {
(every([sm.telephone, sm.personal_email]) && some([sm.phone_is_preferred, sm.email_is_preferred])),
render: () =>
-
- {'<'} Back
-
-
- Example weight ticket scenarios
-
- You need two weight tickets for each trip you took: one with the vehicle empty, one with it full.
-
- Scenario 1
- You and your spouse each drove a vehicle filled with stuff to your destination.
-
- 
-
- - You must upload weight tickets for 2 trips, which is 4 tickets total. -
-- That's one empty weight ticket and one full weight ticket for each vehicle. -
-Scenario 2
- You made two separate trips in one vehicle to bring stuff to your destination.
-
- 
-
- - You must upload weight tickets for 2 trips, which is 4 tickets total. -
-- - - That's one empty and one full ticket for the first trip, and one empty and one full for the second trip. - {' '} - You do need to weigh your empty vehicle a second time. - -
-Scenario 3
- - You and your spouse each drove a vehicle filled with stuff to your destination. Then you made a second trip in - your vehicle (without your spouse) to bring more stuff. -
-
- 
-
- - You must upload weight tickets for 3 trips, which is 6 tickets total. -
-- - That's one empty and one full weight ticket for each vehicle on the first trip, and an empty and full weight - ticket for your vehicle on the second trip. - -
-Scenario 4
- - You drove your car with an attached rental trailer to your destination, then made a second trip to bring more - stuff. -
-
- 
-
- - You must upload weight tickets for 2 trips, which is 4 tickets total. -
-- - You can't claim the weight of your rented trailer in your move. All weight tickets must include the weight - of your car with trailer attached. - -
-Scenario 5
- - You drove your car with an attached trailer that you own, and that meets the trailer criteria, to make two - separate trips to move stuff to your destination. -
-
- 
-
- - You must upload weight tickets for 2 trips, which is 4 tickets total. -
-- - You can claim the weight of your own trailer once per move (not per trip). The empty weight ticket for your - first trip should be the weight of your car only. All 3 additional weight tickets should include the weight - of your car with trailer attached. - -
-
-
-
-
@@ -186,10 +182,14 @@ export class CustomerApp extends Component {
{/* {
- const moveDocFieldProps = {
- values: moveDocument,
- schema: moveDocSchema,
- };
- const isWeightTicketTypeCarOrTrailer =
- isWeightTicketDocument &&
- (moveDocument.weight_ticket_set_type === WEIGHT_TICKET_SET_TYPE.CAR ||
- moveDocument.weight_ticket_set_type === WEIGHT_TICKET_SET_TYPE.CAR_TRAILER);
- const isWeightTicketTypeBoxTruck =
- isWeightTicketDocument && moveDocument.weight_ticket_set_type === WEIGHT_TICKET_SET_TYPE.BOX_TRUCK;
- const isWeightTicketTypeProGear =
- isWeightTicketDocument && moveDocument.weight_ticket_set_type === WEIGHT_TICKET_SET_TYPE.PRO_GEAR;
- return (
-
-
- );
-};
-
-const formName = 'ppm_estimate_and_details';
-
-let PPMEstimatesPanel = editablePanelify(EstimatesDisplay, EstimatesEdit);
-PPMEstimatesPanel = reduxForm({ form: formName })(PPMEstimatesPanel);
-
-function mapStateToProps(state, ownProps) {
- const PPMEstimate = selectActivePPMForMove(state, ownProps.moveId);
- const formValues = getFormValues(formName)(state);
-
- return {
- // reduxForm
- formValues,
- initialValues: { PPMEstimate },
-
- // Wrapper
- ppmSchema: get(state, 'swaggerInternal.spec.definitions.PersonallyProcuredMovePayload'),
- hasError: false,
- errorMessage: get(state, 'office.error'),
- PPMEstimate,
- isUpdating: false,
- entitlement: calculateEntitlementsForMove(state, ownProps.moveId),
-
- // editablePanelify
- getUpdateArgs() {
- if (
- formValues.PPMEstimate.additional_pickup_postal_code !== '' &&
- formValues.PPMEstimate.additional_pickup_postal_code !== undefined
- ) {
- formValues.PPMEstimate.has_additional_postal_code = true;
- } else {
- delete formValues.PPMEstimate.additional_pickup_postal_code;
- formValues.PPMEstimate.has_additional_postal_code = false;
- }
- return [ownProps.moveId, formValues.PPMEstimate.id, formValues.PPMEstimate];
- },
- };
-}
-
-function mapDispatchToProps(dispatch) {
- return bindActionCreators(
- {
- update: updatePPM,
- },
- dispatch,
- );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(PPMEstimatesPanel);
diff --git a/src/scenes/Office/Ppm/StoragePanel.js b/src/scenes/Office/Ppm/StoragePanel.js
deleted file mode 100644
index b9a4bea5a35..00000000000
--- a/src/scenes/Office/Ppm/StoragePanel.js
+++ /dev/null
@@ -1,126 +0,0 @@
-import { get, filter } from 'lodash';
-import React from 'react';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-import { reduxForm, getFormValues } from 'redux-form';
-
-import { convertDollarsToCents } from '../../../shared/utils';
-
-import { getDocsByStatusAndType } from './ducks';
-
-import Alert from 'shared/Alert';
-import { editablePanelify, PanelSwaggerField } from 'shared/EditablePanel';
-import { SwaggerField } from 'shared/JsonSchemaForm/JsonSchemaField';
-import { selectActivePPMForMove, updatePPM } from 'shared/Entities/modules/ppms';
-import { formatCents } from 'utils/formatters';
-
-const StorageDisplay = (props) => {
- const cost = props.ppm && props.ppm.total_sit_cost ? formatCents(props.ppm.total_sit_cost) : 0;
- const days = props.ppm && props.ppm.days_in_storage ? props.ppm.days_in_storage : 0;
-
- const fieldProps = {
- schema: {
- properties: {
- days_in_storage: {
- maximum: 90,
- minimum: 0,
- title: 'How many days do you plan to put your stuff in storage?',
- type: 'integer',
- 'x-nullable': true,
- },
- total_sit_cost: {
- type: 'string',
- },
- },
- },
- values: {
- total_sit_cost: `$${cost}`,
- days_in_storage: `${days}`,
- },
- };
-
- return (
-
- ,
- );
- expect(wrapper.find(PanelSwaggerField)).toHaveLength(2);
- expect(wrapper.find(Alert)).toHaveLength(0);
- });
- it('is existent when any receipt does not have an have OK status', () => {
- const moveDocuments = [
- { moving_expense_type: 'STORAGE', status: 'OK' },
- { moving_expense_type: 'STORAGE', status: 'HAS_ISSUE' },
- ];
- const moveId = 'some ID';
-
- const wrapper = mount(
-
- ,
- );
- expect(wrapper.find(PanelSwaggerField)).toHaveLength(2);
- expect(wrapper.find(Alert)).toHaveLength(1);
- });
- });
-});
diff --git a/src/scenes/Office/Ppm/WeightsPanel.jsx b/src/scenes/Office/Ppm/WeightsPanel.jsx
deleted file mode 100644
index 0ad5cc8f78d..00000000000
--- a/src/scenes/Office/Ppm/WeightsPanel.jsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-
-import {
- selectAllDocumentsForMove,
- findOKedVehicleWeightTickets,
- findOKedProgearWeightTickets,
- findPendingWeightTickets,
-} from 'shared/Entities/modules/moveDocuments';
-import Alert from 'shared/Alert';
-import { PanelField, editablePanelify } from 'shared/EditablePanel';
-import { formatWeight } from 'utils/formatters';
-
-function sumWeights(moveDocs) {
- return moveDocs.reduce(function (sum, { empty_weight, full_weight }) {
- // empty_weight and full_weight can be blank
- empty_weight = empty_weight || 0;
- full_weight = full_weight || 0;
-
- // Minimize the damage from having an empty_weight that is larger than the full_weight.
- if (empty_weight > full_weight) {
- return 0;
- }
-
- return sum + full_weight - empty_weight;
- }, 0);
-}
-
-const WeightDisplay = ({
- hasPendingWeightTickets,
- ppmPaymentRequestedFlag,
- vehicleWeightTicketWeight,
- progearWeightTicketWeight,
-}) => {
- return (
- <>
- {ppmPaymentRequestedFlag && hasPendingWeightTickets && (
-
- Next, wait for approval. Once approved:
-
-
- );
-};
-
-export default PpmAlert;
diff --git a/src/scenes/PpmLanding/PpmSummary.jsx b/src/scenes/PpmLanding/PpmSummary.jsx
deleted file mode 100644
index bdde20e464b..00000000000
--- a/src/scenes/PpmLanding/PpmSummary.jsx
+++ /dev/null
@@ -1,196 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { get, includes, isEmpty } from 'lodash';
-import classnames from 'classnames';
-
-import Alert from 'shared/Alert';
-import TransportationOfficeContactInfo from 'shared/TransportationOffices/TransportationOfficeContactInfo';
-import { selectPPMCloseoutDocumentsForMove } from 'shared/Entities/modules/movingExpenseDocuments';
-import { getMoveDocumentsForMove } from 'shared/Entities/modules/moveDocuments';
-import { calcNetWeight } from 'scenes/Moves/Ppm/utility';
-import ApprovedMoveSummary from 'scenes/PpmLanding/MoveSummary/ApprovedMoveSummary';
-import CanceledMoveSummary from 'scenes/PpmLanding/MoveSummary/CanceledMoveSummary';
-import DraftMoveSummary from 'scenes/PpmLanding/MoveSummary/DraftMoveSummary';
-import PaymentRequestedSummary from 'scenes/PpmLanding/MoveSummary/PaymentRequestedSummary';
-import SubmittedPpmMoveSummary from 'scenes/PpmLanding/MoveSummary/SubmittedPpmMoveSummary';
-import { selectServiceMemberFromLoggedInUser } from 'store/entities/selectors';
-import { calculatePPMEstimate } from 'services/internalApi';
-import { updatePPMEstimate } from 'store/entities/actions';
-import { setPPMEstimateError } from 'store/onboarding/actions';
-import styles from 'scenes/PpmLanding/PpmSummary.module.css';
-
-const MoveInfoHeader = (props) => {
- const { orders, profile, move, entitlement } = props;
- return (
- {
- return date;
- })}
- completed={status.completed}
- current={currentStatus.code === status.code}
- />
- );
- };
-
- render() {
- const currentStatus = getCurrentStatus(this.props.statuses);
- const statusBlocks = this.props.statuses.map((status) => this.createStatusBlock(status, currentStatus));
-
- return (
-
-
- );
-};
-
-const { bool, object, shape, string, arrayOf } = PropTypes;
-
-DocumentDetailDisplay.propTypes = {
- isExpenseDocument: bool.isRequired,
- isWeightTicketDocument: bool.isRequired,
- moveDocSchema: shape({
- properties: object.isRequired,
- required: arrayOf(string).isRequired,
- type: string.isRequired,
- }).isRequired,
- moveDocument: shape({
- document: shape({
- id: string.isRequired,
- service_member_id: string.isRequired,
- uploads: ExistingUploadsShape.isRequired,
- }),
- id: string.isRequired,
- move_document_type: string.isRequired,
- move_id: string.isRequired,
- notes: string,
- personally_procured_move_id: string,
- status: string.isRequired,
- title: string.isRequired,
- }).isRequired,
-};
-
-export default DocumentDetailDisplay;
diff --git a/src/scenes/Office/DocumentViewer/DocumentDetailDisplay.test.jsx b/src/scenes/Office/DocumentViewer/DocumentDetailDisplay.test.jsx
deleted file mode 100644
index c835d55eef9..00000000000
--- a/src/scenes/Office/DocumentViewer/DocumentDetailDisplay.test.jsx
+++ /dev/null
@@ -1,322 +0,0 @@
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { MOVE_DOC_TYPE, WEIGHT_TICKET_SET_TYPE } from '../../../shared/constants';
-
-import DocumentDetailDisplay from './DocumentDetailDisplay';
-
-describe('DocumentDetailDisplay', () => {
- const renderDocumentDetailDisplay = ({
- isExpenseDocument = false,
- isWeightTicketDocument = true,
- moveDocument = {},
- moveDocSchema = {},
- isStorageExpenseDocument = false,
- }) =>
- shallow(
- - {renderStatusIcon(moveDocument.status)} - {moveDocument.title} -
-- Uploaded {formatDate(get(moveDocument, 'document.uploads.0.createdAt'))} -
-
-
-
-
- );
-};
-const { object, shape, string, arrayOf } = PropTypes;
-
-DocumentDetailEdit.propTypes = {
- moveDocSchema: shape({
- properties: object.isRequired,
- required: arrayOf(string).isRequired,
- type: string.isRequired,
- }).isRequired,
-};
-
-export default DocumentDetailEdit;
diff --git a/src/scenes/Office/DocumentViewer/DocumentDetailEdit.test.jsx b/src/scenes/Office/DocumentViewer/DocumentDetailEdit.test.jsx
deleted file mode 100644
index 0a33d8b58d0..00000000000
--- a/src/scenes/Office/DocumentViewer/DocumentDetailEdit.test.jsx
+++ /dev/null
@@ -1,167 +0,0 @@
-import { shallow } from 'enzyme';
-import React from 'react';
-
-import { MOVE_DOC_TYPE, WEIGHT_TICKET_SET_TYPE } from '../../../shared/constants';
-
-import DocumentDetailEdit from './DocumentDetailEdit';
-
-describe('DocumentDetailEdit', () => {
- const renderDocumentDetailEdit = ({ moveDocSchema = {}, formValues = { moveDocument: {} } }) =>
- shallow(
-
- {isWeightTicketTypeBoxTruck && (
-
-
- );
- return (
-
-
-
-
- Something went wrong contacting the server.
-
-
-
-
- );
- }
-}
-
-DocumentViewer.propTypes = {
- docTypes: PropTypes.arrayOf(PropTypes.string).isRequired,
- loadMove: PropTypes.func.isRequired,
- getMoveDocumentsForMove: PropTypes.func.isRequired,
- genericMoveDocSchema: PropTypes.object.isRequired,
- moveDocSchema: PropTypes.object.isRequired,
- moveDocuments: PropTypes.arrayOf(PropTypes.object),
- router: RouterShape.isRequired(),
-};
-
-const mapStateToProps = (state, { router: { params } }) => {
- const { moveId, moveDocumentId } = params;
- const move = selectMove(state, moveId);
- const moveLocator = move.locator;
- const serviceMemberId = move.service_member_id;
- const serviceMember = selectServiceMember(state, serviceMemberId);
- const loadMoveRequest = getRequestStatus(state, loadMoveLabel);
-
- return {
- genericMoveDocSchema: get(state, 'swaggerInternal.spec.definitions.CreateGenericMoveDocumentPayload', {}),
- moveDocSchema: get(state, 'swaggerInternal.spec.definitions.MoveDocumentPayload', {}),
- currentPpm: selectActivePPMForMove(state, moveId),
- docTypes: get(state, 'swaggerInternal.spec.definitions.MoveDocumentType.enum', []),
- moveId,
- moveLocator,
- moveDocumentId,
- moveDocuments: selectAllDocumentsForMove(state, moveId),
- serviceMember,
- serviceMemberId,
- loadDependenciesHasSuccess: loadMoveRequest.isSuccess,
- loadDependenciesHasError: loadMoveRequest.error,
- };
-};
-
-const mapDispatchToProps = {
- createMoveDocument,
- createMovingExpenseDocument,
- loadMove,
- loadServiceMember,
- getMoveDocumentsForMove,
-};
-
-export default withRouter(connect(mapStateToProps, mapDispatchToProps)(DocumentViewer));
diff --git a/src/scenes/Office/OrdersViewerPanel.js b/src/scenes/Office/OrdersViewerPanel.js
index b10d420afb0..c346eb0e26e 100644
--- a/src/scenes/Office/OrdersViewerPanel.js
+++ b/src/scenes/Office/OrdersViewerPanel.js
@@ -16,7 +16,7 @@ import './office.scss';
const OrdersViewerDisplay = (props) => {
const { orders } = props;
- const currentDutyLocation = get(props.serviceMember, 'current_location.name', '');
+ const currentDutyLocation = get(orders, 'origin_duty_location.name', '');
const uploads = get(orders, 'uploaded_orders.uploads', []);
const ordersFieldsProps = {
values: props.orders,
diff --git a/src/scenes/Office/Ppm/DatesAndLocationsPanel.jsx b/src/scenes/Office/Ppm/DatesAndLocationsPanel.jsx
deleted file mode 100644
index 2b17b6823e7..00000000000
--- a/src/scenes/Office/Ppm/DatesAndLocationsPanel.jsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { get } from 'lodash';
-import React from 'react';
-import { bindActionCreators } from 'redux';
-import { connect } from 'react-redux';
-import { reduxForm, getFormValues } from 'redux-form';
-
-import { editablePanelify, PanelSwaggerField } from 'shared/EditablePanel';
-import { SwaggerField } from 'shared/JsonSchemaForm/JsonSchemaField';
-import { selectActivePPMForMove, updatePPM } from 'shared/Entities/modules/ppms';
-
-const DatesAndLocationDisplay = (props) => {
- const fieldProps = {
- schema: props.ppmSchema,
- values: props.ppm,
- };
- return (
-
-
-
- {moveLocator}
- {serviceMember.edipi}
-
- {name}
-
-
-
- All Documents ({numMoveDocs})
- {/* TODO: Handle routing of /new route better */}
- {moveDocumentId && moveDocumentId !== 'new' && Details }
-
-
-
-
-
- {!isEmpty(moveDocuments) && moveDocumentId && moveDocumentId !== 'new' && (
-
-
- )}
-
-
-
- {' '}
-
-
-
- );
-};
-
-const DatesAndLocationEdit = (props) => {
- const schema = props.ppmSchema;
- return (
-
-
- );
-};
-
-const formName = 'ppm_dates_and_locations';
-
-let DatesAndLocationPanel = editablePanelify(DatesAndLocationDisplay, DatesAndLocationEdit);
-DatesAndLocationPanel = reduxForm({
- form: formName,
- enableReinitialize: true,
- keepDirtyOnReinitialize: true,
-})(DatesAndLocationPanel);
-
-function mapStateToProps(state, props) {
- const formValues = getFormValues(formName)(state);
- const ppm = selectActivePPMForMove(state, props.moveId);
-
- return {
- // reduxForm
- formValues,
- initialValues: {
- actual_move_date: ppm.actual_move_date,
- pickup_postal_code: ppm.pickup_postal_code,
- destination_postal_code: ppm.destination_postal_code,
- },
-
- ppmSchema: get(state, 'swaggerInternal.spec.definitions.PersonallyProcuredMovePayload'),
- ppm,
-
- hasError: !!props.error,
- errorMessage: get(state, 'office.error'),
- isUpdating: false,
-
- // editablePanelify
- getUpdateArgs() {
- const values = getFormValues(formName)(state);
- return [props.moveId, ppm.id, values];
- },
- };
-}
-
-function mapDispatchToProps(dispatch) {
- return bindActionCreators(
- {
- update: updatePPM,
- },
- dispatch,
- );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(DatesAndLocationPanel);
diff --git a/src/scenes/Office/Ppm/PPMEstimatesPanel.jsx b/src/scenes/Office/Ppm/PPMEstimatesPanel.jsx
deleted file mode 100644
index e59af7a9238..00000000000
--- a/src/scenes/Office/Ppm/PPMEstimatesPanel.jsx
+++ /dev/null
@@ -1,149 +0,0 @@
-import { get } from 'lodash';
-import React from 'react';
-import { connect } from 'react-redux';
-import { bindActionCreators } from 'redux';
-import { FormSection, getFormValues, reduxForm } from 'redux-form';
-
-import { editablePanelify, PanelField, PanelSwaggerField } from 'shared/EditablePanel';
-import { formatCentsRange } from 'utils/formatters';
-import { SwaggerField } from 'shared/JsonSchemaForm/JsonSchemaField';
-import YesNoBoolean from 'shared/Inputs/YesNoBoolean';
-import { selectActivePPMForMove, updatePPM } from 'shared/Entities/modules/ppms';
-import { calculateEntitlementsForMove } from 'shared/Entities/modules/moves';
-
-const validateWeight = (value, formValues, props, fieldName) => {
- if (value && props.entitlement && value > props.entitlement.sum) {
- return `Cannot be more than full entitlement weight (${props.entitlement.sum} lbs)`;
- }
- return undefined;
-};
-
-const EstimatesDisplay = (props) => {
- const ppm = props.PPMEstimate;
- const fieldProps = {
- schema: props.ppmSchema,
- values: ppm,
- };
-
- return (
- <>
-
-
- {formatCentsRange(ppm.incentive_estimate_min, ppm.incentive_estimate_max)}
-
-
- {fieldProps.values.has_sit ? 'Yes' : 'No'}
-
- {fieldProps.values.has_sit && (
-
-
-
-
- );
-};
-
-const EstimatesEdit = (props) => {
- const ppm = props.PPMEstimate;
- const schema = props.ppmSchema;
-
- return (
-
-
- {formatCentsRange(ppm.incentive_estimate_min, ppm.incentive_estimate_max)}
-
-
- Storage
-
-
-
- {props.awaitingStorageExpenses.length > 0 && (
-
- );
-};
-
-const StorageEdit = (props) => {
- const schema = props.ppmSchema;
-
- return (
-
- There are more storage receipts awaiting review
-
- )}
-
-
- );
-};
-
-const formName = 'ppm_sit_storage';
-
-let StoragePanel = editablePanelify(StorageDisplay, StorageEdit);
-StoragePanel = reduxForm({
- form: formName,
- enableReinitialize: true,
-})(StoragePanel);
-
-function mapStateToProps(state, props) {
- const formValues = getFormValues(formName)(state);
- const ppm = selectActivePPMForMove(state, props.moveId);
- const storageExpenses = filter(props.moveDocuments, ['moving_expense_type', 'STORAGE']);
-
- return {
- // reduxForm
- formValues,
- initialValues: {
- total_sit_cost: formatCents(ppm.total_sit_cost),
- days_in_storage: ppm.days_in_storage,
- },
-
- ppmSchema: get(state, 'swaggerInternal.spec.definitions.PersonallyProcuredMovePayload'),
- ppm,
-
- hasError: !!props.error,
- errorMessage: get(state, 'office.error'),
- isUpdating: false,
- awaitingStorageExpenses: getDocsByStatusAndType(storageExpenses, 'OK'),
-
- // editablePanelify
- getUpdateArgs() {
- const values = getFormValues(formName)(state);
- const adjustedValues = {
- total_sit_cost: convertDollarsToCents(values.total_sit_cost),
- days_in_storage: values.days_in_storage,
- };
- return [props.moveId, ppm.id, adjustedValues];
- },
- };
-}
-
-function mapDispatchToProps(dispatch) {
- return bindActionCreators(
- {
- update: updatePPM,
- },
- dispatch,
- );
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(StoragePanel);
diff --git a/src/scenes/Office/Ppm/StoragePanel.test.js b/src/scenes/Office/Ppm/StoragePanel.test.js
deleted file mode 100644
index 7d33b7a89dc..00000000000
--- a/src/scenes/Office/Ppm/StoragePanel.test.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-import { Provider } from 'react-redux';
-import { mount } from 'enzyme';
-
-import StoragePanel from './StoragePanel';
-
-import store from 'shared/store';
-import Alert from 'shared/Alert';
-import { PanelSwaggerField } from 'shared/EditablePanel';
-
-describe('StoragePanel', () => {
- describe('Receipts Awaiting Review Alert', () => {
- it('is non-existent when all receipts have OK status', () => {
- const moveDocuments = [
- { moving_expense_type: 'STORAGE', status: 'OK' },
- { moving_expense_type: 'STORAGE', status: 'OK' },
- ];
- const moveId = 'some ID';
-
- const wrapper = mount(
-
- There are more weight tickets awaiting review.
-
- )}
-
-
-
-
-
- );
-};
-
-const WeightPanel = editablePanelify(WeightDisplay, null, false);
-
-function mapStateToProps(state, ownProps) {
- const moveDocs = selectAllDocumentsForMove(state, ownProps.moveId);
-
- return {
- ppmPaymentRequestedFlag: true,
- vehicleWeightTicketWeight: sumWeights(findOKedVehicleWeightTickets(moveDocs)),
- progearWeightTicketWeight: sumWeights(findOKedProgearWeightTickets(moveDocs)),
- hasPendingWeightTickets: findPendingWeightTickets(moveDocs).length > 0,
- };
-}
-
-export default connect(mapStateToProps)(WeightPanel);
diff --git a/src/scenes/Office/Ppm/api.js b/src/scenes/Office/Ppm/api.js
deleted file mode 100644
index d8eddfbb9f5..00000000000
--- a/src/scenes/Office/Ppm/api.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { getClient, checkResponse } from 'shared/Swagger/api';
-import { formatDateForSwagger } from 'shared/dates';
-
-export async function GetPpmIncentive(moveDate, originZip, originDutyLocationZip, ordersID, weight) {
- const client = await getClient();
- const response = await client.apis.ppm.showPPMIncentive({
- original_move_date: formatDateForSwagger(moveDate),
- origin_zip: originZip,
- origin_duty_location_zip: originDutyLocationZip,
- orders_id: ordersID,
- weight,
- });
- checkResponse(response, 'failed to update ppm due to server error');
- return response.body;
-}
diff --git a/src/scenes/Office/Ppm/ducks.js b/src/scenes/Office/Ppm/ducks.js
deleted file mode 100644
index f12ee8fa2a9..00000000000
--- a/src/scenes/Office/Ppm/ducks.js
+++ /dev/null
@@ -1,74 +0,0 @@
-import { get, filter } from 'lodash';
-import reduceReducers from 'reduce-reducers';
-
-import { GetPpmIncentive } from './api.js';
-
-import * as ReduxHelpers from 'shared/ReduxHelpers';
-import { MOVE_DOC_STATUS } from 'shared/constants';
-
-const GET_PPM_INCENTIVE = 'GET_PPM_INCENTIVE';
-const GET_PPM_EXPENSE_SUMMARY = 'GET_PPM_EXPENSE_SUMMARY';
-const CLEAR_PPM_INCENTIVE = 'CLEAR_PPM_INCENTIVE';
-export const getIncentiveActionType = ReduxHelpers.generateAsyncActionTypes(GET_PPM_INCENTIVE);
-export const getPpmIncentive = ReduxHelpers.generateAsyncActionCreator(GET_PPM_INCENTIVE, GetPpmIncentive);
-
-const summaryReducer = ReduxHelpers.generateAsyncReducer(GET_PPM_EXPENSE_SUMMARY, (v) => {
- return {
- summary: { ...v },
- };
-});
-
-export const clearPpmIncentive = () => ({ type: CLEAR_PPM_INCENTIVE });
-
-export const getTabularExpenses = (expenseData, movingExpenseSchema) => {
- if (!expenseData || !movingExpenseSchema) return [];
- const expenses = movingExpenseSchema.enum.map((type) => {
- const item = expenseData.categories.find((item) => item.category === type);
- if (!item)
- return {
- type: get(movingExpenseSchema['x-display-value'], type),
- GTCC: null,
- other: null,
- total: null,
- };
- return {
- type: get(movingExpenseSchema['x-display-value'], type),
- GTCC: get(item, 'payment_methods.GTCC', null),
- other: get(item, 'payment_methods.OTHER', null),
- total: item.total,
- };
- });
- expenses.push({
- type: 'Total',
- GTCC: get(expenseData, 'grand_total.payment_method_totals.GTCC'),
- other: get(expenseData, 'grand_total.payment_method_totals.OTHER'),
- total: get(expenseData, 'grand_total.total'),
- });
- return expenses;
-};
-
-export const getDocsByStatusAndType = (documents, statusToExclude, typeToExclude) => {
- return filter(documents, (expense) => {
- if (!statusToExclude) {
- return expense.move_document_type !== typeToExclude;
- }
- if (!typeToExclude) {
- return ![MOVE_DOC_STATUS.EXCLUDE, statusToExclude].includes(expense.status);
- }
-
- return (
- ![MOVE_DOC_STATUS.EXCLUDE, statusToExclude].includes(expense.status) &&
- expense.move_document_type !== typeToExclude
- );
- });
-};
-
-function clearReducer(state, action) {
- if (action.type === CLEAR_PPM_INCENTIVE) return { ...state, calculation: null };
- return state;
-}
-const incentiveReducer = ReduxHelpers.generateAsyncReducer(GET_PPM_INCENTIVE, (v) => ({
- calculation: { ...v },
-}));
-
-export default reduceReducers(clearReducer, incentiveReducer, summaryReducer);
diff --git a/src/scenes/Office/Ppm/ducks.test.js b/src/scenes/Office/Ppm/ducks.test.js
deleted file mode 100644
index d0d47bf9d9d..00000000000
--- a/src/scenes/Office/Ppm/ducks.test.js
+++ /dev/null
@@ -1,266 +0,0 @@
-import reducer, { getDocsByStatusAndType, getIncentiveActionType, getTabularExpenses } from './ducks';
-
-describe('office ppm reducer', () => {
- describe('GET_PPM_INCENTIVE', () => {
- it('handles SUCCESS', () => {
- const newState = reducer(null, {
- type: getIncentiveActionType.success,
- payload: { gcc: 123400, incentive_percentage: 12400 },
- });
-
- expect(newState).toEqual({
- isLoading: false,
- hasErrored: false,
- hasSucceeded: true,
- calculation: { gcc: 123400, incentive_percentage: 12400 },
- });
- });
- it('handles START', () => {
- const newState = reducer(null, {
- type: getIncentiveActionType.start,
- });
- expect(newState).toEqual({
- isLoading: true,
- hasErrored: false,
- hasSucceeded: false,
- });
- });
- it('handles FAILURE', () => {
- const newState = reducer(null, {
- type: getIncentiveActionType.failure,
- });
- expect(newState).toEqual({
- isLoading: false,
- hasErrored: true,
- hasSucceeded: false,
- });
- });
- });
- describe('CLEAR_PPM_INCENTIVE', () => {
- it('handles SUCCESS', () => {
- const newState = reducer(null, {
- type: 'CLEAR_PPM_INCENTIVE',
- });
-
- expect(newState).toEqual({
- calculation: null,
- });
- });
- });
-});
-describe('getTabularExpenses', () => {
- const schema = {
- type: 'string',
- title: 'Moving Expense Type',
- enum: [
- 'CONTRACTED_EXPENSE',
- 'RENTAL_EQUIPMENT',
- 'PACKING_MATERIALS',
- 'WEIGHING_FEE',
- 'GAS',
- 'TOLLS',
- 'OIL',
- 'OTHER',
- ],
- 'x-display-value': {
- CONTRACTED_EXPENSE: 'Contracted Expense',
- RENTAL_EQUIPMENT: 'Rental Equipment',
- PACKING_MATERIALS: 'Packing Materials',
- WEIGHING_FEE: 'Weighing Fees',
- GAS: 'Gas',
- TOLLS: 'Tolls',
- OIL: 'Oil',
- OTHER: 'Other',
- },
- };
- describe('when there is no expense data', () => {
- it('return and empty array', () => {
- expect(getTabularExpenses(null, null)).toEqual([]);
- });
- });
- describe('when there are a few categories', () => {
- const expenseData = {
- categories: [
- {
- category: 'CONTRACTED_EXPENSE',
- payment_methods: {
- GTCC: 600,
- },
- total: 600,
- },
- {
- category: 'RENTAL_EQUIPMENT',
- payment_methods: {
- OTHER: 500,
- },
- total: 500,
- },
- {
- category: 'TOLLS',
- payment_methods: {
- OTHER: 500,
- },
- total: 500,
- },
- ],
- grand_total: {
- payment_method_totals: {
- GTCC: 600,
- OTHER: 1000,
- },
- total: 1600,
- },
- };
- const result = getTabularExpenses(expenseData, schema);
- it('should fill in all categories', () => {
- expect(result.map((r) => r.type)).toEqual([
- 'Contracted Expense',
- 'Rental Equipment',
- 'Packing Materials',
- 'Weighing Fees',
- 'Gas',
- 'Tolls',
- 'Oil',
- 'Other',
- 'Total',
- ]);
- });
- it('should extract GTCC', () => {
- expect(result[0].GTCC).toEqual(600);
- });
- it('should extract other', () => {
- expect(result[1].other).toEqual(500);
- });
-
- it('should include total as last object in array', () => {
- expect(result[result.length - 1]).toEqual({
- GTCC: 600,
- other: 1000,
- total: 1600,
- type: 'Total',
- });
- });
-
- it('should reshape by category', () => {
- expect(result).toEqual([
- { GTCC: 600, other: null, total: 600, type: 'Contracted Expense' },
- {
- GTCC: null,
- other: 500,
- total: 500,
- type: 'Rental Equipment',
- },
- {
- GTCC: null,
- other: null,
- total: null,
- type: 'Packing Materials',
- },
- {
- GTCC: null,
- other: null,
- total: null,
- type: 'Weighing Fees',
- },
- { GTCC: null, other: null, total: null, type: 'Gas' },
- { GTCC: null, other: 500, total: 500, type: 'Tolls' },
- { GTCC: null, other: null, total: null, type: 'Oil' },
- { GTCC: null, other: null, total: null, type: 'Other' },
- { GTCC: 600, other: 1000, total: 1600, type: 'Total' },
- ]);
- });
- });
- describe('getDocsByStatusAndType', () => {
- it('should filter documents by status and type to exclude', () => {
- const documents = [
- {
- move_document_type: 'EXPENSE',
- status: 'AWAITING_REVIEW',
- },
- {
- move_document_type: 'STORAGE',
- status: 'HAS_ISSUE',
- },
- {
- move_document_type: 'EXPENSE',
- status: 'OK',
- },
- {
- move_document_type: 'STORAGE',
- status: 'OK',
- },
- ];
- const filteredDocs = getDocsByStatusAndType(documents, 'OK', 'STORAGE');
- expect(filteredDocs).toEqual([
- {
- move_document_type: 'EXPENSE',
- status: 'AWAITING_REVIEW',
- },
- ]);
- });
-
- it('should filter documents by status to exclude when a type is missing', () => {
- const documents = [
- {
- move_document_type: 'EXPENSE',
- status: 'AWAITING_REVIEW',
- },
- {
- move_document_type: 'STORAGE',
- status: 'HAS_ISSUE',
- },
- {
- move_document_type: 'EXPENSE',
- status: 'OK',
- },
- {
- move_document_type: 'STORAGE',
- status: 'OK',
- },
- ];
- const filteredDocs = getDocsByStatusAndType(documents, 'OK');
- expect(filteredDocs).toEqual([
- {
- move_document_type: 'EXPENSE',
- status: 'AWAITING_REVIEW',
- },
- {
- move_document_type: 'STORAGE',
- status: 'HAS_ISSUE',
- },
- ]);
- });
-
- it('should filter documents by type to exclude when a status is missing', () => {
- const documents = [
- {
- move_document_type: 'EXPENSE',
- status: 'AWAITING_REVIEW',
- },
- {
- move_document_type: 'STORAGE',
- status: 'HAS_ISSUE',
- },
- {
- move_document_type: 'EXPENSE',
- status: 'OK',
- },
- {
- move_document_type: 'STORAGE',
- status: 'OK',
- },
- ];
- const filteredDocs = getDocsByStatusAndType(documents, null, 'STORAGE');
- expect(filteredDocs).toEqual([
- {
- move_document_type: 'EXPENSE',
- status: 'AWAITING_REVIEW',
- },
- {
- move_document_type: 'EXPENSE',
- status: 'OK',
- },
- ]);
- });
- });
-});
diff --git a/src/scenes/PpmLanding/MoveSummary/ApprovedMoveSummary.jsx b/src/scenes/PpmLanding/MoveSummary/ApprovedMoveSummary.jsx
deleted file mode 100644
index a4177dd5ba1..00000000000
--- a/src/scenes/PpmLanding/MoveSummary/ApprovedMoveSummary.jsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { Link } from 'react-router-dom';
-
-import ppmCar from 'scenes/PpmLanding/images/ppm-car.svg';
-import PPMStatusTimeline from 'scenes/PpmLanding/PPMStatusTimeline';
-import PpmMoveDetails from 'scenes/PpmLanding/MoveSummary/PpmMoveDetails';
-import { selectPPMCloseoutDocumentsForMove } from 'shared/Entities/modules/movingExpenseDocuments';
-
-const ApprovedMoveSummary = ({ ppm, move, weightTicketSets, isMissingWeightTicketDocuments, netWeight }) => {
- const paymentRequested = ppm.status === 'PAYMENT_REQUESTED';
- const ppmPaymentRequestIntroRoute = `moves/${move.id}/ppm-payment-request-intro`;
- const ppmPaymentRequestReviewRoute = `moves/${move.id}/ppm-payment-review`;
- return (
-
-
- );
-};
-
-const mapStateToProps = (state, { move }) => ({
- weightTicketSets: selectPPMCloseoutDocumentsForMove(state, move.id, ['WEIGHT_TICKET_SET']),
-});
-
-export default connect(mapStateToProps)(ApprovedMoveSummary);
diff --git a/src/scenes/PpmLanding/MoveSummary/CanceledMoveSummary.jsx b/src/scenes/PpmLanding/MoveSummary/CanceledMoveSummary.jsx
deleted file mode 100644
index 5854cb108ee..00000000000
--- a/src/scenes/PpmLanding/MoveSummary/CanceledMoveSummary.jsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from 'react';
-import { get } from 'lodash';
-
-import truck from 'shared/icon/truck-gray.svg';
-
-const CanceledMoveSummary = (props) => {
- const { profile, reviewProfile } = props;
- const currentLocation = get(profile, 'current_location');
- const officePhone = get(currentLocation, 'transportation_office.phone_lines.0');
- return (
-
-
-
- 
- Handle your own move (PPM)
-
-
-
-
-
-
-
-
- {paymentRequested ? (
- isMissingWeightTicketDocuments ? (
-
-
-
- ) : (
- Next step: Contact the PPPO office
-
- You will need to go into the PPPO office in order to take care of your missing weight ticket.
-
-
- Edit Payment Request
-
-
-
- )
- ) : (
- What's next?
-
- We'll email you a link so you can see and download your final payment paperwork.
-
-
- We've also sent your paperwork to Finance. They'll review it, determine a final amount, then send - your payment. -
-
- Edit Payment Request
-
- -
- We've also sent your paperwork to Finance. They'll review it, determine a final amount, then send - your payment. -
- {weightTicketSets.length ? (
- <>
-
- )}
- Next Step: Finish requesting payment
- Continue uploading your weight tickets and expense to get paid after your move is done.
-
- Continue Requesting Payment
-
-
- ) : (
- <>
- Next Step: Request payment
-
- Request a PPM payment, a storage payment, or an advance against your PPM payment before your
- move is done.
-
-
- Request Payment
-
-
- )}
-
-
-
-
-
- );
-};
-
-export default CanceledMoveSummary;
diff --git a/src/scenes/PpmLanding/MoveSummary/DraftMoveSummary.jsx b/src/scenes/PpmLanding/MoveSummary/DraftMoveSummary.jsx
deleted file mode 100644
index 7fabbf21374..00000000000
--- a/src/scenes/PpmLanding/MoveSummary/DraftMoveSummary.jsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import React from 'react';
-
-import { ProfileStatusTimeline } from 'scenes/PpmLanding/StatusTimeline';
-import truck from 'shared/icon/truck-gray.svg';
-
-const DraftMoveSummary = (props) => {
- const { profile, resumeMove } = props;
- return (
- New move
--
-
-
-
-
- 
- Start here
-
-
-
-
-
-
-
-
-
-
-
- Make sure you have a copy of your move orders before you get started. Questions or need to help?
- Contact your local Transportation Office (PPPO) at {get(currentLocation, 'name')}
- {officePhone ? ` at ${officePhone}` : ''}.
-
-
-
-
-
-
- );
-};
-
-export default DraftMoveSummary;
diff --git a/src/scenes/PpmLanding/MoveSummary/FindWeightScales.jsx b/src/scenes/PpmLanding/MoveSummary/FindWeightScales.jsx
deleted file mode 100644
index 2818f5c26ab..00000000000
--- a/src/scenes/PpmLanding/MoveSummary/FindWeightScales.jsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-
-const FindWeightScales = () => (
-
-
- Find Certified Weight Scales
-
-
-);
-
-export default FindWeightScales;
diff --git a/src/scenes/PpmLanding/MoveSummary/PaymentRequestedSummary.jsx b/src/scenes/PpmLanding/MoveSummary/PaymentRequestedSummary.jsx
deleted file mode 100644
index 45e042faa26..00000000000
--- a/src/scenes/PpmLanding/MoveSummary/PaymentRequestedSummary.jsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React from 'react';
-import moment from 'moment';
-
-import { ppmInfoPacket } from 'shared/constants';
-import ppmCar from 'scenes/PpmLanding/images/ppm-car.svg';
-import PPMStatusTimeline from 'scenes/PpmLanding/PPMStatusTimeline';
-import FindWeightScales from 'scenes/PpmLanding/MoveSummary/FindWeightScales';
-import PpmMoveDetails from 'scenes/PpmLanding/MoveSummary/SubmittedPpmMoveDetails';
-
-const PaymentRequestedSummary = (props) => {
- const { ppm } = props;
- const moveInProgress = moment(ppm.original_move_date, 'YYYY-MM-DD').isSameOrBefore();
- return (
-
-
-
-
- Move to be scheduled
-
-
-
-
-
-
-
-
-
-
-
-
- Next Step: Finish setting up your move
-
- Questions or need help? Contact your local Transportation Office (PPPO) at{' '}
- {profile.current_location.name}.
-
-
-
-
-
- Details
- No details
-
-
- Documents
- No documents
-
-
-
-
-
- );
-};
-
-export default PaymentRequestedSummary;
diff --git a/src/scenes/PpmLanding/MoveSummary/PpmMoveDetails.jsx b/src/scenes/PpmLanding/MoveSummary/PpmMoveDetails.jsx
deleted file mode 100644
index 17517ce048b..00000000000
--- a/src/scenes/PpmLanding/MoveSummary/PpmMoveDetails.jsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-
-import styles from './PpmMoveDetails.module.scss';
-
-import { formatCentsRange, formatCents } from 'utils/formatters';
-import { getIncentiveRange } from 'utils/incentives';
-import { selectPPMEstimateRange, selectReimbursementById } from 'store/entities/selectors';
-import { selectPPMCloseoutDocumentsForMove } from 'shared/Entities/modules/movingExpenseDocuments';
-import ToolTip from 'shared/ToolTip/ToolTip';
-
-const PpmMoveDetails = ({ advance, ppm, isMissingWeightTicketDocuments, estimateRange, netWeight }) => {
- const privateStorageString = ppm.estimated_storage_reimbursement
- ? `(up to ${ppm.estimated_storage_reimbursement})`
- : '';
- const advanceString =
- ppm.has_requested_advance && advance && advance.requested_amount
- ? `Advance Requested: $${formatCents(advance.requested_amount)}`
- : '';
- const hasSitString = `Temp. Storage: ${ppm.days_in_storage} days ${privateStorageString}`;
- const estimatedIncentiveRange = getIncentiveRange(ppm, estimateRange);
- const actualIncentiveRange = formatCentsRange(estimateRange?.range_min, estimateRange?.range_max);
-
- const hasRangeReady = ppm.incentive_estimate_min || estimatedIncentiveRange;
-
- const incentiveNotReady = () => {
- return (
- <>
- Not ready yet{' '}
-
-
-
-
- Handle your own move (PPM)
-
-
-
-
-
-
-
- {!moveInProgress && (
-
-
-
- )}
- Next Step: Get ready to move
-
- Remember to save your weight tickets and expense receipts. For more information, read the PPM info
- packet.
-
-
-
-
-
-
- Your payment is in review
- You will receive a notification from your destination PPPO office when it has been reviewed.
-
-
-
-
- Documents
-
-
-
-
-
- );
-};
-
-const mapStateToProps = (state, ownProps) => {
- const advance = selectReimbursementById(state, ownProps.ppm.advance) || {};
- const isMissingWeightTicketDocuments = selectPPMCloseoutDocumentsForMove(state, ownProps.ppm.move_id, [
- 'WEIGHT_TICKET_SET',
- ]).some((doc) => doc.empty_weight_ticket_missing || doc.full_weight_ticket_missing);
- return {
- advance,
- isMissingWeightTicketDocuments,
- estimateRange: selectPPMEstimateRange(state),
- };
-};
-
-export default connect(mapStateToProps)(PpmMoveDetails);
diff --git a/src/scenes/PpmLanding/MoveSummary/PpmMoveDetails.module.scss b/src/scenes/PpmLanding/MoveSummary/PpmMoveDetails.module.scss
deleted file mode 100644
index d5d91945645..00000000000
--- a/src/scenes/PpmLanding/MoveSummary/PpmMoveDetails.module.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-@import 'shared/styles/themes.scss';
-
-.subText{
- fontSize: '0.90em';
- color: $subtext;
-}
-.payment-details{
- margin-top: 1em;
-}
-
-.detail-title{
- font-weight: bold;
-}
\ No newline at end of file
diff --git a/src/scenes/PpmLanding/MoveSummary/SubmittedPpmMoveDetails.jsx b/src/scenes/PpmLanding/MoveSummary/SubmittedPpmMoveDetails.jsx
deleted file mode 100644
index f8ba6a5fe5c..00000000000
--- a/src/scenes/PpmLanding/MoveSummary/SubmittedPpmMoveDetails.jsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-
-import styles from './PpmMoveDetails.module.scss';
-
-import { formatCents } from 'utils/formatters';
-import { getIncentiveRange } from 'utils/incentives';
-import { selectPPMCloseoutDocumentsForMove } from 'shared/Entities/modules/movingExpenseDocuments';
-import { selectCurrentPPM, selectPPMEstimateRange, selectReimbursementById } from 'store/entities/selectors';
-import { selectPPMEstimateError } from 'store/onboarding/selectors';
-import ToolTip from 'shared/ToolTip/ToolTip';
-
-const SubmittedPpmMoveDetails = (props) => {
- const { advance, currentPPM, hasEstimateError, estimateRange } = props;
- const privateStorageString = currentPPM?.estimated_storage_reimbursement
- ? `(up to ${currentPPM.estimated_storage_reimbursement})`
- : '';
- const advanceString = currentPPM?.has_requested_advance
- ? `Advance Requested: $${formatCents(advance.requested_amount)}`
- : '';
- const hasSitString = `Temp. Storage: ${currentPPM?.days_in_storage} days ${privateStorageString}`;
- const incentiveRange = getIncentiveRange(currentPPM, estimateRange);
-
- const weightEstimate = currentPPM?.weight_estimate;
- return (
- Estimated
- Weight: {ppm.weight_estimate} lbs
- {hasRangeReady && isMissingWeightTicketDocuments ? (
- <>
-
- Unknown
-
-
- Estimated payment will be given after resolving missing weight tickets.
-
-
- ) : (
- <>
-
-
- {ppm.status === 'PAYMENT_REQUESTED' && (
- Payment: {hasRangeReady ? estimatedIncentiveRange : incentiveNotReady()}
-
-
- )}
- Submitted
- Weight: {netWeight} lbs
- Payment request: {hasRangeReady ? actualIncentiveRange : incentiveNotReady()}
-
- Actual payment may vary, subject to Finance review.
-
-
- )}
- {ppm.has_sit && {hasSitString}
}
- {ppm.has_requested_advance && {advanceString}
}
-
-
- );
-};
-
-const mapStateToProps = (state) => {
- const currentPPM = selectCurrentPPM(state) || {};
- const advance = selectReimbursementById(state, currentPPM?.advance) || {};
- const isMissingWeightTicketDocuments = selectPPMCloseoutDocumentsForMove(state, currentPPM?.move_id, [
- 'WEIGHT_TICKET_SET',
- ]).some((doc) => doc.empty_weight_ticket_missing || doc.full_weight_ticket_missing);
-
- const props = {
- currentPPM,
- advance,
- isMissingWeightTicketDocuments,
- estimateRange: selectPPMEstimateRange(state) || {},
- hasEstimateError: selectPPMEstimateError(state),
- };
- return props;
-};
-
-export default connect(mapStateToProps)(SubmittedPpmMoveDetails);
diff --git a/src/scenes/PpmLanding/MoveSummary/SubmittedPpmMoveSummary.jsx b/src/scenes/PpmLanding/MoveSummary/SubmittedPpmMoveSummary.jsx
deleted file mode 100644
index e51c50e406d..00000000000
--- a/src/scenes/PpmLanding/MoveSummary/SubmittedPpmMoveSummary.jsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import React from 'react';
-
-import { ppmInfoPacket } from 'shared/constants';
-import ppmCar from 'scenes/PpmLanding/images/ppm-car.svg';
-import PPMStatusTimeline from 'scenes/PpmLanding/PPMStatusTimeline';
-import FindWeightScales from 'scenes/PpmLanding/MoveSummary/FindWeightScales';
-import PpmMoveDetails from 'scenes/PpmLanding/MoveSummary/SubmittedPpmMoveDetails';
-
-const SubmittedPpmMoveSummary = (props) => {
- const { ppm, hasEstimateError } = props;
- return (
- Estimated
- Weight: {weightEstimate} lbs
-
- Payment:{' '}
- {!incentiveRange || hasEstimateError ? (
- <>
- Not ready yet{' '}
-
- {currentPPM?.has_sit && {hasSitString}
}
- {currentPPM?.has_requested_advance && {advanceString}
}
-
-
- );
-};
-
-export default SubmittedPpmMoveSummary;
diff --git a/src/scenes/PpmLanding/PPMStatusTimeline.js b/src/scenes/PpmLanding/PPMStatusTimeline.js
deleted file mode 100644
index 16d40ddc67b..00000000000
--- a/src/scenes/PpmLanding/PPMStatusTimeline.js
+++ /dev/null
@@ -1,146 +0,0 @@
-import React from 'react';
-import { get, includes } from 'lodash';
-import moment from 'moment';
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-
-import { StatusTimeline } from './StatusTimeline';
-
-import {
- getSignedCertification,
- selectPaymentRequestCertificationForMove,
-} from 'shared/Entities/modules/signed_certifications';
-import { selectCurrentMove } from 'store/entities/selectors';
-import { milmoveLogger } from 'utils/milmoveLog';
-
-const PpmStatuses = {
- Submitted: 'SUBMITTED',
- Approved: 'APPROVED',
- PaymentRequested: 'PAYMENT_REQUESTED',
- Completed: 'COMPLETED',
-};
-
-const PpmStatusTimelineCodes = {
- Submitted: 'SUBMITTED',
- PpmApproved: 'PPM_APPROVED',
- InProgress: 'IN_PROGRESS',
- PaymentRequested: 'PAYMENT_REQUESTED',
- PaymentReviewed: 'PAYMENT_REVIEWED',
-};
-
-export class PPMStatusTimeline extends React.Component {
- componentDidMount() {
- const { moveId } = this.props;
- this.props.getSignedCertification(moveId);
- }
-
- static determineActualMoveDate(ppm) {
- const approveDate = get(ppm, 'approve_date');
- const originalMoveDate = get(ppm, 'original_move_date');
- const actualMoveDate = get(ppm, 'actual_move_date');
- // if there's no approve date, then the PPM hasn't been approved yet
- // and the in progress date should not be shown
- if (!approveDate) {
- return undefined;
- }
- // if there's an actual move date that is known and passed, show it
- // else show original move date if it has passed
- if (actualMoveDate && moment(actualMoveDate, 'YYYY-MM-DD').isSameOrBefore()) {
- return actualMoveDate;
- }
- if (moment(originalMoveDate, 'YYYY-MM-DD').isSameOrBefore()) {
- return originalMoveDate;
- }
- return undefined;
- }
-
- isCompleted(statusCode) {
- const { ppm } = this.props;
- const moveIsApproved = includes(
- [PpmStatuses.Approved, PpmStatuses.PaymentRequested, PpmStatuses.Completed],
- ppm.status,
- );
- const moveInProgress = moment(ppm.original_move_date, 'YYYY-MM-DD').isSameOrBefore();
- const moveIsComplete = includes([PpmStatuses.PaymentRequested, PpmStatuses.Completed], ppm.status);
-
- switch (statusCode) {
- case PpmStatusTimelineCodes.Submitted:
- return true;
- case PpmStatusTimelineCodes.Approved:
- return moveIsApproved;
- case PpmStatusTimelineCodes.InProgress:
- return (moveInProgress && ppm.status === PpmStatuses.Approved) || moveIsComplete;
- case PpmStatusTimelineCodes.PaymentRequested:
- return moveIsComplete;
- case PpmStatusTimelineCodes.PaymentReviewed:
- return ppm.status === PpmStatuses.Completed;
- default:
- milmoveLogger.warn(`Unknown status: ${statusCode}`);
- }
- return undefined;
- }
-
- getStatuses() {
- const { ppm, signedCertification } = this.props;
- const actualMoveDate = PPMStatusTimeline.determineActualMoveDate(ppm);
- const approveDate = get(ppm, 'approve_date');
- const submitDate = get(ppm, 'submit_date');
- const paymentRequestedDate = signedCertification && signedCertification.date ? signedCertification.date : null;
- return [
- {
- name: 'Submitted',
- code: PpmStatusTimelineCodes.Submitted,
- dates: [submitDate],
- completed: this.isCompleted(PpmStatusTimelineCodes.Submitted),
- },
- {
- name: 'Approved',
- code: PpmStatusTimelineCodes.PpmApproved,
- dates: [approveDate],
- completed: this.isCompleted(PpmStatusTimelineCodes.Approved),
- },
- {
- name: 'In progress',
- code: PpmStatusTimelineCodes.InProgress,
- dates: [actualMoveDate],
- completed: this.isCompleted(PpmStatusTimelineCodes.InProgress),
- },
- {
- name: 'Payment requested',
- code: PpmStatusTimelineCodes.PaymentRequested,
- dates: [paymentRequestedDate],
- completed: this.isCompleted(PpmStatusTimelineCodes.PaymentRequested),
- },
- {
- name: 'Payment reviewed',
- code: PpmStatusTimelineCodes.PaymentReviewed,
- completed: this.isCompleted(PpmStatusTimelineCodes.PaymentReviewed),
- },
- ];
- }
-
- render() {
- const statuses = this.getStatuses();
- return
-
- Handle your own move (PPM)
-
-
-
-
-
-
- Read PPM Info Sheet
-
-
-
-
-
- Next Step: Wait for approval & get ready
-
- You'll be notified when your move is approved (up to 5 days). To get ready to move:
-
- -
-
- - {' '} - - Find a convenient weight scale - {' '} - and verify when they’re open. - -
- Save any expense receipts, including for storage. -
-
-
-
- Documents
-
-
-
- -
-
-
- - Get certified weight tickets, both empty & full - -
- - Save expense receipts, including for storage - -
- - Read the{' '} - - - PPM info sheet - - {' '} - for more info - -
-
- );
-};
-
-const genPpmSummaryStatusComponents = {
- DRAFT: DraftMoveSummary,
- SUBMITTED: SubmittedPpmMoveSummary,
- APPROVED: ApprovedMoveSummary,
- CANCELED: CanceledMoveSummary,
- PAYMENT_REQUESTED: PaymentRequestedSummary,
-};
-
-const getPPMStatus = (moveStatus, ppm) => {
- // PPM status determination
- const ppmStatus = get(ppm, 'status', 'DRAFT');
- return moveStatus === 'APPROVED' && (ppmStatus === 'SUBMITTED' || ppmStatus === 'DRAFT') ? 'SUBMITTED' : moveStatus;
-};
-
-export class PpmSummaryComponent extends React.Component {
- constructor(props) {
- super(props);
-
- this.state = {
- hasEstimateError: false,
- netWeight: null,
- };
- }
-
- componentDidMount() {
- if (this.props.move.id) {
- this.props.getMoveDocumentsForMove(this.props.move.id).then(({ obj: documents }) => {
- const weightTicketNetWeight = calcNetWeight(documents);
- let netWeight =
- weightTicketNetWeight > this.props.entitlement.sum ? this.props.entitlement.sum : weightTicketNetWeight;
-
- if (netWeight === 0) {
- netWeight = this.props.ppm.weight_estimate;
- }
- if (!netWeight) {
- this.setState({ hasEstimateError: true });
- }
- if (!isEmpty(this.props.ppm) && netWeight) {
- calculatePPMEstimate(
- this.props.ppm.original_move_date,
- this.props.ppm.pickup_postal_code,
- this.props.originDutyLocationZip,
- this.props.orders.id,
- netWeight,
- )
- .then((response) => {
- this.props.updatePPMEstimate(response);
- this.props.setPPMEstimateError(null);
- })
- .catch((err) => {
- this.props.setPPMEstimateError(err);
- this.setState({ hasEstimateError: true });
- });
-
- this.setState({ netWeight });
- }
- });
- }
- }
-
- render() {
- const {
- profile,
- move,
- orders,
- ppm,
- editMove,
- entitlement,
- resumeMove,
- reviewProfile,
- isMissingWeightTicketDocuments,
- } = this.props;
- const moveStatus = get(move, 'status', 'DRAFT');
- const ppmStatus = getPPMStatus(moveStatus, ppm);
- const PPMComponent = genPpmSummaryStatusComponents[ppmStatus];
- return (
- - {get(orders, 'new_duty_location.name', 'New move')} (from {get(profile, 'current_location.name', '')}) -
- {get(move, 'locator') &&Move Locator: {get(move, 'locator')}
}
- {!isEmpty(entitlement) && (
-
- Weight allowance:{' '}
- {entitlement.weight.toLocaleString()} lbs
-
- )}
-
- {move.status === 'CANCELED' && (
-
- Your move from {get(profile, 'current_location.name')} to {get(orders, 'new_duty_location.name')} with the
- move locator ID {get(move, 'locator')} was canceled.
-
- )}
-
-
- );
- }
-}
-
-function mapStateToProps(state, ownProps) {
- const serviceMember = selectServiceMemberFromLoggedInUser(state);
- const isMissingWeightTicketDocuments = selectPPMCloseoutDocumentsForMove(state, ownProps.move.id, [
- 'WEIGHT_TICKET_SET',
- ]).some((doc) => doc.empty_weight_ticket_missing || doc.full_weight_ticket_missing);
-
- return {
- isMissingWeightTicketDocuments,
- originDutyLocationZip: serviceMember?.current_location?.address?.postalCode,
- };
-}
-
-const mapDispatchToProps = {
- getMoveDocumentsForMove,
- updatePPMEstimate,
- setPPMEstimateError,
-};
-
-export const PpmSummary = connect(mapStateToProps, mapDispatchToProps)(PpmSummaryComponent);
diff --git a/src/scenes/PpmLanding/PpmSummary.module.css b/src/scenes/PpmLanding/PpmSummary.module.css
deleted file mode 100644
index 07c1cdaf262..00000000000
--- a/src/scenes/PpmLanding/PpmSummary.module.css
+++ /dev/null
@@ -1,142 +0,0 @@
-h2 {
- margin-bottom: 0;
-}
-
-.usa-alert li {
- margin-bottom: 0;
-}
-
-.usa-alert ul {
- padding-left: 3.5rem;
-}
-
-.shipment_box {
- border: 3px solid #f1f1f1;
- overflow: hidden;
- padding-bottom: 4rem;
- position: relative;
-}
-
-img.move_sm {
- height: 1em;
- display: inline;
- margin-bottom: 0;
- margin-right: 0.3em;
- padding: 0rem 1.2rem 0rem 0rem;
-}
-
-img.status_icon {
- margin: 1.2em 1rem 1.5rem 1rem;
-}
-
-.shipment_type {
- background-color: #f1f1f1;
- font-size: 1.1em;
- font-weight: bold;
- padding: 0.7em;
-}
-
-.shipment_box_contents {
- padding: 0.5em;
-}
-
-.step {
- margin-bottom: 1em;
-}
-
-.next-step {
- width: 102%;
-}
-
-.next-step li {
- margin-bottom: 0;
-}
-
-.step-contents {
- overflow: hidden;
- margin: 1em 1rem 1rem 1rem;
-}
-
-.step-links {
- margin: 1em 1rem 1rem 1rem;
-}
-
-.details-links a {
- display: block;
-}
-
-.titled_block {
- margin-top: 0.5em;
-}
-
-a {
- text-decoration: none;
-}
-
-.contact_block {
- margin-top: 2em;
-}
-
-.contact_block .title {
- font-size: 2.2rem;
-}
-
-.move-summary button.link {
- color: #0071bc;
- background: transparent;
- padding: 0;
- font-weight: 400;
-}
-
-.move-summary button.link:hover {
- color: #205493;
-}
-
-.ppm-panel button {
- background-color: #0071bc;
- color: #ffffff;
-}
-
-.ppm-panel button:hover {
- background-color: #205493;
- color: #ffffff;
-}
-
-.ppm-panel .shipment_box {
- padding-bottom: 0;
-}
-
-.ppm-panel .shipment_type {
- background-color: #e1f2f8;
-}
-
-.ppm-panel .shipment_box_contents {
- background-color: #f5fbfd;
-}
-
-.st-wrapper {
- width: 100%;
-}
-
-button.usa-button--secondary {
- margin-left: 0;
-}
-
-@media (max-width: 600px) {
- .st-wrapper {
- width: 100vw;
- max-width: 100vw;
- min-width: 320px;
- margin-left: -1.06667rem;
- margin-right: 0;
- }
- .shipment_box_contents {
- padding: 0;
- }
- .shipment_type {
- font-size: 1em;
- }
- a.usa-button {
- margin-left: 16px;
- }
-}
diff --git a/src/scenes/PpmLanding/PpmSummary.test.jsx b/src/scenes/PpmLanding/PpmSummary.test.jsx
deleted file mode 100644
index 554d6a4984c..00000000000
--- a/src/scenes/PpmLanding/PpmSummary.test.jsx
+++ /dev/null
@@ -1,178 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-import moment from 'moment';
-
-import { PpmSummaryComponent } from './PpmSummary';
-
-import CanceledMoveSummary from 'scenes/PpmLanding/MoveSummary/CanceledMoveSummary';
-import DraftMoveSummary from 'scenes/PpmLanding/MoveSummary/DraftMoveSummary';
-import SubmittedPpmMoveSummary from 'scenes/PpmLanding/MoveSummary/SubmittedPpmMoveSummary';
-import { SHIPMENT_OPTIONS } from 'shared/constants';
-
-describe('PpmSummaryComponent', () => {
- const editMoveFn = jest.fn();
- const resumeMoveFn = jest.fn();
- const entitlementObj = { sum: '10000' };
- const serviceMember = { current_location: { name: 'Ft Carson' } };
- const ordersObj = {};
- const getMoveDocumentsForMove = jest.fn(() => ({ then: () => {} }));
- const getShallowRender = (entitlementObj, serviceMember, ordersObj, moveObj, ppmObj, editMoveFn, resumeMoveFn) => {
- return shallow(
-
-
-
- {move.status !== 'CANCELED' && (
-
- You will need to contact your local PPPO office to resolve your missing weight ticket.
-
- )}
-
-
-
-
- )}
- {isMissingWeightTicketDocuments && ppm.status === 'PAYMENT_REQUESTED' && (
- -
-
-
-
-
-
-
-
-
-
-
-
- Contacts
-Next Step: Finish setting up your move
',
- );
- });
- });
- // PPM
- describe('when a ppm move is in canceled state', () => {
- it('renders cancel content', () => {
- const moveObj = { selected_move_type: SHIPMENT_OPTIONS.PPM, status: 'CANCELED' };
- const futureFortNight = moment().add(14, 'day');
- const ppmObj = {
- original_move_date: futureFortNight,
- weight_estimate: '10000',
- estimated_incentive: '$24665.59 - 27261.97',
- status: 'CANCELED',
- };
- const subComponent = getShallowRender(
- entitlementObj,
- serviceMember,
- ordersObj,
- moveObj,
- ppmObj,
- editMoveFn,
- resumeMoveFn,
- );
- expect(subComponent.find(CanceledMoveSummary).length).toBe(1);
- expect(subComponent.find(CanceledMoveSummary).dive().find('h1').html()).toEqual('New move
'); - }); - }); - describe('when a move with a ppm is in submitted state', () => { - it('renders submitted content', () => { - const moveObj = { selected_move_type: SHIPMENT_OPTIONS.PPM, status: 'SUBMITTED' }; - const futureFortNight = moment().add(14, 'day'); - const ppmObj = { - original_move_date: futureFortNight, - weight_estimate: '10000', - estimated_incentive: '$24665.59 - 27261.97', - }; - const subComponent = getShallowRender( - entitlementObj, - serviceMember, - ordersObj, - moveObj, - ppmObj, - editMoveFn, - resumeMoveFn, - ).find(SubmittedPpmMoveSummary); - expect(subComponent.find(SubmittedPpmMoveSummary).length).toBe(1); - expect(subComponent.find(SubmittedPpmMoveSummary).dive().find('.step').find('div.title').first().html()).toEqual( - 'Next Step: Wait for approval & get ready
',
- );
- });
- });
-
- describe('when a move is in approved state but ppm is submitted state', () => {
- it('renders submitted rather than approved content', () => {
- const moveObj = { selected_move_type: SHIPMENT_OPTIONS.PPM, status: 'APPROVED' };
- const futureFortNight = moment().add(14, 'day');
- const ppmObj = {
- original_move_date: futureFortNight,
- weight_estimate: '10000',
- estimated_incentive: '$24665.59 - 27261.97',
- status: 'SUBMITTED',
- };
- const subComponent = getShallowRender(
- entitlementObj,
- serviceMember,
- ordersObj,
- moveObj,
- ppmObj,
- editMoveFn,
- resumeMoveFn,
- ).find(SubmittedPpmMoveSummary);
- expect(subComponent.find(SubmittedPpmMoveSummary).length).toBe(1);
- expect(subComponent.find(SubmittedPpmMoveSummary).dive().find('.step').find('div.title').first().html()).toEqual(
- 'Next Step: Wait for approval & get ready
',
- );
- });
- });
- describe('when a move and ppm are in approved state', () => {
- it('renders approved content', () => {
- const moveObj = { status: 'APPROVED' };
- const futureFortNight = moment().add(14, 'day');
- const ppmObj = {
- original_move_date: futureFortNight,
- weight_estimate: '10000',
- estimated_incentive: '$24665.59 - 27261.97',
- status: 'APPROVED',
- };
- const component = getShallowRender(
- entitlementObj,
- serviceMember,
- ordersObj,
- moveObj,
- ppmObj,
- editMoveFn,
- resumeMoveFn,
- );
- const ppmSummary = component.find('Connect(ApprovedMoveSummary)');
- expect(ppmSummary.exists()).toBe(true);
- });
- });
- describe('when a move with a ppm is in in progress state', () => {
- it('renders in progress content', () => {
- const moveObj = { status: 'APPROVED' };
- const pastFortNight = moment().subtract(14, 'day');
- const ppmObj = {
- original_move_date: pastFortNight,
- weight_estimate: '10000',
- estimated_incentive: '$24665.59 - 27261.97',
- };
- const component = getShallowRender(
- entitlementObj,
- serviceMember,
- ordersObj,
- moveObj,
- ppmObj,
- editMoveFn,
- resumeMoveFn,
- );
- const ppmSummary = component.find(SubmittedPpmMoveSummary);
- expect(ppmSummary.exists()).toBe(true);
- });
- });
-});
diff --git a/src/scenes/PpmLanding/StatusTimeline.jsx b/src/scenes/PpmLanding/StatusTimeline.jsx
deleted file mode 100644
index 9feebe22809..00000000000
--- a/src/scenes/PpmLanding/StatusTimeline.jsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import PropTypes from 'prop-types';
-import React, { PureComponent } from 'react';
-import { filter, findLast } from 'lodash';
-
-import { displayDateRange } from 'utils/formatters';
-import './StatusTimeline.scss';
-
-function getCurrentStatus(statuses) {
- return findLast(statuses, function (status) {
- return status.completed;
- });
-}
-
-export class ProfileStatusTimeline extends React.Component {
- getStatuses() {
- return [
- { name: 'Profile', code: 'PROFILE', completed: true },
- { name: 'Orders', code: 'ORDERS', completed: true },
- { name: 'Move Setup', code: 'MOVE_SETUP', completed: false },
- { name: 'Review', code: 'REVIEW', completed: false },
- ];
- }
-
- render() {
- return
- {statusBlocks}
- {this.props.showEstimated &&
- );
- }
-}
-
-StatusTimeline.propTypes = {
- statuses: PropTypes.array.isRequired,
-};
-
-export const StatusBlock = (props) => {
- const classes = ['status_block', props.code.toLowerCase()];
- if (props.completed) classes.push('status_completed');
- if (props.current) classes.push('status_current');
-
- return (
- * Estimated
}
-
-
-
- );
-};
-
-StatusBlock.propTypes = {
- code: PropTypes.string.isRequired,
- completed: PropTypes.bool.isRequired,
- current: PropTypes.bool.isRequired,
- name: PropTypes.string.isRequired,
- dates: PropTypes.arrayOf(PropTypes.string),
-};
diff --git a/src/scenes/PpmLanding/StatusTimeline.scss b/src/scenes/PpmLanding/StatusTimeline.scss
deleted file mode 100644
index e6e645dc40e..00000000000
--- a/src/scenes/PpmLanding/StatusTimeline.scss
+++ /dev/null
@@ -1,127 +0,0 @@
-@import '../../shared/styles/basics';
-@import '../../shared/styles/mixins';
-@import '../../shared/styles/colors';
-
-.status_block.status_current .status_name {
- @include u-text('bold');
-}
-
-.shipment_box_contents .status_timeline {
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- margin-top: 2rem;
- margin-bottom: 2rem;
- text-align: center;
- @include u-font-size('body', '3xs');
-}
-
-.shipment_box_contents .status_block {
- flex: 1;
- display: flex;
- flex-direction: column;
- align-items: center;
- position: relative;
- font-size: 0.9em;
-}
-
-.shipment_box_contents .status_dot {
- display: block;
- width: 20px;
- height: 20px;
- background: white;
- border: 3px solid $base-lighter;
- border-radius: 50%;
- -moz-border-radius: 50%;
- -webkit-border-radius: 50%;
- z-index: 10;
-}
-
-.status_block.packed .status_dates,
-.status_block.delivered .status_dates {
- font-style: italic;
- color: #999;
-}
-.status_block.packed .status_dates:after,
-.status_block.delivered .status_dates:after {
- content: ' *';
-}
-
-.status_block {
- color: $base;
-}
-
-.status_block.status_completed,
-.status_block.status_current {
- color: black;
-}
-
-.status_block.status_completed .status_dot {
- background: #102e51;
- border: none;
- box-shadow: 0px 0px 0px 2px #102e51;
-}
-
-.status_block.status_current .status_dot {
- background: #102e51;
- border: none;
- box-shadow: 0px 0px 0px 4px #0270bc;
-}
-
-.status_block:after {
- display: block;
- content: ' ';
- width: 100%;
- height: 3px;
- background: #d6d7d9;
- position: absolute;
- right: 50%;
- top: 10px;
- z-index: 1;
-}
-
-.status_block:first-child:after {
- display: none;
-}
-
-.status_block.status_completed:after,
-.status_block.status_current:after {
- background: #102e51;
-}
-
-.status_block.status_completed:first-child:after {
- display: none;
-}
-
-.shipment_box_contents .status_name {
- margin: 1rem 0 0 0;
- max-width: 100px;
- text-align: center;
- line-height: 1.25;
-}
-
-.shipment_box_contents {
- padding: 0;
-}
-
-.status_timeline .legend {
- font-style: italic;
- color: #999;
- position: absolute;
- bottom: 2rem;
- left: 1rem;
-}
-
-.st-wrapper a.usa-button {
- margin-left: 16px;
- max-width: 90%;
-}
-
-@include at-media(tablet) {
- .shipment_box_contents .status_timeline {
- @include u-font-size('body', '2xs');
- }
- .st-wrapper a.usa-button {
- max-width: 100%;
- }
-}
diff --git a/src/scenes/PpmLanding/StatusTimeline.test.jsx b/src/scenes/PpmLanding/StatusTimeline.test.jsx
deleted file mode 100644
index 5ad871f012c..00000000000
--- a/src/scenes/PpmLanding/StatusTimeline.test.jsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import React from 'react';
-import { shallow, mount } from 'enzyme';
-
-import { StatusBlock, ProfileStatusTimeline } from './StatusTimeline';
-import { PPMStatusTimeline } from './PPMStatusTimeline';
-
-describe('StatusTimeline', () => {
- describe('PPMStatusTimeline', () => {
- test('renders timeline', () => {
- const ppm = {};
- const wrapper = mount({props.name}
- {props.dates && props.dates.length > 0 && (
- {displayDateRange(props.dates, 'condensed')}
- )}
-
-
-
- );
-};
-
-ProgressTimelineStep.propTypes = {
- completed: PropTypes.bool,
- current: PropTypes.bool,
-};
-
-// ProgressTimeline renders a subway-map-style timeline. Use ProgressTimelineStep
-// components as children to declaritively define the "stops" and their status.
-export const ProgressTimeline = function (props) {
- return {props.name}
- {props.children}
;
-};
-
-ProgressTimeline.propTypes = {
- children: PropTypes.arrayOf(ProgressTimelineStep).isRequired,
-};
diff --git a/src/shared/constants.js b/src/shared/constants.js
index 353988f9ba1..1d9c17bf10d 100644
--- a/src/shared/constants.js
+++ b/src/shared/constants.js
@@ -11,7 +11,6 @@ export const gitBranch = process.env.REACT_APP_GIT_BRANCH || 'unknown';
export const gitSha = process.env.REACT_APP_GIT_COMMIT || 'unknown';
export const NULL_UUID = '00000000-0000-0000-0000-000000000000';
-export const ppmInfoPacket = '/downloads/ppm_info_sheet.pdf';
export const hostname = window && window.location && window.location.hostname;
export const isMilmoveSite = hostname.startsWith('my') || hostname.startsWith('mil') || '';
@@ -77,6 +76,9 @@ export const SHIPMENT_OPTIONS = {
PPM: 'PPM',
NTS: 'HHG_INTO_NTS_DOMESTIC',
NTSR: 'HHG_OUTOF_NTS_DOMESTIC',
+ BOAT_TOW_AWAY: 'BOAT_TOW_AWAY',
+ BOAT_HAUL_AWAY: 'BOAT_HAUL_AWAY',
+ MOTORHOME: 'MOTORHOME',
};
// These constants are used for forming URLs that have the shipment type in
diff --git a/src/store/entities/actions.js b/src/store/entities/actions.js
index a1241932760..fc09b9c44e1 100644
--- a/src/store/entities/actions.js
+++ b/src/store/entities/actions.js
@@ -4,10 +4,6 @@ export const UPDATE_MOVE = 'UPDATE_MOVE';
export const UPDATE_MTO_SHIPMENT = 'UPDATE_MTO_SHIPMENT';
export const UPDATE_MTO_SHIPMENTS = 'UPDATE_MTO_SHIPMENTS';
export const UPDATE_ORDERS = 'UPDATE_ORDERS';
-export const UPDATE_PPMS = 'UPDATE_PPMS';
-export const UPDATE_PPM = 'UPDATE_PPM';
-export const UPDATE_PPM_ESTIMATE = 'UPDATE_PPM_ESTIMATE';
-export const UPDATE_PPM_SIT_ESTIMATE = 'UPDATE_PPM_SIT_ESTIMATE';
export const UPDATE_OKTA_USER_STATE = 'SET_OKTA_USER';
export const updateOktaUserState = (oktaUser) => ({
@@ -44,23 +40,3 @@ export const updateOrders = (payload) => ({
type: UPDATE_ORDERS,
payload,
});
-
-export const updatePPMs = (payload) => ({
- type: UPDATE_PPMS,
- payload,
-});
-
-export const updatePPM = (payload) => ({
- type: UPDATE_PPM,
- payload,
-});
-
-export const updatePPMEstimate = (payload) => ({
- type: UPDATE_PPM_ESTIMATE,
- payload,
-});
-
-export const updatePPMSitEstimate = (payload) => ({
- type: UPDATE_PPM_SIT_ESTIMATE,
- payload,
-});
diff --git a/src/store/entities/selectors.js b/src/store/entities/selectors.js
index 1d261366635..fa12c58ed03 100644
--- a/src/store/entities/selectors.js
+++ b/src/store/entities/selectors.js
@@ -1,7 +1,7 @@
import { createSelector } from 'reselect';
import { profileStates } from 'constants/customerStates';
-import { MOVE_STATUSES, NULL_UUID } from 'shared/constants';
+import { MOVE_STATUSES } from 'shared/constants';
/**
* Use this file for selecting "slices" of state from Redux and for computed
@@ -43,7 +43,6 @@ export const selectServiceMemberProfileState = createSelector(selectServiceMembe
/* eslint-disable camelcase */
const {
- rank,
edipi,
affiliation,
first_name,
@@ -52,18 +51,15 @@ export const selectServiceMemberProfileState = createSelector(selectServiceMembe
personal_email,
phone_is_preferred,
email_is_preferred,
- current_location,
residential_address,
backup_mailing_address,
backup_contacts,
} = serviceMember;
- if (!rank || !edipi || !affiliation) return profileStates.EMPTY_PROFILE;
+ if (!edipi || !affiliation) return profileStates.EMPTY_PROFILE;
if (!first_name || !last_name) return profileStates.DOD_INFO_COMPLETE;
if (!telephone || !personal_email || !(phone_is_preferred || email_is_preferred)) return profileStates.NAME_COMPLETE;
- if (!current_location || !current_location.id || current_location.id === NULL_UUID)
- return profileStates.CONTACT_INFO_COMPLETE;
- if (!residential_address) return profileStates.DUTY_LOCATION_COMPLETE;
+ if (!residential_address) return profileStates.CONTACT_INFO_COMPLETE;
if (!backup_mailing_address) return profileStates.ADDRESS_COMPLETE;
if (!backup_contacts || !backup_contacts.length) return profileStates.BACKUP_ADDRESS_COMPLETE;
return profileStates.BACKUP_CONTACTS_COMPLETE;
@@ -76,14 +72,12 @@ export const selectIsProfileComplete = createSelector(
(serviceMember) =>
!!(
serviceMember &&
- serviceMember.rank &&
serviceMember.edipi &&
serviceMember.affiliation &&
serviceMember.first_name &&
serviceMember.last_name &&
serviceMember.telephone &&
serviceMember.personal_email &&
- serviceMember.current_location?.id &&
serviceMember.residential_address?.postalCode &&
serviceMember.backup_mailing_address?.postalCode &&
serviceMember.backup_contacts?.length > 0
@@ -240,18 +234,10 @@ export const selectHasCurrentPPM = (state) => {
return !!selectCurrentPPM(state);
};
-export function selectPPMEstimateRange(state) {
- return state.entities?.ppmEstimateRanges?.undefined || null;
-}
-
export function selectPPMSitEstimate(state) {
return state.entities?.ppmSitEstimate?.undefined?.estimate || null;
}
-export function selectReimbursementById(state, reimbursementId) {
- return state.entities?.reimbursements?.[`${reimbursementId}`] || null;
-}
-
export const selectWeightAllotmentsForLoggedInUser = createSelector(
selectServiceMemberFromLoggedInUser,
selectCurrentOrders,
diff --git a/src/store/entities/selectors.test.js b/src/store/entities/selectors.test.js
index 1a121d7fda1..977f8d3ab25 100644
--- a/src/store/entities/selectors.test.js
+++ b/src/store/entities/selectors.test.js
@@ -12,9 +12,7 @@ import {
selectCurrentMove,
selectCurrentPPM,
selectPPMForMove,
- selectPPMEstimateRange,
selectPPMSitEstimate,
- selectReimbursementById,
selectWeightAllotmentsForLoggedInUser,
selectWeightTicketAndIndexById,
} from './selectors';
@@ -207,46 +205,6 @@ describe('selectServiceMemberProfileState', () => {
expect(selectServiceMemberProfileState(testState)).toEqual(profileStates.CONTACT_INFO_COMPLETE);
});
- it('returns DUTY_LOCATION_COMPLETE if there is no address data', () => {
- const testState = {
- entities: {
- user: {
- userId123: {
- id: 'userId123',
- service_member: 'serviceMemberId456',
- },
- },
- serviceMembers: {
- serviceMemberId456: {
- id: 'serviceMemberId456',
- affiliation: 'ARMY',
- rank: 'O_4_W_4',
- edipi: '1234567890',
- first_name: 'Erin',
- last_name: 'Stanfill',
- middle_name: '',
- personal_email: 'erin@truss.works',
- phone_is_preferred: true,
- telephone: '555-555-5556',
- email_is_preferred: false,
- current_location: {
- id: 'testDutyLocationId',
- address: {
- city: 'Colorado Springs',
- country: 'United States',
- postalCode: '80913',
- state: 'CO',
- streetAddress1: 'n/a',
- },
- },
- },
- },
- },
- };
-
- expect(selectServiceMemberProfileState(testState)).toEqual(profileStates.DUTY_LOCATION_COMPLETE);
- });
-
it('returns ADDRESS_COMPLETE if there is no backup address data', () => {
const testState = {
entities: {
@@ -1577,33 +1535,6 @@ describe('selectCurrentPPM', () => {
});
});
-describe('selectPPMEstimateRange', () => {
- it('returns the only PPM estimate range stored in entities', () => {
- const testState = {
- entities: {
- ppmEstimateRanges: {
- undefined: {
- range_min: 1000,
- range_max: 2400,
- },
- },
- },
- };
-
- expect(selectPPMEstimateRange(testState)).toEqual(testState.entities.ppmEstimateRanges.undefined);
- });
-
- it('returns null if there is no PPM estimate range in entities', () => {
- const testState = {
- entities: {
- ppmEstimateRanges: {},
- },
- };
-
- expect(selectPPMEstimateRange(testState)).toEqual(null);
- });
-});
-
describe('selectPPMSitEstimate', () => {
it('returns the only PPM SIT estimate stored in entities', () => {
const testState = {
@@ -1630,34 +1561,6 @@ describe('selectPPMSitEstimate', () => {
});
});
-describe('selectReimbursementById', () => {
- it('returns the only PPM SIT estimate stored in entities', () => {
- const testState = {
- entities: {
- reimbursements: {
- testReimbursement123: {
- id: 'testReimbursement123',
- },
- },
- },
- };
-
- expect(selectReimbursementById(testState, 'testReimbursement123')).toEqual(
- testState.entities.reimbursements.testReimbursement123,
- );
- });
-
- it('returns null if there is no reimbursement in entities', () => {
- const testState = {
- entities: {
- ppmSitEstimate: {},
- },
- };
-
- expect(selectReimbursementById(testState, 'testReimbursement123')).toEqual(null);
- });
-});
-
describe('selectWeightAllotmentsForLoggedInUser', () => {
describe('when I have dependents', () => {
describe('when my spouse has pro gear', () => {
diff --git a/src/store/onboarding/selectors.js b/src/store/onboarding/selectors.js
index 463f5fbc894..a677ee0c773 100644
--- a/src/store/onboarding/selectors.js
+++ b/src/store/onboarding/selectors.js
@@ -2,6 +2,4 @@ export const selectConusStatus = (state) => {
return state.onboarding.conusStatus;
};
-export function selectPPMEstimateError(state) {
- return state.onboarding.ppmEstimateError || null;
-}
+export default selectConusStatus;
diff --git a/src/stories/statusTimeLine.stories.jsx b/src/stories/statusTimeLine.stories.jsx
deleted file mode 100644
index 9a63eca80a6..00000000000
--- a/src/stories/statusTimeLine.stories.jsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react';
-import moment from 'moment';
-import { boolean, text, date } from '@storybook/addon-knobs';
-
-import { StatusTimeline } from '../scenes/PpmLanding/StatusTimeline';
-
-const StatusTimelineCodes = {
- Submitted: 'SUBMITTED',
- PpmApproved: 'PPM_APPROVED',
- InProgress: 'IN_PROGRESS',
- PaymentRequested: 'PAYMENT_REQUESTED',
- PaymentReviewed: 'PAYMENT_REVIEWED',
-};
-
-export default {
- title: 'Customer Components/StatusTimeLine',
- decorators: [(storyFn) => {storyFn()}
],
-};
-
-export const Basic = () => (
-