Merge branch 'develop' into chore/cypress-yarn-failures

Author: jtimpe

…ents/PermissionGuard/PermissionGuard.jsx …c/components/AccessGuard/AccessGuard.jsxtdrs-frontend/src/components/PermissionGuard/PermissionGuard.jsx renamed to tdrs-frontend/src/components/AccessGuard/AccessGuard.jsx tdrs-frontend/src/components/PermissionGuard/PermissionGuard.jsx renamed to tdrs-frontend/src/components/AccessGuard/AccessGuard.jsx

@@ -46,7 +46,7 @@ const isAllowed = (
   return true
 }
 
-const PermissionGuard = ({
+const AccessGuard = ({
   children,
   requiresApproval = false,
   requiredPermissions = [],
@@ -68,4 +68,4 @@ const PermissionGuard = ({
     : notAllowedComponent
 }
 
-export default PermissionGuard
+export default AccessGuard

…/PermissionGuard/PermissionGuard.test.js …mponents/AccessGuard/AccessGuard.test.jstdrs-frontend/src/components/PermissionGuard/PermissionGuard.test.js renamed to tdrs-frontend/src/components/AccessGuard/AccessGuard.test.js tdrs-frontend/src/components/PermissionGuard/PermissionGuard.test.js renamed to tdrs-frontend/src/components/AccessGuard/AccessGuard.test.js

@@ -5,9 +5,9 @@ import { Provider } from 'react-redux'
 import configureStore from 'redux-mock-store'
 import { render, screen } from '@testing-library/react'
 
-import PermissionGuard from '.'
+import AccessGuard from '.'
 
-describe('PermissionGuard.js', () => {
+describe('AccessGuard.js', () => {
   const mockStore = configureStore([thunk])
 
   const setup = (
@@ -18,14 +18,14 @@ describe('PermissionGuard.js', () => {
   ) =>
     render(
       <Provider store={mockStore(initialState)}>
-        <PermissionGuard
+        <AccessGuard
           requiresApproval={requiresApproval}
           requiredPermissions={requiredPermissions}
           requiredFeatureFlags={requiredFeatureFlags}
           notAllowedComponent={<p>not allowed</p>}
         >
           <p>hello, world</p>
-        </PermissionGuard>
+        </AccessGuard>
       </Provider>
     )
 

tdrs-frontend/src/components/AccessGuard/index.js

@@ -0,0 +1,3 @@
+import AccessGuard from './AccessGuard'
+
+export default AccessGuard

tdrs-frontend/src/components/Header/Header.jsx

@@ -14,7 +14,7 @@ import {
 } from '../../selectors/auth'
 
 import NavItem from '../NavItem/NavItem'
-import PermissionGuard from '../PermissionGuard'
+import AccessGuard from '../AccessGuard'
 
 /**
  * This component is rendered on every page and contains the navigation bar.
@@ -120,7 +120,7 @@ function Header() {
               {authenticated && (
                 <>
                   <NavItem pathname={pathname} tabTitle="Home" href="/home" />
-                  <PermissionGuard
+                  <AccessGuard
                     requiresApproval
                     requiredPermissions={['view_datafile', 'add_datafile']}
                   >
@@ -129,8 +129,8 @@ function Header() {
                       tabTitle="TANF Data Files"
                       href="/data-files"
                     />
-                  </PermissionGuard>
-                  <PermissionGuard
+                  </AccessGuard>
+                  <AccessGuard
                     requiresApproval
                     requiredPermissions={[
                       'view_datafile',
@@ -143,7 +143,7 @@ function Header() {
                       tabTitle="FRA Data Files"
                       href="/fra-data-files"
                     />
-                  </PermissionGuard>
+                  </AccessGuard>
                   {(userAccessRequestPending || userAccessRequestApproved) && (
                     <NavItem
                       pathname={pathname}

tdrs-frontend/src/components/PermissionGuard/index.js

@@ -5,7 +5,7 @@ import { setAlert, clearAlert } from '../../actions/alert'
 import { ALERT_INFO } from '../Alert'
 import PrivateTemplate from '../PrivateTemplate'
 import IdleTimer from '../IdleTimer/IdleTimer'
-import PermissionGuard from '../PermissionGuard'
+import AccessGuard from '../AccessGuard'
 
 /**
  * @param {React.ReactNode} children - One or more React components to be
@@ -44,7 +44,7 @@ function PrivateRoute({
 
   if (authenticated) {
     return (
-      <PermissionGuard
+      <AccessGuard
         requiresApproval={requiresApproval}
         requiredPermissions={requiredPermissions}
         requiredFeatureFlags={requiredFeatureFlags}
@@ -54,7 +54,7 @@ function PrivateRoute({
           {children}
           <IdleTimer />
         </PrivateTemplate>
-      </PermissionGuard>
+      </AccessGuard>
     )
   }