VFEP-1502 Remove Benefit Relinquished. (#30716)

* VFEP-1502 Remove Benefit Relinquished. * VFEP-1502 Delete flacky vrrap test. * VFEP-1502 Delete flacky vrrap test.
department-of-veterans-affairs · Jul 8, 2024 · a81095c · a81095c
1 parent f7b3f56
commit a81095c
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 547 deletions.
diff --git a/src/applications/edu-benefits/1990/BenefitsRelinquishmentField.jsx b/src/applications/edu-benefits/1990/BenefitsRelinquishmentField.jsx
diff --git a/src/applications/edu-benefits/1990/config/form.js b/src/applications/edu-benefits/1990/config/form.js
@@ -1,7 +1,6 @@
 import merge from 'lodash/merge';
 import get from 'platform/utilities/data/get';
 import unset from 'platform/utilities/data/unset';
-import moment from 'moment';
 
 import fullSchema1990 from 'vets-json-schema/dist/22-1990-schema.json';
 import dateRangeUI from 'platform/forms-system/src/js/definitions/dateRange';
@@ -13,7 +12,6 @@ import {
   validateBooleanGroup,
   validateCurrentOrFutureDate,
 } from 'platform/forms-system/src/js/validation';
-import dateUI from 'platform/forms-system/src/js/definitions/date';
 import currentOrPastDateUI from 'platform/forms-system/src/js/definitions/currentOrPastDate';
 import ssnUI from 'platform/forms-system/src/js/definitions/ssn';
 import applicantDescription from 'platform/forms/components/ApplicantDescription';
@@ -34,16 +32,10 @@ import * as toursOfDuty from '../../definitions/toursOfDuty';
 import IntroductionPage from '../containers/IntroductionPage';
 import ConfirmationPage from '../containers/ConfirmationPage';
 
-import BenefitsRelinquishmentField from '../BenefitsRelinquishmentField';
-
 import {
   transform,
   benefitsEligibilityBox,
-  benefitsRelinquishmentWarning,
-  benefitsRelinquishmentLabels,
-  benefitsRelinquishedDescription,
   prefillTransformer,
-  reserveKickerWarning,
   SeventeenOrOlder,
   eighteenOrOver,
   ageWarning,
@@ -62,8 +54,6 @@ const {
   additionalContributions,
   activeDutyKicker,
   reserveKicker,
-  benefitsRelinquished,
-  benefitsRelinquishedDate,
   serviceAcademyGraduationYear,
 } = fullSchema1990.properties;
 
@@ -292,12 +282,6 @@ const formConfig = {
                   expandUnderClassNames: 'schemaform-expandUnder-indent',
                 },
               },
-              'view:chapter33ExpandedContent': {
-                'ui:description': benefitsLabels.chapter33Description,
-                'ui:options': {
-                  expandUnder: 'chapter33',
-                },
-              },
               chapter30: {
                 'ui:title': benefitsLabels.chapter30,
               },
@@ -314,68 +298,13 @@ const formConfig = {
                 type: 'object',
                 properties: {
                   chapter33,
-                  'view:chapter33ExpandedContent': {
-                    type: 'object',
-                    properties: {},
-                  },
                   chapter30,
                   chapter1606,
                 },
               },
             },
           },
         },
-        benefitsRelinquishment: {
-          title: 'Benefits relinquishment',
-          path: 'benefits-eligibility/benefits-relinquishment',
-          depends: formData => formData['view:selectedBenefits'].chapter33,
-          initialData: {
-            'view:benefitsRelinquishedContainer': {
-              benefitsRelinquishedDate: moment().format('YYYY-MM-DD'),
-            },
-          },
-          uiSchema: {
-            'ui:title': 'Benefits relinquishment',
-            'ui:description': benefitsRelinquishmentWarning,
-            'view:benefitsRelinquishedContainer': {
-              'ui:field': BenefitsRelinquishmentField,
-              benefitsRelinquished: {
-                'ui:title': 'I choose to give up:',
-                'ui:widget': 'radio',
-                'ui:options': {
-                  labels: benefitsRelinquishmentLabels,
-                },
-              },
-              benefitsRelinquishedDate: merge({}, dateUI('Effective date'), {
-                'ui:required': formData =>
-                  get(
-                    'view:benefitsRelinquishedContainer.benefitsRelinquished',
-                    formData,
-                  ) !== 'unknown',
-              }),
-            },
-            'view:questionText': {
-              'ui:description': benefitsRelinquishedDescription,
-            },
-          },
-          schema: {
-            type: 'object',
-            properties: {
-              'view:benefitsRelinquishedContainer': {
-                type: 'object',
-                required: ['benefitsRelinquished'],
-                properties: {
-                  benefitsRelinquished,
-                  benefitsRelinquishedDate,
-                },
-              },
-              'view:questionText': {
-                type: 'object',
-                properties: {},
-              },
-            },
-          },
-        },
       },
     },
     militaryHistory: {
@@ -502,17 +431,6 @@ const formConfig = {
               'ui:title':
                 'I qualify for a Reserve Kicker (sometimes called a college fund).',
             },
-            'view:reserveKickerWarning': {
-              'ui:description': reserveKickerWarning,
-              'ui:options': {
-                expandUnder: 'reserveKicker',
-                hideIf: data =>
-                  get(
-                    'view:benefitsRelinquishedContainer.benefitsRelinquished',
-                    data,
-                  ) !== 'chapter30',
-              },
-            },
             'view:activeDutyRepayingPeriod': {
               'ui:title':
                 'I have a period of service that the Department of Defense counts toward an education loan payment.',
@@ -544,10 +462,6 @@ const formConfig = {
               additionalContributions,
               activeDutyKicker,
               reserveKicker,
-              'view:reserveKickerWarning': {
-                type: 'object',
-                properties: {},
-              },
               'view:activeDutyRepayingPeriod': {
                 type: 'boolean',
               },

diff --git a/src/applications/edu-benefits/1990/containers/ConfirmationPage.jsx b/src/applications/edu-benefits/1990/containers/ConfirmationPage.jsx
@@ -1,11 +1,9 @@
-import get from 'platform/utilities/data/get';
 import React from 'react';
 import { connect } from 'react-redux';
 
 import { focusElement } from 'platform/utilities/ui';
 import scrollToTop from 'platform/utilities/ui/scrollToTop';
 import { getListOfBenefits } from '../../utils/helpers';
-import { benefitsRelinquishmentLabels } from '../helpers';
 import { ConfirmationPageContent } from '../../components/ConfirmationPageContent';
 
 class ConfirmationPage extends React.Component {
@@ -28,31 +26,17 @@ class ConfirmationPage extends React.Component {
   }
 
   render() {
-    const form = this.props.form;
+    const { form } = this.props;
     const { submission, formId } = form;
     const benefits = form.data['view:selectedBenefits'];
-    const benefitsRelinquished = get(
-      'data.view:benefitsRelinquishedContainer.benefitsRelinquished',
-      form,
-    );
 
     return (
       <ConfirmationPageContent
         claimInfoListItems={[
-          <li key={'benefit'}>
+          <li key="benefit">
             <strong>Benefit claimed</strong>
             <br />
             {this.makeList(getListOfBenefits(benefits))}
-            {benefits.chapter33 && (
-              <div className="claim-relinquished">
-                <span>
-                  <i>Relinquished:</i>
-                </span>
-                {this.makeList([
-                  benefitsRelinquishmentLabels[benefitsRelinquished],
-                ])}
-              </div>
-            )}
           </li>,
         ]}
         docExplanationHeader="No documents required at this time"