Merge branch 'master' into chore/add_unit_test_to_validate_token

Author: nss10

bmh_admin_portal_backend/poetry.lock

@@ -76,8 +76,9 @@ The react application expects certain environment variables to be present during
 * REACT_APP_HELP_EMAIL: help@brh.org
 * REACT_APP_ROOT_EMAIL_DOMAIN: brh.org
 * REACT_APP_DISPLAY_NAME: "STRIDES Portal"
-* REACT_APP_OCC_EMAIL_DOMAIN : occ-data.org
-* REACT_APP_OCC_HELPER_URL : API Gateway Endpoint deployed in backend for OCC
+* REACT_APP_OCC_EMAIL_DOMAIN: occ-data.org
+* REACT_APP_OCC_HELPER_URL: API Gateway Endpoint deployed in backend for OCC
+* REACT_APP_DISABLED_FORMS: Optional, an array of form names that to be hidden from the UI (e.g. `["stridesCredits", "directPay"]`)
 
 ### Build and deploy static files
 

bmh_admin_portal_ui/README_DEPLOYMENT.md

@@ -3,10 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@testing-library/jest-dom": "^5.11.9",
+    "@testing-library/jest-dom": "^6.4.5",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^12.8.1",
-    "axios": "^0.21.3",
+    "axios": "^1.6.4",
     "bootstrap": "^4.6.0",
     "husky": "^5.1.3",
     "jwt-decode": "^3.1.2",
@@ -66,5 +66,10 @@
   },
   "overrides": {
     "@svgr/webpack": "$@svgr/webpack"
+  },
+  "jest": {
+    "moduleNameMapper": {
+      "^axios$": "axios/dist/node/axios.cjs"
+    }
   }
 }

bmh_admin_portal_ui/package-lock.json

@@ -155,7 +155,7 @@ const DirectPayForm = (props) => {
         if(requestApproved === "true"){
           componentToRender = (
           <div>
-                <Form onSubmit={handleRequest} keyField='directpay_request_information'>
+                <Form onSubmit={handleRequest} id='directpay_request_information'>
                   <Form.Row className="mb-3">
                   <Col>
                   <Form.Check type="checkbox" name="approved_creditcard" onChange={handleChange} required label={
@@ -239,7 +239,7 @@ const DirectPayForm = (props) => {
 
         return(
             <div>
-              <Form onSubmit={handleSubmit} keyField='directpay_billingID_confirmation'>
+              <Form onSubmit={handleSubmit} id='directpay_billingID_confirmation'>
                       <Form.Label> BillingID <span data-tip data-for="billingID_help"><BiHelpCircle /></span></Form.Label>
                       <ReactTooltip class="tooltip" id="billingID_help" place="top" effect="solid" multiline={true}>
                         Enter the Billing ID provided from registration through the Payment Solutions Portal. <br />

bmh_admin_portal_ui/package.json

@@ -34,13 +34,15 @@ const getRenderedFormTypesList = (wrapperTag) => {
     return renderedFormTypes;
 }
 
-const mountRequestWorkspceWrapper = (isCreditsAuthorized = false) => {
+const mountRequestWorkspaceWrapper = (isCreditsAuthorized = false) => {
     jest.spyOn(authUtils, 'authorizeCredits').mockResolvedValue(isCreditsAuthorized);
     return mount( <RequestWorkspace/> );
 }
 
+beforeEach(() => process.env.REACT_APP_DISABLED_FORMS = '[]');
+
 it('renders RequestWorkspace page with default form', async () => {
-    const requestWorkspaceWrapper = mountRequestWorkspceWrapper(false);
+    const requestWorkspaceWrapper = mountRequestWorkspaceWrapper(false);
     requestWorkspaceWrapper.update();
     expect(requestWorkspaceWrapper.find('h2').text()).toBe("Workspace Account Request Form");
     expect(requestWorkspaceWrapper.find(FORM_TAGS[DEFAULT_FORM_TYPE])).toHaveLength(1);
@@ -49,7 +51,7 @@ it('renders RequestWorkspace page with default form', async () => {
 describe('verify the form toggles are working as expected', () => {
 
     it('verifies the number of toggle buttons rendered correctly for all form types', async () => {
-        const requestWorkspaceWrapper = mountRequestWorkspceWrapper(true);
+        const requestWorkspaceWrapper = mountRequestWorkspaceWrapper(true);
 
         await waitFor(() => {});
 
@@ -66,7 +68,7 @@ describe('verify the form toggles are working as expected', () => {
 
 
     it('verifies RequestWorkspace toggles between forms', async () => {
-        const requestWorkspaceWrapper = mountRequestWorkspceWrapper(true);
+        const requestWorkspaceWrapper = mountRequestWorkspaceWrapper(true);
 
         //Ensure default form is being loaded at first
         expect(getRenderedFormTypesList(requestWorkspaceWrapper)).toEqual([DEFAULT_FORM_TYPE]);
@@ -87,3 +89,12 @@ describe('verify the form toggles are working as expected', () => {
     });
 
 });
+
+it('verifies RequestWorkspace forms can be hidden by config', async () => {
+    process.env.REACT_APP_DISABLED_FORMS = '["directPay"]';
+    const requestWorkspaceWrapper = mountRequestWorkspaceWrapper(true);
+
+    for (const disabledForm in process.env.REACT_APP_DISABLED_FOR) {
+        expect(requestWorkspaceWrapper.find(disabledForm)).not.toExist();
+    }
+});

bmh_admin_portal_ui/src/components/request-workspace/direct-pay-form.js

@@ -38,10 +38,24 @@ const RequestWorkspace = () => {
   // const [grantsAuthorized, setGrantsAuthorized] = useState(false)
 
   useEffect(() => {
+    if (process.env.REACT_APP_DISABLED_FORMS) {
+      try {
+        const disabledForms = JSON.parse(process.env.REACT_APP_DISABLED_FORMS);
+        if (disabledForms && Array.isArray(disabledForms)) {
+          disabledForms.forEach((formName) => {
+            if (formName in FORM_OPTIONS) {
+              delete FORM_OPTIONS[formName]
+            }
+          })
+        }
+      } catch (err) {
+        console.error(`Unable to parse disabled forms config: ${err}`);
+      }
+    }
     async function fetchAuthorized() {
       const cAuthorized = await authorizeCredits();
       // const gAuthorized = await authorizeGrants();
-      if (cAuthorized) {
+      if (cAuthorized && FORM_OPTIONS.stridesCredits) {
         setFormToggle(FORM_OPTIONS.stridesCredits)
       }
       setCreditsAuthorized(cAuthorized);
@@ -103,9 +117,9 @@ const RequestWorkspace = () => {
           <div>
             <Row className="mb-5">
               <ToggleButtonGroup key={formToggle} type="radio" name="form-select" defaultValue={formToggle} onChange={handleChange}>
-                <ToggleButton variant="outline-primary" value={FORM_OPTIONS.stridesGrant}>STRIDES Grant/Award Funded</ToggleButton>
-                {(creditsAuthorized) ? <ToggleButton variant="outline-primary" value={FORM_OPTIONS.stridesCredits}>STRIDES Credits</ToggleButton> : null}
-                <ToggleButton variant="outline-success" value={FORM_OPTIONS.directPay}>OCC Direct Pay</ToggleButton>
+                {(FORM_OPTIONS.stridesGrant) ? <ToggleButton variant="outline-primary" value={FORM_OPTIONS.stridesGrant}>STRIDES Grant/Award Funded</ToggleButton> : null}
+                {(creditsAuthorized && FORM_OPTIONS.stridesCredits) ? <ToggleButton variant="outline-primary" value={FORM_OPTIONS.stridesCredits}>STRIDES Credits</ToggleButton> : null}
+                {(FORM_OPTIONS.directPay) ? <ToggleButton variant="outline-success" value={FORM_OPTIONS.directPay}>OCC Direct Pay</ToggleButton> : null}
               </ToggleButtonGroup>
             </Row>
           </div>