Skip to content

:hedgehog: PostHog is the leading platform for building self-driving products. Our developer tools – AI observability, analytics, session replay, flags, experiments, error tracking, logs, and more – capture all the context agents need to diagnose problems, uncover opportunities, and ship fixes. Steer it all from Slack, web, desktop, or the MCP.

fix(access-control): allow no access for object overrides (#122798)

Alex Lidere6e85be95ea8
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/AccessControlObject.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/AccessControlObject.tsx
index 397dded66d38..7fc3b399c190 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/AccessControlObject.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/AccessControlObject.tsx
@@ -128,7 +128,7 @@ function AccessControlObjectUsers(): JSX.Element | null {
addableMembers,
accessControlMembers,
accessControlsLoading,
- availableLevels,
+ availableLevelsWithNone,
canEditAccessControls,
} = useValues(accessControlLogic)
const { updateAccessControlMembers } = useAsyncActions(accessControlLogic)
@@ -197,7 +197,7 @@ function AccessControlObjectUsers(): JSX.Element | null {
size="small"
level={resource === 'project' ? AccessControlLevel.Admin : AccessControlLevel.Editor}
disabled={true}
- levels={availableLevels}
+ levels={availableLevelsWithNone}
onChange={() => {}}
/>
</div>
@@ -206,7 +206,8 @@ function AccessControlObjectUsers(): JSX.Element | null {
<SimplLevelComponent
size="small"
level={ac.access_level}
- levels={availableLevels}
+ disabledReason={accessControlsLoading ? 'Saving…' : undefined}
+ levels={availableLevelsWithNone}
onChange={(level) =>
void updateAccessControlMembers([{ member: ac.organization_member as string, level }])
}
@@ -274,7 +275,7 @@ function AccessControlObjectRoles(): JSX.Element | null {
accessControlsLoading,
addableRoles,
rolesById,
- availableLevels,
+ availableLevelsWithNone,
canEditAccessControls,
} = useValues(accessControlLogic)
const { updateAccessControlRoles } = useAsyncActions(accessControlLogic)
@@ -323,7 +324,8 @@ function AccessControlObjectRoles(): JSX.Element | null {
<SimplLevelComponent
size="small"
level={access_level}
- levels={availableLevels}
+ disabledReason={accessControlsLoading ? 'Saving…' : undefined}
+ levels={availableLevelsWithNone}
onChange={(level) => void updateAccessControlRoles([{ role, level }])}
/>
</div>
@@ -449,9 +451,10 @@ function AddItemsControlsModal(props: {
label: string
}[]
}): JSX.Element | null {
- const { availableLevels, canEditAccessControls } = useValues(accessControlLogic)
+ const { availableLevels, availableLevelsWithNone, canEditAccessControls } = useValues(accessControlLogic)
// TODO: Move this into a form logic
const [items, setItems] = useState<string[]>([])
+ const [submitting, setSubmitting] = useState(false)
const [level, setLevel] = useState<AccessControlLevel | null>(availableLevels[0] ?? null)
useEffect(() => {
@@ -460,11 +463,16 @@ function AddItemsControlsModal(props: {
const onSubmit =
items.length && level
- ? (): void =>
- void props.onAdd(items, level).then(() => {
- setItems([])
- setLevel(availableLevels[0] ?? null)
- })
+ ? (): void => {
+ setSubmitting(true)
+ void props
+ .onAdd(items, level)
+ .then(() => {
+ setItems([])
+ setLevel(availableLevels[0] ?? null)
+ })
+ .finally(() => setSubmitting(false))
+ }
: undefined
return (
@@ -473,7 +481,7 @@ function AddItemsControlsModal(props: {
onClose={() => props.setModelOpen(false)}
title="Add access"
maxWidth="30rem"
- description="Allow other users or roles to access this resource"
+ description="Set access for specific users or roles on this resource"
footer={
<div className="flex items-center justify-end gap-2">
<LemonButton type="secondary" onClick={() => props.setModelOpen(false)}>
@@ -482,6 +490,7 @@ function AddItemsControlsModal(props: {
<LemonButton
type="primary"
onClick={onSubmit}
+ loading={submitting}
disabledReason={
!canEditAccessControls
? 'You cannot edit this'
@@ -496,7 +505,7 @@ function AddItemsControlsModal(props: {
}
>
<div className="flex gap-2 items-center w-full">
- <div className="min-w-[16rem] w-full">
+ <div className="min-w-0 flex-1">
<LemonInputSelect
placeholder={props.placeholder}
value={items}
@@ -506,7 +515,7 @@ function AddItemsControlsModal(props: {
disabled={!canEditAccessControls}
/>
</div>
- <SimplLevelComponent levels={availableLevels} level={level} onChange={setLevel} />
+ <SimplLevelComponent levels={availableLevelsWithNone} level={level} onChange={setLevel} />
</div>
</LemonModal>
)
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAccessControlMembers.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAccessControlMembers.tsx
index 1d712155fa26..bdcf7582dd05 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAccessControlMembers.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAccessControlMembers.tsx
@@ -22,8 +22,14 @@ import { QuillRemoveAccessButton } from './QuillRemoveAccessButton'
export function QuillAccessControlMembers(): JSX.Element | null {
const { user } = useValues(userLogic)
- const { resource, membersById, addableMembers, accessControlMembers, availableLevels, accessControlsLoading } =
- useValues(accessControlLogic)
+ const {
+ resource,
+ membersById,
+ addableMembers,
+ accessControlMembers,
+ availableLevelsWithNone,
+ accessControlsLoading,
+ } = useValues(accessControlLogic)
// Each change saves the whole list, so a second change before the first lands could overwrite it.
const savingReason = accessControlsLoading ? 'Saving…' : undefined
const { updateAccessControlMembers } = useAsyncActions(accessControlLogic)
@@ -58,7 +64,7 @@ export function QuillAccessControlMembers(): JSX.Element | null {
<QuillAccessLevelSelect
level={resource === 'project' ? AccessControlLevel.Admin : AccessControlLevel.Editor}
disabled
- levels={availableLevels}
+ levels={availableLevelsWithNone}
onChange={() => {}}
/>
</ItemActions>
@@ -83,7 +89,7 @@ export function QuillAccessControlMembers(): JSX.Element | null {
<ItemActions>
<QuillAccessLevelSelect
level={memberAc.access_level}
- levels={availableLevels}
+ levels={availableLevelsWithNone}
disabledReason={savingReason}
onChange={(level) =>
void updateAccessControlMembers([{ member: memberAc.organization_member as string, level }])
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAccessControlRoles.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAccessControlRoles.tsx
index 9095112891c8..62f2ee966c18 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAccessControlRoles.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAccessControlRoles.tsx
@@ -15,7 +15,7 @@ import { QuillAccessSection } from './QuillAccessSection'
import { QuillRemoveAccessButton } from './QuillRemoveAccessButton'
export function QuillAccessControlRoles(): JSX.Element {
- const { accessControlRoles, addableRoles, rolesById, availableLevels, accessControlsLoading } =
+ const { accessControlRoles, addableRoles, rolesById, availableLevelsWithNone, accessControlsLoading } =
useValues(accessControlLogic)
// Each change saves the whole list, so a second change before the first lands could overwrite it.
const savingReason = accessControlsLoading ? 'Saving…' : undefined
@@ -48,7 +48,7 @@ export function QuillAccessControlRoles(): JSX.Element {
<ItemActions>
<QuillAccessLevelSelect
level={access_level}
- levels={availableLevels}
+ levels={availableLevelsWithNone}
disabledReason={savingReason}
onChange={(level) => void updateAccessControlRoles([{ role, level }])}
/>
diff --git a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAddAccessDialog.tsx b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAddAccessDialog.tsx
index bbc922d8affb..ce82483e9e7c 100644
--- a/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAddAccessDialog.tsx
+++ b/frontend/src/layout/navigation-3000/sidepanel/panels/access_control/quill/QuillAddAccessDialog.tsx
@@ -60,7 +60,7 @@ interface QuillAddAccessDialogProps {
}
export function QuillAddAccessDialog(props: QuillAddAccessDialogProps): JSX.Element {
- const { availableLevels, canEditAccessControls } = useValues(accessControlLogic)
+ const { availableLevels, availableLevelsWithNone, canEditAccessControls } = useValues(accessControlLogic)
const [items, setItems] = useState<string[]>([])
const [level, setLevel] = useState<AccessControlLevel | null>(availableLevels[0] ?? null)
const [submitting, setSubmitting] = useState(false)
@@ -96,7 +96,7 @@ export function QuillAddAccessDialog(props: QuillAddAccessDialogProps): JSX.Elem
<DialogContent>
<DialogHeader>
<DialogTitle>Add access</DialogTitle>
- <DialogDescription>Allow other users or roles to access this resource</DialogDescription>
+ <DialogDescription>Set access for specific users or roles on this resource</DialogDescription>
</DialogHeader>
<DialogBody>
<FieldGroup>
@@ -125,7 +125,11 @@ export function QuillAddAccessDialog(props: QuillAddAccessDialogProps): JSX.Elem
<Field>
<FieldTitle>Access level</FieldTitle>
<div>
- <QuillAccessLevelSelect levels={availableLevels} level={level} onChange={setLevel} />
+ <QuillAccessLevelSelect
+ levels={availableLevelsWithNone}
+ level={level}
+ onChange={setLevel}
+ />
</div>
</Field>
</FieldGroup>