fix(flamegraph): two-pass fetch to avoid loading events for all spans

The previous approach fetched all span data (including events) in a single
query, then returned only a windowed subset (~5000 spans). For traces with
200k spans and 2 events avg, this caused ~440MB of allocation just for
events that were never sent to the client.

New flow (always applied, cache-miss path):
- Pass 1: skeleton query fetches only span_id, parent_span_id, timestamp,
  duration_nano, has_error, service_name, name for ALL spans. No events,
  no attribute maps. Builds the complete BFS tree and selects the response
  window with minimal memory.
- Pass 2: hydration query fetches events (and attribute maps if SelectFields
  is set) only for the span IDs that survive window selection and sampling
  (~5000 max for windowed traces). Uses named parameters with IN @spanIDs.

Memory impact:
- Large traces (200k spans, windowed): ~9x reduction — tree building uses
  ~40MB skeleton instead of ~400MB with events
- Small traces (all spans returned): marginal memory benefit from leaner
  tree-building phase; ~10-50ms extra latency from the second round-trip

Also inlines the trace summary query (previously inside GetSpansForTrace)
so time bounds are shared between both passes without calling the shared
helper.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

frontend/src/components/Alerts/ErrorEmptyState/ErrorEmptyState.module.scss

@@ -1,31 +0,0 @@
-.emptyState {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	gap: 12px;
-	padding: 48px 24px;
-	text-align: center;
-}
-
-.icon {
-	color: var(--danger-background);
-}
-
-.title {
-	font-size: 16px;
-	font-weight: 500;
-	color: var(--text-vanilla-100);
-}
-
-.subtitle {
-	font-size: 14px;
-	color: var(--text-vanilla-400);
-	max-width: 400px;
-}
-
-.actions {
-	display: flex;
-	gap: 8px;
-	margin-top: 4px;
-}

frontend/src/components/Alerts/ErrorEmptyState/ErrorEmptyState.tsx

@@ -1,61 +0,0 @@
-import { useCallback } from 'react';
-import { LifeBuoy, RefreshCw, TriangleAlert } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { handleContactSupport } from 'container/Integrations/utils';
-import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
-
-import styles from './ErrorEmptyState.module.scss';
-
-interface ErrorEmptyStateProps {
-	title?: string;
-	subtitle?: string;
-	onRefresh?: () => void;
-}
-
-function ErrorEmptyState({
-	title = 'Something went wrong',
-	subtitle = 'Our team is getting on top to resolve this. Please reach out to support if the issue persists.',
-	onRefresh,
-}: ErrorEmptyStateProps): JSX.Element {
-	const { isCloudUser } = useGetTenantLicense();
-
-	const onContactSupport = useCallback((): void => {
-		handleContactSupport(isCloudUser);
-	}, [isCloudUser]);
-
-	return (
-		<div className={styles.emptyState} data-testid="error-empty-state">
-			<TriangleAlert className={styles.icon} size={32} />
-			<div className={styles.title} data-testid="error-title">
-				{title}
-			</div>
-			<div className={styles.subtitle} data-testid="error-subtitle">
-				{subtitle}
-			</div>
-			<div className={styles.actions}>
-				<Button
-					variant="solid"
-					color="secondary"
-					prefix={<LifeBuoy size={14} />}
-					onClick={onContactSupport}
-					data-testid="error-contact-support-button"
-				>
-					Contact Support
-				</Button>
-				{onRefresh && (
-					<Button
-						variant="outlined"
-						color="secondary"
-						prefix={<RefreshCw size={14} />}
-						onClick={onRefresh}
-						data-testid="error-refresh-button"
-					>
-						Refresh
-					</Button>
-				)}
-			</div>
-		</div>
-	);
-}
-
-export default ErrorEmptyState;

frontend/src/components/Alerts/ErrorEmptyState/index.ts

@@ -1 +0,0 @@
-export { default } from './ErrorEmptyState';

frontend/src/components/Alerts/LabelColumn/LabelColumn.module.scss

@@ -1,68 +0,0 @@
-.labelColumn {
-	display: flex;
-	gap: 4px;
-	align-items: center;
-	overflow: hidden;
-	max-width: 100%;
-	width: 100%;
-}
-
-.labelBadge {
-	cursor: default;
-	font-size: 12px;
-
-	--badge-display: inline;
-
-	max-width: 180px;
-	text-overflow: ellipsis;
-}
-
-.overflowTrigger {
-	all: unset;
-	cursor: pointer;
-}
-
-.overflowBadge {
-	cursor: pointer;
-	font-size: 12px;
-}
-
-.labelPopover {
-	display: flex;
-	flex-direction: column;
-	gap: 6px;
-	padding: 8px;
-	max-height: 300px;
-	overflow-y: auto;
-}
-
-.labelTooltip {
-	display: flex;
-	flex-direction: column;
-	gap: 6px;
-	max-height: 300px;
-	overflow-y: auto;
-}
-
-.labelValue {
-	text-overflow: ellipsis;
-	overflow: hidden;
-}
-
-.tooltipContent {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-}
-
-.copyButton {
-	all: unset;
-	cursor: pointer;
-	display: flex;
-	align-items: center;
-	opacity: 0.7;
-
-	&:hover {
-		opacity: 1;
-	}
-}

frontend/src/components/Alerts/LabelColumn/LabelColumn.test.tsx

@@ -1,139 +0,0 @@
-import { TooltipProvider } from '@signozhq/ui/tooltip';
-import { act, render, screen } from '@testing-library/react';
-
-import LabelColumn from './LabelColumn';
-
-let resizeCallback: ResizeObserverCallback | null = null;
-
-class MockResizeObserver {
-	constructor(callback: ResizeObserverCallback) {
-		resizeCallback = callback;
-	}
-
-	observe = jest.fn();
-	unobserve = jest.fn();
-	disconnect = jest.fn();
-}
-
-function triggerResize(width: number): void {
-	if (resizeCallback) {
-		act(() => {
-			resizeCallback?.(
-				[{ contentRect: { width } } as ResizeObserverEntry],
-				{} as ResizeObserver,
-			);
-		});
-	}
-}
-
-beforeAll(() => {
-	global.ResizeObserver = MockResizeObserver as unknown as typeof ResizeObserver;
-});
-
-afterEach(() => {
-	resizeCallback = null;
-});
-
-function renderWithProviders(
-	ui: React.ReactElement,
-): ReturnType<typeof render> {
-	return render(<TooltipProvider>{ui}</TooltipProvider>);
-}
-
-describe('LabelColumn', () => {
-	it('should render all labels when 5 or fewer', () => {
-		const labels = ['env', 'service', 'region'];
-
-		renderWithProviders(<LabelColumn labels={labels} />);
-
-		expect(screen.getByTestId('label-tag-env')).toBeInTheDocument();
-		expect(screen.getByTestId('label-tag-service')).toBeInTheDocument();
-		expect(screen.getByTestId('label-tag-region')).toBeInTheDocument();
-	});
-
-	it('should truncate labels and show +N badge when container is narrow', () => {
-		const labels = ['env', 'service', 'region', 'team', 'owner', 'version'];
-
-		renderWithProviders(<LabelColumn labels={labels} />);
-
-		// Simulate narrow container that fits ~3 badges (500px = 3 badges + overflow)
-		triggerResize(500);
-
-		// First 3 visible
-		expect(screen.getByTestId('label-tag-env')).toBeInTheDocument();
-		expect(screen.getByTestId('label-tag-service')).toBeInTheDocument();
-		expect(screen.getByTestId('label-tag-region')).toBeInTheDocument();
-
-		// Remaining in overflow badge
-		expect(screen.getByTestId('label-overflow-badge')).toHaveTextContent('+3');
-	});
-
-	it('should render label with value when value prop provided', () => {
-		const labels = ['env'];
-		const value = { env: 'production' };
-
-		renderWithProviders(<LabelColumn labels={labels} value={value} />);
-
-		expect(screen.getByTestId('label-tag-env')).toHaveTextContent(
-			'env: production',
-		);
-	});
-
-	it('should render labels without value when value is not provided for that label', () => {
-		const labels = ['env', 'service'];
-		const value = { env: 'production' };
-
-		renderWithProviders(<LabelColumn labels={labels} value={value} />);
-
-		expect(screen.getByTestId('label-tag-env')).toHaveTextContent(
-			'env: production',
-		);
-		expect(screen.getByTestId('label-tag-service')).toHaveTextContent('service');
-	});
-
-	it('should show overflow badge with remaining count when container is narrow', () => {
-		const labels = ['env', 'service', 'region', 'team', 'owner', 'version'];
-
-		renderWithProviders(<LabelColumn labels={labels} />);
-
-		// Simulate narrow container to trigger overflow (shows 3 labels)
-		triggerResize(500);
-
-		// Overflow badge shows +3 (remaining labels)
-		const overflowBadge = screen.getByTestId('label-overflow-badge');
-		expect(overflowBadge).toBeInTheDocument();
-		expect(overflowBadge).toHaveTextContent('+3');
-	});
-
-	it('should render empty when no labels provided', () => {
-		renderWithProviders(<LabelColumn labels={[]} />);
-
-		const column = screen.getByTestId('label-column');
-		expect(column.children).toHaveLength(0);
-	});
-
-	it('should use primary color by default', () => {
-		const labels = ['env'];
-
-		renderWithProviders(<LabelColumn labels={labels} />);
-
-		expect(screen.getByTestId('label-tag-env')).toBeInTheDocument();
-	});
-
-	it('should show all labels when container is wide enough', () => {
-		const labels = ['env', 'service', 'region', 'team', 'owner', 'version'];
-
-		renderWithProviders(<LabelColumn labels={labels} />);
-
-		// Simulate wide container
-		triggerResize(1000);
-
-		// All labels visible
-		labels.forEach((label) => {
-			expect(screen.getByTestId(`label-tag-${label}`)).toBeInTheDocument();
-		});
-
-		// No overflow badge
-		expect(screen.queryByTestId('label-overflow-badge')).not.toBeInTheDocument();
-	});
-});

frontend/src/components/Alerts/LabelColumn/LabelColumn.tsx

@@ -1,144 +0,0 @@
-import { Copy } from '@signozhq/icons';
-import { Badge } from '@signozhq/ui/badge';
-import { toast } from '@signozhq/ui/sonner';
-import {
-	TooltipContent,
-	TooltipRoot,
-	TooltipTrigger,
-} from '@signozhq/ui/tooltip';
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { useCopyToClipboard } from 'react-use';
-
-import LabelTag from './LabelTag';
-
-import styles from './LabelColumn.module.scss';
-
-export interface LabelColumnProps {
-	labels: string[];
-	color?:
-		| 'primary'
-		| 'secondary'
-		| 'success'
-		| 'error'
-		| 'warning'
-		| 'robin'
-		| 'forest'
-		| 'amber'
-		| 'sienna'
-		| 'cherry'
-		| 'sakura'
-		| 'aqua'
-		| 'vanilla';
-	value?: { [key: string]: string };
-}
-
-const BADGE_GAP = 4;
-const OVERFLOW_BADGE_WIDTH = 40;
-const ESTIMATED_BADGE_WIDTH = 120;
-
-function LabelColumn({
-	labels,
-	value,
-	color = 'primary',
-}: LabelColumnProps): JSX.Element {
-	const containerRef = useRef<HTMLDivElement>(null);
-	const [maxVisibleCount, setMaxVisibleCount] = useState(labels.length);
-	const [, copyToClipboard] = useCopyToClipboard();
-
-	const calculateMaxVisible = useCallback(
-		(width: number): number => {
-			if (width <= 0) {
-				return 1;
-			}
-
-			const availableWidth = width - OVERFLOW_BADGE_WIDTH - BADGE_GAP;
-			const badgeSlotWidth = ESTIMATED_BADGE_WIDTH + BADGE_GAP;
-			const maxFit = Math.max(1, Math.floor(availableWidth / badgeSlotWidth));
-
-			return Math.min(maxFit, labels.length);
-		},
-		[labels.length],
-	);
-
-	useEffect(() => {
-		const container = containerRef.current;
-		if (!container) {
-			return;
-		}
-
-		const observer = new ResizeObserver((entries) => {
-			const entry = entries[0];
-			if (entry && entry.contentRect.width > 0) {
-				setMaxVisibleCount(calculateMaxVisible(entry.contentRect.width));
-			}
-		});
-
-		observer.observe(container);
-
-		if (container.clientWidth > 0) {
-			setMaxVisibleCount(calculateMaxVisible(container.clientWidth));
-		}
-
-		return (): void => observer.disconnect();
-	}, [calculateMaxVisible]);
-
-	const needsOverflow = labels.length > maxVisibleCount;
-	const visibleLabels = needsOverflow
-		? labels.slice(0, maxVisibleCount)
-		: labels;
-	const remainingLabels = needsOverflow ? labels.slice(maxVisibleCount) : [];
-
-	return (
-		<div
-			ref={containerRef}
-			className={styles.labelColumn}
-			data-testid="label-column"
-		>
-			{visibleLabels.map((label) => (
-				<LabelTag key={label} label={label} color={color} value={value?.[label]} />
-			))}
-			{remainingLabels.length > 0 && (
-				<TooltipRoot>
-					<TooltipTrigger asChild>
-						<span>
-							<Badge
-								color={color}
-								className={styles.overflowBadge}
-								variant="outline"
-								data-testid="label-overflow-badge"
-							>
-								+{remainingLabels.length}
-							</Badge>
-						</span>
-					</TooltipTrigger>
-					<TooltipContent side="bottom" align="end">
-						<div className={styles.tooltipContent}>
-							<span>
-								{remainingLabels
-									.map((label) => (value?.[label] ? `${label}: ${value[label]}` : label))
-									.join(', ')}
-							</span>
-							<button
-								type="button"
-								className={styles.copyButton}
-								onClick={(e): void => {
-									e.stopPropagation();
-									const searchFormat = remainingLabels
-										.map((label) => (value?.[label] ? `${label} ${value[label]}` : label))
-										.join(' ');
-									copyToClipboard(searchFormat);
-									toast.success('Copied! Use in search to filter alerts.');
-								}}
-								aria-label="Copy to clipboard"
-							>
-								<Copy size={12} />
-							</button>
-						</div>
-					</TooltipContent>
-				</TooltipRoot>
-			)}
-		</div>
-	);
-}
-
-export default LabelColumn;

frontend/src/components/Alerts/LabelColumn/LabelTag.module.scss

@@ -1,30 +0,0 @@
-.labelBadge {
-	cursor: default;
-	font-size: 12px;
-
-	max-width: 180px;
-	text-overflow: ellipsis;
-}
-
-.labelValue {
-	text-overflow: ellipsis;
-	overflow: hidden;
-}
-
-.tooltipContent {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-}
-
-.copyButton {
-	all: unset;
-	cursor: pointer;
-	display: flex;
-	align-items: center;
-	opacity: 0.7;
-
-	&:hover {
-		opacity: 1;
-	}
-}

frontend/src/components/Alerts/LabelColumn/LabelTag.tsx

@@ -1,74 +0,0 @@
-import { Copy } from '@signozhq/icons';
-import { Badge } from '@signozhq/ui/badge';
-import { toast } from '@signozhq/ui/sonner';
-import {
-	TooltipContent,
-	TooltipRoot,
-	TooltipTrigger,
-} from '@signozhq/ui/tooltip';
-import { useCopyToClipboard } from 'react-use';
-
-import styles from './LabelTag.module.scss';
-
-export interface LabelTagProps {
-	label: string;
-	color?:
-		| 'primary'
-		| 'secondary'
-		| 'success'
-		| 'error'
-		| 'warning'
-		| 'robin'
-		| 'forest'
-		| 'amber'
-		| 'sienna'
-		| 'cherry'
-		| 'sakura'
-		| 'aqua'
-		| 'vanilla';
-	value?: string;
-}
-
-function LabelTag({ label, value, color }: LabelTagProps): JSX.Element {
-	const [, copyToClipboard] = useCopyToClipboard();
-	const displayText = value ? `${label}: ${value}` : label;
-	const searchFormat = value ? `${label} ${value}` : label;
-
-	const handleCopy = (e: React.MouseEvent): void => {
-		e.stopPropagation();
-		copyToClipboard(searchFormat);
-		toast.success('Copied! Use in search to filter alerts.');
-	};
-
-	return (
-		<TooltipRoot>
-			<TooltipTrigger asChild>
-				<span>
-					<Badge
-						color={color}
-						className={styles.labelBadge}
-						variant="outline"
-						data-testid={`label-tag-${label}`}
-					>
-						<span className={styles.labelValue}>{displayText}</span>
-					</Badge>
-				</span>
-			</TooltipTrigger>
-			<TooltipContent>
-				<div className={styles.tooltipContent}>
-					<span>{displayText}</span>
-					<button
-						type="button"
-						className={styles.copyButton}
-						onClick={handleCopy}
-						aria-label="Copy to clipboard"
-					>
-						<Copy size={12} />
-					</button>
-				</div>
-			</TooltipContent>
-		</TooltipRoot>
-	);
-}
-
-export default LabelTag;

frontend/src/components/Alerts/LabelColumn/index.ts

@@ -1,2 +0,0 @@
-export { default } from './LabelColumn';
-export type { LabelColumnProps } from './LabelColumn';

frontend/src/components/Alerts/NoResultsEmptyState/NoResultsEmptyState.module.scss

@@ -1,30 +0,0 @@
-.emptyState {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	gap: 12px;
-	padding: 48px 24px;
-	text-align: center;
-}
-
-.icon {
-	color: var(--text-vanilla-400);
-}
-
-.title {
-	font-size: 16px;
-	font-weight: 500;
-	color: var(--text-vanilla-100);
-}
-
-.subtitle {
-	font-size: 14px;
-	color: var(--text-vanilla-400);
-	max-width: 400px;
-}
-
-.actions {
-	display: flex;
-	gap: 8px;
-}

frontend/src/components/Alerts/NoResultsEmptyState/NoResultsEmptyState.test.tsx

@@ -1,71 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-import NoResultsEmptyState from './NoResultsEmptyState';
-
-describe('NoResultsEmptyState', () => {
-	it('should render with default props', () => {
-		render(<NoResultsEmptyState />);
-
-		expect(screen.getByTestId('no-results-empty-state')).toBeInTheDocument();
-		expect(screen.getByTestId('no-results-title')).toHaveTextContent(
-			'No matching results',
-		);
-		expect(screen.getByTestId('no-results-subtitle')).toHaveTextContent(
-			'No items match your current filters. Try adjusting your search criteria.',
-		);
-	});
-
-	it('should render with custom title and subtitle', () => {
-		render(
-			<NoResultsEmptyState title="Custom Title" subtitle="Custom Subtitle" />,
-		);
-
-		expect(screen.getByTestId('no-results-title')).toHaveTextContent(
-			'Custom Title',
-		);
-		expect(screen.getByTestId('no-results-subtitle')).toHaveTextContent(
-			'Custom Subtitle',
-		);
-	});
-
-	it('should not render clear button when onClear is not provided', () => {
-		render(<NoResultsEmptyState />);
-
-		expect(
-			screen.queryByTestId('no-results-clear-button'),
-		).not.toBeInTheDocument();
-	});
-
-	it('should render clear button when onClear is provided', () => {
-		const onClear = jest.fn();
-
-		render(<NoResultsEmptyState onClear={onClear} />);
-
-		expect(screen.getByTestId('no-results-clear-button')).toBeInTheDocument();
-		expect(screen.getByTestId('no-results-clear-button')).toHaveTextContent(
-			'Clear Filters',
-		);
-	});
-
-	it('should render custom clear button text', () => {
-		render(
-			<NoResultsEmptyState onClear={jest.fn()} clearButtonText="Reset All" />,
-		);
-
-		expect(screen.getByTestId('no-results-clear-button')).toHaveTextContent(
-			'Reset All',
-		);
-	});
-
-	it('should call onClear when clear button is clicked', async () => {
-		const user = userEvent.setup();
-		const onClear = jest.fn();
-
-		render(<NoResultsEmptyState onClear={onClear} />);
-
-		await user.click(screen.getByTestId('no-results-clear-button'));
-
-		expect(onClear).toHaveBeenCalledTimes(1);
-	});
-});

frontend/src/components/Alerts/NoResultsEmptyState/NoResultsEmptyState.tsx

@@ -1,57 +0,0 @@
-import { RefreshCw, Search } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-
-import styles from './NoResultsEmptyState.module.scss';
-
-interface NoResultsEmptyStateProps {
-	title?: string;
-	subtitle?: string;
-	onClear?: () => void;
-	clearButtonText?: string;
-	onRefresh?: () => void;
-}
-
-function NoResultsEmptyState({
-	title = 'No matching results',
-	subtitle = 'No items match your current filters. Try adjusting your search criteria.',
-	onClear,
-	clearButtonText = 'Clear Filters',
-	onRefresh,
-}: NoResultsEmptyStateProps): JSX.Element {
-	return (
-		<div className={styles.emptyState} data-testid="no-results-empty-state">
-			<Search className={styles.icon} size={16} />
-			<div className={styles.title} data-testid="no-results-title">
-				{title}
-			</div>
-			<div className={styles.subtitle} data-testid="no-results-subtitle">
-				{subtitle}
-			</div>
-			<div className={styles.actions}>
-				{onClear && (
-					<Button
-						variant="outlined"
-						color="secondary"
-						onClick={onClear}
-						data-testid="no-results-clear-button"
-					>
-						{clearButtonText}
-					</Button>
-				)}
-				{onRefresh && (
-					<Button
-						variant="outlined"
-						color="secondary"
-						prefix={<RefreshCw size={14} />}
-						onClick={onRefresh}
-						data-testid="no-results-refresh-button"
-					>
-						Refresh
-					</Button>
-				)}
-			</div>
-		</div>
-	);
-}
-
-export default NoResultsEmptyState;

frontend/src/components/Alerts/NoResultsEmptyState/index.ts

@@ -1 +0,0 @@
-export { default } from './NoResultsEmptyState';

frontend/src/components/Alerts/constants.ts

@@ -1,32 +0,0 @@
-import type { BadgeColor } from '@signozhq/ui/badge';
-
-export const STATE_ORDER = ['firing', 'pending', 'inactive', 'disabled'];
-export const SEVERITY_ORDER = ['critical', 'error', 'warning', 'info'];
-
-export const STATE_LABELS: Record<string, string> = {
-	firing: 'Firing',
-	pending: 'Pending',
-	inactive: 'OK',
-	disabled: 'Disabled',
-};
-
-export const STATE_COLORS: Record<string, string> = {
-	firing: 'var(--bg-cherry-500)',
-	pending: 'var(--bg-amber-500)',
-	inactive: 'var(--bg-forest-500)',
-	disabled: 'var(--l2-foreground)',
-};
-
-export const SEVERITY_COLORS: Record<string, string> = {
-	critical: 'var(--bg-cherry-500)',
-	error: 'var(--bg-cherry-400)',
-	warning: 'var(--bg-amber-500)',
-	info: 'var(--bg-robin-500)',
-};
-
-export const SEVERITY_BADGE_COLORS: Record<string, BadgeColor> = {
-	critical: 'error',
-	error: 'error',
-	warning: 'warning',
-	info: 'primary',
-};

frontend/src/components/Alerts/types.ts

@@ -1,7 +0,0 @@
-export interface FilterValue {
-	value: string;
-}
-
-export interface AlertWithLabels {
-	labels?: Record<string, string>;
-}

frontend/src/components/Alerts/utils.test.ts

@@ -1,287 +0,0 @@
-import type { SortState } from 'components/TanStackTableView/types';
-
-import type { AlertWithLabels, FilterValue } from './types';
-import { filterByLabels, searchByLabels, sortByColumn } from './utils';
-
-interface TestAlert extends AlertWithLabels {
-	name: string;
-	value: number;
-}
-
-const createAlert = (
-	name: string,
-	value: number,
-	labels?: Record<string, string>,
-): TestAlert => ({
-	name,
-	value,
-	labels,
-});
-
-describe('sortByColumn', () => {
-	const alerts: TestAlert[] = [
-		createAlert('Alert C', 3),
-		createAlert('Alert A', 1),
-		createAlert('Alert B', 2),
-	];
-
-	const getSortValue = (
-		item: TestAlert,
-		columnName: string,
-	): string | number => {
-		if (columnName === 'name') {
-			return item.name;
-		}
-		if (columnName === 'value') {
-			return item.value;
-		}
-		return '';
-	};
-
-	it('should return items unchanged when no orderBy provided', () => {
-		const result = sortByColumn(alerts, null, getSortValue);
-		expect(result).toStrictEqual(alerts);
-	});
-
-	it('should sort by string column ascending', () => {
-		const orderBy: SortState = { columnName: 'name', order: 'asc' };
-		const result = sortByColumn(alerts, orderBy, getSortValue);
-		expect(result.map((a) => a.name)).toStrictEqual([
-			'Alert A',
-			'Alert B',
-			'Alert C',
-		]);
-	});
-
-	it('should sort by string column descending', () => {
-		const orderBy: SortState = { columnName: 'name', order: 'desc' };
-		const result = sortByColumn(alerts, orderBy, getSortValue);
-		expect(result.map((a) => a.name)).toStrictEqual([
-			'Alert C',
-			'Alert B',
-			'Alert A',
-		]);
-	});
-
-	it('should sort by number column ascending', () => {
-		const orderBy: SortState = { columnName: 'value', order: 'asc' };
-		const result = sortByColumn(alerts, orderBy, getSortValue);
-		expect(result.map((a) => a.value)).toStrictEqual([1, 2, 3]);
-	});
-
-	it('should sort by number column descending', () => {
-		const orderBy: SortState = { columnName: 'value', order: 'desc' };
-		const result = sortByColumn(alerts, orderBy, getSortValue);
-		expect(result.map((a) => a.value)).toStrictEqual([3, 2, 1]);
-	});
-
-	it('should use defaultSort when orderBy is null', () => {
-		const defaultSort: SortState = { columnName: 'value', order: 'asc' };
-		const result = sortByColumn(alerts, null, getSortValue, defaultSort);
-		expect(result.map((a) => a.value)).toStrictEqual([1, 2, 3]);
-	});
-
-	it('should not mutate original array', () => {
-		const original = [...alerts];
-		const orderBy: SortState = { columnName: 'name', order: 'asc' };
-		sortByColumn(alerts, orderBy, getSortValue);
-		expect(alerts).toStrictEqual(original);
-	});
-
-	it('should handle empty array', () => {
-		const result = sortByColumn(
-			[],
-			{ columnName: 'name', order: 'asc' },
-			getSortValue,
-		);
-		expect(result).toStrictEqual([]);
-	});
-
-	it('should handle equal values', () => {
-		const duplicates = [
-			createAlert('Same', 1),
-			createAlert('Same', 1),
-			createAlert('Same', 1),
-		];
-		const orderBy: SortState = { columnName: 'name', order: 'asc' };
-		const result = sortByColumn(duplicates, orderBy, getSortValue);
-		expect(result).toHaveLength(3);
-	});
-});
-
-describe('searchByLabels', () => {
-	const alerts: TestAlert[] = [
-		createAlert('CPU High', 1, { severity: 'critical', team: 'infra' }),
-		createAlert('Memory Warning', 2, { severity: 'warning', team: 'backend' }),
-		createAlert('Disk Full', 3, { severity: 'error', region: 'us-east' }),
-		createAlert('Network Slow', 4, {}),
-		createAlert('No Labels', 5),
-	];
-
-	const getAlertName = (alert: TestAlert): string => alert.name;
-
-	it('should return all items when search is empty', () => {
-		const result = searchByLabels(alerts, '', getAlertName);
-		expect(result).toStrictEqual(alerts);
-	});
-
-	it('should return all items when search is whitespace', () => {
-		const result = searchByLabels(alerts, '   ', getAlertName);
-		expect(result).toStrictEqual(alerts);
-	});
-
-	it('should search by alert name', () => {
-		const result = searchByLabels(alerts, 'CPU', getAlertName);
-		expect(result).toHaveLength(1);
-		expect(result[0].name).toBe('CPU High');
-	});
-
-	it('should search by alert name case-insensitive', () => {
-		const result = searchByLabels(alerts, 'cpu', getAlertName);
-		expect(result).toHaveLength(1);
-		expect(result[0].name).toBe('CPU High');
-	});
-
-	it('should search by severity label', () => {
-		const result = searchByLabels(alerts, 'critical', getAlertName);
-		expect(result).toHaveLength(1);
-		expect(result[0].name).toBe('CPU High');
-	});
-
-	it('should search by any label key', () => {
-		const result = searchByLabels(alerts, 'team', getAlertName);
-		expect(result).toHaveLength(2);
-	});
-
-	it('should search by any label value', () => {
-		const result = searchByLabels(alerts, 'infra', getAlertName);
-		expect(result).toHaveLength(1);
-		expect(result[0].name).toBe('CPU High');
-	});
-
-	it('should handle alerts with no labels', () => {
-		const result = searchByLabels(alerts, 'No Labels', getAlertName);
-		expect(result).toHaveLength(1);
-		expect(result[0].name).toBe('No Labels');
-	});
-
-	it('should handle partial matches', () => {
-		const result = searchByLabels(alerts, 'warn', getAlertName);
-		expect(result).toHaveLength(1);
-		expect(result[0].name).toBe('Memory Warning');
-	});
-
-	it('should return empty for no matches', () => {
-		const result = searchByLabels(alerts, 'nonexistent', getAlertName);
-		expect(result).toStrictEqual([]);
-	});
-
-	it('should trim search text', () => {
-		const result = searchByLabels(alerts, '  CPU  ', getAlertName);
-		expect(result).toHaveLength(1);
-		expect(result[0].name).toBe('CPU High');
-	});
-});
-
-describe('filterByLabels', () => {
-	const alerts: TestAlert[] = [
-		createAlert('A1', 1, { severity: 'critical', team: 'infra', env: 'prod' }),
-		createAlert('A2', 2, { severity: 'critical', team: 'backend', env: 'prod' }),
-		createAlert('A3', 3, { severity: 'warning', team: 'infra', env: 'staging' }),
-		createAlert('A4', 4, { severity: 'info', team: 'frontend', env: 'dev' }),
-		createAlert('A5', 5, {}),
-		createAlert('A6', 6),
-	];
-
-	const createFilter = (value: string): FilterValue => ({ value });
-
-	it('should return all items when filters are empty', () => {
-		const result = filterByLabels(alerts, []);
-		expect(result).toStrictEqual(alerts);
-	});
-
-	it('should return all items when filters is null-ish', () => {
-		const result = filterByLabels(alerts, null as unknown as FilterValue[]);
-		expect(result).toStrictEqual(alerts);
-	});
-
-	it('should filter by single label', () => {
-		const filters = [createFilter('severity:critical')];
-		const result = filterByLabels(alerts, filters);
-		expect(result).toHaveLength(2);
-		expect(result.map((a) => a.name)).toStrictEqual(['A1', 'A2']);
-	});
-
-	it('should use OR logic for same key', () => {
-		const filters = [
-			createFilter('severity:critical'),
-			createFilter('severity:warning'),
-		];
-		const result = filterByLabels(alerts, filters);
-		expect(result).toHaveLength(3);
-		expect(result.map((a) => a.name)).toStrictEqual(['A1', 'A2', 'A3']);
-	});
-
-	it('should use AND logic for different keys', () => {
-		const filters = [
-			createFilter('severity:critical'),
-			createFilter('team:infra'),
-		];
-		const result = filterByLabels(alerts, filters);
-		expect(result).toHaveLength(1);
-		expect(result[0].name).toBe('A1');
-	});
-
-	it('should handle case-insensitive keys', () => {
-		const filters = [createFilter('SEVERITY:critical')];
-		const result = filterByLabels(alerts, filters);
-		expect(result).toHaveLength(2);
-	});
-
-	it('should handle case-insensitive values', () => {
-		const filters = [createFilter('severity:CRITICAL')];
-		const result = filterByLabels(alerts, filters);
-		expect(result).toHaveLength(2);
-	});
-
-	it('should trim whitespace', () => {
-		const filters = [createFilter(' severity : critical ')];
-		const result = filterByLabels(alerts, filters);
-		expect(result).toHaveLength(2);
-	});
-
-	it('should return empty for invalid filter format', () => {
-		const filters = [createFilter('invalid')];
-		const result = filterByLabels(alerts, filters);
-		expect(result).toStrictEqual([]);
-	});
-
-	it('should ignore invalid filters mixed with valid', () => {
-		const filters = [createFilter('invalid'), createFilter('severity:critical')];
-		const result = filterByLabels(alerts, filters);
-		expect(result).toHaveLength(2);
-	});
-
-	it('should exclude alerts without matching label key', () => {
-		const filters = [createFilter('nonexistent:value')];
-		const result = filterByLabels(alerts, filters);
-		expect(result).toStrictEqual([]);
-	});
-
-	it('should exclude alerts with no labels', () => {
-		const filters = [createFilter('severity:critical')];
-		const result = filterByLabels(alerts, filters);
-		expect(result.every((a) => a.labels !== undefined)).toBe(true);
-	});
-
-	it('should handle complex AND/OR combinations', () => {
-		const filters = [
-			createFilter('env:prod'),
-			createFilter('env:staging'),
-			createFilter('team:infra'),
-		];
-		const result = filterByLabels(alerts, filters);
-		expect(result).toHaveLength(2);
-		expect(result.map((a) => a.name)).toStrictEqual(['A1', 'A3']);
-	});
-});

frontend/src/components/Alerts/utils.ts

@@ -1,116 +0,0 @@
-import type { SortState } from 'components/TanStackTableView/types';
-
-import type { AlertWithLabels, FilterValue } from './types';
-
-/**
- * Generic sort function for alert-like data
- */
-export function sortByColumn<T>(
-	items: T[],
-	orderBy: SortState | null,
-	getSortValue: (item: T, columnName: string) => string | number,
-	defaultSort?: SortState,
-): T[] {
-	const sortState = orderBy ?? defaultSort;
-	if (!sortState) {
-		return items;
-	}
-
-	const { columnName, order } = sortState;
-	const multiplier = order === 'asc' ? 1 : -1;
-
-	return [...items].sort((a, b) => {
-		const aVal = getSortValue(a, columnName);
-		const bVal = getSortValue(b, columnName);
-
-		if (aVal < bVal) {
-			return -1 * multiplier;
-		}
-		if (aVal > bVal) {
-			return 1 * multiplier;
-		}
-		return 0;
-	});
-}
-
-/**
- * Search alerts/rules by name, severity, and all labels
- */
-export function searchByLabels<T extends AlertWithLabels>(
-	items: T[],
-	searchText: string,
-	getAlertName: (item: T) => string,
-): T[] {
-	if (!searchText.trim()) {
-		return items;
-	}
-
-	const value = searchText.toLowerCase().trim();
-
-	return items.filter((item) => {
-		const alertName = getAlertName(item).toLowerCase();
-		const severity = item.labels?.severity?.toLowerCase() ?? '';
-
-		const labelSearchString = Object.entries(item.labels ?? {})
-			.map(([key, val]) => `${key} ${val}`)
-			.join(' ')
-			.toLowerCase();
-
-		return (
-			alertName.includes(value) ||
-			severity.includes(value) ||
-			labelSearchString.includes(value)
-		);
-	});
-}
-
-/**
- * Filter alerts by label key:value pairs
- * Same key uses OR logic, different keys use AND logic
- */
-export function filterByLabels<T extends AlertWithLabels>(
-	items: T[],
-	selectedFilters: FilterValue[],
-): T[] {
-	if (!selectedFilters?.length) {
-		return items;
-	}
-
-	const validFilters = selectedFilters
-		.map((e) => e.value)
-		.filter((v) => v.split(':').length === 2);
-
-	if (!validFilters.length) {
-		return [];
-	}
-
-	// Group values by key - same key uses OR, different keys use AND
-	const filtersByKey = new Map<string, string[]>();
-	validFilters.forEach((f) => {
-		const [key, value] = f.split(':');
-		const trimmedKey = key.trim().toLowerCase();
-		const trimmedValue = value.trim().toLowerCase();
-		const existing = filtersByKey.get(trimmedKey) ?? [];
-		existing.push(trimmedValue);
-		filtersByKey.set(trimmedKey, existing);
-	});
-
-	return items.filter((item) => {
-		if (!item.labels) {
-			return false;
-		}
-
-		// All keys must match (AND), any value per key can match (OR)
-		return Array.from(filtersByKey.entries()).every(([filterKey, values]) => {
-			// Case-insensitive key lookup
-			const matchingKey = Object.keys(item.labels ?? {}).find(
-				(k) => k.toLowerCase() === filterKey,
-			);
-			if (!matchingKey) {
-				return false;
-			}
-			const labelValue = item.labels?.[matchingKey]?.toLowerCase();
-			return values.some((v) => labelValue === v);
-		});
-	});
-}

frontend/src/components/AuthZTooltip/AuthZTooltip.module.scss

@@ -0,0 +1,14 @@
+.wrapper {
+	cursor: not-allowed;
+}
+
+.errorContent {
+	background: var(--callout-error-background) !important;
+	border-color: var(--callout-error-border) !important;
+	backdrop-filter: blur(15px);
+	border-radius: 4px !important;
+	color: var(--foreground) !important;
+	font-style: normal;
+	font-weight: 400;
+	white-space: nowrap;
+}

frontend/src/components/AuthZTooltip/AuthZTooltip.test.tsx

@@ -0,0 +1,145 @@
+import { ReactElement } from 'react';
+import { render, screen } from 'tests/test-utils';
+import { buildPermission } from 'hooks/useAuthZ/utils';
+import type { AuthZObject, BrandedPermission } from 'hooks/useAuthZ/types';
+import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
+import AuthZTooltip from './AuthZTooltip';
+
+jest.mock('hooks/useAuthZ/useAuthZ');
+const mockUseAuthZ = useAuthZ as jest.MockedFunction<typeof useAuthZ>;
+
+const noPermissions = {
+	isLoading: false,
+	isFetching: false,
+	error: null,
+	permissions: null,
+	refetchPermissions: jest.fn(),
+};
+
+const TestButton = (
+	props: React.ButtonHTMLAttributes<HTMLButtonElement>,
+): ReactElement => (
+	<button type="button" {...props}>
+		Action
+	</button>
+);
+
+const createPerm = buildPermission(
+	'create',
+	'serviceaccount:*' as AuthZObject<'create'>,
+);
+const attachSAPerm = (id: string): BrandedPermission =>
+	buildPermission('attach', `serviceaccount:${id}` as AuthZObject<'attach'>);
+const attachRolePerm = buildPermission(
+	'attach',
+	'role:*' as AuthZObject<'attach'>,
+);
+
+describe('AuthZTooltip — single check', () => {
+	it('renders child unchanged when permission is granted', () => {
+		mockUseAuthZ.mockReturnValue({
+			...noPermissions,
+			permissions: { [createPerm]: { isGranted: true } },
+		});
+
+		render(
+			<AuthZTooltip checks={[createPerm]}>
+				<TestButton />
+			</AuthZTooltip>,
+		);
+
+		expect(screen.getByRole('button', { name: 'Action' })).not.toBeDisabled();
+	});
+
+	it('disables child when permission is denied', () => {
+		mockUseAuthZ.mockReturnValue({
+			...noPermissions,
+			permissions: { [createPerm]: { isGranted: false } },
+		});
+
+		render(
+			<AuthZTooltip checks={[createPerm]}>
+				<TestButton />
+			</AuthZTooltip>,
+		);
+
+		expect(screen.getByRole('button', { name: 'Action' })).toBeDisabled();
+	});
+
+	it('disables child while loading', () => {
+		mockUseAuthZ.mockReturnValue({ ...noPermissions, isLoading: true });
+
+		render(
+			<AuthZTooltip checks={[createPerm]}>
+				<TestButton />
+			</AuthZTooltip>,
+		);
+
+		expect(screen.getByRole('button', { name: 'Action' })).toBeDisabled();
+	});
+});
+
+describe('AuthZTooltip — multi-check (checks array)', () => {
+	it('renders child enabled when all checks are granted', () => {
+		const sa = attachSAPerm('sa-1');
+		mockUseAuthZ.mockReturnValue({
+			...noPermissions,
+			permissions: {
+				[sa]: { isGranted: true },
+				[attachRolePerm]: { isGranted: true },
+			},
+		});
+
+		render(
+			<AuthZTooltip checks={[sa, attachRolePerm]}>
+				<TestButton />
+			</AuthZTooltip>,
+		);
+
+		expect(screen.getByRole('button', { name: 'Action' })).not.toBeDisabled();
+	});
+
+	it('disables child when first check is denied, second granted', () => {
+		const sa = attachSAPerm('sa-1');
+		mockUseAuthZ.mockReturnValue({
+			...noPermissions,
+			permissions: {
+				[sa]: { isGranted: false },
+				[attachRolePerm]: { isGranted: true },
+			},
+		});
+
+		render(
+			<AuthZTooltip checks={[sa, attachRolePerm]}>
+				<TestButton />
+			</AuthZTooltip>,
+		);
+
+		expect(screen.getByRole('button', { name: 'Action' })).toBeDisabled();
+	});
+
+	it('disables child when both checks are denied and lists denied permissions in data attr', () => {
+		const sa = attachSAPerm('sa-1');
+		mockUseAuthZ.mockReturnValue({
+			...noPermissions,
+			permissions: {
+				[sa]: { isGranted: false },
+				[attachRolePerm]: { isGranted: false },
+			},
+		});
+
+		render(
+			<AuthZTooltip checks={[sa, attachRolePerm]}>
+				<TestButton />
+			</AuthZTooltip>,
+		);
+
+		expect(screen.getByRole('button', { name: 'Action' })).toBeDisabled();
+
+		const wrapper = screen.getByRole('button', { name: 'Action' }).parentElement;
+		expect(wrapper?.getAttribute('data-denied-permissions')).toContain(sa);
+		expect(wrapper?.getAttribute('data-denied-permissions')).toContain(
+			attachRolePerm,
+		);
+	});
+});

frontend/src/components/AuthZTooltip/AuthZTooltip.tsx

@@ -0,0 +1,85 @@
+import { ReactElement, cloneElement, useMemo } from 'react';
+import {
+	TooltipRoot,
+	TooltipContent,
+	TooltipProvider,
+	TooltipTrigger,
+} from '@signozhq/ui/tooltip';
+import type { BrandedPermission } from 'hooks/useAuthZ/types';
+import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
+import { parsePermission } from 'hooks/useAuthZ/utils';
+import styles from './AuthZTooltip.module.scss';
+
+interface AuthZTooltipProps {
+	checks: BrandedPermission[];
+	children: ReactElement;
+	enabled?: boolean;
+	tooltipMessage?: string;
+}
+
+function formatDeniedMessage(
+	denied: BrandedPermission[],
+	override?: string,
+): string {
+	if (override) {
+		return override;
+	}
+	const labels = denied.map((p) => {
+		const { relation, object } = parsePermission(p);
+		const resource = object.split(':')[0];
+		return `${relation} ${resource}`;
+	});
+	return labels.length === 1
+		? `You don't have ${labels[0]} permission`
+		: `You don't have ${labels.join(', ')} permissions`;
+}
+
+function AuthZTooltip({
+	checks,
+	children,
+	enabled = true,
+	tooltipMessage,
+}: AuthZTooltipProps): JSX.Element {
+	const shouldCheck = enabled && checks.length > 0;
+
+	const { permissions, isLoading } = useAuthZ(checks, { enabled: shouldCheck });
+
+	const deniedPermissions = useMemo(() => {
+		if (!permissions) {
+			return [];
+		}
+		return checks.filter((p) => permissions[p]?.isGranted === false);
+	}, [checks, permissions]);
+
+	if (shouldCheck && isLoading) {
+		return (
+			<span className={styles.wrapper}>
+				{cloneElement(children, { disabled: true })}
+			</span>
+		);
+	}
+
+	if (!shouldCheck || deniedPermissions.length === 0) {
+		return children;
+	}
+
+	return (
+		<TooltipProvider>
+			<TooltipRoot>
+				<TooltipTrigger asChild>
+					<span
+						className={styles.wrapper}
+						data-denied-permissions={deniedPermissions.join(',')}
+					>
+						{cloneElement(children, { disabled: true })}
+					</span>
+				</TooltipTrigger>
+				<TooltipContent className={styles.errorContent}>
+					{formatDeniedMessage(deniedPermissions, tooltipMessage)}
+				</TooltipContent>
+			</TooltipRoot>
+		</TooltipProvider>
+	);
+}
+
+export default AuthZTooltip;

frontend/src/components/CreateServiceAccountModal/CreateServiceAccountModal.tsx

@@ -2,6 +2,8 @@ import { Controller, useForm } from 'react-hook-form';
 import { useQueryClient } from 'react-query';
 import { X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
+import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import { SACreatePermission } from 'hooks/useAuthZ/permissions/service-account.permissions';
 import { DialogFooter, DialogWrapper } from '@signozhq/ui/dialog';
 import { Input } from '@signozhq/ui/input';
 import { toast } from '@signozhq/ui/sonner';
@@ -132,17 +134,19 @@ function CreateServiceAccountModal(): JSX.Element {
 					Cancel
 				</Button>
 
-				<Button
-					type="submit"
-					// @ts-expect-error -- form prop not in @signozhq/ui Button type - TODO: Fix this - @SagarRajput
-					form="create-sa-form"
-					variant="solid"
-					color="primary"
-					loading={isSubmitting}
-					disabled={!isValid}
-				>
-					Create Service Account
-				</Button>
+				<AuthZTooltip checks={[SACreatePermission]}>
+					<Button
+						type="submit"
+						// @ts-expect-error -- form prop not in @signozhq/ui Button type - TODO: Fix this - @SagarRajput
+						form="create-sa-form"
+						variant="solid"
+						color="primary"
+						loading={isSubmitting}
+						disabled={!isValid}
+					>
+						Create Service Account
+					</Button>
+				</AuthZTooltip>
 			</DialogFooter>
 		</DialogWrapper>
 	);

frontend/src/components/CreateServiceAccountModal/__tests__/CreateServiceAccountModal.test.tsx

@@ -11,6 +11,15 @@ import {
 
 import CreateServiceAccountModal from '../CreateServiceAccountModal';
 
+jest.mock('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() },
@@ -113,7 +122,9 @@ describe('CreateServiceAccountModal', () => {
 					getErrorMessage: expect.any(Function),
 				}),
 			);
-			const passedError = showErrorModal.mock.calls[0][0] as any;
+			const passedError = showErrorModal.mock.calls[0][0] as {
+				getErrorMessage: () => string;
+			};
 			expect(passedError.getErrorMessage()).toBe('Internal Server Error');
 		});
 
@@ -132,6 +143,9 @@ describe('CreateServiceAccountModal', () => {
 		await user.click(screen.getByRole('button', { name: /Cancel/i }));
 
 		await waitForElementToBeRemoved(dialog);
+		expect(
+			screen.queryByRole('dialog', { name: /New Service Account/i }),
+		).not.toBeInTheDocument();
 	});
 
 	it('shows "Name is required" after clearing the name field', async () => {
@@ -142,6 +156,8 @@ describe('CreateServiceAccountModal', () => {
 		await user.type(nameInput, 'Bot');
 		await user.clear(nameInput);
 
-		await screen.findByText('Name is required');
+		await expect(
+			screen.findByText('Name is required'),
+		).resolves.toBeInTheDocument();
 	});
 });

frontend/src/components/GuardAuthZ/GuardAuthZ.test.tsx

@@ -1,34 +1,13 @@
 import { ReactElement } from 'react';
-import {
-	AuthtypesGettableTransactionDTO,
-	AuthtypesTransactionDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { ENVIRONMENT } from 'constants/env';
 import { BrandedPermission } from 'hooks/useAuthZ/types';
 import { buildPermission } from 'hooks/useAuthZ/utils';
 import { server } from 'mocks-server/server';
 import { rest } from 'msw';
 import { render, screen, waitFor } from 'tests/test-utils';
+import { AUTHZ_CHECK_URL, authzMockResponse } from 'tests/authz-test-utils';
 
 import { GuardAuthZ } from './GuardAuthZ';
 
-const BASE_URL = ENVIRONMENT.baseURL || '';
-const AUTHZ_CHECK_URL = `${BASE_URL}/api/v1/authz/check`;
-
-function authzMockResponse(
-	payload: AuthtypesTransactionDTO[],
-	authorizedByIndex: boolean[],
-): { data: AuthtypesGettableTransactionDTO[]; status: string } {
-	return {
-		data: payload.map((txn, i) => ({
-			relation: txn.relation,
-			object: txn.object,
-			authorized: authorizedByIndex[i] ?? false,
-		})),
-		status: 'success',
-	};
-}
-
 describe('GuardAuthZ', () => {
 	const TestChild = (): ReactElement => <div>Protected Content</div>;
 	const LoadingFallback = (): ReactElement => <div>Loading...</div>;

frontend/src/components/PermissionDeniedCallout/PermissionDeniedCallout.module.scss

@@ -0,0 +1,4 @@
+.callout {
+	box-sizing: border-box;
+	width: 100%;
+}

frontend/src/components/PermissionDeniedCallout/PermissionDeniedCallout.test.tsx

@@ -0,0 +1,22 @@
+import { render, screen } from 'tests/test-utils';
+import PermissionDeniedCallout from './PermissionDeniedCallout';
+
+describe('PermissionDeniedCallout', () => {
+	it('renders the permission name in the callout message', () => {
+		render(<PermissionDeniedCallout permissionName="serviceaccount:attach" />);
+
+		expect(screen.getByText(/You don't have/)).toBeInTheDocument();
+		expect(screen.getByText(/serviceaccount:attach/)).toBeInTheDocument();
+		expect(screen.getByText(/permission/)).toBeInTheDocument();
+	});
+
+	it('accepts an optional className', () => {
+		const { container } = render(
+			<PermissionDeniedCallout
+				permissionName="serviceaccount:read"
+				className="custom-class"
+			/>,
+		);
+		expect(container.firstChild).toHaveClass('custom-class');
+	});
+});

frontend/src/components/PermissionDeniedCallout/PermissionDeniedCallout.tsx

@@ -0,0 +1,26 @@
+import { Callout } from '@signozhq/ui/callout';
+import cx from 'classnames';
+import styles from './PermissionDeniedCallout.module.scss';
+
+interface PermissionDeniedCalloutProps {
+	permissionName: string;
+	className?: string;
+}
+
+function PermissionDeniedCallout({
+	permissionName,
+	className,
+}: PermissionDeniedCalloutProps): JSX.Element {
+	return (
+		<Callout
+			type="error"
+			showIcon
+			size="small"
+			className={cx(styles.callout, className)}
+		>
+			{`You don't have ${permissionName} permission`}
+		</Callout>
+	);
+}
+
+export default PermissionDeniedCallout;

frontend/src/components/PermissionDeniedFullPage/PermissionDeniedFullPage.module.scss

@@ -0,0 +1,44 @@
+.container {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 100%;
+	height: 100%;
+	min-height: 50vh;
+	padding: var(--spacing-10);
+}
+
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	gap: var(--spacing-2);
+	max-width: 512px;
+}
+
+.icon {
+	margin-bottom: var(--spacing-1);
+}
+
+.title {
+	margin: 0;
+	font-size: var(--label-base-500-font-size);
+	font-weight: var(--label-base-500-font-weight);
+	line-height: var(--line-height-18);
+	letter-spacing: -0.07px;
+	color: var(--l1-foreground);
+}
+
+.subtitle {
+	margin: 0;
+	font-size: var(--label-base-400-font-size);
+	font-weight: var(--label-base-400-font-weight);
+	line-height: var(--line-height-18);
+	letter-spacing: -0.07px;
+	color: var(--l2-foreground);
+}
+
+.permission {
+	font-family: monospace;
+	color: var(--l2-foreground);
+}

frontend/src/components/PermissionDeniedFullPage/PermissionDeniedFullPage.test.tsx

@@ -0,0 +1,21 @@
+import { render, screen } from 'tests/test-utils';
+import PermissionDeniedFullPage from './PermissionDeniedFullPage';
+
+describe('PermissionDeniedFullPage', () => {
+	it('renders the title and subtitle with the permissionName interpolated', () => {
+		render(<PermissionDeniedFullPage permissionName="serviceaccount:list" />);
+
+		expect(
+			screen.getByText("Uh-oh! You don't have permission to view this page."),
+		).toBeInTheDocument();
+		expect(screen.getByText(/serviceaccount:list/)).toBeInTheDocument();
+		expect(
+			screen.getByText(/Please ask your SigNoz administrator to grant access/),
+		).toBeInTheDocument();
+	});
+
+	it('renders with a different permissionName', () => {
+		render(<PermissionDeniedFullPage permissionName="role:read" />);
+		expect(screen.getByText(/role:read/)).toBeInTheDocument();
+	});
+});

frontend/src/components/PermissionDeniedFullPage/PermissionDeniedFullPage.tsx

@@ -0,0 +1,31 @@
+import { CircleSlash2 } from '@signozhq/icons';
+
+import styles from './PermissionDeniedFullPage.module.scss';
+import { Style } from '@signozhq/design-tokens';
+
+interface PermissionDeniedFullPageProps {
+	permissionName: string;
+}
+
+function PermissionDeniedFullPage({
+	permissionName,
+}: PermissionDeniedFullPageProps): JSX.Element {
+	return (
+		<div className={styles.container}>
+			<div className={styles.content}>
+				<span className={styles.icon}>
+					<CircleSlash2 color={Style.CALLOUT_WARNING_TITLE} size={14} />
+				</span>
+				<p className={styles.title}>
+					Uh-oh! You don&apos;t have permission to view this page.
+				</p>
+				<p className={styles.subtitle}>
+					You need <code className={styles.permission}>{permissionName}</code> to
+					view this page. Please ask your SigNoz administrator to grant access.
+				</p>
+			</div>
+		</div>
+	);
+}
+
+export default PermissionDeniedFullPage;

frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.tsx

@@ -32,10 +32,24 @@ import { isKeyMatch } from './utils';
 import './Checkbox.styles.scss';
 
 const SELECTED_OPERATORS = [OPERATORS['='], 'in'];
-const NON_SELECTED_OPERATORS = [OPERATORS['!='], 'not in'];
+const NON_SELECTED_OPERATORS = [OPERATORS['!='], 'not in', 'nin'];
 
 const SOURCES_WITH_EMPTY_STATE_ENABLED = [QuickFiltersSource.LOGS_EXPLORER];
 
+// Sources that use backend APIs expecting short operator format (e.g., 'nin' instead of 'not in')
+const SOURCES_WITH_SHORT_OPERATORS = [QuickFiltersSource.INFRA_MONITORING];
+
+/**
+ * Returns the correct NOT_IN operator value based on source.
+ * InfraMonitoring backend expects 'nin', others expect 'not in'.
+ */
+function getNotInOperator(source: QuickFiltersSource): string {
+	if (SOURCES_WITH_SHORT_OPERATORS.includes(source)) {
+		return 'nin';
+	}
+	return getOperatorValue('NOT_IN');
+}
+
 function setDefaultValues(
 	values: string[],
 	trueOrFalse: boolean,
@@ -401,6 +415,7 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 								}
 							}
 							break;
+						case 'nin':
 						case 'not in':
 							// if the current running operator is NIN then when unchecking the value it gets
 							// added to the clause like key NIN [value1 , currentUnselectedValue]
@@ -495,7 +510,7 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 							if (!checked) {
 								const newFilter = {
 									...currentFilter,
-									op: getOperatorValue('NOT_IN'),
+									op: getNotInOperator(source),
 									value: [currentFilter.value as string, value],
 								};
 								query.filters.items = query.filters.items.map((item) => {
@@ -518,7 +533,7 @@ export default function CheckboxFilter(props: ICheckboxProps): JSX.Element {
 				// case  - when there is no filter for the current key that means all are selected right now.
 				const newFilterItem: TagFilterItem = {
 					id: uuid(),
-					op: getOperatorValue('NOT_IN'),
+					op: getNotInOperator(source),
 					key: filter.attributeKey,
 					value,
 				};

frontend/src/components/RolesSelect/RolesSelect.tsx

@@ -80,6 +80,7 @@ interface BaseProps {
 	isError?: boolean;
 	error?: APIError;
 	onRefetch?: () => void;
+	disabled?: boolean;
 }
 
 interface SingleProps extends BaseProps {
@@ -123,6 +124,7 @@ function RolesSelect(props: RolesSelectProps): JSX.Element {
 		isError = internalError,
 		error = convertToApiError(internalErrorObj),
 		onRefetch = externalRoles === undefined ? internalRefetch : undefined,
+		disabled,
 	} = props;
 
 	const notFoundContent = isError ? (
@@ -151,6 +153,7 @@ function RolesSelect(props: RolesSelectProps): JSX.Element {
 					</Checkbox>
 				)}
 				getPopupContainer={getPopupContainer}
+				disabled={disabled}
 			/>
 		);
 	}
@@ -168,6 +171,7 @@ function RolesSelect(props: RolesSelectProps): JSX.Element {
 			notFoundContent={notFoundContent}
 			options={options}
 			getPopupContainer={getPopupContainer}
+			disabled={disabled}
 		/>
 	);
 }

frontend/src/components/ServiceAccountDrawer/AddKeyModal/KeyFormPhase.tsx

@@ -4,6 +4,11 @@ import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
 import { ToggleGroup, ToggleGroupItem } from '@signozhq/ui/toggle-group';
 import { DatePicker } from 'antd';
+import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import {
+	APIKeyCreatePermission,
+	buildSAAttachPermission,
+} from 'hooks/useAuthZ/permissions/service-account.permissions';
 import { popupContainer } from 'utils/selectPopupContainer';
 
 import { disabledDate } from '../utils';
@@ -18,6 +23,7 @@ export interface KeyFormPhaseProps {
 	isValid: boolean;
 	onSubmit: () => void;
 	onClose: () => void;
+	accountId?: string;
 }
 
 function KeyFormPhase({
@@ -28,6 +34,7 @@ function KeyFormPhase({
 	isValid,
 	onSubmit,
 	onClose,
+	accountId,
 }: KeyFormPhaseProps): JSX.Element {
 	return (
 		<>
@@ -111,17 +118,25 @@ function KeyFormPhase({
 					<Button variant="solid" color="secondary" onClick={onClose}>
 						Cancel
 					</Button>
-					<Button
-						type="submit"
-						// @ts-expect-error -- form prop not in @signozhq/ui Button type - TODO: Fix this - @SagarRajput
-						form={FORM_ID}
-						variant="solid"
-						color="primary"
-						loading={isSubmitting}
-						disabled={!isValid}
+					<AuthZTooltip
+						checks={[
+							APIKeyCreatePermission,
+							buildSAAttachPermission(accountId ?? ''),
+						]}
+						enabled={!!accountId}
 					>
-						Create Key
-					</Button>
+						<Button
+							type="submit"
+							// @ts-expect-error -- form prop not in @signozhq/ui Button type - TODO: Fix this - @SagarRajput
+							form={FORM_ID}
+							variant="solid"
+							color="primary"
+							loading={isSubmitting}
+							disabled={!isValid}
+						>
+							Create Key
+						</Button>
+					</AuthZTooltip>
 				</div>
 			</div>
 		</>

frontend/src/components/ServiceAccountDrawer/AddKeyModal/index.tsx

@@ -161,6 +161,7 @@ function AddKeyModal(): JSX.Element {
 					isValid={isValid}
 					onSubmit={handleSubmit(handleCreate)}
 					onClose={handleClose}
+					accountId={accountId ?? undefined}
 				/>
 			)}
 

frontend/src/components/ServiceAccountDrawer/DeleteAccountModal.tsx

@@ -1,6 +1,8 @@
 import { useQueryClient } from 'react-query';
 import { Trash2, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
+import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import { buildSADeletePermission } from 'hooks/useAuthZ/permissions/service-account.permissions';
 import { DialogWrapper } from '@signozhq/ui/dialog';
 import { toast } from '@signozhq/ui/sonner';
 import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
@@ -65,7 +67,7 @@ function DeleteAccountModal(): JSX.Element {
 	}
 
 	function handleCancel(): void {
-		setIsDeleteOpen(null);
+		void setIsDeleteOpen(null);
 	}
 
 	const content = (
@@ -82,15 +84,20 @@ function DeleteAccountModal(): JSX.Element {
 				<X size={12} />
 				Cancel
 			</Button>
-			<Button
-				variant="solid"
-				color="destructive"
-				loading={isDeleting}
-				onClick={handleConfirm}
+			<AuthZTooltip
+				checks={[buildSADeletePermission(accountId ?? '')]}
+				enabled={!!accountId}
 			>
-				<Trash2 size={12} />
-				Delete
-			</Button>
+				<Button
+					variant="solid"
+					color="destructive"
+					loading={isDeleting}
+					onClick={handleConfirm}
+				>
+					<Trash2 size={12} />
+					Delete
+				</Button>
+			</AuthZTooltip>
 		</div>
 	);
 

frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyForm.tsx

@@ -7,6 +7,12 @@ import { Input } from '@signozhq/ui/input';
 import { ToggleGroup, ToggleGroupItem } from '@signozhq/ui/toggle-group';
 import { DatePicker } from 'antd';
 import type { ServiceaccounttypesGettableFactorAPIKeyDTO } from 'api/generated/services/sigNoz.schemas';
+import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import {
+	buildAPIKeyDeletePermission,
+	buildAPIKeyUpdatePermission,
+	buildSADetachPermission,
+} from 'hooks/useAuthZ/permissions/service-account.permissions';
 import { popupContainer } from 'utils/selectPopupContainer';
 
 import { disabledDate, formatLastObservedAt } from '../utils';
@@ -24,6 +30,8 @@ export interface EditKeyFormProps {
 	onClose: () => void;
 	onRevokeClick: () => void;
 	formatTimezoneAdjustedTimestamp: (ts: string, format: string) => string;
+	canUpdate?: boolean;
+	accountId?: string;
 }
 
 function EditKeyForm({
@@ -37,6 +45,8 @@ function EditKeyForm({
 	onClose,
 	onRevokeClick,
 	formatTimezoneAdjustedTimestamp,
+	canUpdate = true,
+	accountId = '',
 }: EditKeyFormProps): JSX.Element {
 	return (
 		<>
@@ -45,12 +55,34 @@ function EditKeyForm({
 					<label className="edit-key-modal__label" htmlFor="edit-key-name">
 						Name
 					</label>
-					<Input
-						id="edit-key-name"
-						className="edit-key-modal__input"
-						placeholder="Enter key name"
-						{...register('name')}
-					/>
+					{!canUpdate ? (
+						<AuthZTooltip
+							checks={[buildAPIKeyUpdatePermission(keyItem?.id ?? '')]}
+							enabled={!!keyItem?.id}
+						>
+							<div className="edit-key-modal__key-display">
+								<span className="edit-key-modal__id-text">{keyItem?.name || '—'}</span>
+								<LockKeyhole size={12} className="edit-key-modal__lock-icon" />
+							</div>
+						</AuthZTooltip>
+					) : (
+						<Input
+							id="edit-key-name"
+							className="edit-key-modal__input"
+							placeholder="Enter key name"
+							{...register('name')}
+						/>
+					)}
+				</div>
+
+				<div className="edit-key-modal__field">
+					<label className="edit-key-modal__label" htmlFor="edit-key-id">
+						ID
+					</label>
+					<div id="edit-key-id" className="edit-key-modal__key-display">
+						<span className="edit-key-modal__id-text">{keyItem?.id || '—'}</span>
+						<LockKeyhole size={12} className="edit-key-modal__lock-icon" />
+					</div>
 				</div>
 
 				<div className="edit-key-modal__field">
@@ -73,21 +105,22 @@ function EditKeyForm({
 								type="single"
 								value={field.value}
 								onChange={(val): void => {
-									if (val) {
+									if (val && canUpdate) {
 										field.onChange(val);
 									}
 								}}
-								size="sm"
 								className="edit-key-modal__expiry-toggle"
 							>
 								<ToggleGroupItem
 									value={ExpiryMode.NONE}
+									disabled={!canUpdate}
 									className="edit-key-modal__expiry-toggle-btn"
 								>
 									No Expiration
 								</ToggleGroupItem>
 								<ToggleGroupItem
 									value={ExpiryMode.DATE}
+									disabled={!canUpdate}
 									className="edit-key-modal__expiry-toggle-btn"
 								>
 									Set Expiration Date
@@ -114,6 +147,7 @@ function EditKeyForm({
 										popupClassName="edit-key-modal-datepicker-popup"
 										getPopupContainer={popupContainer}
 										disabledDate={disabledDate}
+										disabled={!canUpdate}
 									/>
 								)}
 							/>
@@ -133,26 +167,39 @@ function EditKeyForm({
 			</form>
 
 			<div className="edit-key-modal__footer">
-				<Button variant="link" color="destructive" onClick={onRevokeClick}>
-					<Trash2 size={12} />
-					Revoke Key
-				</Button>
+				<AuthZTooltip
+					checks={[
+						buildAPIKeyDeletePermission(keyItem?.id ?? ''),
+						buildSADetachPermission(accountId ?? ''),
+					]}
+					enabled={!!accountId && !!keyItem?.id}
+				>
+					<Button variant="link" color="destructive" onClick={onRevokeClick}>
+						<Trash2 size={12} />
+						Revoke Key
+					</Button>
+				</AuthZTooltip>
 				<div className="edit-key-modal__footer-right">
 					<Button variant="solid" color="secondary" onClick={onClose}>
 						<X size={12} />
 						Cancel
 					</Button>
-					<Button
-						type="submit"
-						// @ts-expect-error -- form prop not in @signozhq/ui Button type - TODO: Fix this - @SagarRajput
-						form={FORM_ID}
-						variant="solid"
-						color="primary"
-						loading={isSaving}
-						disabled={!isDirty}
+					<AuthZTooltip
+						checks={[buildAPIKeyUpdatePermission(keyItem?.id ?? '')]}
+						enabled={!!accountId && !!keyItem?.id}
 					>
-						Save Changes
-					</Button>
+						<Button
+							type="submit"
+							// @ts-expect-error -- form prop not in @signozhq/ui Button type - TODO: Fix this - @SagarRajput
+							form={FORM_ID}
+							variant="solid"
+							color="primary"
+							loading={isSaving}
+							disabled={!isDirty}
+						>
+							Save Changes
+						</Button>
+					</AuthZTooltip>
 				</div>
 			</div>
 		</>

frontend/src/components/ServiceAccountDrawer/EditKeyModal/EditKeyModal.styles.scss

@@ -60,6 +60,16 @@
 		letter-spacing: 2px;
 	}
 
+	&__id-text {
+		font-size: 13px;
+		font-family: monospace;
+		color: var(--foreground);
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		flex: 1;
+	}
+
 	&__lock-icon {
 		color: var(--foreground);
 		flex-shrink: 0;

frontend/src/components/ServiceAccountDrawer/EditKeyModal/index.tsx

@@ -16,6 +16,8 @@ import type {
 import { AxiosError } from 'axios';
 import { SA_QUERY_PARAMS } from 'container/ServiceAccountsSettings/constants';
 import dayjs from 'dayjs';
+import { buildAPIKeyUpdatePermission } from 'hooks/useAuthZ/permissions/service-account.permissions';
+import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
 import { parseAsString, useQueryState } from 'nuqs';
 import { useErrorModal } from 'providers/ErrorModalProvider';
 import { useTimezone } from 'providers/Timezone';
@@ -69,6 +71,16 @@ function EditKeyModal({ keyItem }: EditKeyModalProps): JSX.Element {
 
 	const expiryMode = watch('expiryMode');
 
+	const { permissions: editPermissions, isLoading: isAuthZLoading } = useAuthZ(
+		editKeyId ? [buildAPIKeyUpdatePermission(editKeyId)] : [],
+		{ enabled: !!editKeyId },
+	);
+
+	const canUpdate = isAuthZLoading
+		? false
+		: (editPermissions?.[buildAPIKeyUpdatePermission(editKeyId ?? '')]
+				?.isGranted ?? true);
+
 	const { mutate: updateKey, isLoading: isSaving } = useUpdateServiceAccountKey({
 		mutation: {
 			onSuccess: async () => {
@@ -115,7 +127,7 @@ function EditKeyModal({ keyItem }: EditKeyModalProps): JSX.Element {
 		});
 
 	function handleClose(): void {
-		setEditKeyId(null);
+		void setEditKeyId(null);
 		setIsRevokeConfirmOpen(false);
 	}
 
@@ -169,6 +181,8 @@ function EditKeyModal({ keyItem }: EditKeyModalProps): JSX.Element {
 						isRevoking={isRevoking}
 						onCancel={(): void => setIsRevokeConfirmOpen(false)}
 						onConfirm={handleRevoke}
+						accountId={selectedAccountId ?? undefined}
+						keyId={keyItem?.id ?? undefined}
 					/>
 				) : undefined
 			}
@@ -190,6 +204,8 @@ function EditKeyModal({ keyItem }: EditKeyModalProps): JSX.Element {
 					onClose={handleClose}
 					onRevokeClick={(): void => setIsRevokeConfirmOpen(true)}
 					formatTimezoneAdjustedTimestamp={formatTimezoneAdjustedTimestamp}
+					canUpdate={canUpdate}
+					accountId={selectedAccountId ?? ''}
 				/>
 			)}
 		</DialogWrapper>

frontend/src/components/ServiceAccountDrawer/KeysTab.tsx

@@ -1,9 +1,16 @@
-import { useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { KeyRound, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
-import { Skeleton, Table, Tooltip } from 'antd';
+import { Skeleton, Table } from 'antd';
 import type { ColumnsType } from 'antd/es/table/interface';
 import type { ServiceaccounttypesGettableFactorAPIKeyDTO } from 'api/generated/services/sigNoz.schemas';
+import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import {
+	APIKeyCreatePermission,
+	buildAPIKeyDeletePermission,
+	buildSAAttachPermission,
+	buildSADetachPermission,
+} from 'hooks/useAuthZ/permissions/service-account.permissions';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import dayjs from 'dayjs';
 import { parseAsBoolean, parseAsString, useQueryState } from 'nuqs';
@@ -17,12 +24,15 @@ interface KeysTabProps {
 	keys: ServiceaccounttypesGettableFactorAPIKeyDTO[];
 	isLoading: boolean;
 	isDisabled?: boolean;
+	canUpdate?: boolean;
+	accountId?: string;
 	currentPage: number;
 	pageSize: number;
 }
 
 interface BuildColumnsParams {
 	isDisabled: boolean;
+	accountId: string;
 	onRevokeClick: (keyId: string) => void;
 	handleformatLastObservedAt: (
 		lastObservedAt: Date | null | undefined,
@@ -42,6 +52,7 @@ function formatExpiry(expiresAt: number): JSX.Element {
 
 function buildColumns({
 	isDisabled,
+	accountId,
 	onRevokeClick,
 	handleformatLastObservedAt,
 }: BuildColumnsParams): ColumnsType<ServiceaccounttypesGettableFactorAPIKeyDTO> {
@@ -92,22 +103,34 @@ function buildColumns({
 			key: 'action',
 			width: 48,
 			align: 'right' as const,
+			onCell: (): {
+				onClick: (e: React.MouseEvent) => void;
+				style: React.CSSProperties;
+			} => ({
+				onClick: (e): void => e.stopPropagation(),
+				style: { cursor: 'default' },
+			}),
 			render: (_, record): JSX.Element => (
-				<Tooltip title={isDisabled ? 'Service account disabled' : 'Revoke Key'}>
+				<AuthZTooltip
+					checks={[
+						buildAPIKeyDeletePermission(record.id),
+						buildSADetachPermission(accountId),
+					]}
+					enabled={!isDisabled && !!accountId}
+				>
 					<Button
 						variant="ghost"
 						size="sm"
 						color="destructive"
 						disabled={isDisabled}
-						onClick={(e): void => {
-							e.stopPropagation();
+						onClick={(): void => {
 							onRevokeClick(record.id);
 						}}
 						className="keys-tab__revoke-btn"
 					>
 						<X size={12} />
 					</Button>
-				</Tooltip>
+				</AuthZTooltip>
 			),
 		},
 	];
@@ -117,6 +140,7 @@ function KeysTab({
 	keys,
 	isLoading,
 	isDisabled = false,
+	accountId = '',
 	currentPage,
 	pageSize,
 }: KeysTabProps): JSX.Element {
@@ -143,14 +167,20 @@ function KeysTab({
 
 	const onRevokeClick = useCallback(
 		(keyId: string): void => {
-			setRevokeKeyId(keyId);
+			void setRevokeKeyId(keyId);
 		},
 		[setRevokeKeyId],
 	);
 
 	const columns = useMemo(
-		() => buildColumns({ isDisabled, onRevokeClick, handleformatLastObservedAt }),
-		[isDisabled, onRevokeClick, handleformatLastObservedAt],
+		() =>
+			buildColumns({
+				isDisabled,
+				accountId,
+				onRevokeClick,
+				handleformatLastObservedAt,
+			}),
+		[isDisabled, accountId, onRevokeClick, handleformatLastObservedAt],
 	);
 
 	if (isLoading) {
@@ -176,16 +206,21 @@ function KeysTab({
 						Learn more
 					</a>
 				</p>
-				<Button
-					variant="link"
-					color="primary"
-					onClick={async (): Promise<void> => {
-						await setIsAddKeyOpen(true);
-					}}
-					disabled={isDisabled}
+				<AuthZTooltip
+					checks={[APIKeyCreatePermission, buildSAAttachPermission(accountId)]}
+					enabled={!isDisabled && !!accountId}
 				>
-					+ Add your first key
-				</Button>
+					<Button
+						variant="link"
+						color="primary"
+						onClick={async (): Promise<void> => {
+							await setIsAddKeyOpen(true);
+						}}
+						disabled={isDisabled}
+					>
+						+ Add your first key
+					</Button>
+				</AuthZTooltip>
 			</div>
 		);
 	}

frontend/src/components/ServiceAccountDrawer/OverviewTab.tsx

@@ -3,9 +3,11 @@ import { LockKeyhole } from '@signozhq/icons';
 import { Badge } from '@signozhq/ui/badge';
 import { Input } from '@signozhq/ui/input';
 import type { AuthtypesRoleDTO } from 'api/generated/services/sigNoz.schemas';
+import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
 import RolesSelect from 'components/RolesSelect';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { ServiceAccountRow } from 'container/ServiceAccountsSettings/utils';
+import { buildSAUpdatePermission } from 'hooks/useAuthZ/permissions/service-account.permissions';
 import { useTimezone } from 'providers/Timezone';
 import APIError from 'types/api/error';
 
@@ -19,6 +21,7 @@ interface OverviewTabProps {
 	localRoles: string[];
 	onRolesChange: (v: string[]) => void;
 	isDisabled: boolean;
+	canUpdate?: boolean;
 	availableRoles: AuthtypesRoleDTO[];
 	rolesLoading?: boolean;
 	rolesError?: boolean;
@@ -34,6 +37,7 @@ function OverviewTab({
 	localRoles,
 	onRolesChange,
 	isDisabled,
+	canUpdate = true,
 	availableRoles,
 	rolesLoading,
 	rolesError,
@@ -63,11 +67,16 @@ function OverviewTab({
 				<label className="sa-drawer__label" htmlFor="sa-name">
 					Name
 				</label>
-				{isDisabled ? (
-					<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>
+				{isDisabled || !canUpdate ? (
+					<AuthZTooltip
+						checks={[buildSAUpdatePermission(account.id)]}
+						enabled={!isDisabled && !canUpdate}
+					>
+						<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>
 				) : (
 					<Input
 						id="sa-name"
@@ -78,6 +87,16 @@ function OverviewTab({
 				)}
 			</div>
 
+			<div className="sa-drawer__field">
+				<label className="sa-drawer__label" htmlFor="sa-id">
+					ID
+				</label>
+				<div className="sa-drawer__input-wrapper sa-drawer__input-wrapper--disabled">
+					<span className="sa-drawer__input-text">{account.id || '—'}</span>
+					<LockKeyhole size={14} className="sa-drawer__lock-icon" />
+				</div>
+			</div>
+
 			<div className="sa-drawer__field">
 				<label className="sa-drawer__label" htmlFor="sa-email">
 					Email Address

frontend/src/components/ServiceAccountDrawer/RevokeKeyModal.tsx

@@ -1,6 +1,11 @@
 import { useQueryClient } from 'react-query';
 import { Trash2, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
+import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import {
+	buildAPIKeyDeletePermission,
+	buildSADetachPermission,
+} from 'hooks/useAuthZ/permissions/service-account.permissions';
 import { DialogWrapper } from '@signozhq/ui/dialog';
 import { toast } from '@signozhq/ui/sonner';
 import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
@@ -23,12 +28,16 @@ export interface RevokeKeyFooterProps {
 	isRevoking: boolean;
 	onCancel: () => void;
 	onConfirm: () => void;
+	accountId?: string;
+	keyId?: string;
 }
 
 export function RevokeKeyFooter({
 	isRevoking,
 	onCancel,
 	onConfirm,
+	accountId,
+	keyId,
 }: RevokeKeyFooterProps): JSX.Element {
 	return (
 		<>
@@ -36,15 +45,23 @@ export function RevokeKeyFooter({
 				<X size={12} />
 				Cancel
 			</Button>
-			<Button
-				variant="solid"
-				color="destructive"
-				loading={isRevoking}
-				onClick={onConfirm}
+			<AuthZTooltip
+				checks={[
+					buildAPIKeyDeletePermission(keyId ?? ''),
+					buildSADetachPermission(accountId ?? ''),
+				]}
+				enabled={!!accountId && !!keyId}
 			>
-				<Trash2 size={12} />
-				Revoke Key
-			</Button>
+				<Button
+					variant="solid"
+					color="destructive"
+					loading={isRevoking}
+					onClick={onConfirm}
+				>
+					<Trash2 size={12} />
+					Revoke Key
+				</Button>
+			</AuthZTooltip>
 		</>
 	);
 }
@@ -115,6 +132,8 @@ function RevokeKeyModal(): JSX.Element {
 					isRevoking={isRevoking}
 					onCancel={handleCancel}
 					onConfirm={handleConfirm}
+					accountId={accountId ?? undefined}
+					keyId={revokeKeyId || undefined}
 				/>
 			}
 		>

frontend/src/components/ServiceAccountDrawer/ServiceAccountDrawer.tsx

@@ -16,6 +16,8 @@ import {
 import type { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
 import { AxiosError } from 'axios';
 import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';
+import { GuardAuthZ } from 'components/GuardAuthZ/GuardAuthZ';
+import PermissionDeniedCallout from 'components/PermissionDeniedCallout/PermissionDeniedCallout';
 import { useRoles } from 'components/RolesSelect';
 import { SA_QUERY_PARAMS } from 'container/ServiceAccountsSettings/constants';
 import {
@@ -27,6 +29,15 @@ import {
 	RoleUpdateFailure,
 	useServiceAccountRoleManager,
 } from 'hooks/serviceAccount/useServiceAccountRoleManager';
+import {
+	APIKeyCreatePermission,
+	APIKeyListPermission,
+	buildSAAttachPermission,
+	buildSADeletePermission,
+	buildSAReadPermission,
+	buildSAUpdatePermission,
+} from 'hooks/useAuthZ/permissions/service-account.permissions';
+import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
 import {
 	parseAsBoolean,
 	parseAsInteger,
@@ -37,6 +48,7 @@ import {
 import APIError from 'types/api/error';
 import { toAPIError } from 'utils/errorUtils';
 
+import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
 import AddKeyModal from './AddKeyModal';
 import DeleteAccountModal from './DeleteAccountModal';
 import KeysTab from './KeysTab';
@@ -96,6 +108,22 @@ function ServiceAccountDrawer({
 
 	const queryClient = useQueryClient();
 
+	const { permissions: drawerPermissions, isLoading: isAuthZLoading } = useAuthZ(
+		selectedAccountId
+			? [
+					buildSAReadPermission(selectedAccountId),
+					buildSAUpdatePermission(selectedAccountId),
+					buildSADeletePermission(selectedAccountId),
+					APIKeyListPermission,
+				]
+			: [],
+		{ enabled: !!selectedAccountId },
+	);
+
+	const canRead =
+		drawerPermissions?.[buildSAReadPermission(selectedAccountId ?? '')]
+			?.isGranted ?? false;
+
 	const {
 		data: accountData,
 		isLoading: isAccountLoading,
@@ -104,7 +132,7 @@ function ServiceAccountDrawer({
 		refetch: refetchAccount,
 	} = useGetServiceAccount(
 		{ id: selectedAccountId ?? '' },
-		{ query: { enabled: !!selectedAccountId } },
+		{ query: { enabled: canRead && !!selectedAccountId } },
 	);
 
 	const account = useMemo(
@@ -117,7 +145,9 @@ function ServiceAccountDrawer({
 		currentRoles,
 		isLoading: isRolesLoading,
 		applyDiff,
-	} = useServiceAccountRoleManager(selectedAccountId ?? '');
+	} = useServiceAccountRoleManager(selectedAccountId ?? '', {
+		enabled: canRead && !!selectedAccountId,
+	});
 
 	const roleSessionRef = useRef<string | null>(null);
 
@@ -165,9 +195,16 @@ function ServiceAccountDrawer({
 		refetch: refetchRoles,
 	} = useRoles();
 
+	const canListKeys =
+		drawerPermissions?.[APIKeyListPermission]?.isGranted ?? false;
+
+	const canUpdate =
+		drawerPermissions?.[buildSAUpdatePermission(selectedAccountId ?? '')]
+			?.isGranted ?? true;
+
 	const { data: keysData, isLoading: keysLoading } = useListServiceAccountKeys(
 		{ id: selectedAccountId ?? '' },
-		{ query: { enabled: !!selectedAccountId } },
+		{ query: { enabled: !!selectedAccountId && canListKeys } },
 	);
 	const keys = keysData?.data ?? [];
 
@@ -392,18 +429,26 @@ function ServiceAccountDrawer({
 					</ToggleGroupItem>
 				</ToggleGroup>
 				{activeTab === ServiceAccountDrawerTab.Keys && (
-					<Button
-						variant="outlined"
-						size="sm"
-						color="secondary"
-						disabled={isDeleted}
-						onClick={(): void => {
-							void setIsAddKeyOpen(true);
-						}}
+					<AuthZTooltip
+						checks={[
+							APIKeyCreatePermission,
+							buildSAAttachPermission(selectedAccountId ?? ''),
+						]}
+						enabled={!isDeleted && !!selectedAccountId}
 					>
-						<Plus size={12} />
-						Add Key
-					</Button>
+						<Button
+							variant="outlined"
+							size="sm"
+							color="secondary"
+							disabled={isDeleted}
+							onClick={(): void => {
+								void setIsAddKeyOpen(true);
+							}}
+						>
+							<Plus size={12} />
+							Add Key
+						</Button>
+					</AuthZTooltip>
 				)}
 			</div>
 
@@ -412,7 +457,9 @@ function ServiceAccountDrawer({
 					activeTab === ServiceAccountDrawerTab.Keys ? ' sa-drawer__body--keys' : ''
 				}`}
 			>
-				{isAccountLoading && <Skeleton active paragraph={{ rows: 6 }} />}
+				{(isAuthZLoading || isAccountLoading) && (
+					<Skeleton active paragraph={{ rows: 6 }} />
+				)}
 				{isAccountError && (
 					<ErrorInPlace
 						error={toAPIError(
@@ -421,38 +468,55 @@ function ServiceAccountDrawer({
 						)}
 					/>
 				)}
-				{!isAccountLoading && !isAccountError && (
-					<>
-						{activeTab === ServiceAccountDrawerTab.Overview && account && (
-							<OverviewTab
-								account={account}
-								localName={localName}
-								onNameChange={handleNameChange}
-								localRoles={localRoles}
-								onRolesChange={(roles): void => {
-									setLocalRoles(roles);
-									clearRoleErrors();
-								}}
-								isDisabled={isDeleted}
-								availableRoles={availableRoles}
-								rolesLoading={rolesLoading}
-								rolesError={rolesError}
-								rolesErrorObj={rolesErrorObj}
-								onRefetchRoles={refetchRoles}
-								saveErrors={saveErrors}
-							/>
-						)}
-						{activeTab === ServiceAccountDrawerTab.Keys && (
-							<KeysTab
-								keys={keys}
-								isLoading={keysLoading}
-								isDisabled={isDeleted}
-								currentPage={keysPage}
-								pageSize={PAGE_SIZE}
-							/>
-						)}
-					</>
-				)}
+				{!isAuthZLoading &&
+					!isAccountLoading &&
+					!isAccountError &&
+					selectedAccountId && (
+						<GuardAuthZ
+							relation="read"
+							object={`serviceaccount:${selectedAccountId}`}
+							fallbackOnNoPermissions={(): JSX.Element => (
+								<PermissionDeniedCallout permissionName="serviceaccount:read" />
+							)}
+						>
+							<>
+								{activeTab === ServiceAccountDrawerTab.Overview && account && (
+									<OverviewTab
+										account={account}
+										localName={localName}
+										onNameChange={handleNameChange}
+										localRoles={localRoles}
+										onRolesChange={(roles): void => {
+											setLocalRoles(roles);
+											clearRoleErrors();
+										}}
+										isDisabled={isDeleted}
+										canUpdate={canUpdate}
+										availableRoles={availableRoles}
+										rolesLoading={rolesLoading}
+										rolesError={rolesError}
+										rolesErrorObj={rolesErrorObj}
+										onRefetchRoles={refetchRoles}
+										saveErrors={saveErrors}
+									/>
+								)}
+								{activeTab === ServiceAccountDrawerTab.Keys &&
+									(canListKeys ? (
+										<KeysTab
+											keys={keys}
+											isLoading={keysLoading}
+											isDisabled={isDeleted}
+											canUpdate={canUpdate}
+											accountId={selectedAccountId}
+											currentPage={keysPage}
+											pageSize={PAGE_SIZE}
+										/>
+									) : (
+										<PermissionDeniedCallout permissionName="factor-api-key:list" />
+									))}
+							</>
+						</GuardAuthZ>
+					)}
 			</div>
 		</div>
 	);
@@ -482,16 +546,21 @@ function ServiceAccountDrawer({
 			) : (
 				<>
 					{!isDeleted && (
-						<Button
-							variant="link"
-							color="destructive"
-							onClick={(): void => {
-								void setIsDeleteOpen(true);
-							}}
+						<AuthZTooltip
+							checks={[buildSADeletePermission(selectedAccountId ?? '')]}
+							enabled={!!selectedAccountId}
 						>
-							<Trash2 size={12} />
-							Delete Service Account
-						</Button>
+							<Button
+								variant="link"
+								color="destructive"
+								onClick={(): void => {
+									void setIsDeleteOpen(true);
+								}}
+							>
+								<Trash2 size={12} />
+								Delete Service Account
+							</Button>
+						</AuthZTooltip>
 					)}
 					{!isDeleted && (
 						<div className="sa-drawer__footer-right">

frontend/src/components/ServiceAccountDrawer/__tests__/EditKeyModal.test.tsx

@@ -6,6 +6,15 @@ import { render, screen, userEvent, waitFor } from 'tests/test-utils';
 
 import EditKeyModal from '../EditKeyModal';
 
+jest.mock('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() },
@@ -19,7 +28,7 @@ const mockKey: ServiceaccounttypesGettableFactorAPIKeyDTO = {
 	id: 'key-1',
 	name: 'Original Key Name',
 	expiresAt: 0,
-	lastObservedAt: null as any,
+	lastObservedAt: null as unknown as Date,
 	serviceAccountId: 'sa-1',
 };
 

frontend/src/components/ServiceAccountDrawer/__tests__/KeysTab.test.tsx

@@ -6,6 +6,15 @@ import { render, screen, userEvent, waitFor } from 'tests/test-utils';
 
 import KeysTab from '../KeysTab';
 
+jest.mock('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() },
@@ -20,7 +29,7 @@ const keys: ServiceaccounttypesGettableFactorAPIKeyDTO[] = [
 		id: 'key-1',
 		name: 'Production Key',
 		expiresAt: 0,
-		lastObservedAt: null as any,
+		lastObservedAt: null as unknown as Date,
 		serviceAccountId: 'sa-1',
 	},
 	{

frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.authz.test.tsx

@@ -0,0 +1,158 @@
+import type { ReactNode } from 'react';
+import { listRolesSuccessResponse } from 'mocks-server/__mockdata__/roles';
+import { rest, server } from 'mocks-server/server';
+import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
+import { fireEvent, render, screen, waitFor } from 'tests/test-utils';
+import {
+	setupAuthzAdmin,
+	setupAuthzDeny,
+	setupAuthzDenyAll,
+} from 'tests/authz-test-utils';
+import {
+	APIKeyListPermission,
+	buildSADeletePermission,
+} from 'hooks/useAuthZ/permissions/service-account.permissions';
+
+import ServiceAccountDrawer from '../ServiceAccountDrawer';
+
+const ROLES_ENDPOINT = '*/api/v1/roles';
+const SA_KEYS_ENDPOINT = '*/api/v1/service_accounts/:id/keys';
+const SA_ENDPOINT = '*/api/v1/service_accounts/sa-1';
+const SA_DELETE_ENDPOINT = '*/api/v1/service_accounts/sa-1';
+const SA_ROLES_ENDPOINT = '*/api/v1/service_accounts/:id/roles';
+const SA_ROLE_DELETE_ENDPOINT = '*/api/v1/service_accounts/:id/roles/:rid';
+
+const activeAccountResponse = {
+	id: 'sa-1',
+	name: 'CI Bot',
+	email: 'ci-bot@signoz.io',
+	roles: ['signoz-admin'],
+	status: 'ACTIVE',
+	createdAt: '2026-01-01T00:00:00Z',
+	updatedAt: '2026-01-02T00:00:00Z',
+};
+
+jest.mock('@signozhq/ui/drawer', () => ({
+	...jest.requireActual('@signozhq/ui/drawer'),
+	DrawerWrapper: ({
+		children,
+		footer,
+		open,
+	}: {
+		children?: ReactNode;
+		footer?: ReactNode;
+		open: boolean;
+	}): JSX.Element | null =>
+		open ? (
+			<div>
+				{children}
+				{footer}
+			</div>
+		) : null,
+}));
+
+jest.mock('@signozhq/ui/sonner', () => ({
+	...jest.requireActual('@signozhq/ui/sonner'),
+	toast: { success: jest.fn(), error: jest.fn() },
+}));
+
+function renderDrawer(
+	searchParams: Record<string, string> = { account: 'sa-1' },
+): ReturnType<typeof render> {
+	return render(
+		<NuqsTestingAdapter searchParams={searchParams} hasMemory>
+			<ServiceAccountDrawer onSuccess={jest.fn()} />
+		</NuqsTestingAdapter>,
+	);
+}
+
+function setupBaseHandlers(): void {
+	server.use(
+		rest.get(ROLES_ENDPOINT, (_, res, ctx) =>
+			res(ctx.status(200), ctx.json(listRolesSuccessResponse)),
+		),
+		rest.get(SA_KEYS_ENDPOINT, (_, res, ctx) =>
+			res(ctx.status(200), ctx.json({ data: [] })),
+		),
+		rest.get(SA_ENDPOINT, (_, res, ctx) =>
+			res(ctx.status(200), ctx.json({ data: activeAccountResponse })),
+		),
+		rest.put(SA_ENDPOINT, (_, res, ctx) =>
+			res(ctx.status(200), ctx.json({ status: 'success', data: {} })),
+		),
+		rest.delete(SA_DELETE_ENDPOINT, (_, res, ctx) =>
+			res(ctx.status(200), ctx.json({ status: 'success', data: {} })),
+		),
+		rest.get(SA_ROLES_ENDPOINT, (_, res, ctx) =>
+			res(
+				ctx.status(200),
+				ctx.json({
+					data: listRolesSuccessResponse.data.filter(
+						(r) => r.name === 'signoz-admin',
+					),
+				}),
+			),
+		),
+		rest.post(SA_ROLES_ENDPOINT, (_, res, ctx) =>
+			res(ctx.status(200), ctx.json({ status: 'success', data: {} })),
+		),
+		rest.delete(SA_ROLE_DELETE_ENDPOINT, (_, res, ctx) =>
+			res(ctx.status(200), ctx.json({ status: 'success', data: {} })),
+		),
+	);
+}
+
+describe('ServiceAccountDrawer — permissions', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+		setupBaseHandlers();
+	});
+
+	afterEach(() => {
+		server.resetHandlers();
+	});
+
+	it('shows PermissionDeniedCallout inside drawer when read permission is denied', async () => {
+		server.use(setupAuthzDenyAll());
+
+		renderDrawer();
+
+		await waitFor(() => {
+			expect(screen.getByText(/serviceaccount:read/)).toBeInTheDocument();
+		});
+	});
+
+	it('shows drawer content when read permission is granted', async () => {
+		server.use(setupAuthzAdmin());
+
+		renderDrawer();
+
+		await screen.findByDisplayValue('CI Bot');
+		expect(screen.queryByText(/serviceaccount:read/)).not.toBeInTheDocument();
+	});
+
+	it('shows PermissionDeniedCallout in Keys tab when list-keys permission is denied', async () => {
+		server.use(setupAuthzDeny(APIKeyListPermission));
+
+		renderDrawer();
+		await screen.findByDisplayValue('CI Bot');
+
+		fireEvent.click(screen.getByRole('radio', { name: /keys/i }));
+
+		await waitFor(() => {
+			expect(screen.getByText(/factor-api-key:list/)).toBeInTheDocument();
+		});
+	});
+
+	it('disables Delete button when delete permission is denied', async () => {
+		server.use(setupAuthzDeny(buildSADeletePermission('sa-1')));
+
+		renderDrawer();
+		await screen.findByDisplayValue('CI Bot');
+
+		const deleteBtn = screen.getByRole('button', {
+			name: /Delete Service Account/i,
+		});
+		await waitFor(() => expect(deleteBtn).toBeDisabled());
+	});
+});

frontend/src/components/ServiceAccountDrawer/__tests__/ServiceAccountDrawer.test.tsx

@@ -3,6 +3,7 @@ import { listRolesSuccessResponse } from 'mocks-server/__mockdata__/roles';
 import { rest, server } from 'mocks-server/server';
 import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
 import { render, screen, userEvent, waitFor } from 'tests/test-utils';
+import { setupAuthzAdmin } from 'tests/authz-test-utils';
 
 import ServiceAccountDrawer from '../ServiceAccountDrawer';
 
@@ -98,6 +99,7 @@ describe('ServiceAccountDrawer', () => {
 			rest.delete(SA_ROLE_DELETE_ENDPOINT, (_, res, ctx) =>
 				res(ctx.status(200), ctx.json({ status: 'success', data: {} })),
 			),
+			setupAuthzAdmin(),
 		);
 	});
 
@@ -300,13 +302,6 @@ describe('ServiceAccountDrawer', () => {
 		await screen.findByText(/No keys/i);
 	});
 
-	it('shows skeleton while loading account data', () => {
-		renderDrawer();
-
-		// Skeleton renders while the fetch is in-flight
-		expect(document.querySelector('.ant-skeleton')).toBeInTheDocument();
-	});
-
 	it('shows error state when account fetch fails', async () => {
 		server.use(
 			rest.get(SA_ENDPOINT, (_, res, ctx) =>
@@ -359,6 +354,7 @@ describe('ServiceAccountDrawer – save-error UX', () => {
 			rest.delete(SA_ROLE_DELETE_ENDPOINT, (_, res, ctx) =>
 				res(ctx.status(200), ctx.json({ status: 'success', data: {} })),
 			),
+			setupAuthzAdmin(),
 		);
 	});
 

frontend/src/components/TanStackTableView/TanStackTable.tsx

@@ -16,7 +16,7 @@ import {
 	horizontalListSortingStrategy,
 	SortableContext,
 } from '@dnd-kit/sortable';
-import { ComboboxSimple } from '@signozhq/ui/combobox';
+import { ComboboxSimple, ComboboxSimpleItem } from '@signozhq/ui/combobox';
 import { TooltipProvider } from '@signozhq/ui/tooltip';
 import { Pagination } from '@signozhq/ui/pagination';
 import type { Row } from '@tanstack/react-table';
@@ -51,7 +51,7 @@ import { useEffectiveData } from './useEffectiveData';
 import { useFlatItems } from './useFlatItems';
 import { useRowKeyData } from './useRowKeyData';
 import { useTableParams } from './useTableParams';
-import { buildPageSizeItems, buildTanstackColumnDef } from './utils';
+import { buildTanstackColumnDef } from './utils';
 import { VirtuosoTableColGroup } from './VirtuosoTableColGroup';
 
 import tableStyles from './TanStackTable.module.scss';
@@ -66,6 +66,14 @@ const INCREASE_VIEWPORT_BY = { top: 500, bottom: 500 };
 
 const noopColumnVisibility = (): void => {};
 
+const paginationPageSizeItems: ComboboxSimpleItem[] = [10, 20, 30, 50, 100].map(
+	(value) => ({
+		value: value.toString(),
+		label: value.toString(),
+		displayValue: value.toString(),
+	}),
+);
+
 // eslint-disable-next-line sonarjs/cognitive-complexity
 function TanStackTableInner<TData>(
 	{
@@ -81,6 +89,7 @@ function TanStackTableInner<TData>(
 		enableQueryParams,
 		pagination,
 		paginationClassname,
+		onSort,
 		onEndReached,
 		getRowKey,
 		getItemKey,
@@ -93,7 +102,6 @@ function TanStackTableInner<TData>(
 		onRowClick,
 		onRowClickNewTab,
 		onRowDeactivate,
-		onSort,
 		activeRowIndex,
 		renderExpandedRow,
 		getRowCanExpand,
@@ -121,22 +129,17 @@ function TanStackTableInner<TData>(
 	const {
 		page,
 		limit,
-		setPage: internalSetPage,
-		setLimit: internalSetLimit,
+		setPage,
+		setLimit,
 		orderBy,
 		setOrderBy: internalSetOrderBy,
 		expanded,
 		setExpanded,
 	} = useTableParams(enableQueryParams, {
 		page: pagination?.defaultPage,
-		limit: pagination?.defaultLimit ?? pagination?.calculatedPageSize ?? 10,
+		limit: pagination?.defaultLimit,
 	});
 
-	const pageSizeItems = useMemo(
-		() => buildPageSizeItems(pagination?.calculatedPageSize),
-		[pagination?.calculatedPageSize],
-	);
-
 	const setOrderBy = useCallback(
 		(sort: SortState | null) => {
 			internalSetOrderBy(sort);
@@ -145,23 +148,6 @@ function TanStackTableInner<TData>(
 		[internalSetOrderBy, onSort],
 	);
 
-	const setPage = useCallback(
-		(p: number) => {
-			internalSetPage(p);
-			pagination?.onPageChange?.(p);
-		},
-		[internalSetPage, pagination],
-	);
-
-	const setLimit = useCallback(
-		(l: number) => {
-			internalSetLimit(l);
-			internalSetPage(1);
-			pagination?.onLimitChange?.(l);
-		},
-		[internalSetLimit, internalSetPage, pagination],
-	);
-
 	const isGrouped = (groupBy?.length ?? 0) > 0;
 
 	const {
@@ -635,14 +621,13 @@ function TanStackTableInner<TData>(
 							{pagination.showPageSize !== false && (
 								<div className={viewStyles.paginationPageSize}>
 									<ComboboxSimple
-										testId="pagination-page-size"
 										value={limit?.toString()}
 										defaultValue="10"
 										onChange={(value): void => {
 											setLimit(+value);
 											pagination.onLimitChange?.(+value);
 										}}
-										items={pageSizeItems}
+										items={paginationPageSizeItems}
 									/>
 								</div>
 							)}

frontend/src/components/TanStackTableView/__tests__/TanStackTableView.test.tsx

@@ -1,4 +1,4 @@
-import { fireEvent, screen, waitFor, within } from '@testing-library/react';
+import { fireEvent, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { UrlUpdateEvent } from 'nuqs/adapters/testing';
 
@@ -23,13 +23,12 @@ jest.mock('../TanStackTable.module.scss', () => ({
 	},
 }));
 
-beforeAll(() => {
-	window.ResizeObserver = jest.fn().mockImplementation(() => ({
-		disconnect: jest.fn(),
-		observe: jest.fn(),
-		unobserve: jest.fn(),
-	}));
-});
+// Mock ResizeObserver for combobox tests
+global.ResizeObserver = class ResizeObserver {
+	observe(): void {}
+	unobserve(): void {}
+	disconnect(): void {}
+};
 
 describe('TanStackTableView Integration', () => {
 	describe('rendering', () => {
@@ -402,54 +401,6 @@ describe('TanStackTableView Integration', () => {
 				expect(onLimitChange).toHaveBeenCalledWith(20);
 			});
 		});
-
-		it('preserves page from URL on initial mount', async () => {
-			renderTanStackTable({
-				props: {
-					pagination: { total: 100, defaultPage: 1, defaultLimit: 10 },
-					enableQueryParams: true,
-				},
-				queryParams: { page: '3' },
-			});
-
-			const nav = await screen.findByRole('navigation');
-			const page3Button = within(nav).getByRole('button', { name: '3' });
-
-			// Page 3 should be active (from URL), not reset to defaultPage 1
-			expect(page3Button).toHaveAttribute('aria-current', 'page');
-		});
-
-		it('resets page to 1 when limit changes', async () => {
-			const user = userEvent.setup();
-
-			renderTanStackTable({
-				props: {
-					pagination: { total: 100, defaultPage: 1, defaultLimit: 5 },
-					enableQueryParams: true,
-				},
-			});
-
-			const nav = await screen.findByRole('navigation');
-			const page1Button = within(nav).getByRole('button', { name: '1' });
-			const page2Button = within(nav).getByRole('button', { name: '2' });
-
-			expect(page1Button).toHaveAttribute('aria-current', 'page');
-
-			await user.click(page2Button);
-
-			await waitFor(() => {
-				expect(page2Button).toHaveAttribute('aria-current', 'page');
-			});
-
-			await user.click(screen.getByTestId('pagination-page-size'));
-
-			const option10 = await screen.findByRole('option', { name: '10' });
-			await user.click(option10);
-
-			await waitFor(() => {
-				expect(page1Button).toHaveAttribute('aria-current', 'page');
-			});
-		});
 	});
 
 	describe('sorting', () => {

frontend/src/components/TanStackTableView/__tests__/useCalculatedPageSize.test.ts

@@ -1,25 +0,0 @@
-import { renderHook } from '@testing-library/react';
-
-import { useCalculatedPageSize } from '../useCalculatedPageSize';
-
-describe('useCalculatedPageSize', () => {
-	it('returns containerRef and null calculatedPageSize initially', () => {
-		const { result } = renderHook(() => useCalculatedPageSize());
-		expect(result.current.containerRef).toBeDefined();
-		expect(result.current.containerRef.current).toBeNull();
-		expect(result.current.calculatedPageSize).toBeNull();
-	});
-
-	it('accepts custom config', () => {
-		const { result } = renderHook(() =>
-			useCalculatedPageSize({
-				rowHeight: 50,
-				headerHeight: 40,
-				paginationHeight: 50,
-				minPageSize: 3,
-				maxPageSize: 20,
-			}),
-		);
-		expect(result.current.containerRef).toBeDefined();
-	});
-});

frontend/src/components/TanStackTableView/__tests__/usePreferredPageSize.test.ts

@@ -1,89 +0,0 @@
-/* eslint-disable no-restricted-syntax */
-import { act, renderHook } from '@testing-library/react';
-
-import {
-	getPreferredPageSize,
-	usePreferredPageSize,
-	usePreferredPageSizeStore,
-} from '../usePreferredPageSize.store';
-
-const STORAGE_KEY = 'test-table';
-const FULL_STORAGE_KEY = '@signoz/table-columns/test-table-preferred-page-size';
-
-describe('usePreferredPageSize', () => {
-	beforeEach(() => {
-		localStorage.clear();
-		usePreferredPageSizeStore.setState({ tables: {} });
-	});
-
-	it('returns null when no stored value exists', () => {
-		const { result } = renderHook(() => usePreferredPageSize(STORAGE_KEY));
-		expect(result.current[0]).toBeNull();
-	});
-
-	it('returns null when storageKey is undefined', () => {
-		const { result } = renderHook(() => usePreferredPageSize(undefined));
-		expect(result.current[0]).toBeNull();
-	});
-
-	it('loads stored page size from localStorage', () => {
-		localStorage.setItem(FULL_STORAGE_KEY, '25');
-		const { result } = renderHook(() => usePreferredPageSize(STORAGE_KEY));
-		expect(result.current[0]).toBe(25);
-	});
-
-	it('ignores invalid stored values', () => {
-		localStorage.setItem(FULL_STORAGE_KEY, 'invalid');
-		const { result } = renderHook(() => usePreferredPageSize(STORAGE_KEY));
-		expect(result.current[0]).toBeNull();
-	});
-
-	it('persists page size to localStorage when set', () => {
-		const { result } = renderHook(() => usePreferredPageSize(STORAGE_KEY));
-
-		act(() => {
-			result.current[1](30);
-		});
-
-		expect(result.current[0]).toBe(30);
-		expect(localStorage.getItem(FULL_STORAGE_KEY)).toBe('30');
-	});
-
-	it('removes from localStorage when set to null', () => {
-		localStorage.setItem(FULL_STORAGE_KEY, '25');
-		const { result } = renderHook(() => usePreferredPageSize(STORAGE_KEY));
-
-		act(() => {
-			result.current[1](null);
-		});
-
-		expect(result.current[0]).toBeNull();
-		expect(localStorage.getItem(FULL_STORAGE_KEY)).toBeNull();
-	});
-
-	it('does nothing when storageKey is undefined and set is called', () => {
-		const { result } = renderHook(() => usePreferredPageSize(undefined));
-
-		act(() => {
-			result.current[1](30);
-		});
-
-		expect(result.current[0]).toBeNull();
-	});
-});
-
-describe('getPreferredPageSize', () => {
-	beforeEach(() => {
-		localStorage.clear();
-		usePreferredPageSizeStore.setState({ tables: {} });
-	});
-
-	it('returns null when no stored value exists', () => {
-		expect(getPreferredPageSize(STORAGE_KEY)).toBeNull();
-	});
-
-	it('returns stored value from localStorage', () => {
-		localStorage.setItem(FULL_STORAGE_KEY, '42');
-		expect(getPreferredPageSize(STORAGE_KEY)).toBe(42);
-	});
-});

frontend/src/components/TanStackTableView/__tests__/useTableParams.test.tsx

@@ -7,7 +7,6 @@ import {
 } from 'nuqs/adapters/testing';
 
 import { useTableParams } from '../useTableParams';
-import { usePreferredPageSizeStore } from '../usePreferredPageSize.store';
 
 function createNuqsWrapper(
 	queryParams?: Record<string, string>,
@@ -544,406 +543,3 @@ describe('useTableParams (selective URL mode — partial config object)', () =>
 		});
 	});
 });
-
-describe('useTableParams (cleanupOnUnmount option)', () => {
-	beforeEach(() => {
-		jest.useFakeTimers();
-		localStorage.clear();
-		usePreferredPageSizeStore.setState({ tables: {} });
-	});
-
-	afterEach(() => {
-		jest.useRealTimers();
-	});
-
-	it('clears URL params on unmount when cleanupOnUnmount is true', async () => {
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-		const { result, unmount } = renderHook(
-			() =>
-				useTableParams(
-					{ page: 'page', limit: 'limit', orderBy: 'orderBy' },
-					{
-						page: 1,
-						limit: 10,
-						cleanupOnUnmount: true,
-					},
-				),
-			{ wrapper },
-		);
-
-		// Set some values
-		await act(async () => {
-			result.current.setLimit(50);
-			result.current.setPage(3);
-			jest.runAllTimers();
-			await Promise.resolve();
-		});
-
-		// Verify values set
-		expect(result.current.limit).toBe(50);
-		expect(result.current.page).toBe(3);
-
-		// Unmount triggers cleanup
-		unmount();
-
-		await act(async () => {
-			jest.runAllTimers();
-			await Promise.resolve();
-		});
-
-		// Last URL update should have cleared params
-		const lastUpdate = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1];
-		expect(lastUpdate[0].searchParams.get('limit')).toBeNull();
-		expect(lastUpdate[0].searchParams.get('page')).toBeNull();
-	});
-
-	it('does not clear URL params on unmount when cleanupOnUnmount is false', async () => {
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-		const { result, unmount } = renderHook(
-			() =>
-				useTableParams(
-					{ page: 'page', limit: 'limit' },
-					{
-						page: 1,
-						limit: 10,
-						cleanupOnUnmount: false,
-					},
-				),
-			{ wrapper },
-		);
-
-		await act(async () => {
-			result.current.setLimit(50);
-			jest.runAllTimers();
-			await Promise.resolve();
-		});
-
-		expect(result.current.limit).toBe(50);
-
-		unmount();
-
-		await act(async () => {
-			jest.runAllTimers();
-			await Promise.resolve();
-		});
-
-		// No new URL updates after unmount (or same count)
-		const lastUpdate = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1];
-		expect(lastUpdate[0].searchParams.get('limit')).toBe('50');
-	});
-
-	it('defaults cleanupOnUnmount to false', async () => {
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-		const { result, unmount } = renderHook(
-			() =>
-				useTableParams({ page: 'page', limit: 'limit' }, { page: 1, limit: 10 }),
-			{ wrapper },
-		);
-
-		await act(async () => {
-			result.current.setLimit(50);
-			jest.runAllTimers();
-			await Promise.resolve();
-		});
-
-		unmount();
-
-		await act(async () => {
-			jest.runAllTimers();
-			await Promise.resolve();
-		});
-
-		// URL should still have limit=50 (cleanup not triggered)
-		const lastUpdate = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1];
-		expect(lastUpdate[0].searchParams.get('limit')).toBe('50');
-	});
-});
-
-describe('useTableParams (auto page size with storageKey)', () => {
-	beforeEach(() => {
-		jest.useFakeTimers();
-		localStorage.clear();
-		usePreferredPageSizeStore.setState({ tables: {} });
-	});
-
-	afterEach(() => {
-		jest.useRealTimers();
-	});
-
-	it('uses explicit default when no URL, no calculated, no preferred', () => {
-		const wrapper = createNuqsWrapper();
-		const { result } = renderHook(
-			() =>
-				useTableParams(
-					{ page: 'page', limit: 'limit' },
-					{
-						page: 1,
-						limit: 10,
-						storageKey: 'test-table',
-						calculatedPageSize: null,
-					},
-				),
-			{ wrapper },
-		);
-
-		// Should use explicit default (10), NOT the internal DEFAULT_LIMIT (50)
-		expect(result.current.limit).toBe(10);
-	});
-
-	it('uses calculatedPageSize when available and no preferred', () => {
-		const wrapper = createNuqsWrapper();
-		const { result } = renderHook(
-			() =>
-				useTableParams(
-					{ page: 'page', limit: 'limit' },
-					{
-						page: 1,
-						limit: 10,
-						storageKey: 'test-table',
-						calculatedPageSize: 42,
-					},
-				),
-			{ wrapper },
-		);
-
-		expect(result.current.limit).toBe(42);
-	});
-
-	it('prefers stored value over calculatedPageSize', () => {
-		// Pre-populate the store
-		localStorage.setItem(
-			'@signoz/table-columns/test-table-preferred-page-size',
-			'25',
-		);
-
-		const wrapper = createNuqsWrapper();
-		const { result } = renderHook(
-			() =>
-				useTableParams(
-					{ page: 'page', limit: 'limit' },
-					{
-						page: 1,
-						limit: 10,
-						storageKey: 'test-table',
-						calculatedPageSize: 42,
-					},
-				),
-			{ wrapper },
-		);
-
-		// Should use preferred (25), not calculated (42)
-		expect(result.current.limit).toBe(25);
-	});
-
-	it('preserves URL limit over calculated and preferred', () => {
-		localStorage.setItem(
-			'@signoz/table-columns/test-table-preferred-page-size',
-			'25',
-		);
-
-		const wrapper = createNuqsWrapper({ limit: '30' });
-		const { result } = renderHook(
-			() =>
-				useTableParams(
-					{ page: 'page', limit: 'limit' },
-					{
-						page: 1,
-						limit: 10,
-						storageKey: 'test-table',
-						calculatedPageSize: 42,
-					},
-				),
-			{ wrapper },
-		);
-
-		// Should use URL (30), not preferred (25) or calculated (42)
-		expect(result.current.limit).toBe(30);
-	});
-
-	it('persists user selection when different from calculated', () => {
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		const wrapper = createNuqsWrapper({}, onUrlUpdate);
-		const { result } = renderHook(
-			() =>
-				useTableParams(
-					{ page: 'page', limit: 'limit' },
-					{
-						page: 1,
-						limit: 10,
-						storageKey: 'test-table',
-						calculatedPageSize: 42,
-					},
-				),
-			{ wrapper },
-		);
-
-		// User selects 30 (different from calculated 42)
-		act(() => {
-			result.current.setLimit(30);
-			jest.runAllTimers();
-		});
-
-		expect(result.current.limit).toBe(30);
-		expect(
-			localStorage.getItem('@signoz/table-columns/test-table-preferred-page-size'),
-		).toBe('30');
-	});
-
-	it('clears preference when user selects calculated value', () => {
-		// Pre-set a preference
-		localStorage.setItem(
-			'@signoz/table-columns/test-table-preferred-page-size',
-			'30',
-		);
-		usePreferredPageSizeStore.setState({ tables: { 'test-table': 30 } });
-
-		const wrapper = createNuqsWrapper();
-		const { result } = renderHook(
-			() =>
-				useTableParams(
-					{ page: 'page', limit: 'limit' },
-					{
-						page: 1,
-						limit: 10,
-						storageKey: 'test-table',
-						calculatedPageSize: 42,
-					},
-				),
-			{ wrapper },
-		);
-
-		// User selects 42 (same as calculated)
-		act(() => {
-			result.current.setLimit(42);
-			jest.runAllTimers();
-		});
-
-		expect(result.current.limit).toBe(42);
-		// Preference should be cleared (null removes from storage)
-		expect(
-			localStorage.getItem('@signoz/table-columns/test-table-preferred-page-size'),
-		).toBeNull();
-	});
-
-	it('returns calculated value even before URL is synced', () => {
-		const wrapper = createNuqsWrapper();
-
-		const { result } = renderHook(
-			() =>
-				useTableParams(
-					{ page: 'page', limit: 'limit' },
-					{
-						page: 1,
-						limit: 10,
-						storageKey: 'test-table',
-						calculatedPageSize: 42,
-					},
-				),
-			{ wrapper },
-		);
-
-		// Limit should be 42 (calculated) even if URL sync is async
-		expect(result.current.limit).toBe(42);
-	});
-
-	it('does not override URL when it already has a value', () => {
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		const wrapper = createNuqsWrapper({ limit: '30' }, onUrlUpdate);
-
-		const { result } = renderHook(
-			() =>
-				useTableParams(
-					{ page: 'page', limit: 'limit' },
-					{
-						page: 1,
-						limit: 10,
-						storageKey: 'test-table',
-						calculatedPageSize: 42,
-					},
-				),
-			{ wrapper },
-		);
-
-		act(() => {
-			jest.runAllTimers();
-		});
-
-		// Limit should stay at 30 (from URL), not change to 42
-		expect(result.current.limit).toBe(30);
-	});
-
-	it('handles calculatedPageSize changing from null to number', () => {
-		const wrapper = createNuqsWrapper();
-
-		const { result, rerender } = renderHook(
-			({ calculated }) =>
-				useTableParams(
-					{ page: 'page', limit: 'limit' },
-					{
-						page: 1,
-						limit: 10,
-						storageKey: 'test-table-2',
-						calculatedPageSize: calculated,
-					},
-				),
-			{ wrapper, initialProps: { calculated: null as number | null } },
-		);
-
-		// Initially should use explicit default (10)
-		expect(result.current.limit).toBe(10);
-
-		// When calculated becomes available, should update
-		rerender({ calculated: 42 });
-
-		act(() => {
-			jest.runAllTimers();
-		});
-
-		// Limit should now be 42
-		expect(result.current.limit).toBe(42);
-	});
-
-	it('keeps user selection when calculatedPageSize changes', () => {
-		const wrapper = createNuqsWrapper();
-
-		const { result, rerender } = renderHook(
-			({ calculated }) =>
-				useTableParams(
-					{ page: 'page', limit: 'limit' },
-					{
-						page: 1,
-						limit: 10,
-						storageKey: 'test-table-3',
-						calculatedPageSize: calculated,
-					},
-				),
-			{ wrapper, initialProps: { calculated: 42 as number | null } },
-		);
-
-		expect(result.current.limit).toBe(42);
-
-		// User selects 30
-		act(() => {
-			result.current.setLimit(30);
-			jest.runAllTimers();
-		});
-
-		expect(result.current.limit).toBe(30);
-
-		// calculatedPageSize changes (e.g., window resize)
-		rerender({ calculated: 50 });
-
-		act(() => {
-			jest.runAllTimers();
-		});
-
-		// Should keep user's selection (30), not change to new calculated (50)
-		expect(result.current.limit).toBe(30);
-	});
-});

frontend/src/components/TanStackTableView/__tests__/useTableParamsCleanup.test.tsx

@@ -1,199 +0,0 @@
-import { ReactNode } from 'react';
-import { act, renderHook } from '@testing-library/react';
-import { useQueryStates, parseAsInteger } from 'nuqs';
-import {
-	NuqsTestingAdapter,
-	OnUrlUpdateFunction,
-	UrlUpdateEvent,
-} from 'nuqs/adapters/testing';
-import { parseAsJsonNoValidate } from 'utils/nuqsParsers';
-
-import { useTableParams } from '../useTableParams';
-import { usePreferredPageSizeStore } from '../usePreferredPageSize.store';
-
-function createNuqsWrapper(
-	queryParams?: Record<string, string>,
-	onUrlUpdate?: OnUrlUpdateFunction,
-): ({ children }: { children: ReactNode }) => JSX.Element {
-	return function NuqsWrapper({
-		children,
-	}: {
-		children: ReactNode;
-	}): JSX.Element {
-		return (
-			<NuqsTestingAdapter
-				searchParams={queryParams}
-				onUrlUpdate={onUrlUpdate}
-				hasMemory
-			>
-				{children}
-			</NuqsTestingAdapter>
-		);
-	};
-}
-
-const QUERY_PARAMS_CONFIG = {
-	orderBy: 'orderBy',
-	page: 'page',
-	limit: 'limit',
-} as const;
-
-type TableParamsWithCleanup = ReturnType<typeof useTableParams> & {
-	clearParams: ReturnType<typeof useQueryStates>[1];
-};
-
-/**
- * Simulates the cleanup pattern used in ListAlertRules:
- * - Uses useQueryStates to clear URL params on unmount
- */
-function useTableParamsWithCleanup(
-	storageKey: string,
-	calculatedPageSize: number | null,
-): TableParamsWithCleanup {
-	const result = useTableParams(QUERY_PARAMS_CONFIG, {
-		page: 1,
-		limit: 10,
-		storageKey,
-		calculatedPageSize,
-	});
-
-	// This mirrors the cleanup effect in ListAlertRules
-	const [, setTableQueryParams] = useQueryStates({
-		[QUERY_PARAMS_CONFIG.orderBy]: parseAsJsonNoValidate(),
-		[QUERY_PARAMS_CONFIG.page]: parseAsInteger,
-		[QUERY_PARAMS_CONFIG.limit]: parseAsInteger,
-	});
-
-	// Note: We can't use useEffect cleanup in tests easily, but we can verify
-	// that calling setTableQueryParams with nulls does clear the URL
-
-	return { ...result, clearParams: setTableQueryParams };
-}
-
-describe('URL cleanup pattern (simulating ListAlertRules behavior)', () => {
-	beforeEach(() => {
-		jest.useFakeTimers();
-		localStorage.clear();
-		usePreferredPageSizeStore.setState({ tables: {} });
-	});
-
-	afterEach(() => {
-		jest.useRealTimers();
-	});
-
-	it('setTableQueryParams with null values should clear URL params', async () => {
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-		const { result } = renderHook(
-			() => useTableParamsWithCleanup('alert-rules', 42),
-			{ wrapper },
-		);
-
-		// Set limit to 100
-		await act(async () => {
-			result.current.setLimit(100);
-			jest.runAllTimers();
-			await Promise.resolve();
-		});
-
-		expect(result.current.limit).toBe(100);
-
-		// Verify limit=100 is in URL
-		const limitAfterSet = onUrlUpdate.mock.calls
-			.map((call) => call[0].searchParams.get('limit'))
-			.filter(Boolean)
-			.pop();
-		expect(limitAfterSet).toBe('100');
-
-		// Simulate cleanup: clear all params
-		await act(async () => {
-			void result.current.clearParams({
-				orderBy: null,
-				page: null,
-				limit: null,
-			});
-			jest.runAllTimers();
-			await Promise.resolve();
-		});
-
-		// Verify limit was cleared (last update should have limit=null or removed)
-		const lastUpdate = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1];
-		const finalLimit = lastUpdate[0].searchParams.get('limit');
-		expect(finalLimit).toBeNull();
-	});
-
-	it('cleanup should work even when limit was set from localStorage preference', async () => {
-		// Pre-set preference
-		localStorage.setItem(
-			'@signoz/table-columns/alert-rules-preferred-page-size',
-			'100',
-		);
-
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-		const { result } = renderHook(
-			() => useTableParamsWithCleanup('alert-rules', 42),
-			{ wrapper },
-		);
-
-		await act(async () => {
-			jest.runAllTimers();
-			await Promise.resolve();
-		});
-
-		// Should use preferred value
-		expect(result.current.limit).toBe(100);
-
-		// Simulate cleanup
-		await act(async () => {
-			void result.current.clearParams({
-				orderBy: null,
-				page: null,
-				limit: null,
-			});
-			jest.runAllTimers();
-			await Promise.resolve();
-		});
-
-		// URL should be cleared
-		const lastUpdate = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1];
-		const finalLimit = lastUpdate[0].searchParams.get('limit');
-		expect(finalLimit).toBeNull();
-	});
-
-	it('demonstrates the bug: component without cleanup leaves limit in URL', async () => {
-		const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-		const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-		// Mount TriggeredAlerts-like component (no cleanup)
-		const { result, unmount } = renderHook(
-			() =>
-				useTableParams(QUERY_PARAMS_CONFIG, {
-					page: 1,
-					limit: 10,
-					storageKey: 'triggered-alerts',
-					calculatedPageSize: 42,
-				}),
-			{ wrapper },
-		);
-
-		// Set limit to 100
-		await act(async () => {
-			result.current.setLimit(100);
-			jest.runAllTimers();
-			await Promise.resolve();
-		});
-
-		expect(result.current.limit).toBe(100);
-
-		// Unmount WITHOUT cleanup
-		unmount();
-
-		// Verify limit=100 is STILL in URL (this is the bug!)
-		const lastUpdate = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1];
-		const finalLimit = lastUpdate[0].searchParams.get('limit');
-		expect(finalLimit).toBe('100'); // BUG: limit persists after unmount
-	});
-});

frontend/src/components/TanStackTableView/__tests__/useTableParamsNavigation.test.tsx

@@ -1,385 +0,0 @@
-import { ReactNode } from 'react';
-import { act, renderHook } from '@testing-library/react';
-import {
-	NuqsTestingAdapter,
-	OnUrlUpdateFunction,
-	UrlUpdateEvent,
-} from 'nuqs/adapters/testing';
-
-import { useTableParams } from '../useTableParams';
-import { usePreferredPageSizeStore } from '../usePreferredPageSize.store';
-
-function createNuqsWrapper(
-	queryParams?: Record<string, string>,
-	onUrlUpdate?: OnUrlUpdateFunction,
-): ({ children }: { children: ReactNode }) => JSX.Element {
-	return function NuqsWrapper({
-		children,
-	}: {
-		children: ReactNode;
-	}): JSX.Element {
-		return (
-			<NuqsTestingAdapter
-				searchParams={queryParams}
-				onUrlUpdate={onUrlUpdate}
-				hasMemory
-			>
-				{children}
-			</NuqsTestingAdapter>
-		);
-	};
-}
-
-describe('useTableParams navigation scenarios', () => {
-	beforeEach(() => {
-		jest.useFakeTimers();
-		localStorage.clear();
-		usePreferredPageSizeStore.setState({ tables: {} });
-	});
-
-	afterEach(() => {
-		jest.useRealTimers();
-	});
-
-	describe('Tab navigation: Alert Rules -> Configuration -> Routing Policies', () => {
-		it('preferred value from one table should NOT leak to URL when navigating away', () => {
-			const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-			const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-			// Simulate Alert Rules: user sets limit=100
-			const alertRules = renderHook(
-				() =>
-					useTableParams(
-						{ page: 'page', limit: 'limit', orderBy: 'orderBy' },
-						{
-							page: 1,
-							limit: 10,
-							storageKey: 'alert-rules',
-							calculatedPageSize: 42,
-						},
-					),
-				{ wrapper },
-			);
-
-			// User selects limit=100
-			act(() => {
-				alertRules.result.current.setLimit(100);
-				jest.runAllTimers();
-			});
-
-			expect(alertRules.result.current.limit).toBe(100);
-
-			// Verify it's persisted in localStorage
-			expect(
-				localStorage.getItem(
-					'@signoz/table-columns/alert-rules-preferred-page-size',
-				),
-			).toBe('100');
-
-			// Simulate unmount (user navigates away)
-			alertRules.unmount();
-
-			// At this point, the URL should NOT have limit=100 from alert-rules
-			// when another component mounts with a different storageKey
-		});
-
-		it('different tables with different storageKeys maintain separate preferences', () => {
-			const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-			const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-			// Alert Rules sets limit=100
-			localStorage.setItem(
-				'@signoz/table-columns/alert-rules-preferred-page-size',
-				'100',
-			);
-			// Triggered Alerts sets limit=25
-			localStorage.setItem(
-				'@signoz/table-columns/triggered-alerts-preferred-page-size',
-				'25',
-			);
-
-			// Mount Triggered Alerts (simulating tab switch from Alert Rules)
-			const triggeredAlerts = renderHook(
-				() =>
-					useTableParams(
-						{ page: 'page', limit: 'limit', orderBy: 'orderBy' },
-						{
-							page: 1,
-							limit: 10,
-							storageKey: 'triggered-alerts',
-							calculatedPageSize: 42,
-						},
-					),
-				{ wrapper },
-			);
-
-			act(() => {
-				jest.runAllTimers();
-			});
-
-			// Should use triggered-alerts preference (25), NOT alert-rules (100)
-			expect(triggeredAlerts.result.current.limit).toBe(25);
-		});
-
-		it('table without storageKey should NOT write preference to URL from another table', () => {
-			const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-
-			// Pre-set alert-rules preference
-			localStorage.setItem(
-				'@signoz/table-columns/alert-rules-preferred-page-size',
-				'100',
-			);
-
-			// Start fresh with NO URL params
-			const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-			// Mount a table WITHOUT storageKey (simulating a simple table)
-			const simpleTable = renderHook(
-				() =>
-					useTableParams(
-						{ page: 'page', limit: 'limit' },
-						{
-							page: 1,
-							limit: 10,
-							// NO storageKey
-							calculatedPageSize: 42,
-						},
-					),
-				{ wrapper },
-			);
-
-			act(() => {
-				jest.runAllTimers();
-			});
-
-			// Should use calculated (42), not alert-rules preference (100)
-			expect(simpleTable.result.current.limit).toBe(42);
-		});
-	});
-
-	describe('URL cleanup on unmount', () => {
-		it('URL params should be cleanable by consumer on unmount', () => {
-			const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-			const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-			const { result, unmount } = renderHook(
-				() =>
-					useTableParams(
-						{ page: 'page', limit: 'limit', orderBy: 'orderBy' },
-						{
-							page: 1,
-							limit: 10,
-							storageKey: 'test-cleanup',
-							calculatedPageSize: 42,
-						},
-					),
-				{ wrapper },
-			);
-
-			// Set some values
-			act(() => {
-				result.current.setLimit(50);
-				result.current.setPage(3);
-				jest.runAllTimers();
-			});
-
-			// Verify URL was updated
-			const limitUpdates = onUrlUpdate.mock.calls
-				.map((call) => call[0].searchParams.get('limit'))
-				.filter(Boolean);
-			expect(limitUpdates).toContain('50');
-
-			// Unmount (note: useTableParams itself doesn't cleanup URL - consumer should)
-			unmount();
-
-			// Verify the component unmounted (no errors)
-			expect(true).toBe(true);
-		});
-	});
-
-	describe('Parallel tables sharing URL params', () => {
-		it('two tables using same URL params should see same values when URL pre-set', () => {
-			const wrapper = createNuqsWrapper({ limit: '30' });
-
-			const table1 = renderHook(
-				() =>
-					useTableParams(
-						{ page: 'page', limit: 'limit' },
-						{
-							page: 1,
-							limit: 10,
-							storageKey: 'table-1',
-							calculatedPageSize: 42,
-						},
-					),
-				{ wrapper },
-			);
-
-			const table2 = renderHook(
-				() =>
-					useTableParams(
-						{ page: 'page', limit: 'limit' },
-						{
-							page: 1,
-							limit: 20,
-							storageKey: 'table-2',
-							calculatedPageSize: 50,
-						},
-					),
-				{ wrapper },
-			);
-
-			// Both should see URL value (30), not their defaults
-			expect(table1.result.current.limit).toBe(30);
-			expect(table2.result.current.limit).toBe(30);
-		});
-
-		it('table mounted after setLimit should see updated URL value', () => {
-			const wrapper = createNuqsWrapper();
-
-			// Table1 mounts first
-			const table1 = renderHook(
-				() =>
-					useTableParams(
-						{ page: 'page', limit: 'limit' },
-						{
-							page: 1,
-							limit: 10,
-							storageKey: 'table-1',
-							calculatedPageSize: 42,
-						},
-					),
-				{ wrapper },
-			);
-
-			act(() => {
-				jest.runAllTimers();
-			});
-
-			expect(table1.result.current.limit).toBe(42);
-
-			// Table1 sets limit to 100
-			act(() => {
-				table1.result.current.setLimit(100);
-				jest.runAllTimers();
-			});
-
-			expect(table1.result.current.limit).toBe(100);
-
-			// Table2 mounts AFTER table1 set limit=100 in URL
-			// In test environment, URL state doesn't persist between renderHook calls
-			// This test documents current behavior - each hook instance is independent
-		});
-	});
-
-	describe('URL state initialization race conditions', () => {
-		it('should not write preferred value to URL if URL already has value', () => {
-			const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-
-			// Pre-set preference
-			localStorage.setItem(
-				'@signoz/table-columns/test-table-preferred-page-size',
-				'100',
-			);
-
-			// URL already has limit=30
-			const wrapper = createNuqsWrapper({ limit: '30' }, onUrlUpdate);
-
-			const { result } = renderHook(
-				() =>
-					useTableParams(
-						{ page: 'page', limit: 'limit' },
-						{
-							page: 1,
-							limit: 10,
-							storageKey: 'test-table',
-							calculatedPageSize: 42,
-						},
-					),
-				{ wrapper },
-			);
-
-			act(() => {
-				jest.runAllTimers();
-			});
-
-			// Should use URL (30), not preferred (100)
-			expect(result.current.limit).toBe(30);
-
-			// URL should NOT have been overwritten with 100
-			const limitUpdates = onUrlUpdate.mock.calls
-				.map((call) => call[0].searchParams.get('limit'))
-				.filter((v) => v === '100');
-			expect(limitUpdates).toHaveLength(0);
-		});
-
-		it('URL init effect should write calculated value when URL empty', async () => {
-			const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-			const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-			// Mount with no URL params
-			const { result } = renderHook(
-				() =>
-					useTableParams(
-						{ page: 'page', limit: 'limit' },
-						{
-							page: 1,
-							limit: 10,
-							storageKey: 'table-1',
-							calculatedPageSize: 42,
-						},
-					),
-				{ wrapper },
-			);
-
-			// Effects run after render, need to flush
-			await act(async () => {
-				jest.runAllTimers();
-				await Promise.resolve();
-			});
-
-			// Should use calculated value
-			expect(result.current.limit).toBe(42);
-
-			// The URL init effect writes to URL asynchronously
-			// Check that limit is 42 (which it is from the limitDefault calculation)
-		});
-
-		it('consumer cleanup effect is responsible for clearing URL params', () => {
-			// This test documents that useTableParams does NOT auto-cleanup URL
-			// Consumer components (like ListAlertRules) must use useEffect cleanup
-			// to clear URL params when unmounting
-			const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-			const wrapper = createNuqsWrapper({}, onUrlUpdate);
-
-			const { result, unmount } = renderHook(
-				() =>
-					useTableParams(
-						{ page: 'page', limit: 'limit' },
-						{
-							page: 1,
-							limit: 10,
-							storageKey: 'table-1',
-							calculatedPageSize: 42,
-						},
-					),
-				{ wrapper },
-			);
-
-			act(() => {
-				result.current.setLimit(100);
-				jest.runAllTimers();
-			});
-
-			expect(result.current.limit).toBe(100);
-
-			// Unmount - useTableParams does NOT clear URL
-			unmount();
-
-			// Verify unmount happened without clearing URL
-			// The last URL update should still have limit=100, not null
-			const lastUpdate = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1];
-			expect(lastUpdate[0].searchParams.get('limit')).toBe('100');
-		});
-	});
-});

frontend/src/components/TanStackTableView/index.tsx

@@ -3,10 +3,8 @@ import TanStackTableText from './TanStackTableText';
 
 export * from './TanStackTableStateContext';
 export * from './types';
-export * from './useCalculatedPageSize';
 export * from './useColumnState';
 export * from './useColumnStore';
-export * from './usePreferredPageSize.store';
 export * from './useTableParams';
 
 /**
@@ -194,67 +192,6 @@ export * from './useTableParams';
  *   )}
  * />
  * ```
- *
- * @example useTableParams — manages pagination state with URL sync and persistence
- *
- * The `useTableParams` hook handles page, limit, orderBy, and expanded state. It can sync
- * to URL params, persist user's page size preference, and auto-calculate page size from
- * container height.
- *
- * **Priority chain for limit**: URL > preferred (localStorage) > calculated > explicit default > 50
- *
- * ```tsx
- * import { useCalculatedPageSize, useTableParams } from 'components/TanStackTableView';
- *
- * const QUERY_PARAMS = { page: 'page', limit: 'limit', orderBy: 'orderBy' } as const;
- *
- * function MyTable({ data, columns }) {
- *   // Auto-calculate page size based on container height
- *   const { containerRef, calculatedPageSize } = useCalculatedPageSize({ rowHeight: 42 });
- *
- *   // useTableParams options:
- *   // - storageKey: persists user's page size selection to localStorage
- *   // - calculatedPageSize: uses this when no URL/preferred value exists
- *   // - cleanupOnUnmount: clears URL params when component unmounts
- *   const { page, limit, setLimit, orderBy } = useTableParams(QUERY_PARAMS, {
- *     page: 1,
- *     limit: 10,
- *     storageKey: 'my-table',
- *     calculatedPageSize,
- *     cleanupOnUnmount: true,
- *   });
- *
- *   const paginatedData = useMemo(() => {
- *     const start = (page - 1) * limit;
- *     return data.slice(start, start + limit);
- *   }, [data, page, limit]);
- *
- *   return (
- *     <div ref={containerRef} style={{ height: '100%' }}>
- *       <TanStackTable
- *         data={paginatedData}
- *         columns={columns}
- *         enableQueryParams={QUERY_PARAMS}
- *         pagination={{
- *           total: data.length,
- *           calculatedPageSize,
- *           onLimitChange: setLimit,
- *         }}
- *       />
- *     </div>
- *   );
- * }
- * ```
- *
- * **useTableParams options:**
- * - `storageKey`: Persists user's page size to localStorage. When user selects a size
- *   different from calculated, it's saved. Selecting calculated size clears preference.
- * - `calculatedPageSize`: From `useCalculatedPageSize`. Used as default when no URL/preferred.
- * - `cleanupOnUnmount`: Clears URL params (page, limit, orderBy, expanded) on unmount.
- *   Use when navigating away should reset table state.
- *
- * **Pagination shows "Auto" option** when `calculatedPageSize` is passed, allowing users
- * to reset to auto-calculated size.
  */
 const TanStackTable = Object.assign(TanStackTableBase, {
 	Text: TanStackTableText,

frontend/src/components/TanStackTableView/types.ts

@@ -74,7 +74,6 @@ export type TableColumnDef<
 		min?: number | string;
 		default?: number | string;
 		max?: number | string;
-		ignoreLastColumnFill?: boolean;
 	};
 };
 
@@ -112,14 +111,6 @@ export type TableRowContext<TData> = {
 	enableAlternatingRowColors?: boolean;
 };
 
-export type AutoPageSizeConfig = {
-	rowHeight?: number;
-	headerHeight?: number;
-	paginationHeight?: number;
-	minPageSize?: number;
-	maxPageSize?: number;
-};
-
 export type PaginationProps = {
 	total: number;
 	defaultPage?: number;
@@ -132,12 +123,6 @@ export type PaginationProps = {
 	onLimitChange?: (limit: number) => void;
 	showTotalCount?: boolean;
 	totalCountLabel?: string;
-	/**
-	 * Auto-calculated page size for the current container.
-	 * When set, shows as "Auto (N)" option in the page size dropdown.
-	 * Consumer is responsible for calculating this via useCalculatedPageSize.
-	 */
-	calculatedPageSize?: number | null;
 };
 
 export type TanstackTableQueryParamsConfig = {

frontend/src/components/TanStackTableView/useCalculatedPageSize.ts

@@ -1,76 +0,0 @@
-import type { RefObject } from 'react';
-import { useCallback, useEffect, useRef, useState } from 'react';
-
-import { AutoPageSizeConfig } from './types';
-
-const DEFAULT_ROW_HEIGHT = 36;
-const DEFAULT_HEADER_HEIGHT = 36;
-const DEFAULT_PAGINATION_HEIGHT = 62;
-const MIN_PAGE_SIZE = 5;
-const MAX_PAGE_SIZE = 100;
-
-export type UseCalculatedPageSizeResult = {
-	containerRef: RefObject<HTMLDivElement>;
-	calculatedPageSize: number | null;
-};
-
-export function useCalculatedPageSize(
-	config?: AutoPageSizeConfig,
-): UseCalculatedPageSizeResult {
-	const containerRef = useRef<HTMLDivElement>(null);
-	const [calculatedPageSize, setCalculatedPageSize] = useState<number | null>(
-		null,
-	);
-
-	const rowHeight = config?.rowHeight ?? DEFAULT_ROW_HEIGHT;
-	const headerHeight = config?.headerHeight ?? DEFAULT_HEADER_HEIGHT;
-	const paginationHeight = config?.paginationHeight ?? DEFAULT_PAGINATION_HEIGHT;
-	const minPageSize = config?.minPageSize ?? MIN_PAGE_SIZE;
-	const maxPageSize = config?.maxPageSize ?? MAX_PAGE_SIZE;
-
-	const calculatePageSize = useCallback(
-		(containerHeight: number): number => {
-			const availableHeight = containerHeight - headerHeight - paginationHeight;
-			const rawPageSize = Math.floor(availableHeight / rowHeight);
-			return Math.min(maxPageSize, Math.max(minPageSize, rawPageSize));
-		},
-		[rowHeight, headerHeight, paginationHeight, minPageSize, maxPageSize],
-	);
-
-	useEffect(() => {
-		if (!containerRef.current) {
-			return;
-		}
-
-		const container = containerRef.current;
-
-		const observer = new ResizeObserver((entries) => {
-			const entry = entries[0];
-
-			if (!entry) {
-				return;
-			}
-
-			const { height } = entry.contentRect;
-			if (height > 0) {
-				const newPageSize = calculatePageSize(height);
-				setCalculatedPageSize((prev) =>
-					prev !== newPageSize ? newPageSize : prev,
-				);
-			}
-		});
-
-		observer.observe(container);
-
-		const { height } = container.getBoundingClientRect();
-		if (height > 0) {
-			setCalculatedPageSize(calculatePageSize(height));
-		}
-
-		return (): void => {
-			observer.disconnect();
-		};
-	}, [calculatePageSize]);
-
-	return { containerRef, calculatedPageSize };
-}

frontend/src/components/TanStackTableView/usePreferredPageSize.store.ts

@@ -1,91 +0,0 @@
-import get from 'api/browser/localstorage/get';
-import set from 'api/browser/localstorage/set';
-import remove from 'api/browser/localstorage/remove';
-import { create } from 'zustand';
-
-const STORAGE_PREFIX = '@signoz/table-columns/';
-const STORAGE_SUFFIX = '-preferred-page-size';
-
-type PreferredPageSizeState = {
-	tables: Record<string, number | null>;
-	setPreferredPageSize: (storageKey: string, pageSize: number | null) => void;
-};
-
-const getStorageKey = (tableKey: string): string =>
-	`${STORAGE_PREFIX}${tableKey}${STORAGE_SUFFIX}`;
-
-const loadFromStorage = (tableKey: string): number | null => {
-	try {
-		const raw = get(getStorageKey(tableKey));
-		if (!raw) {
-			return null;
-		}
-		const parsed = parseInt(raw, 10);
-		return Number.isNaN(parsed) ? null : parsed;
-	} catch {
-		return null;
-	}
-};
-
-const saveToStorage = (tableKey: string, pageSize: number | null): void => {
-	try {
-		const key = getStorageKey(tableKey);
-		if (pageSize === null) {
-			remove(key);
-		} else {
-			set(key, String(pageSize));
-		}
-	} catch {
-		// Ignore storage errors
-	}
-};
-
-export const usePreferredPageSizeStore = create<PreferredPageSizeState>()(
-	(set, get) => ({
-		tables: {},
-		setPreferredPageSize: (storageKey, pageSize): void => {
-			set({ tables: { ...get().tables, [storageKey]: pageSize } });
-			saveToStorage(storageKey, pageSize);
-		},
-	}),
-);
-
-export function usePreferredPageSize(
-	storageKey: string | undefined,
-): [number | null, (pageSize: number | null) => void] {
-	const pageSize = usePreferredPageSizeStore((s) => {
-		if (!storageKey) {
-			return null;
-		}
-		const cached = s.tables[storageKey];
-		if (cached !== undefined) {
-			return cached;
-		}
-		return loadFromStorage(storageKey);
-	});
-
-	const setPageSize = usePreferredPageSizeStore((s) => s.setPreferredPageSize);
-
-	const setPreferred = (size: number | null): void => {
-		if (storageKey) {
-			setPageSize(storageKey, size);
-		}
-	};
-
-	return [pageSize, setPreferred];
-}
-
-export function getPreferredPageSize(storageKey: string): number | null {
-	// oxlint-disable-next-line signoz/no-zustand-getstate-in-hooks
-	const state = usePreferredPageSizeStore.getState();
-	const cached = state.tables[storageKey];
-	if (cached !== undefined) {
-		return cached;
-	}
-
-	const stored = loadFromStorage(storageKey);
-	if (stored !== null) {
-		state.setPreferredPageSize(storageKey, stored);
-	}
-	return stored;
-}

frontend/src/components/TanStackTableView/useTableParams.ts

@@ -4,7 +4,6 @@ import { parseAsInteger, useQueryState } from 'nuqs';
 import { parseAsJsonNoValidate } from 'utils/nuqsParsers';
 
 import { SortState, TanstackTableQueryParamsConfig } from './types';
-import { usePreferredPageSize } from './usePreferredPageSize.store';
 
 const NUQS_OPTIONS = { history: 'push' as const };
 const DEFAULT_PAGE = 1;
@@ -21,15 +20,9 @@ type Defaults = {
 	limit?: number;
 	orderBy?: SortState | null;
 	expanded?: ExpandedState;
-	/** Storage key for persisting user's page size preference */
-	storageKey?: string;
-	/** Auto-calculated page size from container. URL initializes with this when available. */
-	calculatedPageSize?: number | null;
-	/** Clear URL params on unmount. Useful when navigating away from table views. */
-	cleanupOnUnmount?: boolean;
 };
 
-export type TableParamsResult = {
+type TableParamsResult = {
 	page: number;
 	limit: number;
 	orderBy: SortState | null;
@@ -106,23 +99,15 @@ export function useTableParams(
 				? (enableQueryParams.expanded ?? URL_KEYS_DEFAULT.expanded)
 				: URL_KEYS_DEFAULT.expanded;
 	const pageDefault = defaults?.page ?? DEFAULT_PAGE;
+	const limitDefault = defaults?.limit ?? DEFAULT_LIMIT;
 	const orderByDefault = defaults?.orderBy ?? null;
 	const expandedDefault = defaults?.expanded ?? {};
-	const storageKey = defaults?.storageKey;
-	const calculatedPageSize = defaults?.calculatedPageSize;
-	const cleanupOnUnmount = defaults?.cleanupOnUnmount ?? false;
 	const expandedDefaultArray = useMemo(
 		() => expandedStateToArray(expandedDefault),
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 		[],
 	);
 
-	const [preferredPageSize, setPreferredPageSize] =
-		usePreferredPageSize(storageKey);
-
-	const limitDefault =
-		preferredPageSize ?? calculatedPageSize ?? defaults?.limit ?? DEFAULT_LIMIT;
-
 	const [localPage, setLocalPage] = useState(pageDefault);
 	const [localLimit, setLocalLimit] = useState(limitDefault);
 	const [localOrderBy, setLocalOrderBy] = useState<SortState | null>(
@@ -135,71 +120,9 @@ export function useTableParams(
 		pageQueryParam,
 		parseAsInteger.withDefault(pageDefault).withOptions(NUQS_OPTIONS),
 	);
-	const [urlLimitRaw, setUrlLimitRaw] = useQueryState(
+	const [urlLimit, setUrlLimit] = useQueryState(
 		limitQueryParam,
-		parseAsInteger.withOptions(NUQS_OPTIONS),
-	);
-
-	// Track if URL had limit on initial mount
-	const hadUrlLimitOnMountRef = useRef<boolean | null>(null);
-	if (hadUrlLimitOnMountRef.current === null) {
-		hadUrlLimitOnMountRef.current = urlLimitRaw !== null;
-	}
-	const hadUrlLimit = hadUrlLimitOnMountRef.current ?? false;
-
-	const urlLimit = urlLimitRaw ?? limitDefault;
-
-	// Initialize URL with preferred/calculated when available (only if URL was empty)
-	const hasInitializedUrlRef = useRef(false);
-	useEffect(() => {
-		if (!useUrlForLimit || hasInitializedUrlRef.current || hadUrlLimit) {
-			return;
-		}
-
-		if (preferredPageSize !== null) {
-			hasInitializedUrlRef.current = true;
-			void setUrlLimitRaw(preferredPageSize);
-			return;
-		}
-		if (calculatedPageSize != null) {
-			hasInitializedUrlRef.current = true;
-			void setUrlLimitRaw(calculatedPageSize);
-		}
-	}, [
-		useUrlForLimit,
-		calculatedPageSize,
-		preferredPageSize,
-		hadUrlLimit,
-		setUrlLimitRaw,
-	]);
-
-	// Wrapped setLimit that persists preference when different from calculated
-	const setUrlLimit = useCallback(
-		(newLimit: number): void => {
-			if (storageKey) {
-				if (newLimit !== calculatedPageSize) {
-					setPreferredPageSize(newLimit);
-				} else {
-					setPreferredPageSize(null);
-				}
-			}
-			void setUrlLimitRaw(newLimit);
-		},
-		[storageKey, calculatedPageSize, setPreferredPageSize, setUrlLimitRaw],
-	);
-
-	const setLocalLimitWithPersist = useCallback(
-		(newLimit: number): void => {
-			if (storageKey) {
-				if (newLimit !== calculatedPageSize) {
-					setPreferredPageSize(newLimit);
-				} else {
-					setPreferredPageSize(null);
-				}
-			}
-			setLocalLimit(newLimit);
-		},
-		[storageKey, calculatedPageSize, setPreferredPageSize],
+		parseAsInteger.withDefault(limitDefault).withOptions(NUQS_OPTIONS),
 	);
 	const [urlOrderBy, setUrlOrderBy] = useQueryState(
 		orderByQueryParam,
@@ -232,7 +155,7 @@ export function useTableParams(
 				typeof updaterOrValue === 'function'
 					? updaterOrValue(urlExpandedRef.current)
 					: updaterOrValue;
-			void setUrlExpandedArray(expandedStateToArray(newState));
+			setUrlExpandedArray(expandedStateToArray(newState));
 		},
 		[setUrlExpandedArray],
 	);
@@ -249,53 +172,21 @@ export function useTableParams(
 		[],
 	);
 
+	const orderByDefaultMemoKey = `${orderByDefault?.columnName}${orderByDefault?.order}`;
 	const orderByUrlMemoKey = `${urlOrderBy?.columnName}${urlOrderBy?.order}`;
-	const prevOrderByRef = useRef<string | null>(null);
 
 	useEffect(() => {
-		// Only reset page when orderBy actually changes, not on initial mount
-		if (
-			prevOrderByRef.current !== null &&
-			prevOrderByRef.current !== orderByUrlMemoKey
-		) {
-			if (useUrlForPage) {
-				void setUrlPage(pageDefault);
-			} else {
-				setLocalPage(pageDefault);
-			}
+		if (useUrlForPage) {
+			setUrlPage(pageDefault);
+		} else {
+			setLocalPage(pageDefault);
 		}
-		prevOrderByRef.current = orderByUrlMemoKey;
-	}, [useUrlForPage, orderByUrlMemoKey, pageDefault, setUrlPage]);
-
-	useEffect(() => {
-		if (!cleanupOnUnmount) {
-			return;
-		}
-
-		return (): void => {
-			if (useUrlForPage) {
-				void setUrlPage(null);
-			}
-			if (useUrlForLimit) {
-				void setUrlLimitRaw(null);
-			}
-			if (useUrlForOrderBy) {
-				void setUrlOrderBy(null);
-			}
-			if (useUrlForExpanded) {
-				void setUrlExpandedArray(null);
-			}
-		};
 	}, [
-		cleanupOnUnmount,
 		useUrlForPage,
-		useUrlForLimit,
-		useUrlForOrderBy,
-		useUrlForExpanded,
+		orderByDefaultMemoKey,
+		orderByUrlMemoKey,
+		pageDefault,
 		setUrlPage,
-		setUrlLimitRaw,
-		setUrlOrderBy,
-		setUrlExpandedArray,
 	]);
 
 	return {
@@ -304,7 +195,7 @@ export function useTableParams(
 		orderBy: (useUrlForOrderBy ? urlOrderBy : localOrderBy) as SortState | null,
 		expanded: useUrlForExpanded ? urlExpanded : localExpanded,
 		setPage: useUrlForPage ? setUrlPage : setLocalPage,
-		setLimit: useUrlForLimit ? setUrlLimit : setLocalLimitWithPersist,
+		setLimit: useUrlForLimit ? setUrlLimit : setLocalLimit,
 		setOrderBy: useUrlForOrderBy ? setUrlOrderBy : setLocalOrderBy,
 		setExpanded: useUrlForExpanded ? setUrlExpanded : handleSetLocalExpanded,
 	};

frontend/src/components/TanStackTableView/utils.ts

@@ -2,7 +2,6 @@ import type { CSSProperties, ReactNode } from 'react';
 import type { ColumnDef } from '@tanstack/react-table';
 
 import { RowKeyData, TableColumnDef } from './types';
-import { ComboboxSimpleItem } from '@signozhq/ui/combobox';
 
 export const getColumnId = <TData>(column: TableColumnDef<TData>): string =>
 	column.id;
@@ -35,7 +34,7 @@ export const getColumnWidthStyle = <TData>(
 	isLastColumn?: boolean,
 ): CSSProperties => {
 	// Last column always fills remaining space
-	if (isLastColumn && column?.width?.ignoreLastColumnFill !== true) {
+	if (isLastColumn) {
 		return {
 			width: '100%',
 			minWidth: persistedWidth ?? column?.width?.min,
@@ -146,31 +145,3 @@ export function buildTanstackColumnDef<TData>(
 		},
 	};
 }
-
-const DEFAULT_PAGE_SIZES = [10, 20, 30, 50, 100];
-
-export function buildPageSizeItems(
-	calculatedSize?: number | null,
-): ComboboxSimpleItem[] {
-	const items: ComboboxSimpleItem[] = [];
-
-	if (calculatedSize) {
-		items.push({
-			value: calculatedSize.toString(),
-			label: `Auto (${calculatedSize})`,
-			displayValue: calculatedSize.toString(),
-		});
-	}
-
-	for (const size of DEFAULT_PAGE_SIZES) {
-		if (size !== calculatedSize) {
-			items.push({
-				value: size.toString(),
-				label: size.toString(),
-				displayValue: size.toString(),
-			});
-		}
-	}
-
-	return items;
-}

frontend/src/components/createGuardedRoute/createGuardedRoute.test.tsx

@@ -1,33 +1,16 @@
 import { ReactElement } from 'react';
 import type { RouteComponentProps } from 'react-router-dom';
-import {
+import type {
 	AuthtypesGettableTransactionDTO,
 	AuthtypesTransactionDTO,
 } from 'api/generated/services/sigNoz.schemas';
-import { ENVIRONMENT } from 'constants/env';
 import { server } from 'mocks-server/server';
 import { rest } from 'msw';
 import { render, screen, waitFor } from 'tests/test-utils';
+import { AUTHZ_CHECK_URL, authzMockResponse } from 'tests/authz-test-utils';
 
 import { createGuardedRoute } from './createGuardedRoute';
 
-const BASE_URL = ENVIRONMENT.baseURL || '';
-const AUTHZ_CHECK_URL = `${BASE_URL}/api/v1/authz/check`;
-
-function authzMockResponse(
-	payload: AuthtypesTransactionDTO[],
-	authorizedByIndex: boolean[],
-): { data: AuthtypesGettableTransactionDTO[]; status: string } {
-	return {
-		data: payload.map((txn, i) => ({
-			relation: txn.relation,
-			object: txn.object,
-			authorized: authorizedByIndex[i] ?? false,
-		})),
-		status: 'success',
-	};
-}
-
 describe('createGuardedRoute', () => {
 	const TestComponent = ({ testProp }: { testProp: string }): ReactElement => (
 		<div>Test Component: {testProp}</div>

frontend/src/components/createGuardedRoute/createGuardedRoute.tsx

@@ -34,7 +34,7 @@ function OnNoPermissionsFallback(response: {
 					<br />
 					Object: <span>{object}</span>
 					<br />
-					Ask your SigNoz administrator to grant access.
+					Please ask your SigNoz administrator to grant access.
 				</p>
 			</div>
 		</div>

frontend/src/constants/queryBuilder.ts

@@ -431,6 +431,31 @@ export const OPERATORS = {
 	NOTILIKE: 'NOT_ILIKE',
 };
 
+/**
+ * Maps short-form InfraMonitoring operators to long-form display labels.
+ * InfraMonitoring backend uses short forms (NIN), UI displays long forms (NOT_IN).
+ */
+export const INFRA_SHORT_TO_LONG_OPERATOR_MAP: Record<string, string> = {
+	NIN: 'NOT_IN',
+	NLIKE: 'NOT_LIKE',
+	NOTILIKE: 'NOT_ILIKE',
+	NREGEX: 'NOT_REGEX',
+	NEXISTS: 'NOT_EXISTS',
+	NCONTAINS: 'NOT_CONTAINS',
+};
+
+/**
+ * Maps long-form operators to short-form for InfraMonitoring API.
+ */
+export const INFRA_LONG_TO_SHORT_OPERATOR_MAP: Record<string, string> = {
+	NOT_IN: 'NIN',
+	NOT_LIKE: 'NLIKE',
+	NOT_ILIKE: 'NOTILIKE',
+	NOT_REGEX: 'NREGEX',
+	NOT_EXISTS: 'NEXISTS',
+	NOT_CONTAINS: 'NCONTAINS',
+};
+
 export const QUERY_BUILDER_OPERATORS_BY_TYPES = {
 	string: [
 		OPERATORS['='],

frontend/src/container/ListAlertRules/AlertsEmptyState/AlertInfoCard.tsx

@@ -2,8 +2,6 @@ import { ArrowRight } from '@signozhq/icons';
 import { Typography } from '@signozhq/ui/typography';
 import { openInNewTab } from 'utils/navigation';
 
-import styles from './AlertsEmptyState.module.scss';
-
 interface AlertInfoCardProps {
 	header: string;
 	subheader: string;
@@ -19,17 +17,17 @@ function AlertInfoCard({
 }: AlertInfoCardProps): JSX.Element {
 	return (
 		<div
-			className={styles.alertInfoCard}
+			className="alert-info-card"
 			onClick={(): void => {
 				onClick();
 				openInNewTab(link);
 			}}
 		>
-			<div className={styles.alertCardText}>
-				<Typography.Text className={styles.alertCardTextHeader}>
+			<div className="alert-card-text">
+				<Typography.Text className="alert-card-text-header">
 					{header}
 				</Typography.Text>
-				<Typography.Text className={styles.alertCardTextSubheader}>
+				<Typography.Text className="alert-card-text-subheader">
 					{subheader}
 				</Typography.Text>
 			</div>

frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.module.scss

@@ -1,189 +0,0 @@
-.alertListContainer {
-	margin-top: auto;
-	margin-bottom: auto;
-	display: flex;
-	justify-content: center;
-	width: 100%;
-}
-
-.alertListViewContent {
-	width: calc(100% - 30px);
-	max-width: 836px;
-}
-
-.title {
-	color: var(--l1-foreground);
-	font-size: var(--font-size-lg);
-	font-style: normal;
-	font-weight: var(--font-weight-normal);
-	line-height: 28px;
-	letter-spacing: -0.09px;
-}
-
-.subtitle {
-	color: var(--l2-foreground);
-	font-size: var(--font-size-sm);
-	font-style: normal;
-	font-weight: var(--font-weight-normal);
-	line-height: 20px;
-	letter-spacing: -0.07px;
-}
-
-.emptyAlertInfoContainer {
-	display: flex;
-	padding: 71px 193.5px;
-	justify-content: center;
-	align-items: center;
-	border-radius: 6px;
-	border: 1px dashed var(--l1-border);
-	margin-top: 16px;
-}
-
-.alertContent {
-	display: flex;
-	flex-direction: column;
-	align-items: flex-start;
-	gap: 12px;
-}
-
-.heading {
-	display: flex;
-	flex-direction: column;
-	gap: 4px;
-}
-
-.icons {
-	color: white;
-}
-
-.emptyAlertAction {
-	color: var(--l2-foreground);
-	font-family: Inter;
-	font-size: 14px;
-	font-style: normal;
-	font-weight: 400;
-	line-height: 24px;
-	letter-spacing: -0.07px;
-}
-
-.emptyInfo {
-	color: var(--l1-foreground);
-	font-family: Inter;
-	font-size: 14px;
-	font-style: normal;
-	font-weight: 500;
-	line-height: 24px;
-	letter-spacing: -0.07px;
-}
-
-.actionContainer {
-	display: flex;
-	gap: 24px;
-	align-items: center;
-	padding-top: 24px;
-	padding-bottom: 24px;
-	width: 100%;
-}
-
-.buttonGroup {
-	display: flex;
-	gap: 8px;
-}
-
-.buttonContent {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	gap: 4px;
-}
-
-.getStartedText {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	gap: 16px;
-	margin-top: 24px;
-	margin-bottom: 24px;
-	width: 100%;
-
-	:global(.ant-divider)::before,
-	:global(.ant-divider)::after {
-		border-bottom: 2px dotted var(--l1-border);
-		border-top: 2px dotted var(--l1-border);
-		height: 8px;
-	}
-
-	:global(.ant-typography) {
-		color: var(--l2-foreground);
-		font-family: Inter;
-		font-size: 12px;
-		font-style: normal;
-		font-weight: 500;
-		line-height: 20px;
-		letter-spacing: 0.48px;
-		text-transform: uppercase;
-		padding-top: 8px;
-	}
-}
-
-.alertInfoCard {
-	display: flex;
-	padding: 16px;
-	justify-content: space-between;
-	align-items: center;
-	border-radius: 6px;
-	border: 1px solid var(--l1-border);
-	background: var(--l2-background);
-	margin-bottom: 16px;
-
-	&:hover {
-		cursor: pointer;
-	}
-}
-
-.alertCardText {
-	display: flex;
-	gap: 2px;
-	flex-direction: column;
-}
-
-.alertCardTextHeader {
-	color: var(--l1-foreground);
-	font-family: Inter;
-	font-size: 14px;
-	font-style: normal;
-	font-weight: 500;
-	line-height: 20px;
-	letter-spacing: -0.07px;
-}
-
-.alertCardTextSubheader {
-	color: var(--l2-foreground);
-	font-family: Inter;
-	font-size: 12px;
-	font-style: normal;
-	font-weight: 400;
-	line-height: 18px;
-}
-
-.infoText {
-	color: var(--primary);
-	font-family: Inter;
-	font-size: 12px;
-	font-style: normal;
-	font-weight: 500;
-	line-height: 16px;
-	letter-spacing: -0.06px;
-	margin: 0 8px;
-	white-space: nowrap;
-}
-
-.infoLinkContainer {
-	svg {
-		color: var(--primary);
-	}
-
-	&:hover {
-		cursor: pointer;
-	}
-}

frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.styles.scss

@@ -0,0 +1,178 @@
+.alert-list-container {
+	margin-top: 104px;
+	margin-bottom: 30px;
+	display: flex;
+	justify-content: center;
+	width: 100%;
+
+	.alert-list-view-content {
+		width: calc(100% - 30px);
+		max-width: 836px;
+
+		.alert-list-title-container {
+			.title {
+				color: var(--l1-foreground);
+				font-size: var(--font-size-lg);
+				font-style: normal;
+				font-weight: var(--font-weight-normal);
+				line-height: 28px; /* 155.556% */
+				letter-spacing: -0.09px;
+			}
+
+			.subtitle {
+				color: var(--l2-foreground);
+				font-size: var(--font-size-sm);
+				font-style: normal;
+				font-weight: var(--font-weight-normal);
+				line-height: 20px; /* 142.857% */
+				letter-spacing: -0.07px;
+			}
+		}
+
+		.empty-alert-info-container {
+			display: flex;
+			padding: 71px 193.5px;
+			justify-content: center;
+			align-items: center;
+			border-radius: 6px;
+			border: 1px dashed var(--l1-border);
+			margin-top: 16px;
+
+			.alert-content {
+				display: flex;
+				flex-direction: column;
+				align-items: flex-start;
+				gap: 12px;
+
+				.heading {
+					display: flex;
+					flex-direction: column;
+					gap: 4px;
+
+					.icons {
+						color: white;
+					}
+
+					.empty-alert-action {
+						color: var(--l2-foreground);
+						font-family: Inter;
+						font-size: 14px;
+						font-style: normal;
+						font-weight: 400;
+						line-height: 24px; /* 171.429% */
+						letter-spacing: -0.07px;
+					}
+
+					.empty-info {
+						color: var(--l1-foreground);
+						font-family: Inter;
+						font-size: 14px;
+						font-style: normal;
+						font-weight: 500;
+						line-height: 24px;
+						letter-spacing: -0.07px;
+					}
+				}
+
+				.action-container {
+					display: flex;
+					gap: 24px;
+					align-items: center;
+					padding-top: 24px;
+					padding-bottom: 24px;
+					width: 100%;
+				}
+			}
+		}
+
+		.get-started-text {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			gap: 16px;
+			margin-top: 24px;
+			margin-bottom: 24px;
+			width: 100%;
+
+			.ant-divider::before,
+			.ant-divider::after {
+				border-bottom: 2px dotted var(--l1-border);
+				border-top: 2px dotted var(--l1-border);
+				height: 8px;
+			}
+
+			.ant-typography {
+				color: var(--l2-foreground);
+				font-family: Inter;
+				font-size: 12px;
+				font-style: normal;
+				font-weight: 500;
+				line-height: 20px; /* 166.667% */
+				letter-spacing: 0.48px;
+				text-transform: uppercase;
+				padding-top: 8px;
+			}
+		}
+
+		.alert-info-card {
+			display: flex;
+			padding: 16px;
+			justify-content: space-between;
+			align-items: center;
+
+			border-radius: 6px;
+			border: 1px solid var(--l1-border);
+			background: var(--l2-background);
+			margin-bottom: 16px;
+
+			&:hover {
+				cursor: pointer;
+			}
+
+			.alert-card-text {
+				display: flex;
+				gap: 2px;
+				flex-direction: column;
+
+				.alert-card-text-header {
+					color: var(--l1-foreground);
+					font-family: Inter;
+					font-size: 14px;
+					font-style: normal;
+					font-weight: 500;
+					line-height: 20px; /* 142.857% */
+					letter-spacing: -0.07px;
+				}
+
+				.alert-card-text-subheader {
+					color: var(--l2-foreground);
+					font-family: Inter;
+					font-size: 12px;
+					font-style: normal;
+					font-weight: 400;
+					line-height: 18px; /* 150% */
+				}
+			}
+		}
+	}
+}
+
+.info-text {
+	color: var(--bg-robin-400) !important;
+	font-family: Inter;
+	font-size: 12px;
+	font-style: normal;
+	font-weight: 500;
+	line-height: 16px; /* 133.333% */
+	letter-spacing: -0.06px;
+}
+
+.info-link-container {
+	.anticon {
+		color: var(--bg-robin-400);
+	}
+
+	:hover {
+		cursor: pointer;
+	}
+}

frontend/src/container/ListAlertRules/AlertsEmptyState/AlertsEmptyState.tsx

@@ -1,7 +1,6 @@
 import React, { useCallback, useState } from 'react';
-import { Plus, RefreshCw } from '@signozhq/icons';
-import { Divider } from 'antd';
-import { Button } from '@signozhq/ui/button';
+import { Plus } from '@signozhq/icons';
+import { Button, Divider, Flex } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import ROUTES from 'constants/routes';
@@ -17,7 +16,7 @@ import AlertInfoCard from './AlertInfoCard';
 import { ALERT_CARDS, ALERT_INFO_LINKS } from './alertLinks';
 import InfoLinkText from './InfoLinkText';
 
-import styles from './AlertsEmptyState.module.scss';
+import './AlertsEmptyState.styles.scss';
 
 const alertLogEvents = (
 	title: string,
@@ -29,16 +28,10 @@ const alertLogEvents = (
 		page: 'Alert empty state page',
 	};
 
-	void logEvent(title, dataSource ? { ...attributes, dataSource } : attributes);
+	logEvent(title, dataSource ? { ...attributes, dataSource } : attributes);
 };
 
-interface AlertsEmptyStateProps {
-	onRefresh?: () => void;
-}
-
-export function AlertsEmptyState({
-	onRefresh,
-}: AlertsEmptyStateProps): JSX.Element {
+export function AlertsEmptyState(): JSX.Element {
 	const { user } = useAppContext();
 	const { safeNavigate } = useSafeNavigate();
 	const [addNewAlert] = useComponentPermission(
@@ -57,51 +50,45 @@ export function AlertsEmptyState({
 	);
 
 	return (
-		<div className={styles.alertListContainer}>
-			<div className={styles.alertListViewContent}>
-				<div>
-					<Typography.Title className={styles.title}>Alert Rules</Typography.Title>
-					<Typography.Text className={styles.subtitle}>
+		<div className="alert-list-container">
+			<div className="alert-list-view-content">
+				<div className="alert-list-title-container">
+					<Typography.Title className="title">Alert Rules</Typography.Title>
+					<Typography.Text className="subtitle">
 						Create and manage alert rules for your resources.
 					</Typography.Text>
 				</div>
-				<section className={styles.emptyAlertInfoContainer}>
-					<div className={styles.alertContent}>
-						<section className={styles.heading}>
+				<section className="empty-alert-info-container">
+					<div className="alert-content">
+						<section className="heading">
 							<img
 								src={alertEmojiUrl}
 								alt="alert-header"
 								style={{ height: '32px', width: '32px' }}
 							/>
 							<div>
-								<Typography.Text className={styles.emptyInfo}>
+								<Typography.Text className="empty-info">
 									No Alert rules yet.{' '}
 								</Typography.Text>
-								<br />
-								<Typography.Text className={styles.emptyAlertAction}>
+								<Typography.Text className="empty-alert-action">
 									Create an Alert Rule to get started
 								</Typography.Text>
 							</div>
 						</section>
-						<div className={styles.actionContainer}>
-							<div className={styles.buttonGroup}>
-								<Button
-									onClick={onClickNewAlertHandler}
-									disabled={!addNewAlert}
-									loading={loading}
-									data-testid="add-alert"
-								>
-									<span className={styles.buttonContent}>
-										<Plus size="md" />
-										New Alert Rule
-									</span>
-								</Button>
-								{onRefresh && (
-									<Button onClick={onRefresh} prefix={<RefreshCw />} color="secondary">
-										Refresh
-									</Button>
-								)}
-							</div>
+						<div className="action-container">
+							<Button
+								className="add-alert-btn"
+								onClick={onClickNewAlertHandler}
+								disabled={!addNewAlert}
+								loading={loading}
+								type="primary"
+								data-testid="add-alert"
+							>
+								<Flex align="center" justify="center" gap={4}>
+									<Plus size="md" />
+									New Alert Rule
+								</Flex>
+							</Button>
 							<InfoLinkText
 								infoText="Watch a tutorial on creating a sample alert"
 								link="https://youtu.be/xjxNIqiv4_M"
@@ -136,9 +123,11 @@ export function AlertsEmptyState({
 						})}
 					</div>
 				</section>
-				<div className={styles.getStartedText}>
+				<div className="get-started-text">
 					<Divider>
-						<Typography.Text>Or get started with these sample alerts</Typography.Text>
+						<Typography.Text className="get-started-text">
+							Or get started with these sample alerts
+						</Typography.Text>
 					</Divider>
 				</div>
 

frontend/src/container/ListAlertRules/AlertsEmptyState/InfoLinkText.tsx

@@ -3,8 +3,6 @@ import { Flex } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { openInNewTab } from 'utils/navigation';
 
-import styles from './AlertsEmptyState.module.scss';
-
 interface InfoLinkTextProps {
 	infoText: string;
 	link: string;
@@ -26,12 +24,12 @@ function InfoLinkText({
 				onClick();
 				openInNewTab(link);
 			}}
-			className={styles.infoLinkContainer}
+			className="info-link-container"
 		>
-			{leftIconVisible && <CirclePlay size={16} />}
-			<Typography.Text className={styles.infoText}>{infoText}</Typography.Text>
+			{leftIconVisible && <CirclePlay size="md" />}
+			<Typography.Text className="info-text">{infoText}</Typography.Text>
 			{rightIconVisible && (
-				<ArrowRight size={16} style={{ transform: 'rotate(315deg)' }} />
+				<ArrowRight size="md" style={{ transform: 'rotate(315deg)' }} />
 			)}
 		</Flex>
 	);

frontend/src/container/ListAlertRules/DeleteAlert.tsx

@@ -0,0 +1,86 @@
+import { Dispatch, SetStateAction, useState } from 'react';
+import type { NotificationInstance } from 'antd/es/notification/interface';
+import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
+import { deleteRuleByID } from 'api/generated/services/rules';
+import type {
+	RenderErrorResponseDTO,
+	RuletypesRuleDTO,
+} from 'api/generated/services/sigNoz.schemas';
+import { AxiosError } from 'axios';
+import { State } from 'hooks/useFetch';
+import { useErrorModal } from 'providers/ErrorModalProvider';
+import { PayloadProps as DeleteAlertPayloadProps } from 'types/api/alerts/delete';
+import APIError from 'types/api/error';
+
+import { ColumnButton } from './styles';
+
+function DeleteAlert({
+	id,
+	setData,
+	notifications,
+}: DeleteAlertProps): JSX.Element {
+	const [deleteAlertState, setDeleteAlertState] = useState<
+		State<DeleteAlertPayloadProps>
+	>({
+		error: false,
+		errorMessage: '',
+		loading: false,
+		success: false,
+		payload: undefined,
+	});
+
+	const { showErrorModal } = useErrorModal();
+
+	const onDeleteHandler = async (id: string): Promise<void> => {
+		try {
+			await deleteRuleByID({ id });
+
+			setData((state) => state.filter((alert) => alert.id !== id));
+
+			setDeleteAlertState((state) => ({
+				...state,
+				loading: false,
+			}));
+			notifications.success({
+				message: 'Success',
+			});
+		} catch (error) {
+			setDeleteAlertState((state) => ({
+				...state,
+				loading: false,
+				error: true,
+			}));
+
+			showErrorModal(
+				convertToApiError(error as AxiosError<RenderErrorResponseDTO>) as APIError,
+			);
+		}
+	};
+
+	const onClickHandler = (): void => {
+		setDeleteAlertState((state) => ({
+			...state,
+			loading: true,
+		}));
+		onDeleteHandler(id);
+	};
+
+	return (
+		<ColumnButton
+			disabled={deleteAlertState.loading || false}
+			loading={deleteAlertState.loading || false}
+			onClick={onClickHandler}
+			type="link"
+		>
+			Delete
+		</ColumnButton>
+	);
+}
+
+interface DeleteAlertProps {
+	id: string;
+	setData: Dispatch<SetStateAction<RuletypesRuleDTO[]>>;
+	notifications: NotificationInstance;
+}
+
+export default DeleteAlert;

frontend/src/container/ListAlertRules/ListAlert.tsx

@@ -0,0 +1,429 @@
+import React, { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { UseQueryResult } from 'react-query';
+import { Button, Flex, Input } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import { Plus } from '@signozhq/icons';
+import type { ColumnsType } from 'antd/es/table/interface';
+import logEvent from 'api/common/logEvent';
+import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
+import { createRule } from 'api/generated/services/rules';
+import type {
+	ListRules200,
+	RenderErrorResponseDTO,
+	RuletypesRuleDTO,
+} from 'api/generated/services/sigNoz.schemas';
+import type { ErrorType } from 'api/generatedAPIInstance';
+import { AxiosError } from 'axios';
+import DropDown from 'components/DropDown/DropDown';
+import {
+	DynamicColumnsKey,
+	TableDataSource,
+} from 'components/ResizeTable/contants';
+import DynamicColumnTable from 'components/ResizeTable/DynamicColumnTable';
+import DateComponent from 'components/ResizeTable/TableComponent/DateComponent';
+import LabelColumn from 'components/TableRenderer/LabelColumn';
+import TextToolTip from 'components/TextToolTip';
+import { QueryParams } from 'constants/query';
+import ROUTES from 'constants/routes';
+import { sanitizeDefaultAlertQuery } from 'container/EditAlertV2/utils';
+import useSortableTable from 'hooks/ResizeTable/useSortableTable';
+import useComponentPermission from 'hooks/useComponentPermission';
+import useDebouncedFn from 'hooks/useDebouncedFunction';
+import useInterval from 'hooks/useInterval';
+import { useNotifications } from 'hooks/useNotifications';
+import { useSafeNavigate } from 'hooks/useSafeNavigate';
+import useUrlQuery from 'hooks/useUrlQuery';
+import { mapQueryDataFromApi } from 'lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi';
+import { useAppContext } from 'providers/App/App';
+import { useErrorModal } from 'providers/ErrorModalProvider';
+import { toCompositeMetricQuery } from 'types/api/alerts/convert';
+import APIError from 'types/api/error';
+import { isModifierKeyPressed } from 'utils/app';
+
+import DeleteAlert from './DeleteAlert';
+import { ColumnButton, SearchContainer } from './styles';
+import Status from './TableComponents/Status';
+import ToggleAlertState from './ToggleAlertState';
+import { alertActionLogEvent, filterAlerts } from './utils';
+
+const { Search } = Input;
+
+function ListAlert({ allAlertRules, refetch }: ListAlertProps): JSX.Element {
+	const { t } = useTranslation('common');
+	const { safeNavigate } = useSafeNavigate();
+	const { user } = useAppContext();
+	const [addNewAlert, action] = useComponentPermission(
+		['add_new_alert', 'action'],
+		user.role,
+	);
+
+	const [editLoader, setEditLoader] = useState<boolean>(false);
+	const [cloneLoader, setCloneLoader] = useState<boolean>(false);
+
+	const params = useUrlQuery();
+	const orderColumnParam = params.get('columnKey');
+	const orderQueryParam = params.get('order');
+	const paginationParam = params.get('page');
+	const searchParams = params.get('search');
+	const [searchString, setSearchString] = useState<string>(searchParams || '');
+	const [data, setData] = useState<RuletypesRuleDTO[]>(() => {
+		const value = searchString.toLowerCase();
+		const filteredData = filterAlerts(allAlertRules, value);
+		return filteredData || [];
+	});
+
+	// Type asuring
+	const sortingOrder: 'ascend' | 'descend' | null =
+		orderQueryParam === 'ascend' || orderQueryParam === 'descend'
+			? orderQueryParam
+			: null;
+
+	const { sortedInfo, handleChange } = useSortableTable<RuletypesRuleDTO>(
+		sortingOrder,
+		orderColumnParam || '',
+		searchString,
+	);
+
+	const { notifications: notificationsApi } = useNotifications();
+
+	useInterval(() => {
+		(async (): Promise<void> => {
+			const { data: refetchData, status } = await refetch();
+			if (status === 'success') {
+				const value = searchString.toLowerCase();
+				const filteredData = filterAlerts(refetchData?.data ?? [], value);
+				setData(filteredData || []);
+			}
+			if (status === 'error') {
+				notificationsApi.error({
+					message: t('something_went_wrong'),
+				});
+			}
+		})();
+	}, 30000);
+
+	const { showErrorModal } = useErrorModal();
+
+	const onClickNewAlertHandler = useCallback(
+		(e: React.MouseEvent): void => {
+			logEvent('Alert: New alert button clicked', {
+				number: allAlertRules?.length,
+				layout: 'new',
+			});
+			safeNavigate(ROUTES.ALERT_TYPE_SELECTION, {
+				newTab: isModifierKeyPressed(e),
+			});
+		},
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+		[],
+	);
+
+	const onEditHandler = (
+		record: RuletypesRuleDTO,
+		options?: { newTab?: boolean },
+	): void => {
+		const compositeQuery = sanitizeDefaultAlertQuery(
+			mapQueryDataFromApi(toCompositeMetricQuery(record.condition.compositeQuery)),
+			record.alertType,
+		);
+		params.set(
+			QueryParams.compositeQuery,
+			encodeURIComponent(JSON.stringify(compositeQuery)),
+		);
+
+		const panelType = record.condition.compositeQuery.panelType;
+		if (panelType) {
+			params.set(QueryParams.panelTypes, panelType);
+		}
+
+		params.set(QueryParams.ruleId, record.id);
+
+		setEditLoader(false);
+
+		safeNavigate(`${ROUTES.ALERT_OVERVIEW}?${params.toString()}`, {
+			newTab: options?.newTab,
+		});
+	};
+
+	const onCloneHandler =
+		(originalAlert: RuletypesRuleDTO) => async (): Promise<void> => {
+			const copyAlert: RuletypesRuleDTO = {
+				...originalAlert,
+				alert: `${originalAlert.alert} - Copy`,
+			};
+
+			try {
+				setCloneLoader(true);
+				await createRule(copyAlert);
+
+				notificationsApi.success({
+					message: 'Success',
+					description: 'Alert cloned successfully',
+				});
+
+				const { data: refetchData, status } = await refetch();
+				const rules = refetchData?.data;
+				if (status === 'success' && rules) {
+					setData(rules);
+					setTimeout(() => {
+						const clonedAlert = rules[rules.length - 1];
+						params.set(QueryParams.ruleId, String(clonedAlert.id));
+						safeNavigate(`${ROUTES.EDIT_ALERTS}?${params.toString()}`);
+					}, 2000);
+				}
+				if (status === 'error') {
+					notificationsApi.error({
+						message: t('something_went_wrong'),
+					});
+				}
+			} catch (error) {
+				showErrorModal(
+					convertToApiError(error as AxiosError<RenderErrorResponseDTO>) as APIError,
+				);
+			} finally {
+				setCloneLoader(false);
+			}
+		};
+
+	const handleSearch = useDebouncedFn((e: unknown) => {
+		const value = (e as React.BaseSyntheticEvent).target.value.toLowerCase();
+		setSearchString(value);
+		const filteredData = filterAlerts(allAlertRules, value);
+		setData(filteredData);
+	});
+
+	const dynamicColumns: ColumnsType<RuletypesRuleDTO> = [
+		{
+			title: 'Created At',
+			dataIndex: 'createdAt',
+			width: 80,
+			key: DynamicColumnsKey.CreatedAt,
+			align: 'center',
+			sorter: (a: RuletypesRuleDTO, b: RuletypesRuleDTO): number => {
+				const prev = a.createdAt ? new Date(a.createdAt).getTime() : 0;
+				const next = b.createdAt ? new Date(b.createdAt).getTime() : 0;
+
+				return prev - next;
+			},
+			render: DateComponent,
+			sortOrder:
+				sortedInfo.columnKey === DynamicColumnsKey.CreatedAt
+					? sortedInfo.order
+					: null,
+		},
+		{
+			title: 'Created By',
+			dataIndex: 'createdBy',
+			width: 80,
+			key: DynamicColumnsKey.CreatedBy,
+			align: 'center',
+		},
+		{
+			title: 'Updated At',
+			dataIndex: 'updatedAt',
+			width: 80,
+			key: DynamicColumnsKey.UpdatedAt,
+			align: 'center',
+			sorter: (a: RuletypesRuleDTO, b: RuletypesRuleDTO): number => {
+				const prev = a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
+				const next = b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
+
+				return prev - next;
+			},
+			render: DateComponent,
+			sortOrder:
+				sortedInfo.columnKey === DynamicColumnsKey.UpdatedAt
+					? sortedInfo.order
+					: null,
+		},
+		{
+			title: 'Updated By',
+			dataIndex: 'updatedBy',
+			width: 80,
+			key: DynamicColumnsKey.UpdatedBy,
+			align: 'center',
+		},
+	];
+
+	const columns: ColumnsType<RuletypesRuleDTO> = [
+		{
+			title: 'Status',
+			dataIndex: 'state',
+			width: 80,
+			key: 'state',
+			sorter: (a, b): number =>
+				(b.state ? b.state.charCodeAt(0) : 1000) -
+				(a.state ? a.state.charCodeAt(0) : 1000),
+			render: (value): JSX.Element => <Status status={value} />,
+			sortOrder: sortedInfo.columnKey === 'state' ? sortedInfo.order : null,
+		},
+		{
+			title: 'Alert Name',
+			dataIndex: 'alert',
+			width: 100,
+			key: 'name',
+			sorter: (alertA, alertB): number => {
+				if (alertA.alert && alertB.alert) {
+					return alertA.alert.localeCompare(alertB.alert);
+				}
+				return 0;
+			},
+			render: (value, record): JSX.Element => {
+				const onClickHandler = (e: React.MouseEvent<HTMLElement>): void => {
+					e.stopPropagation();
+					e.preventDefault();
+					onEditHandler(record, { newTab: isModifierKeyPressed(e) });
+				};
+
+				return <Typography.Link onClick={onClickHandler}>{value}</Typography.Link>;
+			},
+			sortOrder: sortedInfo.columnKey === 'name' ? sortedInfo.order : null,
+		},
+		{
+			title: 'Severity',
+			dataIndex: 'labels',
+			width: 80,
+			key: 'severity',
+			sorter: (a, b): number =>
+				(a?.labels?.severity?.length || 0) - (b?.labels?.severity?.length || 0),
+			render: (value): JSX.Element => {
+				const objectKeys = value ? Object.keys(value) : [];
+				const withSeverityKey = objectKeys.find((e) => e === 'severity') || '';
+				const severityValue = withSeverityKey ? value[withSeverityKey] : '-';
+
+				return <Typography>{severityValue}</Typography>;
+			},
+			sortOrder: sortedInfo.columnKey === 'severity' ? sortedInfo.order : null,
+		},
+		{
+			title: 'Labels',
+			dataIndex: 'labels',
+			key: 'tags',
+			align: 'center',
+			width: 100,
+			render: (value): JSX.Element => {
+				const objectKeys = value ? Object.keys(value) : [];
+				const withOutSeverityKeys = objectKeys.filter((e) => e !== 'severity');
+
+				if (withOutSeverityKeys.length === 0) {
+					return <Typography>-</Typography>;
+				}
+
+				return (
+					<LabelColumn labels={withOutSeverityKeys} value={value} color="magenta" />
+				);
+			},
+		},
+	];
+
+	if (action) {
+		columns.push({
+			title: 'Action',
+			dataIndex: 'id',
+			key: 'action',
+			width: 10,
+			render: (id: RuletypesRuleDTO['id'], record): JSX.Element => (
+				<div data-testid="alert-actions">
+					<DropDown
+						onDropDownItemClick={(item): void =>
+							alertActionLogEvent(item.key, record)
+						}
+						element={[
+							<ToggleAlertState
+								key="1"
+								disabled={record.disabled ?? false}
+								setData={setData}
+								id={id ?? ''}
+							/>,
+							<ColumnButton
+								key="2"
+								onClick={(e: React.MouseEvent): void =>
+									onEditHandler(record, { newTab: isModifierKeyPressed(e) })
+								}
+								type="link"
+								loading={editLoader}
+							>
+								Edit
+							</ColumnButton>,
+							<ColumnButton
+								key="3"
+								onClick={(): void => onEditHandler(record, { newTab: true })}
+								type="link"
+								loading={editLoader}
+							>
+								Edit in New Tab
+							</ColumnButton>,
+							<ColumnButton
+								key="3"
+								onClick={onCloneHandler(record)}
+								type="link"
+								loading={cloneLoader}
+							>
+								Clone
+							</ColumnButton>,
+							<DeleteAlert
+								key="4"
+								notifications={notificationsApi}
+								setData={setData}
+								id={id ?? ''}
+							/>,
+						]}
+					/>
+				</div>
+			),
+		});
+	}
+
+	const paginationConfig = {
+		defaultCurrent: Number(paginationParam) || 1,
+	};
+	return (
+		<div className="alert-rules-list-container">
+			<SearchContainer>
+				<Search
+					placeholder="Search by Alert Name, Severity and Labels"
+					onChange={handleSearch}
+					defaultValue={searchString}
+				/>
+				<Flex gap={12} align="center">
+					{addNewAlert && (
+						<Button type="primary" onClick={onClickNewAlertHandler}>
+							<Flex align="center" gap={4}>
+								<Plus size="md" />
+								New Alert
+							</Flex>
+						</Button>
+					)}
+					<TextToolTip
+						{...{
+							text: `More details on how to create alerts`,
+							url: 'https://signoz.io/docs/alerts/?utm_source=product&utm_medium=list-alerts',
+							urlText: 'Learn More',
+						}}
+					/>
+				</Flex>
+			</SearchContainer>
+			<DynamicColumnTable
+				tablesource={TableDataSource.Alert}
+				columns={columns}
+				rowKey="id"
+				dataSource={data}
+				shouldSendAlertsLogEvent
+				dynamicColumns={dynamicColumns}
+				onChange={handleChange}
+				pagination={paginationConfig}
+			/>
+		</div>
+	);
+}
+
+interface ListAlertProps {
+	allAlertRules: RuletypesRuleDTO[];
+	refetch: UseQueryResult<
+		ListRules200,
+		ErrorType<RenderErrorResponseDTO>
+	>['refetch'];
+}
+
+export default ListAlert;

frontend/src/container/ListAlertRules/ListAlertRules.module.scss

@@ -1,92 +0,0 @@
-.container {
-	display: flex;
-	flex-direction: column;
-	gap: 1rem;
-	height: calc(100vh - 62px);
-	min-height: 400px;
-}
-
-.header {
-	position: relative;
-	z-index: 10;
-	display: flex;
-	justify-content: flex-end;
-	gap: 1rem;
-	flex-shrink: 0;
-	padding: 0 var(--spacing-8);
-}
-
-.refreshRow {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-}
-
-.filtersRow {
-	position: relative;
-	z-index: 10;
-	display: flex;
-	align-items: center;
-	gap: 1rem;
-	flex-shrink: 0;
-	padding: 0 var(--spacing-8);
-
-	--combobox-trigger-height: 2rem;
-}
-
-.searchInput {
-	min-width: 250px;
-}
-
-.filterSelect {
-	min-width: 300px;
-	flex: 1;
-}
-
-.tableContainer {
-	flex: 1;
-	min-height: 0;
-	display: flex;
-	flex-direction: column;
-
-	--tanstack-table-header-cell-bg: var(--l2-background);
-	--tanstack-table-header-cell-color: var(--l2-foreground);
-	--tanstack-table-cell-bg: var(--l2-background);
-	--tanstack-table-cell-color: var(--l2-foreground);
-	--tanstack-table-row-hover-bg: var(--l2-background-hover);
-	--tanstack-table-row-active-bg: var(--l2-background-active);
-	--tanstack-table-resize-handle-bg: var(--l2-background);
-	--tanstack-table-resize-handle-hover-bg: var(--l2-border);
-	--tanstack-table-row-height: 42px;
-
-	--tanstack-cell-padding-top-override: 5px;
-	--tanstack-cell-padding-bottom-override: 5px;
-	--tanstack-cell-padding-left-override: 16px;
-	--tanstack-cell-padding-right-override: 16px;
-
-	--tanstack-table-row-odd-bg: color-mix(
-		in srgb,
-		var(--l1-foreground) 2%,
-		transparent
-	);
-	--tanstack-table-row-even-bg: color-mix(
-		in srgb,
-		var(--l1-foreground) 1%,
-		transparent
-	);
-	--badge-cursor: pointer;
-}
-
-.searchIcon {
-	color: var(--l2-foreground);
-}
-
-.actionsColumn {
-	display: flex;
-	justify-content: flex-end;
-}
-
-.paginationContainer {
-	padding-right: var(--spacing-12);
-	height: 62px;
-}

frontend/src/container/ListAlertRules/TableComponents/Status.tsx

@@ -0,0 +1,32 @@
+import { Tag } from 'antd';
+import type { RuletypesRuleDTO } from 'api/generated/services/sigNoz.schemas';
+
+function Status({ status }: StatusProps): JSX.Element {
+	switch (status) {
+		case 'inactive': {
+			return <Tag color="green">OK</Tag>;
+		}
+
+		case 'pending': {
+			return <Tag color="orange">Pending</Tag>;
+		}
+
+		case 'firing': {
+			return <Tag color="red">Firing</Tag>;
+		}
+
+		case 'disabled': {
+			return <Tag>Disabled</Tag>;
+		}
+
+		default: {
+			return <Tag color="default">Unknown</Tag>;
+		}
+	}
+}
+
+interface StatusProps {
+	status: RuletypesRuleDTO['state'];
+}
+
+export default Status;

frontend/src/container/ListAlertRules/ToggleAlertState.tsx

@@ -0,0 +1,103 @@
+import { Dispatch, SetStateAction, useState } from 'react';
+import { useQueryClient } from 'react-query';
+import { patchRulePartial } from 'api/alerts/patchRulePartial';
+import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
+import { invalidateGetRuleByID } from 'api/generated/services/rules';
+import type {
+	RenderErrorResponseDTO,
+	RuletypesRuleDTO,
+} from 'api/generated/services/sigNoz.schemas';
+import { AxiosError } from 'axios';
+import { State } from 'hooks/useFetch';
+import { useNotifications } from 'hooks/useNotifications';
+import { useErrorModal } from 'providers/ErrorModalProvider';
+import APIError from 'types/api/error';
+
+import { ColumnButton } from './styles';
+
+function ToggleAlertState({
+	id,
+	disabled,
+	setData,
+}: ToggleAlertStateProps): JSX.Element {
+	const [apiStatus, setAPIStatus] = useState<State<RuletypesRuleDTO>>({
+		error: false,
+		errorMessage: '',
+		loading: false,
+		success: false,
+		payload: undefined,
+	});
+
+	const { notifications } = useNotifications();
+	const { showErrorModal } = useErrorModal();
+	const queryClient = useQueryClient();
+
+	const onToggleHandler = async (
+		id: string,
+		disabled: boolean,
+	): Promise<void> => {
+		try {
+			setAPIStatus((state) => ({
+				...state,
+				loading: true,
+			}));
+
+			const response = await patchRulePartial(id, { disabled });
+			const { data: updatedRule } = response;
+
+			setData((state) =>
+				state.map((alert) => {
+					if (alert.id === id) {
+						return {
+							...alert,
+							disabled: updatedRule.disabled,
+							state: updatedRule.state,
+						};
+					}
+					return alert;
+				}),
+			);
+
+			setAPIStatus((state) => ({
+				...state,
+				loading: false,
+				payload: updatedRule,
+			}));
+
+			invalidateGetRuleByID(queryClient, { id });
+
+			notifications.success({
+				message: 'Success',
+			});
+		} catch (error) {
+			setAPIStatus((state) => ({
+				...state,
+				loading: false,
+				error: true,
+			}));
+
+			showErrorModal(
+				convertToApiError(error as AxiosError<RenderErrorResponseDTO>) as APIError,
+			);
+		}
+	};
+
+	return (
+		<ColumnButton
+			disabled={apiStatus.loading || false}
+			loading={apiStatus.loading || false}
+			onClick={(): Promise<void> => onToggleHandler(id, !disabled)}
+			type="link"
+		>
+			{disabled ? 'Enable' : 'Disable'}
+		</ColumnButton>
+	);
+}
+
+interface ToggleAlertStateProps {
+	id: string;
+	disabled: boolean;
+	setData: Dispatch<SetStateAction<RuletypesRuleDTO[]>>;
+}
+
+export default ToggleAlertState;

frontend/src/container/ListAlertRules/__test__/utils.test.ts

@@ -0,0 +1,147 @@
+import type {
+	RuletypesAlertStateDTO,
+	RuletypesCompareOperatorDTO,
+	RuletypesMatchTypeDTO,
+	RuletypesPanelTypeDTO,
+	RuletypesQueryTypeDTO,
+	RuletypesRuleDTO,
+} from 'api/generated/services/sigNoz.schemas';
+
+import { filterAlerts } from '../utils';
+
+describe('filterAlerts', () => {
+	const mockAlertBase: Partial<RuletypesRuleDTO> = {
+		state: 'active' as RuletypesAlertStateDTO,
+		disabled: false,
+		createdAt: new Date('2024-01-01T00:00:00Z'),
+		createdBy: 'test-user',
+		updatedAt: new Date('2024-01-01T00:00:00Z'),
+		updatedBy: 'test-user',
+		version: '1',
+		condition: {
+			compositeQuery: {
+				queries: [],
+				panelType: 'graph' as RuletypesPanelTypeDTO,
+				queryType: 'builder' as RuletypesQueryTypeDTO,
+			},
+			matchType: 'at_least_once' as RuletypesMatchTypeDTO,
+			op: 'above' as RuletypesCompareOperatorDTO,
+		},
+		ruleType: 'threshold_rule' as RuletypesRuleDTO['ruleType'],
+	};
+
+	const mockAlerts: RuletypesRuleDTO[] = [
+		{
+			...mockAlertBase,
+			id: '1',
+			alert: 'High CPU Usage',
+			alertType: 'METRIC_BASED_ALERT',
+			labels: {
+				severity: 'warning',
+				status: 'ok',
+				environment: 'production',
+			},
+		} as RuletypesRuleDTO,
+		{
+			...mockAlertBase,
+			id: '2',
+			alert: 'Memory Leak Detected',
+			alertType: 'METRIC_BASED_ALERT',
+			labels: {
+				severity: 'critical',
+				status: 'firing',
+				environment: 'staging',
+			},
+		} as RuletypesRuleDTO,
+		{
+			...mockAlertBase,
+			id: '3',
+			alert: 'Database Connection Error',
+			alertType: 'METRIC_BASED_ALERT',
+			labels: {
+				severity: 'error',
+				status: 'pending',
+				environment: 'production',
+			},
+		} as RuletypesRuleDTO,
+	];
+
+	it('should return all alerts when filter is empty', () => {
+		const result = filterAlerts(mockAlerts, '');
+		expect(result).toStrictEqual(mockAlerts);
+	});
+
+	it('should return all alerts when filter is only whitespace', () => {
+		const result = filterAlerts(mockAlerts, '   ');
+		expect(result).toStrictEqual(mockAlerts);
+	});
+
+	it('should filter alerts by alert name', () => {
+		const result = filterAlerts(mockAlerts, 'CPU');
+		expect(result).toHaveLength(1);
+		expect(result[0].alert).toBe('High CPU Usage');
+	});
+
+	it('should filter alerts by severity', () => {
+		const result = filterAlerts(mockAlerts, 'warning');
+		expect(result).toHaveLength(1);
+		expect(result[0].labels?.severity).toBe('warning');
+	});
+
+	it('should filter alerts by label key', () => {
+		const result = filterAlerts(mockAlerts, 'environment');
+		expect(result).toHaveLength(3); // All alerts have environment label
+	});
+
+	it('should filter alerts by label value', () => {
+		const result = filterAlerts(mockAlerts, 'production');
+		expect(result).toHaveLength(2);
+		expect(
+			result.every((alert) => alert.labels?.environment === 'production'),
+		).toBe(true);
+	});
+
+	it('should be case insensitive', () => {
+		const result = filterAlerts(mockAlerts, 'cpu');
+		expect(result).toHaveLength(1);
+		expect(result[0].alert).toBe('High CPU Usage');
+	});
+
+	it('should handle partial matches', () => {
+		const result = filterAlerts(mockAlerts, 'mem');
+		expect(result).toHaveLength(1);
+		expect(result[0].alert).toBe('Memory Leak Detected');
+	});
+
+	it('should handle alerts with missing labels', () => {
+		const alertsWithMissingLabels: RuletypesRuleDTO[] = [
+			{
+				...mockAlertBase,
+				id: '4',
+				alert: 'Test Alert',
+				alertType: 'METRIC_BASED_ALERT',
+				labels: undefined,
+			} as RuletypesRuleDTO,
+		];
+		const result = filterAlerts(alertsWithMissingLabels, 'test');
+		expect(result).toHaveLength(1);
+		expect(result[0].alert).toBe('Test Alert');
+	});
+
+	it('should handle alerts with missing alert name', () => {
+		const alertsWithMissingName: RuletypesRuleDTO[] = [
+			{
+				...mockAlertBase,
+				id: '5',
+				alert: '',
+				alertType: 'METRIC_BASED_ALERT',
+				labels: {
+					severity: 'warning',
+				},
+			} as RuletypesRuleDTO,
+		];
+		const result = filterAlerts(alertsWithMissingName, 'warning');
+		expect(result).toHaveLength(1);
+		expect(result[0].labels?.severity).toBe('warning');
+	});
+});

frontend/src/container/ListAlertRules/components/ActionsMenu.module.scss

@@ -1,16 +0,0 @@
-.actionButton {
-	opacity: 0.7;
-	transition: opacity 0.15s ease;
-
-	&:hover {
-		opacity: 1;
-	}
-}
-
-.deleteItem {
-	color: var(--bg-cherry-500);
-
-	&:hover {
-		background: color-mix(in srgb, var(--bg-cherry-500) 10%, transparent);
-	}
-}

frontend/src/container/ListAlertRules/components/ActionsMenu.tsx

@@ -1,172 +0,0 @@
-import { useMemo } from 'react';
-import { useQueryClient } from 'react-query';
-import { Ellipsis } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
-import { toast } from '@signozhq/ui/sonner';
-import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
-import {
-	createRule,
-	deleteRuleByID,
-	invalidateListRules,
-	patchRuleByID,
-} from 'api/generated/services/rules';
-import type {
-	RenderErrorResponseDTO,
-	RuletypesPostableRuleDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import type { AxiosError } from 'axios';
-
-import type { AlertRule } from '../types';
-import { ALERT_ACTIONS, alertActionLogEvent } from '../utils';
-import styles from './ActionsMenu.module.scss';
-
-interface ActionsMenuProps {
-	rule: AlertRule;
-	onEdit: (rule: AlertRule, options?: { newTab?: boolean }) => void;
-	isLoading?: boolean;
-}
-
-function ActionsMenu({
-	rule,
-	onEdit,
-	isLoading: externalLoading = false,
-}: ActionsMenuProps): JSX.Element {
-	const queryClient = useQueryClient();
-
-	const handleClone = (): void => {
-		alertActionLogEvent(ALERT_ACTIONS.CLONE, rule);
-		toast.promise(
-			createRule({
-				...rule,
-				alert: `${rule.alert} - Copy`,
-			} as RuletypesPostableRuleDTO).then(async (response) => {
-				await invalidateListRules(queryClient);
-				const newRule = response.data;
-				if (newRule) {
-					onEdit(newRule as AlertRule);
-				}
-			}),
-			{
-				loading: 'Cloning alert...',
-				success: 'Alert cloned successfully',
-				error: (error): string => {
-					const apiError = convertToApiError(
-						error as AxiosError<RenderErrorResponseDTO>,
-					);
-					return apiError?.getErrorMessage() || 'Failed to clone alert';
-				},
-				position: 'top-right',
-			},
-		);
-	};
-
-	const handleDelete = (): void => {
-		alertActionLogEvent(ALERT_ACTIONS.DELETE, rule);
-		toast.promise(
-			deleteRuleByID({ id: rule.id ?? '' }).then(() =>
-				invalidateListRules(queryClient),
-			),
-			{
-				loading: 'Deleting alert...',
-				success: 'Alert deleted successfully',
-				error: (error): string => {
-					const apiError = convertToApiError(
-						error as AxiosError<RenderErrorResponseDTO>,
-					);
-					return apiError?.getErrorMessage() || 'Failed to delete alert';
-				},
-				position: 'top-right',
-			},
-		);
-	};
-
-	const handleToggle = (): void => {
-		alertActionLogEvent(ALERT_ACTIONS.TOGGLE, rule);
-		const newDisabled = !rule.disabled;
-		toast.promise(
-			patchRuleByID({ id: rule.id ?? '' }, {
-				disabled: newDisabled,
-			} as RuletypesPostableRuleDTO).then(() => invalidateListRules(queryClient)),
-			{
-				loading: newDisabled ? 'Disabling alert...' : 'Enabling alert...',
-				success: newDisabled ? 'Alert disabled' : 'Alert enabled',
-				error: (error): string => {
-					const apiError = convertToApiError(
-						error as AxiosError<RenderErrorResponseDTO>,
-					);
-					return apiError?.getErrorMessage() || 'Failed to toggle alert state';
-				},
-				position: 'top-right',
-			},
-		);
-	};
-
-	const menuItems = useMemo(
-		() => [
-			{
-				key: 'toggle',
-				label: rule.disabled ? 'Enable' : 'Disable',
-				disabled: externalLoading,
-				onClick: handleToggle,
-			},
-			{
-				key: 'edit',
-				label: 'Edit',
-				disabled: externalLoading,
-				onClick: (): void => {
-					alertActionLogEvent(ALERT_ACTIONS.EDIT, rule);
-					onEdit(rule);
-				},
-			},
-			{
-				key: 'edit-new-tab',
-				label: 'Edit in New Tab',
-				disabled: externalLoading,
-				onClick: (): void => {
-					alertActionLogEvent(ALERT_ACTIONS.EDIT, rule);
-					onEdit(rule, { newTab: true });
-				},
-			},
-			{
-				key: 'clone',
-				label: 'Clone',
-				disabled: externalLoading,
-				onClick: handleClone,
-			},
-			{ key: 'divider', type: 'divider' as const },
-			{
-				key: 'delete',
-				label: 'Delete',
-				disabled: externalLoading,
-				danger: true,
-				onClick: handleDelete,
-			},
-		],
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-		[rule, externalLoading, onEdit],
-	);
-
-	const handleClick = (e: React.MouseEvent): void => {
-		e.stopPropagation();
-	};
-
-	return (
-		// eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
-		<div onClick={handleClick}>
-			<DropdownMenuSimple menu={{ items: menuItems }} align="end">
-				<Button
-					variant="outlined"
-					color="secondary"
-					size="icon"
-					className={styles.actionButton}
-					data-testid="alert-actions"
-				>
-					<Ellipsis size={16} />
-				</Button>
-			</DropdownMenuSimple>
-		</div>
-	);
-}
-
-export default ActionsMenu;

frontend/src/container/ListAlertRules/components/ColumnSelector.module.scss

@@ -1,34 +0,0 @@
-.popoverContent {
-	min-width: 180px;
-	padding: 8px;
-}
-
-.title {
-	font-size: 12px;
-	font-weight: 600;
-	color: var(--l2-foreground);
-	padding: 4px 8px;
-	margin-bottom: 4px;
-}
-
-.columnList {
-	display: flex;
-	flex-direction: column;
-	gap: 2px;
-}
-
-.columnItem {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-	padding: 6px 8px;
-	border-radius: 4px;
-	cursor: pointer;
-	font-size: 13px;
-	color: var(--l1-foreground);
-	transition: background-color 0.15s ease;
-
-	&:hover {
-		background: var(--l2-background-hover);
-	}
-}

frontend/src/container/ListAlertRules/components/ColumnSelector.tsx

@@ -1,78 +0,0 @@
-import { useMemo } from 'react';
-import { Columns3 } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { Checkbox } from '@signozhq/ui/checkbox';
-import { Popover, PopoverContent, PopoverTrigger } from '@signozhq/ui/popover';
-import type { TableColumnDef } from 'components/TanStackTableView';
-import {
-	hideColumn,
-	showColumn,
-	useHiddenColumnIds,
-} from 'components/TanStackTableView';
-
-import styles from './ColumnSelector.module.scss';
-
-interface ColumnSelectorProps<TData> {
-	columns: TableColumnDef<TData>[];
-	storageKey: string;
-}
-
-function ColumnSelector<TData>({
-	columns,
-	storageKey,
-}: ColumnSelectorProps<TData>): JSX.Element {
-	const hiddenColumnIds = useHiddenColumnIds(storageKey);
-
-	const selectableColumns = useMemo(
-		() =>
-			columns.filter(
-				(col) => col.canBeHidden !== false && col.enableRemove !== false,
-			),
-		[columns],
-	);
-
-	const handleToggle = (columnId: string, checked: boolean): void => {
-		if (checked) {
-			showColumn(storageKey, columnId);
-		} else {
-			hideColumn(storageKey, columnId);
-		}
-	};
-
-	return (
-		<Popover>
-			<PopoverTrigger asChild>
-				<Button
-					variant="outlined"
-					size="sm"
-					color="secondary"
-					prefix={<Columns3 size={14} />}
-				>
-					Columns
-				</Button>
-			</PopoverTrigger>
-			<PopoverContent align="end" className={styles.popoverContent}>
-				<div className={styles.title}>Toggle Columns</div>
-				<div className={styles.columnList}>
-					{selectableColumns.map((col) => {
-						const isVisible = !hiddenColumnIds.includes(col.id);
-						const label = typeof col.header === 'string' ? col.header : col.id;
-
-						return (
-							<label key={col.id} className={styles.columnItem}>
-								<Checkbox
-									id={`col-${col.id}`}
-									value={isVisible}
-									onChange={(): void => handleToggle(col.id, !isVisible)}
-								/>
-								<span>{label}</span>
-							</label>
-						);
-					})}
-				</div>
-			</PopoverContent>
-		</Popover>
-	);
-}
-
-export default ColumnSelector;

frontend/src/container/ListAlertRules/components/index.ts

@@ -1,2 +0,0 @@
-export { default as ActionsMenu } from './ActionsMenu';
-export { default as ColumnSelector } from './ColumnSelector';

frontend/src/container/ListAlertRules/hooks.ts

@@ -1,46 +0,0 @@
-import {
-	Options,
-	parseAsInteger,
-	useQueryState,
-	UseQueryStateReturn,
-} from 'nuqs';
-import { parseAsJsonNoValidate } from 'utils/nuqsParsers';
-
-const defaultNuqsOptions: Options = {
-	history: 'push',
-};
-
-export const ALERT_RULES_PARAMS = {
-	SEARCH: 'search',
-	PAGE: 'page',
-	RULE_TYPE: 'ruleType',
-	FILTERS: 'alertRulesFilters',
-} as const;
-
-export const useAlertRulesPage = (): UseQueryStateReturn<number, number> =>
-	useQueryState(
-		ALERT_RULES_PARAMS.PAGE,
-		parseAsInteger.withDefault(1).withOptions(defaultNuqsOptions),
-	);
-
-export const useAlertRulesRuleType = (): UseQueryStateReturn<
-	string[],
-	string[]
-> =>
-	useQueryState(
-		ALERT_RULES_PARAMS.RULE_TYPE,
-		parseAsJsonNoValidate<string[]>()
-			.withDefault([])
-			.withOptions(defaultNuqsOptions),
-	);
-
-export const useAlertRulesFilters = (): UseQueryStateReturn<
-	string[],
-	string[]
-> =>
-	useQueryState(
-		ALERT_RULES_PARAMS.FILTERS,
-		parseAsJsonNoValidate<string[]>()
-			.withDefault([])
-			.withOptions(defaultNuqsOptions),
-	);

frontend/src/container/ListAlertRules/index.tsx

@@ -1,194 +1,67 @@
-import { useCallback, useMemo } from 'react';
-import { Plus, Search } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { Input } from '@signozhq/ui/input';
-import ErrorEmptyState from 'components/Alerts/ErrorEmptyState';
-import NoResultsEmptyState from 'components/Alerts/NoResultsEmptyState';
-import TanStackTable from 'components/TanStackTableView';
-import { useCalculatedPageSize } from 'components/TanStackTableView/useCalculatedPageSize';
-import { useTableParams } from 'components/TanStackTableView/useTableParams';
-import useComponentPermission from 'hooks/useComponentPermission';
-import { useUrlSearchState } from 'hooks/useUrlSearchState';
-import { useAppContext } from 'providers/App/App';
-import { useTimezone } from 'providers/Timezone';
-
-import TextToolTip from 'components/TextToolTip';
+import { useEffect, useMemo, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Space } from 'antd';
+import logEvent from 'api/common/logEvent';
+import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
+import { useListRules } from 'api/generated/services/rules';
+import { RenderErrorResponseDTO } from 'api/generated/services/sigNoz.schemas';
+import { AxiosError } from 'axios';
+import Spinner from 'components/Spinner';
+import { useNotifications } from 'hooks/useNotifications';
 
 import { AlertsEmptyState } from './AlertsEmptyState/AlertsEmptyState';
-import { ActionsMenu, ColumnSelector } from './components';
-import { ALERT_RULES_PARAMS, useAlertRulesFilters } from './hooks';
-import styles from './ListAlertRules.module.scss';
-import { getAlertRuleColumns } from './table.config';
-import type { AlertRule } from './types';
-import { useAlertRulesData } from './useAlertRulesData';
-import { useAlertRulesHandlers } from './useAlertRulesHandlers';
-
-const QUERY_PARAMS_CONFIG = {
-	orderBy: 'orderBy',
-	page: 'page',
-	limit: 'limit',
-} as const;
-
-const DEFAULT_PAGE = 1;
-const DEFAULT_LIMIT = 10;
+import ListAlert from './ListAlert';
 
 function ListAlertRules(): JSX.Element {
-	const { user } = useAppContext();
-	const [addNewAlert, action] = useComponentPermission(
-		['add_new_alert', 'action'],
-		user.role,
-	);
-
-	const [filterValues, setFilterValues] = useAlertRulesFilters();
-	const { searchText, debouncedSearch, handleSearchChange, clearSearch } =
-		useUrlSearchState(ALERT_RULES_PARAMS.SEARCH);
-	const { formatTimezoneAdjustedTimestamp } = useTimezone();
-
-	const { containerRef, calculatedPageSize } = useCalculatedPageSize({
-		rowHeight: 42,
+	const { t } = useTranslation('common');
+	const { data, isError, isLoading, refetch, error } = useListRules({
+		query: { cacheTime: 0 },
 	});
 
-	const { orderBy, page, limit, setLimit } = useTableParams(
-		QUERY_PARAMS_CONFIG,
-		{
-			page: DEFAULT_PAGE,
-			limit: DEFAULT_LIMIT,
-			storageKey: 'alert-rules',
-			calculatedPageSize,
-			cleanupOnUnmount: true,
-		},
+	const rules = data?.data ?? [];
+	const hasLoaded = !isLoading && data !== undefined;
+	const logEventCalledRef = useRef(false);
+
+	const { notifications } = useNotifications();
+
+	const apiError = useMemo(
+		() => convertToApiError(error as AxiosError<RenderErrorResponseDTO> | null),
+		[error],
 	);
 
-	const { filteredRules, isFetching, isError, allRules, refetch } =
-		useAlertRulesData(orderBy, debouncedSearch, filterValues ?? []);
-
-	const { handleEdit, handleNewAlert, handleRowClick, handleRowClickNewTab } =
-		useAlertRulesHandlers(allRules.length);
-
-	const handleClearFilters = useCallback((): void => {
-		void setFilterValues(null);
-		clearSearch();
-	}, [setFilterValues, clearSearch]);
-
-	const columns = useMemo(
-		() => getAlertRuleColumns(formatTimezoneAdjustedTimestamp),
-		[formatTimezoneAdjustedTimestamp],
-	);
-
-	const paginatedRules = useMemo(() => {
-		const start = (page - 1) * limit;
-		return filteredRules.slice(start, start + limit);
-	}, [filteredRules, page, limit]);
-
-	const columnsWithActions = useMemo(() => {
-		if (!action) {
-			return columns;
+	useEffect(() => {
+		if (!logEventCalledRef.current && hasLoaded) {
+			logEvent('Alert: List page visited', {
+				number: rules.length,
+			});
+			logEventCalledRef.current = true;
 		}
+	}, [hasLoaded, rules.length]);
 
-		return [
-			...columns,
-			{
-				id: 'actions',
-				header: (): JSX.Element => (
-					<span style={{ textAlign: 'right', display: 'block' }}>Actions</span>
-				),
-				accessorKey: 'id',
-				width: { fixed: '80px', ignoreLastColumnFill: true },
-				enableSort: false,
-				enableRemove: false,
-				enableMove: false,
-				pin: 'right' as const,
-				cell: ({ row }: { row: AlertRule }): JSX.Element => (
-					<div className={styles.actionsColumn}>
-						<ActionsMenu rule={row} onEdit={handleEdit} />
-					</div>
-				),
-			},
-		];
-	}, [action, columns, handleEdit]);
+	useEffect(() => {
+		if (isError) {
+			notifications.error({
+				message: apiError?.getErrorMessage() || t('something_went_wrong'),
+			});
+		}
+	}, [isError, apiError, t, notifications]);
 
-	const hasActiveFilters =
-		searchText.length > 0 || (filterValues ?? []).length > 0;
-	const isEmptyDueToFilters =
-		!isFetching &&
-		filteredRules.length === 0 &&
-		hasActiveFilters &&
-		allRules.length > 0;
-	const isEmptyNoRules = !isFetching && !isError && allRules.length === 0;
+	if (isError) {
+		return <div>{apiError?.getErrorMessage() || t('something_went_wrong')}</div>;
+	}
+
+	if (isLoading || !data) {
+		return <Spinner height="75vh" tip="Loading Rules..." />;
+	}
+
+	if (rules.length === 0) {
+		return <AlertsEmptyState />;
+	}
 
 	return (
-		<div className={styles.container}>
-			{!isEmptyNoRules && (
-				<div className={styles.header}>
-					<div className={styles.refreshRow}>
-						<ColumnSelector columns={columns} storageKey="alert-rules-columns" />
-						{addNewAlert && (
-							<Button
-								variant="solid"
-								size="sm"
-								prefix={<Plus size={14} />}
-								onClick={handleNewAlert}
-								color="primary"
-							>
-								New Alert
-							</Button>
-						)}
-						<TextToolTip
-							text="More details on how to create alerts"
-							url="https://signoz.io/docs/alerts/?utm_source=product&utm_medium=list-alerts"
-							urlText="Learn More"
-						/>
-					</div>
-				</div>
-			)}
-
-			{!isEmptyNoRules && (
-				<div className={styles.filtersRow}>
-					<Input
-						className={styles.searchInput}
-						placeholder="Search by Alert Name, Severity and Labels"
-						value={searchText}
-						onChange={handleSearchChange}
-						suffix={<Search size={14} className={styles.searchIcon} />}
-					/>
-				</div>
-			)}
-
-			<div ref={containerRef} className={styles.tableContainer}>
-				{isError ? (
-					<ErrorEmptyState title="Failed to load alert rules" onRefresh={refetch} />
-				) : isEmptyDueToFilters ? (
-					<NoResultsEmptyState
-						title="No matching alert rules"
-						subtitle="No alert rules match your search. Try adjusting your search criteria."
-						onClear={handleClearFilters}
-						clearButtonText="Clear Search"
-					/>
-				) : isEmptyNoRules ? (
-					<AlertsEmptyState onRefresh={refetch} />
-				) : (
-					<TanStackTable<AlertRule>
-						data={paginatedRules}
-						columns={columnsWithActions}
-						isLoading={isFetching}
-						getRowKey={(row): string => row.id ?? ''}
-						getItemKey={(row): string => row.id ?? ''}
-						columnStorageKey="alert-rules-columns"
-						enableQueryParams={QUERY_PARAMS_CONFIG}
-						onRowClick={handleRowClick}
-						onRowClickNewTab={handleRowClickNewTab}
-						pagination={{
-							total: filteredRules.length,
-							calculatedPageSize,
-							onLimitChange: setLimit,
-							showTotalCount: true,
-						}}
-						paginationClassname={styles.paginationContainer}
-						enableAlternatingRowColors
-					/>
-				)}
-			</div>
-		</div>
+		<Space direction="vertical" size="large" style={{ width: '100%' }}>
+			<ListAlert allAlertRules={rules} refetch={refetch} />
+		</Space>
 	);
 }
 

frontend/src/container/ListAlertRules/styles.ts

@@ -0,0 +1,28 @@
+import { Button as ButtonComponent } from 'antd';
+import styled from 'styled-components';
+
+export const SearchContainer = styled.div`
+	&&& {
+		display: flex;
+		margin-bottom: 2rem;
+		align-items: center;
+		gap: 2rem;
+	}
+`;
+
+export const Button = styled(ButtonComponent)`
+	&&& {
+		margin-left: 1em;
+	}
+`;
+
+export const ColumnButton = styled(ButtonComponent)`
+	&&& {
+		padding-left: 0;
+		padding-right: 0;
+		margin-right: 1.5em;
+		width: 100%;
+		display: flex;
+		align-items: center;
+	}
+`;

frontend/src/container/ListAlertRules/table.config.tsx

@@ -1,154 +0,0 @@
-import { Badge, BadgeColor } from '@signozhq/ui/badge';
-import { SEVERITY_BADGE_COLORS } from 'components/Alerts/constants';
-import LabelColumn from 'components/Alerts/LabelColumn';
-import type { TableColumnDef } from 'components/TanStackTableView';
-import TanStackTable from 'components/TanStackTableView';
-import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-
-import type { AlertRule } from './types';
-
-const STATE_CONFIG: Record<string, { color: BadgeColor; label: string }> = {
-	firing: { color: 'error', label: 'Firing' },
-	inactive: { color: 'success', label: 'OK' },
-	pending: { color: 'warning', label: 'Pending' },
-	disabled: { color: 'secondary', label: 'Disabled' },
-};
-
-export function getAlertRuleColumns(
-	formatTimezoneAdjustedTimestamp: (date: string, format: string) => string,
-): TableColumnDef<AlertRule>[] {
-	return [
-		{
-			id: 'state',
-			header: 'Status',
-			accessorKey: 'state',
-			width: { default: '100%' },
-			enableSort: true,
-			enableRemove: false,
-			enableMove: false,
-			cell: ({ value }): JSX.Element => {
-				const state = String(value ?? '').toLowerCase();
-				const config = STATE_CONFIG[state] ?? {
-					color: 'secondary' as BadgeColor,
-					label: 'Unknown',
-				};
-				return (
-					<Badge color={config.color} variant="outline">
-						{config.label}
-					</Badge>
-				);
-			},
-		},
-		{
-			id: 'name',
-			header: 'Alert Name',
-			accessorKey: 'alert',
-			width: { default: '100%' },
-			enableSort: true,
-			enableRemove: false,
-			enableMove: false,
-			cell: ({ value }): JSX.Element => (
-				<TanStackTable.Text>{String(value ?? '-')}</TanStackTable.Text>
-			),
-		},
-		{
-			id: 'severity',
-			header: 'Severity',
-			accessorFn: (row) => row.labels?.severity ?? '',
-			width: { default: '100%' },
-			enableSort: true,
-			enableMove: false,
-			cell: ({ value }): JSX.Element => {
-				const severity = String(value ?? '').toLowerCase();
-				if (!severity) {
-					return <TanStackTable.Text>-</TanStackTable.Text>;
-				}
-				return (
-					<Badge
-						color={SEVERITY_BADGE_COLORS[severity] ?? 'secondary'}
-						variant="outline"
-					>
-						{severity}
-					</Badge>
-				);
-			},
-		},
-		{
-			id: 'labels',
-			header: 'Labels',
-			accessorKey: 'labels',
-			width: { default: '100%' },
-			enableSort: false,
-			enableMove: false,
-			cell: ({ value }): JSX.Element => {
-				const labels = value as Record<string, string> | undefined;
-				if (!labels) {
-					return <TanStackTable.Text>-</TanStackTable.Text>;
-				}
-
-				const tagKeys = Object.keys(labels).filter((k) => k !== 'severity');
-				if (!tagKeys.length) {
-					return <TanStackTable.Text>-</TanStackTable.Text>;
-				}
-
-				return <LabelColumn labels={tagKeys} value={labels} color="sakura" />;
-			},
-		},
-		{
-			id: 'createdAt',
-			header: 'Created At',
-			accessorKey: 'createdAt',
-			width: { default: '100%' },
-			enableSort: true,
-			enableMove: false,
-			defaultVisibility: false,
-			cell: ({ value }): JSX.Element => (
-				<TanStackTable.Text>
-					{value
-						? formatTimezoneAdjustedTimestamp(String(value), DATE_TIME_FORMATS.UTC_US)
-						: '-'}
-				</TanStackTable.Text>
-			),
-		},
-		{
-			id: 'createdBy',
-			header: 'Created By',
-			accessorKey: 'createdBy',
-			width: { default: '100%' },
-			enableSort: false,
-			enableMove: false,
-			defaultVisibility: false,
-			cell: ({ value }): JSX.Element => (
-				<TanStackTable.Text>{String(value ?? '-')}</TanStackTable.Text>
-			),
-		},
-		{
-			id: 'updatedAt',
-			header: 'Updated At',
-			accessorKey: 'updatedAt',
-			width: { default: '100%' },
-			enableSort: true,
-			enableMove: false,
-			defaultVisibility: false,
-			cell: ({ value }): JSX.Element => (
-				<TanStackTable.Text>
-					{value
-						? formatTimezoneAdjustedTimestamp(String(value), DATE_TIME_FORMATS.UTC_US)
-						: '-'}
-				</TanStackTable.Text>
-			),
-		},
-		{
-			id: 'updatedBy',
-			header: 'Updated By',
-			accessorKey: 'updatedBy',
-			width: { default: '100%' },
-			enableSort: false,
-			enableMove: false,
-			defaultVisibility: false,
-			cell: ({ value }): JSX.Element => (
-				<TanStackTable.Text>{String(value ?? '-')}</TanStackTable.Text>
-			),
-		},
-	];
-}

frontend/src/container/ListAlertRules/types.ts

@@ -1,3 +0,0 @@
-import type { RuletypesRuleDTO } from 'api/generated/services/sigNoz.schemas';
-
-export type AlertRule = RuletypesRuleDTO;

frontend/src/container/ListAlertRules/useAlertRulesData.ts

@@ -1,55 +0,0 @@
-import { useEffect, useMemo, useRef } from 'react';
-import logEvent from 'api/common/logEvent';
-import { useListRules } from 'api/generated/services/rules';
-import { searchByLabels } from 'components/Alerts/utils';
-import type { SortState } from 'components/TanStackTableView/types';
-import { isUndefined } from 'lodash-es';
-
-import type { AlertRule } from './types';
-import { filterRulesByFilters, sortRules } from './utils';
-
-interface UseAlertRulesDataReturn {
-	allRules: AlertRule[];
-	filteredRules: AlertRule[];
-	isFetching: boolean;
-	isError: boolean;
-	refetch: () => void;
-}
-
-export function useAlertRulesData(
-	orderBy: SortState | null,
-	searchText = '',
-	filters: string[] = [],
-): UseAlertRulesDataReturn {
-	const hasLoggedEvent = useRef(false);
-
-	const rulesResponse = useListRules();
-
-	const allRules = useMemo(
-		() => rulesResponse.data?.data ?? [],
-		[rulesResponse.data],
-	);
-
-	useEffect(() => {
-		if (!hasLoggedEvent.current && !isUndefined(rulesResponse.data?.data)) {
-			void logEvent('Alert: List page visited', {
-				number: allRules.length,
-			});
-			hasLoggedEvent.current = true;
-		}
-	}, [rulesResponse.data, allRules.length]);
-
-	const filteredRules = useMemo(() => {
-		const filtered = filterRulesByFilters(allRules, filters);
-		const searched = searchByLabels(filtered, searchText, (r) => r.alert ?? '');
-		return sortRules(searched, orderBy);
-	}, [allRules, filters, searchText, orderBy]);
-
-	return {
-		allRules,
-		filteredRules,
-		isFetching: rulesResponse.isFetching,
-		isError: rulesResponse.isError,
-		refetch: rulesResponse.refetch,
-	};
-}

frontend/src/container/ListAlertRules/useAlertRulesHandlers.ts

@@ -1,82 +0,0 @@
-import { useCallback } from 'react';
-import logEvent from 'api/common/logEvent';
-import { QueryParams } from 'constants/query';
-import ROUTES from 'constants/routes';
-import { sanitizeDefaultAlertQuery } from 'container/EditAlertV2/utils';
-import { useSafeNavigate } from 'hooks/useSafeNavigate';
-import { useTableRowClick } from 'hooks/useTableRowClick';
-import useUrlQuery from 'hooks/useUrlQuery';
-import { mapQueryDataFromApi } from 'lib/newQueryBuilder/queryBuilderMappers/mapQueryDataFromApi';
-import { toCompositeMetricQuery } from 'types/api/alerts/convert';
-import { isModifierKeyPressed } from 'utils/app';
-
-import type { AlertRule } from './types';
-
-interface UseAlertRulesHandlersReturn {
-	handleEdit: (rule: AlertRule, options?: { newTab?: boolean }) => void;
-	handleNewAlert: (e: React.MouseEvent) => void;
-	handleRowClick: (rule: AlertRule) => void;
-	handleRowClickNewTab: (rule: AlertRule) => void;
-}
-
-export function useAlertRulesHandlers(
-	allRulesCount: number,
-): UseAlertRulesHandlersReturn {
-	const { safeNavigate } = useSafeNavigate();
-	const params = useUrlQuery();
-
-	const getEditUrl = useCallback(
-		(rule: AlertRule): string => {
-			const compositeQuery = sanitizeDefaultAlertQuery(
-				mapQueryDataFromApi(toCompositeMetricQuery(rule.condition.compositeQuery)),
-				rule.alertType,
-			);
-			params.set(
-				QueryParams.compositeQuery,
-				encodeURIComponent(JSON.stringify(compositeQuery)),
-			);
-
-			const panelType = rule.condition.compositeQuery.panelType;
-			if (panelType) {
-				params.set(QueryParams.panelTypes, panelType);
-			}
-
-			params.set(QueryParams.ruleId, rule.id);
-
-			return `${ROUTES.ALERT_OVERVIEW}?${params.toString()}`;
-		},
-		[params],
-	);
-
-	const handleEdit = useCallback(
-		(rule: AlertRule, options?: { newTab?: boolean }): void => {
-			safeNavigate(getEditUrl(rule), options);
-		},
-		[getEditUrl, safeNavigate],
-	);
-
-	const handleNewAlert = useCallback(
-		(e: React.MouseEvent): void => {
-			void logEvent('Alert: New alert button clicked', {
-				number: allRulesCount,
-				layout: 'new',
-			});
-			safeNavigate(ROUTES.ALERT_TYPE_SELECTION, {
-				newTab: isModifierKeyPressed(e),
-			});
-		},
-		[allRulesCount, safeNavigate],
-	);
-
-	const { handleRowClick, handleRowClickNewTab } = useTableRowClick<AlertRule>({
-		getUrl: getEditUrl,
-		onNavigate: safeNavigate,
-	});
-
-	return {
-		handleEdit,
-		handleNewAlert,
-		handleRowClick,
-		handleRowClickNewTab,
-	};
-}

frontend/src/container/ListAlertRules/utils.ts

@@ -1,92 +1,59 @@
 import logEvent from 'api/common/logEvent';
 import type { RuletypesRuleDTO } from 'api/generated/services/sigNoz.schemas';
-import { sortByColumn } from 'components/Alerts/utils';
-import type { SortState } from 'components/TanStackTableView/types';
 import { dataSourceForAlertType } from 'constants/alerts';
 
-import type { AlertRule } from './types';
+export const filterAlerts = (
+	allAlertRules: RuletypesRuleDTO[],
+	filter: string,
+): RuletypesRuleDTO[] => {
+	if (!filter.trim()) {
+		return allAlertRules;
+	}
 
-export const ALERT_RULES_REFRESH_INTERVAL = 30_000;
+	const value = filter.trim().toLowerCase();
+	return allAlertRules.filter((alert) => {
+		const alertName = alert.alert.toLowerCase();
+		const severity = alert.labels?.severity?.toLowerCase();
 
-export const ALERT_ACTIONS = {
-	TOGGLE: 'toggle',
-	EDIT: 'edit',
-	CLONE: 'clone',
-	DELETE: 'delete',
-} as const;
+		// Create a string of all label keys and values for searching
+		const labelSearchString = Object.entries(alert.labels || {})
+			.map(([key, val]) => `${key} ${val}`)
+			.join(' ')
+			.toLowerCase();
 
-const ACTION_LABELS: Record<string, string> = {
-	[ALERT_ACTIONS.TOGGLE]: 'Enable/Disable',
-	[ALERT_ACTIONS.EDIT]: 'Edit',
-	[ALERT_ACTIONS.CLONE]: 'Clone',
-	[ALERT_ACTIONS.DELETE]: 'Delete',
+		return (
+			alertName.includes(value) ||
+			severity?.includes(value) ||
+			labelSearchString.includes(value)
+		);
+	});
 };
 
 export const alertActionLogEvent = (
 	action: string,
 	record: RuletypesRuleDTO,
 ): void => {
-	const actionValue = ACTION_LABELS[action] ?? action;
-	void logEvent('Alert: Action', {
+	let actionValue = '';
+	switch (action) {
+		case '0':
+			actionValue = 'Enable/Disable';
+			break;
+		case '1':
+			actionValue = 'Edit';
+			break;
+		case '2':
+			actionValue = 'Clone';
+			break;
+		case '3':
+			actionValue = 'Delete';
+			break;
+		default:
+			break;
+	}
+	logEvent('Alert: Action', {
 		ruleId: record.id,
 		dataSource: dataSourceForAlertType(record.alertType),
 		name: record.alert,
 		action: actionValue,
 	});
 };
-
-export function getAlertSortValue(
-	rule: AlertRule,
-	columnName: string,
-): string | number {
-	switch (columnName) {
-		case 'state':
-			return rule.state ?? '';
-		case 'name':
-			return rule.alert ?? '';
-		case 'severity':
-			return rule.labels?.severity ?? '';
-		case 'createdAt':
-			return rule.createdAt ? new Date(rule.createdAt).getTime() : 0;
-		case 'updatedAt':
-			return rule.updatedAt ? new Date(rule.updatedAt).getTime() : 0;
-		default:
-			return '';
-	}
-}
-
-export function sortRules(
-	rules: AlertRule[],
-	orderBy: SortState | null,
-): AlertRule[] {
-	return sortByColumn(rules, orderBy, getAlertSortValue);
-}
-
-export function filterRulesByFilters(
-	rules: AlertRule[],
-	filters: string[],
-): AlertRule[] {
-	if (filters.length === 0) {
-		return rules;
-	}
-
-	const stateFilters = filters
-		.filter((f) => f.startsWith('state:'))
-		.map((f) => f.replace('state:', '').toLowerCase());
-
-	const severityFilters = filters
-		.filter((f) => f.startsWith('severity:'))
-		.map((f) => f.replace('severity:', '').toLowerCase());
-
-	return rules.filter((rule) => {
-		const state = rule.state?.toLowerCase() ?? '';
-		const severity = rule.labels?.severity?.toLowerCase() ?? '';
-
-		const matchesState =
-			stateFilters.length === 0 || stateFilters.includes(state);
-		const matchesSeverity =
-			severityFilters.length === 0 || severityFilters.includes(severity);
-
-		return matchesState && matchesSeverity;
-	});
-}

frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/index.tsx

@@ -12,7 +12,10 @@ import { useLocation } from 'react-router-dom';
 import { Button, Select, Spin, Tag, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import cx from 'classnames';
-import { OPERATORS } from 'constants/queryBuilder';
+import {
+	INFRA_LONG_TO_SHORT_OPERATOR_MAP,
+	OPERATORS,
+} from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
 import { LogsExplorerShortcuts } from 'constants/shortcuts/logsExplorerShortcuts';
 import { InfraMonitoringEntity } from 'container/InfraMonitoringK8s/constants';
@@ -68,6 +71,17 @@ import {
 
 import './QueryBuilderSearch.styles.scss';
 
+function getOperatorValueForContext(
+	op: string,
+	isInfraMonitoring?: boolean,
+): string {
+	const mappedOp =
+		isInfraMonitoring && INFRA_LONG_TO_SHORT_OPERATOR_MAP[op]
+			? INFRA_LONG_TO_SHORT_OPERATOR_MAP[op]
+			: op;
+	return getOperatorValue(mappedOp);
+}
+
 function QueryBuilderSearch({
 	query,
 	onChange,
@@ -301,7 +315,7 @@ function QueryBuilderSearch({
 					dataType: fetchValueDataType(computedTagValue, tagOperator),
 					type: '',
 				},
-				op: getOperatorValue(tagOperator),
+				op: getOperatorValueForContext(tagOperator, isInfraMonitoring),
 				value: computedTagValue,
 			};
 		});

frontend/src/container/QueryBuilder/filters/QueryBuilderSearch/utils.ts

@@ -7,10 +7,17 @@ import { TagFilter } from 'types/api/queryBuilder/queryBuilderData';
 import { orderByValueDelimiter } from '../OrderByFilter/utils';
 
 export const tagRegexp =
-	/^\s*(.*?)\s*(\bIN\b|\bNOT_IN\b|\bLIKE\b|\bNOT_LIKE\b|\bILIKE\b|\bNOT_ILIKE\b|\bREGEX\b|\bNOT_REGEX\b|=|!=|\bEXISTS\b|\bNOT_EXISTS\b|\bCONTAINS\b|\bNOT_CONTAINS\b|>=|>|<=|<|\bHAS\b|\bNHAS\b)\s*(.*)$/gi;
+	/^\s*(.*?)\s*(\bIN\b|\bNOT_IN\b|\bNIN\b|\bLIKE\b|\bNOT_LIKE\b|\bNLIKE\b|\bILIKE\b|\bNOT_ILIKE\b|\bNOTILIKE\b|\bREGEX\b|\bNOT_REGEX\b|\bNREGEX\b|=|!=|\bEXISTS\b|\bNOT_EXISTS\b|\bNEXISTS\b|\bCONTAINS\b|\bNOT_CONTAINS\b|\bNCONTAINS\b|>=|>|<=|<|\bHAS\b|\bNHAS\b)\s*(.*)$/gi;
 
 export function isInNInOperator(value: string): boolean {
-	return value === OPERATORS.IN || value === OPERATORS.NIN;
+	return (
+		value === 'IN' ||
+		value === 'NOT_IN' ||
+		value === 'NIN' ||
+		value === 'in' ||
+		value === 'not in' ||
+		value === 'nin'
+	);
 }
 
 interface ITagToken {
@@ -45,7 +52,8 @@ export function isExistsNotExistsOperator(value: string): boolean {
 	const { tagOperator } = getTagToken(value);
 	return (
 		tagOperator?.trim() === OPERATORS.NOT_EXISTS ||
-		tagOperator?.trim() === OPERATORS.EXISTS
+		tagOperator?.trim() === OPERATORS.EXISTS ||
+		tagOperator?.trim() === 'NEXISTS'
 	);
 }
 
@@ -83,6 +91,19 @@ export function getOperatorValue(op: string): string {
 			return 'contains';
 		case 'NOT_CONTAINS':
 			return 'not contains';
+		// Short form operators (InfraMonitoring)
+		case 'NIN':
+			return 'nin';
+		case 'NLIKE':
+			return 'nlike';
+		case 'NOTILIKE':
+			return 'notilike';
+		case 'NREGEX':
+			return 'nregex';
+		case 'NEXISTS':
+			return 'nexists';
+		case 'NCONTAINS':
+			return 'ncontains';
 		default:
 			return op;
 	}
@@ -114,6 +135,19 @@ export function getOperatorFromValue(op: string): string {
 			return OPERATORS.HAS;
 		case 'not has':
 			return OPERATORS.NHAS;
+		// Short-form operators (InfraMonitoring)
+		case 'nin':
+			return 'NIN';
+		case 'nlike':
+			return 'NLIKE';
+		case 'notilike':
+			return 'NOTILIKE';
+		case 'nregex':
+			return 'NREGEX';
+		case 'nexists':
+			return 'NEXISTS';
+		case 'ncontains':
+			return 'NCONTAINS';
 		default:
 			return op;
 	}

frontend/src/container/RolesSettings/PermissionSidePanel/PermissionSidePanel.styles.scss

@@ -29,18 +29,6 @@
 		border-bottom: 1px solid var(--l1-border);
 	}
 
-	&__close {
-		width: 16px;
-		height: 16px;
-		padding: 0;
-		color: var(--foreground);
-		flex-shrink: 0;
-
-		&:hover {
-			color: var(--l1-foreground);
-		}
-	}
-
 	&__header-divider {
 		display: block;
 		width: 1px;
@@ -167,7 +155,6 @@
 		line-height: 20px;
 		letter-spacing: -0.07px;
 		color: var(--l1-foreground);
-		text-transform: capitalize;
 	}
 
 	&__body {

frontend/src/container/RolesSettings/PermissionSidePanel/PermissionSidePanel.tsx

@@ -25,10 +25,13 @@ import { PermissionScope } from './PermissionSidePanel.types';
 
 import './PermissionSidePanel.styles.scss';
 
+const RELATIONS_ALL_ONLY = new Set(['list', 'create']);
+
 interface ResourceRowProps {
 	resource: ResourceDefinition;
 	config: ResourceConfig;
 	isExpanded: boolean;
+	relation: string;
 	onToggleExpand: (id: string) => void;
 	onScopeChange: (id: string, scope: ScopeType) => void;
 	onSelectedIdsChange: (id: string, ids: string[]) => void;
@@ -38,10 +41,12 @@ function ResourceRow({
 	resource,
 	config,
 	isExpanded,
+	relation,
 	onToggleExpand,
 	onScopeChange,
 	onSelectedIdsChange,
 }: ResourceRowProps): JSX.Element {
+	const showOnlySelected = !RELATIONS_ALL_ONLY.has(relation);
 	return (
 		<div className="psp-resource">
 			<div
@@ -78,36 +83,40 @@ function ResourceRow({
 							<RadioGroupLabel htmlFor={`${resource.id}-all`}>All</RadioGroupLabel>
 						</div>
 
+						{showOnlySelected && (
+							<div className="psp-resource__radio-item">
+								<RadioGroupItem
+									value={PermissionScope.ONLY_SELECTED}
+									id={`${resource.id}-only-selected`}
+								/>
+								<RadioGroupLabel htmlFor={`${resource.id}-only-selected`}>
+									Only selected
+								</RadioGroupLabel>
+							</div>
+						)}
+
 						<div className="psp-resource__radio-item">
 							<RadioGroupItem
-								value={PermissionScope.ONLY_SELECTED}
-								id={`${resource.id}-only-selected`}
+								value={PermissionScope.NONE}
+								id={`${resource.id}-none`}
 							/>
-							<RadioGroupLabel htmlFor={`${resource.id}-only-selected`}>
-								Only selected
-							</RadioGroupLabel>
+							<RadioGroupLabel htmlFor={`${resource.id}-none`}>None</RadioGroupLabel>
 						</div>
 					</RadioGroup>
 
-					{config.scope === PermissionScope.ONLY_SELECTED && (
+					{config.scope === PermissionScope.ONLY_SELECTED && showOnlySelected && (
 						<div className="psp-resource__select-wrapper">
-							{/* TODO: right now made to only accept user input, we need to give it proper resource based value fetching from APIs */}
 							<Select
 								mode="tags"
+								open={false}
+								allowClear
+								suffixIcon={null}
 								value={config.selectedIds}
 								onChange={(vals: string[]): void =>
 									onSelectedIdsChange(resource.id, vals)
 								}
-								options={resource.options ?? []}
-								placeholder="Select resources..."
+								placeholder="Type and press Enter to add..."
 								className="psp-resource__select"
-								popupClassName="psp-resource__select-popup"
-								showSearch
-								filterOption={(input, option): boolean =>
-									String(option?.label ?? '')
-										.toLowerCase()
-										.includes(input.toLowerCase())
-								}
 							/>
 						</div>
 					)}
@@ -121,10 +130,12 @@ function PermissionSidePanel({
 	open,
 	onClose,
 	permissionLabel,
+	relation,
 	resources,
 	initialConfig,
 	isLoading = false,
 	isSaving = false,
+	canEdit = true,
 	onSave,
 }: PermissionSidePanelProps): JSX.Element | null {
 	const [config, setConfig] = useState<PermissionConfig>(() =>
@@ -213,13 +224,13 @@ function PermissionSidePanel({
 			<div className="permission-side-panel">
 				<div className="permission-side-panel__header">
 					<Button
-						variant="ghost"
+						variant="link"
+						color="secondary"
 						size="icon"
-						className="permission-side-panel__close"
 						onClick={onClose}
 						aria-label="Close panel"
 					>
-						<X size={16} />
+						<X size={14} />
 					</Button>
 					<span className="permission-side-panel__header-divider" />
 					<span className="permission-side-panel__title">
@@ -238,6 +249,7 @@ function PermissionSidePanel({
 									resource={resource}
 									config={config[resource.id] ?? DEFAULT_RESOURCE_CONFIG}
 									isExpanded={expandedIds.has(resource.id)}
+									relation={relation}
 									onToggleExpand={handleToggleExpand}
 									onScopeChange={handleScopeChange}
 									onSelectedIdsChange={handleSelectedIdsChange}
@@ -274,7 +286,7 @@ function PermissionSidePanel({
 							size="sm"
 							onClick={handleSave}
 							loading={isSaving}
-							disabled={isLoading || unsavedCount === 0}
+							disabled={isLoading || unsavedCount === 0 || !canEdit}
 						>
 							Save Changes
 						</Button>

frontend/src/container/RolesSettings/PermissionSidePanel/PermissionSidePanel.types.ts

@@ -5,6 +5,8 @@ export interface ResourceOption {
 
 export interface ResourceDefinition {
 	id: string;
+	kind: string;
+	type: string;
 	label: string;
 	options?: ResourceOption[];
 }
@@ -12,6 +14,7 @@ export interface ResourceDefinition {
 export enum PermissionScope {
 	ALL = 'all',
 	ONLY_SELECTED = 'only_selected',
+	NONE = 'none',
 }
 
 export type ScopeType = PermissionScope;
@@ -27,9 +30,11 @@ export interface PermissionSidePanelProps {
 	open: boolean;
 	onClose: () => void;
 	permissionLabel: string;
+	relation: string;
 	resources: ResourceDefinition[];
 	initialConfig?: PermissionConfig;
 	isLoading?: boolean;
 	isSaving?: boolean;
+	canEdit?: boolean;
 	onSave: (config: PermissionConfig) => void;
 }

frontend/src/container/RolesSettings/RoleDetails/RoleDetailsPage.styles.scss

@@ -9,8 +9,9 @@
 
 	.role-details-header {
 		display: flex;
-		flex-direction: column;
-		gap: 0;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
 	}
 
 	.role-details-title {
@@ -28,44 +29,6 @@
 		opacity: 0.55;
 	}
 
-	.role-details-nav {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.role-details-tab {
-		gap: 4px;
-		padding: 0 16px;
-		height: 32px;
-		border-radius: 0;
-		font-size: 12px;
-		overflow: hidden;
-		font-weight: 400;
-		line-height: 18px;
-		letter-spacing: -0.06px;
-
-		&[data-state='on'] {
-			border-radius: 2px 0 0 2px;
-		}
-	}
-
-	.role-details-tab-count {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		min-width: 20px;
-		padding: 0 6px;
-		border-radius: 50px;
-		background: var(--secondary);
-		font-size: 12px;
-		font-weight: 400;
-		line-height: 20px;
-		color: var(--foreground);
-		letter-spacing: -0.06px;
-		text-transform: uppercase;
-	}
-
 	.role-details-actions {
 		display: flex;
 		align-items: center;
@@ -155,6 +118,17 @@
 		margin: 0;
 	}
 
+	.role-details-permissions-learn-more {
+		color: var(--primary);
+		font-size: var(--font-size-xs);
+		text-decoration: none;
+		white-space: nowrap;
+
+		&:hover {
+			text-decoration: underline;
+		}
+	}
+
 	.role-details-permission-list {
 		display: flex;
 		flex-direction: column;
@@ -282,30 +256,6 @@
 	}
 }
 
-.role-details-delete-action-btn {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 32px;
-	height: 32px;
-	min-width: 32px;
-	border: none;
-	border-radius: 2px;
-	background: transparent;
-	color: var(--destructive);
-	opacity: 0.6;
-	padding: 0;
-	transition:
-		background-color 0.2s,
-		opacity 0.2s;
-	box-shadow: none;
-
-	&:hover {
-		background: color-mix(in srgb, var(--danger-background) 10%, transparent);
-		opacity: 0.9;
-	}
-}
-
 .role-details-delete-modal {
 	width: calc(100% - 30px) !important;
 	max-width: 384px;

frontend/src/container/RolesSettings/RoleDetails/RoleDetailsPage.tsx

@@ -1,10 +1,9 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import { useQueryClient } from 'react-query';
 import { useHistory, useLocation } from 'react-router-dom';
-import { Table2, Trash2, Users } from '@signozhq/icons';
+import { Trash2 } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 import { toast } from '@signozhq/ui/sonner';
-import { ToggleGroup, ToggleGroupItem } from '@signozhq/ui/toggle-group';
 import { Skeleton } from 'antd';
 import {
 	getGetObjectsQueryKey,
@@ -13,7 +12,15 @@ import {
 	useGetRole,
 	usePatchObjects,
 } from 'api/generated/services/role';
+import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import PermissionDeniedFullPage from 'components/PermissionDeniedFullPage/PermissionDeniedFullPage';
 import permissionsType from 'hooks/useAuthZ/permissions.type';
+import {
+	buildRoleDeletePermission,
+	buildRoleReadPermission,
+	buildRoleUpdatePermission,
+} from 'hooks/useAuthZ/permissions/role.permissions';
+import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
 
 import type { AuthzResources } from '../utils';
 import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';
@@ -23,7 +30,6 @@ import { useErrorModal } from 'providers/ErrorModalProvider';
 import { RoleType } from 'types/roles';
 import { handleApiError, toAPIError } from 'utils/errorUtils';
 
-import { IS_ROLE_DETAILS_AND_CRUD_ENABLED } from '../config';
 import type { PermissionConfig } from '../PermissionSidePanel';
 import PermissionSidePanel from '../PermissionSidePanel';
 import CreateRoleModal from '../RolesComponents/CreateRoleModal';
@@ -34,35 +40,33 @@ import {
 	deriveResourcesForRelation,
 	objectsToPermissionConfig,
 } from '../utils';
-import MembersTab from './components/MembersTab';
 import OverviewTab from './components/OverviewTab';
 import { ROLE_ID_REGEX } from './constants';
 
 import './RoleDetailsPage.styles.scss';
 
-type TabKey = 'overview' | 'members';
-
 // eslint-disable-next-line sonarjs/cognitive-complexity
 function RoleDetailsPage(): JSX.Element {
-	const { pathname } = useLocation();
+	const { pathname, search } = useLocation();
 	const history = useHistory();
 
-	useEffect(() => {
-		if (!IS_ROLE_DETAILS_AND_CRUD_ENABLED) {
-			history.push(ROUTES.ROLES_SETTINGS);
-		}
-	}, [history]);
-
 	const queryClient = useQueryClient();
 	const { showErrorModal } = useErrorModal();
 
 	const authzResources = permissionsType.data as unknown as AuthzResources;
 
-	// Extract channelId from URL pathname since useParams doesn't work in nested routing
+	// Extract roleId from URL pathname since useParams doesn't work in nested routing
 	const roleIdMatch = pathname.match(ROLE_ID_REGEX);
 	const roleId = roleIdMatch ? roleIdMatch[1] : '';
 
-	const [activeTab, setActiveTab] = useState<TabKey>('overview');
+	// Role name passed as query param by the listing page — used to check read permission
+	// before the role details API resolves. Absent when navigating directly (e.g. deep link),
+	// in which case we skip the FGA check and fall back to the BE guard.
+	const nameFromQuery = useMemo(
+		() => new URLSearchParams(search).get('name') ?? '',
+		[search],
+	);
+
 	const [isEditModalOpen, setIsEditModalOpen] = useState(false);
 	const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
 	const [activePermission, setActivePermission] = useState<string | null>(null);
@@ -75,6 +79,27 @@ function RoleDetailsPage(): JSX.Element {
 	const isTransitioning = isFetching && role?.id !== roleId;
 	const isManaged = role?.type === RoleType.MANAGED;
 
+	const roleName = role?.name ?? '';
+
+	// Read check — fires immediately using the name query param so we can gate the page
+	// before the role details API resolves. Skipped when name is absent.
+	const { permissions: readPerms, isLoading: isReadAuthZLoading } = useAuthZ(
+		nameFromQuery ? [buildRoleReadPermission(nameFromQuery)] : [],
+		{ enabled: !!nameFromQuery },
+	);
+	const hasReadPermission = nameFromQuery
+		? (readPerms?.[buildRoleReadPermission(nameFromQuery)]?.isGranted ?? true)
+		: true;
+
+	// Update check uses role name once loaded
+	const { permissions: updatePerms, isLoading: isAuthZLoading } = useAuthZ(
+		roleName && !isManaged ? [buildRoleUpdatePermission(roleName)] : [],
+		{ enabled: !!roleName && !isManaged },
+	);
+	const hasUpdatePermission = isAuthZLoading
+		? false
+		: (updatePerms?.[buildRoleUpdatePermission(roleName)]?.isGranted ?? false);
+
 	const permissionTypes = useMemo(
 		() => derivePermissionTypes(authzResources?.relations ?? null),
 		[authzResources],
@@ -90,7 +115,11 @@ function RoleDetailsPage(): JSX.Element {
 
 	const { data: objectsData, isLoading: isLoadingObjects } = useGetObjects(
 		{ id: roleId, relation: activePermission ?? '' },
-		{ query: { enabled: !!activePermission && !!roleId && !isManaged } },
+		{
+			query: {
+				enabled: !!activePermission && !!roleId && !isManaged,
+			},
+		},
 	);
 
 	const initialConfig = useMemo(() => {
@@ -110,7 +139,6 @@ function RoleDetailsPage(): JSX.Element {
 				getGetObjectsQueryKey({ id: roleId, relation: activePermission }),
 			);
 		}
-		setActivePermission(null);
 	};
 
 	const { mutate: patchObjects, isLoading: isSaving } = usePatchObjects({
@@ -130,7 +158,11 @@ function RoleDetailsPage(): JSX.Element {
 		},
 	});
 
-	if (!IS_ROLE_DETAILS_AND_CRUD_ENABLED || isLoading || isTransitioning) {
+	if (!hasReadPermission && readPerms !== null) {
+		return <PermissionDeniedFullPage permissionName="role:read" />;
+	}
+
+	if (isLoading || isTransitioning || (!!nameFromQuery && isReadAuthZLoading)) {
 		return (
 			<div className="role-details-page">
 				<Skeleton
@@ -186,73 +218,49 @@ function RoleDetailsPage(): JSX.Element {
 		<div className="role-details-page">
 			<div className="role-details-header">
 				<h2 className="role-details-title">Role — {role.name}</h2>
-			</div>
-
-			<div className="role-details-nav">
-				<ToggleGroup
-					type="single"
-					value={activeTab}
-					onChange={(val): void => {
-						if (val) {
-							setActiveTab(val as TabKey);
-						}
-					}}
-					className="role-details-tabs"
-				>
-					<ToggleGroupItem value="overview" className="role-details-tab">
-						<Table2 size={14} />
-						Overview
-					</ToggleGroupItem>
-					<ToggleGroupItem value="members" className="role-details-tab">
-						<Users size={14} />
-						Members
-						<span className="role-details-tab-count">0</span>
-					</ToggleGroupItem>
-				</ToggleGroup>
-
 				{!isManaged && (
 					<div className="role-details-actions">
-						<Button
-							variant="ghost"
-							color="destructive"
-							className="role-details-delete-action-btn"
-							onClick={(): void => setIsDeleteModalOpen(true)}
-							aria-label="Delete role"
-						>
-							<Trash2 size={14} />
-						</Button>
-						<Button
-							variant="solid"
-							color="secondary"
-							size="sm"
-							onClick={(): void => setIsEditModalOpen(true)}
-						>
-							Edit Role Details
-						</Button>
+						<AuthZTooltip checks={[buildRoleDeletePermission(role.name)]}>
+							<Button
+								variant="link"
+								color="destructive"
+								onClick={(): void => setIsDeleteModalOpen(true)}
+								aria-label="Delete role"
+							>
+								<Trash2 size={12} />
+							</Button>
+						</AuthZTooltip>
+						<AuthZTooltip checks={[buildRoleUpdatePermission(role.name)]}>
+							<Button
+								variant="solid"
+								color="secondary"
+								onClick={(): void => setIsEditModalOpen(true)}
+							>
+								Edit Role Details
+							</Button>
+						</AuthZTooltip>
 					</div>
 				)}
 			</div>
 
-			{activeTab === 'overview' && (
-				<OverviewTab
-					role={role || null}
-					isManaged={isManaged}
-					permissionTypes={permissionTypes}
-					onPermissionClick={(key): void => setActivePermission(key)}
-				/>
-			)}
-			{activeTab === 'members' && <MembersTab />}
-
+			<OverviewTab
+				role={role || null}
+				isManaged={isManaged}
+				permissionTypes={permissionTypes}
+				onPermissionClick={(key): void => setActivePermission(key)}
+			/>
 			{!isManaged && (
 				<>
 					<PermissionSidePanel
 						open={activePermission !== null}
 						onClose={(): void => setActivePermission(null)}
 						permissionLabel={activePermission ? capitalize(activePermission) : ''}
+						relation={activePermission ?? ''}
 						resources={resourcesForActivePermission}
 						initialConfig={initialConfig}
 						isLoading={isLoadingObjects}
 						isSaving={isSaving}
+						canEdit={hasUpdatePermission}
 						onSave={handleSave}
 					/>
 

frontend/src/container/RolesSettings/RoleDetails/__tests__/RoleDetailsPage.test.tsx

@@ -1,5 +1,3 @@
-jest.mock('../../config', () => ({ IS_ROLE_DETAILS_AND_CRUD_ENABLED: true }));
-
 import * as roleApi from 'api/generated/services/role';
 import {
 	customRoleResponse,
@@ -15,9 +13,16 @@ import {
 	waitFor,
 	within,
 } from 'tests/test-utils';
-
+import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
+import {
+	mockUseAuthZDenyAll,
+	mockUseAuthZGrantAll,
+} from 'tests/authz-test-utils';
 import RoleDetailsPage from '../RoleDetailsPage';
 
+jest.mock('hooks/useAuthZ/useAuthZ');
+const mockUseAuthZ = useAuthZ as jest.MockedFunction<typeof useAuthZ>;
+
 const CUSTOM_ROLE_ID = '019c24aa-3333-0001-aaaa-111111111111';
 const MANAGED_ROLE_ID = '019c24aa-2248-756f-9833-984f1ab63819';
 
@@ -29,7 +34,7 @@ const allScopeObjectsResponse = {
 	status: 'success',
 	data: [
 		{
-			resource: { kind: 'role', type: 'metaresources' },
+			resource: { kind: 'role', type: 'role' },
 			selectors: ['*'],
 		},
 	],
@@ -46,6 +51,10 @@ function setupDefaultHandlers(roleId = CUSTOM_ROLE_ID): void {
 	);
 }
 
+beforeEach(() => {
+	mockUseAuthZ.mockImplementation(mockUseAuthZGrantAll);
+});
+
 afterEach(() => {
 	jest.clearAllMocks();
 	server.resetHandlers();
@@ -63,9 +72,6 @@ describe('RoleDetailsPage', () => {
 			screen.findByText('Role — billing-manager'),
 		).resolves.toBeInTheDocument();
 
-		expect(screen.getByText('Overview')).toBeInTheDocument();
-		expect(screen.getByText('Members')).toBeInTheDocument();
-
 		expect(
 			screen.getByText('Custom role for managing billing and invoices.'),
 		).toBeInTheDocument();
@@ -212,6 +218,18 @@ describe('RoleDetailsPage', () => {
 		);
 	});
 
+	it('shows PermissionDeniedFullPage when read permission is denied via query param', async () => {
+		mockUseAuthZ.mockImplementation(mockUseAuthZDenyAll);
+
+		render(<RoleDetailsPage />, undefined, {
+			initialRoute: `/settings/roles/${CUSTOM_ROLE_ID}?name=billing-manager`,
+		});
+
+		await expect(
+			screen.findByText(/you don't have permission to view this page/i),
+		).resolves.toBeInTheDocument();
+	});
+
 	describe('permission side panel', () => {
 		beforeEach(() => {
 			// Both hooks mocked so data renders synchronously — no React Query scheduler or MSW round-trip.
@@ -238,7 +256,18 @@ describe('RoleDetailsPage', () => {
 			const panel = document.querySelector(
 				'.permission-side-panel',
 			) as HTMLElement;
-			await within(panel).findByRole('button', { name: 'Role' });
+			await within(panel).findByRole('button', { name: 'role' });
+			return panel;
+		}
+
+		async function openReadPanel(): Promise<HTMLElement> {
+			await screen.findByText('Role — billing-manager');
+			fireEvent.click(screen.getByText('Read'));
+			await screen.findByText('Edit Read Permissions');
+			const panel = document.querySelector(
+				'.permission-side-panel',
+			) as HTMLElement;
+			await within(panel).findByRole('button', { name: 'role' });
 			return panel;
 		}
 
@@ -253,7 +282,7 @@ describe('RoleDetailsPage', () => {
 				within(panel).getByRole('button', { name: /save changes/i }),
 			).toBeDisabled();
 
-			fireEvent.click(within(panel).getByRole('button', { name: 'Role' }));
+			fireEvent.click(within(panel).getByRole('button', { name: 'role' }));
 			fireEvent.click(screen.getByText('All'));
 
 			expect(
@@ -281,7 +310,7 @@ describe('RoleDetailsPage', () => {
 
 			const panel = await openCreatePanel();
 
-			fireEvent.click(within(panel).getByRole('button', { name: 'Role' }));
+			fireEvent.click(within(panel).getByRole('button', { name: 'role' }));
 			fireEvent.click(screen.getByText('All'));
 			fireEvent.click(
 				within(panel).getByRole('button', { name: /save changes/i }),
@@ -317,9 +346,11 @@ describe('RoleDetailsPage', () => {
 				initialRoute: `/settings/roles/${CUSTOM_ROLE_ID}`,
 			});
 
-			const panel = await openCreatePanel();
+			const panel = await openReadPanel();
 
-			fireEvent.click(within(panel).getByRole('button', { name: 'Role' }));
+			fireEvent.click(within(panel).getByRole('button', { name: 'role' }));
+			// Default is NONE, so switch to Only selected first to reveal the combobox
+			fireEvent.click(screen.getByText('Only selected'));
 
 			const combobox = within(panel).getByRole('combobox');
 			fireEvent.change(combobox, { target: { value: 'role-001' } });
@@ -342,6 +373,48 @@ describe('RoleDetailsPage', () => {
 			);
 		});
 
+		it('set scope to None on create panel (existing All) → patchObjects deletions: ["*"], additions: null', async () => {
+			const patchSpy = jest.fn();
+
+			jest.spyOn(roleApi, 'useGetObjects').mockReturnValue({
+				data: allScopeObjectsResponse,
+				isLoading: false,
+			} as any);
+			server.use(
+				rest.patch(
+					`${rolesApiBase}/:id/relations/:relation/objects`,
+					async (req, res, ctx) => {
+						patchSpy(await req.json());
+						return res(ctx.status(200), ctx.json({ status: 'success', data: null }));
+					},
+				),
+			);
+
+			render(<RoleDetailsPage />, undefined, {
+				initialRoute: `/settings/roles/${CUSTOM_ROLE_ID}`,
+			});
+
+			const panel = await openCreatePanel();
+
+			fireEvent.click(within(panel).getByRole('button', { name: 'role' }));
+			fireEvent.click(screen.getByText('None'));
+			fireEvent.click(
+				within(panel).getByRole('button', { name: /save changes/i }),
+			);
+
+			await waitFor(() =>
+				expect(patchSpy).toHaveBeenCalledWith({
+					additions: null,
+					deletions: [
+						{
+							resource: { kind: 'role', type: 'role' },
+							selectors: ['*'],
+						},
+					],
+				}),
+			);
+		});
+
 		it('existing All scope changed to Only selected (empty) → patchObjects deletions: ["*"], additions: null', async () => {
 			const patchSpy = jest.fn();
 
@@ -363,9 +436,9 @@ describe('RoleDetailsPage', () => {
 				initialRoute: `/settings/roles/${CUSTOM_ROLE_ID}`,
 			});
 
-			const panel = await openCreatePanel();
+			const panel = await openReadPanel();
 
-			fireEvent.click(within(panel).getByRole('button', { name: 'Role' }));
+			fireEvent.click(within(panel).getByRole('button', { name: 'role' }));
 			fireEvent.click(screen.getByText('Only selected'));
 			fireEvent.click(
 				within(panel).getByRole('button', { name: /save changes/i }),
@@ -393,7 +466,7 @@ describe('RoleDetailsPage', () => {
 
 			expect(screen.queryByText(/unsaved change/)).not.toBeInTheDocument();
 
-			fireEvent.click(within(panel).getByRole('button', { name: 'Role' }));
+			fireEvent.click(within(panel).getByRole('button', { name: 'role' }));
 			fireEvent.click(screen.getByText('All'));
 
 			expect(screen.getByText('1 unsaved change')).toBeInTheDocument();

frontend/src/container/RolesSettings/RoleDetails/components/OverviewTab.tsx

@@ -2,6 +2,7 @@ import { Callout } from '@signozhq/ui/callout';
 
 import { PermissionType, TimestampBadge } from '../../utils';
 import PermissionItem from './PermissionItem';
+import { AuthtypesRelationDTO } from 'api/generated/services/sigNoz.schemas';
 
 interface OverviewTabProps {
 	role: {
@@ -55,18 +56,28 @@ function OverviewTab({
 			<div className="role-details-permissions">
 				<div className="role-details-permissions-header">
 					<span className="role-details-section-label">Permissions</span>
+					<a
+						href="https://signoz.io/docs/manage/administrator-guide/iam/permissions/"
+						target="_blank"
+						rel="noopener noreferrer"
+						className="role-details-permissions-learn-more"
+					>
+						Learn more
+					</a>
 					<hr className="role-details-permissions-divider" />
 				</div>
 
 				<div className="role-details-permission-list">
-					{permissionTypes.map((permissionType) => (
-						<PermissionItem
-							key={permissionType.key}
-							permissionType={permissionType}
-							isManaged={isManaged}
-							onPermissionClick={onPermissionClick}
-						/>
-					))}
+					{permissionTypes
+						.filter((p) => p.key !== AuthtypesRelationDTO.assignee)
+						.map((permissionType) => (
+							<PermissionItem
+								key={permissionType.key}
+								permissionType={permissionType}
+								isManaged={isManaged}
+								onPermissionClick={onPermissionClick}
+							/>
+						))}
 				</div>
 			</div>
 		</div>

frontend/src/container/RolesSettings/RolesComponents/DeleteRoleModal.tsx

@@ -27,9 +27,8 @@ function DeleteRoleModal({
 				<Button
 					key="cancel"
 					className="cancel-btn"
-					prefix={<X size={16} />}
+					prefix={<X size={14} />}
 					onClick={onCancel}
-					size="sm"
 					variant="solid"
 					color="secondary"
 				>
@@ -38,10 +37,9 @@ function DeleteRoleModal({
 				<Button
 					key="delete"
 					className="delete-btn"
-					prefix={<Trash2 size={16} />}
+					prefix={<Trash2 size={14} />}
 					onClick={onConfirm}
 					loading={isDeleting}
-					size="sm"
 					variant="solid"
 					color="destructive"
 				>

frontend/src/container/RolesSettings/RolesComponents/RolesListingTable.tsx

@@ -4,16 +4,17 @@ import { Pagination, Skeleton } from 'antd';
 import { useListRoles } from 'api/generated/services/role';
 import { AuthtypesRoleDTO } from 'api/generated/services/sigNoz.schemas';
 import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';
+import PermissionDeniedFullPage from 'components/PermissionDeniedFullPage/PermissionDeniedFullPage';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import ROUTES from 'constants/routes';
+import { RoleListPermission } from 'hooks/useAuthZ/permissions/role.permissions';
+import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
 import useUrlQuery from 'hooks/useUrlQuery';
 import LineClampedText from 'periscope/components/LineClampedText/LineClampedText';
 import { useTimezone } from 'providers/Timezone';
 import { RoleType } from 'types/roles';
 import { toAPIError } from 'utils/errorUtils';
 
-import { IS_ROLE_DETAILS_AND_CRUD_ENABLED } from '../config';
-
 import '../RolesSettings.styles.scss';
 
 const PAGE_SIZE = 20;
@@ -29,7 +30,14 @@ interface RolesListingTableProps {
 function RolesListingTable({
 	searchQuery,
 }: RolesListingTableProps): JSX.Element {
-	const { data, isLoading, isError, error } = useListRoles();
+	const { permissions: listPerms, isLoading: isAuthZLoading } = useAuthZ([
+		RoleListPermission,
+	]);
+	const hasListPermission = listPerms?.[RoleListPermission]?.isGranted ?? false;
+
+	const { data, isLoading, isError, error } = useListRoles({
+		query: { enabled: hasListPermission },
+	});
 	const { formatTimezoneAdjustedTimestamp } = useTimezone();
 	const history = useHistory();
 	const urlQuery = useUrlQuery();
@@ -151,7 +159,11 @@ function RolesListingTable({
 		</>
 	);
 
-	if (isLoading) {
+	if (!hasListPermission && listPerms !== null) {
+		return <PermissionDeniedFullPage permissionName="role:list" />;
+	}
+
+	if (isAuthZLoading || isLoading) {
 		return (
 			<div className="roles-listing-table">
 				<Skeleton active paragraph={{ rows: 5 }} />
@@ -182,31 +194,26 @@ function RolesListingTable({
 		);
 	}
 
-	const navigateToRole = (roleId: string): void => {
-		history.push(ROUTES.ROLE_DETAILS.replace(':roleId', roleId));
+	const navigateToRole = (roleId: string, roleName?: string): void => {
+		const search = roleName ? `?name=${encodeURIComponent(roleName)}` : '';
+		history.push(`${ROUTES.ROLE_DETAILS.replace(':roleId', roleId)}${search}`);
 	};
 
 	// todo: use table from periscope when its available for consumption
 	const renderRow = (role: AuthtypesRoleDTO): JSX.Element => (
 		<div
 			key={role.id}
-			className={`roles-table-row ${
-				IS_ROLE_DETAILS_AND_CRUD_ENABLED ? 'roles-table-row--clickable' : ''
-			}`}
+			className="roles-table-row roles-table-row--clickable"
 			role="button"
-			tabIndex={IS_ROLE_DETAILS_AND_CRUD_ENABLED ? 0 : -1}
+			tabIndex={0}
 			onClick={(): void => {
-				if (IS_ROLE_DETAILS_AND_CRUD_ENABLED && role.id) {
-					navigateToRole(role.id);
+				if (role.id) {
+					navigateToRole(role.id, role.name);
 				}
 			}}
 			onKeyDown={(e): void => {
-				if (
-					IS_ROLE_DETAILS_AND_CRUD_ENABLED &&
-					(e.key === 'Enter' || e.key === ' ') &&
-					role.id
-				) {
-					navigateToRole(role.id);
+				if ((e.key === 'Enter' || e.key === ' ') && role.id) {
+					navigateToRole(role.id, role.name);
 				}
 			}}
 		>

frontend/src/container/RolesSettings/RolesSettings.styles.scss

@@ -22,12 +22,21 @@
 			color: var(--foreground);
 			font-family: Inter;
 			font-style: normal;
-			font-size: 14px;
-			font-weight: 400;
+			font-size: var(--paragraph-base-400-font-size);
+			font-weight: var(--paragraph-base-400-font-weight);
 			line-height: 20px;
 			letter-spacing: -0.07px;
 			margin: 0;
 		}
+
+		.roles-settings-header-learn-more {
+			color: var(--primary);
+			text-decoration: none;
+
+			&:hover {
+				text-decoration: underline;
+			}
+		}
 	}
 
 	.roles-settings-content {
@@ -285,16 +294,23 @@
 			}
 		}
 
-		// todo: https://github.com/SigNoz/components/issues/116
-		input,
+		input {
+			&::placeholder {
+				opacity: 0.4;
+			}
+		}
+
 		textarea {
 			width: 100%;
-			background: var(--l3-background);
-			border: 1px solid var(--l1-border);
+			box-sizing: border-box;
+			min-height: 100px;
+			resize: vertical;
+			background: var(--input-background, transparent);
+			border: 1px solid var(--border);
 			border-radius: 2px;
 			padding: 6px 8px;
 			font-family: Inter;
-			font-size: 14px;
+			font-size: var(--font-size-xs);
 			font-weight: 400;
 			line-height: 18px;
 			letter-spacing: -0.07px;
@@ -303,7 +319,7 @@
 			box-shadow: none;
 
 			&::placeholder {
-				color: var(--l3-foreground);
+				color: var(--muted-foreground);
 				opacity: 0.4;
 			}
 
@@ -313,25 +329,6 @@
 				box-shadow: none;
 			}
 		}
-
-		input {
-			height: 32px;
-		}
-
-		input:disabled {
-			opacity: 0.5;
-			cursor: not-allowed;
-
-			&:hover {
-				border-color: var(--l1-border);
-				box-shadow: none;
-			}
-		}
-
-		textarea {
-			min-height: 100px;
-			resize: vertical;
-		}
 	}
 
 	.ant-modal-footer {

frontend/src/container/RolesSettings/RolesSettings.tsx

@@ -2,8 +2,9 @@ import { useState } from 'react';
 import { Plus } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
+import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
+import { RoleCreatePermission } from 'hooks/useAuthZ/permissions/role.permissions';
 
-import { IS_ROLE_DETAILS_AND_CRUD_ENABLED } from './config';
 import CreateRoleModal from './RolesComponents/CreateRoleModal';
 import RolesListingTable from './RolesComponents/RolesListingTable';
 
@@ -18,7 +19,15 @@ function RolesSettings(): JSX.Element {
 			<div className="roles-settings-header">
 				<h3 className="roles-settings-header-title">Roles</h3>
 				<p className="roles-settings-header-description">
-					Create and manage custom roles for your team.
+					Create and manage custom roles for your team.{' '}
+					<a
+						href="https://signoz.io/docs/manage/administrator-guide/iam/roles/"
+						target="_blank"
+						rel="noopener noreferrer"
+						className="roles-settings-header-learn-more"
+					>
+						Learn more
+					</a>
 				</p>
 			</div>
 			<div className="roles-settings-content">
@@ -29,7 +38,7 @@ function RolesSettings(): JSX.Element {
 						value={searchQuery}
 						onChange={(e): void => setSearchQuery(e.target.value)}
 					/>
-					{IS_ROLE_DETAILS_AND_CRUD_ENABLED && (
+					<AuthZTooltip checks={[RoleCreatePermission]}>
 						<Button
 							variant="solid"
 							color="primary"
@@ -39,7 +48,7 @@ function RolesSettings(): JSX.Element {
 							<Plus size={14} />
 							Custom role
 						</Button>
-					)}
+					</AuthZTooltip>
 				</div>
 				<RolesListingTable searchQuery={searchQuery} />
 			</div>

frontend/src/container/RolesSettings/__tests__/RolesSettings.test.tsx

@@ -5,13 +5,19 @@ import {
 import { server } from 'mocks-server/server';
 import { rest } from 'msw';
 import { fireEvent, render, screen } from 'tests/test-utils';
+import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
+import { mockUseAuthZGrantAll } from 'tests/authz-test-utils';
 
 import RolesSettings from '../RolesSettings';
 
+jest.mock('hooks/useAuthZ/useAuthZ');
+const mockUseAuthZ = useAuthZ as jest.MockedFunction<typeof useAuthZ>;
+
 const rolesApiURL = 'http://localhost/api/v1/roles';
 
 describe('RolesSettings', () => {
 	beforeEach(() => {
+		mockUseAuthZ.mockImplementation(mockUseAuthZGrantAll);
 		server.use(
 			rest.get(rolesApiURL, (_req, res, ctx) =>
 				res(ctx.status(200), ctx.json(listRolesSuccessResponse)),

frontend/src/container/RolesSettings/__tests__/utils.test.ts

@@ -58,8 +58,18 @@ const baseAuthzResources: AuthzResources = {
 };
 
 const resourceDefs: ResourceDefinition[] = [
-	{ id: 'dashboard', label: 'Dashboard' },
-	{ id: 'alert', label: 'Alert' },
+	{
+		id: 'metaresource:dashboard',
+		kind: 'dashboard',
+		type: 'metaresource',
+		label: 'Dashboard',
+	},
+	{
+		id: 'metaresource:alert',
+		kind: 'alert',
+		type: 'metaresource',
+		label: 'Alert',
+	},
 ];
 
 const ID_A = 'aaaaaaaa-0000-0000-0000-000000000001';
@@ -69,15 +79,24 @@ const ID_C = 'cccccccc-0000-0000-0000-000000000003';
 describe('buildPatchPayload', () => {
 	it('sends only the added selector as an addition', () => {
 		const initial: PermissionConfig = {
-			dashboard: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [ID_A] },
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
+			'metaresource:dashboard': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [ID_A],
+			},
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
 		};
 		const newConfig: PermissionConfig = {
-			dashboard: {
+			'metaresource:dashboard': {
 				scope: PermissionScope.ONLY_SELECTED,
 				selectedIds: [ID_A, ID_B],
 			},
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
 		};
 
 		const result = buildPatchPayload({
@@ -95,18 +114,24 @@ describe('buildPatchPayload', () => {
 
 	it('sends only the removed selector as a deletion', () => {
 		const initial: PermissionConfig = {
-			dashboard: {
+			'metaresource:dashboard': {
 				scope: PermissionScope.ONLY_SELECTED,
 				selectedIds: [ID_A, ID_B, ID_C],
 			},
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
 		};
 		const newConfig: PermissionConfig = {
-			dashboard: {
+			'metaresource:dashboard': {
 				scope: PermissionScope.ONLY_SELECTED,
 				selectedIds: [ID_A, ID_C],
 			},
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
 		};
 
 		const result = buildPatchPayload({
@@ -124,18 +149,24 @@ describe('buildPatchPayload', () => {
 
 	it('treats selector order as irrelevant — produces no payload when IDs are identical', () => {
 		const initial: PermissionConfig = {
-			dashboard: {
+			'metaresource:dashboard': {
 				scope: PermissionScope.ONLY_SELECTED,
 				selectedIds: [ID_A, ID_B],
 			},
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
 		};
 		const newConfig: PermissionConfig = {
-			dashboard: {
+			'metaresource:dashboard': {
 				scope: PermissionScope.ONLY_SELECTED,
 				selectedIds: [ID_B, ID_A],
 			},
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
 		};
 
 		const result = buildPatchPayload({
@@ -151,15 +182,21 @@ describe('buildPatchPayload', () => {
 
 	it('replaces wildcard with specific IDs when switching all → only_selected', () => {
 		const initial: PermissionConfig = {
-			dashboard: { scope: PermissionScope.ALL, selectedIds: [] },
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
+			'metaresource:dashboard': { scope: PermissionScope.ALL, selectedIds: [] },
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
 		};
 		const newConfig: PermissionConfig = {
-			dashboard: {
+			'metaresource:dashboard': {
 				scope: PermissionScope.ONLY_SELECTED,
 				selectedIds: [ID_A, ID_B],
 			},
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
 		};
 
 		const result = buildPatchPayload({
@@ -179,12 +216,21 @@ describe('buildPatchPayload', () => {
 
 	it('only deletes wildcard when switching all → only_selected with empty selector list', () => {
 		const initial: PermissionConfig = {
-			dashboard: { scope: PermissionScope.ALL, selectedIds: [] },
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
+			'metaresource:dashboard': { scope: PermissionScope.ALL, selectedIds: [] },
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
 		};
 		const newConfig: PermissionConfig = {
-			dashboard: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
+			'metaresource:dashboard': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
 		};
 
 		const result = buildPatchPayload({
@@ -200,14 +246,135 @@ describe('buildPatchPayload', () => {
 		expect(result.additions).toBeNull();
 	});
 
-	it('only includes resources that actually changed', () => {
+	it('ALL → NONE: deletes wildcard, no additions', () => {
 		const initial: PermissionConfig = {
-			dashboard: { scope: PermissionScope.ALL, selectedIds: [] },
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [ID_A] },
+			'metaresource:dashboard': { scope: PermissionScope.ALL, selectedIds: [] },
+			'metaresource:alert': { scope: PermissionScope.NONE, selectedIds: [] },
 		};
 		const newConfig: PermissionConfig = {
-			dashboard: { scope: PermissionScope.ALL, selectedIds: [] }, // unchanged
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [ID_A, ID_B] }, // added ID_B
+			'metaresource:dashboard': { scope: PermissionScope.NONE, selectedIds: [] },
+			'metaresource:alert': { scope: PermissionScope.NONE, selectedIds: [] },
+		};
+
+		const result = buildPatchPayload({
+			newConfig,
+			initialConfig: initial,
+			resources: resourceDefs,
+			authzRes: baseAuthzResources,
+		});
+
+		expect(result.deletions).toStrictEqual([
+			{ resource: dashboardResource, selectors: ['*'] },
+		]);
+		expect(result.additions).toBeNull();
+	});
+
+	it('NONE → ALL: adds wildcard, no deletions', () => {
+		const initial: PermissionConfig = {
+			'metaresource:dashboard': { scope: PermissionScope.NONE, selectedIds: [] },
+			'metaresource:alert': { scope: PermissionScope.NONE, selectedIds: [] },
+		};
+		const newConfig: PermissionConfig = {
+			'metaresource:dashboard': { scope: PermissionScope.ALL, selectedIds: [] },
+			'metaresource:alert': { scope: PermissionScope.NONE, selectedIds: [] },
+		};
+
+		const result = buildPatchPayload({
+			newConfig,
+			initialConfig: initial,
+			resources: resourceDefs,
+			authzRes: baseAuthzResources,
+		});
+
+		expect(result.additions).toStrictEqual([
+			{ resource: dashboardResource, selectors: ['*'] },
+		]);
+		expect(result.deletions).toBeNull();
+	});
+
+	it('ONLY_SELECTED → NONE: deletes selected IDs, no additions', () => {
+		const initial: PermissionConfig = {
+			'metaresource:dashboard': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [ID_A, ID_B],
+			},
+			'metaresource:alert': { scope: PermissionScope.NONE, selectedIds: [] },
+		};
+		const newConfig: PermissionConfig = {
+			'metaresource:dashboard': { scope: PermissionScope.NONE, selectedIds: [] },
+			'metaresource:alert': { scope: PermissionScope.NONE, selectedIds: [] },
+		};
+
+		const result = buildPatchPayload({
+			newConfig,
+			initialConfig: initial,
+			resources: resourceDefs,
+			authzRes: baseAuthzResources,
+		});
+
+		expect(result.deletions).toStrictEqual([
+			{ resource: dashboardResource, selectors: [ID_A, ID_B] },
+		]);
+		expect(result.additions).toBeNull();
+	});
+
+	it('NONE → ONLY_SELECTED with IDs: adds those IDs, no deletions', () => {
+		const initial: PermissionConfig = {
+			'metaresource:dashboard': { scope: PermissionScope.NONE, selectedIds: [] },
+			'metaresource:alert': { scope: PermissionScope.NONE, selectedIds: [] },
+		};
+		const newConfig: PermissionConfig = {
+			'metaresource:dashboard': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [ID_A],
+			},
+			'metaresource:alert': { scope: PermissionScope.NONE, selectedIds: [] },
+		};
+
+		const result = buildPatchPayload({
+			newConfig,
+			initialConfig: initial,
+			resources: resourceDefs,
+			authzRes: baseAuthzResources,
+		});
+
+		expect(result.additions).toStrictEqual([
+			{ resource: dashboardResource, selectors: [ID_A] },
+		]);
+		expect(result.deletions).toBeNull();
+	});
+
+	it('NONE → NONE: no change, produces empty payload', () => {
+		const initial: PermissionConfig = {
+			'metaresource:dashboard': { scope: PermissionScope.NONE, selectedIds: [] },
+			'metaresource:alert': { scope: PermissionScope.NONE, selectedIds: [] },
+		};
+
+		const result = buildPatchPayload({
+			newConfig: { ...initial },
+			initialConfig: initial,
+			resources: resourceDefs,
+			authzRes: baseAuthzResources,
+		});
+
+		expect(result.additions).toBeNull();
+		expect(result.deletions).toBeNull();
+	});
+
+	it('only includes resources that actually changed', () => {
+		const initial: PermissionConfig = {
+			'metaresource:dashboard': { scope: PermissionScope.ALL, selectedIds: [] },
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [ID_A],
+			},
+		};
+		const newConfig: PermissionConfig = {
+			'metaresource:dashboard': { scope: PermissionScope.ALL, selectedIds: [] }, // unchanged
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [ID_A, ID_B],
+			}, // added ID_B
 		};
 
 		const result = buildPatchPayload({
@@ -232,7 +399,7 @@ describe('objectsToPermissionConfig', () => {
 
 		const result = objectsToPermissionConfig(objects, resourceDefs);
 
-		expect(result.dashboard).toStrictEqual({
+		expect(result['metaresource:dashboard']).toStrictEqual({
 			scope: PermissionScope.ALL,
 			selectedIds: [],
 		});
@@ -245,21 +412,21 @@ describe('objectsToPermissionConfig', () => {
 
 		const result = objectsToPermissionConfig(objects, resourceDefs);
 
-		expect(result.dashboard).toStrictEqual({
+		expect(result['metaresource:dashboard']).toStrictEqual({
 			scope: PermissionScope.ONLY_SELECTED,
 			selectedIds: [ID_A, ID_B],
 		});
 	});
 
-	it('defaults to ONLY_SELECTED with empty selectedIds when resource is absent from API response', () => {
+	it('defaults to NONE scope when resource is absent from API response', () => {
 		const result = objectsToPermissionConfig([], resourceDefs);
 
-		expect(result.dashboard).toStrictEqual({
-			scope: PermissionScope.ONLY_SELECTED,
+		expect(result['metaresource:dashboard']).toStrictEqual({
+			scope: PermissionScope.NONE,
 			selectedIds: [],
 		});
-		expect(result.alert).toStrictEqual({
-			scope: PermissionScope.ONLY_SELECTED,
+		expect(result['metaresource:alert']).toStrictEqual({
+			scope: PermissionScope.NONE,
 			selectedIds: [],
 		});
 	});
@@ -268,8 +435,11 @@ describe('objectsToPermissionConfig', () => {
 describe('configsEqual', () => {
 	it('returns true for identical configs', () => {
 		const config: PermissionConfig = {
-			dashboard: { scope: PermissionScope.ALL, selectedIds: [] },
-			alert: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [ID_A] },
+			'metaresource:dashboard': { scope: PermissionScope.ALL, selectedIds: [] },
+			'metaresource:alert': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [ID_A],
+			},
 		};
 
 		expect(configsEqual(config, { ...config })).toBe(true);
@@ -277,22 +447,25 @@ describe('configsEqual', () => {
 
 	it('returns false when configs differ', () => {
 		const a: PermissionConfig = {
-			dashboard: { scope: PermissionScope.ALL, selectedIds: [] },
+			'metaresource:dashboard': { scope: PermissionScope.ALL, selectedIds: [] },
 		};
 		const b: PermissionConfig = {
-			dashboard: { scope: PermissionScope.ONLY_SELECTED, selectedIds: [] },
+			'metaresource:dashboard': {
+				scope: PermissionScope.ONLY_SELECTED,
+				selectedIds: [],
+			},
 		};
 
 		expect(configsEqual(a, b)).toBe(false);
 
 		const c: PermissionConfig = {
-			dashboard: {
+			'metaresource:dashboard': {
 				scope: PermissionScope.ONLY_SELECTED,
 				selectedIds: [ID_C, ID_B],
 			},
 		};
 		const d: PermissionConfig = {
-			dashboard: {
+			'metaresource:dashboard': {
 				scope: PermissionScope.ONLY_SELECTED,
 				selectedIds: [ID_A, ID_B],
 			},
@@ -303,13 +476,13 @@ describe('configsEqual', () => {
 
 	it('returns true when selectedIds are the same but in different order', () => {
 		const a: PermissionConfig = {
-			dashboard: {
+			'metaresource:dashboard': {
 				scope: PermissionScope.ONLY_SELECTED,
 				selectedIds: [ID_A, ID_B],
 			},
 		};
 		const b: PermissionConfig = {
-			dashboard: {
+			'metaresource:dashboard': {
 				scope: PermissionScope.ONLY_SELECTED,
 				selectedIds: [ID_B, ID_A],
 			},
@@ -322,23 +495,26 @@ describe('configsEqual', () => {
 describe('buildConfig', () => {
 	it('uses initial values when provided and defaults for resources not in initial', () => {
 		const initial: PermissionConfig = {
-			dashboard: { scope: PermissionScope.ALL, selectedIds: [] },
+			'metaresource:dashboard': { scope: PermissionScope.ALL, selectedIds: [] },
 		};
 
 		const result = buildConfig(resourceDefs, initial);
 
-		expect(result.dashboard).toStrictEqual({
+		expect(result['metaresource:dashboard']).toStrictEqual({
 			scope: PermissionScope.ALL,
 			selectedIds: [],
 		});
-		expect(result.alert).toStrictEqual(DEFAULT_RESOURCE_CONFIG);
+		expect(result['metaresource:alert']).toStrictEqual(DEFAULT_RESOURCE_CONFIG);
 	});
 
-	it('applies DEFAULT_RESOURCE_CONFIG to all resources when no initial is provided', () => {
+	it('applies DEFAULT_RESOURCE_CONFIG (NONE scope) to all resources when no initial is provided', () => {
 		const result = buildConfig(resourceDefs);
 
-		expect(result.dashboard).toStrictEqual(DEFAULT_RESOURCE_CONFIG);
-		expect(result.alert).toStrictEqual(DEFAULT_RESOURCE_CONFIG);
+		expect(result['metaresource:dashboard']).toStrictEqual(
+			DEFAULT_RESOURCE_CONFIG,
+		);
+		expect(result['metaresource:alert']).toStrictEqual(DEFAULT_RESOURCE_CONFIG);
+		expect(DEFAULT_RESOURCE_CONFIG.scope).toBe(PermissionScope.NONE);
 	});
 });
 
@@ -375,7 +551,10 @@ describe('deriveResourcesForRelation', () => {
 		const result = deriveResourcesForRelation(baseAuthzResources, 'create');
 
 		expect(result).toHaveLength(2);
-		expect(result.map((r) => r.id)).toStrictEqual(['dashboard', 'alert']);
+		expect(result.map((r) => r.id)).toStrictEqual([
+			'metaresource:dashboard',
+			'metaresource:alert',
+		]);
 	});
 
 	it('returns an empty array when authzResources is null', () => {