Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: add template RBAC #4125

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.

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

Closed
wants to merge 41 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
5a47132
feat: Add ACL list support to rego objects
Emyrk Sep 13, 2022
03f69bf
Add unit tests
Emyrk Sep 13, 2022
91a358d
Rename ACL list
Emyrk Sep 13, 2022
8f837b7
Flip rego json to key by user id
Emyrk Sep 15, 2022
8378c9b
feat: add template ACL
sreya Sep 17, 2022
54a0d13
add down migration
sreya Sep 19, 2022
72ea751
remove unused file
sreya Sep 19, 2022
d533a16
undo insert templates query change
sreya Sep 19, 2022
f56fcf9
add patch endpoint tests
sreya Sep 19, 2022
f162694
Unit test use shadowed copied value
Emyrk Sep 19, 2022
ea25c08
Allow wildcards for ACL list
Emyrk Sep 19, 2022
5a081eb
fix authorize bug
sreya Sep 19, 2022
072b3e4
feat: Allow filter to accept objects of multiple types
Emyrk Sep 19, 2022
205c36c
add support for private templates
sreya Sep 19, 2022
ba32928
go.mod
sreya Sep 19, 2022
5c6344f
Merge branch 'main' into resource_acl_list
sreya Sep 19, 2022
ef15908
fix rbac merge woes
sreya Sep 19, 2022
8ab5200
update migration
sreya Sep 19, 2022
c040e8e
fix workspaces_test
sreya Sep 19, 2022
1f4ceee
remove sqlx
sreya Sep 19, 2022
7cc71e1
fix audit
sreya Sep 19, 2022
131d5ed
fix lint
sreya Sep 19, 2022
8c3ee6a
Revert "remove sqlx"
sreya Sep 19, 2022
fe2af91
add test for list templates
sreya Sep 20, 2022
0218c4e
fix error msg
sreya Sep 20, 2022
6883106
fix sqlx woes
sreya Sep 20, 2022
4fbd9be
fix lint
sreya Sep 20, 2022
c96a6ca
fix audit
sreya Sep 20, 2022
57ba8b3
make gen
sreya Sep 20, 2022
c66d247
Merge branch 'main' into resource_acl_list
sreya Sep 20, 2022
0af367a
fix merge woes
sreya Sep 20, 2022
f6c3f51
fix test template
sreya Sep 20, 2022
6e72286
fmt
sreya Sep 20, 2022
44bcbde
Add base layout
BrunoQuaresma Sep 21, 2022
0f80beb
Add table
BrunoQuaresma Sep 21, 2022
d274d62
Add search user
BrunoQuaresma Sep 21, 2022
943c76b
Add user role
BrunoQuaresma Sep 21, 2022
7f7f1d3
Add update and delete
BrunoQuaresma Sep 21, 2022
967a1a9
Fix summary view
BrunoQuaresma Sep 21, 2022
1324991
Merge branch 'resource_acl_list' of github.com:coder/coder into resou…
BrunoQuaresma Sep 21, 2022
bd34d20
Merge branch 'resource_acl_list' of github.com:coder/coder into resou…
sreya Sep 22, 2022
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
Prev Previous commit
Next Next commit
Add base layout
  • Loading branch information
BrunoQuaresma committed Sep 21, 2022
commit 44bcbde4486406442a5146940eb487c2033713cd
18 changes: 15 additions & 3 deletions site/src/AppRouter.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { useSelector } from "@xstate/react"
import { FeatureNames } from "api/types"
import { RequirePermission } from "components/RequirePermission/RequirePermission"
import { TemplateLayout } from "components/TemplateLayout/TemplateLayout"
import { SetupPage } from "pages/SetupPage/SetupPage"
import TemplateCollaboratorsPage from "pages/TemplatePage/TemplateCollaboratorsPage/TemplateCollaboratorsPage"
import TemplateSummaryPage from "pages/TemplatePage/TemplateSummaryPage/TemplateSummaryPage"
import { TemplateSettingsPage } from "pages/TemplateSettingsPage/TemplateSettingsPage"
import { FC, lazy, Suspense, useContext } from "react"
import { Route, Routes } from "react-router-dom"
Expand Down Expand Up @@ -33,7 +36,6 @@ const TerminalPage = lazy(() => import("./pages/TerminalPage/TerminalPage"))
const WorkspacesPage = lazy(() => import("./pages/WorkspacesPage/WorkspacesPage"))
const CreateWorkspacePage = lazy(() => import("./pages/CreateWorkspacePage/CreateWorkspacePage"))
const AuditPage = lazy(() => import("./pages/AuditPage/AuditPage"))
const TemplatePage = lazy(() => import("./pages/TemplatePage/TemplatePage"))

export const AppRouter: FC = () => {
const xServices = useContext(XServiceContext)
Expand Down Expand Up @@ -87,12 +89,22 @@ export const AppRouter: FC = () => {

<Route path=":template">
<Route
index
element={
<AuthAndFrame>
<TemplatePage />
<TemplateLayout />
</AuthAndFrame>
}
>
<Route index element={<TemplateSummaryPage />} />
<Route path="collaborators" element={<TemplateCollaboratorsPage />} />
</Route>
<Route
path="workspace"
element={
<RequireAuth>
<CreateWorkspacePage />
</RequireAuth>
}
/>
<Route
path="workspace"
Expand Down
231 changes: 231 additions & 0 deletions site/src/components/TemplateLayout/TemplateLayout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
import Avatar from "@material-ui/core/Avatar"
import Button from "@material-ui/core/Button"
import Link from "@material-ui/core/Link"
import { makeStyles } from "@material-ui/core/styles"
import AddCircleOutline from "@material-ui/icons/AddCircleOutline"
import SettingsOutlined from "@material-ui/icons/SettingsOutlined"
import { useMachine, useSelector } from "@xstate/react"
import { DeleteDialog } from "components/Dialogs/DeleteDialog/DeleteDialog"
import { DeleteButton } from "components/DropdownButton/ActionCtas"
import { DropdownButton } from "components/DropdownButton/DropdownButton"
import { Loader } from "components/Loader/Loader"
import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "components/PageHeader/PageHeader"
import { useOrganizationId } from "hooks/useOrganizationId"
import { FC, useContext } from "react"
import { useTranslation } from "react-i18next"
import { Link as RouterLink, Navigate, NavLink, Outlet, useParams } from "react-router-dom"
import { combineClasses } from "util/combineClasses"
import { firstLetter } from "util/firstLetter"
import { selectPermissions } from "xServices/auth/authSelectors"
import { XServiceContext } from "xServices/StateContext"
import { templateMachine } from "xServices/template/templateXService"
import { Margins } from "../../components/Margins/Margins"
import { Stack } from "../../components/Stack/Stack"

const useTemplateName = () => {
const { template } = useParams()

if (!template) {
throw new Error("No template found in the URL")
}

return template
}

const Language = {
settingsButton: "Settings",
createButton: "Create workspace",
noDescription: "",
}

export const TemplateLayout: FC = () => {
const styles = useStyles()
const organizationId = useOrganizationId()
const templateName = useTemplateName()
const { t } = useTranslation("templatePage")
const [templateState, templateSend] = useMachine(templateMachine, {
context: {
templateName,
organizationId,
},
})
const { template, activeTemplateVersion, templateResources, templateDAUs } = templateState.context
const xServices = useContext(XServiceContext)
const permissions = useSelector(xServices.authXService, selectPermissions)
const isLoading =
!template || !activeTemplateVersion || !templateResources || !permissions || !templateDAUs

if (isLoading) {
return <Loader />
}

if (templateState.matches("deleted")) {
return <Navigate to="/templates" />
}

const hasIcon = template.icon && template.icon !== ""

const createWorkspaceButton = (className?: string) => (
<Link underline="none" component={RouterLink} to={`/templates/${template.name}/workspace`}>
<Button className={className ?? ""} startIcon={<AddCircleOutline />}>
{Language.createButton}
</Button>
</Link>
)

const handleDeleteTemplate = () => {
templateSend("DELETE")
}

return (
<>
<Margins>
<PageHeader
actions={
<>
<Link
underline="none"
component={RouterLink}
to={`/templates/${template.name}/settings`}
>
<Button variant="outlined" startIcon={<SettingsOutlined />}>
{Language.settingsButton}
</Button>
</Link>

{permissions.deleteTemplates ? (
<DropdownButton
primaryAction={createWorkspaceButton(styles.actionButton)}
secondaryActions={[
{
action: "delete",
button: <DeleteButton handleAction={handleDeleteTemplate} />,
},
]}
canCancel={false}
/>
) : (
createWorkspaceButton()
)}
</>
}
>
<Stack direction="row" spacing={3} className={styles.pageTitle}>
<div>
{hasIcon ? (
<div className={styles.iconWrapper}>
<img src={template.icon} alt="" />
</div>
) : (
<Avatar className={styles.avatar}>{firstLetter(template.name)}</Avatar>
)}
</div>
<div>
<PageHeaderTitle>{template.name}</PageHeaderTitle>
<PageHeaderSubtitle condensed>
{template.description === "" ? Language.noDescription : template.description}
</PageHeaderSubtitle>
</div>
</Stack>
</PageHeader>
</Margins>

<div className={styles.tabs}>
<Margins>
<Stack direction="row" spacing={0.25}>
<NavLink
end
to={`/templates/${template.name}`}
className={({ isActive }) =>
combineClasses([styles.tabItem, isActive ? styles.tabItemActive : undefined])
}
>
Summary
</NavLink>
<NavLink
to={`/templates/${template.name}/collaborators`}
className={({ isActive }) =>
combineClasses([styles.tabItem, isActive ? styles.tabItemActive : undefined])
}
>
Collaborators
</NavLink>
</Stack>
</Margins>
</div>

<Margins>
<Outlet context={templateState.context} />
</Margins>

<DeleteDialog
isOpen={templateState.matches("confirmingDelete")}
confirmLoading={templateState.matches("deleting")}
title={t("deleteDialog.title")}
description={t("deleteDialog.description")}
onConfirm={() => {
templateSend("CONFIRM_DELETE")
}}
onCancel={() => {
templateSend("CANCEL_DELETE")
}}
/>
</>
)
}

export const useStyles = makeStyles((theme) => {
return {
actionButton: {
border: "none",
borderRadius: `${theme.shape.borderRadius}px 0px 0px ${theme.shape.borderRadius}px`,
},
pageTitle: {
alignItems: "center",
},
avatar: {
width: theme.spacing(6),
height: theme.spacing(6),
fontSize: theme.spacing(3),
},
iconWrapper: {
width: theme.spacing(6),
height: theme.spacing(6),
"& img": {
width: "100%",
},
},

tabs: {
borderBottom: `1px solid ${theme.palette.divider}`,
marginBottom: theme.spacing(5),
},

tabItem: {
textDecoration: "none",
color: theme.palette.text.secondary,
fontSize: 14,
display: "block",
padding: theme.spacing(0, 2, 2),

"&:hover": {
color: theme.palette.text.primary,
},
},

tabItemActive: {
color: theme.palette.text.primary,
position: "relative",

"&:before": {
content: `""`,
left: 0,
bottom: 0,
height: 2,
width: "100%",
background: theme.palette.secondary.dark,
position: "absolute",
},
},
}
})
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { FC } from "react"
import { Helmet } from "react-helmet-async"
import { useOutletContext } from "react-router-dom"
import { pageTitle } from "util/page"
import { TemplateContext } from "xServices/template/templateXService"
import { TemplateCollaboratorsPageView } from "./TemplateCollaboratorsPageView"

export const TemplateCollaboratorsPage: FC<React.PropsWithChildren<unknown>> = () => {
const { template, activeTemplateVersion, templateResources, deleteTemplateError } =
useOutletContext<TemplateContext>()

if (!template || !activeTemplateVersion || !templateResources) {
throw new Error(
"This page should not be displayed until template, activeTemplateVersion or templateResources being loaded.",
)
}

return (
<>
<Helmet>
<title>{pageTitle(`${template.name} · Collaborators`)}</title>
</Helmet>
<TemplateCollaboratorsPageView deleteTemplateError={deleteTemplateError} />
</>
)
}

export default TemplateCollaboratorsPage
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { makeStyles } from "@material-ui/core/styles"
import { ErrorSummary } from "components/ErrorSummary/ErrorSummary"
import { Stack } from "components/Stack/Stack"
import { FC } from "react"

export interface TemplateCollaboratorsPageViewProps {
deleteTemplateError: Error | unknown
}

export const TemplateCollaboratorsPageView: FC<
React.PropsWithChildren<TemplateCollaboratorsPageViewProps>
> = ({ deleteTemplateError }) => {
const deleteError = deleteTemplateError ? (
<ErrorSummary error={deleteTemplateError} dismissible />
) : null

return (
<Stack spacing={2.5}>
{deleteError}
<h2>Collaborators</h2>
</Stack>
)
}

export const useStyles = makeStyles(() => {
return {}
})
Loading