Skip to content

Commit b38d1ed

Browse files
johnstcnjohnstcn
authored
Revert "fix(UI): redirect if user is not permissioned to see workspace (#6786)" (#6836)
This reverts commit fc21e15.
1 parent 891bbda commit b38d1ed

File tree

5 files changed

+60
-125
lines changed

5 files changed

+60
-125
lines changed

‎site/src/hooks/useReadPagePermissions.ts

-27
This file was deleted.

‎site/src/pages/AuditPage/AuditPage.test.tsx

-4
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ describe("AuditPage", () => {
4848
const mock = jest.spyOn(CreateDayString, "createDayString")
4949
mock.mockImplementation(() => "a minute ago")
5050

51-
jest.spyOn(API, "checkAuthorization").mockResolvedValue({
52-
readPagePermissions: true,
53-
})
54-
5551
// Mock the entitlements
5652
server.use(
5753
rest.get("/api/v2/entitlements", (req, res, ctx) => {

‎site/src/pages/AuditPage/AuditPage.tsx

+18-33
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,8 @@ import { pageTitle } from "util/page"
1111
import { auditMachine } from "xServices/audit/auditXService"
1212
import { PaginationMachineRef } from "xServices/pagination/paginationXService"
1313
import { AuditPageView } from "./AuditPageView"
14-
import { RequirePermission } from "components/RequirePermission/RequirePermission"
15-
import { useReadPagePermissions } from "hooks/useReadPagePermissions"
16-
import { Loader } from "components/Loader/Loader"
1714

1815
const AuditPage: FC = () => {
19-
// we call the below hook to make sure the user has access to view the page
20-
const { data: permissions, isLoading: isLoadingPermissions } =
21-
useReadPagePermissions("audit_log")
22-
2316
const [searchParams, setSearchParams] = useSearchParams()
2417
const filter = searchParams.get("filter") ?? ""
2518
const [auditState, auditSend] = useMachine(auditMachine, {
@@ -35,34 +28,26 @@ const AuditPage: FC = () => {
3528

3629
const { auditLogs, count, apiError } = auditState.context
3730
const paginationRef = auditState.context.paginationRef as PaginationMachineRef
38-
const { audit_log: isAuditLogEnabled } = useFeatureVisibility()
39-
40-
if (!permissions || isLoadingPermissions) {
41-
return <Loader />
42-
}
31+
const { audit_log: isAuditLogVisible } = useFeatureVisibility()
4332

4433
return (
45-
<RequirePermission
46-
isFeatureVisible={isAuditLogEnabled && permissions.readPagePermissions}
47-
>
48-
<>
49-
<Helmet>
50-
<title>{pageTitle("Audit")}</title>
51-
</Helmet>
52-
<AuditPageView
53-
filter={filter}
54-
auditLogs={auditLogs}
55-
count={count}
56-
onFilter={(filter) => {
57-
auditSend("FILTER", { filter })
58-
}}
59-
paginationRef={paginationRef}
60-
isNonInitialPage={nonInitialPage(searchParams)}
61-
isAuditLogVisible={isAuditLogEnabled}
62-
error={apiError}
63-
/>
64-
</>
65-
</RequirePermission>
34+
<>
35+
<Helmet>
36+
<title>{pageTitle("Audit")}</title>
37+
</Helmet>
38+
<AuditPageView
39+
filter={filter}
40+
auditLogs={auditLogs}
41+
count={count}
42+
onFilter={(filter) => {
43+
auditSend("FILTER", { filter })
44+
}}
45+
paginationRef={paginationRef}
46+
isNonInitialPage={nonInitialPage(searchParams)}
47+
isAuditLogVisible={isAuditLogVisible}
48+
error={apiError}
49+
/>
50+
</>
6651
)
6752
}
6853

‎site/src/pages/WorkspacePage/WorkspacePage.test.tsx

-6
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ const { t } = i18next
3131

3232
// It renders the workspace page and waits for it be loaded
3333
const renderWorkspacePage = async () => {
34-
jest.spyOn(api, "checkAuthorization").mockResolvedValue({
35-
readPagePermissions: true,
36-
})
3734
jest.spyOn(api, "getTemplate").mockResolvedValueOnce(MockTemplate)
3835
jest.spyOn(api, "getTemplateVersionRichParameters").mockResolvedValueOnce([])
3936
renderWithAuth(<WorkspacePage />, {
@@ -194,9 +191,6 @@ describe("WorkspacePage", () => {
194191
it("updates the parameters when they are missing during update", async () => {
195192
// Setup mocks
196193
const user = userEvent.setup()
197-
jest.spyOn(api, "checkAuthorization").mockResolvedValue({
198-
readPagePermissions: true,
199-
})
200194
jest
201195
.spyOn(api, "getWorkspaceByOwnerAndName")
202196
.mockResolvedValueOnce(MockOutdatedWorkspace)

‎site/src/pages/WorkspacePage/WorkspacePage.tsx

+42-55
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ import { Loader } from "components/Loader/Loader"
66
import { FC, useEffect } from "react"
77
import { useParams } from "react-router-dom"
88
import { firstOrItem } from "util/array"
9+
import { quotaMachine } from "xServices/quotas/quotasXService"
910
import { workspaceMachine } from "xServices/workspace/workspaceXService"
1011
import { WorkspaceReadyPage } from "./WorkspaceReadyPage"
11-
import { quotaMachine } from "xServices/quotas/quotasXService"
12-
import { RequirePermission } from "components/RequirePermission/RequirePermission"
13-
import { useReadPagePermissions } from "hooks/useReadPagePermissions"
1412

1513
export const WorkspacePage: FC = () => {
16-
const styles = useStyles()
1714
const { username: usernameQueryParam, workspace: workspaceQueryParam } =
1815
useParams()
1916
const username = firstOrItem(usernameQueryParam, null)
@@ -26,13 +23,9 @@ export const WorkspacePage: FC = () => {
2623
getTemplateParametersWarning,
2724
checkPermissionsError,
2825
} = workspaceState.context
29-
30-
// we call the below hook to make sure the user has access to view the page
31-
const { data: permissions, isLoading: isLoadingPermissions } =
32-
useReadPagePermissions("workspace", workspace?.id)
33-
3426
const [quotaState, quotaSend] = useMachine(quotaMachine)
3527
const { getQuotaError } = quotaState.context
28+
const styles = useStyles()
3629

3730
/**
3831
* Get workspace, template, and organization on mount and whenever workspaceId changes.
@@ -48,53 +41,47 @@ export const WorkspacePage: FC = () => {
4841
username && quotaSend({ type: "GET_QUOTA", username })
4942
}, [username, quotaSend])
5043

51-
if (!permissions || isLoadingPermissions) {
52-
return <Loader />
53-
}
54-
5544
return (
56-
<RequirePermission isFeatureVisible={permissions.readPagePermissions}>
57-
<ChooseOne>
58-
<Cond condition={workspaceState.matches("error")}>
59-
<div className={styles.error}>
60-
{Boolean(getWorkspaceError) && (
61-
<AlertBanner severity="error" error={getWorkspaceError} />
62-
)}
63-
{Boolean(getTemplateWarning) && (
64-
<AlertBanner severity="error" error={getTemplateWarning} />
65-
)}
66-
{Boolean(getTemplateParametersWarning) && (
67-
<AlertBanner
68-
severity="error"
69-
error={getTemplateParametersWarning}
70-
/>
71-
)}
72-
{Boolean(checkPermissionsError) && (
73-
<AlertBanner severity="error" error={checkPermissionsError} />
74-
)}
75-
{Boolean(getQuotaError) && (
76-
<AlertBanner severity="error" error={getQuotaError} />
77-
)}
78-
</div>
79-
</Cond>
80-
<Cond
81-
condition={
82-
Boolean(workspace) &&
83-
workspaceState.matches("ready") &&
84-
quotaState.matches("success")
85-
}
86-
>
87-
<WorkspaceReadyPage
88-
workspaceState={workspaceState}
89-
quotaState={quotaState}
90-
workspaceSend={workspaceSend}
91-
/>
92-
</Cond>
93-
<Cond>
94-
<Loader />
95-
</Cond>
96-
</ChooseOne>
97-
</RequirePermission>
45+
<ChooseOne>
46+
<Cond condition={workspaceState.matches("error")}>
47+
<div className={styles.error}>
48+
{Boolean(getWorkspaceError) && (
49+
<AlertBanner severity="error" error={getWorkspaceError} />
50+
)}
51+
{Boolean(getTemplateWarning) && (
52+
<AlertBanner severity="error" error={getTemplateWarning} />
53+
)}
54+
{Boolean(getTemplateParametersWarning) && (
55+
<AlertBanner
56+
severity="error"
57+
error={getTemplateParametersWarning}
58+
/>
59+
)}
60+
{Boolean(checkPermissionsError) && (
61+
<AlertBanner severity="error" error={checkPermissionsError} />
62+
)}
63+
{Boolean(getQuotaError) && (
64+
<AlertBanner severity="error" error={getQuotaError} />
65+
)}
66+
</div>
67+
</Cond>
68+
<Cond
69+
condition={
70+
Boolean(workspace) &&
71+
workspaceState.matches("ready") &&
72+
quotaState.matches("success")
73+
}
74+
>
75+
<WorkspaceReadyPage
76+
workspaceState={workspaceState}
77+
quotaState={quotaState}
78+
workspaceSend={workspaceSend}
79+
/>
80+
</Cond>
81+
<Cond>
82+
<Loader />
83+
</Cond>
84+
</ChooseOne>
9885
)
9986
}
10087

0 commit comments

Comments
 (0)