diff --git a/client/app/nonComp/pages/ReportPage.jsx b/client/app/nonComp/pages/ReportPage.jsx
index 3e3a7ba89a8..cedae7187b3 100644
--- a/client/app/nonComp/pages/ReportPage.jsx
+++ b/client/app/nonComp/pages/ReportPage.jsx
@@ -1,3 +1,4 @@
+/* eslint-disable max-lines */
import React, { useEffect } from 'react';
import { useController, useForm, FormProvider, useFormContext } from 'react-hook-form';
import { useDispatch, useSelector } from 'react-redux';
@@ -5,6 +6,7 @@ import { downloadReportCSV } from 'app/nonComp/actions/changeHistorySlice';
import { css } from 'glamor';
import PropTypes from 'prop-types';
+import Alert from 'app/components/Alert';
import Button from 'app/components/Button';
import NonCompLayout from '../components/NonCompLayout';
import { conditionsSchema, ReportPageConditions } from '../components/ReportPage/ReportPageConditions';
@@ -27,7 +29,7 @@ import {
RADIO_STATUS_OPTIONS,
RADIO_STATUS_REPORT_TYPE_OPTIONS,
SPECIFIC_STATUS_OPTIONS,
- SPECTIFIC_EVENT_OPTIONS
+ SPECIFIC_EVENT_OPTIONS
} from 'constants/REPORT_TYPE_CONSTANTS';
import * as ERRORS from 'constants/REPORT_PAGE_VALIDATION_ERRORS';
@@ -42,6 +44,13 @@ const buttonOuterContainerStyling = css({
marginTop: '4rem',
});
+const outerContainerStyling = css({
+ display: 'flex',
+ justifyContent: 'space-between',
+ paddingLeft: '30px',
+ gap: '3em',
+});
+
const specificEventTypeSchema = yup.lazy((value) => {
// eslint-disable-next-line no-undefined
if (value === undefined) {
@@ -52,13 +61,22 @@ const specificEventTypeSchema = yup.lazy((value) => {
added_decision_date: yup.boolean(),
added_issue: yup.boolean(),
added_issue_no_decision_date: yup.boolean(),
+ removed_issue: yup.boolean(),
+ withdrew_issue: yup.boolean(),
+ completed_disposition: yup.boolean(),
claim_created: yup.boolean(),
claim_closed: yup.boolean(),
claim_status_incomplete: yup.boolean(),
+ claim_status_pending: yup.boolean(),
claim_status_inprogress: yup.boolean(),
- completed_disposition: yup.boolean(),
- removed_issue: yup.boolean(),
- withdrew_issue: yup.boolean(),
+ requested_issue_modification: yup.boolean(),
+ requested_issue_addition: yup.boolean(),
+ requested_issue_removal: yup.boolean(),
+ requested_issue_withdrawal: yup.boolean(),
+ approval_of_request: yup.boolean(),
+ rejection_of_request: yup.boolean(),
+ cancellation_of_request: yup.boolean(),
+ edit_of_request: yup.boolean(),
}).test('at-least-one-true', ERRORS.AT_LEAST_ONE_OPTION, (obj) => {
return Object.values(obj).some((val) => val === true);
});
@@ -130,28 +148,11 @@ const ReportPageButtons = ({
);
};
-const RHFCheckboxGroup = ({ options, name, control }) => {
- const { field } = useController({
- control,
- name
- });
-
- const { errors } = useFormContext();
-
- const [value, setValue] = React.useState({});
-
- let fieldClasses = 'checkbox';
-
- const errorMessage = get(errors, name)?.message;
-
- if (errorMessage) {
- fieldClasses += ' usa-input-error';
- fieldClasses += ' less-error-padding';
- }
+const EventCheckboxGroup = ({ header, options, name, onChange }) => {
return (
-