diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx index c805e33c02cef..673d12a1e2e23 100644 --- a/site/src/pages/WorkspacePage/WorkspacePage.tsx +++ b/site/src/pages/WorkspacePage/WorkspacePage.tsx @@ -9,6 +9,7 @@ import { firstOrItem } from "util/array" import { quotaMachine } from "xServices/quotas/quotasXService" import { workspaceMachine } from "xServices/workspace/workspaceXService" import { WorkspaceReadyPage } from "./WorkspaceReadyPage" +import { RequirePermission } from "components/RequirePermission/RequirePermission" export const WorkspacePage: FC = () => { const { username: usernameQueryParam, workspace: workspaceQueryParam } = @@ -42,46 +43,50 @@ export const WorkspacePage: FC = () => { }, [username, quotaSend]) return ( - - - - {Boolean(getWorkspaceError) && ( - - )} - {Boolean(getTemplateWarning) && ( - - )} - {Boolean(getTemplateParametersWarning) && ( - - )} - {Boolean(checkPermissionsError) && ( - - )} - {Boolean(getQuotaError) && ( - - )} - - - - - - - - - + + + + + {Boolean(getWorkspaceError) && ( + + )} + {Boolean(getTemplateWarning) && ( + + )} + {Boolean(getTemplateParametersWarning) && ( + + )} + {Boolean(checkPermissionsError) && ( + + )} + {Boolean(getQuotaError) && ( + + )} + + + + + + + + + + ) } diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts index 1fc1c543fd78e..4a5f47506be6a 100644 --- a/site/src/xServices/workspace/workspaceXService.ts +++ b/site/src/xServices/workspace/workspaceXService.ts @@ -9,6 +9,7 @@ import { displayError, displaySuccess, } from "../../components/GlobalSnackbar/utils" +import { AxiosError } from "axios" const latestBuild = (builds: TypesGen.WorkspaceBuild[]) => { // Cloning builds to not change the origin object with the sort() @@ -56,7 +57,7 @@ export interface WorkspaceContext { workspace?: TypesGen.Workspace template?: TypesGen.Template build?: TypesGen.WorkspaceBuild - getWorkspaceError?: Error | unknown + getWorkspaceError?: AxiosError getTemplateWarning: Error | unknown getTemplateParametersWarning: Error | unknown // Builds @@ -491,7 +492,7 @@ export const workspaceMachine = createMachine( workspace: (_, event) => event.data, }), assignGetWorkspaceError: assign({ - getWorkspaceError: (_, event) => event.data, + getWorkspaceError: (_, event) => event.data as AxiosError, }), clearGetWorkspaceError: (context) => assign({ ...context, getWorkspaceError: undefined }),