10207 required email changes to prod (#33567)

department-of-veterans-affairs · Dec 16, 2024 · 0e27439 · 0e27439
1 parent eb23afa
commit 0e27439
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 206 deletions.
diff --git a/src/applications/simple-forms/20-10207/pages/nonVeteranPhoneAndEmail.js b/src/applications/simple-forms/20-10207/pages/nonVeteranPhoneAndEmail.js
@@ -1,34 +1,15 @@
 import {
-  emailSchema,
-  emailUI,
   emailToSendNotificationsSchema,
   emailToSendNotificationsUI,
   phoneSchema,
   phoneUI,
   titleUI,
 } from 'platform/forms-system/src/js/web-component-patterns';
-import environment from 'platform/utilities/environment';
 import {
   getPhoneAndEmailPageEmailHint,
   getPhoneAndEmailPageTitle,
 } from '../helpers';
 
-/** @type {PageSchema} */
-const oldPageSchema = {
-  uiSchema: {
-    ...titleUI(({ formData }) => getPhoneAndEmailPageTitle(formData)),
-    nonVeteranPhone: phoneUI('Phone number'),
-    nonVeteranEmailAddress: emailUI(),
-  },
-  schema: {
-    type: 'object',
-    properties: {
-      nonVeteranPhone: phoneSchema,
-      nonVeteranEmailAddress: emailSchema,
-    },
-  },
-};
-
 /** @type {PageSchema} */
 const pageSchema = {
   uiSchema: {
@@ -53,7 +34,4 @@ const pageSchema = {
   },
 };
 
-// test on dev before making this change
-const useNewPageSchema = environment.isDev() || environment.isLocalhost();
-
-export default (useNewPageSchema ? pageSchema : oldPageSchema);
+export default pageSchema;
diff --git a/src/applications/simple-forms/20-10207/pages/nonVeteranPointOfContact.js b/src/applications/simple-forms/20-10207/pages/nonVeteranPointOfContact.js
@@ -6,34 +6,6 @@ import {
   titleUI,
 } from 'platform/forms-system/src/js/web-component-patterns';
 import VaTextInputField from 'platform/forms-system/src/js/web-component-fields/VaTextInputField';
-import environment from 'platform/utilities/environment';
-
-/** @type {PageSchema} */
-const oldPageSchema = {
-  uiSchema: {
-    ...titleUI(
-      "Claimant's point of contact",
-      'To help us process this request, it helps us to be able to get in touch with the claimant. Please provide the name and telephone number of someone who can help us locate the claimant.',
-    ),
-    pointOfContactName: {
-      'ui:title': "Name of claimant's point of contact",
-      'ui:webComponentField': VaTextInputField,
-    },
-    pointOfContactPhone: phoneUI(
-      "Telephone number of claimant's point of contact",
-    ),
-  },
-  schema: {
-    type: 'object',
-    properties: {
-      pointOfContactName: {
-        type: 'string',
-        maxLength: 40,
-      },
-      pointOfContactPhone: phoneSchema,
-    },
-  },
-};
 
 /** @type {PageSchema} */
 const pageSchema = {
@@ -68,7 +40,4 @@ const pageSchema = {
   },
 };
 
-// test on dev before making this change
-const useNewPageSchema = environment.isDev() || environment.isLocalhost();
-
-export default (useNewPageSchema ? pageSchema : oldPageSchema);
+export default pageSchema;
diff --git a/src/applications/simple-forms/20-10207/pages/phoneAndEmail.js b/src/applications/simple-forms/20-10207/pages/phoneAndEmail.js
@@ -1,29 +1,10 @@
 import {
-  emailSchema,
-  emailUI,
   emailToSendNotificationsSchema,
   emailToSendNotificationsUI,
   phoneSchema,
   phoneUI,
   titleUI,
 } from 'platform/forms-system/src/js/web-component-patterns';
-import environment from 'platform/utilities/environment';
-
-/** @type {PageSchema} */
-const oldPageSchema = {
-  uiSchema: {
-    ...titleUI('Your phone and email address'),
-    phone: phoneUI('Phone number'),
-    emailAddress: emailUI(),
-  },
-  schema: {
-    type: 'object',
-    properties: {
-      phone: phoneSchema,
-      emailAddress: emailSchema,
-    },
-  },
-};
 
 /** @type {PageSchema} */
 const pageSchema = {
@@ -44,7 +25,4 @@ const pageSchema = {
   },
 };
 
-// test on dev before making this change
-const useNewPageSchema = environment.isDev() || environment.isLocalhost();
-
-export default (useNewPageSchema ? pageSchema : oldPageSchema);
+export default pageSchema;
diff --git a/src/applications/simple-forms/20-10207/pages/pointOfContact.js b/src/applications/simple-forms/20-10207/pages/pointOfContact.js
@@ -6,34 +6,8 @@ import {
   titleUI,
 } from 'platform/forms-system/src/js/web-component-patterns';
 import VaTextInputField from 'platform/forms-system/src/js/web-component-fields/VaTextInputField';
-import environment from 'platform/utilities/environment';
 import { PREPARER_TYPES } from '../config/constants';
 
-/** @type {PageSchema} */
-const oldPageSchema = {
-  uiSchema: {
-    ...titleUI(
-      'Your point of contact',
-      'To help us process your request, it helps us to be able to get in touch with you. Please provide the name and telephone number of someone who can help us locate you.',
-    ),
-    pointOfContactName: {
-      'ui:title': 'Name of your point of contact',
-      'ui:webComponentField': VaTextInputField,
-    },
-    pointOfContactPhone: phoneUI('Telephone number of your point of contact'),
-  },
-  schema: {
-    type: 'object',
-    properties: {
-      pointOfContactName: {
-        type: 'string',
-        maxLength: 40,
-      },
-      pointOfContactPhone: phoneSchema,
-    },
-  },
-};
-
 /** @type {PageSchema} */
 const pageSchema = {
   uiSchema: {
@@ -69,7 +43,4 @@ const pageSchema = {
   },
 };
 
-// test on dev before making this change
-const useNewPageSchema = environment.isDev() || environment.isLocalhost();
-
-export default (useNewPageSchema ? pageSchema : oldPageSchema);
+export default pageSchema;
diff --git a/src/applications/simple-forms/20-10207/pages/veteranPhoneAndEmail.js b/src/applications/simple-forms/20-10207/pages/veteranPhoneAndEmail.js
@@ -1,34 +1,15 @@
 import {
-  emailSchema,
-  emailUI,
   emailToSendNotificationsSchema,
   emailToSendNotificationsUI,
   phoneSchema,
   phoneUI,
   titleUI,
 } from 'platform/forms-system/src/js/web-component-patterns';
-import environment from 'platform/utilities/environment';
 import {
   getPhoneAndEmailPageTitle,
   getPhoneAndEmailPageEmailHint,
 } from '../helpers';
 
-/** @type {PageSchema} */
-const oldPageSchema = {
-  uiSchema: {
-    ...titleUI(({ formData }) => getPhoneAndEmailPageTitle(formData)),
-    veteranPhone: phoneUI('Phone number'),
-    veteranEmailAddress: emailUI(),
-  },
-  schema: {
-    type: 'object',
-    properties: {
-      veteranPhone: phoneSchema,
-      veteranEmailAddress: emailSchema,
-    },
-  },
-};
-
 /** @type {PageSchema} */
 const pageSchema = {
   uiSchema: {
@@ -53,7 +34,4 @@ const pageSchema = {
   },
 };
 
-// test on dev before making this change
-const useNewPageSchema = environment.isDev() || environment.isLocalhost();
-
-export default (useNewPageSchema ? pageSchema : oldPageSchema);
+export default pageSchema;
diff --git a/src/applications/simple-forms/20-10207/pages/veteranPointOfContact.js b/src/applications/simple-forms/20-10207/pages/veteranPointOfContact.js
@@ -6,34 +6,6 @@ import {
   titleUI,
 } from 'platform/forms-system/src/js/web-component-patterns';
 import VaTextInputField from 'platform/forms-system/src/js/web-component-fields/VaTextInputField';
-import environment from 'platform/utilities/environment';
-
-/** @type {PageSchema} */
-const oldPageSchema = {
-  uiSchema: {
-    ...titleUI(
-      "Veteran's point of contact",
-      'To help us process this request, it helps us to be able to get in touch with the Veteran. Please provide the name and telephone number of someone who can help us locate the Veteran.',
-    ),
-    pointOfContactName: {
-      'ui:title': "Name of Veteran's point of contact",
-      'ui:webComponentField': VaTextInputField,
-    },
-    pointOfContactPhone: phoneUI(
-      "Telephone number of Veteran's point of contact",
-    ),
-  },
-  schema: {
-    type: 'object',
-    properties: {
-      pointOfContactName: {
-        type: 'string',
-        maxLength: 40,
-      },
-      pointOfContactPhone: phoneSchema,
-    },
-  },
-};
 
 /** @type {PageSchema} */
 const pageSchema = {
@@ -68,7 +40,4 @@ const pageSchema = {
   },
 };
 
-// test on dev before making this change
-const useNewPageSchema = environment.isDev() || environment.isLocalhost();
-
-export default (useNewPageSchema ? pageSchema : oldPageSchema);
+export default pageSchema;
diff --git a/...applications/simple-forms/20-10207/tests/unit/pages/nonVeteranPointOfContact.unit.spec.js b/...applications/simple-forms/20-10207/tests/unit/pages/nonVeteranPointOfContact.unit.spec.js
@@ -1,4 +1,3 @@
-import environment from 'platform/utilities/environment';
 import {
   testNumberOfErrorsOnSubmit,
   testNumberOfErrorsOnSubmitForWebComponents,
@@ -16,12 +15,7 @@ const pageTitle = "Claimant's point of contact";
 
 const data = {};
 
-let expectedNumberOfWebComponentFields = 2;
-
-// test on dev before making this change
-if (environment.isDev() || environment.isLocalhost()) {
-  expectedNumberOfWebComponentFields = 3;
-}
+const expectedNumberOfWebComponentFields = 3;
 
 testNumberOfWebComponentFields(
   formConfig,
@@ -32,12 +26,7 @@ testNumberOfWebComponentFields(
   data,
 );
 
-let expectedNumberOfWebComponentErrors = 0;
-
-// test on dev before making this change
-if (environment.isDev() || environment.isLocalhost()) {
-  expectedNumberOfWebComponentErrors = 1;
-}
+const expectedNumberOfWebComponentErrors = 1;
 
 testNumberOfErrorsOnSubmitForWebComponents(
   formConfig,

diff --git a/src/applications/simple-forms/20-10207/tests/unit/pages/pointOfContact.unit.spec.js b/src/applications/simple-forms/20-10207/tests/unit/pages/pointOfContact.unit.spec.js
@@ -1,4 +1,3 @@
-import environment from 'platform/utilities/environment';
 import {
   testNumberOfErrorsOnSubmit,
   testNumberOfErrorsOnSubmitForWebComponents,
@@ -16,12 +15,7 @@ const pageTitle = 'Your point of contact';
 
 let data = {};
 
-let expectedNumberOfWebComponentFields = 2;
-
-// test on dev before making this change
-if (environment.isDev() || environment.isLocalhost()) {
-  expectedNumberOfWebComponentFields = 3;
-}
+const expectedNumberOfWebComponentFields = 3;
 
 testNumberOfWebComponentFields(
   formConfig,
@@ -35,11 +29,6 @@ testNumberOfWebComponentFields(
 // veteran with email - point of contact should not be required
 let expectedNumberOfWebComponentErrors = 0;
 
-// test on dev before making this change
-if (environment.isDev() || environment.isLocalhost()) {
-  expectedNumberOfWebComponentErrors = 0;
-}
-
 data = {
   preparerType: 'veteran',
   veteranEmailAddress: '[email protected]',
@@ -55,12 +44,7 @@ testNumberOfErrorsOnSubmitForWebComponents(
 );
 
 // veteran without email - point of contact should be required
-expectedNumberOfWebComponentErrors = 0;
-
-// test on dev before making this change
-if (environment.isDev() || environment.isLocalhost()) {
-  expectedNumberOfWebComponentErrors = 1;
-}
+expectedNumberOfWebComponentErrors = 1;
 
 data = {
   preparerType: 'veteran',

diff --git a/src/applications/simple-forms/20-10207/tests/unit/pages/veteranPointOfContact.unit.spec.js b/src/applications/simple-forms/20-10207/tests/unit/pages/veteranPointOfContact.unit.spec.js
@@ -1,4 +1,3 @@
-import environment from 'platform/utilities/environment';
 import {
   testNumberOfErrorsOnSubmit,
   testNumberOfErrorsOnSubmitForWebComponents,
@@ -16,12 +15,7 @@ const pageTitle = "Veteran's point of contact";
 
 const data = {};
 
-let expectedNumberOfWebComponentFields = 2;
-
-// test on dev before making this change
-if (environment.isDev() || environment.isLocalhost()) {
-  expectedNumberOfWebComponentFields = 3;
-}
+const expectedNumberOfWebComponentFields = 3;
 
 testNumberOfWebComponentFields(
   formConfig,
@@ -32,12 +26,8 @@ testNumberOfWebComponentFields(
   data,
 );
 
-let expectedNumberOfWebComponentErrors = 0;
+const expectedNumberOfWebComponentErrors = 1;
 
-// test on dev before making this change
-if (environment.isDev() || environment.isLocalhost()) {
-  expectedNumberOfWebComponentErrors = 1;
-}
 testNumberOfErrorsOnSubmitForWebComponents(
   formConfig,
   schema,