chore: initial commit

docs/api/openapi.yml

@@ -2342,8 +2342,6 @@ components:
           type: boolean
         org_id:
           type: string
-        source:
-          $ref: '#/components/schemas/DashboardtypesSource'
         updatedAt:
           format: date-time
           type: string
@@ -2373,12 +2371,6 @@ components:
         timeRangeEnabled:
           type: boolean
       type: object
-    DashboardtypesSource:
-      enum:
-      - user
-      - system
-      - integration
-      type: object
     DashboardtypesStorableDashboardData:
       additionalProperties: {}
       type: object

ee/modules/dashboard/impldashboard/module.go

@@ -49,14 +49,6 @@ func (module *module) CreatePublic(ctx context.Context, orgID valuer.UUID, publi
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
 	}
 
-	dashboard, err := module.Get(ctx, orgID, publicDashboard.DashboardID)
-	if err != nil {
-		return err
-	}
-	if err := dashboard.ErrIfNotPublishable(); err != nil {
-		return err
-	}
-
 	storablePublicDashboard, err := module.store.GetPublic(ctx, publicDashboard.DashboardID.StringValue())
 	if err != nil && !errors.Ast(err, errors.TypeNotFound) {
 		return err
@@ -137,14 +129,6 @@ func (module *module) UpdatePublic(ctx context.Context, orgID valuer.UUID, publi
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
 	}
 
-	dashboard, err := module.Get(ctx, orgID, publicDashboard.DashboardID)
-	if err != nil {
-		return err
-	}
-	if err := dashboard.ErrIfNotPublishable(); err != nil {
-		return err
-	}
-
 	return module.store.UpdatePublic(ctx, dashboardtypes.NewStorablePublicDashboardFromPublicDashboard(publicDashboard))
 }
 
@@ -154,10 +138,6 @@ func (module *module) Delete(ctx context.Context, orgID valuer.UUID, id valuer.U
 		return err
 	}
 
-	if err := dashboard.ErrIfNotDeletable(); err != nil {
-		return err
-	}
-
 	if dashboard.Locked {
 		return errors.New(errors.TypeInvalidInput, errors.CodeInvalidInput, "dashboard is locked, please unlock the dashboard to be delete it")
 	}
@@ -188,14 +168,6 @@ func (module *module) DeletePublic(ctx context.Context, orgID valuer.UUID, dashb
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
 	}
 
-	dashboard, err := module.Get(ctx, orgID, dashboardID)
-	if err != nil {
-		return err
-	}
-	if err := dashboard.ErrIfNotPublishable(); err != nil {
-		return err
-	}
-
 	err = module.store.DeletePublic(ctx, dashboardID.StringValue())
 	if err != nil {
 		return err

frontend/src/AppRoutes/pageComponents.ts

@@ -47,6 +47,7 @@ export const TracesFunnels = Loadable(
 		import(/* webpackChunkName: "Traces Funnels" */ 'pages/TracesModulePage'),
 );
 export const TracesFunnelDetails = Loadable(
+	// eslint-disable-next-line sonarjs/no-identical-functions
 	() =>
 		import(
 			/* webpackChunkName: "Traces Funnel Details" */ 'pages/TracesModulePage'
@@ -312,6 +313,13 @@ export const PublicDashboardPage = Loadable(
 		),
 );
 
+export const AlertTypeSelectionPage = Loadable(
+	() =>
+		import(
+			/* webpackChunkName: "Alert Type Selection Page" */ 'pages/AlertTypeSelection'
+		),
+);
+
 export const MeterExplorerPage = Loadable(
 	() =>
 		import(/* webpackChunkName: "Meter Explorer Page" */ 'pages/MeterExplorer'),

frontend/src/AppRoutes/routes.ts

@@ -5,6 +5,7 @@ import {
 	AIAssistantPage,
 	AlertHistory,
 	AlertOverview,
+	AlertTypeSelectionPage,
 	AllAlertChannels,
 	AllErrors,
 	ApiMonitoring,
@@ -212,6 +213,13 @@ const routes: AppRoutes[] = [
 		isPrivate: true,
 		key: 'LIST_ALL_ALERT',
 	},
+	{
+		path: ROUTES.ALERT_TYPE_SELECTION,
+		exact: true,
+		component: AlertTypeSelectionPage,
+		isPrivate: true,
+		key: 'ALERT_TYPE_SELECTION',
+	},
 	{
 		path: ROUTES.ALERTS_NEW,
 		exact: true,
@@ -525,6 +533,18 @@ export const LIST_LICENSES: AppRoutes = {
 	key: 'LIST_LICENSES',
 };
 
+export const oldRoutes = [
+	'/pipelines',
+	'/logs-explorer',
+	'/logs-explorer/live',
+	'/logs-save-views',
+	'/traces-save-views',
+	'/settings/access-tokens',
+	'/settings/api-keys',
+	'/messaging-queues',
+	'/alerts/edit',
+];
+
 export const oldNewRoutesMapping: Record<string, string> = {
 	'/pipelines': '/logs/pipelines',
 	'/logs-explorer': '/logs/logs-explorer',
@@ -535,9 +555,7 @@ export const oldNewRoutesMapping: Record<string, string> = {
 	'/settings/api-keys': '/settings/service-accounts',
 	'/messaging-queues': '/messaging-queues/overview',
 	'/alerts/edit': '/alerts/overview',
-	'/alerts/type-selection': '/alerts/new',
 };
-export const oldRoutes = Object.keys(oldNewRoutesMapping);
 
 export const ROUTES_NOT_TO_BE_OVERRIDEN: string[] = [
 	ROUTES.WORKSPACE_LOCKED,

frontend/src/api/generated/services/sigNoz.schemas.ts

@@ -2999,11 +2999,6 @@ export interface CoretypesPatchableObjectsDTO {
 	deletions: CoretypesObjectGroupDTO[] | null;
 }
 
-export enum DashboardtypesSourceDTO {
-	user = 'user',
-	system = 'system',
-	integration = 'integration',
-}
 export interface DashboardtypesDashboardDTO {
 	/**
 	 * @type string
@@ -3027,7 +3022,6 @@ export interface DashboardtypesDashboardDTO {
 	 * @type string
 	 */
 	org_id?: string;
-	source?: DashboardtypesSourceDTO;
 	/**
 	 * @type string
 	 * @format date-time

frontend/src/components/AlertBreadcrumb/AlertBreadcrumb.module.scss

@@ -1,17 +0,0 @@
-.breadcrumb {
-	padding-left: 16px;
-
-	ol {
-		align-items: center;
-	}
-
-	:global(.ant-breadcrumb-separator) {
-		color: var(--muted-foreground);
-	}
-}
-
-.divider {
-	border-color: var(--l1-border);
-	margin: 16px 0;
-	margin-top: 10px;
-}

frontend/src/components/AlertBreadcrumb/AlertBreadcrumb.tsx

@@ -1,32 +0,0 @@
-import { Breadcrumb, Divider } from 'antd';
-
-import styles from './AlertBreadcrumb.module.scss';
-import BreadcrumbItem, { BreadcrumbItemConfig } from './BreadcrumbItem';
-
-export interface AlertBreadcrumbProps {
-	items: BreadcrumbItemConfig[];
-	className?: string;
-	showDivider?: boolean;
-}
-
-function AlertBreadcrumb({
-	items,
-	className,
-	showDivider = true,
-}: AlertBreadcrumbProps): JSX.Element {
-	const breadcrumbItems = items.map((item) => ({
-		title: <BreadcrumbItem {...item} />,
-	}));
-
-	return (
-		<>
-			<Breadcrumb
-				className={`${styles.breadcrumb} ${className || ''}`}
-				items={breadcrumbItems}
-			/>
-			{showDivider && <Divider className={styles.divider} />}
-		</>
-	);
-}
-
-export default AlertBreadcrumb;

frontend/src/components/AlertBreadcrumb/BreadcrumbItem.module.scss

@@ -1,9 +0,0 @@
-.item {
-	--button-padding: 0;
-	--button-font-size: var(--periscope-font-size-base);
-}
-
-.itemLast {
-	color: var(--muted-foreground);
-	font-size: var(--periscope-font-size-base);
-}

frontend/src/components/AlertBreadcrumb/BreadcrumbItem.tsx

@@ -1,45 +0,0 @@
-import { Button } from '@signozhq/ui/button';
-import { useSafeNavigate } from 'hooks/useSafeNavigate';
-import { isModifierKeyPressed } from 'utils/app';
-
-import styles from './BreadcrumbItem.module.scss';
-
-export type BreadcrumbItemConfig =
-	| {
-			title: string | null;
-			route?: string;
-	  }
-	| {
-			title: string | null;
-			isLast?: true;
-	  };
-
-function BreadcrumbItem({
-	title,
-	...props
-}: BreadcrumbItemConfig): JSX.Element {
-	const { safeNavigate } = useSafeNavigate();
-
-	if ('isLast' in props) {
-		return <div className={styles.itemLast}>{title}</div>;
-	}
-
-	return (
-		<Button
-			variant="ghost"
-			color="secondary"
-			className={styles.item}
-			onClick={(e: React.MouseEvent): void => {
-				if (!('route' in props) || !props.route) {
-					return;
-				}
-
-				safeNavigate(props.route, { newTab: isModifierKeyPressed(e) });
-			}}
-		>
-			{title}
-		</Button>
-	);
-}
-
-export default BreadcrumbItem;

frontend/src/components/AlertBreadcrumb/index.tsx

@@ -1,6 +0,0 @@
-export { default } from './AlertBreadcrumb';
-export {
-	default as BreadcrumbItem,
-	type BreadcrumbItemConfig,
-} from './BreadcrumbItem';
-export type { AlertBreadcrumbProps } from './AlertBreadcrumb';

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,142 +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
-		// Badge widths: env=37, service=65, region=58, team=44, owner=51, version=65
-		// 220px available = 3 badges (160px) + gaps (8px) + overflow (44px)
-		triggerResize(220);
-
-		// 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)
-		// 220px fits first 3 badges before overflow
-		triggerResize(220);
-
-		// 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,150 +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';
-import { BADGE_GAP, estimateBadgeWidth, OVERFLOW_BADGE_WIDTH } from './utils';
-
-export interface LabelColumnProps {
-	labels: string[];
-	color?:
-		| 'primary'
-		| 'secondary'
-		| 'success'
-		| 'error'
-		| 'warning'
-		| 'robin'
-		| 'forest'
-		| 'amber'
-		| 'sienna'
-		| 'cherry'
-		| 'sakura'
-		| 'aqua'
-		| 'vanilla';
-	value?: { [key: string]: string };
-}
-
-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;
-			let usedWidth = 0;
-			let count = 0;
-
-			for (const label of labels) {
-				const badgeWidth = estimateBadgeWidth(label, value?.[label]) + BADGE_GAP;
-				if (usedWidth + badgeWidth > availableWidth && count > 0) {
-					break;
-				}
-				usedWidth += badgeWidth;
-				count++;
-			}
-
-			return Math.max(1, count);
-		},
-		[labels, value],
-	);
-
-	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/LabelColumn/utils.ts

@@ -1,14 +0,0 @@
-export const BADGE_GAP = 4;
-export const OVERFLOW_BADGE_WIDTH = 40;
-
-export const BADGE_MAX_WIDTH = 180;
-export const BADGE_PADDING = 16;
-export const CHAR_WIDTH = 7;
-
-export function estimateBadgeWidth(label: string, value?: string): number {
-	const displayText = value ? `${label}: ${value}` : label;
-	return Math.min(
-		displayText.length * CHAR_WIDTH + BADGE_PADDING,
-		BADGE_MAX_WIDTH,
-	);
-}

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/InputNumber/InputNumber.styles.scss

@@ -0,0 +1,12 @@
+/* Hide native browser spinners for our number input, matching antd defaults. */
+.signoz-input-number {
+	&::-webkit-outer-spin-button,
+	&::-webkit-inner-spin-button {
+		-webkit-appearance: none;
+		margin: 0;
+	}
+
+	&[type='number'] {
+		-moz-appearance: textfield;
+	}
+}

frontend/src/components/InputNumber/InputNumber.tsx

@@ -0,0 +1,130 @@
+import './InputNumber.styles.scss';
+
+import {
+	ChangeEvent,
+	CSSProperties,
+	FocusEventHandler,
+	forwardRef,
+	KeyboardEventHandler,
+	ReactNode,
+} from 'react';
+import { Input } from '@signozhq/ui/input';
+import cx from 'classnames';
+
+export type InputNumberProps = {
+	value?: number | null;
+	defaultValue?: number | null;
+	onChange?: (value: number | null) => void;
+	min?: number;
+	max?: number;
+	step?: number;
+	/** When set, values emitted via onChange are rounded to this many decimals. */
+	precision?: number;
+	placeholder?: string;
+	disabled?: boolean;
+	prefix?: ReactNode;
+	suffix?: ReactNode;
+	className?: string;
+	rootClassName?: string;
+	style?: CSSProperties;
+	id?: string;
+	name?: string;
+	testId?: string;
+	autoFocus?: boolean;
+	onKeyDown?: KeyboardEventHandler<HTMLInputElement>;
+	onBlur?: FocusEventHandler<HTMLInputElement>;
+	onFocus?: FocusEventHandler<HTMLInputElement>;
+	'aria-label'?: string;
+	'data-testid'?: string;
+};
+
+const toInputValue = (value: number | null | undefined): string | undefined => {
+	if (value === null || value === undefined || Number.isNaN(value)) {
+		return '';
+	}
+	return String(value);
+};
+
+const parseValue = (raw: string, precision?: number): number | null => {
+	if (raw === '' || raw === '-') {
+		return null;
+	}
+	const parsed = Number(raw);
+	if (Number.isNaN(parsed)) {
+		return null;
+	}
+	if (precision === undefined) {
+		return parsed;
+	}
+	const factor = 10 ** precision;
+	return Math.round(parsed * factor) / factor;
+};
+
+const InputNumber = forwardRef<HTMLInputElement, InputNumberProps>(
+	(
+		{
+			value,
+			defaultValue,
+			onChange,
+			min,
+			max,
+			step,
+			precision,
+			placeholder,
+			disabled,
+			prefix,
+			suffix,
+			className,
+			rootClassName,
+			style,
+			id,
+			name,
+			testId,
+			autoFocus,
+			onKeyDown,
+			onBlur,
+			onFocus,
+			'aria-label': ariaLabel,
+			'data-testid': dataTestId,
+		},
+		ref,
+	): JSX.Element => {
+		const handleChange = (event: ChangeEvent<HTMLInputElement>): void => {
+			onChange?.(parseValue(event.target.value, precision));
+		};
+
+		return (
+			<Input
+				ref={ref}
+				type="number"
+				value={value === undefined ? undefined : toInputValue(value)}
+				defaultValue={
+					defaultValue === undefined ? undefined : toInputValue(defaultValue)
+				}
+				onChange={handleChange}
+				min={min}
+				max={max}
+				step={step}
+				placeholder={placeholder}
+				disabled={disabled}
+				prefix={prefix}
+				suffix={suffix}
+				className={cx('signoz-input-number', className)}
+				containerClassName={cx('signoz-input-number-container', rootClassName)}
+				style={style}
+				id={id}
+				name={name}
+				testId={testId ?? dataTestId}
+				autoFocus={autoFocus}
+				onKeyDown={onKeyDown}
+				onBlur={onBlur}
+				onFocus={onFocus}
+				aria-label={ariaLabel}
+			/>
+		);
+	},
+);
+
+InputNumber.displayName = 'InputNumber';
+
+export default InputNumber;

frontend/src/components/InputNumber/index.ts

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

frontend/src/components/LogDetail/index.tsx

@@ -50,7 +50,6 @@ import {
 import { JsonView } from 'periscope/components/JsonView';
 import { useAppContext } from 'providers/App/App';
 import { AppState } from 'store/reducers';
-import { ILogBody } from 'types/api/logs/log';
 import { Query, TagFilter } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource, StringOperators } from 'types/common/queryBuilder';
 import { GlobalReducer } from 'types/reducer/globalTime';
@@ -218,17 +217,20 @@ function LogDetailInner({
 
 	const logBody = useMemo(() => {
 		if (!isBodyJsonQueryEnabled) {
-			return (log?.body as string) ?? '';
+			return log?.body || '';
 		}
-		// Feature enabled: body is always a map; message is always a string
-		const bodyObj = log?.body as ILogBody;
-		if (!bodyObj) {
-			return '';
+
+		try {
+			const json = JSON.parse(log?.body || '');
+
+			if (typeof json?.message === 'string' && json.message !== '') {
+				return json.message;
+			}
+
+			return log?.body || '';
+		} catch {
+			return log?.body || '';
 		}
-		if (bodyObj.message) {
-			return bodyObj.message;
-		}
-		return JSON.stringify(bodyObj);
 	}, [isBodyJsonQueryEnabled, log?.body]);
 
 	const htmlBody = useMemo(

frontend/src/components/Logs/RawLogView/index.tsx

@@ -9,10 +9,7 @@ import { Color } from '@signozhq/design-tokens';
 import { Tooltip } from 'antd';
 import { VIEW_TYPES } from 'components/LogDetail/constants';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-import {
-	getBodyDisplayString,
-	getSanitizedLogBody,
-} from 'container/LogDetailedView/utils';
+import { getSanitizedLogBody } from 'container/LogDetailedView/utils';
 import { useCopyLogLink } from 'hooks/logs/useCopyLogLink';
 // hooks
 import { useIsDarkMode } from 'hooks/useDarkMode';
@@ -102,7 +99,7 @@ function RawLogView({
 		// Check if body is selected
 		const showBody = selectedFields.some((field) => field.name === 'body');
 		if (showBody) {
-			parts.push(`${attributesText} ${getBodyDisplayString(data.body)}`);
+			parts.push(`${attributesText} ${data.body}`);
 		} else {
 			parts.push(attributesText);
 		}

frontend/src/components/Logs/TableView/useLogsTableColumns.tsx

@@ -2,10 +2,7 @@ import type { ReactElement } from 'react';
 import { useMemo } from 'react';
 import TanStackTable from 'components/TanStackTableView';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-import {
-	getBodyDisplayString,
-	getSanitizedLogBody,
-} from 'container/LogDetailedView/utils';
+import { getSanitizedLogBody } from 'container/LogDetailedView/utils';
 import { FontSize } from 'container/OptionsMenu/types';
 import { FlatLogData } from 'lib/logs/flatLogData';
 import { useTimezone } from 'providers/Timezone';
@@ -90,7 +87,7 @@ export function useLogsTableColumns({
 			? {
 					id: 'body',
 					header: 'Body',
-					accessorFn: (log): string => getBodyDisplayString(log.body),
+					accessorFn: (log): string => log.body,
 					canBeHidden: false,
 					width: { default: '100%', min: 300 },
 					cell: ({ value, isActive }): ReactElement => (

frontend/src/components/LogsFormatOptionsMenu/LogsFormatOptionsMenu.tsx

@@ -1,8 +1,9 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { Button, Input, InputNumber, Popover, Tooltip } from 'antd';
+import { Button, Input, Popover, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import type { DefaultOptionType } from 'antd/es/select';
 import cx from 'classnames';
+import InputNumber from 'components/InputNumber';
 import { LogViewMode } from 'container/LogsTable';
 import { FontSize, OptionsMenuConfig } from 'container/OptionsMenu/types';
 import useDebouncedFn from 'hooks/useDebouncedFunction';

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,18 +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);
-											if (page !== 1) {
-												setPage(1);
-												pagination.onPageChange?.(1);
-											}
 										}}
-										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,78 +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();
-			const onUrlUpdate = jest.fn<void, [UrlUpdateEvent]>();
-			const onPageChange = jest.fn();
-
-			renderTanStackTable({
-				props: {
-					pagination: { total: 100, defaultPage: 1, defaultLimit: 10, onPageChange },
-					enableQueryParams: true,
-				},
-				onUrlUpdate,
-			});
-
-			await waitFor(() => {
-				expect(screen.getByRole('navigation')).toBeInTheDocument();
-			});
-
-			// Navigate to page 2
-			const nav = screen.getByRole('navigation');
-			const page2 = Array.from(nav.querySelectorAll('button')).find(
-				(btn) => btn.textContent?.trim() === '2',
-			);
-			if (!page2) {
-				throw new Error('Page 2 button not found in pagination');
-			}
-			await user.click(page2);
-
-			await waitFor(() => {
-				const lastPage = onUrlUpdate.mock.calls
-					.map((call) => call[0].searchParams.get('page'))
-					.filter(Boolean)
-					.pop();
-				expect(lastPage).toBe('2');
-			});
-
-			// Change page size
-			const comboboxTrigger = document.querySelector(
-				'button[aria-haspopup="dialog"]',
-			) as HTMLElement;
-			await user.click(comboboxTrigger);
-
-			const option20 = await screen.findByRole('option', { name: '20' });
-			await user.click(option20);
-
-			// Verify page reset to 1 (nuqs removes default values from URL)
-			await waitFor(() => {
-				const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1];
-				const lastPage = lastCall[0].searchParams.get('page');
-				expect(lastPage === '1' || lastPage === null).toBe(true);
-				expect(lastCall[0].searchParams.get('limit')).toBe('20');
-			});
-
-			// Verify onPageChange callback was called with 1
-			expect(onPageChange).toHaveBeenCalledWith(1);
-		});
 	});
 
 	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/constants/routes.ts

@@ -29,6 +29,7 @@ const ROUTES = {
 	ALERTS_NEW: '/alerts/new',
 	ALERT_HISTORY: '/alerts/history',
 	ALERT_OVERVIEW: '/alerts/overview',
+	ALERT_TYPE_SELECTION: '/alerts/type-selection',
 	ALL_CHANNELS: '/settings/channels',
 	CHANNELS_NEW: '/settings/channels/new',
 	CHANNELS_EDIT: '/settings/channels/edit/:channelId',

frontend/src/container/CreateAlertRule/AlertRuleDocumentationRedirection.test.tsx

@@ -1,23 +1,12 @@
 import ROUTES from 'constants/routes';
 import * as usePrefillAlertConditions from 'container/FormAlertRules/usePrefillAlertConditions';
+import AlertTypeSelectionPage from 'pages/AlertTypeSelection';
 import CreateAlertPage from 'pages/CreateAlert';
 import { act, fireEvent, render } from 'tests/test-utils';
 import { AlertTypes } from 'types/api/alerts/alertTypes';
 
 import { ALERT_TYPE_TO_TITLE, ALERT_TYPE_URL_MAP } from './constants';
 
-jest.mock('react-router-dom-v5-compat', () => ({
-	...jest.requireActual('react-router-dom-v5-compat'),
-	useNavigationType: jest.fn(() => 'PUSH'),
-	useLocation: jest.fn(() => ({
-		pathname: '/alerts/new',
-		search: '',
-		hash: '',
-		state: null,
-	})),
-	useSearchParams: jest.fn(() => [new URLSearchParams(), jest.fn()]),
-}));
-
 jest
 	.spyOn(usePrefillAlertConditions, 'usePrefillAlertConditions')
 	.mockReturnValue({
@@ -65,13 +54,20 @@ describe('Alert rule documentation redirection', () => {
 		window.open = mockWindowOpen;
 	});
 
+	jest.mock('react-router-dom', () => ({
+		...jest.requireActual('react-router-dom'),
+		useLocation: (): { pathname: string } => ({
+			pathname: `${process.env.FRONTEND_API_ENDPOINT}${ROUTES.ALERT_TYPE_SELECTION}`,
+		}),
+	}));
+
 	beforeEach(() => {
 		act(() => {
 			renderResult = render(
-				<CreateAlertPage />,
+				<AlertTypeSelectionPage />,
 				{},
 				{
-					initialRoute: ROUTES.ALERTS_NEW,
+					initialRoute: ROUTES.ALERT_TYPE_SELECTION,
 				},
 			);
 		});

frontend/src/container/CreateAlertRule/AnomalyAlertDocumentationRedirection.test.tsx

@@ -15,18 +15,6 @@ jest.mock('react-router-dom', () => ({
 	}),
 }));
 
-jest.mock('react-router-dom-v5-compat', () => ({
-	...jest.requireActual('react-router-dom-v5-compat'),
-	useNavigationType: jest.fn(() => 'PUSH'),
-	useLocation: jest.fn(() => ({
-		pathname: '/alerts/new',
-		search: 'ruleType=anomaly_rule',
-		hash: '',
-		state: null,
-	})),
-	useSearchParams: jest.fn(() => [new URLSearchParams(), jest.fn()]),
-}));
-
 window.ResizeObserver =
 	window.ResizeObserver ||
 	jest.fn().mockImplementation(() => ({

frontend/src/container/CreateAlertRule/CreateAlertRule.styles.scss

@@ -1,75 +0,0 @@
-.create-alert-tabs {
-	&__extra {
-		display: flex;
-		align-items: center;
-		gap: 16px;
-	}
-}
-
-.create-alert-wrapper {
-	margin-top: 10px;
-
-	.divider {
-		border-color: var(--l1-border);
-		margin: 16px 0;
-	}
-
-	.breadcrumb-divider {
-		margin-top: 10px;
-	}
-}
-
-.create-alert__breadcrumb {
-	padding-left: 16px;
-
-	ol {
-		align-items: center;
-	}
-
-	.breadcrumb-item {
-		color: var(--l2-foreground);
-		font-size: 14px;
-		line-height: 20px;
-		letter-spacing: 0.25px;
-		padding: 0;
-	}
-
-	.ant-breadcrumb-separator,
-	.breadcrumb-item--last {
-		color: var(--muted-foreground);
-		font-family: 'Geist Mono';
-	}
-}
-
-.alerts-container {
-	.top-level-tab.periscope-tab {
-		padding: 2px 0;
-	}
-
-	.ant-tabs {
-		&-nav {
-			padding: 0 8px;
-			margin-bottom: 0 !important;
-
-			&::before {
-				border-bottom: 1px solid var(--l1-border) !important;
-			}
-		}
-
-		&-tab {
-			&[data-node-key='TriggeredAlerts'] {
-				margin-left: 16px;
-			}
-
-			&:not(:first-of-type) {
-				margin-left: 24px !important;
-			}
-
-			[aria-selected='false'] {
-				.periscope-tab {
-					color: var(--l2-foreground);
-				}
-			}
-		}
-	}
-}

frontend/src/container/CreateAlertRule/SelectAlertType/__tests__/SelectAlertType.test.tsx

@@ -1,111 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import { FeatureKeys } from 'constants/features';
-import { getAppContextMockState } from 'container/RoutingPolicies/__tests__/testUtils';
-import * as appHooks from 'providers/App/App';
-import { AlertTypes } from 'types/api/alerts/alertTypes';
-
-import SelectAlertType from '..';
-
-const useAppContextSpy = jest.spyOn(appHooks, 'useAppContext');
-
-describe('SelectAlertType', () => {
-	const mockOnSelect = jest.fn();
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-		useAppContextSpy.mockReturnValue(getAppContextMockState());
-	});
-
-	it('should render all alert type options when anomaly detection is enabled', () => {
-		useAppContextSpy.mockReturnValue({
-			...getAppContextMockState({}),
-			featureFlags: [
-				{
-					name: FeatureKeys.ANOMALY_DETECTION,
-					active: true,
-					usage: 0,
-					usage_limit: -1,
-					route: '',
-				},
-			],
-		});
-
-		render(<SelectAlertType onSelect={mockOnSelect} />);
-
-		expect(screen.getByText('metric_based_alert')).toBeInTheDocument();
-		expect(screen.getByText('log_based_alert')).toBeInTheDocument();
-		expect(screen.getByText('traces_based_alert')).toBeInTheDocument();
-		expect(screen.getByText('exceptions_based_alert')).toBeInTheDocument();
-		expect(screen.getByText('anomaly_based_alert')).toBeInTheDocument();
-	});
-
-	it('should render all alert type options except anomaly based alert when anomaly detection is disabled', () => {
-		render(<SelectAlertType onSelect={mockOnSelect} />);
-
-		expect(screen.getByText('metric_based_alert')).toBeInTheDocument();
-		expect(screen.getByText('log_based_alert')).toBeInTheDocument();
-		expect(screen.getByText('traces_based_alert')).toBeInTheDocument();
-		expect(screen.getByText('exceptions_based_alert')).toBeInTheDocument();
-		expect(screen.queryByText('anomaly_based_alert')).not.toBeInTheDocument();
-	});
-
-	it('should call onSelect with metrics based alert type', () => {
-		render(<SelectAlertType onSelect={mockOnSelect} />);
-		fireEvent.click(screen.getByText('metric_based_alert'));
-
-		expect(mockOnSelect).toHaveBeenCalledWith(
-			AlertTypes.METRICS_BASED_ALERT,
-			false,
-		);
-	});
-
-	it('should call onSelect with anomaly based alert type', () => {
-		useAppContextSpy.mockReturnValue({
-			...getAppContextMockState({}),
-			featureFlags: [
-				{
-					name: FeatureKeys.ANOMALY_DETECTION,
-					active: true,
-					usage: 0,
-					usage_limit: -1,
-					route: '',
-				},
-			],
-		});
-
-		render(<SelectAlertType onSelect={mockOnSelect} />);
-		fireEvent.click(screen.getByText('anomaly_based_alert'));
-
-		expect(mockOnSelect).toHaveBeenCalledWith(
-			AlertTypes.ANOMALY_BASED_ALERT,
-			false,
-		);
-	});
-
-	it('should call onSelect with log based alert type', () => {
-		render(<SelectAlertType onSelect={mockOnSelect} />);
-		fireEvent.click(screen.getByText('log_based_alert'));
-
-		expect(mockOnSelect).toHaveBeenCalledWith(AlertTypes.LOGS_BASED_ALERT, false);
-	});
-
-	it('should call onSelect with traces based alert type', () => {
-		render(<SelectAlertType onSelect={mockOnSelect} />);
-		fireEvent.click(screen.getByText('traces_based_alert'));
-
-		expect(mockOnSelect).toHaveBeenCalledWith(
-			AlertTypes.TRACES_BASED_ALERT,
-			false,
-		);
-	});
-
-	it('should call onSelect with exceptions based alert type', () => {
-		render(<SelectAlertType onSelect={mockOnSelect} />);
-		fireEvent.click(screen.getByText('exceptions_based_alert'));
-
-		expect(mockOnSelect).toHaveBeenCalledWith(
-			AlertTypes.EXCEPTIONS_BASED_ALERT,
-			false,
-		);
-	});
-});

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

@@ -1,37 +1,13 @@
-import { fireEvent, screen } from '@testing-library/react';
-import { FeatureKeys } from 'constants/features';
+import { render, screen } from '@testing-library/react';
 import { QueryParams } from 'constants/query';
 import { initialQueriesMap } from 'constants/queryBuilder';
-import { getAppContextMockState } from 'container/RoutingPolicies/__tests__/testUtils';
 import * as useCompositeQueryParamHooks from 'hooks/queryBuilder/useGetCompositeQueryParam';
-import * as navigateHooks from 'hooks/useSafeNavigate';
 import * as useUrlQueryHooks from 'hooks/useUrlQuery';
-import * as appHooks from 'providers/App/App';
-import { render } from 'tests/test-utils';
 import { AlertTypes } from 'types/api/alerts/alertTypes';
 import { DataSource } from 'types/common/queryBuilder';
 
 import CreateAlertRule from '../index';
 
-jest.mock('react-router-dom-v5-compat', () => ({
-	...jest.requireActual('react-router-dom-v5-compat'),
-	useNavigationType: jest.fn(() => 'PUSH'),
-	useLocation: jest.fn(() => ({
-		pathname: '/alerts/new',
-		search: '',
-		hash: '',
-		state: null,
-	})),
-	useSearchParams: jest.fn(() => [new URLSearchParams(), jest.fn()]),
-}));
-
-jest.mock('container/TopNav/DateTimeSelectionV2', () => ({
-	__esModule: true,
-	default: function MockDateTimeSelector(): JSX.Element {
-		return <div data-testid="datetime-selector">Mock DateTime Selector</div>;
-	},
-}));
-
 jest.mock('container/FormAlertRules', () => ({
 	__esModule: true,
 	default: function MockFormAlertRules({
@@ -72,14 +48,10 @@ const useCompositeQueryParamSpy = jest.spyOn(
 	'useGetCompositeQueryParam',
 );
 const useUrlQuerySpy = jest.spyOn(useUrlQueryHooks, 'default');
-const useSafeNavigateSpy = jest.spyOn(navigateHooks, 'useSafeNavigate');
-const useAppContextSpy = jest.spyOn(appHooks, 'useAppContext');
 
 const mockSetUrlQuery = jest.fn();
 const mockToString = jest.fn();
 const mockGetUrlQuery = jest.fn();
-const mockSafeNavigate = jest.fn();
-const mockDeleteUrlQuery = jest.fn();
 
 const FORM_ALERT_RULES_TEXT = 'Form Alert Rules';
 const CREATE_ALERT_V2_TEXT = 'Create Alert V2';
@@ -91,13 +63,8 @@ describe('CreateAlertRule', () => {
 			set: mockSetUrlQuery,
 			toString: mockToString,
 			get: mockGetUrlQuery,
-			delete: mockDeleteUrlQuery,
 		} as Partial<URLSearchParams> as URLSearchParams);
 		useCompositeQueryParamSpy.mockReturnValue(initialQueriesMap.metrics);
-		useSafeNavigateSpy.mockReturnValue({
-			safeNavigate: mockSafeNavigate,
-		});
-		useAppContextSpy.mockReturnValue(getAppContextMockState());
 	});
 
 	it('should render classic flow when showClassicCreateAlertsPage is true', () => {
@@ -105,53 +72,18 @@ describe('CreateAlertRule', () => {
 			if (key === QueryParams.showClassicCreateAlertsPage) {
 				return 'true';
 			}
-			if (key === QueryParams.alertType) {
-				return AlertTypes.METRICS_BASED_ALERT;
-			}
 			return null;
 		});
 		render(<CreateAlertRule />);
 		expect(screen.getByText(FORM_ALERT_RULES_TEXT)).toBeInTheDocument();
 	});
 
-	it('should render new flow when alertType is provided', () => {
-		mockGetUrlQuery.mockImplementation((key: string) => {
-			if (key === QueryParams.alertType) {
-				return AlertTypes.METRICS_BASED_ALERT;
-			}
-			return null;
-		});
+	it('should render new flow by default', () => {
+		mockGetUrlQuery.mockReturnValue(null);
 		render(<CreateAlertRule />);
 		expect(screen.getByText(CREATE_ALERT_V2_TEXT)).toBeInTheDocument();
 	});
 
-	it('should render type selection when no alertType in URL and no compositeQuery', () => {
-		mockGetUrlQuery.mockReturnValue(null);
-		useCompositeQueryParamSpy.mockReturnValue(null);
-		render(<CreateAlertRule />);
-		expect(screen.queryByText(FORM_ALERT_RULES_TEXT)).not.toBeInTheDocument();
-		expect(screen.queryByText(CREATE_ALERT_V2_TEXT)).not.toBeInTheDocument();
-	});
-
-	it('should skip type selection and render alert form when compositeQuery is present', () => {
-		mockGetUrlQuery.mockReturnValue(null);
-		useCompositeQueryParamSpy.mockReturnValue({
-			...initialQueriesMap.metrics,
-			builder: {
-				...initialQueriesMap.metrics.builder,
-				queryData: [
-					{
-						...initialQueriesMap.metrics.builder.queryData[0],
-						dataSource: DataSource.METRICS,
-					},
-				],
-			},
-		});
-		render(<CreateAlertRule />);
-		expect(screen.getByText(CREATE_ALERT_V2_TEXT)).toBeInTheDocument();
-		expect(screen.getByText(AlertTypes.METRICS_BASED_ALERT)).toBeInTheDocument();
-	});
-
 	it('should render classic flow when ruleType is anomaly_rule even if showClassicCreateAlertsPage is not true', () => {
 		mockGetUrlQuery.mockImplementation((key: string) => {
 			if (key === QueryParams.showClassicCreateAlertsPage) {
@@ -179,13 +111,8 @@ describe('CreateAlertRule', () => {
 		expect(screen.getByText(AlertTypes.LOGS_BASED_ALERT)).toBeInTheDocument();
 	});
 
-	it('should use alertType from URL over compositeQuery dataSource', () => {
-		mockGetUrlQuery.mockImplementation((key: string) => {
-			if (key === QueryParams.alertType) {
-				return AlertTypes.LOGS_BASED_ALERT;
-			}
-			return null;
-		});
+	it('should use alertType from compositeQuery dataSource when alertType is not in URL', () => {
+		mockGetUrlQuery.mockReturnValue(null);
 		useCompositeQueryParamSpy.mockReturnValue({
 			...initialQueriesMap.metrics,
 			builder: {
@@ -200,123 +127,14 @@ describe('CreateAlertRule', () => {
 		});
 		render(<CreateAlertRule />);
 		expect(screen.getByText(CREATE_ALERT_V2_TEXT)).toBeInTheDocument();
-		expect(screen.getByText(AlertTypes.LOGS_BASED_ALERT)).toBeInTheDocument();
+		expect(screen.getByText(AlertTypes.TRACES_BASED_ALERT)).toBeInTheDocument();
 	});
 
-	describe('handleSelectType navigation', () => {
-		beforeEach(() => {
-			mockGetUrlQuery.mockReturnValue(null);
-			useCompositeQueryParamSpy.mockReturnValue(null);
-		});
-
-		it('should navigate with threshold alert params for metrics alert', () => {
-			render(<CreateAlertRule />);
-			fireEvent.click(screen.getByText('metric_based_alert'));
-
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.ruleType,
-				'threshold_rule',
-			);
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.alertType,
-				AlertTypes.METRICS_BASED_ALERT,
-			);
-			expect(mockSafeNavigate).toHaveBeenCalled();
-		});
-
-		it('should navigate with threshold alert params for logs alert', () => {
-			render(<CreateAlertRule />);
-			fireEvent.click(screen.getByText('log_based_alert'));
-
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.ruleType,
-				'threshold_rule',
-			);
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.alertType,
-				AlertTypes.LOGS_BASED_ALERT,
-			);
-			expect(mockSafeNavigate).toHaveBeenCalled();
-		});
-
-		it('should navigate with threshold alert params for traces alert', () => {
-			render(<CreateAlertRule />);
-			fireEvent.click(screen.getByText('traces_based_alert'));
-
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.ruleType,
-				'threshold_rule',
-			);
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.alertType,
-				AlertTypes.TRACES_BASED_ALERT,
-			);
-			expect(mockSafeNavigate).toHaveBeenCalled();
-		});
-
-		it('should navigate with threshold alert params for exceptions alert', () => {
-			render(<CreateAlertRule />);
-			fireEvent.click(screen.getByText('exceptions_based_alert'));
-
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.ruleType,
-				'threshold_rule',
-			);
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.alertType,
-				AlertTypes.EXCEPTIONS_BASED_ALERT,
-			);
-			expect(mockSafeNavigate).toHaveBeenCalled();
-		});
-
-		it('should navigate with anomaly detection params for anomaly alert', () => {
-			useAppContextSpy.mockReturnValue({
-				...getAppContextMockState({}),
-				featureFlags: [
-					{
-						name: FeatureKeys.ANOMALY_DETECTION,
-						active: true,
-						usage: 0,
-						usage_limit: -1,
-						route: '',
-					},
-				],
-			});
-
-			render(<CreateAlertRule />);
-			fireEvent.click(screen.getByText('anomaly_based_alert'));
-
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.ruleType,
-				'anomaly_rule',
-			);
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.alertType,
-				AlertTypes.METRICS_BASED_ALERT,
-			);
-			expect(mockSafeNavigate).toHaveBeenCalled();
-		});
-
-		it('should navigate even when showClassicCreateAlertsPage flag is present', () => {
-			mockGetUrlQuery.mockImplementation((key: string) => {
-				if (key === QueryParams.showClassicCreateAlertsPage) {
-					return 'true';
-				}
-				return null;
-			});
-
-			render(<CreateAlertRule />);
-			fireEvent.click(screen.getByText('metric_based_alert'));
-
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.ruleType,
-				'threshold_rule',
-			);
-			expect(mockSetUrlQuery).toHaveBeenCalledWith(
-				QueryParams.alertType,
-				AlertTypes.METRICS_BASED_ALERT,
-			);
-			expect(mockSafeNavigate).toHaveBeenCalled();
-		});
+	it('should default to METRICS_BASED_ALERT when no alertType and no compositeQuery', () => {
+		mockGetUrlQuery.mockReturnValue(null);
+		useCompositeQueryParamSpy.mockReturnValue(null);
+		render(<CreateAlertRule />);
+		expect(screen.getByText(CREATE_ALERT_V2_TEXT)).toBeInTheDocument();
+		expect(screen.getByText(AlertTypes.METRICS_BASED_ALERT)).toBeInTheDocument();
 	});
 });

frontend/src/container/CreateAlertRule/defaults.ts

@@ -208,11 +208,3 @@ export const ALERTS_VALUES_MAP: Record<AlertTypes, AlertDef> = {
 	[AlertTypes.TRACES_BASED_ALERT]: traceAlertDefaults,
 	[AlertTypes.EXCEPTIONS_BASED_ALERT]: exceptionAlertDefaults,
 };
-
-export const ALERT_TYPE_BREADCRUMB_TITLE: Record<AlertTypes, string> = {
-	[AlertTypes.ANOMALY_BASED_ALERT]: 'Anomaly-Based Alert',
-	[AlertTypes.METRICS_BASED_ALERT]: 'Metric-Based Alert',
-	[AlertTypes.LOGS_BASED_ALERT]: 'Log-Based Alert',
-	[AlertTypes.TRACES_BASED_ALERT]: 'Traces-Based Alert',
-	[AlertTypes.EXCEPTIONS_BASED_ALERT]: 'Exceptions-Based Alert',
-};

frontend/src/container/CreateAlertRule/index.tsx

@@ -1,34 +1,21 @@
-import { useCallback, useEffect, useMemo } from 'react';
-import { Form, Tabs, TabsProps } from 'antd';
-import logEvent from 'api/common/logEvent';
-import ConfigureIcon from 'assets/AlertHistory/ConfigureIcon';
-import AlertBreadcrumb from 'components/AlertBreadcrumb';
-import HeaderRightSection from 'components/HeaderRightSection/HeaderRightSection';
+import { useMemo } from 'react';
+import { Form } from 'antd';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import { QueryParams } from 'constants/query';
-import ROUTES from 'constants/routes';
 import CreateAlertV2 from 'container/CreateAlertV2';
 import FormAlertRules, { AlertDetectionTypes } from 'container/FormAlertRules';
-import DateTimeSelector from 'container/TopNav/DateTimeSelectionV2';
 import { useGetCompositeQueryParam } from 'hooks/queryBuilder/useGetCompositeQueryParam';
-import { useSafeNavigate } from 'hooks/useSafeNavigate';
 import useUrlQuery from 'hooks/useUrlQuery';
-import { AlertListTabs } from 'pages/AlertList/types';
-import { GalleryVerticalEnd, Pyramid } from '@signozhq/icons';
 import { AlertTypes } from 'types/api/alerts/alertTypes';
 import { AlertDef } from 'types/api/alerts/def';
 
 import { ALERT_TYPE_VS_SOURCE_MAPPING } from './config';
-import { ALERTS_VALUES_MAP, ALERT_TYPE_BREADCRUMB_TITLE } from './defaults';
-import SelectAlertType from './SelectAlertType';
-
-import './CreateAlertRule.styles.scss';
+import { ALERTS_VALUES_MAP } from './defaults';
 
 function CreateRules(): JSX.Element {
 	const [formInstance] = Form.useForm();
 	const compositeQuery = useGetCompositeQueryParam();
 	const queryParams = useUrlQuery();
-	const { safeNavigate } = useSafeNavigate();
 
 	const ruleTypeFromURL = queryParams.get(QueryParams.ruleType);
 	const alertTypeFromURL = queryParams.get(QueryParams.alertType);
@@ -36,15 +23,6 @@ function CreateRules(): JSX.Element {
 	const showClassicCreateAlertsPageFlag =
 		queryParams.get(QueryParams.showClassicCreateAlertsPage) === 'true';
 
-	const isTypeSelectionMode =
-		!alertTypeFromURL && !ruleTypeFromURL && !compositeQuery;
-
-	useEffect(() => {
-		if (isTypeSelectionMode) {
-			logEvent('Alert: New alert data source selection page visited', {});
-		}
-	}, [isTypeSelectionMode]);
-
 	const alertType = useMemo(() => {
 		if (ruleTypeFromURL === AlertDetectionTypes.ANOMALY_DETECTION_ALERT) {
 			return AlertTypes.ANOMALY_BASED_ALERT;
@@ -67,142 +45,22 @@ function CreateRules(): JSX.Element {
 		[alertType, version],
 	);
 
-	const handleTabChange = useCallback(
-		(tab: string): void => {
-			queryParams.set('tab', tab);
-			queryParams.delete('subTab');
-			queryParams.delete('search');
-			safeNavigate(`${ROUTES.LIST_ALL_ALERT}?${queryParams.toString()}`);
-		},
-		[safeNavigate, queryParams],
-	);
+	// Load old alerts flow always for anomaly based alerts and when showClassicCreateAlertsPage is true
+	if (
+		showClassicCreateAlertsPageFlag ||
+		alertType === AlertTypes.ANOMALY_BASED_ALERT
+	) {
+		return (
+			<FormAlertRules
+				alertType={alertType}
+				formInstance={formInstance}
+				initialValue={initialAlertValue}
+				ruleId=""
+			/>
+		);
+	}
 
-	const handleSelectType = useCallback(
-		(type: AlertTypes, newTab?: boolean): void => {
-			if (type === AlertTypes.ANOMALY_BASED_ALERT) {
-				queryParams.set(
-					QueryParams.ruleType,
-					AlertDetectionTypes.ANOMALY_DETECTION_ALERT,
-				);
-				queryParams.set(QueryParams.alertType, AlertTypes.METRICS_BASED_ALERT);
-			} else {
-				queryParams.set(QueryParams.ruleType, AlertDetectionTypes.THRESHOLD_ALERT);
-				queryParams.set(QueryParams.alertType, type);
-			}
-
-			safeNavigate(`${ROUTES.ALERTS_NEW}?${queryParams.toString()}`, { newTab });
-		},
-		[queryParams, safeNavigate],
-	);
-
-	const alertContent = useMemo(() => {
-		if (isTypeSelectionMode) {
-			return <SelectAlertType onSelect={handleSelectType} />;
-		}
-
-		if (
-			showClassicCreateAlertsPageFlag ||
-			alertType === AlertTypes.ANOMALY_BASED_ALERT
-		) {
-			return (
-				<FormAlertRules
-					alertType={alertType}
-					formInstance={formInstance}
-					initialValue={initialAlertValue}
-					ruleId=""
-				/>
-			);
-		}
-		return <CreateAlertV2 alertType={alertType} />;
-	}, [
-		isTypeSelectionMode,
-		handleSelectType,
-		showClassicCreateAlertsPageFlag,
-		alertType,
-		formInstance,
-		initialAlertValue,
-	]);
-
-	const items: TabsProps['items'] = [
-		{
-			label: (
-				<div className="periscope-tab top-level-tab">
-					<GalleryVerticalEnd size={14} />
-					Triggered Alerts
-				</div>
-			),
-			key: AlertListTabs.TRIGGERED_ALERTS,
-			children: null,
-		},
-		{
-			label: (
-				<div className="periscope-tab top-level-tab">
-					<Pyramid size={14} />
-					Alert Rules
-				</div>
-			),
-			key: AlertListTabs.ALERT_RULES,
-			children: (
-				<div className="create-alert-wrapper">
-					<AlertBreadcrumb
-						className="create-alert__breadcrumb"
-						items={
-							isTypeSelectionMode
-								? [
-										{
-											title: 'Alert Rules',
-											route: `${ROUTES.LIST_ALL_ALERT}?tab=${AlertListTabs.ALERT_RULES}`,
-										},
-										{ title: 'Select Alert Type', isLast: true },
-									]
-								: [
-										{
-											title: 'Alert Rules',
-											route: `${ROUTES.LIST_ALL_ALERT}?tab=${AlertListTabs.ALERT_RULES}`,
-										},
-										{ title: 'Select Alert Type', route: ROUTES.ALERTS_NEW },
-										{
-											title: ALERT_TYPE_BREADCRUMB_TITLE[alertType],
-											isLast: true,
-										},
-									]
-						}
-					/>
-					{alertContent}
-				</div>
-			),
-		},
-		{
-			label: (
-				<div className="periscope-tab top-level-tab">
-					<ConfigureIcon width={14} height={14} />
-					Configuration
-				</div>
-			),
-			key: AlertListTabs.CONFIGURATION,
-			children: null,
-		},
-	];
-
-	return (
-		<Tabs
-			destroyInactiveTabPane
-			items={items}
-			activeKey={AlertListTabs.ALERT_RULES}
-			onChange={handleTabChange}
-			className="alerts-container create-alert-tabs"
-			tabBarExtraContent={
-				<div className="create-alert-tabs__extra">
-					<DateTimeSelector showAutoRefresh />
-					<HeaderRightSection
-						enableAnnouncements={false}
-						enableShare
-						enableFeedback
-					/>
-				</div>
-			}
-		/>
-	);
+	return <CreateAlertV2 alertType={alertType} />;
 }
 
 export default CreateRules;

frontend/src/container/CreateAlertV2/CreateAlertHeader/CreateAlertHeader.tsx

@@ -9,7 +9,6 @@ import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
 import useUrlQuery from 'hooks/useUrlQuery';
 import { RotateCcw } from '@signozhq/icons';
-import { useAlertRuleOptional } from 'providers/Alert';
 import { Labels } from 'types/api/alerts/def';
 
 import { useCreateAlertState } from '../context';
@@ -19,7 +18,6 @@ import './styles.scss';
 
 function CreateAlertHeader(): JSX.Element {
 	const { alertState, setAlertState, isEditMode } = useCreateAlertState();
-	const alertRuleContext = useAlertRuleOptional();
 
 	const { currentQuery } = useQueryBuilder();
 	const { safeNavigate } = useSafeNavigate();
@@ -76,13 +74,9 @@ function CreateAlertHeader(): JSX.Element {
 				<Input
 					type="text"
 					value={alertState.name}
-					onChange={(e): void => {
-						const newName = e.target.value;
-						setAlertState({ type: 'SET_ALERT_NAME', payload: newName });
-						if (isEditMode && alertRuleContext?.setAlertRuleName) {
-							alertRuleContext.setAlertRuleName(newName);
-						}
-					}}
+					onChange={(e): void =>
+						setAlertState({ type: 'SET_ALERT_NAME', payload: e.target.value })
+					}
 					className="alert-header__input title"
 					placeholder="Enter alert rule name"
 					data-testid="alert-name-input"

frontend/src/container/CreateAlertV2/Footer/Footer.tsx

@@ -20,11 +20,6 @@ import {
 } from './utils';
 
 import './styles.scss';
-import {
-	invalidateGetRuleByID,
-	invalidateListRules,
-} from 'api/generated/services/rules';
-import { useQueryClient } from 'react-query';
 
 function Footer(): JSX.Element {
 	const {
@@ -120,7 +115,6 @@ function Footer(): JSX.Element {
 		testAlertRule,
 	]);
 
-	const queryClient = useQueryClient();
 	const handleSaveAlert = useCallback((): void => {
 		const payload = buildCreateThresholdAlertRulePayload({
 			alertType,
@@ -139,9 +133,6 @@ function Footer(): JSX.Element {
 				},
 				{
 					onSuccess: () => {
-						void invalidateGetRuleByID(queryClient, { id: ruleId });
-						void invalidateListRules(queryClient);
-
 						toast.success('Alert rule updated successfully');
 						safeNavigate('/alerts');
 					},

frontend/src/container/CreateAlertV2/Footer/__tests__/Footer.test.tsx

@@ -7,7 +7,6 @@ import { createMockAlertContextState } from 'container/CreateAlertV2/EvaluationS
 
 import * as createAlertState from '../../context';
 import Footer from '../Footer';
-import MockQueryClientProvider from 'providers/test/MockQueryClientProvider';
 
 // Mock the hooks used by Footer component
 jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
@@ -65,12 +64,6 @@ const mockAlertContextState = createMockAlertContextState({
 	},
 });
 
-const WrappedFooter = (): JSX.Element => (
-	<MockQueryClientProvider>
-		<Footer />
-	</MockQueryClientProvider>
-);
-
 jest
 	.spyOn(createAlertState, 'useCreateAlertState')
 	.mockReturnValue(mockAlertContextState);
@@ -104,20 +97,20 @@ describe('Footer', () => {
 	});
 
 	it('should render the component with 3 buttons', () => {
-		render(<WrappedFooter />);
+		render(<Footer />);
 		expect(screen.getByText(SAVE_ALERT_RULE_TEXT)).toBeInTheDocument();
 		expect(screen.getByText(TEST_NOTIFICATION_TEXT)).toBeInTheDocument();
 		expect(screen.getByText(DISCARD_TEXT)).toBeInTheDocument();
 	});
 
 	it('discard action works correctly', () => {
-		render(<WrappedFooter />);
+		render(<Footer />);
 		fireEvent.click(screen.getByText(DISCARD_TEXT));
 		expect(mockDiscardAlertRule).toHaveBeenCalled();
 	});
 
 	it('save alert rule action works correctly', () => {
-		render(<WrappedFooter />);
+		render(<Footer />);
 		fireEvent.click(screen.getByText(SAVE_ALERT_RULE_TEXT));
 		expect(mockCreateAlertRule).toHaveBeenCalled();
 	});
@@ -127,13 +120,13 @@ describe('Footer', () => {
 			...mockAlertContextState,
 			isEditMode: true,
 		});
-		render(<WrappedFooter />);
+		render(<Footer />);
 		fireEvent.click(screen.getByText(SAVE_ALERT_RULE_TEXT));
 		expect(mockUpdateAlertRule).toHaveBeenCalled();
 	});
 
 	it('test notification action works correctly', () => {
-		render(<WrappedFooter />);
+		render(<Footer />);
 		fireEvent.click(screen.getByText(TEST_NOTIFICATION_TEXT));
 		expect(mockTestAlertRule).toHaveBeenCalled();
 	});
@@ -143,7 +136,7 @@ describe('Footer', () => {
 			...mockAlertContextState,
 			isCreatingAlertRule: true,
 		});
-		render(<WrappedFooter />);
+		render(<Footer />);
 
 		expect(
 			screen.getByRole('button', { name: /save alert rule/i }),
@@ -159,7 +152,7 @@ describe('Footer', () => {
 			...mockAlertContextState,
 			isUpdatingAlertRule: true,
 		});
-		render(<WrappedFooter />);
+		render(<Footer />);
 
 		// Target the button elements directly instead of the text spans inside them
 		expect(
@@ -176,7 +169,7 @@ describe('Footer', () => {
 			...mockAlertContextState,
 			isTestingAlertRule: true,
 		});
-		render(<WrappedFooter />);
+		render(<Footer />);
 
 		// Target the button elements directly instead of the text spans inside them
 		expect(
@@ -196,7 +189,7 @@ describe('Footer', () => {
 				name: '',
 			},
 		});
-		render(<WrappedFooter />);
+		render(<Footer />);
 
 		expect(
 			screen.getByRole('button', { name: /save alert rule/i }),
@@ -224,7 +217,7 @@ describe('Footer', () => {
 			},
 		});
 
-		render(<WrappedFooter />);
+		render(<Footer />);
 
 		expect(
 			screen.getByRole('button', { name: /save alert rule/i }),
@@ -252,7 +245,7 @@ describe('Footer', () => {
 			},
 		});
 
-		render(<WrappedFooter />);
+		render(<Footer />);
 
 		expect(
 			screen.getByRole('button', { name: /save alert rule/i }),
@@ -268,7 +261,7 @@ describe('Footer', () => {
 			...mockAlertContextState,
 			isTestingAlertRule: true,
 		});
-		render(<WrappedFooter />);
+		render(<Footer />);
 
 		// When testing alert rule, the play icon is replaced with a loader icon
 		expect(
@@ -283,7 +276,7 @@ describe('Footer', () => {
 			...mockAlertContextState,
 			isUpdatingAlertRule: true,
 		});
-		render(<WrappedFooter />);
+		render(<Footer />);
 
 		// When updating alert rule, the check icon is replaced with a loader icon
 		expect(
@@ -298,7 +291,7 @@ describe('Footer', () => {
 			...mockAlertContextState,
 			isCreatingAlertRule: true,
 		});
-		render(<WrappedFooter />);
+		render(<Footer />);
 
 		// When creating alert rule, the check icon is replaced with a loader icon
 		expect(

frontend/src/container/FormAlertRules/RuleOptions.tsx

@@ -3,14 +3,13 @@ import {
 	Checkbox,
 	Collapse,
 	Form,
-	InputNumber,
-	InputNumberProps,
 	Select,
 	SelectProps,
 	Space,
 } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import type { DefaultOptionType } from 'antd/es/select';
+import InputNumber from 'components/InputNumber';
 import {
 	getCategoryByOptionId,
 	getCategorySelectOptionByName,
@@ -289,7 +288,7 @@ function RuleOptions({
 		</Form.Item>
 	);
 
-	const onChange: InputNumberProps['onChange'] = (value): void => {
+	const onChange = (value: number | null): void => {
 		setAlertDef({
 			...alertDef,
 			condition: {
@@ -391,11 +390,9 @@ function RuleOptions({
 						<Space direction="horizontal" align="center">
 							<Form.Item noStyle>
 								<InputNumber
-									addonBefore={t('field_threshold')}
+									prefix={t('field_threshold')}
 									value={alertDef?.condition?.target}
 									onChange={onChange}
-									type="number"
-									onWheel={(e): void => e.currentTarget.blur()}
 								/>
 							</Form.Item>
 
@@ -455,8 +452,6 @@ function RuleOptions({
 														},
 													});
 												}}
-												type="number"
-												onWheel={(e): void => e.currentTarget.blur()}
 											/>
 										</Form.Item>
 										<Typography.Text>{t('text_for')}</Typography.Text>
@@ -494,8 +489,6 @@ function RuleOptions({
 														},
 													});
 												}}
-												type="number"
-												onWheel={(e): void => e.currentTarget.blur()}
 											/>
 										</Form.Item>
 										<Typography.Text>{t('text_num_points')}</Typography.Text>

frontend/src/container/FormAlertRules/index.tsx

@@ -38,7 +38,6 @@ import { mapQueryDataFromApi } from 'lib/newQueryBuilder/queryBuilderMappers/map
 import { mapQueryDataToApi } from 'lib/newQueryBuilder/queryBuilderMappers/mapQueryDataToApi';
 import { isEmpty, isEqual } from 'lodash-es';
 import Tabs2 from 'periscope/components/Tabs2';
-import { useAlertRuleOptional } from 'providers/Alert';
 import { useAppContext } from 'providers/App/App';
 import { useErrorModal } from 'providers/ErrorModalProvider';
 import { AppState } from 'store/reducers';
@@ -93,6 +92,7 @@ const ALERT_SETUP_GUIDE_URLS: Record<AlertTypes, string> = {
 		'https://signoz.io/docs/alerts-management/anomaly-based-alerts/?utm_source=product&utm_medium=alert-creation-page',
 };
 
+// eslint-disable-next-line sonarjs/cognitive-complexity
 function FormAlertRules({
 	alertType,
 	formInstance,
@@ -160,32 +160,6 @@ function FormAlertRules({
 	const [alertDef, setAlertDef] = useState<AlertDef>(initialValue);
 	const [yAxisUnit, setYAxisUnit] = useState<string>(currentQuery.unit || '');
 
-	const alertRuleContext = useAlertRuleOptional();
-	const providerAlertName = alertRuleContext?.alertRuleName;
-	useEffect(() => {
-		if (providerAlertName) {
-			setAlertDef((prev) => {
-				if (prev.alert === providerAlertName) {
-					return prev;
-				}
-				return { ...prev, alert: providerAlertName };
-			});
-			formInstance.setFieldsValue({ alert: providerAlertName });
-		}
-	}, [providerAlertName, formInstance]);
-
-	// Wrap setAlertDef to sync alert name to provider when user types
-	const handleSetAlertDef = useCallback(
-		(newDef: AlertDef) => {
-			setAlertDef(newDef);
-			// Sync alert name change to provider for header display
-			if (newDef.alert !== alertDef.alert && alertRuleContext?.setAlertRuleName) {
-				alertRuleContext.setAlertRuleName(newDef.alert);
-			}
-		},
-		[alertDef.alert, alertRuleContext],
-	);
-
 	const alertTypeFromURL = urlQuery.get(QueryParams.ruleType);
 
 	const [detectionMethod, setDetectionMethod] = useState<string | null>(null);
@@ -706,7 +680,7 @@ function FormAlertRules({
 	const renderBasicInfo = (): JSX.Element => (
 		<BasicInfo
 			alertDef={alertDef}
-			setAlertDef={handleSetAlertDef}
+			setAlertDef={setAlertDef}
 			isNewRule={isNewRule}
 		/>
 	);

frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx

@@ -11,7 +11,6 @@ import {
 	DatePicker,
 	Form,
 	Input,
-	InputNumber,
 	Modal,
 	Row,
 	Select,
@@ -23,6 +22,7 @@ import {
 	Tooltip,
 } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import InputNumber from 'components/InputNumber';
 import type { NotificationInstance } from 'antd/es/notification/interface';
 import type { CollapseProps } from 'antd/lib';
 import {
@@ -1212,7 +1212,7 @@ function MultiIngestionSettings(): JSX.Element {
 																						<Form.Item name="dailyLimit" key="dailyLimit">
 																							<InputNumber
 																								disabled={!activeSignal?.config?.day?.enabled}
-																								addonAfter={
+																								suffix={
 																									<Select defaultValue="GiB" disabled>
 																										<Option value="TiB">TiB</Option>
 																										<Option value="GiB">GiB</Option>
@@ -1235,7 +1235,7 @@ function MultiIngestionSettings(): JSX.Element {
 																						<Form.Item name="dailyCount" key="dailyCount">
 																							<InputNumber
 																								placeholder="Enter max # of samples/day"
-																								addonAfter={
+																								suffix={
 																									<Form.Item
 																										name="dailyCountUnit"
 																										noStyle
@@ -1302,7 +1302,7 @@ function MultiIngestionSettings(): JSX.Element {
 																						<Form.Item name="secondsLimit" key="secondsLimit">
 																							<InputNumber
 																								disabled={!activeSignal?.config?.second?.enabled}
-																								addonAfter={
+																								suffix={
 																									<Select defaultValue="GiB" disabled>
 																										<Option value="TiB">TiB</Option>
 																										<Option value="GiB">GiB</Option>
@@ -1325,7 +1325,7 @@ function MultiIngestionSettings(): JSX.Element {
 																						<Form.Item name="secondsCount" key="secondsCount">
 																							<InputNumber
 																								placeholder="Enter max # of samples/s"
-																								addonAfter={
+																								suffix={
 																									<Form.Item
 																										name="secondsCountUnit"
 																										noStyle

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: '2024-01-01T00:00:00Z',
+		createdBy: 'test-user',
+		updatedAt: '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,183 +0,0 @@
-import { useCallback, 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 handleToggle = useCallback((): 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',
-			},
-		);
-	}, [rule, queryClient]);
-
-	const handleEdit = useCallback((): void => {
-		alertActionLogEvent(ALERT_ACTIONS.EDIT, rule);
-		onEdit(rule);
-	}, [rule, onEdit]);
-
-	const handleEditNewTab = useCallback((): void => {
-		alertActionLogEvent(ALERT_ACTIONS.EDIT, rule);
-		onEdit(rule, { newTab: true });
-	}, [rule, onEdit]);
-
-	const handleClone = useCallback((): 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',
-			},
-		);
-	}, [rule, queryClient, onEdit]);
-
-	const handleDelete = useCallback((): 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',
-			},
-		);
-	}, [rule, queryClient]);
-
-	const menuItems = useMemo(
-		() => [
-			{
-				key: 'toggle',
-				label: rule.disabled ? 'Enable' : 'Disable',
-				disabled: externalLoading,
-				onClick: handleToggle,
-			},
-			{
-				key: 'edit',
-				label: 'Edit',
-				disabled: externalLoading,
-				onClick: handleEdit,
-			},
-			{
-				key: 'edit-new-tab',
-				label: 'Edit in New Tab',
-				disabled: externalLoading,
-				onClick: handleEditNewTab,
-			},
-			{
-				key: 'clone',
-				label: 'Clone',
-				disabled: externalLoading,
-				onClick: handleClone,
-			},
-			{ key: 'divider', type: 'divider' as const },
-			{
-				key: 'delete',
-				label: 'Delete',
-				disabled: externalLoading,
-				danger: true,
-				onClick: handleDelete,
-			},
-		],
-		[
-			rule.disabled,
-			externalLoading,
-			handleToggle,
-			handleEdit,
-			handleEditNewTab,
-			handleClone,
-			handleDelete,
-		],
-	);
-
-	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.ALERTS_NEW, {
-				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/LogDetailedView/Overview.tsx

@@ -14,7 +14,7 @@ import { ILog } from 'types/api/logs/log';
 
 import { ActionItemProps } from './ActionItem';
 import TableView from './TableView';
-import { getBodyDisplayString, removeEscapeCharacters } from './utils';
+import { removeEscapeCharacters } from './utils';
 
 import './Overview.styles.scss';
 
@@ -112,7 +112,7 @@ function Overview({
 						children: (
 							<div className="logs-body-content">
 								<MEditor
-									value={removeEscapeCharacters(getBodyDisplayString(logData.body))}
+									value={removeEscapeCharacters(logData.body)}
 									language="json"
 									options={options}
 									onChange={(): void => {}}

frontend/src/container/LogDetailedView/TableView.tsx

@@ -106,20 +106,10 @@ function TableView({
 		isListViewPanel,
 	]);
 
-	// When USE_JSON_BODY is enabled, body arrives as a pre-parsed object. Serialize it
-	// back to a string so flattenObject keeps `body` as a single table row instead of
-	// recursively expanding it into dotted sub-keys (body.message, body.foo.bar, …),
-	// which would break the tree view in BodyContent that relies on record.field === 'body'.
-	const flattenLogData: Record<string, string> | null = useMemo(() => {
-		if (!logData) {
-			return null;
-		}
-		const normalizedLog =
-			typeof logData.body === 'object' && logData.body !== null
-				? { ...logData, body: JSON.stringify(logData.body) }
-				: logData;
-		return flattenObject(normalizedLog);
-	}, [logData]);
+	const flattenLogData: Record<string, string> | null = useMemo(
+		() => (logData ? flattenObject(logData) : null),
+		[logData],
+	);
 
 	const handleClick = (
 		operator: string,

frontend/src/container/LogDetailedView/TableView/useAsyncJSONProcessing.ts

@@ -10,7 +10,7 @@ const MAX_BODY_BYTES = 100 * 1024; // 100 KB
 
 // Hook for async JSON processing
 const useAsyncJSONProcessing = (
-	value: string | Record<string, unknown>,
+	value: string,
 	shouldProcess: boolean,
 	handleChangeSelectedView?: ChangeViewFunctionType,
 ): {
@@ -40,17 +40,11 @@ const useAsyncJSONProcessing = (
 			return (): void => {};
 		}
 
-		// When value is already a parsed object skip the size check and JSON parsing
-		const parseBody = (): Record<string, unknown> | null => {
-			if (typeof value === 'object' && value !== null) {
-				return value as Record<string, unknown>;
-			}
-			const byteSize = new Blob([value as string]).size;
-			if (byteSize > MAX_BODY_BYTES) {
-				return null;
-			}
-			return recursiveParseJSON(value as string);
-		};
+		// Avoid processing if the json is too large
+		const byteSize = new Blob([value]).size;
+		if (byteSize > MAX_BODY_BYTES) {
+			return (): void => {};
+		}
 
 		processingRef.current = true;
 		setJsonState({ isLoading: true, treeData: null, error: null });
@@ -59,8 +53,8 @@ const useAsyncJSONProcessing = (
 		const processAsync = (): void => {
 			setTimeout(() => {
 				try {
-					const parsedBody = parseBody();
-					if (parsedBody && !isEmpty(parsedBody)) {
+					const parsedBody = recursiveParseJSON(value);
+					if (!isEmpty(parsedBody)) {
 						const treeData = jsonToDataNodes(parsedBody, {
 							isBodyJsonQueryEnabled,
 							handleChangeSelectedView,
@@ -88,8 +82,8 @@ const useAsyncJSONProcessing = (
 					// eslint-disable-next-line sonarjs/no-identical-functions
 					(): void => {
 						try {
-							const parsedBody = parseBody();
-							if (parsedBody && !isEmpty(parsedBody)) {
+							const parsedBody = recursiveParseJSON(value);
+							if (!isEmpty(parsedBody)) {
 								const treeData = jsonToDataNodes(parsedBody, {
 									isBodyJsonQueryEnabled,
 									handleChangeSelectedView,

frontend/src/container/LogDetailedView/utils.tsx

@@ -4,11 +4,7 @@ import { ChangeViewFunctionType } from 'container/ExplorerOptions/types';
 import { MetricsType } from 'container/MetricsApplication/constant';
 import dompurify from 'dompurify';
 import { uniqueId } from 'lodash-es';
-import {
-	ILog,
-	ILogAggregateAttributesResources,
-	ILogBody,
-} from 'types/api/logs/log';
+import { ILog, ILogAggregateAttributesResources } from 'types/api/logs/log';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { FORBID_DOM_PURIFY_ATTR, FORBID_DOM_PURIFY_TAGS } from 'utils/app';
 
@@ -437,8 +433,3 @@ export const getSanitizedLogBody = (
 		return '{}';
 	}
 };
-
-// Returns a plain string for display contexts (Monaco editor, table cells, raw log row).
-export function getBodyDisplayString(body: string | ILogBody): string {
-	return typeof body === 'string' ? body : JSON.stringify(body as ILogBody);
-}

frontend/src/container/NewWidget/RightContainer/SettingSections/AxesSection/AxesSection.tsx

@@ -1,7 +1,8 @@
 import { Dispatch, SetStateAction } from 'react';
-import { InputNumber, Select } from 'antd';
+import { Select } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { Axis3D, ChartLine, Spline } from '@signozhq/icons';
+import InputNumber from 'components/InputNumber';
 
 import SettingsSection from '../../components/SettingsSection/SettingsSection';
 
@@ -48,7 +49,6 @@ export default function AxesSection({
 					<section className="container">
 						<Typography.Text className="text">Soft Min</Typography.Text>
 						<InputNumber
-							type="number"
 							value={softMin}
 							onChange={softMinHandler}
 							rootClassName="input"
@@ -58,7 +58,6 @@ export default function AxesSection({
 						<Typography.Text className="text">Soft Max</Typography.Text>
 						<InputNumber
 							value={softMax}
-							type="number"
 							rootClassName="input"
 							onChange={softMaxHandler}
 						/>

frontend/src/container/NewWidget/RightContainer/SettingSections/HistogramBucketsSection/HistogramBucketsSection.tsx

@@ -1,6 +1,7 @@
 import { Dispatch, SetStateAction } from 'react';
-import { InputNumber, Switch } from 'antd';
+import { Switch } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
+import InputNumber from 'components/InputNumber';
 
 import SettingsSection from '../../components/SettingsSection/SettingsSection';
 
@@ -31,7 +32,6 @@ export default function HistogramBucketsSection({
 				</Typography.Text>
 				<InputNumber
 					value={bucketCount || null}
-					type="number"
 					min={0}
 					rootClassName="bucket-input"
 					placeholder="Default: 30"
@@ -44,7 +44,6 @@ export default function HistogramBucketsSection({
 				</Typography.Text>
 				<InputNumber
 					value={bucketWidth || null}
-					type="number"
 					precision={2}
 					placeholder="Default: Auto"
 					step={0.1}

frontend/src/container/NewWidget/RightContainer/Threshold/Threshold.tsx

@@ -1,7 +1,8 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { useMemo, useRef, useState } from 'react';
 import { useDrag, useDrop, XYCoord } from 'react-dnd';
-import { Button, Input, InputNumber, Select, Space } from 'antd';
+import { Button, Input, Select, Space } from 'antd';
+import InputNumber from 'components/InputNumber';
 import { Typography } from '@signozhq/ui/typography';
 import YAxisUnitSelector from 'components/YAxisUnitSelector';
 import { Y_AXIS_UNIT_NAMES } from 'components/YAxisUnitSelector/constants';

frontend/src/container/OptionsMenu/MaxLinesField/index.tsx

@@ -14,12 +14,7 @@ function MaxLinesField({ config }: MaxLinesFieldProps): JSX.Element | null {
 	return (
 		<MaxLinesFieldWrapper>
 			<FieldTitle>{t('options_menu.maxLines')}</FieldTitle>
-			<MaxLinesInput
-				controls
-				size="small"
-				value={config.value}
-				onChange={config.onChange}
-			/>
+			<MaxLinesInput value={config.value} onChange={config.onChange} />
 		</MaxLinesFieldWrapper>
 	);
 }

frontend/src/container/OptionsMenu/MaxLinesField/styles.ts

@@ -1,4 +1,4 @@
-import { InputNumber } from 'antd';
+import InputNumber from 'components/InputNumber';
 import styled from 'styled-components';
 
 export const MaxLinesFieldWrapper = styled.div`

frontend/src/container/OptionsMenu/types.ts

@@ -1,5 +1,6 @@
-import { InputNumberProps, RadioProps, SelectProps } from 'antd';
+import { RadioProps, SelectProps } from 'antd';
 import { TelemetryFieldKey } from 'api/v5/v5';
+import type { InputNumberProps } from 'components/InputNumber';
 import { LogViewMode } from 'container/LogsTable';
 
 export enum FontSize {

frontend/src/container/PipelinePage/PipelineListsView/Preview/components/LogsList/index.tsx

@@ -2,7 +2,6 @@ import { Expand } from '@signozhq/icons';
 import LogDetail from 'components/LogDetail';
 import { VIEW_TYPES } from 'components/LogDetail/constants';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-import { getBodyDisplayString } from 'container/LogDetailedView/utils';
 import { useActiveLog } from 'hooks/logs/useActiveLog';
 import { useTimezone } from 'providers/Timezone';
 import { ILog } from 'types/api/logs/log';
@@ -27,9 +26,7 @@ function LogsList({ logs }: LogsListProps): JSX.Element {
 							DATE_TIME_FORMATS.UTC_MONTH_SHORT,
 						)}
 					</div>
-					<div className="logs-preview-list-item-body">
-						{getBodyDisplayString(log.body)}
-					</div>
+					<div className="logs-preview-list-item-body">{log.body}</div>
 					<div
 						className="logs-preview-list-item-expand"
 						onClick={makeLogDetailsHandler(log)}

frontend/src/container/PlannedDowntime/PlannedDowntimeForm.tsx

@@ -311,7 +311,7 @@ export function PlannedDowntimeForm(
 			default:
 				return `Scheduled for ${formattedStartDate} starting at ${formattedStartTime}.`;
 		}
-	}, [formData, recurrenceType]);
+	}, [formData, recurrenceType, timezone]);
 
 	const endTimeText = useMemo((): string => {
 		const endTime = formData.endTime;
@@ -322,7 +322,7 @@ export function PlannedDowntimeForm(
 		const formattedEndTime = endTime.format(TIME_FORMAT);
 		const formattedEndDate = endTime.format(DATE_FORMAT);
 		return `Scheduled to end maintenance on ${formattedEndDate} at ${formattedEndTime}.`;
-	}, [formData, recurrenceType]);
+	}, [formData, recurrenceType, timezone]);
 
 	return (
 		<Modal

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

@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { InputNumber, InputNumberProps } from 'antd';
+import InputNumber from 'components/InputNumber';
 import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import { DataSource } from 'types/common/queryBuilder';
 
@@ -15,9 +15,9 @@ function AggregateEveryFilter({
 		[query.dataSource],
 	);
 
-	const onChangeHandler: InputNumberProps<number>['onChange'] = (event) => {
-		if (event && event >= 0) {
-			onChange(event);
+	const onChangeHandler = (value: number | null): void => {
+		if (value !== null && value >= 0) {
+			onChange(value);
 		}
 	};
 

frontend/src/container/QueryBuilder/filters/Formula/Limit/Limit.tsx

@@ -1,4 +1,4 @@
-import { InputNumber } from 'antd';
+import InputNumber from 'components/InputNumber';
 
 import { selectStyle } from '../../QueryBuilderSearch/config';
 import { handleKeyDownLimitFilter } from '../../utils';
@@ -8,7 +8,6 @@ function LimitFilter({ onChange, formula }: LimitFilterProps): JSX.Element {
 	return (
 		<InputNumber
 			min={1}
-			type="number"
 			value={formula.limit}
 			style={selectStyle}
 			onChange={onChange}