Merge branch 'feature/APPEALS-27311' into wmedders21/APPEALS-37144

department-of-veterans-affairs · Dec 21, 2023 · 3450e56 · 3450e56
2 parents 6c8b161 + 1c3a60b
commit 3450e56
Show file tree

Hide file tree

Showing 9 changed files with 427 additions and 19 deletions.
diff --git a/client/COPY.json b/client/COPY.json
@@ -1410,13 +1410,13 @@
   "EMPLOYER_IDENTIFICATION_NUMBER": "Employer Identification Number",
   "PACKAGE_ACTION_MERGE_DESCRIPTION": "By confirming, you will send a request for the supervisor to take action on the following package:",
   "PACKAGE_ACTION_MERGE_TITLE": "Request merge",
-  "PACKAGE_ACTION_MERGE_TEXTAREA_LABEL": "Select a reason for merging this package",
+  "PACKAGE_ACTION_MERGE_TEXTAREA_LABEL": "Reason for merge",
   "PACKAGE_ACTION_MERGE_RADIO_LABEL": "Select a reason for merging this package.",
   "PACKAGE_ACTION_MODAL_DESCRIPTION": "By confirming, you will send a request for the supervisor to take action on the following package:",
   "PACKAGE_ACTION_REMOVAL_TITLE": "Request package removal",
   "PACKAGE_ACTION_REMOVAL_TEXTAREA_LABEL": "Provide a reason for removal",
   "PACKAGE_ACTION_REASSIGN_DESCRIPTION":"You have selected the following correspondence cases for reassignment to another users. Please confirm your selection(s) below:",
-  "PACKAGE_ACTION_REASSIGN_TITLE":"Request package assignment",
+  "PACKAGE_ACTION_REASSIGN_TITLE":"Request package reassignment",
   "PACKAGE_ACTION_REASSIGN_TEXTAREA_LABEL":"Provide a reason for reassignment",
   "PACKAGE_ACTION_SPLIT_TEXTAREA_LABEL":"Reason for split",
   "PACKAGE_ACTION_SPLIT_TITLE": "Request split package",

diff --git a/.../correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx b/.../correspondence/intake/components/ConfirmCorrespondence/ConfirmTasksRelatedToAnAppeal.jsx
@@ -13,7 +13,8 @@ const borderlessTd = {
 
 const ConfirmTasksRelatedToAnAppeal = () => {
   const tasks = useSelector((state) => state.intakeCorrespondence.newAppealRelatedTasks);
-  const taskIds = useSelector((state) => state.intakeCorrespondence.taskRelatedAppealIds);
+  const taskIds = useSelector((state) => state.intakeCorrespondence.taskRelatedAppealIds).
+    sort((first, second) => first - second);
   const fetchedAppeals = useSelector((state) => state.intakeCorrespondence.fetchedAppeals);
   const waivedEvidenceTasks = useSelector((state) => state.intakeCorrespondence.waivedEvidenceTasks);
 

diff --git a/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx b/client/app/queue/correspondence/intake/components/TasksAppeals/AddAppealRelatedTaskView.jsx
@@ -119,7 +119,7 @@ export const AddAppealRelatedTaskView = (props) => {
         then((appealResponse) => {
           const appealsForStore = prepareAppealForStore(appealResponse.body.appeals);
 
-          const appealArr = Object.values(appealsForStore.appeals);
+          const appealArr = Object.values(appealsForStore.appeals).sort((first, second) => first.id - second.id);
 
           dispatch(setFetchedAppeals(appealArr));
           setLoading(false);

diff --git a/client/app/queue/correspondence/modals/PackageActionModal.jsx b/client/app/queue/correspondence/modals/PackageActionModal.jsx
@@ -183,6 +183,7 @@ const PackageActionModal = (props) => {
           name={modalInfo.label}
           aria-label={modalInfo.label}
           value={textInputReason}
+          placeholder={modalInfo.placeholder}
           onChange={(value) => setTextInputReason(value)}
         />
       )}

diff --git a/client/app/queue/correspondence/review_package/utils.js b/client/app/queue/correspondence/review_package/utils.js
@@ -81,7 +81,7 @@ export const getPackageActionColumns = (dropdownType) => {
           </span>
         ),
         valueFunction: (row) => {
-          const vaDate = moment(row.correspondence.va_date_of_receipt).format('MM/DD/YYYY');
+          const vaDate = moment.utc(row.correspondence.va_date_of_receipt).format('MM/DD/YYYY');
 
           return (
             <span className="veteran-info-value">
@@ -105,7 +105,8 @@ export const getModalInformation = (dropdownType) => {
       title: PACKAGE_ACTION_MERGE_TITLE,
       description: PACKAGE_ACTION_MERGE_DESCRIPTION,
       label: PACKAGE_ACTION_MERGE_TEXTAREA_LABEL,
-      radioLabel: PACKAGE_ACTION_MERGE_RADIO_LABEL
+      radioLabel: PACKAGE_ACTION_MERGE_RADIO_LABEL,
+      placeholder: 'This is a reason for merge',
     };
   case 'removePackage':
     return {

diff --git a/client/test/app/queue/correspondences/modals/PackageActionModal.test.js b/client/test/app/queue/correspondences/modals/PackageActionModal.test.js
@@ -65,7 +65,7 @@ describe('PackageActionModal rendering', () => {
 
     renderPackageActionModal('reassignPackage');
 
-    expect(screen.getByText('Request package assignment')).toBeInTheDocument();
+    expect(screen.getByText('Request package reassignment')).toBeInTheDocument();
     expect(screen.getByText('Veteran Details')).toBeInTheDocument();
     expect(screen.getByText('Provide a reason for reassignment')).toBeInTheDocument();
     expect(screen.getByText(correspondenceData.cmp_packet_number.toString())).toBeInTheDocument();