SigNoz is an open-source, OpenTelemetry-native observability platform for your team and their AI agents. Get logs, metrics, and traces in one tool with features like APM, distributed tracing, log management, infra monitoring, etc. Combined with SigNoz MCP and a native AI teammate (in SigNoz Cloud) it helps you build more resilient apps.
TypeScript apmapplication-monitoringdistributed-tracinggogood-first-issuejaegerloglogsmetricsmonitoringnextjsobservabilityopen-sourceopentelemetryprometheusreactreactjsself-hostedtracingtypescript
refactor(authz): ensure roles/service-accounts follow the guidelines (#12348)
Vinicius Lourenço159354a51139
diff --git a/frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx b/frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsxindex bf6ea463d1..83e9807ffb 100644--- a/frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx+++ b/frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx@@ -3,6 +3,7 @@ import { useQueryClient } from 'react-query';import { X } from '@signozhq/icons';import { Button } from '@signozhq/ui/button';import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';+import { AuthZGuardContent } from 'lib/authz/components/AuthZGuard/AuthZGuardContent';import { SACreatePermission } from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';import { DialogFooter, DialogWrapper } from '@signozhq/ui/dialog';import { Input } from '@signozhq/ui/input';@@ -20,6 +21,7 @@ import { useErrorModal } from 'providers/ErrorModalProvider';import APIError from 'types/api/error';import './CreateServiceAccountModal.styles.scss';+import { Skeleton } from 'antd';interface FormValues {name: string;@@ -95,33 +97,39 @@ function CreateServiceAccountModal(): JSX.Element {testId="create-service-account-modal"><div className="create-sa-modal__content">- <form- id="create-sa-form"- className="create-sa-form"- onSubmit={handleSubmit(handleCreate)}+ <AuthZGuardContent+ checks={[SACreatePermission]}+ fallbackOnLoading={<Skeleton active paragraph={{ rows: 1 }} />}>- <div className="create-sa-form__item">- <label htmlFor="sa-name">Name</label>- <Controller- name="name"- control={control}- rules={{ required: 'Name is required' }}- render={({ field }): JSX.Element => (- <Input- id="sa-name"- placeholder="Enter a name"- className="create-sa-form__input"- value={field.value}- onChange={field.onChange}- onBlur={field.onBlur}- />+ <form+ id="create-sa-form"+ className="create-sa-form"+ onSubmit={handleSubmit(handleCreate)}+ >+ <div className="create-sa-form__item">+ <label htmlFor="sa-name">Name</label>+ <Controller+ name="name"+ control={control}+ rules={{ required: 'Name is required' }}+ render={({ field }): JSX.Element => (+ <Input+ id="sa-name"+ placeholder="Enter a name"+ className="create-sa-form__input"+ value={field.value}+ onChange={field.onChange}+ onBlur={field.onBlur}+ data-testid="create-sa-name-input"+ />+ )}+ />+ {errors.name && (+ <p className="create-sa-form__error">{errors.name.message}</p>)}- />- {errors.name && (- <p className="create-sa-form__error">{errors.name.message}</p>- )}- </div>- </form>+ </div>+ </form>+ </AuthZGuardContent></div><DialogFooter className="create-sa-modal__footer">@@ -130,6 +138,7 @@ function CreateServiceAccountModal(): JSX.Element {variant="solid"color="secondary"onClick={handleClose}+ data-testid="create-sa-cancel-btn"><X size={12} />Cancel@@ -137,12 +146,14 @@ function CreateServiceAccountModal(): JSX.Element {<AuthZButtonchecks={[SACreatePermission]}+ withPortal={false}type="submit"form="create-sa-form"variant="solid"color="primary"loading={isSubmitting}disabled={!isValid}+ data-testid="create-sa-submit-btn">Create Service Account</AuthZButton>diff --git a/frontend/src/components/CreateServiceAccountModal/__tests__/CreateServiceAccountModal.test.tsx b/frontend/src/components/CreateServiceAccountModal/__tests__/CreateServiceAccountModal.test.tsxindex 8643cf4c89..8d216839bd 100644--- a/frontend/src/components/CreateServiceAccountModal/__tests__/CreateServiceAccountModal.test.tsx+++ b/frontend/src/components/CreateServiceAccountModal/__tests__/CreateServiceAccountModal.test.tsx@@ -1,19 +1,14 @@import { toast } from '@signozhq/ui/sonner';+import {+ setupAuthzAdmin,+ setupAuthzDenyAll,+} from 'lib/authz/utils/authz-test-utils';import { rest, server } from 'mocks-server/server';import { NuqsTestingAdapter } from 'nuqs/adapters/testing';import { render, screen, userEvent, waitFor } from 'tests/test-utils';import CreateServiceAccountModal from '../CreateServiceAccountModal';-jest.mock('lib/authz/components/AuthZTooltip/AuthZTooltip', () => ({- __esModule: true,- default: ({- children,- }: {- children: React.ReactElement;- }): React.ReactElement => children,-}));-jest.mock('@signozhq/ui/sonner', () => ({...jest.requireActual('@signozhq/ui/sonner'),toast: { success: jest.fn(), error: jest.fn() },@@ -45,6 +40,7 @@ describe('CreateServiceAccountModal', () => {beforeEach(() => {jest.clearAllMocks();server.use(+ setupAuthzAdmin(),rest.post(SERVICE_ACCOUNTS_ENDPOINT, (_, res, ctx) =>res(ctx.status(201), ctx.json({ status: 'success', data: {} })),),@@ -55,23 +51,41 @@ describe('CreateServiceAccountModal', () => {server.resetHandlers();});- it('submit button is disabled when form is empty', () => {+ it('submit button is disabled while the form is empty', async () => {renderModal();- expect(- screen.getByRole('button', { name: /Create Service Account/i }),- ).toBeDisabled();+ // The form only renders once the create check resolves, and the name field+ // registers its `required` rule on mount, so the empty-form invalid state+ // settles a tick later.+ await screen.findByTestId('create-sa-name-input');++ await waitFor(() =>+ expect(screen.getByTestId('create-sa-submit-btn')).toBeDisabled(),+ );+ });++ it('submit button becomes disabled after clearing the name field', async () => {+ const user = userEvent.setup({ pointerEventsCheck: 0 });+ renderModal();++ const nameInput = await screen.findByTestId('create-sa-name-input');+ const submitBtn = await screen.findByTestId('create-sa-submit-btn');++ await user.type(nameInput, 'test');+ await waitFor(() => expect(submitBtn).not.toBeDisabled());++ await user.clear(nameInput);+ await waitFor(() => expect(submitBtn).toBeDisabled());});it('successful submit shows toast.success and closes modal', async () => {const user = userEvent.setup({ pointerEventsCheck: 0 });renderModal();- await user.type(screen.getByPlaceholderText('Enter a name'), 'Deploy Bot');+ const nameInput = await screen.findByTestId('create-sa-name-input');+ await user.type(nameInput, 'Deploy Bot');- const submitBtn = screen.getByRole('button', {- name: /Create Service Account/i,- });+ const submitBtn = screen.getByTestId('create-sa-submit-btn');await waitFor(() => expect(submitBtn).not.toBeDisabled());await user.click(submitBtn);@@ -102,11 +116,10 @@ describe('CreateServiceAccountModal', () => {renderModal();- await user.type(screen.getByPlaceholderText('Enter a name'), 'Dupe Bot');+ const nameInput = await screen.findByTestId('create-sa-name-input');+ await user.type(nameInput, 'Dupe Bot');- const submitBtn = screen.getByRole('button', {- name: /Create Service Account/i,- });+ const submitBtn = screen.getByTestId('create-sa-submit-btn');await waitFor(() => expect(submitBtn).not.toBeDisabled());await user.click(submitBtn);@@ -131,8 +144,45 @@ describe('CreateServiceAccountModal', () => {const user = userEvent.setup({ pointerEventsCheck: 0 });renderModal();- await screen.findByTestId('create-service-account-modal');- await user.click(screen.getByRole('button', { name: /Cancel/i }));+ const cancelBtn = await screen.findByTestId('create-sa-cancel-btn');+ await user.click(cancelBtn);++ await waitFor(() => {+ expect(+ screen.queryByTestId('create-service-account-modal'),+ ).not.toBeInTheDocument();+ });+ });++ it('shows inline permission denial and hides the form when create permission is denied', async () => {+ server.use(setupAuthzDenyAll());++ renderModal();++ await expect(+ screen.findByText(/is not authorized to perform/i),+ ).resolves.toBeInTheDocument();++ expect(screen.queryByTestId('create-sa-name-input')).not.toBeInTheDocument();+ expect(+ screen.getByTestId('create-service-account-modal'),+ ).toBeInTheDocument();+ });++ it('keeps the footer usable when create permission is denied', async () => {+ const user = userEvent.setup({ pointerEventsCheck: 0 });+ server.use(setupAuthzDenyAll());++ renderModal();++ await expect(+ screen.findByText(/is not authorized to perform/i),+ ).resolves.toBeInTheDocument();++ // The footer lives outside the guard: submit is gated, Cancel still works.+ expect(screen.getByTestId('create-sa-submit-btn')).toBeDisabled();++ await user.click(screen.getByTestId('create-sa-cancel-btn'));await waitFor(() => {expect(@@ -145,7 +195,7 @@ describe('CreateServiceAccountModal', () => {const user = userEvent.setup({ pointerEventsCheck: 0 });renderModal();- const nameInput = screen.getByPlaceholderText('Enter a name');+ const nameInput = await screen.findByTestId('create-sa-name-input');await user.type(nameInput, 'Bot');await user.clear(nameInput);diff --git a/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx b/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsxindex 6e31db1684..fccc74341f 100644--- a/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx+++ b/frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx@@ -5,6 +5,7 @@ import { Input } from '@signozhq/ui/input';import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';import { DatePicker } from 'antd';import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';+import { AuthZGuardContent } from 'lib/authz/components/AuthZGuard/AuthZGuardContent';import {APIKeyCreatePermission,buildSAAttachPermission,@@ -36,91 +37,104 @@ function KeyFormPhase({onClose,accountId,}: KeyFormPhaseProps): JSX.Element {+ const checks = accountId+ ? [APIKeyCreatePermission, buildSAAttachPermission(accountId)]+ : [];+return (<><form id={FORM_ID} className="add-key-modal__form" onSubmit={onSubmit}>- <div className="add-key-modal__field">- <label className="add-key-modal__label" htmlFor="key-name">- Name <span style={{ color: 'var(--destructive)' }}>*</span>- </label>- <Input- id="key-name"- placeholder="Enter key name e.g.: Service Owner"- className="add-key-modal__input"- {...register('keyName', {- required: true,- validate: (v) => !!v.trim(),- })}- />- </div>-- <div className="add-key-modal__field">- <span className="add-key-modal__label">Expiration</span>- <Controller- name="expiryMode"- control={control}- render={({ field }): JSX.Element => (- <ToggleGroupSimple- type="single"- value={field.value}- onChange={(val: string): void => {- if (val) {- field.onChange(val);- }- }}- size="sm"- className="add-key-modal__expiry-toggle"- items={[- { value: ExpiryMode.NONE, label: 'No Expiration' },- { value: ExpiryMode.DATE, label: 'Set Expiration Date' },- ]}+ <AuthZGuardContent checks={checks}>+ <>+ <div className="add-key-modal__field">+ <label className="add-key-modal__label" htmlFor="key-name">+ Name <span style={{ color: 'var(--destructive)' }}>*</span>+ </label>+ <Input+ id="key-name"+ placeholder="Enter key name e.g.: Service Owner"+ className="add-key-modal__input"+ testId="add-key-name-input"+ {...register('keyName', {+ required: true,+ validate: (v) => !!v.trim(),+ })}/>- )}- />- </div>+ </div>- {expiryMode === ExpiryMode.DATE && (- <div className="add-key-modal__field">- <label className="add-key-modal__label" htmlFor="expiry-date">- Expiration Date- </label>- <div className="add-key-modal__datepicker">+ <div className="add-key-modal__field">+ <span className="add-key-modal__label">Expiration</span><Controller- name="expiryDate"+ name="expiryMode"control={control}render={({ field }): JSX.Element => (- <DatePicker- id="expiry-date"+ <ToggleGroupSimple+ type="single"value={field.value}- onChange={field.onChange}- popupClassName="add-key-modal-datepicker-popup"- getPopupContainer={popupContainer}- disabledDate={disabledDate}+ onChange={(val: string): void => {+ if (val) {+ field.onChange(val);+ }+ }}+ size="sm"+ className="add-key-modal__expiry-toggle"+ items={[+ { value: ExpiryMode.NONE, label: 'No Expiration' },+ { value: ExpiryMode.DATE, label: 'Set Expiration Date' },+ ]}/>)}/></div>- </div>- )}++ {expiryMode === ExpiryMode.DATE && (+ <div className="add-key-modal__field">+ <label className="add-key-modal__label" htmlFor="expiry-date">+ Expiration Date+ </label>+ <div className="add-key-modal__datepicker">+ <Controller+ name="expiryDate"+ control={control}+ render={({ field }): JSX.Element => (+ <DatePicker+ id="expiry-date"+ value={field.value}+ onChange={field.onChange}+ popupClassName="add-key-modal-datepicker-popup"+ getPopupContainer={popupContainer}+ disabledDate={disabledDate}+ />+ )}+ />+ </div>+ </div>+ )}+ </>+ </AuthZGuardContent></form><div className="add-key-modal__footer"><div className="add-key-modal__footer-right">- <Button variant="solid" color="secondary" onClick={onClose}>+ <Button+ variant="solid"+ color="secondary"+ onClick={onClose}+ testId="add-key-cancel-btn"+ >Cancel</Button><AuthZButton- checks={[- APIKeyCreatePermission,- buildSAAttachPermission(accountId ?? ''),- ]}+ checks={checks}authZEnabled={!!accountId}+ withPortal={false}type="submit"form={FORM_ID}variant="solid"color="primary"loading={isSubmitting}disabled={!isValid}+ testId="add-key-submit-btn">Create Key</AuthZButton>diff --git a/frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsx b/frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsxindex 049c846efb..bb607b83fc 100644--- a/frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsx+++ b/frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsx@@ -92,6 +92,7 @@ function DeleteAccountModal(): JSX.Element {loading={isDeleting}onClick={handleConfirm}data-testid="confirm-delete-btn"+ withPortal={false}><Trash2 size={12} />Deletediff --git a/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx b/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsxindex dd84da6590..7b8ca5775e 100644--- a/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx+++ b/frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx@@ -60,6 +60,7 @@ function EditKeyForm({<AuthZTooltipchecks={[buildAPIKeyUpdatePermission(keyItem?.id ?? '')]}enabled={!!keyItem?.id}+ withPortal={false}><div className="edit-key-modal__key-display"><span className="edit-key-modal__id-text">{keyItem?.name || '—'}</span>@@ -168,6 +169,7 @@ function EditKeyForm({variant="link"color="destructive"onClick={onRevokeClick}+ withPortal={false}><Trash2 size={12} />Revoke Key@@ -186,6 +188,7 @@ function EditKeyForm({color="primary"loading={isSaving}disabled={!isDirty}+ withPortal={false}>Save Changes</AuthZButton>diff --git a/frontend/src/components/ServiceAccountDrawer/KeysTab.tsx b/frontend/src/components/ServiceAccountDrawer/KeysTab.tsxindex fd4fe04b08..3cf1815a01 100644--- a/frontend/src/components/ServiceAccountDrawer/KeysTab.tsx+++ b/frontend/src/components/ServiceAccountDrawer/KeysTab.tsx@@ -114,13 +114,14 @@ function buildColumns({render: (_, record): JSX.Element => {const tooltipTitle = isDisabled ? 'Service account disabled' : 'Revoke Key';return (- <Tooltip title={tooltipTitle}>+ <Tooltip title={tooltipTitle} placement="bottom"><AuthZButtonchecks={[buildAPIKeyDeletePermission(record.id),buildSADetachPermission(accountId),]}authZEnabled={!isDisabled && !!accountId}+ withPortal={false}variant="ghost"size="sm"color="destructive"@@ -214,6 +215,7 @@ function KeysTab({<AuthZButtonchecks={[APIKeyCreatePermission, buildSAAttachPermission(accountId)]}authZEnabled={!isDisabled && !!accountId}+ withPortal={false}variant="link"color="primary"onClick={async (): Promise<void> => {diff --git a/frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx b/frontend/src/components/ServiceAccountDrawer/OverviewTab.tsxindex d0c94b6929..195dab91df 100644--- a/frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx+++ b/frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx@@ -90,14 +90,20 @@ function OverviewTab({Name</label>{isDisabled ? (- <AuthZTooltip checks={[buildSAUpdatePermission(account.id)]}>+ <AuthZTooltip+ checks={[buildSAUpdatePermission(account.id)]}+ withPortal={false}+ ><div className="sa-drawer__input-wrapper sa-drawer__input-wrapper--disabled"><span className="sa-drawer__input-text">{localName || '—'}</span><LockKeyhole size={14} className="sa-drawer__lock-icon" /></div></AuthZTooltip>) : (- <AuthZTooltip checks={[buildSAUpdatePermission(account.id)]}>+ <AuthZTooltip+ checks={[buildSAUpdatePermission(account.id)]}+ withPortal={false}+ ><Inputid="sa-name"value={localName}diff --git a/frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsx b/frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsxindex 714db05e1b..52529f8539 100644--- a/frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsx+++ b/frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsx@@ -55,6 +55,7 @@ export function RevokeKeyFooter({color="destructive"loading={isRevoking}onClick={onConfirm}+ withPortal={false}><Trash2 size={12} />Revoke Keydiff --git a/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx b/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsxindex a0a5157d9a..106f763f0e 100644--- a/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx+++ b/frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx@@ -38,6 +38,7 @@ import {APIKeyCreatePermission,buildSAAttachPermission,buildSADeletePermission,+ buildSAReadPermission,buildSAUpdatePermission,} from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';import {@@ -376,6 +377,7 @@ function ServiceAccountDrawer({<AuthZButtonchecks={[buildSADeletePermission(selectedAccountId ?? '')]}authZEnabled={!!selectedAccountId}+ withPortal={false}variant="link"color="destructive"onClick={(): void => {@@ -391,8 +393,12 @@ function ServiceAccountDrawer({Cancel</Button><AuthZButton- checks={[buildSAUpdatePermission(selectedAccountId ?? '')]}+ checks={[+ buildSAReadPermission(selectedAccountId ?? ''),+ buildSAUpdatePermission(selectedAccountId ?? ''),+ ]}authZEnabled={!!selectedAccountId}+ withPortal={false}variant="solid"color="primary"loading={isSaving}@@ -465,6 +471,7 @@ function ServiceAccountDrawer({buildSAAttachPermission(selectedAccountId ?? ''),]}authZEnabled={!isDeleted && !!selectedAccountId}+ withPortal={false}variant="outlined"size="sm"color="secondary"diff --git a/frontend/src/components/ServiceAccountDrawer/__tests__/AddKeyModal.test.tsx b/frontend/src/components/ServiceAccountDrawer/__tests__/AddKeyModal.test.tsxindex 0431d30d79..5047e1d0b9 100644--- a/frontend/src/components/ServiceAccountDrawer/__tests__/AddKeyModal.test.tsx+++ b/frontend/src/components/ServiceAccountDrawer/__tests__/AddKeyModal.test.tsx@@ -1,5 +1,10 @@import { toast } from '@signozhq/ui/sonner';-import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';+import { buildSAAttachPermission } from 'lib/authz/hooks/useAuthZ/permissions/service-account.permissions';+import {+ setupAuthzAdmin,+ setupAuthzDeny,+ setupAuthzDenyAll,+} from 'lib/authz/utils/authz-test-utils';import { rest, server } from 'mocks-server/server';import { NuqsTestingAdapter } from 'nuqs/adapters/testing';import { render, screen, userEvent, waitFor } from 'tests/test-utils';@@ -66,28 +71,29 @@ describe('AddKeyModal', () => {const user = userEvent.setup({ pointerEventsCheck: 0 });renderModal();- expect(screen.getByRole('button', { name: /Create Key/i })).toBeDisabled();+ // The form only renders once the checks resolve, so waiting for it also+ // guarantees the button is no longer in its authz-loading state.+ const nameInput = await screen.findByTestId('add-key-name-input');+ const createBtn = await screen.findByTestId('add-key-submit-btn');- await user.type(screen.getByPlaceholderText(/Enter key name/i), 'My Key');+ expect(createBtn).toBeDisabled();- await waitFor(() =>- expect(- screen.getByRole('button', { name: /Create Key/i }),- ).not.toBeDisabled(),- );+ await user.type(nameInput, 'My Key');+ await waitFor(() => expect(createBtn).not.toBeDisabled());++ await user.clear(nameInput);+ await waitFor(() => expect(createBtn).toBeDisabled());});it('successful creation transitions to phase 2 with key displayed and security callout', async () => {const user = userEvent.setup({ pointerEventsCheck: 0 });renderModal();- await user.type(screen.getByPlaceholderText(/Enter key name/i), 'Deploy Key');- await waitFor(() =>- expect(- screen.getByRole('button', { name: /Create Key/i }),- ).not.toBeDisabled(),- );- await user.click(screen.getByRole('button', { name: /Create Key/i }));+ const nameInput = await screen.findByTestId('add-key-name-input');+ const submitBtn = await screen.findByTestId('add-key-submit-btn');+ await user.type(nameInput, 'Deploy Key');+ await waitFor(() => expect(submitBtn).not.toBeDisabled());+ await user.click(submitBtn);await screen.findByText('snz_abc123xyz456secret');expect(screen.getByText(/Store the key securely/i)).toBeInTheDocument();@@ -99,13 +105,11 @@ describe('AddKeyModal', () => {renderModal();- await user.type(screen.getByPlaceholderText(/Enter key name/i), 'Deploy Key');- await waitFor(() =>- expect(- screen.getByRole('button', { name: /Create Key/i }),- ).not.toBeDisabled(),- );- await user.click(screen.getByRole('button', { name: /Create Key/i }));+ const nameInput = await screen.findByTestId('add-key-name-input');+ const submitBtn = await screen.findByTestId('add-key-submit-btn');+ await user.type(nameInput, 'Deploy Key');+ await waitFor(() => expect(submitBtn).not.toBeDisabled());+ await user.click(submitBtn);await screen.findByText('snz_abc123xyz456secret');@@ -123,12 +127,57 @@ describe('AddKeyModal', () => {});});+ it('shows inline permission denial and hides the form when key create is denied', async () => {+ server.use(setupAuthzDenyAll());++ renderModal();++ await expect(+ screen.findByText(/is not authorized to perform/i),+ ).resolves.toBeInTheDocument();++ expect(screen.queryByTestId('add-key-name-input')).not.toBeInTheDocument();+ expect(screen.getByTestId('add-key-modal')).toBeInTheDocument();+ });++ it('keeps the footer usable when key create is denied', async () => {+ const user = userEvent.setup({ pointerEventsCheck: 0 });+ server.use(setupAuthzDenyAll());++ renderModal();++ await expect(+ screen.findByText(/is not authorized to perform/i),+ ).resolves.toBeInTheDocument();++ // The footer lives outside the guard: submit is gated, Cancel still works.+ expect(screen.getByTestId('add-key-submit-btn')).toBeDisabled();++ await user.click(screen.getByTestId('add-key-cancel-btn'));++ await waitFor(() => {+ expect(screen.queryByTestId('add-key-modal')).not.toBeInTheDocument();+ });+ });++ it('shows inline permission denial when attach on the service account is denied', async () => {+ server.use(setupAuthzDeny(buildSAAttachPermission('sa-1')));++ renderModal();++ await expect(+ screen.findByText(/is not authorized to perform/i),+ ).resolves.toBeInTheDocument();++ expect(screen.queryByTestId('add-key-name-input')).not.toBeInTheDocument();+ });+it('Cancel button closes the modal', async () => {const user = userEvent.setup({ pointerEventsCheck: 0 });renderModal();- await screen.findByTestId('add-key-modal');- await user.click(screen.getByRole('button', { name: /Cancel/i }));+ const cancelBtn = await screen.findByTestId('add-key-cancel-btn');+ await user.click(cancelBtn);await waitFor(() => {expect(screen.queryByTestId('add-key-modal')).not.toBeInTheDocument();diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.tsxindex caeaf4f09c..f51135aefe 100644--- a/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.tsx+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/CreateEditRolePage.tsx@@ -26,6 +26,7 @@ import { useCreateEditRolePageActions } from './useCreateEditRolePageActions';import styles from './CreateEditRolePage.module.scss';import { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';+import { AuthZGuardContent } from 'lib/authz/components/AuthZGuard/AuthZGuardContent';function authzCheckFn(_props: object,@@ -33,18 +34,11 @@ function authzCheckFn(): BrandedPermission[] {const match = router.matchPath<{ roleId: string }>(ROUTES.ROLE_DETAILS);const roleId = match?.roleId ?? 'new';- const roleName = router.searchParams.get('name') ?? '';const isCreateMode = roleId === 'new';if (isCreateMode) {return [RoleCreatePermission];}- if (roleName) {- return [- buildRoleReadPermission(roleName),- buildRoleUpdatePermission(roleName),- ];- }return [];}@@ -149,7 +143,7 @@ function CreateEditRolePageContent(): JSX.Element {);}- if ((isLoading && !isCreateMode) || isFeatureGateLoading) {+ if (isFeatureGateLoading) {return (<div className={styles.createEditRolePage}><Skeleton active paragraph={{ rows: 8 }} />@@ -157,32 +151,18 @@ function CreateEditRolePageContent(): JSX.Element {);}- if (loadError) {- return (- <div- className={styles.createEditRolePage}- data-testid="create-edit-role-page"- >- <div className={styles.createEditRolePageHeader}>- <div className={styles.createEditRolePageHeaderLeft}>- <Button- variant="ghost"- color="secondary"- onClick={handleCancel}- disabled={isSaving}- data-testid="cancel-button"- className={styles.backButton}- >- <ArrowLeft size={16} />- </Button>- <Typography.Title level={3}>Failed to load role</Typography.Title>- </div>- </div>+ const title = isCreateMode+ ? 'Create Role'+ : `Role - ${+ formData.name || (isLoading ? 'Loading role...' : 'Failed to load role')+ }`;- <ErrorInPlace error={loadError} data-testid="role-load-error-banner" />- </div>- );- }+ const canCheckRolePermissions = !isCreateMode && !!roleName;++ const saveChecks = isCreateMode+ ? [RoleCreatePermission]+ : [buildRoleReadPermission(roleName), buildRoleUpdatePermission(roleName)];+ const isSaveCheckEnabled = isCreateMode || canCheckRolePermissions;return (<div@@ -201,11 +181,7 @@ function CreateEditRolePageContent(): JSX.Element {><ArrowLeft size={16} /></Button>- <Typography.Title level={3}>- {isCreateMode- ? 'Create Role'- : `Role - ${formData.name || 'Loading role...'}`}- </Typography.Title>+ <Typography.Title level={3}>{title}</Typography.Title></div><div className={styles.createEditRolePageActions}>@@ -218,11 +194,8 @@ function CreateEditRolePageContent(): JSX.Element {</div>)}<AuthZButton- checks={- isCreateMode- ? [RoleCreatePermission]- : [buildRoleUpdatePermission(roleName)]- }+ checks={saveChecks}+ authZEnabled={isSaveCheckEnabled}variant="solid"color="primary"onClick={handleSaveAndNavigate}@@ -235,61 +208,91 @@ function CreateEditRolePageContent(): JSX.Element {</div></div>- {saveError && (- <ErrorInPlace- error={saveError}- height="auto"- data-testid="save-error-banner"- padding={0}- bordered={true}- className={styles.errorInPlaceContainer}- />- )}+ <AuthZGuardContent+ checks={canCheckRolePermissions ? [buildRoleReadPermission(roleName)] : []}+ fallbackOnLoading={+ <div className={styles.createEditRolePage}>+ <Skeleton active paragraph={{ rows: 8 }} />+ </div>+ }+ >+ <>+ {isLoading && (+ <div className={styles.createEditRolePage}>+ <Skeleton active paragraph={{ rows: 8 }} />+ </div>+ )}- <div className={styles.createEditRolePageContent}>- <div className={styles.createEditRolePageForm}>- <div className={styles.formRow}>- {isCreateMode ? (- <div className={styles.formField}>- <label htmlFor="role-name" className={styles.formLabel}>- Name- </label>- <Input- id="role-name"- value={formData.name}- onChange={(e): void => handleFormChange('name', e.target.value)}- placeholder="my-custom-role"- data-testid="role-name-input"- />+ {loadError && (+ <ErrorInPlace+ error={loadError}+ height="auto"+ data-testid="role-load-error-banner"+ padding={0}+ bordered={true}+ className={styles.errorInPlaceContainer}+ />+ )}++ {saveError && (+ <ErrorInPlace+ error={saveError}+ height="auto"+ data-testid="save-error-banner"+ padding={0}+ bordered={true}+ className={styles.errorInPlaceContainer}+ />+ )}++ <div className={styles.createEditRolePageContent}>+ <div className={styles.createEditRolePageForm}>+ <div className={styles.formRow}>+ {isCreateMode ? (+ <div className={styles.formField}>+ <label htmlFor="role-name" className={styles.formLabel}>+ Name+ </label>+ <Input+ id="role-name"+ value={formData.name}+ onChange={(e): void => handleFormChange('name', e.target.value)}+ placeholder="my-custom-role"+ data-testid="role-name-input"+ />+ </div>+ ) : null}+ <div className={styles.formField}>+ <label htmlFor="role-description" className={styles.formLabel}>+ Description+ </label>+ <Input+ id="role-description"+ value={formData.description}+ onChange={(e): void =>+ handleFormChange('description', e.target.value)+ }+ placeholder="Custom role for the support team"+ data-testid="role-description-input"+ />+ </div></div>- ) : null}- <div className={styles.formField}>- <label htmlFor="role-description" className={styles.formLabel}>- Description- </label>- <Input- id="role-description"- value={formData.description}- onChange={(e): void => handleFormChange('description', e.target.value)}- placeholder="Custom role for the support team"- data-testid="role-description-input"- /></div>- </div>- </div>- <div className={styles.createEditRolePageDivider} />+ <div className={styles.createEditRolePageDivider} />- <PermissionEditor- resources={resources}- mode={editorMode}- onModeChange={setEditorMode}- onResourceChange={setResources}- onJsonValidityChange={setHasJsonError}- isLoading={isLoading}- validationErrors={validationErrors}- />- </div>+ <PermissionEditor+ resources={resources}+ mode={editorMode}+ onModeChange={setEditorMode}+ onResourceChange={setResources}+ onJsonValidityChange={setHasJsonError}+ isLoading={isLoading}+ validationErrors={validationErrors}+ />+ </div>+ </>+ </AuthZGuardContent><ConfirmDialogopen={isBlocked}diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.authz.test.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.authz.test.tsxindex 8ad56dc1e3..7a505c38a1 100644--- a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.authz.test.tsx+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.authz.test.tsx@@ -4,6 +4,7 @@ import { server } from 'mocks-server/server';import { rest } from 'msw';import { render, screen } from 'tests/test-utils';import {+ AUTHZ_CHECK_URL,setupAuthzAdmin,setupAuthzDenyAll,setupAuthzDeny,@@ -57,24 +58,80 @@ function renderEditPage(): ReturnType<typeof render> {describe('EditRolePage - AuthZ', () => {describe('permission denied', () => {- it('shows PermissionDeniedFullPage when read permission denied', async () => {+ it('shows PermissionDeniedCallout when read permission denied', async () => {server.use(setupAuthzDenyAll());renderEditPage();await expect(- screen.findByText(/You are not authorized/i),+ screen.findByText(/is not authorized to perform/i),).resolves.toBeInTheDocument();++ expect(+ screen.queryByText('Uh-oh! You are not authorized'),+ ).not.toBeInTheDocument();});- it('shows PermissionDeniedFullPage when update permission denied but read granted', async () => {+ it('keeps the header visible and hides the form when read permission denied', async () => {+ server.use(setupAuthzDenyAll());++ renderEditPage();++ await screen.findByText(/is not authorized to perform/i);++ await expect(+ screen.findByText(`Role - ${EDIT_ROLE_NAME}`),+ ).resolves.toBeInTheDocument();+ expect(screen.getByTestId('cancel-button')).toBeInTheDocument();+ expect(screen.getByTestId('save-button')).toBeDisabled();++ expect(+ screen.queryByTestId('role-description-input'),+ ).not.toBeInTheDocument();+ expect(screen.queryByTestId('permission-editor')).not.toBeInTheDocument();+ });++ it('renders page with disabled save button when update permission denied but read granted', async () => {server.use(setupAuthzDeny(buildRoleUpdatePermission(EDIT_ROLE_NAME)));renderEditPage();await expect(- screen.findByText(/You are not authorized/i),+ screen.findByText(`Role - ${EDIT_ROLE_NAME}`),+ ).resolves.toBeInTheDocument();++ const saveButton = await screen.findByTestId('save-button');+ expect(saveButton).toBeDisabled();+ });+ });++ describe('route without the name query param', () => {+ // `roleName` is the permission selector. When it is missing we must skip the+ // check entirely — building `role:` widens to `role:*` on the wire and never+ // matches back, which would deny the form even for an admin.+ it('renders the form instead of denying it', async () => {+ server.use(setupAuthzAdmin());++ render(+ <Switch>+ <Route path={ROUTES.ROLES_SETTINGS} exact>+ <div data-testid="roles-list-redirect" />+ </Route>+ <Route path={ROUTES.ROLE_DETAILS}>+ <CreateEditRolePage />+ </Route>+ </Switch>,+ undefined,+ { initialRoute: `/settings/roles/${EDIT_ROLE_ID}` },+ );++ await expect(+ screen.findByTestId('role-description-input'),).resolves.toBeInTheDocument();++ expect(+ screen.queryByText(/is not authorized to perform/i),+ ).not.toBeInTheDocument();});});@@ -96,6 +153,23 @@ describe('EditRolePage - AuthZ', () => {});});+ describe('permission check failure', () => {+ it('renders the form when the permission check request fails', async () => {+ server.use(+ rest.post(AUTHZ_CHECK_URL, (_req, res, ctx) => res(ctx.status(500))),+ );++ renderEditPage();++ await expect(+ screen.findByTestId('role-description-input'),+ ).resolves.toBeInTheDocument();+ expect(+ screen.queryByText(/is not authorized to perform/i),+ ).not.toBeInTheDocument();+ });+ });+describe('permission granted', () => {it('renders edit page when both read and update permissions granted', async () => {server.use(setupAuthzAdmin());diff --git a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.test.tsx b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.test.tsxindex 6d0886d863..a433db7899 100644--- a/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.test.tsx+++ b/frontend/src/container/RolesSettings/CreateEditRolePage/__tests__/EditRolePage.test.tsx@@ -71,6 +71,20 @@ describe('EditRolePage', () => {expect(document.querySelector('.ant-skeleton')).toBeInTheDocument();});++ it('shows loading title in header while fetching role data', async () => {+ server.use(+ rest.get(`${rolesApiBase}/:id`, (_req, res, ctx) =>+ res(ctx.delay(200), ctx.status(200), ctx.json(roleWithTransactionGroups)),+ ),+ );++ renderEditPage();++ await expect(+ screen.findByText('Role - Loading role...'),+ ).resolves.toBeInTheDocument();+ });});describe('load error state', () => {@@ -83,12 +97,12 @@ describe('EditRolePage', () => {renderEditPage();- await waitFor(() => {- expect(document.querySelector('.error-in-place')).toBeInTheDocument();- });+ await expect(+ screen.findByTestId('role-load-error-banner'),+ ).resolves.toBeInTheDocument();});- it('shows Failed to load role title on load error', async () => {+ it('shows failed to load title on load error', async () => {server.use(rest.get(`${rolesApiBase}/:id`, (_req, res, ctx) =>res(ctx.status(404), ctx.json({ error: { message: 'Not found' } })),@@ -98,7 +112,7 @@ describe('EditRolePage', () => {renderEditPage();await expect(- screen.findByText('Failed to load role'),+ screen.findByText('Role - Failed to load role'),).resolves.toBeInTheDocument();});diff --git a/frontend/src/container/RolesSettings/RolesComponents/RolesListingTable.tsx b/frontend/src/container/RolesSettings/RolesComponents/RolesListingTable.tsxindex 533e4b2bfc..004977e439 100644--- a/frontend/src/container/RolesSettings/RolesComponents/RolesListingTable.tsx+++ b/frontend/src/container/RolesSettings/RolesComponents/RolesListingTable.tsx@@ -8,7 +8,7 @@ import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';import ROUTES from 'constants/routes';import { useRolesFeatureGate } from 'hooks/useRolesFeatureGate';import useUrlQuery from 'hooks/useUrlQuery';-import { withAuthZPage } from 'lib/authz/components/withAuthZ/withAuthZPage';+import { withAuthZContent } from 'lib/authz/components/withAuthZ/withAuthZContent';import { RoleListPermission } from 'lib/authz/hooks/useAuthZ/permissions/role.permissions';import LineClampedText from 'periscope/components/LineClampedText/LineClampedText';import { useTimezone } from 'providers/Timezone';@@ -267,7 +267,7 @@ function RolesListContent({ searchQuery }: RolesListContentProps): JSX.Element {);}-export default withAuthZPage<RolesListContentProps>(RolesListContent, {+export default withAuthZContent<RolesListContentProps>(RolesListContent, {checks: [RoleListPermission],fallbackOnLoading: (<div className={styles.rolesListingTable}>diff --git a/frontend/src/container/RolesSettings/RolesComponents/__tests__/RolesListingTable.authz.test.tsx b/frontend/src/container/RolesSettings/RolesComponents/__tests__/RolesListingTable.authz.test.tsxnew file mode 100644index 0000000000..d19bd45687--- /dev/null+++ b/frontend/src/container/RolesSettings/RolesComponents/__tests__/RolesListingTable.authz.test.tsx@@ -0,0 +1,81 @@+import { listRolesSuccessResponse } from 'mocks-server/__mockdata__/roles';+import { server } from 'mocks-server/server';+import { rest } from 'msw';+import {+ AUTHZ_CHECK_URL,+ setupAuthzAdmin,+ setupAuthzDenyAll,+} from 'lib/authz/utils/authz-test-utils';+import { render, screen } from 'tests/test-utils';++import RolesListingTable from '../RolesListingTable';++const rolesApiBase = '*/api/v1/roles';++beforeEach(() => {+ server.use(+ rest.get(rolesApiBase, (_req, res, ctx) =>+ res(ctx.status(200), ctx.json(listRolesSuccessResponse)),+ ),+ );+});++afterEach(() => {+ server.resetHandlers();+});++function renderTable(): ReturnType<typeof render> {+ return render(<RolesListingTable searchQuery="" />, undefined, {+ initialRoute: '/settings/roles',+ });+}++describe('RolesListingTable - AuthZ', () => {+ describe('permission granted', () => {+ it('renders the roles table when list permission granted', async () => {+ server.use(setupAuthzAdmin());++ renderTable();++ await expect(+ screen.findByText('billing-manager'),+ ).resolves.toBeInTheDocument();+ });+ });++ describe('permission denied', () => {+ it('shows inline permission denial instead of the table when list permission denied', async () => {+ server.use(setupAuthzDenyAll());++ renderTable();++ await expect(+ screen.findByText(/is not authorized to perform/i),+ ).resolves.toBeInTheDocument();++ expect(screen.queryByText('billing-manager')).not.toBeInTheDocument();++ // denial is inline, not a full page takeover+ expect(+ screen.queryByText('Uh-oh! You are not authorized'),+ ).not.toBeInTheDocument();+ });+ });++ describe('permission check failure', () => {+ it('renders the roles table when the permission check request fails', async () => {+ server.use(+ rest.post(AUTHZ_CHECK_URL, (_req, res, ctx) => res(ctx.status(500))),+ );++ renderTable();++ await expect(+ screen.findByText('billing-manager'),+ ).resolves.toBeInTheDocument();+ expect(+ screen.queryByText(/is not authorized to perform/i),+ ).not.toBeInTheDocument();+ });+ });+});diff --git a/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.tsx b/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.tsxindex ad1fa9487b..074d2dc428 100644--- a/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.tsx+++ b/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePage.tsx@@ -5,22 +5,15 @@ import { Button } from '@signozhq/ui/button';import { Divider } from '@signozhq/ui/divider';import { RadioGroup, RadioGroupItem } from '@signozhq/ui/radio-group';import { Tabs } from '@signozhq/ui/tabs';-import { TooltipSimple } from '@signozhq/ui/tooltip';import { Typography } from '@signozhq/ui/typography';import { Skeleton } from 'antd';import { useGetRole } from 'api/generated/services/role';import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';import { useDeleteRoleModal } from 'container/RolesSettings/DeleteRoleModal/useDeleteRoleModal';-import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';import { transformApiToRolePermissions } from 'container/RolesSettings/hooks/useRolePermissions';import { useRolesFeatureGate } from 'hooks/useRolesFeatureGate';-import { withAuthZPage } from 'lib/authz/components/withAuthZ/withAuthZPage';-import { RouterContext } from 'lib/authz/components/withAuthZ/withAuthZ';-import {- buildRoleDeletePermission,- buildRoleReadPermission,- buildRoleUpdatePermission,-} from 'lib/authz/hooks/useAuthZ/permissions/role.permissions';+import { withAuthZContent } from 'lib/authz/components/withAuthZ/withAuthZContent';+import { buildRoleReadPermission } from 'lib/authz/hooks/useAuthZ/permissions/role.permissions';import { useTimezone } from 'providers/Timezone';import APIError from 'types/api/error';import { RoleType } from 'types/roles';@@ -32,43 +25,35 @@ import ReadOnlyJsonViewer from './ReadOnlyJsonViewer';import { useViewRolePageActions } from './useViewRolePageActions';import styles from './ViewRolePage.module.scss';+import { ViewRolePageHeaderActions } from 'container/RolesSettings/ViewRolePage/ViewRolePageHeaderActions';-function ViewRolePageContent(): JSX.Element {- const { formatTimezoneAdjustedTimestampOptional } = useTimezone();- const { isRolesEnabled, isLoading: isFeatureGateLoading } =- useRolesFeatureGate();+interface ViewRoleContentProps {+ roleId: string;+ roleName: string;+ viewMode: 'list' | 'json';+ expandedResources: Set<string>;+ setExpandedResources: (resources: Set<string>) => void;+ handleModeChange: (value: string) => void;+ handleTabChange: (key: string) => void;+ activeTab: 'overview';+}- const {- roleId,- roleName,- activeTab,- viewMode,- expandedResources,- setExpandedResources,- handleRedirectToUpdate,- handleCancel,- handleModeChange,- handleTabChange,- } = useViewRolePageActions();+function ViewRoleContentInner({+ roleId,+ viewMode,+ expandedResources,+ setExpandedResources,+ handleModeChange,+ handleTabChange,+ activeTab,+}: ViewRoleContentProps): JSX.Element {+ const { formatTimezoneAdjustedTimestampOptional } = useTimezone();const { data, isLoading, error } = useGetRole(- { id: roleId ?? '' },+ { id: roleId },{ query: { enabled: !!roleId } },);const role = data?.data;- const isManaged = role?.type === RoleType.MANAGED;-- const {- isDeleteModalOpen,- deleteError,- handleOpenDeleteModal,- handleCloseDeleteModal,- handleConfirmDelete,- } = useDeleteRoleModal({- roleId,- isManaged: isManaged ?? false,- onDeleteSuccess: handleCancel,- });const tabItems = useMemo(() => [@@ -116,7 +101,7 @@ function ViewRolePageContent(): JSX.Element {<div className={styles.permissionContent}>{viewMode === 'list' ? (<PermissionOverview- roleId={roleId ?? ''}+ roleId={roleId}expandedResources={expandedResources}onExpandedResourcesChange={setExpandedResources}/>@@ -138,6 +123,109 @@ function ViewRolePageContent(): JSX.Element {],);+ if (isLoading) {+ return <Skeleton active paragraph={{ rows: 6 }} />;+ }++ if (error) {+ return (+ <ErrorInPlace+ error={toAPIError(error, 'Failed to load role details')}+ data-testid="role-error-banner"+ />+ );+ }++ if (!role) {+ return <></>;+ }++ return (+ <div className={styles.viewRolePageContent}>+ <div className={styles.viewRolePageForm}>+ <div className={styles.formField}>+ <label htmlFor="role-description" className={styles.formLabel}>+ Description+ </label>+ <Typography>{role.description}</Typography>+ </div>+ <div className={styles.formRow}>+ <div className={styles.formField}>+ <label htmlFor="role-created-at" className={styles.formLabel}>+ Created At+ </label>+ <Badge color="secondary">+ {formatTimezoneAdjustedTimestampOptional(role.createdAt)}+ </Badge>+ </div>+ <div className={styles.formField}>+ <label htmlFor="role-modified-at" className={styles.formLabel}>+ Last Modified At+ </label>+ <Badge color="secondary">+ {formatTimezoneAdjustedTimestampOptional(role.updatedAt)}+ </Badge>+ </div>+ </div>+ </div>++ <Divider />++ <Tabs+ className={styles.roleTabs}+ value={activeTab}+ onChange={handleTabChange}+ items={tabItems}+ />+ </div>+ );+}++const ViewRoleContent = withAuthZContent<ViewRoleContentProps>(+ ViewRoleContentInner,+ {+ checks: (props: ViewRoleContentProps) =>+ props.roleName ? [buildRoleReadPermission(props.roleName)] : [],+ fallbackOnLoading: <Skeleton active paragraph={{ rows: 6 }} />,+ },+);++function ViewRolePage(): JSX.Element {+ const { isRolesEnabled, isLoading: isFeatureGateLoading } =+ useRolesFeatureGate();++ const {+ roleId,+ roleName,+ activeTab,+ viewMode,+ expandedResources,+ setExpandedResources,+ handleRedirectToUpdate,+ handleCancel,+ handleModeChange,+ handleTabChange,+ } = useViewRolePageActions();++ const { data, isLoading: isRoleLoading } = useGetRole(+ { id: roleId ?? '' },+ { query: { enabled: !!roleId } },+ );+ const role = data?.data;+ const isManaged = role?.type === RoleType.MANAGED;++ const {+ isDeleteModalOpen,+ deleteError,+ handleOpenDeleteModal,+ handleCloseDeleteModal,+ handleConfirmDelete,+ } = useDeleteRoleModal({+ roleId,+ isManaged: isManaged ?? false,+ onDeleteSuccess: handleCancel,+ });+if (!isRolesEnabled && !isFeatureGateLoading) {return (<div className={styles.viewRolePage} data-testid="view-role-page">@@ -175,7 +263,7 @@ function ViewRolePageContent(): JSX.Element {);}- if (isLoading || isFeatureGateLoading) {+ if (isFeatureGateLoading) {return (<div className={styles.viewRolePage}><Skeleton active paragraph={{ rows: 8 }} />@@ -183,36 +271,6 @@ function ViewRolePageContent(): JSX.Element {);}- if (error) {- return (- <div className={styles.viewRolePage} data-testid="view-role-page">- <div className={styles.viewRolePageHeader}>- <div className={styles.viewRolePageHeaderLeft}>- <Button- variant="ghost"- color="secondary"- onClick={handleCancel}- data-testid="cancel-button"- className={styles.backButton}- >- <ArrowLeft size={16} />- </Button>- <Typography.Title level={3}>Failed to load role</Typography.Title>- </div>- </div>-- <ErrorInPlace- error={toAPIError(error, 'Failed to load role details')}- data-testid="role-error-banner"- />- </div>- );- }-- if (!role) {- return <></>;- }-return (<div className={styles.viewRolePage} data-testid="view-role-page"><div className={styles.viewRolePageHeader}>@@ -227,103 +285,35 @@ function ViewRolePageContent(): JSX.Element {<ArrowLeft size={16} /></Button><Typography.Title level={3}>- {'Role - ' + role.name || 'Loading role...'}+ {'Role - ' + (roleName || 'Loading role...')}</Typography.Title></div>- <div className={styles.viewRolePageActions}>- {isManaged ? (- <TooltipSimple title="Managed roles cannot be deleted">- <Button- variant="link"- color="destructive"- disabled- data-testid="delete-button"- className={styles.deleteButton}- >- Delete- </Button>- </TooltipSimple>- ) : (- <AuthZButton- checks={[buildRoleDeletePermission(roleName)]}- variant="link"- color="destructive"- onClick={handleOpenDeleteModal}- data-testid="delete-button"- className={styles.deleteButton}- >- Delete- </AuthZButton>- )}-- <Divider type="vertical" />-- {isManaged ? (- <TooltipSimple title="Managed roles cannot be updated">- <Button- variant="solid"- color="primary"- disabled- data-testid="save-button"- >- Update- </Button>- </TooltipSimple>- ) : (- <AuthZButton- checks={[buildRoleUpdatePermission(roleName)]}- variant="solid"- color="primary"- data-testid="save-button"- onClick={handleRedirectToUpdate}- >- Update- </AuthZButton>- )}- </div>+ <ViewRolePageHeaderActions+ isRoleLoading={isRoleLoading}+ isManaged={isManaged}+ roleName={roleName}+ handleOpenDeleteModal={handleOpenDeleteModal}+ handleRedirectToUpdate={handleRedirectToUpdate}+ /></div>- <div className={styles.viewRolePageContent}>- <div className={styles.viewRolePageForm}>- <div className={styles.formField}>- <label htmlFor="role-description" className={styles.formLabel}>- Description- </label>- <Typography>{role.description}</Typography>- </div>- <div className={styles.formRow}>- <div className={styles.formField}>- <label htmlFor="role-created-at" className={styles.formLabel}>- Created At- </label>- <Badge color="secondary">- {formatTimezoneAdjustedTimestampOptional(role.createdAt)}- </Badge>- </div>- <div className={styles.formField}>- <label htmlFor="role-modified-at" className={styles.formLabel}>- Last Modified At- </label>- <Badge color="secondary">- {formatTimezoneAdjustedTimestampOptional(role.updatedAt)}- </Badge>- </div>- </div>- </div>-- <Divider />-- <Tabs- className={styles.roleTabs}- value={activeTab}- onChange={handleTabChange}- items={tabItems}+ {roleId && (+ <ViewRoleContent+ roleId={roleId}+ roleName={roleName}+ viewMode={viewMode}+ expandedResources={expandedResources}+ setExpandedResources={setExpandedResources}+ handleModeChange={handleModeChange}+ handleTabChange={handleTabChange}+ activeTab={activeTab}/>- </div>+ )}+<DeleteRoleModalisOpen={isDeleteModalOpen}- roleName={role.name}+ roleName={roleName}error={deleteError}onCancel={handleCloseDeleteModal}onConfirm={handleConfirmDelete}@@ -332,14 +322,4 @@ function ViewRolePageContent(): JSX.Element {);}-export default withAuthZPage(ViewRolePageContent, {- checks: (_props: object, router: RouterContext) => {- const roleName = router.searchParams.get('name') ?? '';- return roleName ? [buildRoleReadPermission(roleName)] : [];- },- fallbackOnLoading: (- <div className={styles.viewRolePage}>- <Skeleton active paragraph={{ rows: 8 }} />- </div>- ),-});+export default ViewRolePage;diff --git a/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePageHeaderActions.tsx b/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePageHeaderActions.tsxnew file mode 100644index 0000000000..2026c25d3e--- /dev/null+++ b/frontend/src/container/RolesSettings/ViewRolePage/ViewRolePageHeaderActions.tsx@@ -0,0 +1,114 @@+import styles from 'container/RolesSettings/ViewRolePage/ViewRolePage.module.scss';+import { Button } from '@signozhq/ui/button';+import { Divider } from '@signozhq/ui/divider';+import AuthZButton from 'lib/authz/components/AuthZButton/AuthZButton';+import {+ buildRoleDeletePermission,+ buildRoleReadPermission,+ buildRoleUpdatePermission,+} from 'lib/authz/hooks/useAuthZ/permissions/role.permissions';+import { TooltipSimple } from '@signozhq/ui/tooltip';++export function ViewRolePageHeaderActions({+ isRoleLoading,+ isManaged,+ roleName,+ handleOpenDeleteModal,+ handleRedirectToUpdate,+}: {+ isRoleLoading: boolean;+ isManaged: boolean;+ roleName: string;+ handleOpenDeleteModal: () => void;+ handleRedirectToUpdate: () => void;+}): JSX.Element {+ const renderDeleteButton = (): JSX.Element => {+ if (isRoleLoading) {+ return (+ <Button+ variant="link"+ color="destructive"+ disabled+ data-testid="delete-button"+ className={styles.deleteButton}+ >+ Delete+ </Button>+ );+ }++ if (isManaged) {+ return (+ <TooltipSimple title="Managed roles cannot be deleted">+ <Button+ variant="link"+ color="destructive"+ disabled+ data-testid="delete-button"+ className={styles.deleteButton}+ >+ Delete+ </Button>+ </TooltipSimple>+ );+ }++ return (+ <AuthZButton+ checks={[buildRoleDeletePermission(roleName)]}+ authZEnabled={!!roleName}+ variant="link"+ color="destructive"+ onClick={handleOpenDeleteModal}+ data-testid="delete-button"+ className={styles.deleteButton}+ >+ Delete+ </AuthZButton>+ );+ };++ const renderUpdateButton = (): JSX.Element => {+ if (isRoleLoading) {+ return (+ <Button variant="solid" color="primary" disabled data-testid="save-button">+ Update+ </Button>+ );+ }++ if (isManaged) {+ return (+ <TooltipSimple title="Managed roles cannot be updated">+ <Button variant="solid" color="primary" disabled data-testid="save-button">+ Update+ </Button>+ </TooltipSimple>+ );+ }++ return (+ <AuthZButton+ checks={[+ buildRoleReadPermission(roleName),+ buildRoleUpdatePermission(roleName),+ ]}+ authZEnabled={!!roleName}+ variant="solid"+ color="primary"+ data-testid="save-button"+ onClick={handleRedirectToUpdate}+ >+ Update+ </AuthZButton>+ );+ };++ return (+ <div className={styles.viewRolePageActions}>+ {renderDeleteButton()}+ <Divider type="vertical" />+ {renderUpdateButton()}+ </div>+ );+}diff --git a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.authz.test.tsx b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.authz.test.tsxindex 763743eb41..784f066f9a 100644--- a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.authz.test.tsx+++ b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.authz.test.tsx@@ -34,7 +34,7 @@ describe('ViewRolePage - AuthZ', () => {});describe('permission denied', () => {- it('shows permission denied page when read permission denied', async () => {+ it('shows inline permission denial when read permission denied but keeps header visible', async () => {server.use(setupAuthzDenyAll());jest.spyOn(roleApi, 'useGetRole').mockReturnValue({@@ -49,8 +49,144 @@ describe('ViewRolePage - AuthZ', () => {});await expect(- screen.findByText(/You are not authorized/i),+ screen.findByTestId('view-role-page'),).resolves.toBeInTheDocument();++ await expect(+ screen.findByText(/is not authorized to perform/i),+ ).resolves.toBeInTheDocument();++ expect(screen.getByTestId('delete-button')).toBeInTheDocument();++ expect(+ screen.queryByText('Uh-oh! You are not authorized'),+ ).not.toBeInTheDocument();+ });++ it('hides the role content when read permission denied', async () => {+ server.use(setupAuthzDenyAll());++ jest.spyOn(roleApi, 'useGetRole').mockReturnValue({+ data: customRoleResponse,+ isLoading: false,+ isError: false,+ error: null,+ } as ReturnType<typeof roleApi.useGetRole>);++ jest.spyOn(useRolePermissionsModule, 'useRolePermissions').mockReturnValue({+ data: mockPermissionsData,+ isLoading: false,+ isError: false,+ error: null,+ } as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);++ render(<ViewRolePage />, undefined, {+ initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),+ });++ await screen.findByText(/is not authorized to perform/i);++ expect(screen.queryByTestId('permission-view-mode')).not.toBeInTheDocument();+ expect(screen.queryByText('Description')).not.toBeInTheDocument();+ });+ });++ describe('route without the name query param', () => {+ // `roleName` is the permission selector. When it is missing we must skip the+ // check entirely — building `role:` widens to `role:*` on the wire and never+ // matches back, which would deny the content even for an admin.+ it('renders the role content instead of denying it', async () => {+ server.use(setupAuthzAdmin());++ jest.spyOn(roleApi, 'useGetRole').mockReturnValue({+ data: customRoleResponse,+ isLoading: false,+ isError: false,+ error: null,+ } as ReturnType<typeof roleApi.useGetRole>);++ jest.spyOn(useRolePermissionsModule, 'useRolePermissions').mockReturnValue({+ data: mockPermissionsData,+ isLoading: false,+ isError: false,+ error: null,+ } as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);++ render(<ViewRolePage />, undefined, {+ initialRoute: `/settings/roles/${CUSTOM_ROLE_ID}`,+ });++ await expect(+ screen.findByTestId('permission-view-mode'),+ ).resolves.toBeInTheDocument();++ expect(+ screen.queryByText(/is not authorized to perform/i),+ ).not.toBeInTheDocument();+ });++ it('leaves the action buttons enabled instead of gating them on an empty selector', async () => {+ server.use(setupAuthzAdmin());++ jest.spyOn(roleApi, 'useGetRole').mockReturnValue({+ data: customRoleResponse,+ isLoading: false,+ isError: false,+ error: null,+ } as ReturnType<typeof roleApi.useGetRole>);++ jest.spyOn(useRolePermissionsModule, 'useRolePermissions').mockReturnValue({+ data: mockPermissionsData,+ isLoading: false,+ isError: false,+ error: null,+ } as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);++ render(+ <TooltipProvider>+ <ViewRolePage />+ </TooltipProvider>,+ undefined,+ { initialRoute: `/settings/roles/${CUSTOM_ROLE_ID}` },+ );++ await waitFor(() => {+ expect(screen.getByTestId('delete-button')).not.toBeDisabled();+ expect(screen.getByTestId('save-button')).not.toBeDisabled();+ });+ });+ });++ describe('permission check failure', () => {+ it('renders the role content when the permission check request fails', async () => {+ server.use(+ rest.post(AUTHZ_CHECK_URL, (_req, res, ctx) => res(ctx.status(500))),+ );++ jest.spyOn(roleApi, 'useGetRole').mockReturnValue({+ data: customRoleResponse,+ isLoading: false,+ isError: false,+ error: null,+ } as ReturnType<typeof roleApi.useGetRole>);++ jest.spyOn(useRolePermissionsModule, 'useRolePermissions').mockReturnValue({+ data: mockPermissionsData,+ isLoading: false,+ isError: false,+ error: null,+ } as ReturnType<typeof useRolePermissionsModule.useRolePermissions>);++ render(<ViewRolePage />, undefined, {+ initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),+ });++ await expect(+ screen.findByTestId('permission-view-mode'),+ ).resolves.toBeInTheDocument();+ expect(+ screen.queryByText(/is not authorized to perform/i),+ ).not.toBeInTheDocument();});});diff --git a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.edgeCases.test.tsx b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.edgeCases.test.tsxindex bc5a5dd306..32bea743a9 100644--- a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.edgeCases.test.tsx+++ b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.edgeCases.test.tsx@@ -78,8 +78,9 @@ describe('ViewRolePage - Edge Cases', () => {initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),});+ // Wait for content to render (not just page wrapper)await expect(- screen.findByTestId('view-role-page'),+ screen.findByTestId('permission-view-mode'),).resolves.toBeInTheDocument();const dashes = screen.getAllByText('—');expect(dashes.length).toBeGreaterThanOrEqual(2);@@ -111,8 +112,9 @@ describe('ViewRolePage - Edge Cases', () => {initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),});+ // Wait for content to render (not just page wrapper)await expect(- screen.findByTestId('view-role-page'),+ screen.findByTestId('permission-view-mode'),).resolves.toBeInTheDocument();const dashes = screen.getAllByText('—');expect(dashes.length).toBeGreaterThanOrEqual(2);diff --git a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.error.test.tsx b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.error.test.tsxindex ab0650dc0c..e476a078da 100644--- a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.error.test.tsx+++ b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.error.test.tsx@@ -4,7 +4,7 @@ import * as roleApi from 'api/generated/services/role';import { customRoleResponse } from 'mocks-server/__mockdata__/roles';import { server } from 'mocks-server/server';import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';-import { render, screen, waitFor } from 'tests/test-utils';+import { render, screen } from 'tests/test-utils';import * as useRolePermissionsModule from '../../hooks/useRolePermissions';import ViewRolePage from '../ViewRolePage';@@ -45,12 +45,12 @@ describe('ViewRolePage - Error State', () => {initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),});- await waitFor(() => {- expect(document.querySelector('.error-in-place')).toBeInTheDocument();- });+ await expect(+ screen.findByTestId('role-error-banner'),+ ).resolves.toBeInTheDocument();});- it('displays error state with title when API fails without role data', async () => {+ it('displays error state when API fails without role data', async () => {jest.spyOn(roleApi, 'useGetRole').mockReturnValue({data: undefined,isLoading: false,@@ -62,12 +62,10 @@ describe('ViewRolePage - Error State', () => {initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),});+ // Error shows in content area after authz check passesawait expect(- screen.findByText('Failed to load role'),+ screen.findByTestId('role-error-banner'),).resolves.toBeInTheDocument();- await waitFor(() => {- expect(document.querySelector('.error-in-place')).toBeInTheDocument();- });});it('shows back button on error state', async () => {diff --git a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.loading.test.tsx b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.loading.test.tsxindex 66d230ab8f..6efa4d841b 100644--- a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.loading.test.tsx+++ b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.loading.test.tsx@@ -1,7 +1,7 @@import * as roleApi from 'api/generated/services/role';import { server } from 'mocks-server/server';import { setupAuthzAdmin } from 'lib/authz/utils/authz-test-utils';-import { render } from 'tests/test-utils';+import { render, screen } from 'tests/test-utils';import ViewRolePage from '../ViewRolePage';@@ -36,6 +36,24 @@ describe('ViewRolePage - Loading State', () => {expect(document.querySelector('.ant-skeleton')).toBeInTheDocument();});+ it('keeps the header visible with delete disabled while fetching role', async () => {+ jest.spyOn(roleApi, 'useGetRole').mockReturnValue({+ data: undefined,+ isLoading: true,+ isError: false,+ error: null,+ } as ReturnType<typeof roleApi.useGetRole>);++ render(<ViewRolePage />, undefined, {+ initialRoute: buildViewRoleRoute(CUSTOM_ROLE_ID, CUSTOM_ROLE_NAME),+ });++ await expect(+ screen.findByTestId('delete-button'),+ ).resolves.toBeInTheDocument();+ expect(screen.getByTestId('delete-button')).toBeDisabled();+ });+it('does not fetch when roleId is missing from URL', () => {const getRole = jest.spyOn(roleApi, 'useGetRole');diff --git a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.permissionOverview.test.tsx b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.permissionOverview.test.tsxindex af5d193a6b..266920af49 100644--- a/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.permissionOverview.test.tsx+++ b/frontend/src/container/RolesSettings/ViewRolePage/__tests__/ViewRolePage.permissionOverview.test.tsx@@ -18,8 +18,9 @@ import {} from './testUtils';async function waitForPageReady(): Promise<void> {+ // Wait for content to render (after authz check passes)await expect(- screen.findByTestId('view-role-page'),+ screen.findByTestId('permission-view-mode'),).resolves.toBeInTheDocument();}diff --git a/frontend/src/lib/authz/components/AuthZButton/AuthZButton.tsx b/frontend/src/lib/authz/components/AuthZButton/AuthZButton.tsxindex 70f3c1fa84..93dc6be68c 100644--- a/frontend/src/lib/authz/components/AuthZButton/AuthZButton.tsx+++ b/frontend/src/lib/authz/components/AuthZButton/AuthZButton.tsx@@ -15,12 +15,18 @@ export type AuthZButtonProps = ButtonProps & {* Gate the permission check itself. When false, renders a plain button.*/authZEnabled?: boolean;+ /**+ * Set this false when this button is used inside a modal/drawer of signozhq/ui,+ * otherwise the tooltip will not have the correct z-index+ */+ withPortal?: false;};function AuthZButton({checks,tooltipMessage,authZEnabled = true,+ withPortal,...buttonProps}: AuthZButtonProps): JSX.Element {return (@@ -28,6 +34,7 @@ function AuthZButton({checks={checks}enabled={authZEnabled}tooltipMessage={tooltipMessage}+ withPortal={withPortal}><Button {...buttonProps} /></AuthZTooltip>diff --git a/frontend/src/lib/authz/components/AuthZTooltip/AuthZTooltip.tsx b/frontend/src/lib/authz/components/AuthZTooltip/AuthZTooltip.tsxindex d78f532ce5..f9b38b4a90 100644--- a/frontend/src/lib/authz/components/AuthZTooltip/AuthZTooltip.tsx+++ b/frontend/src/lib/authz/components/AuthZTooltip/AuthZTooltip.tsx@@ -1,8 +1,8 @@-import { CSSProperties, ReactElement, cloneElement, useMemo } from 'react';+import { cloneElement, CSSProperties, ReactElement, useMemo } from 'react';import {- TooltipRoot,TooltipContent,TooltipProvider,+ TooltipRoot,TooltipTrigger,} from '@signozhq/ui/tooltip';import type { BrandedPermission } from 'lib/authz/hooks/useAuthZ/types';@@ -23,6 +23,11 @@ interface AuthZTooltipProps {children: ReactElement;enabled?: boolean;tooltipMessage?: string;+ /**+ * Set this false when this button is used inside a modal/drawer of signozhq/ui,+ * otherwise the tooltip will not have the correct z-index+ */+ withPortal?: false;}function formatDeniedMessage(@@ -42,6 +47,7 @@ function AuthZTooltip({children,enabled = true,tooltipMessage,+ withPortal,}: AuthZTooltipProps): JSX.Element {const { user } = useAppContext();const shouldCheck = enabled && checks.length > 0;@@ -69,10 +75,12 @@ function AuthZTooltip({return children;}+ const childTestId = (children.props as { testId?: string }).testId;+return (<TooltipProvider><TooltipRoot>- <TooltipTrigger asChild>+ <TooltipTrigger asChild testId={childTestId}>{cloneElement(children, {disabled: true,style: DISABLED_STYLE,@@ -82,7 +90,7 @@ function AuthZTooltip({'data-denied-permissions': deniedPermissions.join(','),})}</TooltipTrigger>- <TooltipContent className={styles.errorContent}>+ <TooltipContent className={styles.errorContent} withPortal={withPortal}>{formatDeniedMessage(deniedPermissions, user.id, tooltipMessage)}</TooltipContent></TooltipRoot>