DMT | Fix divorce date (#43887)

* Move reformatDate to formHelpers

* Add onFormLoaded date processing

Author: Mottie

src/applications/dependents/686c-674/components/picklist/PicklistRemoveDependentFollowup.jsx

@@ -16,7 +16,7 @@ import {
 import { routing, getPicklistRoutes } from './routes';
 import { showExitLink } from './utils';
 
-import { reformatDate } from '../../config/utilities/submission';
+import { reformatDate } from '../../config/utilities';
 
 import { getFullName } from '../../../shared/utils';
 import ExitForm from '../../../shared/components/ExitFormLink';

src/applications/dependents/686c-674/config/form.js

@@ -56,6 +56,7 @@ import {
   showOptionsSelection,
   isAddingDependents,
   isRemovingDependents,
+  onFormLoaded,
 } from './utilities';
 import migrations from './migrations';
 import reviewDependents from './chapters/picklist/reviewDependents';
@@ -102,6 +103,7 @@ export const formConfig = {
   prefillEnabled: true,
   prefillTransformer,
   verifyRequiredPrefill: true,
+  onFormLoaded,
   footerContent: FormFooter,
   getHelp: GetFormHelp,
   downtime: {

src/applications/dependents/686c-674/config/utilities/formHelpers.js

@@ -1,10 +1,14 @@
-import { parse, parseISO, isValid } from 'date-fns';
+import { parse, parseISO, isValid, format } from 'date-fns';
 
 import omit from 'platform/utilities/data/omit';
 
 import { stringifyFormReplacer } from 'platform/forms-system/src/js/helpers';
 
-import { MARRIAGE_TYPES, PICKLIST_DATA } from '../constants';
+import {
+  MARRIAGE_TYPES,
+  PICKLIST_DATA,
+  FORMAT_YMD_DATE_FNS,
+} from '../constants';
 
 export const PHONE_KEYS = ['phoneNumber', 'internationalPhone'];
 const WHITESPACE_REGEX = /\s+/g;
@@ -229,3 +233,38 @@ export const isVisiblePicklistPage = (formData, relationship) => {
  */
 export const hasSelectedPicklistItems = formData =>
   (formData?.[PICKLIST_DATA] || []).some(item => item.selected);
+
+/**
+ * Process date string for submission by adding leading zeros to month and day
+ * parts using date-fns
+ * @param {String} date - date string
+ * @returns {String} Processed date string
+ */
+export function reformatDate(date) {
+  const dateObj = parseDateToDateObj(date, FORMAT_YMD_DATE_FNS);
+  if (!dateObj) return date; // Return original value if parsing fails
+  return format(dateObj, FORMAT_YMD_DATE_FNS);
+}
+
+/**
+ * Clean up dates in yyyy-MM-dd format that don't include leading zeros in the
+ * month and day fields
+ * @param {object} props - The props object
+ * @param {string} props.returnUrl - The URL to return to after the form is loaded
+ * @param {object} props.router - The router object used to navigate to different pages
+ * @param {object} props.formData - The form data that has been loaded
+ * @returns {void}
+ */
+export const onFormLoaded = props => {
+  const { returnUrl, router, formData } = props;
+
+  // Editing data in place
+  formData?.[PICKLIST_DATA]?.forEach(item => {
+    if (item?.endDate && item.endDate.length !== 10) {
+      // eslint-disable-next-line no-param-reassign
+      item.endDate = reformatDate(item.endDate);
+    }
+  });
+
+  router.push(returnUrl);
+};

src/applications/dependents/686c-674/config/utilities/index.js

@@ -24,6 +24,8 @@ import {
   hasAwardedDependents,
   isVisiblePicklistPage,
   hasSelectedPicklistItems,
+  reformatDate,
+  onFormLoaded,
 } from './formHelpers';
 import { buildSubmissionData, customTransformForSubmit } from './submission';
 
@@ -55,4 +57,6 @@ export {
   hasAwardedDependents,
   isVisiblePicklistPage,
   hasSelectedPicklistItems,
+  reformatDate,
+  onFormLoaded,
 };

src/applications/dependents/686c-674/config/utilities/submission.js

@@ -1,5 +1,4 @@
 import cloneDeep from 'lodash/cloneDeep';
-import { format } from 'date-fns';
 
 import {
   filterInactivePageData,
@@ -19,14 +18,14 @@ import { isVetInReceiptOfPension } from './api';
 import {
   customFormReplacer,
   showV3Picklist,
-  parseDateToDateObj,
+  reformatDate,
 } from './formHelpers';
 import {
   transformPicklistToV2,
   enrichDivorceWithSSN,
   cleanupAddressData,
 } from './picklistTransform';
-import { PICKLIST_REMOVAL_FLAG, FORMAT_YMD_DATE_FNS } from '../constants';
+import { PICKLIST_REMOVAL_FLAG } from '../constants';
 
 /**
  * Extract data fields with values from source data
@@ -530,18 +529,6 @@ function cleanDataWithAddresses(data = {}) {
   };
 }
 
-/**
- * Process date string for submission by adding leading zeros to month and day
- * parts using date-fns
- * @param {String} date - date string
- * @returns {String} Processed date string
- */
-export function reformatDate(date) {
-  const dateObj = parseDateToDateObj(date, FORMAT_YMD_DATE_FNS);
-  if (!dateObj) return date; // Return original value if parsing fails
-  return format(dateObj, FORMAT_YMD_DATE_FNS);
-}
-
 /**
  * Add leading zeros to month and day parts in YYYY-MM-DD format
  * @param {Object} data - form data

src/applications/dependents/686c-674/tests/config/utilities.formHelpers.unit.spec.jsx

@@ -1,4 +1,5 @@
 import { expect } from 'chai';
+import sinon from 'sinon';
 
 import {
   customFormReplacer,
@@ -13,6 +14,8 @@ import {
   isRemovingDependents,
   isVisiblePicklistPage,
   hasSelectedPicklistItems,
+  reformatDate,
+  onFormLoaded,
 } from '../../config/utilities/formHelpers';
 
 import { PICKLIST_DATA } from '../../config/constants';
@@ -373,3 +376,40 @@ describe('hasSelectedPicklistItems', () => {
     expect(hasSelectedPicklistItems(getData(true, true))).to.be.true;
   });
 });
+
+describe('reformatDate', () => {
+  it('should return empty string for invalid dates', () => {
+    expect(reformatDate()).to.be.undefined;
+    expect(reformatDate('')).to.equal('');
+    expect(reformatDate('invalid-date')).to.equal('invalid-date');
+  });
+
+  it('should handle double-digit months and days', () => {
+    expect(reformatDate('2026-04-05')).to.equal('2026-04-05');
+    expect(reformatDate('2026-11-10')).to.equal('2026-11-10');
+    expect(reformatDate('2026-12-11')).to.equal('2026-12-11');
+    expect(reformatDate('2026-10-31')).to.equal('2026-10-31');
+  });
+
+  it('should convert date and include leading zeros in yyyy-MM-dd format', () => {
+    expect(reformatDate('2026-1-3')).to.equal('2026-01-03');
+    expect(reformatDate('2026-11-4')).to.equal('2026-11-04');
+    expect(reformatDate('2026-4-11')).to.equal('2026-04-11');
+  });
+});
+
+describe('onFormLoaded', () => {
+  it('should reformat endDate and push to returnUrl', () => {
+    const router = { push: sinon.spy() };
+    const formData = {
+      [PICKLIST_DATA]: [{ endDate: '2024-1-1' }, { endDate: '2024-2-2' }],
+    };
+    const returnUrl = '/test-return-url';
+
+    onFormLoaded({ returnUrl, router, formData });
+
+    expect(formData[PICKLIST_DATA][0].endDate).to.equal('2024-01-01');
+    expect(formData[PICKLIST_DATA][1].endDate).to.equal('2024-02-02');
+    expect(router.push.calledWith(returnUrl)).to.be.true;
+  });
+});

src/applications/dependents/686c-674/tests/config/utilities.submission.unit.spec.jsx

@@ -5,7 +5,6 @@ import set from 'platform/utilities/data/set';
 import {
   buildSubmissionData,
   customTransformForSubmit,
-  reformatDate,
   cleanUpDates,
 } from '../../config/utilities/submission';
 
@@ -1249,27 +1248,6 @@ describe('customTransformForSubmit integration', () => {
 });
 
 describe('clean up utilities', () => {
-  context('reformatDate', () => {
-    it('should return empty string for invalid dates', () => {
-      expect(reformatDate()).to.be.undefined;
-      expect(reformatDate('')).to.equal('');
-      expect(reformatDate('invalid-date')).to.equal('invalid-date');
-    });
-
-    it('should handle double-digit months and days', () => {
-      expect(reformatDate('2026-04-05')).to.equal('2026-04-05');
-      expect(reformatDate('2026-11-10')).to.equal('2026-11-10');
-      expect(reformatDate('2026-12-11')).to.equal('2026-12-11');
-      expect(reformatDate('2026-10-31')).to.equal('2026-10-31');
-    });
-
-    it('should convert date and include leading zeros in yyyy-MM-dd format', () => {
-      expect(reformatDate('2026-1-3')).to.equal('2026-01-03');
-      expect(reformatDate('2026-11-4')).to.equal('2026-11-04');
-      expect(reformatDate('2026-4-11')).to.equal('2026-04-11');
-    });
-  });
-
   context('cleanUpDates', () => {
     const getData = date => ({
       reportDivorce: { divorceDate: date },