Skip to content

Commit 4e79b2d

Browse files
committed
Condition page
1 parent a641881 commit 4e79b2d

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

site/src/AppRouter.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
import { useSelector } from "@xstate/react"
2+
import { FeatureNames } from "api/types"
3+
import { RequirePermission } from "components/RequirePermission/RequirePermission"
24
import { SetupPage } from "pages/SetupPage/SetupPage"
35
import { TemplateSettingsPage } from "pages/TemplateSettingsPage/TemplateSettingsPage"
46
import { FC, lazy, Suspense, useContext } from "react"
57
import { Navigate, Route, Routes } from "react-router-dom"
68
import { selectPermissions } from "xServices/auth/authSelectors"
9+
import { selectFeatureVisibility } from "xServices/entitlements/entitlementsSelectors"
710
import { XServiceContext } from "xServices/StateContext"
811
import { AuthAndFrame } from "./components/AuthAndFrame/AuthAndFrame"
912
import { RequireAuth } from "./components/RequireAuth/RequireAuth"
@@ -35,6 +38,8 @@ const AuditPage = lazy(() => import("./pages/AuditPage/AuditPage"))
3538
export const AppRouter: FC = () => {
3639
const xServices = useContext(XServiceContext)
3740
const permissions = useSelector(xServices.authXService, selectPermissions)
41+
const featureVisibility = useSelector(xServices.entitlementsXService, selectFeatureVisibility)
42+
3843
return (
3944
<Suspense fallback={<></>}>
4045
<Routes>
@@ -134,11 +139,13 @@ export const AppRouter: FC = () => {
134139
<Route
135140
index
136141
element={
137-
process.env.NODE_ENV === "production" || !permissions?.viewAuditLog ? (
142+
process.env.NODE_ENV === "production" ? (
138143
<Navigate to="/workspaces" />
139144
) : (
140145
<AuthAndFrame>
141-
<AuditPage />
146+
<RequirePermission isFeatureVisible={featureVisibility[FeatureNames.AuditLog] && !!permissions?.viewAuditLog}>
147+
<AuditPage />
148+
</RequirePermission>
142149
</AuthAndFrame>
143150
)
144151
}

0 commit comments

Comments
 (0)