Skip to content

fix(ui): revert #6786 #6836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 28, 2023
Merged

fix(ui): revert #6786 #6836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions site/src/hooks/useReadPagePermissions.ts
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions site/src/pages/AuditPage/AuditPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ describe("AuditPage", () => {
const mock = jest.spyOn(CreateDayString, "createDayString")
mock.mockImplementation(() => "a minute ago")

jest.spyOn(API, "checkAuthorization").mockResolvedValue({
readPagePermissions: true,
})

// Mock the entitlements
server.use(
rest.get("/api/v2/entitlements", (req, res, ctx) => {
Expand Down
51 changes: 18 additions & 33 deletions site/src/pages/AuditPage/AuditPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,8 @@ import { pageTitle } from "util/page"
import { auditMachine } from "xServices/audit/auditXService"
import { PaginationMachineRef } from "xServices/pagination/paginationXService"
import { AuditPageView } from "./AuditPageView"
import { RequirePermission } from "components/RequirePermission/RequirePermission"
import { useReadPagePermissions } from "hooks/useReadPagePermissions"
import { Loader } from "components/Loader/Loader"

const AuditPage: FC = () => {
// we call the below hook to make sure the user has access to view the page
const { data: permissions, isLoading: isLoadingPermissions } =
useReadPagePermissions("audit_log")

const [searchParams, setSearchParams] = useSearchParams()
const filter = searchParams.get("filter") ?? ""
const [auditState, auditSend] = useMachine(auditMachine, {
Expand All @@ -35,34 +28,26 @@ const AuditPage: FC = () => {

const { auditLogs, count, apiError } = auditState.context
const paginationRef = auditState.context.paginationRef as PaginationMachineRef
const { audit_log: isAuditLogEnabled } = useFeatureVisibility()

if (!permissions || isLoadingPermissions) {
return <Loader />
}
const { audit_log: isAuditLogVisible } = useFeatureVisibility()

return (
<RequirePermission
isFeatureVisible={isAuditLogEnabled && permissions.readPagePermissions}
>
<>
<Helmet>
<title>{pageTitle("Audit")}</title>
</Helmet>
<AuditPageView
filter={filter}
auditLogs={auditLogs}
count={count}
onFilter={(filter) => {
auditSend("FILTER", { filter })
}}
paginationRef={paginationRef}
isNonInitialPage={nonInitialPage(searchParams)}
isAuditLogVisible={isAuditLogEnabled}
error={apiError}
/>
</>
</RequirePermission>
<>
<Helmet>
<title>{pageTitle("Audit")}</title>
</Helmet>
<AuditPageView
filter={filter}
auditLogs={auditLogs}
count={count}
onFilter={(filter) => {
auditSend("FILTER", { filter })
}}
paginationRef={paginationRef}
isNonInitialPage={nonInitialPage(searchParams)}
isAuditLogVisible={isAuditLogVisible}
error={apiError}
/>
</>
)
}

Expand Down
6 changes: 0 additions & 6 deletions site/src/pages/WorkspacePage/WorkspacePage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ const { t } = i18next

// It renders the workspace page and waits for it be loaded
const renderWorkspacePage = async () => {
jest.spyOn(api, "checkAuthorization").mockResolvedValue({
readPagePermissions: true,
})
jest.spyOn(api, "getTemplate").mockResolvedValueOnce(MockTemplate)
jest.spyOn(api, "getTemplateVersionRichParameters").mockResolvedValueOnce([])
renderWithAuth(<WorkspacePage />, {
Expand Down Expand Up @@ -194,9 +191,6 @@ describe("WorkspacePage", () => {
it("updates the parameters when they are missing during update", async () => {
// Setup mocks
const user = userEvent.setup()
jest.spyOn(api, "checkAuthorization").mockResolvedValue({
readPagePermissions: true,
})
jest
.spyOn(api, "getWorkspaceByOwnerAndName")
.mockResolvedValueOnce(MockOutdatedWorkspace)
Expand Down
97 changes: 42 additions & 55 deletions site/src/pages/WorkspacePage/WorkspacePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@ import { Loader } from "components/Loader/Loader"
import { FC, useEffect } from "react"
import { useParams } from "react-router-dom"
import { firstOrItem } from "util/array"
import { quotaMachine } from "xServices/quotas/quotasXService"
import { workspaceMachine } from "xServices/workspace/workspaceXService"
import { WorkspaceReadyPage } from "./WorkspaceReadyPage"
import { quotaMachine } from "xServices/quotas/quotasXService"
import { RequirePermission } from "components/RequirePermission/RequirePermission"
import { useReadPagePermissions } from "hooks/useReadPagePermissions"

export const WorkspacePage: FC = () => {
const styles = useStyles()
const { username: usernameQueryParam, workspace: workspaceQueryParam } =
useParams()
const username = firstOrItem(usernameQueryParam, null)
Expand All @@ -26,13 +23,9 @@ export const WorkspacePage: FC = () => {
getTemplateParametersWarning,
checkPermissionsError,
} = workspaceState.context

// we call the below hook to make sure the user has access to view the page
const { data: permissions, isLoading: isLoadingPermissions } =
useReadPagePermissions("workspace", workspace?.id)

const [quotaState, quotaSend] = useMachine(quotaMachine)
const { getQuotaError } = quotaState.context
const styles = useStyles()

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

if (!permissions || isLoadingPermissions) {
return <Loader />
}

return (
<RequirePermission isFeatureVisible={permissions.readPagePermissions}>
<ChooseOne>
<Cond condition={workspaceState.matches("error")}>
<div className={styles.error}>
{Boolean(getWorkspaceError) && (
<AlertBanner severity="error" error={getWorkspaceError} />
)}
{Boolean(getTemplateWarning) && (
<AlertBanner severity="error" error={getTemplateWarning} />
)}
{Boolean(getTemplateParametersWarning) && (
<AlertBanner
severity="error"
error={getTemplateParametersWarning}
/>
)}
{Boolean(checkPermissionsError) && (
<AlertBanner severity="error" error={checkPermissionsError} />
)}
{Boolean(getQuotaError) && (
<AlertBanner severity="error" error={getQuotaError} />
)}
</div>
</Cond>
<Cond
condition={
Boolean(workspace) &&
workspaceState.matches("ready") &&
quotaState.matches("success")
}
>
<WorkspaceReadyPage
workspaceState={workspaceState}
quotaState={quotaState}
workspaceSend={workspaceSend}
/>
</Cond>
<Cond>
<Loader />
</Cond>
</ChooseOne>
</RequirePermission>
<ChooseOne>
<Cond condition={workspaceState.matches("error")}>
<div className={styles.error}>
{Boolean(getWorkspaceError) && (
<AlertBanner severity="error" error={getWorkspaceError} />
)}
{Boolean(getTemplateWarning) && (
<AlertBanner severity="error" error={getTemplateWarning} />
)}
{Boolean(getTemplateParametersWarning) && (
<AlertBanner
severity="error"
error={getTemplateParametersWarning}
/>
)}
{Boolean(checkPermissionsError) && (
<AlertBanner severity="error" error={checkPermissionsError} />
)}
{Boolean(getQuotaError) && (
<AlertBanner severity="error" error={getQuotaError} />
)}
</div>
</Cond>
<Cond
condition={
Boolean(workspace) &&
workspaceState.matches("ready") &&
quotaState.matches("success")
}
>
<WorkspaceReadyPage
workspaceState={workspaceState}
quotaState={quotaState}
workspaceSend={workspaceSend}
/>
</Cond>
<Cond>
<Loader />
</Cond>
</ChooseOne>
)
}

Expand Down