Skip to content

Commit 4daf358

Browse files
authored
Merge pull request #5677 from raft-tech/chore/rename-permission-guard
Rename `PermissionGuard` to `AccessGuard`
2 parents 1bc73c7 + 7e241d2 commit 4daf358

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

tdrs-frontend/src/components/PermissionGuard/PermissionGuard.jsx renamed to tdrs-frontend/src/components/AccessGuard/AccessGuard.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const isAllowed = (
4646
return true
4747
}
4848

49-
const PermissionGuard = ({
49+
const AccessGuard = ({
5050
children,
5151
requiresApproval = false,
5252
requiredPermissions = [],
@@ -68,4 +68,4 @@ const PermissionGuard = ({
6868
: notAllowedComponent
6969
}
7070

71-
export default PermissionGuard
71+
export default AccessGuard

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { Provider } from 'react-redux'
55
import configureStore from 'redux-mock-store'
66
import { render, screen } from '@testing-library/react'
77

8-
import PermissionGuard from '.'
8+
import AccessGuard from '.'
99

10-
describe('PermissionGuard.js', () => {
10+
describe('AccessGuard.js', () => {
1111
const mockStore = configureStore([thunk])
1212

1313
const setup = (
@@ -18,14 +18,14 @@ describe('PermissionGuard.js', () => {
1818
) =>
1919
render(
2020
<Provider store={mockStore(initialState)}>
21-
<PermissionGuard
21+
<AccessGuard
2222
requiresApproval={requiresApproval}
2323
requiredPermissions={requiredPermissions}
2424
requiredFeatureFlags={requiredFeatureFlags}
2525
notAllowedComponent={<p>not allowed</p>}
2626
>
2727
<p>hello, world</p>
28-
</PermissionGuard>
28+
</AccessGuard>
2929
</Provider>
3030
)
3131

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import AccessGuard from './AccessGuard'
2+
3+
export default AccessGuard

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
} from '../../selectors/auth'
1515

1616
import NavItem from '../NavItem/NavItem'
17-
import PermissionGuard from '../PermissionGuard'
17+
import AccessGuard from '../AccessGuard'
1818

1919
/**
2020
* This component is rendered on every page and contains the navigation bar.
@@ -120,7 +120,7 @@ function Header() {
120120
{authenticated && (
121121
<>
122122
<NavItem pathname={pathname} tabTitle="Home" href="/home" />
123-
<PermissionGuard
123+
<AccessGuard
124124
requiresApproval
125125
requiredPermissions={['view_datafile', 'add_datafile']}
126126
>
@@ -129,8 +129,8 @@ function Header() {
129129
tabTitle="TANF Data Files"
130130
href="/data-files"
131131
/>
132-
</PermissionGuard>
133-
<PermissionGuard
132+
</AccessGuard>
133+
<AccessGuard
134134
requiresApproval
135135
requiredPermissions={[
136136
'view_datafile',
@@ -143,7 +143,7 @@ function Header() {
143143
tabTitle="FRA Data Files"
144144
href="/fra-data-files"
145145
/>
146-
</PermissionGuard>
146+
</AccessGuard>
147147
{(userAccessRequestPending || userAccessRequestApproved) && (
148148
<NavItem
149149
pathname={pathname}

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

Lines changed: 0 additions & 3 deletions
This file was deleted.

tdrs-frontend/src/components/PrivateRoute/PrivateRoute.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { setAlert, clearAlert } from '../../actions/alert'
55
import { ALERT_INFO } from '../Alert'
66
import PrivateTemplate from '../PrivateTemplate'
77
import IdleTimer from '../IdleTimer/IdleTimer'
8-
import PermissionGuard from '../PermissionGuard'
8+
import AccessGuard from '../AccessGuard'
99

1010
/**
1111
* @param {React.ReactNode} children - One or more React components to be
@@ -44,7 +44,7 @@ function PrivateRoute({
4444

4545
if (authenticated) {
4646
return (
47-
<PermissionGuard
47+
<AccessGuard
4848
requiresApproval={requiresApproval}
4949
requiredPermissions={requiredPermissions}
5050
requiredFeatureFlags={requiredFeatureFlags}
@@ -54,7 +54,7 @@ function PrivateRoute({
5454
{children}
5555
<IdleTimer />
5656
</PrivateTemplate>
57-
</PermissionGuard>
57+
</AccessGuard>
5858
)
5959
}
6060

0 commit comments

Comments
 (0)