- Update so that digit cannot see alerts tab

Author: elipe17

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

@@ -7,7 +7,8 @@ import {
   accountStatusIsApproved,
   accountIsInReview,
   accountCanViewAdmin,
-  accountCanViewPlg,
+  accountCanViewGrafana,
+  accountCanViewAlerts,
 } from '../../selectors/auth'
 
 import NavItem from '../NavItem/NavItem'
@@ -30,7 +31,8 @@ function Header() {
   const userAccessRequestPending = useSelector(accountIsInReview)
   const userAccessRequestApproved = useSelector(accountStatusIsApproved)
   const userIsAdmin = useSelector(accountCanViewAdmin)
-  const userViewPlg = useSelector(accountCanViewPlg)
+  const userViewGrafana = useSelector(accountCanViewGrafana)
+  const userViewAlerts = useSelector(accountCanViewAlerts)
 
   const menuRef = useRef()
 
@@ -153,19 +155,19 @@ function Header() {
                       href={`${process.env.REACT_APP_BACKEND_HOST}/admin/`}
                     />
                   )}
-                  {userViewPlg && (
-                    <>
-                      <NavItem
-                        pathname={pathname}
-                        tabTitle="Grafana"
-                        href={`${process.env.REACT_APP_BACKEND_HOST}/grafana/`}
-                      />
-                      <NavItem
-                        pathname={pathname}
-                        tabTitle="Alerts"
-                        href={`${process.env.REACT_APP_BACKEND_HOST}/alerts/`}
-                      />
-                    </>
+                  {userViewGrafana && (
+                    <NavItem
+                      pathname={pathname}
+                      tabTitle="Grafana"
+                      href={`${process.env.REACT_APP_BACKEND_HOST}/grafana/`}
+                    />
+                  )}
+                  {userViewAlerts && (
+                    <NavItem
+                      pathname={pathname}
+                      tabTitle="Alerts"
+                      href={`${process.env.REACT_APP_BACKEND_HOST}/alerts/`}
+                    />
                   )}
                 </>
               )}

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

@@ -3,14 +3,16 @@ import { useSelector } from 'react-redux'
 import {
   accountStatusIsApproved,
   accountCanViewAdmin,
-  accountCanViewPlg,
   selectUserPermissions,
+  accountCanViewGrafana,
+  accountCanViewAlerts,
 } from '../../selectors/auth'
 
 const SiteMap = ({ user }) => {
   const userIsApproved = useSelector(accountStatusIsApproved)
   const userIsAdmin = useSelector(accountCanViewAdmin)
-  const userViewPlg = useSelector(accountCanViewPlg)
+  const userViewGrafana = useSelector(accountCanViewGrafana)
+  const userViewAlerts = useSelector(accountCanViewAlerts)
 
   const permissions = useSelector(selectUserPermissions)
   const userHasFra = userIsApproved && permissions.includes('has_fra_access')
@@ -43,17 +45,18 @@ const SiteMap = ({ user }) => {
         />
       )}
 
-      {userViewPlg && (
-        <>
-          <SiteMap.Link
-            text="Grafana"
-            link={`${process.env.REACT_APP_BACKEND_HOST}/grafana/`}
-          />
-          <SiteMap.Link
-            text="Alerts"
-            link={`${process.env.REACT_APP_BACKEND_HOST}/alerts/`}
-          />
-        </>
+      {userViewGrafana && (
+        <SiteMap.Link
+          text="Grafana"
+          link={`${process.env.REACT_APP_BACKEND_HOST}/grafana/`}
+        />
+      )}
+
+      {userViewAlerts && (
+        <SiteMap.Link
+          text="Alerts"
+          link={`${process.env.REACT_APP_BACKEND_HOST}/alerts/`}
+        />
       )}
     </div>
   )

tdrs-frontend/src/selectors/auth.js

@@ -72,12 +72,16 @@ export const accountCanViewAdmin = (state) =>
     'System Owner',
   ].includes(selectPrimaryUserRole(state)?.name)
 
-export const accountCanViewPlg = (state) =>
+export const accountCanViewGrafana = (state) =>
   accountStatusIsApproved(state) &&
   ['OFA System Admin', 'Developer', 'DIGIT Team'].includes(
     selectPrimaryUserRole(state)?.name
   )
 
+export const accountCanViewAlerts = (state) =>
+  accountStatusIsApproved(state) &&
+  ['OFA System Admin', 'Developer'].includes(selectPrimaryUserRole(state)?.name)
+
 export const accountIsRegionalStaff = (state) =>
   accountStatusIsApproved(state) &&
   selectPrimaryUserRole(state)?.name === 'OFA Regional Staff'