: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.
Python ab-testingai-analyticsanalyticscdpdata-warehouseexperimentsfeature-flagsjavascriptproduct-analyticspythonreactsession-replaysurveystypescriptweb-analytics
fix(approvals): let member approvers vote from the settings list (#123254)
Eleftheria Trivyzaki531e60d212be
diff --git a/frontend/src/scenes/approvals/ChangeRequestActions.tsx b/frontend/src/scenes/approvals/ChangeRequestActions.tsxindex dec510b46982..76e82c7b9637 100644--- a/frontend/src/scenes/approvals/ChangeRequestActions.tsx+++ b/frontend/src/scenes/approvals/ChangeRequestActions.tsx@@ -9,7 +9,7 @@ import { ChangeRequest } from '~/types'export interface ChangeRequestActionsProps {changeRequest: ChangeRequestonApprove: (id: string) => void- onReject: (id: string, reason?: string) => void+ onReject: (id: string, reason: string) => voidonCancel: (id: string, reason?: string) => voidshowViewButton?: boolean/** When the user can't approve, show a disabled Approve button explaining why instead of hiding it. */@@ -21,7 +21,8 @@ export function changeRequestDialogHandlers({onApprove,onReject,onCancel,-}: Pick<ChangeRequestActionsProps, 'changeRequest' | 'onApprove' | 'onReject' | 'onCancel'>): {+}: Pick<ChangeRequestActionsProps, 'changeRequest' | 'onApprove' | 'onReject'> &+ Partial<Pick<ChangeRequestActionsProps, 'onCancel'>>): {handleApprove: () => voidhandleReject: () => voidhandleCancel: () => void@@ -98,7 +99,7 @@ export function changeRequestDialogHandlers({status: 'danger',onClick: () => {const reason = (document.getElementById('cancel-reason') as HTMLInputElement)?.value- onCancel(changeRequest.id, reason || undefined)+ onCancel?.(changeRequest.id, reason || undefined)},size: 'small',},diff --git a/frontend/src/scenes/settings/organization/Approvals/ChangeRequestTableActions.test.tsx b/frontend/src/scenes/settings/organization/Approvals/ChangeRequestTableActions.test.tsxnew file mode 100644index 000000000000..a83236a95653--- /dev/null+++ b/frontend/src/scenes/settings/organization/Approvals/ChangeRequestTableActions.test.tsx@@ -0,0 +1,79 @@+import { MOCK_DEFAULT_ORGANIZATION } from 'lib/api.mock'++import '@testing-library/jest-dom'++import { cleanup, render, screen, within } from '@testing-library/react'+import userEvent from '@testing-library/user-event'++import { OrganizationMembershipLevel } from 'lib/constants'+import { organizationLogic } from 'scenes/organizationLogic'++import { initKeaTests } from '~/test/init'+import { ChangeRequest, ChangeRequestState, ValidationStatus } from '~/types'++import { ChangeRequestTableActions } from './ChangeRequestTableActions'++const pendingChangeRequest: ChangeRequest = {+ id: 'cr-1',+ action_key: 'feature_flag.enable',+ action_version: 1,+ resource_type: 'feature_flag',+ resource_id: '123',+ intent: { flag_key: 'my-flag' },+ intent_display: { description: 'Enable my-flag' },+ policy_snapshot: { quorum: 1, roles: ['role-1'], allow_self_approve: false },+ validation_status: ValidationStatus.Valid,+ validation_errors: null,+ validated_at: null,+ state: ChangeRequestState.Pending,+ created_by: { id: 1, uuid: 'user-1', distinct_id: 'distinct-1', first_name: 'Admin', email: '[email protected]' },+ applied_by: null,+ created_at: '2026-01-01T00:00:00Z',+ updated_at: '2026-01-01T00:00:00Z',+ expires_at: '2026-01-15T00:00:00Z',+ applied_at: null,+ apply_error: '',+ result_data: null,+ approvals: [],+ can_approve: true,+ can_cancel: false,+ is_requester: false,+ user_decision: null,+}++describe('<ChangeRequestTableActions />', () => {+ beforeEach(() => {+ initKeaTests()+ organizationLogic.mount()+ organizationLogic.actions.loadCurrentOrganizationSuccess({+ ...MOCK_DEFAULT_ORGANIZATION,+ membership_level: OrganizationMembershipLevel.Member,+ })+ })++ afterEach(() => {+ cleanup()+ })++ it('lets an organization member who is in the approver set approve from the row menu', async () => {+ const onApprove = jest.fn()+ const { container } = render(+ <ChangeRequestTableActions+ changeRequest={pendingChangeRequest}+ onApprove={onApprove}+ onReject={jest.fn()}+ />+ )++ await userEvent.click(container.querySelector('[data-attr="more-button"]') as HTMLElement)++ const approveButton = screen.getByText('Approve').closest('button') as HTMLButtonElement+ expect(approveButton).toHaveAttribute('aria-disabled', 'false')++ await userEvent.click(approveButton)+ const dialog = screen.getByText('Approve this change request?').closest('.LemonModal') as HTMLElement+ await userEvent.click(within(dialog).getByText('Approve'))++ expect(onApprove).toHaveBeenCalledWith('cr-1')+ })+})diff --git a/frontend/src/scenes/settings/organization/Approvals/ChangeRequestTableActions.tsx b/frontend/src/scenes/settings/organization/Approvals/ChangeRequestTableActions.tsxnew file mode 100644index 000000000000..1156a01ecf89--- /dev/null+++ b/frontend/src/scenes/settings/organization/Approvals/ChangeRequestTableActions.tsx@@ -0,0 +1,45 @@+import { LemonButton } from '@posthog/lemon-ui'++import { More } from 'lib/lemon-ui/LemonButton/More'+import { changeRequestDialogHandlers } from 'scenes/approvals/ChangeRequestActions'+import { getChangeRequestButtonVisibility } from 'scenes/approvals/changeRequestsLogic'+import { urls } from 'scenes/urls'++import { ChangeRequest } from '~/types'++export interface ChangeRequestTableActionsProps {+ changeRequest: ChangeRequest+ onApprove: (id: string) => void+ onReject: (id: string, reason: string) => void+}++export function ChangeRequestTableActions({+ changeRequest,+ onApprove,+ onReject,+}: ChangeRequestTableActionsProps): JSX.Element {+ const { showApproveButton, showRejectButton } = getChangeRequestButtonVisibility(changeRequest)+ const { handleApprove, handleReject } = changeRequestDialogHandlers({ changeRequest, onApprove, onReject })++ return (+ <More+ overlay={+ <>+ <LemonButton fullWidth to={urls.approval(changeRequest.id)}>+ View details+ </LemonButton>+ {showApproveButton && (+ <LemonButton fullWidth type="primary" onClick={handleApprove}>+ Approve+ </LemonButton>+ )}+ {showRejectButton && (+ <LemonButton fullWidth status="danger" onClick={handleReject}>+ Reject+ </LemonButton>+ )}+ </>+ }+ />+ )+}diff --git a/frontend/src/scenes/settings/organization/Approvals/ChangeRequestsList.tsx b/frontend/src/scenes/settings/organization/Approvals/ChangeRequestsList.tsxindex a2b202e6c558..7c8d771fafc5 100644--- a/frontend/src/scenes/settings/organization/Approvals/ChangeRequestsList.tsx+++ b/frontend/src/scenes/settings/organization/Approvals/ChangeRequestsList.tsx@@ -1,25 +1,22 @@import { useActions, useValues } from 'kea'-import { router } from 'kea-router'-import { LemonButton, LemonDialog, LemonInput, LemonSelect, LemonTable, LemonTag, lemonToast } from '@posthog/lemon-ui'+import { LemonButton, LemonSelect, LemonTable, LemonTag } from '@posthog/lemon-ui'import { PayGateMini } from 'lib/components/PayGateMini/PayGateMini'-import { RestrictionScope, useRestrictedArea } from 'lib/components/RestrictedArea'import { TZLabel } from 'lib/components/TZLabel'-import { OrganizationMembershipLevel } from 'lib/constants'import { dayjs } from 'lib/dayjs'-import { More } from 'lib/lemon-ui/LemonButton/More'import { LemonTableColumn } from 'lib/lemon-ui/LemonTable'import { LemonTableLink } from 'lib/lemon-ui/LemonTable/LemonTableLink'import { ProfilePicture } from 'lib/lemon-ui/ProfilePicture'import { cn } from 'lib/utils/css-classes'import { approvalsLogic } from 'scenes/approvals/approvalsLogic'-import { getChangeRequestButtonVisibility } from 'scenes/approvals/changeRequestsLogic'import { getApprovalActionLabel, getApprovalResourceName, getApprovalResourceUrl } from 'scenes/approvals/utils'import { urls } from 'scenes/urls'import { AvailableFeature, ChangeRequest, ChangeRequestState } from '~/types'+import { ChangeRequestTableActions } from './ChangeRequestTableActions'+export function ChangeRequestsList(): JSX.Element {const { changeRequests, changeRequestsDataLoading, filters, hasMore } = useValues(approvalsLogic)const { setFilters, loadMore, approveChangeRequest, rejectChangeRequest } = useActions(approvalsLogic)@@ -175,113 +172,6 @@ export function ChangeRequestsList(): JSX.Element {)}-function ChangeRequestTableActions({- changeRequest,- onApprove,- onReject,-}: {- changeRequest: ChangeRequest- onApprove: (id: string) => void- onReject: (id: string, reason: string) => void-}): JSX.Element {- const restrictedReason = useRestrictedArea({- scope: RestrictionScope.Organization,- minimumAccessLevel: OrganizationMembershipLevel.Admin,- })- const { showApproveButton, showRejectButton } = getChangeRequestButtonVisibility(changeRequest)-- return (- <More- overlay={- <>- <LemonButton fullWidth onClick={() => router.actions.push(urls.approval(changeRequest.id))}>- View details- </LemonButton>- {showApproveButton && (- <LemonButton- fullWidth- type="primary"- disabledReason={restrictedReason}- onClick={() => {- LemonDialog.open({- title: 'Approve this change request?',- content: (- <div className="text-sm text-secondary">- This will add your approval to the change request.- {changeRequest.policy_snapshot?.quorum === 1- ? ' The change will be applied automatically.'- : ''}- </div>- ),- primaryButton: {- children: 'Approve',- type: 'primary',- onClick: () => onApprove(changeRequest.id),- size: 'small',- },- secondaryButton: {- children: 'Cancel',- type: 'tertiary',- size: 'small',- },- })- }}- >- Approve- </LemonButton>- )}- {showRejectButton && (- <LemonButton- fullWidth- status="danger"- disabledReason={restrictedReason}- onClick={() => {- LemonDialog.open({- title: 'Reject this change request?',- content: (- <div>- <div className="text-sm text-secondary mb-2">- This will reject the change request and prevent it from being applied.- </div>- <LemonInput- id="reject-reason"- placeholder="Reason for rejection (required)"- />- </div>- ),- primaryButton: {- children: 'Reject',- type: 'primary',- status: 'danger',- onClick: () => {- const reason = (- document.getElementById('reject-reason') as HTMLInputElement- )?.value- if (!reason) {- lemonToast.error('Please provide a reason for rejection')- return- }- onReject(changeRequest.id, reason)- },- size: 'small',- },- secondaryButton: {- children: 'Cancel',- type: 'tertiary',- size: 'small',- },- })- }}- >- Reject- </LemonButton>- )}- </>- }- />- )-}-function StatusTag({ state }: { state: ChangeRequestState }): JSX.Element {const tagTypes = {[ChangeRequestState.Pending]: 'default',