Fix bug with using formData in the schema files when calling ProfileN… (

#33881) * fix bug with using formData in the schema files when calling ProfileNotUpdatedNote * fix failing tests
department-of-veterans-affairs · Jan 3, 2025 · e22526e · e22526e
1 parent 22e1d6b
commit e22526e
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 36 deletions.
diff --git a/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx b/src/applications/representative-appoint/components/ProfileNotUpdatedNote.jsx
@@ -5,16 +5,17 @@ import PropTypes from 'prop-types';
 
 import { CONTACTS } from '@department-of-veterans-affairs/component-library/contacts';
 import { isLoggedIn } from 'platform/user/selectors';
+import { preparerIsVeteran } from '../utilities/helpers';
 
 function ProfileNotUpdatedNote(props) {
   const {
+    formData,
     includeLink,
     includePhone,
     includePrefix,
     loggedIn,
-    preparerIsVeteran,
   } = props;
-  const isLoggedInVeteran = loggedIn && preparerIsVeteran;
+  const isLoggedInVeteran = loggedIn && preparerIsVeteran({ formData });
 
   return (
     <>
@@ -52,16 +53,17 @@ function ProfileNotUpdatedNote(props) {
 }
 
 ProfileNotUpdatedNote.propTypes = {
+  formData: PropTypes.object,
   includeLink: PropTypes.bool,
   includePhone: PropTypes.bool,
   includePrefix: PropTypes.bool,
   loggedIn: PropTypes.bool,
-  preparerIsVeteran: PropTypes.bool,
 };
 
 function mapStateToProps(state) {
   return {
     loggedIn: isLoggedIn(state),
+    formData: state.form.data,
   };
 }
 

diff --git a/src/applications/representative-appoint/pages/veteran/veteranContactMailing.js b/src/applications/representative-appoint/pages/veteran/veteranContactMailing.js
@@ -7,21 +7,14 @@ import {
   titleSchema,
 } from 'platform/forms-system/src/js/web-component-patterns';
 import ProfileNotUpdatedNote from '../../components/ProfileNotUpdatedNote';
-import { preparerIsVeteran } from '../../utilities/helpers';
 
 export const uiSchema = {
   ...titleUI(
     'Your mailing address',
     'We’ll send any important information about your form to this address.',
   ),
   profileNotUpdatedNote: {
-    'ui:description': formData => (
-      <ProfileNotUpdatedNote
-        includeLink
-        includePrefix
-        preparerIsVeteran={preparerIsVeteran({ formData })}
-      />
-    ),
+    'ui:description': () => <ProfileNotUpdatedNote includeLink includePrefix />,
   },
   veteranHomeAddress: addressUI({
     labels: {

diff --git a/src/applications/representative-appoint/pages/veteran/veteranContactPhoneEmail.js b/src/applications/representative-appoint/pages/veteran/veteranContactPhoneEmail.js
@@ -10,17 +10,12 @@ import {
 } from 'platform/forms-system/src/js/web-component-patterns';
 
 import ProfileNotUpdatedNote from '../../components/ProfileNotUpdatedNote';
-import { preparerIsVeteran } from '../../utilities/helpers';
+// import { preparerIsVeteran } from '../../utilities/helpers';
 
 export const uiSchema = {
   ...titleUI(() => 'Your phone number and email address'),
   profileNotUpdatedNote: {
-    'ui:description': formData => (
-      <ProfileNotUpdatedNote
-        includePhone
-        preparerIsVeteran={preparerIsVeteran({ formData })}
-      />
-    ),
+    'ui:description': () => <ProfileNotUpdatedNote includePhone />,
   },
   'Primary phone': phoneUI({
     required: true,

diff --git a/src/applications/representative-appoint/pages/veteran/veteranIdentification.js b/src/applications/representative-appoint/pages/veteran/veteranIdentification.js
@@ -32,12 +32,8 @@ export const uiSchema = {
       } Social Security and VA file numbers are the same. `,
   ),
   profileNotUpdatedNote: {
-    'ui:description': formData => (
-      <ProfileNotUpdatedNote
-        includePhone
-        includePrefix
-        preparerIsVeteran={preparerIsVeteran({ formData })}
-      />
+    'ui:description': () => (
+      <ProfileNotUpdatedNote includePhone includePrefix />
     ),
   },
   veteranSocialSecurityNumber: ssnUI('Social Security number'),

diff --git a/src/applications/representative-appoint/pages/veteran/veteranPersonalInformation.js b/src/applications/representative-appoint/pages/veteran/veteranPersonalInformation.js
@@ -24,12 +24,7 @@ export const uiSchema = {
       } name and date of birth`,
   ),
   profileNotUpdatedNote: {
-    'ui:description': formData => (
-      <ProfileNotUpdatedNote
-        includePhone
-        preparerIsVeteran={preparerIsVeteran({ formData })}
-      />
-    ),
+    'ui:description': () => <ProfileNotUpdatedNote includePhone />,
   },
   veteranFullName: fullNameMiddleInitialUI,
   veteranDateOfBirth: dateOfBirthUI(),

diff --git a/src/applications/representative-appoint/pages/veteran/veteranServiceInformation.js b/src/applications/representative-appoint/pages/veteran/veteranServiceInformation.js
@@ -18,12 +18,7 @@ export const uiSchema = {
       } service information`,
   ),
   profileNotUpdatedNote: {
-    'ui:description': formData => (
-      <ProfileNotUpdatedNote
-        includePhone
-        preparerIsVeteran={preparerIsVeteran({ formData })}
-      />
-    ),
+    'ui:description': () => <ProfileNotUpdatedNote includePhone />,
   },
   'Branch of Service': radioUI('Branch of service'),
 };

diff --git a/...tions/representative-appoint/tests/pages/claimant/claimantContactPhoneEmail.unit.spec.jsx b/...tions/representative-appoint/tests/pages/claimant/claimantContactPhoneEmail.unit.spec.jsx
@@ -16,6 +16,7 @@ describe('Claimant Contact Phone Email page', () => {
   const mockStore = configureStore();
   const store = mockStore({
     user: { login: { currentlyLoggedIn: true } },
+    form: { data: {} },
   });
 
   it('should render', () => {

diff --git a/...ons/representative-appoint/tests/pages/claimant/claimantPersonalInformation.unit.spec.jsx b/...ons/representative-appoint/tests/pages/claimant/claimantPersonalInformation.unit.spec.jsx
@@ -18,6 +18,7 @@ describe('Claimant Personal Information page', () => {
   const mockStore = configureStore();
   const store = mockStore({
     user: { login: { currentlyLoggedIn: true } },
+    form: { data: {} },
   });
 
   // Custom page is rendered, so this only renders a submit button

diff --git a/...cations/representative-appoint/tests/pages/veteran/veteranContactPhoneEmail.unit.spec.jsx b/...cations/representative-appoint/tests/pages/veteran/veteranContactPhoneEmail.unit.spec.jsx
@@ -16,6 +16,7 @@ describe('Veteran Contact Phone Email page', () => {
   const mockStore = configureStore();
   const store = mockStore({
     user: { login: { currentlyLoggedIn: true } },
+    form: { data: {} },
   });
 
   it('should render', () => {

diff --git a/...representative-appoint/tests/pages/veteran/veteranContactPhoneEmailClaimant.unit.spec.jsx b/...representative-appoint/tests/pages/veteran/veteranContactPhoneEmailClaimant.unit.spec.jsx
@@ -16,6 +16,7 @@ describe('Veteran Contact Phone Email Claimant page', () => {
   const mockStore = configureStore();
   const store = mockStore({
     user: { login: { currentlyLoggedIn: true } },
+    form: { data: {} },
   });
 
   it('should render', () => {

diff --git a/...plications/representative-appoint/tests/pages/veteran/veteranIdentification.unit.spec.jsx b/...plications/representative-appoint/tests/pages/veteran/veteranIdentification.unit.spec.jsx
@@ -16,6 +16,7 @@ describe('Veteran Identification page', () => {
   const mockStore = configureStore();
   const store = mockStore({
     user: { login: { currentlyLoggedIn: true } },
+    form: { data: {} },
   });
 
   it('should render', () => {

diff --git a/...tions/representative-appoint/tests/pages/veteran/veteranPersonalInformation.unit.spec.jsx b/...tions/representative-appoint/tests/pages/veteran/veteranPersonalInformation.unit.spec.jsx
@@ -16,6 +16,7 @@ describe('Veteran Personal Information page', () => {
   const mockStore = configureStore();
   const store = mockStore({
     user: { login: { currentlyLoggedIn: true } },
+    form: { data: {} },
   });
 
   it('should render', () => {

diff --git a/...ations/representative-appoint/tests/pages/veteran/veteranServiceInformation.unit.spec.jsx b/...ations/representative-appoint/tests/pages/veteran/veteranServiceInformation.unit.spec.jsx
@@ -16,6 +16,7 @@ describe('Veteran Service Information page', () => {
   const mockStore = configureStore();
   const store = mockStore({
     user: { login: { currentlyLoggedIn: true } },
+    form: { data: {} },
   });
 
   it('should render', () => {