Your {formType} information
diff --git a/src/applications/static-pages/ezr-tera-alert/components/App/index.jsx b/src/applications/static-pages/ezr-tera-alert/components/App/index.jsx
new file mode 100644
index 000000000000..8de5d22b5b99
--- /dev/null
+++ b/src/applications/static-pages/ezr-tera-alert/components/App/index.jsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+
+export const App = ({ isEzrEnabled }) => {
+ return isEzrEnabled ? (
+ <>
+
+
+ Veterans enrolled in VA health care and expansion of benefits
+
+
+
+ On March 5, 2024, we expanded health care to
+ millions of Veterans.
+
+
+ Learn more about the PACT Act and VA health care and benefits
+
+ https://www.va.gov/resources/the-pact-act-and-your-va-benefits/
+
+
+
+ Veterans who are enrolled in VA health care can now answer more
+ questions about their military service history. We’ll use this
+ information to determine if you may have had exposure to any toxins
+ or other hazards. And we’ll determine if we’ll place you in a higher
+ priority group. This may affect how much (if anything) you’ll have
+ to pay towards the cost of your care
+
+
+ These questions are only available on our PDF form at this time. If
+ you want to answer these questions, you’ll need to submit your form
+ by mail or in person.
+
+
+
+ ) : (
+ <>
+
+
+ Veterans enrolled in VA health care and expansion of benefits
+
+
+
+ On March 5, 2024, we expanded health care to
+ millions more Veterans.
+
+
+ Learn more about the PACT Act and VA health care and benefits
+
+ https://www.va.gov/resources/the-pact-act-and-your-va-benefits/
+
+
+
+ Veterans who are enrolled in VA health care can now provide more
+ information about their military service history.
+
+
+ We’ll use this information to determine if you may have had exposure
+ to any toxins or other hazards. And we’ll also determine if we’ll
+ place you in a higher priority group. This may affect how much (if
+ anything) you’ll have to pay towards the cost of your care.
+
+
+
+ );
+};
+
+App.propTypes = {
+ isEzrEnabled: PropTypes.bool,
+};
+
+const mapStateToProps = state => ({
+ isEzrEnabled: state.featureToggles.ezrProdEnabled,
+});
+
+export default connect(mapStateToProps)(App);
diff --git a/src/applications/static-pages/ezr-tera-alert/components/App/index.unit.spec.jsx b/src/applications/static-pages/ezr-tera-alert/components/App/index.unit.spec.jsx
new file mode 100644
index 000000000000..1834c96143fe
--- /dev/null
+++ b/src/applications/static-pages/ezr-tera-alert/components/App/index.unit.spec.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { expect } from 'chai';
+import { shallow } from 'enzyme';
+import { App } from '.';
+
+describe('ezr tera alert', () => {
+ it('should not render ezr tera alert to the static page when feature toggle is false', () => {
+ const wrapper = shallow(
);
+ const selectors = {
+ headings: wrapper.find('h2'),
+ ezrAlertNotEnabled: wrapper.find('[data-testid="ezr-tera-alert"]'),
+ };
+ expect(selectors.ezrAlertNotEnabled).to.have.lengthOf(1);
+ wrapper.unmount();
+ });
+
+ it('renders ezr tera alert to the static page when feature toggle is true', () => {
+ const wrapper = shallow(
);
+ const selectors = {
+ headings: wrapper.find('h2'),
+ ezrAlertEnabled: wrapper.find('[data-testid="ezr-tera-alert-enabled"]'),
+ };
+ expect(selectors.ezrAlertEnabled).to.have.lengthOf(1);
+ wrapper.unmount();
+ });
+});
diff --git a/src/applications/static-pages/ezr-tera-alert/index.js b/src/applications/static-pages/ezr-tera-alert/index.js
new file mode 100644
index 000000000000..54bba26d2755
--- /dev/null
+++ b/src/applications/static-pages/ezr-tera-alert/index.js
@@ -0,0 +1,23 @@
+// Node modules.
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Provider } from 'react-redux';
+import { connectFeatureToggle } from 'platform/utilities/feature-toggles';
+
+export default (store, widgetType) => {
+ const root = document.querySelector(`[data-widget-type="${widgetType}"]`);
+ if (root) {
+ import(/* webpackChunkName: "ezr-tera-alert" */
+ './components/App').then(module => {
+ const App = module.default;
+ connectFeatureToggle(store.dispatch);
+
+ ReactDOM.render(
+
+
+ ,
+ root,
+ );
+ });
+ }
+};
diff --git a/src/applications/static-pages/static-pages-entry.js b/src/applications/static-pages/static-pages-entry.js
index 3093b62ccea7..b0e13d053057 100644
--- a/src/applications/static-pages/static-pages-entry.js
+++ b/src/applications/static-pages/static-pages-entry.js
@@ -44,6 +44,7 @@ import createEducationApplicationStatus from '../edu-benefits/components/createE
import createEventsPage from './events';
import createExpandableOperatingStatus from './facilities/vet-center/createExpandableOperatingStatus';
import createEZRSubmissionOptions from './ezr-submission-options';
+import createEZRTeraAlert from './ezr-tera-alert';
import createFacilityPage from './facilities/createFacilityPage';
import createFacilityMapSatelliteMainOffice from './facilities/createFacilityMapSatelliteMainOffice';
import createFacilityPageSatelliteLocations from './facilities/createFacilityPageSatelliteLocations';
@@ -182,6 +183,7 @@ form686CTA(store, widgetTypes.FORM_686_CTA);
createAskVAWidget(store, widgetTypes.ASK_VA);
createEventsPage(store, widgetTypes.EVENTS);
createEZRSubmissionOptions(store, widgetTypes.EZR_SUBMISSION_OPTIONS);
+createEZRTeraAlert(store, widgetTypes.EZR_TERA_ALERT);
createMedicalCopaysCTA(store, widgetTypes.MEDICAL_COPAYS_CTA);
createGetMedicalRecordsPage(store, widgetTypes.GET_MEDICAL_RECORDS_PAGE);
createRefillTrackPrescriptionsPage(
diff --git a/src/applications/static-pages/widgetTypes.js b/src/applications/static-pages/widgetTypes.js
index aac6244b2ca6..b0c4d4834472 100644
--- a/src/applications/static-pages/widgetTypes.js
+++ b/src/applications/static-pages/widgetTypes.js
@@ -18,6 +18,7 @@ export default {
EDUCATION_APP_STATUS: 'education-app-status',
EVENTS: 'events',
EZR_SUBMISSION_OPTIONS: 'ezr-submission-options',
+ EZR_TERA_ALERT: 'ezr-tera-alert',
FACILITY_APPOINTMENT_WAIT_TIMES_WIDGET:
'facility-appointment-wait-times-widget',
FACILITY_DETAIL: 'facility-detail',
diff --git a/src/platform/mhv/downtime/mocks/api/maintenance-windows/index.js b/src/platform/mhv/downtime/mocks/api/maintenance-windows/index.js
index dca8b85f017a..80dc8fc0b8ef 100644
--- a/src/platform/mhv/downtime/mocks/api/maintenance-windows/index.js
+++ b/src/platform/mhv/downtime/mocks/api/maintenance-windows/index.js
@@ -1,17 +1,12 @@
/* eslint-disable camelcase */
-const HOUR_MS = 3600000;
-const MIN_MS = 60000;
+const { add, set } = require('date-fns');
-function offsetDate(date, hours = 0, minutes = 0) {
- const ts = date.getTime() + hours * HOUR_MS + minutes * MIN_MS;
- return new Date(ts);
-}
const now = new Date(); // datetime the mock api server was refreshed
-const soonStartTime = offsetDate(now, 1, -10);
-const soonEndTime = offsetDate(soonStartTime, 4); // 4 hours later
-const lateStartTime = offsetDate(now, 6, 30);
-const lateEndTime = offsetDate(lateStartTime, 8);
+const soonStartTime = add(now, { minutes: 45 });
+const soonEndTime = add(soonStartTime, { hours: 4 }); // 4 hours later
+const lateStartTime = set(now, { hours: 6, minutes: 30, seconds: 0 });
+const lateEndTime = add(lateStartTime, { hours: 8 });
// vets-api requests are camelCase, thanks to `X-Key-Inflection: camel` header
const responses = {
diff --git a/src/platform/mhv/downtime/tests/containers/MHVDowntime.unit.spec.jsx b/src/platform/mhv/downtime/tests/containers/MHVDowntime.unit.spec.jsx
index b78f25768553..84ff701874f0 100644
--- a/src/platform/mhv/downtime/tests/containers/MHVDowntime.unit.spec.jsx
+++ b/src/platform/mhv/downtime/tests/containers/MHVDowntime.unit.spec.jsx
@@ -1,126 +1,130 @@
-// import React from 'react';
-// import { expect } from 'chai';
-// import { render } from '@testing-library/react';
+import React from 'react';
+import { expect } from 'chai';
+import { render } from '@testing-library/react';
-// import { externalServiceStatus } from '@department-of-veterans-affairs/platform-monitoring/exports';
+import { externalServiceStatus } from '@department-of-veterans-affairs/platform-monitoring/exports';
-// import MHVDowntime from '../../containers/MHVDowntime';
+import MHVDowntime from '../../containers/MHVDowntime';
-// describe('MHVDowntime', () => {
-// it('renders MHVDown when a service is down', () => {
-// const now = new Date();
-// const later = new Date(now).setHours(now.getHours() + 4);
+/*
+ * NOTE: Tests will run in various timezones, so look for formatting rather than exact datetimes
+ */
-// const mockServiceProps = {
-// endTime: later,
-// startTime: now,
-// externalService: 'mhv_sm',
-// };
-// const mockProps = {
-// status: externalServiceStatus.down,
-// ...mockServiceProps,
-// };
-// const { getByRole, getByText } = render(
);
-// getByRole('heading', { level: 3, name: 'Maintenance on My HealtheVet' });
-// getByText(/some of our health tools/i);
-// });
+describe('MHVDowntime', () => {
+ it('renders MHVDown when a service is down', () => {
+ const now = new Date();
+ const later = new Date(now).setHours(now.getHours() + 4);
-// it('renders MHVDowntimeApproaching and children when a service is going down within an hour', () => {
-// // Create a starting datetime 30 minutes into the future, though `status` is what really controls what renders
-// const soon = new Date(Date.now());
-// soon.setMinutes(soon.getMinutes() + 30);
-// const later = new Date(soon).setHours(soon.getHours() + 4);
+ const mockServiceProps = {
+ endTime: later,
+ startTime: now,
+ externalService: 'mhv_sm',
+ };
+ const mockProps = {
+ status: externalServiceStatus.down,
+ ...mockServiceProps,
+ };
+ const { getByRole, getByText } = render(
);
+ getByRole('heading', { level: 2, name: 'Maintenance on My HealtheVet' });
+ getByText(/some of our health tools/i);
+ });
-// const mockServiceProps = {
-// endTime: later,
-// startTime: soon,
-// externalService: 'mhv_sm',
-// };
-// const mockProps = {
-// status: externalServiceStatus.downtimeApproaching,
-// children:
Child content lives here.
,
-// ...mockServiceProps,
-// };
-// const { getByRole, getByText } = render(
);
-// getByRole('heading', {
-// level: 3,
-// name: 'Upcoming maintenance on My HealtheVet',
-// });
-// getByText(/you may have trouble using some of our health tools/i);
-// getByText(/child content lives here/i);
-// });
+ it('renders MHVDowntimeApproaching and children when a service is going down within an hour', () => {
+ // Create a starting datetime 30 minutes into the future, though `status` is what really controls what renders
+ const soon = new Date(Date.now());
+ soon.setMinutes(soon.getMinutes() + 30);
+ const later = new Date(soon).setHours(soon.getHours() + 4);
-// it('renders child content when no matching services are down', () => {
-// const mockServiceProps = {
-// endTime: undefined,
-// startTime: undefined,
-// externalService: undefined,
-// };
-// const mockProps = {
-// children:
Child content renders
,
-// status: externalServiceStatus.ok,
-// ...mockServiceProps,
-// };
-// const { getByText } = render(
);
-// getByText('Child content renders');
-// });
+ const mockServiceProps = {
+ endTime: later,
+ startTime: soon,
+ externalService: 'mhv_sm',
+ };
+ const mockProps = {
+ status: externalServiceStatus.downtimeApproaching,
+ children:
Child content lives here.
,
+ ...mockServiceProps,
+ };
+ const { getByRole, getByText } = render(
);
+ getByRole('heading', {
+ level: 2,
+ name: 'Upcoming maintenance on My HealtheVet',
+ });
+ getByText(/you may have trouble using some of our health tools/i);
+ getByText(/child content lives here/i);
+ });
-// it('renders content with vague time interval and no start/end time if no valid dates provided', () => {
-// const mockServiceProps = {
-// endTime: {},
-// startTime: undefined,
-// externalService: 'mhv_sm',
-// };
-// const mockProps = {
-// status: externalServiceStatus.downtimeApproaching,
-// ...mockServiceProps,
-// };
+ it('renders child content when no matching services are down', () => {
+ const mockServiceProps = {
+ endTime: undefined,
+ startTime: undefined,
+ externalService: undefined,
+ };
+ const mockProps = {
+ children:
Child content renders
,
+ status: externalServiceStatus.ok,
+ ...mockServiceProps,
+ };
+ const { getByText } = render(
);
+ getByText('Child content renders');
+ });
-// const { getByText, queryByText } = render(
);
-// getByText(/The maintenance will last some time/i);
-// getByText(
-// /During this time, you may have trouble using some of our health tools/i,
-// );
-// expect(queryByText('July 4, 2019 at 9:00 a.m. ET')).to.be.null;
-// expect(queryByText('July 5, 2019 at 3:00 a.m. ET')).to.be.null;
-// });
+ it('renders content with vague time interval and no start/end time if no valid dates provided', () => {
+ const mockServiceProps = {
+ endTime: {},
+ startTime: undefined,
+ externalService: 'mhv_sm',
+ };
+ const mockProps = {
+ status: externalServiceStatus.downtimeApproaching,
+ ...mockServiceProps,
+ };
-// it('renders content with vague time interval and start time if end time does not exist', () => {
-// const mockServiceProps = {
-// endTime: {},
-// startTime: new Date('July 4, 2019 09:00:00 EDT'),
-// externalService: 'mhv_sm',
-// };
-// const mockProps = {
-// status: externalServiceStatus.downtimeApproaching,
-// ...mockServiceProps,
-// };
+ const { getByText, queryByText } = render(
);
+ getByText(/The maintenance will last some time/i);
+ getByText(
+ /During this time, you may have trouble using some of our health tools/i,
+ );
+ expect(queryByText('July 4, 2019 at 9:00 a.m. ET')).to.be.null;
+ expect(queryByText('July 5, 2019 at 3:00 a.m. ET')).to.be.null;
+ });
-// const { getByText, queryByText } = render(
);
-// getByText(/The maintenance will last some time/i);
-// getByText(
-// /During this time, you may have trouble using some of our health tools/i,
-// );
-// getByText('July 4, 2019 at 9:00 a.m. ET');
-// expect(queryByText('July 5, 2019 at 3:00 a.m. ET')).to.be.null;
-// });
+ it('renders content with vague time interval and start time if end time does not exist', () => {
+ const mockServiceProps = {
+ endTime: {},
+ startTime: new Date('July 4, 2019 09:00:00 EDT'),
+ externalService: 'mhv_sm',
+ };
+ const mockProps = {
+ status: externalServiceStatus.downtimeApproaching,
+ ...mockServiceProps,
+ };
-// it('renders content with vague time interval and end time if start time does not exist', () => {
-// const mockServiceProps = {
-// endTime: new Date('July 7, 2019 09:00:00 EDT'),
-// startTime: { toDate: () => 'FAKE' },
-// externalService: 'mhv_sm',
-// };
-// const mockProps = {
-// status: externalServiceStatus.downtimeApproaching,
-// ...mockServiceProps,
-// };
+ const { getByText, queryByText } = render(
);
+ getByText(/The maintenance will last some time/i);
+ getByText(
+ /During this time, you may have trouble using some of our health tools/i,
+ );
+ getByText(/July 4, 2019 at \d:\d{2} (a|p)\.m\. [A-Z]{1,2}T/);
+ expect(queryByText('July 5, 2019 at 3:00 a.m. ET')).to.be.null;
+ });
-// const { getByText } = render(
);
-// getByText(/The maintenance will last some time/i);
-// getByText(
-// /During this time, you may have trouble using some of our health tools/i,
-// );
-// getByText('July 7, 2019 at 9:00 a.m. ET');
-// });
-// });
+ it('renders content with vague time interval and end time if start time does not exist', () => {
+ const mockServiceProps = {
+ endTime: new Date('July 7, 2019 09:00:00 EDT'),
+ startTime: { toDate: () => 'FAKE' },
+ externalService: 'mhv_sm',
+ };
+ const mockProps = {
+ status: externalServiceStatus.downtimeApproaching,
+ ...mockServiceProps,
+ };
+
+ const { getByText } = render(
);
+ getByText(/The maintenance will last some time/i);
+ getByText(
+ /During this time, you may have trouble using some of our health tools/i,
+ );
+ getByText(/July 7, 2019 at \d:\d{2} (a|p)\.m\. [A-Z]{1,2}T/);
+ });
+});
diff --git a/src/platform/mhv/downtime/tests/date.unit.spec.js b/src/platform/mhv/downtime/tests/date.unit.spec.js
index 7c487dcd70eb..bb7918c8827c 100644
--- a/src/platform/mhv/downtime/tests/date.unit.spec.js
+++ b/src/platform/mhv/downtime/tests/date.unit.spec.js
@@ -1,129 +1,99 @@
-// import { expect } from 'chai';
-// // NOTE: moment is deprecated, should only be used for testing compatibility with older code
-// import moment from 'moment';
-
-// import {
-// coerceToDate,
-// formatDatetime,
-// formatElapsedHours,
-// parseDate,
-// } from '../utils/date';
-
-// describe('coerceToDate', () => {
-// it('returns a Date instance when passed a moment object', () => {
-// const m = moment('2024-02-14 09:30');
-// const d = coerceToDate(m);
-// expect(d).to.be.an.instanceOf(Date);
-// });
-
-// it('returns a date instance when passed a date instance', () => {
-// const d1 = new Date();
-// const d2 = coerceToDate(d1);
-// expect(d2).to.equal(d1);
-// });
-
-// it('returns null when passed something that is not a date or moment object', () => {
-// const x = '';
-// const y = undefined;
-// const z = {};
-// // F is for Fake
-// const f = { toDate: () => 'Tricked you!' };
-
-// expect(coerceToDate(x)).to.be.null;
-// expect(coerceToDate(y)).to.be.null;
-// expect(coerceToDate(z)).to.be.null;
-// expect(coerceToDate(f)).to.be.null;
-// });
-// });
-
-// describe('parseDate', () => {
-// it('parses an ISO 8601 date string', () => {
-// const dateString = '2024-01-29T15:17:05-05:00';
-
-// const result = parseDate(dateString);
-
-// expect(result).to.respondTo('toISOString');
-
-// expect(result.toISOString()).to.eql('2024-01-29T20:17:05.000Z');
-// });
-
-// it('returns null for invalid inputs', () => {
-// expect(parseDate('foobar')).to.be.null;
-// expect(parseDate(null)).to.be.null;
-// expect(parseDate('Tomorrow')).to.be.null;
-// });
-// });
-
-// describe('formatDatetime', () => {
-// // Use times when UTC offset is -05:00, aka not daylight savings time
-// it('formats a datetime string with long month name, full year and timezone abbreviation', () => {
-// const dateString = '2024-01-01T15:17:05-05:00';
-// const d = new Date(dateString);
-
-// const result = formatDatetime(d);
-
-// // Test must run in context of expected timezone
-// expect(result).to.equal('January 1, 2024 at 3:17 p.m. ET');
-// });
-
-// it('formats 12:00 PM as noon', () => {
-// const dateString = '2024-11-11T12:00-05:00';
-// const d = new Date(dateString);
-
-// const result = formatDatetime(d);
-
-// // Test must run in context of expected timezone
-// expect(result).to.equal('November 11, 2024 at noon ET');
-// });
-
-// it('formats 12:00 AM as midnight', () => {
-// const dateString = '2024-11-12T00:00:00-05:00';
-// const d = new Date(dateString);
-
-// const result = formatDatetime(d);
-
-// // Test must run in context of expected timezone
-// expect(result).to.equal('November 12, 2024 at midnight ET');
-// });
-
-// it('handles datetimes in daylight savings appropriately', () => {
-// // DST in 2024 is March 10, 2024 - November 03, 2024
-// // Use April 1, 2024, 10am to be in DST
-// const dateString = '2024-04-01T10:00:00-04:00';
-// const d = new Date(dateString);
-
-// const result = formatDatetime(d);
-
-// // Test must run in context of expected timezone
-// expect(result).to.equal('April 1, 2024 at 10:00 a.m. ET');
-// });
-// });
-
-// describe('formatElapsedHours', () => {
-// it('shows 1 hour when time difference is less than an hour and a half', () => {
-// const startDate = new Date(2024, 2, 14, 14);
-// const endDate = new Date(2024, 2, 14, 15, 15);
-
-// const result = formatElapsedHours(startDate, endDate);
-
-// expect(result).to.equal('1 hour');
-// });
-
-// it('shows a plural hours when time difference is greater than an hour and a half', () => {
-// const startDate = new Date(2024, 2, 14, 14);
-// const endDate = new Date(2024, 2, 14, 18, 30);
-
-// const result = formatElapsedHours(startDate, endDate);
-
-// expect(result).to.equal('5 hours');
-// });
-
-// it('returns null when start or end time is not or cannot be coerced to a date', () => {
-// expect(formatElapsedHours('foo', new Date())).to.be.null;
-
-// expect(formatElapsedHours(new Date(), { toDate: () => "It's a trap!" })).to
-// .be.null;
-
-// expect(formatElapsedHours(undefined, null)).to.be.null;
-// });
-// });
+import { expect } from 'chai';
+// NOTE: moment is deprecated, should only be used for testing compatibility with older code
+import moment from 'moment';
+
+import {
+ coerceToDate,
+ formatDatetime,
+ formatElapsedHours,
+ parseDate,
+} from '../utils/date';
+
+describe('coerceToDate', () => {
+ it('returns a Date instance when passed a moment object', () => {
+ const m = moment('2024-02-14 09:30');
+ const d = coerceToDate(m);
+ expect(d).to.be.an.instanceOf(Date);
+ });
+
+ it('returns a date instance when passed a date instance', () => {
+ const d1 = new Date();
+ const d2 = coerceToDate(d1);
+ expect(d2).to.equal(d1);
+ });
+
+ it('returns null when passed something that is not a date or moment object', () => {
+ const x = '';
+ const y = undefined;
+ const z = {};
+ // F is for Fake
+ const f = { toDate: () => 'Tricked you!' };
+
+ expect(coerceToDate(x)).to.be.null;
+ expect(coerceToDate(y)).to.be.null;
+ expect(coerceToDate(z)).to.be.null;
+ expect(coerceToDate(f)).to.be.null;
+ });
+});
+
+describe('parseDate', () => {
+ it('parses an ISO 8601 date string', () => {
+ const dateString = '2024-01-29T15:17:05-05:00';
+
+ const result = parseDate(dateString);
+
+ expect(result).to.respondTo('toISOString');
+
+ expect(result.toISOString()).to.eql('2024-01-29T20:17:05.000Z');
+ });
+
+ it('returns null for invalid inputs', () => {
+ expect(parseDate('foobar')).to.be.null;
+ expect(parseDate(null)).to.be.null;
+ expect(parseDate('Tomorrow')).to.be.null;
+ });
+});
+
+describe('formatDatetime', () => {
+ // Use times when UTC offset is -05:00, aka not daylight savings time
+ it('formats a datetime string with long month name, full year and timezone abbreviation', () => {
+ const dateString = '2024-01-01T15:17:05-05:00';
+ const d = new Date(dateString);
+
+ const result = formatDatetime(d);
+
+ // Test must run in context of expected timezone
+ expect(result).to.match(
+ /January 1, 2024 at \d:\d{2} (a|p)\.m\. [A-Z]{1,2}T/,
+ );
+ });
+});
+
+describe('formatElapsedHours', () => {
+ it('shows 1 hour when time difference is less than an hour and a half', () => {
+ const startDate = new Date(2024, 2, 14, 14);
+ const endDate = new Date(2024, 2, 14, 15, 15);
+
+ const result = formatElapsedHours(startDate, endDate);
+
+ expect(result).to.equal('1 hour');
+ });
+
+ it('shows a plural hours when time difference is greater than an hour and a half', () => {
+ const startDate = new Date(2024, 2, 14, 14);
+ const endDate = new Date(2024, 2, 14, 18, 30);
+
+ const result = formatElapsedHours(startDate, endDate);
+
+ expect(result).to.equal('5 hours');
+ });
+
+ it('returns null when start or end time is not or cannot be coerced to a date', () => {
+ expect(formatElapsedHours('foo', new Date())).to.be.null;
+
+ expect(formatElapsedHours(new Date(), { toDate: () => "It's a trap!" })).to
+ .be.null;
+
+ expect(formatElapsedHours(undefined, null)).to.be.null;
+ });
+});
diff --git a/src/platform/mhv/downtime/utils/date.js b/src/platform/mhv/downtime/utils/date.js
index 96caf4fd264f..82020bb0d546 100644
--- a/src/platform/mhv/downtime/utils/date.js
+++ b/src/platform/mhv/downtime/utils/date.js
@@ -1,7 +1,7 @@
// Date parsing
// DowntimeNotification uses momentjs, which is deprecated.
-
-const HOUR_MS = 3600000; // 1000 * 60 * 60
+import { formatDuration, differenceInHours } from 'date-fns';
+import { format } from 'date-fns-tz';
/*
* Attempts to coerce a momentjs object to a plain date. Returns null if it cannot return a date
@@ -36,42 +36,6 @@ function parseDate(input) {
return result;
}
-/* Datetime formatter */
-const vaDatetimeFormat = new Intl.DateTimeFormat('en', {
- year: 'numeric',
- month: 'long',
- day: 'numeric',
- hour: 'numeric',
- minute: 'numeric',
- // timeZone: 'America/New_York',
- timeZoneName: 'short', // `shortGeneric` not supported by node, deno
-});
-
-/**
- * Transforms Intl.DateTimeFormat `formatToParts` into a dictionary-like object
- * @typedef {{ type: string, value: string}} DateTimePart
- * @param {DateTimePart[]} dtParts - See Intl.DateTimeFormat.prototype.formatToParts()
- * @returns {Object.
} - Object of datetime parts
- */
-function datetimePartsToObj(dtParts) {
- return dtParts.reduce((acc, currentValue) => {
- if (
- [
- 'year',
- 'month',
- 'day',
- 'dayPeriod',
- 'hour',
- 'minute',
- 'timeZoneName',
- ].includes(currentValue.type)
- ) {
- acc[currentValue.type] = currentValue.value;
- }
- return acc;
- }, {});
-}
-
/**
* Format a Date into a VA-preferred datetime string
*
@@ -84,38 +48,19 @@ function datetimePartsToObj(dtParts) {
function formatDatetime(input) {
const d = coerceToDate(input);
if (d === null) return '';
- const dtParts = vaDatetimeFormat.formatToParts(d);
- const dtDict = datetimePartsToObj(dtParts);
- const { year, month, day, hour, minute } = dtDict;
- let { dayPeriod, timeZoneName } = dtDict;
+
+ let timeString = format(d, "MMMM d, yyyy 'at' h:mm bbbb z");
// remove S or D in timezone abbreviation
- timeZoneName = timeZoneName.replace(/([A-Z])(S|D)T$/, (_, p1) => `${p1}T`);
- // Lowercase and add periods to dayPeriod
- dayPeriod = [...dayPeriod.toLowerCase(), ''].join('.');
- //
- let timeString = `${hour}:${minute} ${dayPeriod}`;
- // Handle 12:00 as noon or midnight
- if (hour === '12' && minute === '00') {
- if (dayPeriod === 'a.m.') {
- timeString = 'midnight';
- } else {
- timeString = 'noon';
- }
- }
+ timeString = timeString.replace(/([A-Z])(S|D)T$/, (_, p1) => `${p1}T`);
- return `${month} ${day}, ${year} at ${timeString} ${timeZoneName}`;
-}
+ // Handle 12:00 as noon or midnight
+ timeString = timeString.replace(
+ /\d{1,2}:\d{2} (noon|midnight)/,
+ (_, p1) => `${p1}`,
+ );
-/*
- * Calculate a fractional number of hours between two datetimes
- * @param {Date} startDate
- * @param {Date} endDate
- * @returns {number}
- */
-function getElapsedHours(startDate, endDate) {
- const elapsedMs = Math.abs(endDate - startDate);
- return elapsedMs / HOUR_MS;
+ return timeString;
}
/*
@@ -128,15 +73,10 @@ function formatElapsedHours(start, end) {
const startDate = coerceToDate(start);
const endDate = coerceToDate(end);
if (!(startDate && endDate)) return null;
- let hours = getElapsedHours(startDate, endDate);
- hours = Math.round(hours);
- return `${hours} hour${hours > 1 ? 's' : ''}`;
+ const hours = differenceInHours(endDate, startDate, {
+ roundingMethod: 'round',
+ });
+ return formatDuration({ hours });
}
-export {
- coerceToDate,
- formatDatetime,
- formatElapsedHours,
- getElapsedHours,
- parseDate,
-};
+export { coerceToDate, formatDatetime, formatElapsedHours, parseDate };
-