Appoint a rep routing fix (#32939)

* Updated routing logic to check for query params * Removed unnecessary useEffect handling postlogin * Using typographic apostrophe in copy * Reintroduce authorizeMedicalSelect * Refactored authorizeMedicalSelect * Removed unused method
department-of-veterans-affairs · Nov 8, 2024 · 20a2e97 · 20a2e97
1 parent 9beea14
commit 20a2e97
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 96 deletions.
diff --git a/src/applications/representative-appoint/config/form.js b/src/applications/representative-appoint/config/form.js
@@ -16,7 +16,7 @@ import {
 
 import {
   authorizeMedical,
-  // authorizeMedicalSelect,
+  authorizeMedicalSelect,
   authorizeAddress,
   authorizeInsideVA,
   authorizeOutsideVA,
@@ -334,18 +334,18 @@ const formConfig = {
           uiSchema: authorizeMedical.uiSchema,
           schema: authorizeMedical.schema,
         },
-        // authorizeMedicalSelect: {
-        //   path: 'authorize-medical/select',
-        //   depends: formData => {
-        //     return (
-        //       formData?.authorizationRadio ===
-        //       'Yes, but they can only access some of these types of records'
-        //     );
-        //   },
-        //   title: 'Authorization for Certain Medical Records - Select',
-        //   uiSchema: authorizeMedicalSelect.uiSchema,
-        //   schema: authorizeMedicalSelect.schema,
-        // },
+        authorizeMedicalSelect: {
+          path: 'authorize-medical/select',
+          depends: formData => {
+            return (
+              formData?.authorizationRadio ===
+              'Yes, but they can only access some of these types of records'
+            );
+          },
+          title: 'Authorization for Certain Medical Records - Select',
+          uiSchema: authorizeMedicalSelect.uiSchema,
+          schema: authorizeMedicalSelect.schema,
+        },
         authorizeAddress: {
           path: 'authorize-address',
           title: 'Authorization to change your address',

diff --git a/src/applications/representative-appoint/containers/App.jsx b/src/applications/representative-appoint/containers/App.jsx
@@ -16,19 +16,6 @@ function App({ loggedIn, location, children, formData, setFormData }) {
   const { pathname } = location || {};
   const [updatedFormConfig, setUpdatedFormConfig] = useState({ ...formConfig });
 
-  const isPostLogin = document.location.search?.includes('postLogin=true');
-
-  useEffect(
-    () => {
-      if (isPostLogin) {
-        window.location.replace(
-          '/get-help-from-accredited-representative/appoint-rep',
-        );
-      }
-    },
-    [isPostLogin],
-  );
-
   useEffect(
     () => {
       configService.setFormConfig({ subTitle });

diff --git a/src/applications/representative-appoint/pages/authorizations/authorizeAddress.js b/src/applications/representative-appoint/pages/authorizations/authorizeAddress.js
@@ -73,7 +73,7 @@ export const schema = {
       properties: {},
     },
     authorizeAddressRadio: radioSchema([
-      `Yes, they can change my address if it's incorrect or outdated`,
+      `Yes, they can change my address if it’s incorrect or outdated`,
       `No, they can't change my address`,
     ]),
     'view:authorizationNote3': {

diff --git a/src/applications/representative-appoint/pages/authorizations/authorizeMedicalSelect.js b/src/applications/representative-appoint/pages/authorizations/authorizeMedicalSelect.js
@@ -1,56 +1,61 @@
-// import React from 'react';
-// import { checkboxGroupUI } from 'platform/forms-system/src/js/web-component-patterns';
-// import {
-//   checkboxGroupSchemaWithReviewLabels,
-//   representativeTypeMap,
-// } from '../../utilities/helpers';
+import React from 'react';
+import {
+  checkboxGroupSchema,
+  checkboxGroupUI,
+} from '~/platform/forms-system/src/js/web-component-patterns';
+import { authorizationNote } from '../../content/authorizeMedical';
+import { representativeTypeMap } from '../../utilities/helpers';
 
-// export const uiSchema = {
-//   'ui:description': ({ formData }) => {
-//     return (
-//       <>
-//         <h3>Authorization to access certain medical records</h3>
-//         <p className="vads-u-margin-bottom--3 appoint-text">
-//           You’ve authorized this accredited{' '}
-//           {representativeTypeMap[formData.repTypeRadio] || `representative`} to
-//           access some of your medical records.
-//         </p>
-//       </>
-//     );
-//   },
-//   'view:authorizeRecordsCheckbox': {
-//     ...checkboxGroupUI({
-//       title: 'Select the types of records they can access',
-//       required: true,
-//       labelHeaderLevel: '',
-//       tile: false,
-//       uswds: true,
-//       labels: {
-//         alcoholRecords: 'Alcoholism and alcohol abuse records',
-//         drugAbuseRecords: 'Drug abuse records',
-//         HIVRecords: 'HIV (human immunodeficiency virus) records',
-//         sickleCellRecords: 'Sickle cell anemia records',
-//       },
-//       errorMessages: {
-//         required: 'Please select at least one option',
-//       },
-//     }),
-//     'ui:options': {
-//       classNames: 'vads-u-margin-top--0',
-//     },
-//   },
-// };
+export const uiSchema = {
+  'ui:description': ({ formData }) => {
+    return (
+      <>
+        <h3>Authorization to access certain medical records</h3>
+        <p className="vads-u-margin-bottom--3 appoint-text">
+          You’ve authorized this accredited{' '}
+          {representativeTypeMap[formData.repTypeRadio] || `representative`} to
+          access some of your medical records.
+        </p>
+      </>
+    );
+  },
 
-// export const schema = {
-//   type: 'object',
-//   properties: {
-//     'view:authorizeRecordsCheckbox': {
-//       ...checkboxGroupSchemaWithReviewLabels([
-//         'alcoholRecords',
-//         'drugAbuseRecords',
-//         'HIVRecords',
-//         'sickleCellRecords',
-//       ]),
-//     },
-//   },
-// };
+  authorizeMedicalSelectCheckbox: checkboxGroupUI({
+    title: 'Select the types of records they can access',
+    required: true,
+    labelHeaderLevel: '',
+    tile: false,
+    uswds: true,
+    labels: {
+      alcoholRecords: 'Alcoholism and alcohol abuse records',
+      drugAbuseRecords: 'Drug abuse records',
+      HIVRecords: 'HIV (human immunodeficiency virus) records',
+      sickleCellRecords: 'Sickle cell anemia records',
+    },
+    errorMessages: {
+      required: 'Please select at least one option',
+    },
+  }),
+  'view:authorizationNote4': {
+    'ui:description': authorizationNote,
+  },
+};
+
+export const schema = {
+  type: 'object',
+  required: ['authorizeMedicalSelectCheckbox'],
+  properties: {
+    'view:authorizeRecordsSelect': {
+      type: 'object',
+      properties: {},
+    },
+    authorizeMedicalSelectCheckbox: checkboxGroupSchema(
+      Object.keys({
+        alcoholRecords: 'Alcoholism and alcohol abuse records',
+        drugAbuseRecords: 'Drug abuse records',
+        HIVRecords: 'HIV (human immunodeficiency virus) records',
+        sickleCellRecords: 'Sickle cell anemia records',
+      }),
+    ),
+  },
+};
diff --git a/src/applications/representative-appoint/routes.jsx b/src/applications/representative-appoint/routes.jsx
@@ -5,9 +5,23 @@ import App from './containers/App';
 const route = {
   path: '/',
   component: App,
-  indexRoute: { onEnter: (_nextState, replace) => replace('/introduction') },
+  indexRoute: {
+    onEnter: (nextState, replace) => {
+      const { location } = nextState;
 
-  childRoutes: [...createRoutesWithSaveInProgress(formConfig)],
+      if (
+        location.pathname === '/introduction' &&
+        location.query.next === 'loginModal' &&
+        location.query.postLogin === 'true'
+      ) {
+        replace('/');
+      } else {
+        replace('/introduction');
+      }
+    },
+  },
+
+  childRoutes: createRoutesWithSaveInProgress(formConfig),
 };
 
 export default route;
diff --git a/src/applications/representative-appoint/utilities/helpers.js b/src/applications/representative-appoint/utilities/helpers.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import { checkboxGroupSchema } from 'platform/forms-system/src/js/web-component-patterns';
 import environment from '@department-of-veterans-affairs/platform-utilities/environment';
 import { createInitialState } from '@department-of-veterans-affairs/platform-forms-system/state/helpers';
 import moment from 'moment';
@@ -13,18 +12,6 @@ export const representativeTypeMap = {
   'Veterans Service Organization (VSO)': 'Veterans Service Organization (VSO)',
 };
 
-export const checkboxGroupSchemaWithReviewLabels = keys => {
-  const schema = checkboxGroupSchema(keys);
-  keys.forEach(key => {
-    schema.properties[key] = {
-      ...schema.properties[key],
-      enum: [true, false],
-      enumNames: ['Selected', 'Not selected'],
-    };
-  });
-  return schema;
-};
-
 export const deviewifyFields = formData => {
   const newFormData = {};
   Object.keys(formData).forEach(key => {