From 79933e9ed32bbfb5e07b22c7692a4bbb3073d459 Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Mon, 11 Jul 2022 15:36:51 -0400
Subject: [PATCH 01/26] Add SiteMap component

---
 .../src/components/SiteMap/SiteMap.jsx        | 30 +++++++++++++++++++
 tdrs-frontend/src/components/SiteMap/index.js |  3 ++
 2 files changed, 33 insertions(+)
 create mode 100644 tdrs-frontend/src/components/SiteMap/SiteMap.jsx
 create mode 100644 tdrs-frontend/src/components/SiteMap/index.js

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
new file mode 100644
index 0000000000..b390a69a50
--- /dev/null
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
@@ -0,0 +1,30 @@
+import React, { useRef, useState } from 'react'
+
+const SiteMap = () => (
+  <div className="margin-top-5">
+    <SiteMap.Link text="Home" link="/home" />
+    <SiteMap.Link
+      text="Privacy Policy"
+      link="https://www.acf.hhs.gov/privacy-policy"
+    />
+    <SiteMap.Link text="Data Files" link="/data-files" />
+    <SiteMap.Link text="Profile" link="/profile" />
+    <SiteMap.Link
+      text="Home"
+      link={`${process.env.REACT_APP_BACKEND_HOST}/admin/`}
+    />
+  </div>
+)
+
+SiteMap.Link = ({ text, link }) => (
+  <a
+    className="usa-footer__primary-link"
+    href={link}
+    target="_blank"
+    rel="noreferrer"
+  >
+    {text}
+  </a>
+)
+
+export default SiteMap
diff --git a/tdrs-frontend/src/components/SiteMap/index.js b/tdrs-frontend/src/components/SiteMap/index.js
new file mode 100644
index 0000000000..2b43dc5ab1
--- /dev/null
+++ b/tdrs-frontend/src/components/SiteMap/index.js
@@ -0,0 +1,3 @@
+import SiteMap from './SiteMap'
+
+export default SiteMap

From 3ff3db727a4bcc867392b99da6205fab84687258 Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Mon, 11 Jul 2022 15:37:06 -0400
Subject: [PATCH 02/26] Add sitemap route

---
 tdrs-frontend/src/components/Routes/Routes.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tdrs-frontend/src/components/Routes/Routes.js b/tdrs-frontend/src/components/Routes/Routes.js
index e2743f33ba..6b75436900 100644
--- a/tdrs-frontend/src/components/Routes/Routes.js
+++ b/tdrs-frontend/src/components/Routes/Routes.js
@@ -6,6 +6,9 @@ import Profile from '../Profile'
 import PrivateRoute from '../PrivateRoute'
 import LoginCallback from '../LoginCallback'
 import Reports from '../Reports'
+
+import SiteMap from '../SiteMap'
+
 import Home from '../Home'
 import { useSelector } from 'react-redux'
 
@@ -47,6 +50,16 @@ const AppRoutes = () => {
           </PrivateRoute>
         }
       />
+
+      <Route
+        exact
+        path="/site-map"
+        element={
+          <PrivateRoute title="Site Map">
+            <SiteMap />
+          </PrivateRoute>
+        }
+      />
       <Route
         exact
         path="/profile"

From 63411da3b620a56d956e51e711b4fba564fc54fc Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Mon, 11 Jul 2022 15:37:20 -0400
Subject: [PATCH 03/26] Add link to site map from footer

---
 tdrs-frontend/src/components/Footer/Footer.jsx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tdrs-frontend/src/components/Footer/Footer.jsx b/tdrs-frontend/src/components/Footer/Footer.jsx
index 6b148cc87d..173a82158e 100644
--- a/tdrs-frontend/src/components/Footer/Footer.jsx
+++ b/tdrs-frontend/src/components/Footer/Footer.jsx
@@ -20,6 +20,16 @@ function Footer() {
                     Privacy policy
                   </a>
                 </li>
+                <li className="mobile-lg:grid-col-6 desktop:grid-col-auto usa-footer__primary-content">
+                  <a
+                    className="usa-footer__primary-link"
+                    href="/site-map"
+                    target="_blank"
+                    rel="noreferrer"
+                  >
+                    Site Map
+                  </a>
+                </li>
               </ul>
             </nav>
           </div>

From 58309ec8928c7eaf97a2c83a477f106223c20c24 Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Tue, 12 Jul 2022 10:39:28 -0400
Subject: [PATCH 04/26] Don't show site map to non authenticated users

---
 .../src/components/Footer/Footer.jsx          | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/tdrs-frontend/src/components/Footer/Footer.jsx b/tdrs-frontend/src/components/Footer/Footer.jsx
index 173a82158e..dfb618bc92 100644
--- a/tdrs-frontend/src/components/Footer/Footer.jsx
+++ b/tdrs-frontend/src/components/Footer/Footer.jsx
@@ -1,8 +1,10 @@
 import React from 'react'
+import { useSelector } from 'react-redux'
 
 import ACFLogo from '../../assets/ACFLogo.svg'
 
 function Footer() {
+  const authenticated = useSelector((state) => state.auth.authenticated)
   return (
     <footer className="usa-footer usa-footer--slim">
       <div className="usa-footer__primary-section">
@@ -20,16 +22,18 @@ function Footer() {
                     Privacy policy
                   </a>
                 </li>
-                <li className="mobile-lg:grid-col-6 desktop:grid-col-auto usa-footer__primary-content">
-                  <a
-                    className="usa-footer__primary-link"
-                    href="/site-map"
-                    target="_blank"
-                    rel="noreferrer"
-                  >
-                    Site Map
-                  </a>
-                </li>
+                {authenticated ? (
+                  <li className="mobile-lg:grid-col-6 desktop:grid-col-auto usa-footer__primary-content">
+                    <a
+                      className="usa-footer__primary-link"
+                      href="/site-map"
+                      target="_blank"
+                      rel="noreferrer"
+                    >
+                      Site Map
+                    </a>
+                  </li>
+                ) : null}
               </ul>
             </nav>
           </div>

From 84871ebb1c60e68e46813a92ee4c9b5fac9ce0db Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Tue, 12 Jul 2022 10:49:28 -0400
Subject: [PATCH 05/26] Added tests and fixed admin link text

---
 .../src/components/SiteMap/SiteMap.jsx        |  2 +-
 .../src/components/SiteMap/SiteMap.test.js    | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 tdrs-frontend/src/components/SiteMap/SiteMap.test.js

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
index b390a69a50..88d4400ef7 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
@@ -10,7 +10,7 @@ const SiteMap = () => (
     <SiteMap.Link text="Data Files" link="/data-files" />
     <SiteMap.Link text="Profile" link="/profile" />
     <SiteMap.Link
-      text="Home"
+      text="Admin"
       link={`${process.env.REACT_APP_BACKEND_HOST}/admin/`}
     />
   </div>
diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
new file mode 100644
index 0000000000..316d510782
--- /dev/null
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
@@ -0,0 +1,22 @@
+
+import React from 'react'
+import { render } from '@testing-library/react'
+
+import SiteMap from './SiteMap'
+
+describe('SiteMap', () => {
+
+  const locations = [
+    "Home",
+    "Privacy Policy",
+    "Data Files",
+    "Profile",
+    "Admin",
+  ]
+  for(let location of locations) {
+    it(`renders the $(location) link`, () => {
+      const { getByText } = render(<SiteMap />)
+      expect(getByText(location)).toBeInTheDocument()
+    })
+  }
+})

From ea9b8b0b2e4d303e9986421d64aa209adfb938aa Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Tue, 12 Jul 2022 11:12:09 -0400
Subject: [PATCH 06/26] lint tests

---
 tdrs-frontend/src/components/SiteMap/SiteMap.test.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
index 316d510782..f939be4756 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
@@ -1,19 +1,11 @@
-
 import React from 'react'
 import { render } from '@testing-library/react'
 
 import SiteMap from './SiteMap'
 
 describe('SiteMap', () => {
-
-  const locations = [
-    "Home",
-    "Privacy Policy",
-    "Data Files",
-    "Profile",
-    "Admin",
-  ]
-  for(let location of locations) {
+  const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile', 'Admin']
+  for (let location of locations) {
     it(`renders the $(location) link`, () => {
       const { getByText } = render(<SiteMap />)
       expect(getByText(location)).toBeInTheDocument()

From c54570213693f6142fdebf26cc4b3cf93cdd411c Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Tue, 12 Jul 2022 11:24:59 -0400
Subject: [PATCH 07/26] Add noopener

---
 tdrs-frontend/src/components/SiteMap/SiteMap.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
index 88d4400ef7..e96ecb7b4e 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
@@ -21,7 +21,7 @@ SiteMap.Link = ({ text, link }) => (
     className="usa-footer__primary-link"
     href={link}
     target="_blank"
-    rel="noreferrer"
+    rel="noopener noreferrer"
   >
     {text}
   </a>

From 50ea005dc085401cbbf13d0516c0143622c645bf Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Tue, 12 Jul 2022 14:02:07 -0400
Subject: [PATCH 08/26] update admin element for authorized users only

---
 .../src/components/SiteMap/SiteMap.jsx        | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
index e96ecb7b4e..b03ca87ee8 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
@@ -1,6 +1,17 @@
 import React, { useRef, useState } from 'react'
+import { useSelector } from 'react-redux'
 
-const SiteMap = () => (
+
+const isMemberOfOne = (user, ...groupNames) =>
+      !!user?.roles?.some((role) => groupNames.includes(role.name))
+
+const userAccessRequestApproved = (user) => !!(!user?.['access_request']) && user.roles.length > 0
+
+const canViewAdmin = (user) =>
+      userAccessRequestApproved(user) &&
+      isMemberOfOne(user,'Developer', 'OFA System Admin', 'ACF OCIO')
+
+const SiteMap = ({ user }) => (
   <div className="margin-top-5">
     <SiteMap.Link text="Home" link="/home" />
     <SiteMap.Link
@@ -9,10 +20,13 @@ const SiteMap = () => (
     />
     <SiteMap.Link text="Data Files" link="/data-files" />
     <SiteMap.Link text="Profile" link="/profile" />
-    <SiteMap.Link
-      text="Admin"
-      link={`${process.env.REACT_APP_BACKEND_HOST}/admin/`}
-    />
+
+    {canViewAdmin(user) && (
+      <SiteMap.Link
+        text="Admin"
+        link={`${process.env.REACT_APP_BACKEND_HOST}/admin/`}
+      />
+    )}
   </div>
 )
 

From a78eede0ead1496579f2f23aa3ca8130cb9a8959 Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Tue, 12 Jul 2022 14:02:49 -0400
Subject: [PATCH 09/26] threading the needle

---
 tdrs-frontend/src/components/Routes/Routes.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tdrs-frontend/src/components/Routes/Routes.js b/tdrs-frontend/src/components/Routes/Routes.js
index 6b75436900..04e87c7631 100644
--- a/tdrs-frontend/src/components/Routes/Routes.js
+++ b/tdrs-frontend/src/components/Routes/Routes.js
@@ -12,15 +12,18 @@ import SiteMap from '../SiteMap'
 import Home from '../Home'
 import { useSelector } from 'react-redux'
 
+const isMemberOfOne = (user, ...groupNames) =>
+      !!user?.roles?.some((role) => groupNames.includes(role.name))
+
 /**
  * This component renders the routes for the app.
  * Routes have the 'exact' prop, so the order of routes
  * does not matter.
  */
-const AppRoutes = () => {
-  const user = useSelector((state) => state.auth.user)
+const AppRoutes = ({ user }) => {
   const role = user?.roles
   const hasRole = Boolean(role?.length > 0)
+
   const userAccessRequestApproved = Boolean(user?.['access_request'])
 
   const homeTitle =
@@ -56,7 +59,7 @@ const AppRoutes = () => {
         path="/site-map"
         element={
           <PrivateRoute title="Site Map">
-            <SiteMap />
+            <SiteMap user={user}/>
           </PrivateRoute>
         }
       />

From c24df751b950acf397ac85274e092d7a226a019c Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Tue, 12 Jul 2022 14:03:04 -0400
Subject: [PATCH 10/26] Update test to include initial state

---
 tdrs-frontend/src/components/SiteMap/SiteMap.test.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
index f939be4756..487c4fbb65 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
@@ -4,6 +4,10 @@ import { render } from '@testing-library/react'
 import SiteMap from './SiteMap'
 
 describe('SiteMap', () => {
+
+  const initialState = {
+    auth: { authenticated: false, inactive: false },
+  }
   const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile', 'Admin']
   for (let location of locations) {
     it(`renders the $(location) link`, () => {

From 04a05e242e16c411b7a9845ab5cf99e0bcaee389 Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Thu, 14 Jul 2022 14:25:42 -0400
Subject: [PATCH 11/26] lint

---
 tdrs-frontend/src/components/Routes/Routes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tdrs-frontend/src/components/Routes/Routes.js b/tdrs-frontend/src/components/Routes/Routes.js
index 04e87c7631..bd94439ffe 100644
--- a/tdrs-frontend/src/components/Routes/Routes.js
+++ b/tdrs-frontend/src/components/Routes/Routes.js
@@ -13,7 +13,7 @@ import Home from '../Home'
 import { useSelector } from 'react-redux'
 
 const isMemberOfOne = (user, ...groupNames) =>
-      !!user?.roles?.some((role) => groupNames.includes(role.name))
+  !!user?.roles?.some((role) => groupNames.includes(role.name))
 
 /**
  * This component renders the routes for the app.
@@ -59,7 +59,7 @@ const AppRoutes = ({ user }) => {
         path="/site-map"
         element={
           <PrivateRoute title="Site Map">
-            <SiteMap user={user}/>
+            <SiteMap user={user} />
           </PrivateRoute>
         }
       />

From 77feb194fd6274c5000aaaa1448017335fb9d1ca Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Thu, 14 Jul 2022 14:26:18 -0400
Subject: [PATCH 12/26] Lint and permission function

---
 .../src/components/SiteMap/SiteMap.jsx        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
index b03ca87ee8..4a6af89e54 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
@@ -1,15 +1,24 @@
 import React, { useRef, useState } from 'react'
 import { useSelector } from 'react-redux'
 
-
+// I copied these from Header.jsx and slightly refactored them to accept a user as their first arguement
+// I am wanting to shift these, and similar reused pieces of code at the top of component functions
+// up the tree to be passed in from the router.
 const isMemberOfOne = (user, ...groupNames) =>
-      !!user?.roles?.some((role) => groupNames.includes(role.name))
+  !!user?.roles?.some((role) => groupNames.includes(role.name))
 
-const userAccessRequestApproved = (user) => !!(!user?.['access_request']) && user.roles.length > 0
+const userAccessRequestApproved = (user) =>
+  !user?.['access_request'] && user?.roles?.length > 0
 
 const canViewAdmin = (user) =>
-      userAccessRequestApproved(user) &&
-      isMemberOfOne(user,'Developer', 'OFA System Admin', 'ACF OCIO')
+  userAccessRequestApproved(user) &&
+  isMemberOfOne(user, 'Developer', 'OFA System Admin', 'ACF OCIO')
+
+
+const hasPermission = (permissionName) =>
+      user?.roles?.[0]?.permissions?.some(
+        (perm) => perm.codename === permissionName
+      )
 
 const SiteMap = ({ user }) => (
   <div className="margin-top-5">

From 06d2cab8804a55ee6d641fe24f35fc41d225ba30 Mon Sep 17 00:00:00 2001
From: Aaron Beavers <foamy125@gmail.com>
Date: Thu, 14 Jul 2022 14:26:22 -0400
Subject: [PATCH 13/26] Update tests

---
 .../src/components/Footer/Footer.test.js      | 71 ++++++++++++++++++-
 .../src/components/SiteMap/SiteMap.test.js    | 55 +++++++++++---
 2 files changed, 113 insertions(+), 13 deletions(-)

diff --git a/tdrs-frontend/src/components/Footer/Footer.test.js b/tdrs-frontend/src/components/Footer/Footer.test.js
index 3e7695b698..2d5532e6ad 100644
--- a/tdrs-frontend/src/components/Footer/Footer.test.js
+++ b/tdrs-frontend/src/components/Footer/Footer.test.js
@@ -1,16 +1,81 @@
 import React from 'react'
 import { render } from '@testing-library/react'
+import configureStore from 'redux-mock-store'
+import thunk from 'redux-thunk'
+import { Provider } from 'react-redux'
 
 import Footer from './Footer'
+import { permissions } from '../Header/developer_permissions'
 
 describe('Footer', () => {
+
+  const unauthenticatedInitialState = {
+    router: { location: { pathname: '/profile' } },
+    auth: {
+      authenticated: false,
+    },
+  }
+  const adminInitialState = {
+    router: { location: { pathname: '/profile' } },
+    auth: {
+      authenticated: true,
+      roles: [{ id: 1, name: 'Developer', permissions }],
+    },
+  }
+
+  const basicAuthenticatedInitialState = {
+    router: { location: { pathname: '/profile' } },
+    auth: {authenticated: true},
+  }
+  const mockStore = configureStore([thunk])
   it('renders the children & families logo', () => {
-    const { container } = render(<Footer />)
+    const store = mockStore(unauthenticatedInitialState)
+    const { container } = render(
+      <Provider store={store}>
+        <Footer />
+      </Provider>
+    )
     expect(container.querySelector('img')).toBeInTheDocument()
   })
 
-  it('renders the privacy policy link', () => {
-    const { getByText } = render(<Footer />)
+  it('renders the privacy policy link as an unauthenticated user', () => {
+    const store = mockStore(unauthenticatedInitialState)
+    const { getByText } = render(
+      <Provider store={store}>
+        <Footer />
+      </Provider>
+    )
+    expect(getByText('Privacy policy')).toBeInTheDocument()
+  })
+
+  it('renders the privacy policy link as an authenticated user', () => {
+    const store = mockStore(basicAuthenticatedInitialState)
+    const { getByText } = render(
+      <Provider store={store}>
+        <Footer />
+      </Provider>
+    )
     expect(getByText('Privacy policy')).toBeInTheDocument()
   })
+
+  it('renders the site map link if a user is authenticated', () => {
+    const store = mockStore(basicAuthenticatedInitialState)
+    const { getByText } = render(
+      <Provider store={store}>
+        <Footer />
+      </Provider>
+    )
+    expect(getByText('Site Map')).toBeInTheDocument()
+  })
+
+  it('does not render the sitemap link if a user is not authenticated', () => {
+    const store = mockStore(unauthenticatedInitialState)
+    const { queryByText} = render(
+      <Provider store={store}>
+        <Footer />
+      </Provider>
+    )
+    expect(queryByText('Site Map')).not.toBeInTheDocument()
+  })
+
 })
diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
index 487c4fbb65..74ccb92a8b 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
@@ -5,14 +5,49 @@ import SiteMap from './SiteMap'
 
 describe('SiteMap', () => {
 
-  const initialState = {
-    auth: { authenticated: false, inactive: false },
-  }
-  const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile', 'Admin']
-  for (let location of locations) {
-    it(`renders the $(location) link`, () => {
-      const { getByText } = render(<SiteMap />)
-      expect(getByText(location)).toBeInTheDocument()
-    })
-  }
+  describe("When an non-admin user visits the sitemap",() =>{
+
+    const initialState = {
+      auth: { authenticated: false, inactive: false },
+      roles:[]
+    }
+    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile']
+    for (let location of locations) {
+      it(`renders the $(location) link`, () => {
+        const { getByText } = render(<SiteMap />)
+        expect(getByText(location)).toBeInTheDocument()
+      })
+    }
+
+  })
+  describe("When an admin user visits the sitemap",() => {
+
+    const initialState = {
+      auth: { authenticated: false, inactive: false },
+      roles:[{name:"Developer"}]
+    }
+    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile']
+    for (let location of locations) {
+      it(`renders the $(location) link`, () => {
+        const { getByText } = render(<SiteMap />)
+        expect(getByText(location)).toBeInTheDocument()
+      })
+    }
+  })
+
+  describe("When an unapproved user visits the sitemap",() => {
+
+    const initialState = {
+      auth: { authenticated: false, inactive: false },
+      roles:[{name:"Developer"}]
+    }
+    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile']
+    for (let location of locations) {
+      it(`renders the $(location) link`, () => {
+        const { getByText } = render(<SiteMap />)
+        expect(getByText(location)).toBeInTheDocument()
+      })
+    }
+  })
+
 })

From 27ab0314e900a4a08061d7e8e6860e8b39db5ea2 Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Mon, 25 Jul 2022 13:46:47 -0700
Subject: [PATCH 14/26] Starting on tests

---
 tdrs-frontend/src/components/Routes/Routes.js |   4 -
 .../src/components/SiteMap/SiteMap.jsx        |  12 +-
 .../src/components/SiteMap/SiteMap.test.js    | 128 ++++++++++++++----
 3 files changed, 108 insertions(+), 36 deletions(-)

diff --git a/tdrs-frontend/src/components/Routes/Routes.js b/tdrs-frontend/src/components/Routes/Routes.js
index bd94439ffe..93033c6777 100644
--- a/tdrs-frontend/src/components/Routes/Routes.js
+++ b/tdrs-frontend/src/components/Routes/Routes.js
@@ -10,10 +10,6 @@ import Reports from '../Reports'
 import SiteMap from '../SiteMap'
 
 import Home from '../Home'
-import { useSelector } from 'react-redux'
-
-const isMemberOfOne = (user, ...groupNames) =>
-  !!user?.roles?.some((role) => groupNames.includes(role.name))
 
 /**
  * This component renders the routes for the app.
diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
index 4a6af89e54..59a299bb2d 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
@@ -1,5 +1,4 @@
-import React, { useRef, useState } from 'react'
-import { useSelector } from 'react-redux'
+import React from 'react'
 
 // I copied these from Header.jsx and slightly refactored them to accept a user as their first arguement
 // I am wanting to shift these, and similar reused pieces of code at the top of component functions
@@ -14,11 +13,10 @@ const canViewAdmin = (user) =>
   userAccessRequestApproved(user) &&
   isMemberOfOne(user, 'Developer', 'OFA System Admin', 'ACF OCIO')
 
-
-const hasPermission = (permissionName) =>
-      user?.roles?.[0]?.permissions?.some(
-        (perm) => perm.codename === permissionName
-      )
+// const hasPermission = (permissionName) =>
+//   user?.roles?.[0]?.permissions?.some(
+//     (perm) => perm.codename === permissionName
+//   )
 
 const SiteMap = ({ user }) => (
   <div className="margin-top-5">
diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
index 74ccb92a8b..3b3ca60db9 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
@@ -1,53 +1,131 @@
 import React from 'react'
-import { render } from '@testing-library/react'
-
+import thunk from 'redux-thunk'
+import { Provider } from 'react-redux'
+import { mount } from 'enzyme'
+import { render, screen } from '@testing-library/react'
+import configureStore from 'redux-mock-store'
+import SplashPage from '../SplashPage'
 import SiteMap from './SiteMap'
+import { permissions } from '../Header/developer_permissions'
+import PrivateRoute from '../PrivateRoute'
+import { MemoryRouter, Route, Routes } from 'react-router-dom'
 
 describe('SiteMap', () => {
+  it('When a non authenticated user visits the splash page do not show sitemap', () => {
+    const initialState = {
+      auth: { authenticated: false, inactive: false },
+      roles: [],
+    }
+    const mockStore = configureStore([thunk])
+
+    const store = mockStore(initialState)
 
-  describe("When an non-admin user visits the sitemap",() =>{
+    const wrapper = mount(
+      <Provider store={store}>
+        <SplashPage />
+      </Provider>
+    )
 
+    const footer = wrapper.find('footer')
+    expect(footer).not.toIncludeText('Site Map')
+  })
+
+  it('When an authenticated developer visits the splash page show sitemap', () => {
     const initialState = {
-      auth: { authenticated: false, inactive: false },
-      roles:[]
+      router: { location: { pathname: '/home' } },
+      auth: {
+        user: {
+          email: 'test@test.com',
+          roles: [{ id: 1, name: 'Developer', permissions }],
+          access_request: true,
+        },
+        authenticated: true,
+      },
     }
-    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile']
-    for (let location of locations) {
-      it(`renders the $(location) link`, () => {
-        const { getByText } = render(<SiteMap />)
-        expect(getByText(location)).toBeInTheDocument()
-      })
+
+    const mockStore = configureStore([thunk])
+    const store = mockStore(initialState)
+
+    const wrapper = mount(
+      <Provider store={store}>
+        <SplashPage />
+      </Provider>
+    )
+
+    const footer = wrapper.find('footer')
+    expect(footer.find('.usa-footer')).toIncludeText('Site Map')
+  })
+
+  it('When an authenticated admin visits the splash page show sitemap', () => {
+    const initialState = {
+      router: { location: { pathname: '/home' } },
+      auth: {
+        user: {
+          email: 'test@test.com',
+          roles: [{ id: 1, name: 'Admin', permissions }],
+          access_request: true,
+        },
+        authenticated: true,
+      },
     }
 
+    const mockStore = configureStore([thunk])
+    const store = mockStore(initialState)
+
+    const wrapper = mount(
+      <Provider store={store}>
+        <MemoryRouter initialEntries={['/home', '/']}>
+          <Routes>
+            <Route
+              exact
+              path="/home"
+              element={
+                <PrivateRoute title="Welcome to TDP">
+                  <SplashPage />
+                </PrivateRoute>
+              }
+            />
+          </Routes>
+        </MemoryRouter>
+      </Provider>
+    )
+
+    const footer = wrapper.find('footer')
+    expect(footer.find('.usa-footer')).not.toIncludeText('Site Map')
   })
-  describe("When an admin user visits the sitemap",() => {
 
+  it('When an non-authenticated user visits the sitemap', () => {
     const initialState = {
       auth: { authenticated: false, inactive: false },
-      roles:[{name:"Developer"}]
+      roles: [],
     }
+    const mockStore = configureStore([thunk])
+    const store = mockStore(initialState)
+    const wrapper = mount(
+      <Provider store={store}>
+        <SplashPage />
+      </Provider>
+    )
+
     const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile']
+    const footer = wrapper.find('footer')
     for (let location of locations) {
-      it(`renders the $(location) link`, () => {
-        const { getByText } = render(<SiteMap />)
-        expect(getByText(location)).toBeInTheDocument()
-      })
+      expect(getByText(location)).toBeInTheDocument()
     }
   })
 
-  describe("When an unapproved user visits the sitemap",() => {
-
+  it('When an authenticated user visits the sitemap', () => {
     const initialState = {
       auth: { authenticated: false, inactive: false },
-      roles:[{name:"Developer"}]
+      roles: [],
     }
+    const mockStore = configureStore([thunk])
+    const store = mockStore(initialState)
+    const { getByText } = render(<SiteMap store={store} />)
+
     const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile']
     for (let location of locations) {
-      it(`renders the $(location) link`, () => {
-        const { getByText } = render(<SiteMap />)
-        expect(getByText(location)).toBeInTheDocument()
-      })
+      expect(getByText(location)).toBeInTheDocument()
     }
   })
-
 })

From 08633ff5e2f5ee33cd56cc3510ae226fa50b1fc2 Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Tue, 26 Jul 2022 08:41:19 -0700
Subject: [PATCH 15/26] working on tests

---
 .../src/components/SiteMap/SiteMap.test.js    | 132 +++++-------------
 1 file changed, 37 insertions(+), 95 deletions(-)

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
index 3b3ca60db9..08fe04e9f0 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
@@ -1,129 +1,71 @@
 import React from 'react'
 import thunk from 'redux-thunk'
-import { Provider } from 'react-redux'
-import { mount } from 'enzyme'
 import { render, screen } from '@testing-library/react'
 import configureStore from 'redux-mock-store'
-import SplashPage from '../SplashPage'
 import SiteMap from './SiteMap'
-import { permissions } from '../Header/developer_permissions'
-import PrivateRoute from '../PrivateRoute'
-import { MemoryRouter, Route, Routes } from 'react-router-dom'
+import { Provider } from 'react-redux'
 
 describe('SiteMap', () => {
-  it('When a non authenticated user visits the splash page do not show sitemap', () => {
-    const initialState = {
-      auth: { authenticated: false, inactive: false },
-      roles: [],
-    }
-    const mockStore = configureStore([thunk])
-
-    const store = mockStore(initialState)
-
-    const wrapper = mount(
-      <Provider store={store}>
-        <SplashPage />
-      </Provider>
-    )
 
-    const footer = wrapper.find('footer')
-    expect(footer).not.toIncludeText('Site Map')
-  })
+  const initialState = {
+    router: { location: { pathname: '/home' } },
+    auth: {
+      user: {
+        email: 'test@test.com',
+        roles: [{ id: 1, name: 'Developer', permissions: [] }],
+        access_request: true,
+      },
+      authenticated: true,
+    },
+  }
 
-  it('When an authenticated developer visits the splash page show sitemap', () => {
-    const initialState = {
-      router: { location: { pathname: '/home' } },
+  it('When an authenticated Developer visits the sitemap', () => {
+    const mockStore = configureStore([thunk])
+    const store = mockStore({
+      ...initialState,
       auth: {
+        authenticated: true,
         user: {
-          email: 'test@test.com',
-          roles: [{ id: 1, name: 'Developer', permissions }],
+          email: 'hi@bye.com',
+          roles: [{ id: 1, name: 'Developer', permission: [] }],
           access_request: true,
         },
-        authenticated: true,
       },
-    }
+    })
 
-    const mockStore = configureStore([thunk])
-    const store = mockStore(initialState)
-
-    const wrapper = mount(
+    const { getByText } = render(
       <Provider store={store}>
-        <SplashPage />
+        <SiteMap />
       </Provider>
     )
 
-    const footer = wrapper.find('footer')
-    expect(footer.find('.usa-footer')).toIncludeText('Site Map')
+    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile']
+    for (let location of locations) {
+      expect(getByText(location)).toBeInTheDocument()
+    }
   })
 
-  it('When an authenticated admin visits the splash page show sitemap', () => {
-    const initialState = {
-      router: { location: { pathname: '/home' } },
+  it('When an authenticated Admin visits the sitemap', () => {
+    const mockStore = configureStore([thunk])
+    const store = mockStore({
+      ...initialState,
       auth: {
+        authenticated: true,
         user: {
-          email: 'test@test.com',
-          roles: [{ id: 1, name: 'Admin', permissions }],
+          email: 'hi@bye.com',
+          roles: [{ id: 1, name: 'OFA System Admin', permission: [] }],
           access_request: true,
         },
-        authenticated: true,
       },
-    }
-
-    const mockStore = configureStore([thunk])
-    const store = mockStore(initialState)
+    })
 
-    const wrapper = mount(
-      <Provider store={store}>
-        <MemoryRouter initialEntries={['/home', '/']}>
-          <Routes>
-            <Route
-              exact
-              path="/home"
-              element={
-                <PrivateRoute title="Welcome to TDP">
-                  <SplashPage />
-                </PrivateRoute>
-              }
-            />
-          </Routes>
-        </MemoryRouter>
-      </Provider>
-    )
-
-    const footer = wrapper.find('footer')
-    expect(footer.find('.usa-footer')).not.toIncludeText('Site Map')
-  })
-
-  it('When an non-authenticated user visits the sitemap', () => {
-    const initialState = {
-      auth: { authenticated: false, inactive: false },
-      roles: [],
-    }
-    const mockStore = configureStore([thunk])
-    const store = mockStore(initialState)
-    const wrapper = mount(
+    const { getByText } = render(
       <Provider store={store}>
-        <SplashPage />
+        <SiteMap />
       </Provider>
     )
 
-    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile']
-    const footer = wrapper.find('footer')
-    for (let location of locations) {
-      expect(getByText(location)).toBeInTheDocument()
-    }
-  })
-
-  it('When an authenticated user visits the sitemap', () => {
-    const initialState = {
-      auth: { authenticated: false, inactive: false },
-      roles: [],
-    }
-    const mockStore = configureStore([thunk])
-    const store = mockStore(initialState)
-    const { getByText } = render(<SiteMap store={store} />)
-
-    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile']
+    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile', 'Admin']
     for (let location of locations) {
       expect(getByText(location)).toBeInTheDocument()
     }

From 05a4dd76cff47e8d760337fd504c5c6cd828c6ae Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Tue, 26 Jul 2022 09:11:13 -0700
Subject: [PATCH 16/26] linting

---
 tdrs-frontend/src/components/Footer/Footer.test.js   | 6 ++----
 tdrs-frontend/src/components/SiteMap/SiteMap.test.js | 9 +++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tdrs-frontend/src/components/Footer/Footer.test.js b/tdrs-frontend/src/components/Footer/Footer.test.js
index 2d5532e6ad..e5bdfda063 100644
--- a/tdrs-frontend/src/components/Footer/Footer.test.js
+++ b/tdrs-frontend/src/components/Footer/Footer.test.js
@@ -8,7 +8,6 @@ import Footer from './Footer'
 import { permissions } from '../Header/developer_permissions'
 
 describe('Footer', () => {
-
   const unauthenticatedInitialState = {
     router: { location: { pathname: '/profile' } },
     auth: {
@@ -25,7 +24,7 @@ describe('Footer', () => {
 
   const basicAuthenticatedInitialState = {
     router: { location: { pathname: '/profile' } },
-    auth: {authenticated: true},
+    auth: { authenticated: true },
   }
   const mockStore = configureStore([thunk])
   it('renders the children & families logo', () => {
@@ -70,12 +69,11 @@ describe('Footer', () => {
 
   it('does not render the sitemap link if a user is not authenticated', () => {
     const store = mockStore(unauthenticatedInitialState)
-    const { queryByText} = render(
+    const { queryByText } = render(
       <Provider store={store}>
         <Footer />
       </Provider>
     )
     expect(queryByText('Site Map')).not.toBeInTheDocument()
   })
-
 })
diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
index 08fe04e9f0..f81bbbc88d 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
@@ -6,7 +6,6 @@ import SiteMap from './SiteMap'
 import { Provider } from 'react-redux'
 
 describe('SiteMap', () => {
-
   const initialState = {
     router: { location: { pathname: '/home' } },
     auth: {
@@ -65,7 +64,13 @@ describe('SiteMap', () => {
       </Provider>
     )
 
-    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile', 'Admin']
+    const locations = [
+      'Home',
+      'Privacy Policy',
+      'Data Files',
+      'Profile',
+      'Admin',
+    ]
     for (let location of locations) {
       expect(getByText(location)).toBeInTheDocument()
     }

From 0a2621b70bf7ce256ee40d4fdfcfc3e704d05aa1 Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Wed, 27 Jul 2022 10:26:34 -0700
Subject: [PATCH 17/26] pass user to sitemap

---
 tdrs-frontend/src/components/Routes/Routes.js    | 6 +++++-
 tdrs-frontend/src/components/SiteMap/SiteMap.jsx | 7 +------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tdrs-frontend/src/components/Routes/Routes.js b/tdrs-frontend/src/components/Routes/Routes.js
index 93033c6777..823338a067 100644
--- a/tdrs-frontend/src/components/Routes/Routes.js
+++ b/tdrs-frontend/src/components/Routes/Routes.js
@@ -6,6 +6,7 @@ import Profile from '../Profile'
 import PrivateRoute from '../PrivateRoute'
 import LoginCallback from '../LoginCallback'
 import Reports from '../Reports'
+import { useSelector } from 'react-redux'
 
 import SiteMap from '../SiteMap'
 
@@ -16,7 +17,10 @@ import Home from '../Home'
  * Routes have the 'exact' prop, so the order of routes
  * does not matter.
  */
-const AppRoutes = ({ user }) => {
+const AppRoutes = () => {
+  // The logged in user in our Redux state
+  const user = useSelector((state) => state.auth.user)
+
   const role = user?.roles
   const hasRole = Boolean(role?.length > 0)
 
diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
index 59a299bb2d..5bd91e9821 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
@@ -7,17 +7,12 @@ const isMemberOfOne = (user, ...groupNames) =>
   !!user?.roles?.some((role) => groupNames.includes(role.name))
 
 const userAccessRequestApproved = (user) =>
-  !user?.['access_request'] && user?.roles?.length > 0
+  user?.['access_request'] && user?.roles?.length > 0
 
 const canViewAdmin = (user) =>
   userAccessRequestApproved(user) &&
   isMemberOfOne(user, 'Developer', 'OFA System Admin', 'ACF OCIO')
 
-// const hasPermission = (permissionName) =>
-//   user?.roles?.[0]?.permissions?.some(
-//     (perm) => perm.codename === permissionName
-//   )
-
 const SiteMap = ({ user }) => (
   <div className="margin-top-5">
     <SiteMap.Link text="Home" link="/home" />

From 9704cf2ca78b3e08c279cf149a49b77853a28290 Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Mon, 1 Aug 2022 10:09:23 -0700
Subject: [PATCH 18/26] fixed test

---
 .../src/components/SiteMap/SiteMap.test.js    | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
index f81bbbc88d..8946005fb2 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
@@ -45,24 +45,13 @@ describe('SiteMap', () => {
   })
 
   it('When an authenticated Admin visits the sitemap', () => {
-    const mockStore = configureStore([thunk])
-    const store = mockStore({
-      ...initialState,
-      auth: {
-        authenticated: true,
-        user: {
-          email: 'hi@bye.com',
-          roles: [{ id: 1, name: 'OFA System Admin', permission: [] }],
-          access_request: true,
-        },
-      },
-    })
+    const user = {
+      email: 'hi@bye.com',
+      roles: [{ id: 1, name: 'OFA System Admin', permission: [] }],
+      access_request: true,
+    }
 
-    const { getByText } = render(
-      <Provider store={store}>
-        <SiteMap />
-      </Provider>
-    )
+    const { getByText } = render(<SiteMap user={user}></SiteMap>)
 
     const locations = [
       'Home',

From bd3d5c5ef6bee5584a62c947e46ec4e3e6234bce Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Wed, 3 Aug 2022 11:01:18 -0700
Subject: [PATCH 19/26] refactor canViewAdmin

---
 tdrs-frontend/src/components/Footer/Footer.jsx   |  4 ++--
 tdrs-frontend/src/components/Header/Header.jsx   | 11 ++---------
 tdrs-frontend/src/components/SiteMap/SiteMap.jsx | 11 +----------
 tdrs-frontend/src/utils/canViewAdmin.js          | 11 +++++++++++
 4 files changed, 16 insertions(+), 21 deletions(-)
 create mode 100644 tdrs-frontend/src/utils/canViewAdmin.js

diff --git a/tdrs-frontend/src/components/Footer/Footer.jsx b/tdrs-frontend/src/components/Footer/Footer.jsx
index dfb618bc92..839cce529c 100644
--- a/tdrs-frontend/src/components/Footer/Footer.jsx
+++ b/tdrs-frontend/src/components/Footer/Footer.jsx
@@ -17,7 +17,7 @@ function Footer() {
                     className="usa-footer__primary-link"
                     href="https://www.acf.hhs.gov/privacy-policy"
                     target="_blank"
-                    rel="noreferrer"
+                    rel="noopener noreferrer"
                   >
                     Privacy policy
                   </a>
@@ -28,7 +28,7 @@ function Footer() {
                       className="usa-footer__primary-link"
                       href="/site-map"
                       target="_blank"
-                      rel="noreferrer"
+                      rel="noopener noreferrer"
                     >
                       Site Map
                     </a>
diff --git a/tdrs-frontend/src/components/Header/Header.jsx b/tdrs-frontend/src/components/Header/Header.jsx
index 0f64d3e839..d8265b1add 100644
--- a/tdrs-frontend/src/components/Header/Header.jsx
+++ b/tdrs-frontend/src/components/Header/Header.jsx
@@ -3,6 +3,7 @@ import { useSelector } from 'react-redux'
 import closeIcon from 'uswds/dist/img/close.svg'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faSignOutAlt, faUserCircle } from '@fortawesome/free-solid-svg-icons'
+import canViewAdmin from '../../utils/canViewAdmin'
 
 import NavItem from '../NavItem/NavItem'
 
@@ -21,20 +22,12 @@ function Header() {
   const user = useSelector((state) => state.auth.user)
   const authenticated = useSelector((state) => state.auth.authenticated)
   const userAccessRequestPending = Boolean(user?.['access_request'])
-  const userAccessRequestApproved =
-    Boolean(user?.['access_request']) && user.roles.length > 0
-
-  const isMemberOfOne = (...groupNames) =>
-    user?.roles?.some((role) => groupNames.includes(role.name))
 
   const hasPermission = (permissionName) =>
     user?.roles?.[0]?.permissions?.some(
       (perm) => perm.codename === permissionName
     )
 
-  const canViewAdmin =
-    userAccessRequestApproved &&
-    isMemberOfOne('Developer', 'OFA System Admin', 'ACF OCIO')
   const canViewDataFiles = hasPermission('view_datafile')
 
   const menuRef = useRef()
@@ -134,7 +127,7 @@ function Header() {
                       href="/profile"
                     />
                   )}
-                  {canViewAdmin && (
+                  {canViewAdmin(user) && (
                     <NavItem
                       pathname={pathname}
                       tabTitle="Admin"
diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
index 5bd91e9821..c0dc6f9fb5 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
@@ -1,17 +1,8 @@
 import React from 'react'
-
+import canViewAdmin from '../../utils/canViewAdmin'
 // I copied these from Header.jsx and slightly refactored them to accept a user as their first arguement
 // I am wanting to shift these, and similar reused pieces of code at the top of component functions
 // up the tree to be passed in from the router.
-const isMemberOfOne = (user, ...groupNames) =>
-  !!user?.roles?.some((role) => groupNames.includes(role.name))
-
-const userAccessRequestApproved = (user) =>
-  user?.['access_request'] && user?.roles?.length > 0
-
-const canViewAdmin = (user) =>
-  userAccessRequestApproved(user) &&
-  isMemberOfOne(user, 'Developer', 'OFA System Admin', 'ACF OCIO')
 
 const SiteMap = ({ user }) => (
   <div className="margin-top-5">
diff --git a/tdrs-frontend/src/utils/canViewAdmin.js b/tdrs-frontend/src/utils/canViewAdmin.js
new file mode 100644
index 0000000000..ba35fdb48a
--- /dev/null
+++ b/tdrs-frontend/src/utils/canViewAdmin.js
@@ -0,0 +1,11 @@
+const isMemberOfOne = (user, ...groupNames) =>
+  !!user?.roles?.some((role) => groupNames.includes(role.name))
+
+const userAccessRequestApproved = (user) =>
+  user?.['access_request'] && user?.roles?.length > 0
+
+const canViewAdmin = (user) =>
+  userAccessRequestApproved(user) &&
+  isMemberOfOne(user, 'Developer', 'OFA System Admin', 'ACF OCIO')
+
+export default canViewAdmin

From 1f516857ad3f5549cbe928465ffc8958c8ce02c9 Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Wed, 3 Aug 2022 16:37:54 -0700
Subject: [PATCH 20/26] fixed tests

---
 .../src/components/SiteMap/SiteMap.test.js    | 72 +++++++++++--------
 tdrs-frontend/src/utils/canViewAdmin.js       |  4 +-
 2 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
index 8946005fb2..4197ba9916 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
@@ -1,9 +1,10 @@
 import React from 'react'
 import thunk from 'redux-thunk'
-import { render, screen } from '@testing-library/react'
+import { render } from '@testing-library/react'
 import configureStore from 'redux-mock-store'
 import SiteMap from './SiteMap'
 import { Provider } from 'react-redux'
+import { mount } from 'enzyme'
 
 describe('SiteMap', () => {
   const initialState = {
@@ -19,49 +20,64 @@ describe('SiteMap', () => {
   }
 
   it('When an authenticated Developer visits the sitemap', () => {
-    const mockStore = configureStore([thunk])
-    const store = mockStore({
-      ...initialState,
-      auth: {
-        authenticated: true,
-        user: {
-          email: 'hi@bye.com',
-          roles: [{ id: 1, name: 'Developer', permission: [] }],
-          access_request: true,
-        },
-      },
-    })
+    const user = {
+      email: 'hi@bye.com',
+      roles: [{ id: 1, name: 'Developer', permissions: [] }],
+      access_request: true,
+    }
 
-    const { getByText } = render(
-      <Provider store={store}>
-        <SiteMap />
-      </Provider>
-    )
+    const { getByText } = render(<SiteMap user={user}></SiteMap>)
 
-    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile']
+    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile', 'Admin']
     for (let location of locations) {
       expect(getByText(location)).toBeInTheDocument()
     }
   })
 
-  it('When an authenticated Admin visits the sitemap', () => {
+  it('When an authenticated OFA System Admin visits the sitemap', () => {
     const user = {
       email: 'hi@bye.com',
-      roles: [{ id: 1, name: 'OFA System Admin', permission: [] }],
+      roles: [{ id: 1, name: 'OFA System Admin', permissions: [] }],
       access_request: true,
     }
 
     const { getByText } = render(<SiteMap user={user}></SiteMap>)
 
-    const locations = [
-      'Home',
-      'Privacy Policy',
-      'Data Files',
-      'Profile',
-      'Admin',
-    ]
+    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile', 'Admin']
+    for (let location of locations) {
+      expect(getByText(location)).toBeInTheDocument()
+    }
+  }) 
+
+  it('When an authenticated ACF OCIO visits the sitemap', () => {
+    const user = {
+      email: 'hi@bye.com',
+      roles: [{ id: 1, name: 'ACF OCIO', permissions: [] }],
+      access_request: true,
+    }
+
+    const { getByText } = render(<SiteMap user={user}></SiteMap>)
+
+    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile', 'Admin']
     for (let location of locations) {
       expect(getByText(location)).toBeInTheDocument()
     }
   })
+  it('When an authenticated Data Analyst visits the sitemap', () => {
+    const user = {
+      email: 'hi@bye.com',
+      roles: [{ id: 1, name: 'Data Analyst', permissions: [] }],
+      access_request: true,
+    }
+
+    const { getByText } = render(<SiteMap user={user}></SiteMap>)
+
+    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile']
+    for (let location of locations) {
+      expect(getByText(location)).toBeInTheDocument()
+    }
+    const wrapper = mount(<SiteMap user={user}></SiteMap>)
+    expect(wrapper.html()).not.toContain('Admin')
+    expect(wrapper.html()).toContain('Home')
+  }) 
 })
diff --git a/tdrs-frontend/src/utils/canViewAdmin.js b/tdrs-frontend/src/utils/canViewAdmin.js
index ba35fdb48a..447185047e 100644
--- a/tdrs-frontend/src/utils/canViewAdmin.js
+++ b/tdrs-frontend/src/utils/canViewAdmin.js
@@ -1,4 +1,4 @@
-const isMemberOfOne = (user, ...groupNames) =>
+const isMemberOfOne = (user, groupNames) =>
   !!user?.roles?.some((role) => groupNames.includes(role.name))
 
 const userAccessRequestApproved = (user) =>
@@ -6,6 +6,6 @@ const userAccessRequestApproved = (user) =>
 
 const canViewAdmin = (user) =>
   userAccessRequestApproved(user) &&
-  isMemberOfOne(user, 'Developer', 'OFA System Admin', 'ACF OCIO')
+  isMemberOfOne(user, ['Developer', 'OFA System Admin', 'ACF OCIO'])
 
 export default canViewAdmin

From 334210c80314b854f04706f389e328f422d10f28 Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Wed, 10 Aug 2022 13:15:50 -0700
Subject: [PATCH 21/26] linting

---
 .../src/components/SiteMap/SiteMap.test.js    | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
index 4197ba9916..0edeb4bfdb 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
@@ -1,9 +1,6 @@
 import React from 'react'
-import thunk from 'redux-thunk'
 import { render } from '@testing-library/react'
-import configureStore from 'redux-mock-store'
 import SiteMap from './SiteMap'
-import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
 
 describe('SiteMap', () => {
@@ -28,7 +25,13 @@ describe('SiteMap', () => {
 
     const { getByText } = render(<SiteMap user={user}></SiteMap>)
 
-    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile', 'Admin']
+    const locations = [
+      'Home',
+      'Privacy Policy',
+      'Data Files',
+      'Profile',
+      'Admin',
+    ]
     for (let location of locations) {
       expect(getByText(location)).toBeInTheDocument()
     }
@@ -43,11 +46,17 @@ describe('SiteMap', () => {
 
     const { getByText } = render(<SiteMap user={user}></SiteMap>)
 
-    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile', 'Admin']
+    const locations = [
+      'Home',
+      'Privacy Policy',
+      'Data Files',
+      'Profile',
+      'Admin',
+    ]
     for (let location of locations) {
       expect(getByText(location)).toBeInTheDocument()
     }
-  }) 
+  })
 
   it('When an authenticated ACF OCIO visits the sitemap', () => {
     const user = {
@@ -58,7 +67,13 @@ describe('SiteMap', () => {
 
     const { getByText } = render(<SiteMap user={user}></SiteMap>)
 
-    const locations = ['Home', 'Privacy Policy', 'Data Files', 'Profile', 'Admin']
+    const locations = [
+      'Home',
+      'Privacy Policy',
+      'Data Files',
+      'Profile',
+      'Admin',
+    ]
     for (let location of locations) {
       expect(getByText(location)).toBeInTheDocument()
     }
@@ -79,5 +94,5 @@ describe('SiteMap', () => {
     const wrapper = mount(<SiteMap user={user}></SiteMap>)
     expect(wrapper.html()).not.toContain('Admin')
     expect(wrapper.html()).toContain('Home')
-  }) 
+  })
 })

From 097a95345531f73581046dca3b301b5d137cf42a Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Mon, 15 Aug 2022 13:55:05 -0700
Subject: [PATCH 22/26] removed comments

---
 tdrs-frontend/src/components/SiteMap/SiteMap.jsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
index c0dc6f9fb5..e1f823e840 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
@@ -1,8 +1,5 @@
 import React from 'react'
 import canViewAdmin from '../../utils/canViewAdmin'
-// I copied these from Header.jsx and slightly refactored them to accept a user as their first arguement
-// I am wanting to shift these, and similar reused pieces of code at the top of component functions
-// up the tree to be passed in from the router.
 
 const SiteMap = ({ user }) => (
   <div className="margin-top-5">

From 369165524c49909b84a6cdad3eddc1b3fed03b71 Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Wed, 17 Aug 2022 13:22:22 -0700
Subject: [PATCH 23/26] Site map opens in same tab, Can only see data files if
 access approved

---
 tdrs-frontend/src/components/Footer/Footer.jsx   | 2 +-
 tdrs-frontend/src/components/SiteMap/SiteMap.jsx | 9 ++++++---
 tdrs-frontend/src/utils/canViewAdmin.js          | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tdrs-frontend/src/components/Footer/Footer.jsx b/tdrs-frontend/src/components/Footer/Footer.jsx
index 839cce529c..6fb642eb94 100644
--- a/tdrs-frontend/src/components/Footer/Footer.jsx
+++ b/tdrs-frontend/src/components/Footer/Footer.jsx
@@ -27,7 +27,7 @@ function Footer() {
                     <a
                       className="usa-footer__primary-link"
                       href="/site-map"
-                      target="_blank"
+                      target="_self"
                       rel="noopener noreferrer"
                     >
                       Site Map
diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
index e1f823e840..6518890db9 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
@@ -7,8 +7,11 @@ const SiteMap = ({ user }) => (
     <SiteMap.Link
       text="Privacy Policy"
       link="https://www.acf.hhs.gov/privacy-policy"
+      target="_blank"
     />
-    <SiteMap.Link text="Data Files" link="/data-files" />
+    {user?.['access_request'] && (
+      <SiteMap.Link text="Data Files" link="/data-files" />
+    )}
     <SiteMap.Link text="Profile" link="/profile" />
 
     {canViewAdmin(user) && (
@@ -20,11 +23,11 @@ const SiteMap = ({ user }) => (
   </div>
 )
 
-SiteMap.Link = ({ text, link }) => (
+SiteMap.Link = ({ text, link, target = '_self' }) => (
   <a
     className="usa-footer__primary-link"
     href={link}
-    target="_blank"
+    target={target}
     rel="noopener noreferrer"
   >
     {text}
diff --git a/tdrs-frontend/src/utils/canViewAdmin.js b/tdrs-frontend/src/utils/canViewAdmin.js
index 447185047e..fa38090c09 100644
--- a/tdrs-frontend/src/utils/canViewAdmin.js
+++ b/tdrs-frontend/src/utils/canViewAdmin.js
@@ -1,5 +1,5 @@
 const isMemberOfOne = (user, groupNames) =>
-  !!user?.roles?.some((role) => groupNames.includes(role.name))
+  user?.roles?.some((role) => groupNames.includes(role.name))
 
 const userAccessRequestApproved = (user) =>
   user?.['access_request'] && user?.roles?.length > 0

From 16a053c5a349eaee966bba72323a468ddff4c741 Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Wed, 17 Aug 2022 13:29:18 -0700
Subject: [PATCH 24/26] fixed test and added new test

---
 .../src/components/SiteMap/SiteMap.test.js     | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
index 0edeb4bfdb..89445dd47a 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.test.js
@@ -95,4 +95,22 @@ describe('SiteMap', () => {
     expect(wrapper.html()).not.toContain('Admin')
     expect(wrapper.html()).toContain('Home')
   })
+
+  it('When an authenticated user that does not yet have access visits the sitemap', () => {
+    const user = {
+      email: 'hi@bye.com',
+      roles: [],
+      access_request: false,
+    }
+
+    const { getByText } = render(<SiteMap user={user}></SiteMap>)
+
+    const locations = ['Home', 'Privacy Policy', 'Profile']
+    for (let location of locations) {
+      expect(getByText(location)).toBeInTheDocument()
+    }
+    const wrapper = mount(<SiteMap user={user}></SiteMap>)
+    expect(wrapper.html()).not.toContain('Admin')
+    expect(wrapper.html()).toContain('Home')
+  })
 })

From b31c3729af8ba67d30ee9d77366ca41e82d5e919 Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Thu, 18 Aug 2022 09:49:03 -0700
Subject: [PATCH 25/26] added OFA admin to canViewAdmin

---
 tdrs-frontend/src/utils/canViewAdmin.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tdrs-frontend/src/utils/canViewAdmin.js b/tdrs-frontend/src/utils/canViewAdmin.js
index fa38090c09..2d43a92956 100644
--- a/tdrs-frontend/src/utils/canViewAdmin.js
+++ b/tdrs-frontend/src/utils/canViewAdmin.js
@@ -6,6 +6,11 @@ const userAccessRequestApproved = (user) =>
 
 const canViewAdmin = (user) =>
   userAccessRequestApproved(user) &&
-  isMemberOfOne(user, ['Developer', 'OFA System Admin', 'ACF OCIO'])
+  isMemberOfOne(user, [
+    'Developer',
+    'OFA System Admin',
+    'ACF OCIO',
+    'OFA Admin',
+  ])
 
 export default canViewAdmin

From 40d3a7525a19ad0c12c5a1f87f8f872b80f69d63 Mon Sep 17 00:00:00 2001
From: Cameron Smart <smartcameron@gmail.com>
Date: Thu, 18 Aug 2022 10:28:30 -0700
Subject: [PATCH 26/26] fixed check for data files tab

---
 tdrs-frontend/src/components/Header/Header.jsx   | 2 +-
 tdrs-frontend/src/components/SiteMap/SiteMap.jsx | 7 +++++--
 tdrs-frontend/src/utils/canViewAdmin.js          | 6 ++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/tdrs-frontend/src/components/Header/Header.jsx b/tdrs-frontend/src/components/Header/Header.jsx
index d8265b1add..0054e3d389 100644
--- a/tdrs-frontend/src/components/Header/Header.jsx
+++ b/tdrs-frontend/src/components/Header/Header.jsx
@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux'
 import closeIcon from 'uswds/dist/img/close.svg'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faSignOutAlt, faUserCircle } from '@fortawesome/free-solid-svg-icons'
-import canViewAdmin from '../../utils/canViewAdmin'
+import { canViewAdmin } from '../../utils/canViewAdmin'
 
 import NavItem from '../NavItem/NavItem'
 
diff --git a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
index 6518890db9..7c58260a5c 100644
--- a/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
+++ b/tdrs-frontend/src/components/SiteMap/SiteMap.jsx
@@ -1,5 +1,8 @@
 import React from 'react'
-import canViewAdmin from '../../utils/canViewAdmin'
+import {
+  canViewAdmin,
+  userAccessRequestApproved,
+} from '../../utils/canViewAdmin'
 
 const SiteMap = ({ user }) => (
   <div className="margin-top-5">
@@ -9,7 +12,7 @@ const SiteMap = ({ user }) => (
       link="https://www.acf.hhs.gov/privacy-policy"
       target="_blank"
     />
-    {user?.['access_request'] && (
+    {userAccessRequestApproved(user) && (
       <SiteMap.Link text="Data Files" link="/data-files" />
     )}
     <SiteMap.Link text="Profile" link="/profile" />
diff --git a/tdrs-frontend/src/utils/canViewAdmin.js b/tdrs-frontend/src/utils/canViewAdmin.js
index 2d43a92956..1be7707128 100644
--- a/tdrs-frontend/src/utils/canViewAdmin.js
+++ b/tdrs-frontend/src/utils/canViewAdmin.js
@@ -1,10 +1,10 @@
 const isMemberOfOne = (user, groupNames) =>
   user?.roles?.some((role) => groupNames.includes(role.name))
 
-const userAccessRequestApproved = (user) =>
+export const userAccessRequestApproved = (user) =>
   user?.['access_request'] && user?.roles?.length > 0
 
-const canViewAdmin = (user) =>
+export const canViewAdmin = (user) =>
   userAccessRequestApproved(user) &&
   isMemberOfOne(user, [
     'Developer',
@@ -12,5 +12,3 @@ const canViewAdmin = (user) =>
     'ACF OCIO',
     'OFA Admin',
   ])
-
-export default canViewAdmin