feat: dashboard details changes

drop the useIsDashboardV2 entry-point branches and exclude both v2
folders from tsc. nothing imports them, so vite tree-shakes the code
out of the bundle; the folders sit dormant until a follow-up restores
the feature-flag gates once nv/v2-list-dashboard merges to main.

.github/CODEOWNERS

@@ -118,6 +118,9 @@ go.mod @therealpandey
 
 /tests/integration/ @therealpandey
 
+# e2e tests
+/tests/e2e/ @AshwinBhatkal
+
 # Flagger Owners
 
 /pkg/flagger/ @therealpandey
@@ -162,3 +165,7 @@ go.mod @therealpandey
 /frontend/src/lib/dashboard/ @SigNoz/pulse-frontend
 /frontend/src/lib/dashboardVariables/ @SigNoz/pulse-frontend
 /frontend/src/components/NewSelect/ @SigNoz/pulse-frontend
+
+## Dashboard V2
+/frontend/src/pages/DashboardPageV2/ @SigNoz/pulse-frontend
+/frontend/src/pages/DashboardsListPageV2/ @SigNoz/pulse-frontend

frontend/plugins/rules/no-antd-components.mjs

@@ -17,9 +17,8 @@ const BANNED_COMPONENTS = {
 	Typography:
 		'Use @signozhq/ui/typography Typography instead of antd Typography.',
 	Switch: 'Use @signozhq/ui/switch Switch instead of antd Switch.',
-	Dropdown:
-		'Use @signozhq/ui DropdownMenuSimple (or the composable DropdownMenu primitives) from @signozhq/ui/dropdown-menu instead of antd Dropdown.',
 	Badge: 'Use @signozhq/ui/badge instead of antd Badge.',
+	Progress: 'Use @signozhq/ui/progress instead of antd Progress.',
 };
 
 export default {

frontend/src/components/CeleryOverview/CeleryOverviewTable/CeleryOverviewTable.styles.scss

@@ -51,13 +51,6 @@
 				background: var(--l1-background);
 			}
 
-			.progress-container {
-				.ant-progress-bg {
-					height: 8px !important;
-					border-radius: 4px;
-				}
-			}
-
 			.ant-table-tbody > tr:hover > td {
 				background: color-mix(in srgb, var(--l1-foreground) 4%, transparent);
 			}

frontend/src/components/CeleryOverview/CeleryOverviewTable/CeleryOverviewTable.tsx

@@ -9,13 +9,13 @@ import {
 	Flex,
 	Input,
 	InputRef,
-	Progress,
 	Space,
 	Spin,
 	TableColumnsType,
 	TableColumnType,
 	Tooltip,
 } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import type { FilterDropdownProps } from 'antd/lib/table/interface';
 import logEvent from 'api/common/logEvent';
@@ -59,7 +59,7 @@ function ProgressRender(item: string | number): JSX.Element {
 			<Progress
 				percent={percent}
 				strokeLinecap="butt"
-				size="small"
+				showInfo
 				strokeColor={((): string => {
 					const cpuPercent = percent;
 					if (cpuPercent >= 90) {

frontend/src/components/DropDown/DropDown.styles.scss

@@ -0,0 +1,7 @@
+.dropdown-button {
+	color: var(--l1-foreground);
+}
+
+.dropdown-icon {
+	font-size: 1.2rem;
+}

frontend/src/components/DropDown/DropDown.tsx

@@ -0,0 +1,51 @@
+import { useState } from 'react';
+import { Ellipsis } from '@signozhq/icons';
+import { Button, Dropdown, MenuProps } from 'antd';
+
+import './DropDown.styles.scss';
+
+function DropDown({
+	element,
+	onDropDownItemClick,
+}: {
+	element: JSX.Element[];
+	onDropDownItemClick?: MenuProps['onClick'];
+}): JSX.Element {
+	const items: MenuProps['items'] = element.map(
+		(e: JSX.Element, index: number) => ({
+			label: e,
+			key: index,
+		}),
+	);
+
+	const [isDdOpen, setDdOpen] = useState<boolean>(false);
+
+	return (
+		<Dropdown
+			menu={{
+				items,
+				onMouseEnter: (): void => setDdOpen(true),
+				onMouseLeave: (): void => setDdOpen(false),
+				onClick: (item): void => onDropDownItemClick?.(item),
+			}}
+			open={isDdOpen}
+		>
+			<Button
+				type="link"
+				className={`dropdown-button`}
+				onClick={(e): void => {
+					e.preventDefault();
+					setDdOpen(true);
+				}}
+			>
+				<Ellipsis className="dropdown-icon" size={16} />
+			</Button>
+		</Dropdown>
+	);
+}
+
+DropDown.defaultProps = {
+	onDropDownItemClick: (): void => {},
+};
+
+export default DropDown;

frontend/src/components/ExplorerCard/ExplorerCard.tsx

@@ -1,7 +1,15 @@
 import { useState } from 'react';
 import { useCopyToClipboard } from 'react-use';
-import { Button, Col, Popover, Row, Select, Space } from 'antd';
-import { DropdownMenuSimple, type MenuProps } from '@signozhq/ui/dropdown-menu';
+import {
+	Button,
+	Col,
+	Dropdown,
+	MenuProps,
+	Popover,
+	Row,
+	Select,
+	Space,
+} from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import axios from 'axios';
 import TextToolTip from 'components/TextToolTip';
@@ -233,9 +241,9 @@ function ExplorerCard({
 								</Popover>
 								<Share2 onClick={onCopyUrlHandler} size="md" />
 								{viewKey && (
-									<DropdownMenuSimple menu={moreOptionMenu}>
-										<Button type="text" size="small" icon={<Ellipsis size="md" />} />
-									</DropdownMenuSimple>
+									<Dropdown trigger={['click']} menu={moreOptionMenu}>
+										<Ellipsis size="md" />
+									</Dropdown>
 								)}
 							</Space>
 						</OffSetCol>

frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx

@@ -6,7 +6,7 @@ import {
 	useMemo,
 	useState,
 } from 'react';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
+import { Dropdown } from 'antd';
 import cx from 'classnames';
 import { ENTITY_VERSION_V4, ENTITY_VERSION_V5 } from 'constants/app';
 import { PANEL_TYPES } from 'constants/queryBuilder';
@@ -195,7 +195,7 @@ export const QueryV2 = forwardRef(function QueryV2(
 							)}
 
 							{isMultiQueryAllowed && (
-								<DropdownMenuSimple
+								<Dropdown
 									className="query-actions-dropdown"
 									menu={{
 										items: [
@@ -217,10 +217,10 @@ export const QueryV2 = forwardRef(function QueryV2(
 												: []),
 										],
 									}}
-									align="end"
+									placement="bottomRight"
 								>
 									<Ellipsis size={16} />
-								</DropdownMenuSimple>
+								</Dropdown>
 							)}
 						</div>
 					</div>

frontend/src/components/ResizeTable/DynamicColumnTable.tsx

@@ -4,14 +4,14 @@ import type {
 	TableColumnsType as ColumnsType,
 	TableColumnType as ColumnType,
 } from 'antd';
-import { Button, Flex } from 'antd';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
+import { Button, Dropdown, Flex, MenuProps } from 'antd';
 import { Switch } from '@signozhq/ui/switch';
 import logEvent from 'api/common/logEvent';
 import LaunchChatSupport from 'components/LaunchChatSupport/LaunchChatSupport';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
 import useUrlQuery from 'hooks/useUrlQuery';
 import { SlidersHorizontal } from '@signozhq/icons';
+import { popupContainer } from 'utils/selectPopupContainer';
 
 import ResizeTable from './ResizeTable';
 import { DynamicColumnTableProps } from './types';
@@ -84,9 +84,8 @@ function DynamicColumnTable({
 			);
 		};
 
-	const items: MenuItem[] =
+	const items: MenuProps['items'] =
 		dynamicColumns?.map((column, index) => ({
-			key: String(index),
 			label: (
 				<div
 					className="dynamicColumnsTable-items"
@@ -100,6 +99,8 @@ function DynamicColumnTable({
 					/>
 				</div>
 			),
+			key: index,
+			type: 'checkbox',
 		})) || [];
 
 	// Get current page from URL or default to 1
@@ -128,14 +129,18 @@ function DynamicColumnTable({
 			<Flex justify="flex-end" align="center" gap={8}>
 				{facingIssueBtn && <LaunchChatSupport {...facingIssueBtn} />}
 				{dynamicColumns && (
-					<DropdownMenuSimple menu={{ items }}>
+					<Dropdown
+						getPopupContainer={popupContainer}
+						menu={{ items }}
+						trigger={['click']}
+					>
 						<Button
 							className="dynamicColumnTable-button filter-btn"
 							size="middle"
 							icon={<SlidersHorizontal size={14} />}
 							data-testid="additional-filters-button"
 						/>
-					</DropdownMenuSimple>
+					</Dropdown>
 				)}
 			</Flex>
 

frontend/src/components/TimePreferenceDropDown/index.tsx

@@ -1,7 +1,6 @@
 import { Dispatch, SetStateAction, useCallback, useMemo } from 'react';
 import { ChevronDown, Globe } from '@signozhq/icons';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
-import { Button } from 'antd';
+import { Button, Dropdown } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import TimeItems, {
 	timePreferance,
@@ -28,17 +27,20 @@ function TimePreference({
 
 	const menu = useMemo(
 		() => ({
-			items: menuItems.map((item) => ({
-				...item,
-				onClick: timeMenuItemOnChangeHandler,
-			})),
+			items: menuItems,
+			onClick: timeMenuItemOnChangeHandler,
 		}),
 		[timeMenuItemOnChangeHandler],
 	);
 
 	return (
-		<DropdownMenuSimple menu={menu} className="time-selection-menu">
-			<Button className="time-selection-target">
+		<Dropdown
+			menu={menu}
+			rootClassName="time-selection-menu"
+			className="time-selection-target"
+			trigger={['click']}
+		>
+			<Button>
 				<div className="button-selected-text">
 					<Globe size={14} />
 					<Typography.Text className="selected-value">
@@ -47,7 +49,7 @@ function TimePreference({
 				</div>
 				<ChevronDown size="md" />
 			</Button>
-		</DropdownMenuSimple>
+		</Dropdown>
 	);
 }
 

frontend/src/constants/features.ts

@@ -11,4 +11,5 @@ export enum FeatureKeys {
 	DOT_METRICS_ENABLED = 'dot_metrics_enabled',
 	USE_JSON_BODY = 'use_json_body',
 	USE_FINE_GRAINED_AUTHZ = 'use_fine_grained_authz',
+	DASHBOARD_V2 = 'dashboard_v2',
 }

frontend/src/constants/localStorage.ts

@@ -42,4 +42,5 @@ export enum LOCALSTORAGE {
 	LICENSE_KEY_CALLOUT_DISMISSED = 'LICENSE_KEY_CALLOUT_DISMISSED',
 	DASHBOARD_PREFERENCES = 'DASHBOARD_PREFERENCES',
 	ACTIVE_SIGNOZ_INSTANCE_URL = 'ACTIVE_SIGNOZ_INSTANCE_URL',
+	DASHBOARDS_LIST_VISIBLE_COLUMNS = 'DASHBOARDS_LIST_VISIBLE_COLUMNS',
 }

frontend/src/container/AlertHistory/Statistics/TopContributorsCard/TopContributorsCard.styles.scss

@@ -45,6 +45,10 @@
 	.contributors-row {
 		height: 80px;
 	}
+	.top-contributors-progress {
+		--progress-background: transparent;
+	}
+
 	&__content {
 		.ant-table {
 			&-cell {

frontend/src/container/AlertHistory/Statistics/TopContributorsCard/TopContributorsRows.tsx

@@ -1,6 +1,7 @@
 import { HTMLAttributes } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Table, TableColumnsType as ColumnsType } from 'antd';
+import { Table, TableColumnsType as ColumnsType } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import logEvent from 'api/common/logEvent';
 import { ConditionalAlertPopover } from 'container/AlertHistory/AlertPopover/AlertPopover';
 import AlertLabels from 'pages/AlertDetails/AlertHeader/AlertLabels/AlertLabels';
@@ -51,8 +52,8 @@ function TopContributorsRows({
 					<Progress
 						percent={(count / totalCurrentTriggers) * 100}
 						showInfo={false}
-						trailColor="rgba(255, 255, 255, 0)"
 						strokeColor={Color.BG_ROBIN_500}
+						className="top-contributors-progress"
 					/>
 				</ConditionalAlertPopover>
 			),

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.styles.scss

@@ -141,12 +141,9 @@
 
 			.progress-container {
 				width: 158px;
-				.ant-progress {
-					margin: 0;
 
-					.ant-progress-text {
-						font-weight: 600;
-					}
+				span {
+					font-weight: 600;
 				}
 			}
 

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/DomainMetrics.tsx

@@ -1,7 +1,8 @@
 import { useMemo } from 'react';
 import { useQueries } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Skeleton, Tooltip } from 'antd';
+import { Skeleton, Tooltip } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
@@ -136,12 +137,11 @@ function DomainMetrics({
 							<Tooltip title={formattedDomainMetricsData.errorRate}>
 								{formattedDomainMetricsData.errorRate !== '-' ? (
 									<Progress
-										status="active"
 										percent={Number(
 											Number(formattedDomainMetricsData.errorRate).toFixed(2),
 										)}
 										strokeLinecap="butt"
-										size="small"
+										showInfo
 										strokeColor={((): string => {
 											const errorRatePercent = Number(
 												Number(formattedDomainMetricsData.errorRate).toFixed(2),

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/EndPointMetrics.tsx

@@ -1,7 +1,8 @@
 import { useMemo } from 'react';
 import { UseQueryResult } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Skeleton, Tooltip } from 'antd';
+import { Skeleton, Tooltip } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	getDisplayValue,
@@ -80,10 +81,9 @@ function EndPointMetrics({
 							<Tooltip title={metricsData?.errorRate}>
 								{metricsData?.errorRate !== '-' ? (
 									<Progress
-										status="active"
 										percent={Number(Number(metricsData?.errorRate ?? 0).toFixed(2))}
 										strokeLinecap="butt"
-										size="small"
+										showInfo
 										strokeColor={((): string => {
 											const errorRatePercent = Number(
 												Number(metricsData?.errorRate ?? 0).toFixed(2),

frontend/src/container/ApiMonitoring/utils.tsx

@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, TableColumnType as ColumnType, Tag, Tooltip } from 'antd';
+import { TableColumnType as ColumnType, Tag, Tooltip } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { convertFiltersToExpressionWithExistingQuery } from 'components/QueryBuilderV2/utils';
 import {
 	FiltersType,
@@ -257,10 +258,9 @@ export const columnsConfig: ColumnType<APIDomainsRowData>[] = [
 				errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate;
 			return (
 				<Progress
-					status="active"
 					percent={Number((errorRateValue as number).toFixed(2))}
 					strokeLinecap="butt"
-					size="small"
+					showInfo
 					strokeColor={((): string => {
 						const errorRatePercent = Number((errorRateValue as number).toFixed(2));
 						if (errorRatePercent >= 90) {
@@ -1022,14 +1022,13 @@ export const getEndPointsColumnsConfig = (
 		className: `column`,
 		render: (errorRate: number | string): React.ReactNode => (
 			<Progress
-				status="active"
 				percent={Number(
 					(
 						(errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate) as number
 					).toFixed(1),
 				)}
 				strokeLinecap="butt"
-				size="small"
+				showInfo
 				strokeColor={((): string => {
 					const errorRatePercent = Number((errorRate as number).toFixed(1));
 					if (errorRatePercent >= 90) {
@@ -2514,10 +2513,9 @@ export const dependentServicesColumns: ColumnType<DependentServicesData>[] = [
 		render: (errorPercentage: number | string): React.ReactNode =>
 			errorPercentage !== '-' ? (
 				<Progress
-					status="active"
 					percent={Number((errorPercentage as number).toFixed(2))}
 					strokeLinecap="butt"
-					size="small"
+					showInfo
 					strokeColor={((): string => {
 						const errorPercentagePercent = Number(
 							(errorPercentage as number).toFixed(2),
@@ -3022,14 +3020,13 @@ export const getAllEndpointsWidgetData = (
 		),
 		F1: (errorRate: any): ReactNode => (
 			<Progress
-				status="active"
 				percent={Number(
 					(
 						(errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate) as number
 					).toFixed(2),
 				)}
 				strokeLinecap="butt"
-				size="small"
+				showInfo
 				strokeColor={((): string => {
 					const errorRatePercent = Number(
 						(

frontend/src/container/CustomDomainSettings/CustomDomainSettings.tsx

@@ -11,13 +11,8 @@ import {
 } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 import { Callout } from '@signozhq/ui/callout';
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuTrigger,
-} from '@signozhq/ui/dropdown-menu';
 import { toast } from '@signozhq/ui/sonner';
-import { Skeleton } from 'antd';
+import { Dropdown, Skeleton } from 'antd';
 import {
 	RenderErrorResponseDTO,
 	ZeustypesHostDTO,
@@ -205,15 +200,10 @@ export default function CustomDomainSettings(): JSX.Element {
 							!workspaceName ? 'workspace-name-hidden' : ''
 						}`}
 					>
-						<DropdownMenu>
-							<DropdownMenuTrigger asChild>
-								<Button variant="link" color="none" disabled={isFetchingHosts}>
-									<Link2 size={12} />
-									<span>{stripProtocol(activeHost?.url ?? '')}</span>
-									<ChevronDown size={12} />
-								</Button>
-							</DropdownMenuTrigger>
-							<DropdownMenuContent align="start">
+						<Dropdown
+							trigger={['click']}
+							disabled={isFetchingHosts}
+							dropdownRender={(): JSX.Element => (
 								<div className="workspace-url-dropdown">
 									<span className="workspace-url-dropdown-header">
 										All Workspace URLs
@@ -246,8 +236,14 @@ export default function CustomDomainSettings(): JSX.Element {
 										);
 									})}
 								</div>
-							</DropdownMenuContent>
-						</DropdownMenu>
+							)}
+						>
+							<Button variant="link" color="none">
+								<Link2 size={12} />
+								<span>{stripProtocol(activeHost?.url ?? '')}</span>
+								<ChevronDown size={12} />
+							</Button>
+						</Dropdown>
 						<span className="custom-domain-card-meta-timezone">
 							<Clock size={11} />
 							{timezone.offset}

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

@@ -1,5 +1,4 @@
 import { GetHosts200 } from 'api/generated/services/sigNoz.schemas';
-import userEvent from '@testing-library/user-event';
 import { rest, server } from 'mocks-server/server';
 import { fireEvent, render, screen, waitFor } from 'tests/test-utils';
 
@@ -143,13 +142,12 @@ describe('CustomDomainSettings', () => {
 	});
 
 	it('shows all workspace URLs as links in the dropdown', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
 		render(<CustomDomainSettings />);
 
 		await screen.findByText(/custom-host\.test\.cloud/i);
 
 		// Open the URL dropdown
-		await user.click(
+		fireEvent.click(
 			screen.getByRole('button', { name: /custom-host\.test\.cloud/i }),
 		);
 

frontend/src/container/DashboardContainerV2/DashboardDescriptionV2/SettingsDrawer/SettingsDrawer.styles.scss

@@ -0,0 +1,43 @@
+.settings-container-root {
+	.ant-drawer-wrapper-body {
+		border-left: 1px solid var(--l1-border);
+		background: var(--l2-background);
+		box-shadow: -4px 10px 16px 2px rgba(0, 0, 0, 0.2);
+
+		.ant-drawer-header {
+			height: 48px;
+			border-bottom: 1px solid var(--l1-border);
+			padding: 14px 14px 14px 11px;
+
+			.ant-drawer-header-title {
+				gap: 16px;
+
+				.ant-drawer-title {
+					color: var(--l2-foreground);
+					font-family: Inter;
+					font-size: 14px;
+					font-style: normal;
+					font-weight: 400;
+					line-height: 20px; /* 142.857% */
+					letter-spacing: -0.07px;
+					padding-left: 16px;
+					border-left: 1px solid var(--l1-border);
+				}
+
+				.ant-drawer-close {
+					height: 16px;
+					width: 16px;
+					margin-inline-end: 0px !important;
+				}
+			}
+		}
+
+		.ant-drawer-body {
+			padding: 16px;
+
+			&::-webkit-scrollbar {
+				width: 0.1rem;
+			}
+		}
+	}
+}

frontend/src/container/DashboardContainerV2/DashboardDescriptionV2/SettingsDrawer/index.tsx

@@ -0,0 +1,34 @@
+import { memo, PropsWithChildren, ReactElement } from 'react';
+import { Drawer } from 'antd';
+import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
+
+import './SettingsDrawer.styles.scss';
+
+type SettingsDrawerProps = PropsWithChildren<{
+	drawerTitle: string;
+	isOpen: boolean;
+	onClose: () => void;
+}>;
+
+function SettingsDrawer({
+	children,
+	drawerTitle,
+	isOpen,
+	onClose,
+}: SettingsDrawerProps): JSX.Element {
+	return (
+		<Drawer
+			title={drawerTitle}
+			placement="right"
+			width="50%"
+			onClose={onClose}
+			open={isOpen}
+			rootClassName="settings-container-root"
+		>
+			{/* Need to type cast because of OverlayScrollbar type definition. We should be good once we remove it. */}
+			<OverlayScrollbar>{children as ReactElement}</OverlayScrollbar>
+		</Drawer>
+	);
+}
+
+export default memo(SettingsDrawer);

frontend/src/container/DashboardContainerV2/DashboardDescriptionV2/index.tsx

@@ -0,0 +1,411 @@
+import { useEffect, useMemo, useState } from 'react';
+import { FullScreenHandle } from 'react-full-screen';
+import { useTranslation } from 'react-i18next';
+import { useCopyToClipboard } from 'react-use';
+import {
+	Check,
+	ClipboardCopy,
+	Ellipsis,
+	FileJson,
+	Fullscreen,
+	Globe,
+	LockKeyhole,
+	PenLine,
+	Plus,
+	X,
+} from '@signozhq/icons';
+import { Button, Card, Input, Modal, Popover, Tag, Tooltip } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import logEvent from 'api/common/logEvent';
+import {
+	lockDashboardV2,
+	patchDashboardV2,
+	unlockDashboardV2,
+} from 'api/generated/services/dashboard';
+import type { DashboardtypesJSONPatchOperationDTO } from 'api/generated/services/sigNoz.schemas';
+import ConfigureIcon from 'assets/Integrations/ConfigureIcon';
+import { DeleteButton } from 'container/ListOfDashboard/TableComponents/DeleteButton';
+import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
+import useComponentPermission from 'hooks/useComponentPermission';
+import { useNotifications } from 'hooks/useNotifications';
+import { isEmpty } from 'lodash-es';
+import { useAppContext } from 'providers/App/App';
+import { useErrorModal } from 'providers/ErrorModalProvider';
+import APIError from 'types/api/error';
+import { USER_ROLES } from 'types/roles';
+
+import { Base64Icons } from '../../DashboardContainer/DashboardSettings/General/utils';
+import DashboardSettingsV2 from '../DashboardSettings';
+import DashboardHeader from '../components/DashboardHeader/DashboardHeader';
+import DashboardVariablesV2 from '../DashboardVariablesV2';
+import SettingsDrawer from './SettingsDrawer';
+
+import '../../DashboardContainer/DashboardDescription/Description.styles.scss';
+
+import type { V2Dashboard } from '../utils';
+
+interface DashboardDescriptionV2Props {
+	dashboard: V2Dashboard | undefined;
+	handle: FullScreenHandle;
+	onRefetch: () => void;
+}
+
+// eslint-disable-next-line sonarjs/cognitive-complexity
+function DashboardDescriptionV2(props: DashboardDescriptionV2Props): JSX.Element {
+	const { dashboard, handle, onRefetch } = props;
+
+	const id = dashboard?.id ?? '';
+	const isDashboardLocked = !!dashboard?.locked;
+
+	const [isSettingsDrawerOpen, setIsSettingsDrawerOpen] =
+		useState<boolean>(false);
+
+	const title = dashboard?.data?.spec?.display?.name ?? '';
+	const description = dashboard?.data?.spec?.display?.description ?? '';
+	const image = dashboard?.data?.metadata?.image || Base64Icons[0];
+	const tags = useMemo(
+		() =>
+			(dashboard?.data?.metadata?.tags ?? []).map((t) =>
+				t.key === t.value ? t.key : `${t.key}:${t.value}`,
+			),
+		[dashboard?.data?.metadata?.tags],
+	);
+	const dashboardVariables = dashboard?.data?.spec?.variables ?? [];
+
+	const [updatedTitle, setUpdatedTitle] = useState<string>(title);
+
+	const { user } = useAppContext();
+	const [editDashboard] = useComponentPermission(['edit_dashboard'], user.role);
+	const [isDashboardSettingsOpen, setIsDashbordSettingsOpen] =
+		useState<boolean>(false);
+	const [isRenameDashboardOpen, setIsRenameDashboardOpen] =
+		useState<boolean>(false);
+
+	const isAuthor =
+		!!user?.email && !!dashboard?.createdBy && dashboard.createdBy === user.email;
+	const addPanelPermission = !isDashboardLocked;
+	// V2 public dashboard wiring lives separately; treat as not-public for chrome.
+	const isPublicDashboard = false;
+
+	const { notifications } = useNotifications();
+	const { showErrorModal } = useErrorModal();
+	const { t } = useTranslation(['dashboard', 'common']);
+
+	const [isRenameLoading, setIsRenameLoading] = useState<boolean>(false);
+
+	useEffect(() => {
+		if (dashboard) setUpdatedTitle(title);
+	}, [dashboard, title]);
+
+	const handleLockDashboardToggle = async (): Promise<void> => {
+		if (!id) return;
+		setIsDashbordSettingsOpen(false);
+		try {
+			if (isDashboardLocked) {
+				await unlockDashboardV2({ id });
+				notifications.success({ message: 'Dashboard unlocked' });
+			} else {
+				await lockDashboardV2({ id });
+				notifications.success({ message: 'Dashboard locked' });
+			}
+			onRefetch();
+		} catch (error) {
+			showErrorModal(error as APIError);
+		}
+	};
+
+	const onNameChangeHandler = async (): Promise<void> => {
+		const trimmed = updatedTitle.trim();
+		if (!id || !trimmed || trimmed === title) {
+			setIsRenameDashboardOpen(false);
+			return;
+		}
+		try {
+			setIsRenameLoading(true);
+			const patch: DashboardtypesJSONPatchOperationDTO[] = [
+				{
+					op: 'replace' as DashboardtypesJSONPatchOperationDTO['op'],
+					path: '/spec/display/name',
+					value: trimmed,
+				},
+			];
+			await patchDashboardV2({ id }, patch);
+			notifications.success({ message: 'Dashboard renamed successfully' });
+			setIsRenameDashboardOpen(false);
+			onRefetch();
+		} catch (error) {
+			showErrorModal(error as APIError);
+			setIsRenameDashboardOpen(true);
+		} finally {
+			setIsRenameLoading(false);
+		}
+	};
+
+	const onEmptyWidgetHandler = (): void => {
+		logEvent('Dashboard Detail V2: Add new panel clicked', {
+			dashboardId: id,
+		});
+		notifications.info({
+			message: 'V2 panel editor coming next',
+		});
+	};
+
+	const [state, setCopy] = useCopyToClipboard();
+
+	useEffect(() => {
+		if (state.error) {
+			notifications.error({
+				message: t('something_went_wrong', { ns: 'common' }),
+			});
+		}
+		if (state.value) {
+			notifications.success({ message: t('success', { ns: 'common' }) });
+		}
+	}, [state.error, state.value, t, notifications]);
+
+	const dashboardDataJSON = (): string =>
+		JSON.stringify(dashboard?.data ?? {}, null, 2);
+
+	const exportJSON = (): void => {
+		const blob = new Blob([dashboardDataJSON()], { type: 'application/json' });
+		const url = URL.createObjectURL(blob);
+		const link = document.createElement('a');
+		link.href = url;
+		link.download = `${title || 'dashboard'}.json`;
+		document.body.appendChild(link);
+		link.click();
+		document.body.removeChild(link);
+		URL.revokeObjectURL(url);
+	};
+
+	const onConfigureClick = (): void => {
+		setIsSettingsDrawerOpen(true);
+	};
+
+	const onSettingsDrawerClose = (): void => {
+		setIsSettingsDrawerOpen(false);
+	};
+
+	return (
+		<Card className="dashboard-description-container">
+			<DashboardHeader title={title} image={image} />
+			<section className="dashboard-details">
+				<div className="left-section">
+					<img src={image} alt="dashboard-img" className="dashboard-img" />
+					<Tooltip title={title.length > 30 ? title : ''}>
+						<Typography.Text
+							className="dashboard-title"
+							data-testid="dashboard-title"
+						>
+							{title}
+						</Typography.Text>
+					</Tooltip>
+
+					{isPublicDashboard && (
+						<Tooltip title="This dashboard is publicly accessible">
+							<Globe size={14} className="public-dashboard-icon" />
+						</Tooltip>
+					)}
+
+					{isDashboardLocked && (
+						<Tooltip title="This dashboard is locked">
+							<LockKeyhole size={14} className="lock-dashboard-icon" />
+						</Tooltip>
+					)}
+				</div>
+				<div className="right-section">
+					<DateTimeSelectionV2 showAutoRefresh hideShareModal />
+					<Popover
+						open={isDashboardSettingsOpen}
+						arrow={false}
+						onOpenChange={(visible): void => setIsDashbordSettingsOpen(visible)}
+						rootClassName="dashboard-settings"
+						content={
+							<div className="menu-content">
+								<section className="section-1">
+									{(isAuthor || user.role === USER_ROLES.ADMIN) && (
+										<Tooltip
+											title={
+												dashboard?.createdBy === 'integration' &&
+												'Dashboards created by integrations cannot be unlocked'
+											}
+										>
+											<Button
+												type="text"
+												icon={<LockKeyhole size={14} />}
+												disabled={dashboard?.createdBy === 'integration'}
+												onClick={handleLockDashboardToggle}
+												data-testid="lock-unlock-dashboard"
+											>
+												{isDashboardLocked ? 'Unlock Dashboard' : 'Lock Dashboard'}
+											</Button>
+										</Tooltip>
+									)}
+
+									{!isDashboardLocked && editDashboard && (
+										<Button
+											type="text"
+											icon={<PenLine size={14} />}
+											onClick={(): void => {
+												setIsRenameDashboardOpen(true);
+												setIsDashbordSettingsOpen(false);
+											}}
+										>
+											Rename
+										</Button>
+									)}
+
+									<Button
+										type="text"
+										icon={<Fullscreen size={14} />}
+										onClick={handle.enter}
+									>
+										Full screen
+									</Button>
+								</section>
+								<section className="section-2">
+									<Button
+										type="text"
+										icon={<FileJson size={14} />}
+										onClick={(): void => {
+											exportJSON();
+											setIsDashbordSettingsOpen(false);
+										}}
+									>
+										Export JSON
+									</Button>
+									<Button
+										type="text"
+										icon={<ClipboardCopy size={14} />}
+										onClick={(): void => {
+											setCopy(dashboardDataJSON());
+											setIsDashbordSettingsOpen(false);
+										}}
+									>
+										Copy as JSON
+									</Button>
+								</section>
+								<section className="delete-dashboard">
+									<DeleteButton
+										createdBy={dashboard?.createdBy || ''}
+										name={title}
+										id={id}
+										isLocked={isDashboardLocked}
+										routeToListPage
+									/>
+								</section>
+							</div>
+						}
+						trigger="click"
+						placement="bottomRight"
+					>
+						<Button
+							icon={<Ellipsis size={14} />}
+							type="text"
+							className="icons"
+							data-testid="options"
+						/>
+					</Popover>
+					{!isDashboardLocked && editDashboard && (
+						<>
+							<Button
+								type="text"
+								className="configure-button"
+								icon={<ConfigureIcon />}
+								data-testid="show-drawer"
+								onClick={onConfigureClick}
+							>
+								Configure
+							</Button>
+							<SettingsDrawer
+								drawerTitle="Dashboard Configuration"
+								isOpen={isSettingsDrawerOpen}
+								onClose={onSettingsDrawerClose}
+							>
+								<DashboardSettingsV2
+									dashboard={dashboard}
+									onRefetch={onRefetch}
+								/>
+							</SettingsDrawer>
+						</>
+					)}
+					{!isDashboardLocked && addPanelPermission && (
+						<Button
+							className="add-panel-btn"
+							onClick={onEmptyWidgetHandler}
+							icon={<Plus size="md" />}
+							type="primary"
+							data-testid="add-panel-header"
+						>
+							New Panel
+						</Button>
+					)}
+				</div>
+			</section>
+			{tags.length > 0 && (
+				<div className="dashboard-tags">
+					{tags.map((tag) => (
+						<Tag key={tag} className="tag">
+							{tag}
+						</Tag>
+					))}
+				</div>
+			)}
+			{!isEmpty(description) && (
+				<section className="dashboard-description-section">{description}</section>
+			)}
+
+			{dashboardVariables.length > 0 && (
+				<section className="dashboard-variables">
+					<DashboardVariablesV2
+						dashboardId={id}
+						variables={dashboardVariables}
+					/>
+				</section>
+			)}
+
+			<Modal
+				open={isRenameDashboardOpen}
+				title="Rename Dashboard"
+				onOk={onNameChangeHandler}
+				onCancel={(): void => {
+					setIsRenameDashboardOpen(false);
+				}}
+				rootClassName="rename-dashboard"
+				footer={
+					<div className="dashboard-rename">
+						<Button
+							type="primary"
+							icon={<Check size={14} />}
+							className="rename-btn"
+							onClick={onNameChangeHandler}
+							disabled={isRenameLoading}
+						>
+							Rename Dashboard
+						</Button>
+						<Button
+							type="text"
+							icon={<X size={14} />}
+							className="cancel-btn"
+							onClick={(): void => setIsRenameDashboardOpen(false)}
+						>
+							Cancel
+						</Button>
+					</div>
+				}
+			>
+				<div className="dashboard-content">
+					<Typography.Text className="name-text">Enter a new name</Typography.Text>
+					<Input
+						data-testid="dashboard-name"
+						className="dashboard-name-input"
+						value={updatedTitle}
+						onChange={(e): void => setUpdatedTitle(e.target.value)}
+					/>
+				</div>
+			</Modal>
+		</Card>
+	);
+}
+
+export default DashboardDescriptionV2;

frontend/src/container/DashboardContainerV2/DashboardSettings/General/GeneralSettings.module.scss

@@ -0,0 +1,227 @@
+.overviewContent {
+	display: flex;
+	flex-direction: column;
+	gap: 16px;
+}
+
+.overviewSettings {
+	border-radius: 3px;
+	border: 1px solid var(--l1-border);
+	padding: 16px !important;
+}
+
+.crossPanelSyncGroup {
+	display: flex;
+	flex-direction: column;
+	gap: 16px;
+}
+
+.crossPanelSyncSectionTitle {
+	color: var(--l1-foreground);
+	font-family: Inter;
+	font-size: 14px;
+	font-weight: 500;
+	line-height: 20px;
+}
+
+.crossPanelSyncSectionHeader {
+	display: flex;
+	align-items: center;
+	gap: 6px;
+	align-self: flex-start;
+}
+
+.crossPanelSyncInfoIcon {
+	cursor: help;
+	color: var(--l3-foreground);
+}
+
+.crossPanelSyncTooltipContent {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+	max-width: 300px;
+}
+
+.crossPanelSyncTooltipTitle {
+	font-size: 14px;
+}
+
+.crossPanelSyncTooltipDescription {
+	font-size: 12px;
+	line-height: 1.5;
+}
+
+.crossPanelSyncTooltipDocLink {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	color: var(--primary-background);
+	font-size: 12px;
+	margin-top: 4px;
+}
+
+.crossPanelSyncRow {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	gap: 16px;
+
+	& + & {
+		padding-top: 16px;
+		border-top: 1px solid var(--l1-border);
+	}
+}
+
+.crossPanelSyncInfo {
+	display: flex;
+	flex-direction: column;
+	gap: 4px;
+}
+
+.crossPanelSyncTitle {
+	color: var(--l2-foreground);
+	font-family: Inter;
+	font-size: 14px;
+	font-weight: 400;
+	line-height: 20px;
+}
+
+.crossPanelSyncDescription {
+	color: var(--l3-foreground);
+	font-family: Inter;
+	font-size: 13px;
+	font-weight: 400;
+	line-height: 20px;
+}
+
+.nameIconInput {
+	display: flex;
+}
+
+.dashboardImageInput {
+	:global(.ant-select-selector) {
+		display: flex;
+		width: 32px;
+		height: 32px;
+		padding: 6px;
+		justify-content: center;
+		align-items: center;
+		border-radius: 2px 0px 0px 2px;
+		border: 1px solid var(--l1-border) !important;
+		background: var(--l3-background) !important;
+
+		:global(.ant-select-selection-item) {
+			display: flex;
+			align-items: center;
+		}
+	}
+
+	&:global(.ant-select-dropdown) {
+		padding: 0px !important;
+	}
+
+	:global(.ant-select-item) {
+		padding: 0px;
+		align-items: center;
+		justify-content: center;
+
+		:global(.ant-select-item-option-content) {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+}
+
+.listItemImage {
+	height: 16px;
+	width: 16px;
+}
+
+.dashboardNameInput {
+	border-radius: 0px 2px 2px 0px;
+	border: 1px solid var(--l1-border);
+	background: var(--l3-background);
+}
+
+.dashboardName {
+	color: var(--l2-foreground);
+	font-family: Inter;
+	font-size: 14px;
+	font-style: normal;
+	font-weight: 400;
+	line-height: 20px;
+	margin-bottom: 0.5rem;
+}
+
+.descriptionTextArea {
+	padding: 6px 6px 6px 8px;
+	border-radius: 2px;
+	border: 1px solid var(--l1-border);
+	background: var(--l3-background);
+}
+
+.overviewSettingsFooter {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	width: -webkit-fill-available;
+	padding: 12px 16px 12px 0px;
+	position: fixed;
+	bottom: 0;
+	height: 32px;
+	border-top: 1px solid var(--l1-border);
+	background: var(--l2-background);
+}
+
+.unsaved {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+
+.unsavedDot {
+	width: 6px;
+	height: 6px;
+	border-radius: 50px;
+	background: var(--primary-background);
+	box-shadow: 0px 0px 6px 0px
+		color-mix(in srgb, var(--primary-background) 40%, transparent);
+}
+
+.unsavedChanges {
+	color: var(--bg-robin-400);
+	font-family: Inter;
+	font-size: 14px;
+	font-style: normal;
+	font-weight: 400;
+	line-height: 24px;
+	letter-spacing: -0.07px;
+}
+
+.footerActionBtns {
+	display: flex;
+	gap: 8px;
+}
+
+.discardBtn {
+	margin: '16px 0';
+	color: var(--l1-foreground);
+	font-family: Inter;
+	font-size: 12px;
+	font-style: normal;
+	font-weight: 500;
+	line-height: 24px;
+}
+
+.saveBtn {
+	margin: 0px !important;
+	color: var(--l1-foreground);
+	font-family: Inter;
+	font-size: 12px;
+	font-style: normal;
+	font-weight: 500;
+	line-height: 24px;
+}

frontend/src/container/DashboardContainerV2/DashboardSettings/General/index.tsx

@@ -0,0 +1,357 @@
+import { useEffect, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Col, Input, Radio, Select, Space, Tooltip } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import AddTags from 'container/DashboardContainer/DashboardSettings/General/AddTags';
+import { useDashboardCursorSyncMode } from 'hooks/dashboard/useDashboardCursorSyncMode';
+import { useSyncTooltipFilterMode } from 'hooks/dashboard/useSyncTooltipFilterMode';
+import {
+	DashboardCursorSync,
+	SyncTooltipFilterMode,
+} from 'lib/uPlotV2/plugins/TooltipPlugin/types';
+import { isEqual } from 'lodash-es';
+import { Check, ExternalLink, SolidInfoCircle, X } from '@signozhq/icons';
+import { patchDashboardV2 } from 'api/generated/services/dashboard';
+import type {
+	DashboardtypesJSONPatchOperationDTO,
+	TagtypesPostableTagDTO,
+} from 'api/generated/services/sigNoz.schemas';
+import { useNotifications } from 'hooks/useNotifications';
+import { useErrorModal } from 'providers/ErrorModalProvider';
+import APIError from 'types/api/error';
+
+import styles from './GeneralSettings.module.scss';
+import { Button } from './styles';
+import { Base64Icons } from './utils';
+import logEvent from 'api/common/logEvent';
+import { Events } from 'constants/events';
+import { getAbsoluteUrl } from 'utils/basePath';
+
+import type { V2Dashboard } from '../../utils';
+
+const { Option } = Select;
+
+interface Props {
+	dashboard: V2Dashboard | undefined;
+	onRefetch: () => void;
+}
+
+// Convert V2 tags ({key, value}[]) into "key:value" strings for the V1
+// AddTags component (which expects string[]), and back on save.
+//
+// V2 tags require both `key` and `value` to be non-empty server-side
+// (returns `tag_invalid_value` otherwise). To preserve the V1 single-word
+// tag UX, a string with no ':' is round-tripped as `{key: x, value: x}` and
+// collapsed back to just `x` for display.
+function tagsToStrings(tags: TagtypesPostableTagDTO[]): string[] {
+	return tags.map((t) => (t.key === t.value ? t.key : `${t.key}:${t.value}`));
+}
+
+function stringsToTags(tagStrings: string[]): TagtypesPostableTagDTO[] {
+	return tagStrings
+		.map((s) => {
+			const trimmed = s.trim();
+			const idx = trimmed.indexOf(':');
+			if (idx === -1) return { key: trimmed, value: trimmed };
+			const key = trimmed.slice(0, idx).trim();
+			const value = trimmed.slice(idx + 1).trim();
+			return { key, value: value || key };
+		})
+		.filter((t) => t.key.length > 0);
+}
+
+function GeneralDashboardSettingsV2({
+	dashboard,
+	onRefetch,
+}: Props): JSX.Element {
+	const id = dashboard?.id ?? '';
+
+	const [cursorSyncMode, setCursorSyncMode] = useDashboardCursorSyncMode(id);
+	const [syncTooltipFilterMode, setSyncTooltipFilterMode] =
+		useSyncTooltipFilterMode(id);
+
+	const title = dashboard?.data?.spec?.display?.name ?? '';
+	const description = dashboard?.data?.spec?.display?.description ?? '';
+	const image = dashboard?.data?.metadata?.image || Base64Icons[0];
+	const tagsAsStrings = useMemo(
+		() => tagsToStrings(dashboard?.data?.metadata?.tags ?? []),
+		[dashboard?.data?.metadata?.tags],
+	);
+
+	const [updatedTitle, setUpdatedTitle] = useState<string>(title);
+	const [updatedTags, setUpdatedTags] = useState<string[]>(tagsAsStrings);
+	const [updatedDescription, setUpdatedDescription] = useState<string>(
+		description,
+	);
+	const [updatedImage, setUpdatedImage] = useState<string>(image);
+	const [isSaving, setIsSaving] = useState<boolean>(false);
+	const [numberOfUnsavedChanges, setNumberOfUnsavedChanges] = useState<number>(
+		0,
+	);
+
+	const { t } = useTranslation('common');
+	const { notifications } = useNotifications();
+	const { showErrorModal } = useErrorModal();
+
+	// Sync state when dashboard refetches after a save
+	useEffect(() => {
+		setUpdatedTitle(title);
+		setUpdatedDescription(description);
+		setUpdatedImage(image);
+		setUpdatedTags(tagsAsStrings);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [dashboard?.updatedAt]);
+
+	const buildPatch = (): DashboardtypesJSONPatchOperationDTO[] => {
+		const ops: DashboardtypesJSONPatchOperationDTO[] = [];
+		const replace = (
+			path: string,
+			value: unknown,
+		): DashboardtypesJSONPatchOperationDTO => ({
+			op: 'replace' as DashboardtypesJSONPatchOperationDTO['op'],
+			path,
+			value,
+		});
+
+		if (updatedTitle !== title) {
+			ops.push(replace('/spec/display/name', updatedTitle));
+		}
+		if (updatedDescription !== description) {
+			ops.push(replace('/spec/display/description', updatedDescription));
+		}
+		if (updatedImage !== image) {
+			ops.push(replace('/metadata/image', updatedImage));
+		}
+		if (!isEqual(updatedTags, tagsAsStrings)) {
+			ops.push(replace('/metadata/tags', stringsToTags(updatedTags)));
+		}
+		return ops;
+	};
+
+	const onSaveHandler = async (): Promise<void> => {
+		if (!id) return;
+		const ops = buildPatch();
+		if (ops.length === 0) return;
+
+		try {
+			setIsSaving(true);
+			await patchDashboardV2({ id }, ops);
+			notifications.success({ message: 'Dashboard updated' });
+			onRefetch();
+		} catch (error) {
+			showErrorModal(error as APIError);
+		} finally {
+			setIsSaving(false);
+		}
+	};
+
+	useEffect(() => {
+		let n = 0;
+		const initialValues = [title, description, tagsAsStrings, image];
+		const updatedValues = [
+			updatedTitle,
+			updatedDescription,
+			updatedTags,
+			updatedImage,
+		];
+		initialValues.forEach((val, index) => {
+			if (!isEqual(val, updatedValues[index])) n += 1;
+		});
+		setNumberOfUnsavedChanges(n);
+	}, [
+		description,
+		image,
+		tagsAsStrings,
+		title,
+		updatedDescription,
+		updatedImage,
+		updatedTags,
+		updatedTitle,
+	]);
+
+	const discardHandler = (): void => {
+		setUpdatedTitle(title);
+		setUpdatedImage(image);
+		setUpdatedTags(tagsAsStrings);
+		setUpdatedDescription(description);
+	};
+
+	return (
+		<div className={styles.overviewContent}>
+			<Col className={styles.overviewSettings}>
+				<Space
+					direction="vertical"
+					style={{
+						width: '100%',
+						display: 'flex',
+						flexDirection: 'column',
+						gap: '21px',
+					}}
+				>
+					<div>
+						<Typography className={styles.dashboardName}>Dashboard Name</Typography>
+						<section className={styles.nameIconInput}>
+							<Select
+								defaultActiveFirstOption
+								data-testid="dashboard-image"
+								suffixIcon={null}
+								rootClassName={styles.dashboardImageInput}
+								value={updatedImage}
+								onChange={(value: string): void => setUpdatedImage(value)}
+							>
+								{Base64Icons.map((icon) => (
+									<Option value={icon} key={icon}>
+										<img
+											src={icon}
+											alt="dashboard-icon"
+											className={styles.listItemImage}
+										/>
+									</Option>
+								))}
+							</Select>
+							<Input
+								data-testid="dashboard-name"
+								className={styles.dashboardNameInput}
+								value={updatedTitle}
+								onChange={(e): void => setUpdatedTitle(e.target.value)}
+							/>
+						</section>
+					</div>
+
+					<div>
+						<Typography className={styles.dashboardName}>Description</Typography>
+						<Input.TextArea
+							data-testid="dashboard-desc"
+							rows={6}
+							value={updatedDescription}
+							className={styles.descriptionTextArea}
+							onChange={(e): void => setUpdatedDescription(e.target.value)}
+						/>
+					</div>
+					<div>
+						<Typography className={styles.dashboardName}>Tags</Typography>
+						<AddTags tags={updatedTags} setTags={setUpdatedTags} />
+					</div>
+				</Space>
+			</Col>
+			<Col className={`${styles.overviewSettings} ${styles.crossPanelSyncGroup}`}>
+				<div className={styles.crossPanelSyncSectionHeader}>
+					<Typography.Text className={styles.crossPanelSyncSectionTitle}>
+						Cross-Panel Sync
+					</Typography.Text>
+					<Tooltip
+						title={
+							<div className={styles.crossPanelSyncTooltipContent}>
+								<strong className={styles.crossPanelSyncTooltipTitle}>
+									Cross-Panel Sync
+								</strong>
+								<span className={styles.crossPanelSyncTooltipDescription}>
+									Sync crosshair and tooltip across all the dashboard panels
+								</span>
+								<a
+									href="https://signoz.io/docs/dashboards/interactivity/#cross-panel-sync"
+									target="_blank"
+									rel="noopener noreferrer"
+									className={styles.crossPanelSyncTooltipDocLink}
+								>
+									Learn more
+									<ExternalLink size={12} />
+								</a>
+							</div>
+						}
+						placement="top"
+						mouseEnterDelay={0.5}
+					>
+						<SolidInfoCircle size="md" className={styles.crossPanelSyncInfoIcon} />
+					</Tooltip>
+				</div>
+				<div className={styles.crossPanelSyncRow}>
+					<div className={styles.crossPanelSyncInfo}>
+						<Typography.Text className={styles.crossPanelSyncTitle}>
+							Sync Mode
+						</Typography.Text>
+						<Typography.Text className={styles.crossPanelSyncDescription}>
+							Sync crosshair and tooltip across all the dashboard panels
+						</Typography.Text>
+					</div>
+					<Radio.Group
+						value={cursorSyncMode}
+						onChange={(e): void => {
+							setCursorSyncMode(e.target.value as DashboardCursorSync);
+						}}
+					>
+						<Radio.Button value={DashboardCursorSync.None}>No Sync</Radio.Button>
+						<Radio.Button value={DashboardCursorSync.Crosshair}>
+							Crosshair
+						</Radio.Button>
+						<Radio.Button value={DashboardCursorSync.Tooltip}>Tooltip</Radio.Button>
+					</Radio.Group>
+				</div>
+				{cursorSyncMode === DashboardCursorSync.Tooltip && (
+					<div className={styles.crossPanelSyncRow}>
+						<div className={styles.crossPanelSyncInfo}>
+							<Typography.Text className={styles.crossPanelSyncTitle}>
+								Synced Tooltip Series
+							</Typography.Text>
+							<Typography.Text className={styles.crossPanelSyncDescription}>
+								Show only series that intersect on group-by, or every series with the
+								matching ones highlighted
+							</Typography.Text>
+						</div>
+						<Radio.Group
+							value={syncTooltipFilterMode}
+							onChange={(e): void => {
+								logEvent(Events.TOOLTIP_SYNC_MODE_CHANGED, {
+									path: getAbsoluteUrl(window.location.pathname),
+									mode: e.target.value,
+								});
+								setSyncTooltipFilterMode(e.target.value as SyncTooltipFilterMode);
+							}}
+						>
+							<Radio.Button value={SyncTooltipFilterMode.All}>All</Radio.Button>
+							<Radio.Button value={SyncTooltipFilterMode.Filtered}>
+								Filtered
+							</Radio.Button>
+						</Radio.Group>
+					</div>
+				)}
+			</Col>
+			{numberOfUnsavedChanges > 0 && (
+				<div className={styles.overviewSettingsFooter}>
+					<div className={styles.unsaved}>
+						<div className={styles.unsavedDot} />
+						<Typography.Text className={styles.unsavedChanges}>
+							{numberOfUnsavedChanges} unsaved change
+							{numberOfUnsavedChanges > 1 && 's'}
+						</Typography.Text>
+					</div>
+					<div className={styles.footerActionBtns}>
+						<Button
+							disabled={isSaving}
+							icon={<X size={14} />}
+							onClick={discardHandler}
+							type="text"
+							className={styles.discardBtn}
+						>
+							Discard
+						</Button>
+						<Button
+							style={{ margin: '16px 0' }}
+							disabled={isSaving}
+							loading={isSaving}
+							icon={<Check size={14} />}
+							data-testid="save-dashboard-config"
+							onClick={onSaveHandler}
+							type="primary"
+							className={styles.saveBtn}
+						>
+							{t('save')}
+						</Button>
+					</div>
+				</div>
+			)}
+		</div>
+	);
+}
+
+export default GeneralDashboardSettingsV2;

frontend/src/container/DashboardContainerV2/DashboardSettings/General/styles.ts

@@ -0,0 +1,20 @@
+import { Button as ButtonComponent, Drawer } from 'antd';
+import styled from 'styled-components';
+
+export const Container = styled.div`
+	margin-top: 0.5rem;
+`;
+
+export const Button = styled(ButtonComponent)`
+	&&& {
+		display: flex;
+		align-items: center;
+	}
+`;
+
+export const DrawerContainer = styled(Drawer)`
+	.ant-drawer-header {
+		padding: 0;
+		border: none;
+	}
+`;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/CustomFields.tsx

@@ -0,0 +1,46 @@
+import { Collapse, Input } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+
+import { VariableItemRow } from '../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+
+interface Props {
+	customValue: string;
+	onChange: (v: string) => void;
+	error?: string;
+}
+
+function CustomFields({ customValue, onChange, error }: Props): JSX.Element {
+	return (
+		<VariableItemRow className="variable-custom-section">
+			<Collapse
+				collapsible="header"
+				rootClassName="custom-collapse"
+				defaultActiveKey={['1']}
+				items={[
+					{
+						key: '1',
+						label: 'Options',
+						children: (
+							<>
+								<Input.TextArea
+									value={customValue}
+									placeholder="Enter options separated by commas."
+									rootClassName="comma-input"
+									onChange={(e): void => onChange(e.target.value)}
+									data-testid="variable-custom-value-v2"
+								/>
+								{error ? (
+									<div>
+										<Typography.Text color="warning">{error}</Typography.Text>
+									</div>
+								) : null}
+							</>
+						),
+					},
+				]}
+			/>
+		</VariableItemRow>
+	);
+}
+
+export default CustomFields;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/DynamicFields.tsx

@@ -0,0 +1,74 @@
+import { useCallback, useMemo } from 'react';
+import DynamicVariable from 'container/DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/DynamicVariable/DynamicVariable';
+import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
+
+interface Props {
+	dynamicName: string;
+	dynamicSignal: TelemetrytypesSignalDTO | undefined;
+	onNameChange: (v: string) => void;
+	onSignalChange: (v: TelemetrytypesSignalDTO | undefined) => void;
+	error?: string;
+}
+
+// V1 DynamicVariable stores the source as a UI-friendly label:
+// 'All telemetry' | 'Logs' | 'Metrics' | 'Traces'. V2 stores the API enum
+// signal value: undefined (= all) | 'metrics' | 'traces' | 'logs'. We convert
+// at this boundary so the V1 component can stay untouched.
+const ALL_TELEMETRY = 'All telemetry';
+
+function signalToV1Source(
+	signal: TelemetrytypesSignalDTO | undefined,
+): string {
+	if (signal === TelemetrytypesSignalDTO.logs) return 'Logs';
+	if (signal === TelemetrytypesSignalDTO.metrics) return 'Metrics';
+	if (signal === TelemetrytypesSignalDTO.traces) return 'Traces';
+	return ALL_TELEMETRY;
+}
+
+function v1SourceToSignal(
+	source: string,
+): TelemetrytypesSignalDTO | undefined {
+	if (source === 'Logs') return TelemetrytypesSignalDTO.logs;
+	if (source === 'Metrics') return TelemetrytypesSignalDTO.metrics;
+	if (source === 'Traces') return TelemetrytypesSignalDTO.traces;
+	return undefined;
+}
+
+function DynamicFields({
+	dynamicName,
+	dynamicSignal,
+	onNameChange,
+	onSignalChange,
+	error,
+}: Props): JSX.Element {
+	const v1Value = useMemo(
+		() => ({ name: dynamicName, value: signalToV1Source(dynamicSignal) }),
+		[dynamicName, dynamicSignal],
+	);
+
+	const setV1Value: React.Dispatch<
+		React.SetStateAction<{ name: string; value: string } | undefined>
+	> = useCallback(
+		(action) => {
+			const next =
+				typeof action === 'function' ? action(v1Value) : action;
+			if (!next) return;
+			if (next.name !== dynamicName) onNameChange(next.name);
+			const nextSignal = v1SourceToSignal(next.value);
+			if (nextSignal !== dynamicSignal) onSignalChange(nextSignal);
+		},
+		[v1Value, dynamicName, dynamicSignal, onNameChange, onSignalChange],
+	);
+
+	return (
+		<div className="variable-dynamic-section">
+			<DynamicVariable
+				setDynamicVariablesSelectedValue={setV1Value}
+				dynamicVariablesSelectedValue={v1Value}
+				errorAttributeKeyMessage={error}
+			/>
+		</div>
+	);
+}
+
+export default DynamicFields;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/Footer.tsx

@@ -0,0 +1,43 @@
+import { Button } from 'antd';
+import { Check, X } from '@signozhq/icons';
+
+import { VariableItemRow } from '../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+
+interface Props {
+	saving: boolean;
+	canSave: boolean;
+	onSave: () => void;
+	onCancel: () => void;
+}
+
+function Footer({ saving, canSave, onSave, onCancel }: Props): JSX.Element {
+	return (
+		<div className="variable-item-footer">
+			<VariableItemRow>
+				<Button
+					type="default"
+					onClick={onCancel}
+					icon={<X size={14} />}
+					className="footer-btn-discard"
+					disabled={saving}
+					data-testid="variable-cancel-v2"
+				>
+					Discard
+				</Button>
+				<Button
+					type="primary"
+					onClick={onSave}
+					icon={<Check size={14} />}
+					className="footer-btn-save"
+					loading={saving}
+					disabled={!canSave || saving}
+					data-testid="variable-save-v2"
+				>
+					Save Variable
+				</Button>
+			</VariableItemRow>
+		</div>
+	);
+}
+
+export default Footer;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/ListBasicOptions.tsx

@@ -0,0 +1,80 @@
+import type { V2VariableKind } from '../types';
+import AllOptionRow from './ListOptions/AllOptionRow';
+import CapturingRegexpRow from './ListOptions/CapturingRegexpRow';
+import CustomAllValueRow from './ListOptions/CustomAllValueRow';
+import DefaultValueRow from './ListOptions/DefaultValueRow';
+import MultiSelectRow from './ListOptions/MultiSelectRow';
+import SortRow from './ListOptions/SortRow';
+
+interface Props {
+	kind: V2VariableKind;
+	allowAllValue: boolean;
+	allowMultiple: boolean;
+	sort: string;
+	defaultValue: string;
+	customAllValue: string;
+	capturingRegexp: string;
+	previewValues: string[];
+	onAllowAllChange: (v: boolean) => void;
+	onAllowMultipleChange: (v: boolean) => void;
+	onSortChange: (v: string) => void;
+	onDefaultValueChange: (v: string) => void;
+	onCustomAllValueChange: (v: string) => void;
+	onCapturingRegexpChange: (v: string) => void;
+}
+
+function ListBasicOptions({
+	kind,
+	allowAllValue,
+	allowMultiple,
+	sort,
+	defaultValue,
+	customAllValue,
+	capturingRegexp,
+	previewValues,
+	onAllowAllChange,
+	onAllowMultipleChange,
+	onSortChange,
+	onDefaultValueChange,
+	onCustomAllValueChange,
+	onCapturingRegexpChange,
+}: Props): JSX.Element {
+	return (
+		<>
+			<SortRow sort={sort} onChange={onSortChange} />
+			<MultiSelectRow
+				allowMultiple={allowMultiple}
+				onChange={(v): void => {
+					onAllowMultipleChange(v);
+					if (!v) onAllowAllChange(false);
+				}}
+			/>
+			{allowMultiple && kind !== 'DYNAMIC' ? (
+				<AllOptionRow
+					allowAllValue={allowAllValue}
+					onChange={onAllowAllChange}
+				/>
+			) : null}
+			{allowAllValue ? (
+				<CustomAllValueRow
+					customAllValue={customAllValue}
+					onChange={onCustomAllValueChange}
+				/>
+			) : null}
+			{kind === 'QUERY' || kind === 'DYNAMIC' ? (
+				<CapturingRegexpRow
+					capturingRegexp={capturingRegexp}
+					onChange={onCapturingRegexpChange}
+				/>
+			) : null}
+			<DefaultValueRow
+				kind={kind}
+				defaultValue={defaultValue}
+				previewValues={previewValues}
+				onChange={onDefaultValueChange}
+			/>
+		</>
+	);
+}
+
+export default ListBasicOptions;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/ListOptions/AllOptionRow.tsx

@@ -0,0 +1,28 @@
+import { Switch } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+
+import { LabelContainer, VariableItemRow } from '../../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+
+interface Props {
+	allowAllValue: boolean;
+	onChange: (v: boolean) => void;
+}
+
+function AllOptionRow({ allowAllValue, onChange }: Props): JSX.Element {
+	return (
+		<VariableItemRow className="all-option-section">
+			<LabelContainer>
+				<Typography className="typography-variables">
+					Include an option for ALL values
+				</Typography>
+			</LabelContainer>
+			<Switch
+				checked={allowAllValue}
+				onChange={onChange}
+				data-testid="variable-allow-all-v2"
+			/>
+		</VariableItemRow>
+	);
+}
+
+export default AllOptionRow;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/ListOptions/CapturingRegexpRow.tsx

@@ -0,0 +1,43 @@
+import { Input } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+
+import { LabelContainer, VariableItemRow } from '../../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+
+interface Props {
+	capturingRegexp: string;
+	onChange: (v: string) => void;
+}
+
+function CapturingRegexpRow({
+	capturingRegexp,
+	onChange,
+}: Props): JSX.Element {
+	return (
+		<VariableItemRow className="capturing-regexp-section">
+			<LabelContainer>
+				<Typography
+					className="typography-variables"
+					style={{ display: 'block' }}
+				>
+					Capturing regex
+				</Typography>
+				<Typography
+					className="default-value-description"
+					style={{ display: 'block' }}
+				>
+					Regex applied to each value; the first capture group becomes the
+					selectable option.
+				</Typography>
+			</LabelContainer>
+			<Input
+				value={capturingRegexp}
+				placeholder="e.g. env-(.*)-\\d+"
+				onChange={(e): void => onChange(e.target.value)}
+				style={{ width: 400 }}
+				data-testid="variable-capturing-regexp-v2"
+			/>
+		</VariableItemRow>
+	);
+}
+
+export default CapturingRegexpRow;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/ListOptions/CustomAllValueRow.tsx

@@ -0,0 +1,42 @@
+import { Input } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+
+import { LabelContainer, VariableItemRow } from '../../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+
+interface Props {
+	customAllValue: string;
+	onChange: (v: string) => void;
+}
+
+function CustomAllValueRow({
+	customAllValue,
+	onChange,
+}: Props): JSX.Element {
+	return (
+		<VariableItemRow className="custom-all-value-section">
+			<LabelContainer>
+				<Typography
+					className="typography-variables"
+					style={{ display: 'block' }}
+				>
+					Custom &quot;ALL&quot; value
+				</Typography>
+				<Typography
+					className="default-value-description"
+					style={{ display: 'block' }}
+				>
+					Literal value emitted when the user picks ALL (e.g. * or .*).
+				</Typography>
+			</LabelContainer>
+			<Input
+				value={customAllValue}
+				placeholder="Leave blank to send the full union of values"
+				onChange={(e): void => onChange(e.target.value)}
+				style={{ width: 400 }}
+				data-testid="variable-custom-all-value-v2"
+			/>
+		</VariableItemRow>
+	);
+}
+
+export default CustomAllValueRow;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/ListOptions/DefaultValueRow.tsx

@@ -0,0 +1,43 @@
+import CustomSelect from 'components/NewSelect/CustomSelect';
+import { Typography } from '@signozhq/ui/typography';
+
+import { LabelContainer, VariableItemRow } from '../../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+import type { V2VariableKind } from '../../types';
+
+interface Props {
+	kind: V2VariableKind;
+	defaultValue: string;
+	previewValues: string[];
+	onChange: (v: string) => void;
+}
+
+function DefaultValueRow({
+	kind,
+	defaultValue,
+	previewValues,
+	onChange,
+}: Props): JSX.Element {
+	const description =
+		kind === 'QUERY'
+			? 'Click Test Run Query to see the values or add custom value'
+			: 'Select a value from the preview values or add custom value';
+
+	return (
+		<VariableItemRow className="default-value-section">
+			<LabelContainer>
+				<Typography className="typography-variables">Default Value</Typography>
+				<Typography className="default-value-description">
+					{description}
+				</Typography>
+			</LabelContainer>
+			<CustomSelect
+				placeholder="Select a default value"
+				value={defaultValue}
+				onChange={(v): void => onChange((v as string) ?? '')}
+				options={previewValues.map((v) => ({ label: v, value: v }))}
+			/>
+		</VariableItemRow>
+	);
+}
+
+export default DefaultValueRow;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/ListOptions/MultiSelectRow.tsx

@@ -0,0 +1,28 @@
+import { Switch } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+
+import { LabelContainer, VariableItemRow } from '../../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+
+interface Props {
+	allowMultiple: boolean;
+	onChange: (v: boolean) => void;
+}
+
+function MultiSelectRow({ allowMultiple, onChange }: Props): JSX.Element {
+	return (
+		<VariableItemRow className="multiple-values-section">
+			<LabelContainer>
+				<Typography className="typography-variables">
+					Enable multiple values to be checked
+				</Typography>
+			</LabelContainer>
+			<Switch
+				checked={allowMultiple}
+				onChange={onChange}
+				data-testid="variable-allow-multiple-v2"
+			/>
+		</VariableItemRow>
+	);
+}
+
+export default MultiSelectRow;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/ListOptions/SortRow.tsx

@@ -0,0 +1,29 @@
+import { Select } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+
+import { LabelContainer, VariableItemRow } from '../../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+import { SORT_OPTIONS } from '../../types';
+
+interface Props {
+	sort: string;
+	onChange: (v: string) => void;
+}
+
+function SortRow({ sort, onChange }: Props): JSX.Element {
+	return (
+		<VariableItemRow className="sort-values-section">
+			<LabelContainer>
+				<Typography className="typography-variables">Sort Values</Typography>
+			</LabelContainer>
+			<Select
+				value={sort}
+				onChange={onChange}
+				options={SORT_OPTIONS}
+				className="sort-input"
+				data-testid="variable-sort-v2"
+			/>
+		</VariableItemRow>
+	);
+}
+
+export default SortRow;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/NameDisplay.tsx

@@ -0,0 +1,59 @@
+import { Input } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+
+import { LabelContainer, VariableItemRow } from '../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+
+interface Props {
+	name: string;
+	description: string;
+	onNameChange: (v: string) => void;
+	onDescriptionChange: (v: string) => void;
+	nameError?: string;
+}
+
+function NameDisplay({
+	name,
+	description,
+	onNameChange,
+	onDescriptionChange,
+	nameError,
+}: Props): JSX.Element {
+	return (
+		<>
+			<VariableItemRow className="variable-name-section">
+				<LabelContainer>
+					<Typography className="typography-variables">Name</Typography>
+				</LabelContainer>
+				<div>
+					<Input
+						placeholder="Unique name of the variable"
+						value={name}
+						className="name-input"
+						onChange={(e): void => onNameChange(e.target.value)}
+						data-testid="variable-name-v2"
+					/>
+					{nameError ? (
+						<div>
+							<Typography.Text color="warning">{nameError}</Typography.Text>
+						</div>
+					) : null}
+				</div>
+			</VariableItemRow>
+			<VariableItemRow className="variable-description-section">
+				<LabelContainer>
+					<Typography className="typography-variables">Description</Typography>
+				</LabelContainer>
+				<Input.TextArea
+					value={description}
+					placeholder="Enter a description for the variable"
+					className="description-input"
+					rows={3}
+					onChange={(e): void => onDescriptionChange(e.target.value)}
+					data-testid="variable-description-v2"
+				/>
+			</VariableItemRow>
+		</>
+	);
+}
+
+export default NameDisplay;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/PreviewValues.tsx

@@ -0,0 +1,33 @@
+import { Tag } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import { orange } from '@ant-design/colors';
+
+import { LabelContainer, VariableItemRow } from '../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+
+interface Props {
+	previewValues: string[];
+	error?: string | null;
+}
+
+function PreviewValues({ previewValues, error }: Props): JSX.Element {
+	return (
+		<VariableItemRow className="variables-preview-section">
+			<LabelContainer style={{ width: '100%' }}>
+				<Typography className="typography-variables">
+					Preview of Values
+				</Typography>
+			</LabelContainer>
+			<div className="preview-values">
+				{error ? (
+					<Typography style={{ color: orange[5] }}>{error}</Typography>
+				) : (
+					previewValues.map((v, idx) => (
+						<Tag key={`${v}${idx}`}>{v.toString()}</Tag>
+					))
+				)}
+			</div>
+		</VariableItemRow>
+	);
+}
+
+export default PreviewValues;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/QueryFields.tsx

@@ -0,0 +1,66 @@
+import { Button } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import Editor from 'components/Editor';
+
+import { LabelContainer } from '../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+
+interface Props {
+	queryValue: string;
+	onChange: (v: string) => void;
+	onTestRun?: () => void;
+	testRunLoading?: boolean;
+	error?: string;
+}
+
+function QueryFields({
+	queryValue,
+	onChange,
+	onTestRun,
+	testRunLoading,
+	error,
+}: Props): JSX.Element {
+	return (
+		<div className="query-container">
+			<LabelContainer>
+				<Typography>Query</Typography>
+			</LabelContainer>
+
+			<div style={{ flex: 1, position: 'relative' }}>
+				<Editor
+					language="sql"
+					value={queryValue}
+					onChange={onChange}
+					height="240px"
+					options={{
+						fontSize: 13,
+						wordWrap: 'on',
+						lineNumbers: 'off',
+						glyphMargin: false,
+						folding: false,
+						lineDecorationsWidth: 0,
+						lineNumbersMinChars: 0,
+						minimap: { enabled: false },
+					}}
+				/>
+				{onTestRun ? (
+					<Button
+						type="primary"
+						size="small"
+						onClick={onTestRun}
+						style={{ position: 'absolute', bottom: 0 }}
+						loading={testRunLoading}
+					>
+						Test Run Query
+					</Button>
+				) : null}
+				{error ? (
+					<div>
+						<Typography.Text color="warning">{error}</Typography.Text>
+					</div>
+				) : null}
+			</div>
+		</div>
+	);
+}
+
+export default QueryFields;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/TextFields.tsx

@@ -0,0 +1,37 @@
+import { Input } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+
+import { LabelContainer, VariableItemRow } from '../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+
+interface Props {
+	textValue: string;
+	onChange: (v: string) => void;
+	error?: string;
+}
+
+function TextFields({ textValue, onChange, error }: Props): JSX.Element {
+	return (
+		<VariableItemRow className="variable-textbox-section">
+			<LabelContainer>
+				<Typography className="typography-variables">Default Value</Typography>
+			</LabelContainer>
+			<div>
+				<Input
+					value={textValue}
+					className="default-input"
+					onChange={(e): void => onChange(e.target.value)}
+					placeholder="Enter a default value (if any)..."
+					style={{ width: 400 }}
+					data-testid="variable-text-value-v2"
+				/>
+				{error ? (
+					<div>
+						<Typography.Text color="warning">{error}</Typography.Text>
+					</div>
+				) : null}
+			</div>
+		</VariableItemRow>
+	);
+}
+
+export default TextFields;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/TypeSelector.tsx

@@ -0,0 +1,126 @@
+import { Button, Tag } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import {
+	ClipboardType,
+	DatabaseZap,
+	Info,
+	LayoutList,
+	Pyramid,
+} from '@signozhq/icons';
+import { Color } from '@signozhq/design-tokens';
+import cx from 'classnames';
+import TextToolTip from 'components/TextToolTip';
+import { useIsDarkMode } from 'hooks/useDarkMode';
+
+import { LabelContainer, VariableItemRow } from '../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/styles';
+import type { V2VariableKind } from '../types';
+
+import '../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/VariableItem.styles.scss';
+
+interface Props {
+	kind: V2VariableKind;
+	onChange: (kind: V2VariableKind) => void;
+}
+
+function TypeSelector({ kind, onChange }: Props): JSX.Element {
+	const isDarkMode = useIsDarkMode();
+
+	return (
+		<VariableItemRow className="variable-type-section">
+			<LabelContainer className="variable-type-label-container">
+				<Typography className="typography-variables">Variable Type</Typography>
+				<TextToolTip
+					text="Learn more about supported variable types"
+					url="https://signoz.io/docs/userguide/manage-variables/#supported-variable-types"
+					urlText="here"
+					useFilledIcon={false}
+					outlinedIcon={
+						<Info
+							size={14}
+							style={{
+								color: isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500,
+								marginTop: 1,
+							}}
+						/>
+					}
+				/>
+			</LabelContainer>
+
+			<div className="variable-type-btn-group">
+				<Button
+					type="text"
+					icon={<Pyramid size={14} />}
+					className={cx(
+						'variable-type-btn',
+						kind === 'DYNAMIC' ? 'selected' : '',
+					)}
+					onClick={(): void => onChange('DYNAMIC')}
+					data-testid="variable-type-dynamic-v2"
+				>
+					Dynamic
+					<Tag bordered={false} className="sidenav-beta-tag" color="geekblue">
+						Beta
+					</Tag>
+				</Button>
+				<Button
+					type="text"
+					icon={<ClipboardType size={14} />}
+					className={cx(
+						'variable-type-btn',
+						kind === 'TEXT' ? 'selected' : '',
+					)}
+					onClick={(): void => onChange('TEXT')}
+					data-testid="variable-type-text-v2"
+				>
+					Textbox
+				</Button>
+				<Button
+					type="text"
+					icon={<LayoutList size={14} />}
+					className={cx(
+						'variable-type-btn',
+						kind === 'CUSTOM' ? 'selected' : '',
+					)}
+					onClick={(): void => onChange('CUSTOM')}
+					data-testid="variable-type-custom-v2"
+				>
+					Custom
+				</Button>
+				<Button
+					type="text"
+					icon={<DatabaseZap size={14} />}
+					className={cx(
+						'variable-type-btn',
+						kind === 'QUERY' ? 'selected' : '',
+					)}
+					onClick={(): void => onChange('QUERY')}
+					data-testid="variable-type-query-v2"
+				>
+					Query
+					<Tag bordered={false} className="sidenav-beta-tag" color="warning">
+						Not Recommended
+					</Tag>
+					<div onClick={(e): void => e.stopPropagation()}>
+						<TextToolTip
+							text="Learn why we don't recommend"
+							url="https://signoz.io/docs/userguide/manage-variables/#why-avoid-clickhouse-query-variables"
+							urlText="here"
+							useFilledIcon={false}
+							outlinedIcon={
+								<Info
+									size={14}
+									style={{
+										color: isDarkMode ? Color.BG_VANILLA_100 : Color.BG_INK_500,
+										marginTop: 1,
+									}}
+								/>
+							}
+						/>
+					</div>
+				</Button>
+			</div>
+		</VariableItemRow>
+	);
+}
+
+export default TypeSelector;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableItem/index.tsx

@@ -0,0 +1,188 @@
+import { useCallback, useMemo, useState } from 'react';
+import { Button } from 'antd';
+import { ArrowLeft } from '@signozhq/icons';
+import { commaValuesParser } from 'lib/dashboardVariables/customCommaValuesParser';
+
+import { draftToVariableDTO, validateDraft } from '../draft';
+import type { SaveCallback, VariableDraft, V2VariableKind } from '../types';
+import CustomFields from './CustomFields';
+import DynamicFields from './DynamicFields';
+import Footer from './Footer';
+import ListBasicOptions from './ListBasicOptions';
+import NameDisplay from './NameDisplay';
+import PreviewValues from './PreviewValues';
+import QueryFields from './QueryFields';
+import TextFields from './TextFields';
+import TypeSelector from './TypeSelector';
+
+import '../../../../DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/VariableItem.styles.scss';
+
+interface Props {
+	initialDraft: VariableDraft;
+	existingNames: string[];
+	saving: boolean;
+	onSave: SaveCallback;
+	onCancel: () => void;
+}
+
+/**
+ * Editor for a single V2 variable.
+ *
+ * Type-switch contract: changing `kind` does NOT clear the per-kind fields
+ * the user already typed. They remain in local state and are restored if the
+ * user navigates back to the same kind. Only the fields relevant to the
+ * active `kind` are written into the V2 envelope on save (see
+ * `draftToVariableDTO`).
+ */
+function VariableItem({
+	initialDraft,
+	existingNames,
+	saving,
+	onSave,
+	onCancel,
+}: Props): JSX.Element {
+	const [draft, setDraft] = useState<VariableDraft>(initialDraft);
+
+	const update = useCallback(
+		<K extends keyof VariableDraft>(key: K, value: VariableDraft[K]): void => {
+			setDraft((prev) => ({ ...prev, [key]: value }));
+		},
+		[],
+	);
+
+	const onKindChange = useCallback(
+		(kind: V2VariableKind): void => {
+			// Retain every other field — only the discriminator changes.
+			update('kind', kind);
+		},
+		[update],
+	);
+
+	const namesExcludingSelf = useMemo(
+		() => existingNames.filter((n) => n !== initialDraft.name),
+		[existingNames, initialDraft.name],
+	);
+	const validationError = useMemo(
+		() => validateDraft(draft, namesExcludingSelf),
+		[draft, namesExcludingSelf],
+	);
+
+	// Local preview values — currently populated only for CUSTOM (CSV parse).
+	// Query / Dynamic previews are wired in the variable execution subsystem.
+	const previewValues = useMemo<string[]>(() => {
+		if (draft.kind === 'CUSTOM') {
+			return commaValuesParser(draft.customValue).map((v) => String(v));
+		}
+		return [];
+	}, [draft.kind, draft.customValue]);
+
+	const handleSave = useCallback((): void => {
+		if (validationError) return;
+		onSave(draftToVariableDTO(draft));
+	}, [draft, validationError, onSave]);
+
+	const errorFor = (
+		field: NonNullable<typeof validationError>['field'],
+	): string | undefined => {
+		if (validationError && validationError.field === field) {
+			return validationError.message;
+		}
+		return undefined;
+	};
+
+	const showListOptions =
+		draft.kind === 'QUERY' || draft.kind === 'CUSTOM' || draft.kind === 'DYNAMIC';
+
+	return (
+		<>
+			<div className="variable-item-container">
+				<div className="all-variables">
+					<Button
+						type="text"
+						className="all-variables-btn"
+						icon={<ArrowLeft size={14} />}
+						onClick={onCancel}
+					>
+						All variables
+					</Button>
+				</div>
+				<div className="variable-item-content">
+					<NameDisplay
+						name={draft.name}
+						description={draft.displayName}
+						onNameChange={(v): void => update('name', v)}
+						onDescriptionChange={(v): void => update('displayName', v)}
+						nameError={errorFor('name')}
+					/>
+
+					<TypeSelector kind={draft.kind} onChange={onKindChange} />
+
+					{draft.kind === 'DYNAMIC' ? (
+						<DynamicFields
+							dynamicName={draft.dynamicName}
+							dynamicSignal={draft.dynamicSignal}
+							onNameChange={(v): void => update('dynamicName', v)}
+							onSignalChange={(v): void => update('dynamicSignal', v)}
+							error={errorFor('dynamicName')}
+						/>
+					) : null}
+					{draft.kind === 'QUERY' ? (
+						<QueryFields
+							queryValue={draft.queryValue}
+							onChange={(v): void => update('queryValue', v)}
+							error={errorFor('queryValue')}
+						/>
+					) : null}
+					{draft.kind === 'CUSTOM' ? (
+						<CustomFields
+							customValue={draft.customValue}
+							onChange={(v): void => update('customValue', v)}
+							error={errorFor('customValue')}
+						/>
+					) : null}
+					{draft.kind === 'TEXT' ? (
+						<TextFields
+							textValue={draft.textValue}
+							onChange={(v): void => update('textValue', v)}
+							error={errorFor('textValue')}
+						/>
+					) : null}
+
+					{showListOptions ? (
+						<>
+							<PreviewValues previewValues={previewValues} />
+							<ListBasicOptions
+								kind={draft.kind}
+								allowAllValue={draft.allowAllValue}
+								allowMultiple={draft.allowMultiple}
+								sort={draft.sort}
+								defaultValue={draft.defaultValue}
+								customAllValue={draft.customAllValue}
+								capturingRegexp={draft.capturingRegexp}
+								previewValues={previewValues}
+								onAllowAllChange={(v): void => update('allowAllValue', v)}
+								onAllowMultipleChange={(v): void => update('allowMultiple', v)}
+								onSortChange={(v): void => update('sort', v)}
+								onDefaultValueChange={(v): void => update('defaultValue', v)}
+								onCustomAllValueChange={(v): void =>
+									update('customAllValue', v)
+								}
+								onCapturingRegexpChange={(v): void =>
+									update('capturingRegexp', v)
+								}
+							/>
+						</>
+					) : null}
+				</div>
+			</div>
+			<Footer
+				saving={saving}
+				canSave={!validationError}
+				onSave={handleSave}
+				onCancel={onCancel}
+			/>
+		</>
+	);
+}
+
+export default VariableItem;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableList/TableRow.tsx

@@ -0,0 +1,58 @@
+import React from 'react';
+import { CSS } from '@dnd-kit/utilities';
+import { useSortable } from '@dnd-kit/sortable';
+import type { RowProps } from 'antd';
+import { GripVertical } from '@signozhq/icons';
+
+/**
+ * Sortable table row that injects a drag handle into the `name` cell —
+ * matches V1's [DashboardVariableSettings/index.tsx:31](TableRow component).
+ */
+function TableRow({ children, ...props }: RowProps): JSX.Element {
+	const {
+		attributes,
+		listeners,
+		setNodeRef,
+		setActivatorNodeRef,
+		transform,
+		transition,
+		isDragging,
+	} = useSortable({
+		// @ts-expect-error — antd Table's RowProps doesn't type the data-row-key it injects
+		id: props['data-row-key'],
+	});
+
+	const style: React.CSSProperties = {
+		...props.style,
+		transform: CSS.Transform.toString(transform && { ...transform, scaleY: 1 }),
+		transition,
+		...(isDragging ? { position: 'relative', zIndex: 9999 } : {}),
+	};
+
+	return (
+		<tr {...props} ref={setNodeRef} style={style} {...attributes}>
+			{React.Children.map(children, (child) => {
+				const childElement = child as React.ReactElement;
+				if (childElement.key === 'name') {
+					return React.cloneElement(childElement, {
+						key: 'name-with-drag',
+						children: (
+							<div className="variable-name-drag">
+								<GripVertical
+									ref={setActivatorNodeRef as unknown as React.Ref<SVGSVGElement>}
+									style={{ touchAction: 'none', cursor: 'move' }}
+									size="md"
+									{...listeners}
+								/>
+								{child}
+							</div>
+						),
+					});
+				}
+				return childElement;
+			})}
+		</tr>
+	);
+}
+
+export default TableRow;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableList/VariableRow.tsx

@@ -0,0 +1,50 @@
+import { Button, Space, Tag } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import { PenLine, Trash2 } from '@signozhq/icons';
+
+interface Props {
+	description: string;
+	kindLabel: string;
+	onEdit: () => void;
+	onDelete: () => void;
+}
+
+/**
+ * Right cell of the variable table — description text + edit/delete actions.
+ * Variable name + kind tag render in the left cell via column config.
+ */
+function VariableRow({
+	description,
+	kindLabel,
+	onEdit,
+	onDelete,
+}: Props): JSX.Element {
+	return (
+		<div className="variable-description-actions">
+			<Typography.Text className="variable-description">
+				{description}
+			</Typography.Text>
+			<Space className="actions-btns">
+				<Tag>{kindLabel}</Tag>
+				<Button
+					type="text"
+					onClick={onEdit}
+					className="edit-variable-button"
+					data-testid="variable-edit-v2"
+				>
+					<PenLine size={14} />
+				</Button>
+				<Button
+					type="text"
+					onClick={onDelete}
+					className="delete-variable-button"
+					data-testid="variable-delete-v2"
+				>
+					<Trash2 size={14} />
+				</Button>
+			</Space>
+		</div>
+	);
+}
+
+export default VariableRow;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/VariableList/index.tsx

@@ -0,0 +1,119 @@
+import { Empty, Table } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import {
+	DndContext,
+	PointerSensor,
+	useSensor,
+	useSensors,
+	type DragEndEvent,
+} from '@dnd-kit/core';
+import { restrictToVerticalAxis } from '@dnd-kit/modifiers';
+import { arrayMove, SortableContext } from '@dnd-kit/sortable';
+import type { DashboardtypesVariableDTO } from 'api/generated/services/sigNoz.schemas';
+
+import { getVariableKindLabel, getVariableName } from '../draft';
+import TableRow from './TableRow';
+import VariableRow from './VariableRow';
+
+import '../../../../DashboardContainer/DashboardSettings/DashboardSettings.styles.scss';
+
+interface TableEntry {
+	key: string;
+	name: string;
+	description: string;
+	kindLabel: string;
+	index: number;
+}
+
+interface Props {
+	variables: DashboardtypesVariableDTO[];
+	onEdit: (index: number) => void;
+	onDelete: (index: number) => void;
+	onReorder: (next: DashboardtypesVariableDTO[]) => void;
+}
+
+function VariableList({
+	variables,
+	onEdit,
+	onDelete,
+	onReorder,
+}: Props): JSX.Element {
+	const sensors = useSensors(
+		useSensor(PointerSensor, {
+			activationConstraint: { distance: 1 },
+		}),
+	);
+
+	if (variables.length === 0) {
+		return (
+			<Empty
+				image={Empty.PRESENTED_IMAGE_SIMPLE}
+				description={
+					<Typography.Text>
+						No variables yet. Click &quot;Add variable&quot; to create one.
+					</Typography.Text>
+				}
+			/>
+		);
+	}
+
+	const dataSource: TableEntry[] = variables.map((v, idx) => ({
+		key: getVariableName(v) || String(idx),
+		name: getVariableName(v),
+		description:
+			(v.spec as { display?: { name?: string } })?.display?.name ?? '',
+		kindLabel: getVariableKindLabel(v),
+		index: idx,
+	}));
+
+	const columns = [
+		{
+			title: 'Variable',
+			dataIndex: 'name',
+			key: 'name',
+			width: '50%',
+		},
+		{
+			title: 'Description',
+			key: 'description',
+			width: '50%',
+			render: (entry: TableEntry): JSX.Element => (
+				<VariableRow
+					description={entry.description}
+					kindLabel={entry.kindLabel}
+					onEdit={(): void => onEdit(entry.index)}
+					onDelete={(): void => onDelete(entry.index)}
+				/>
+			),
+		},
+	];
+
+	const onDragEnd = ({ active, over }: DragEndEvent): void => {
+		if (!over || active.id === over.id) return;
+		const fromIdx = dataSource.findIndex((d) => d.key === active.id);
+		const toIdx = dataSource.findIndex((d) => d.key === over.id);
+		if (fromIdx < 0 || toIdx < 0) return;
+		onReorder(arrayMove(variables, fromIdx, toIdx));
+	};
+
+	return (
+		<DndContext
+			sensors={sensors}
+			modifiers={[restrictToVerticalAxis]}
+			onDragEnd={onDragEnd}
+		>
+			<SortableContext items={dataSource.map((d) => d.key)}>
+				<Table
+					components={{ body: { row: TableRow } }}
+					rowKey="key"
+					columns={columns}
+					pagination={false}
+					dataSource={dataSource}
+					className="dashboard-variable-settings-table"
+				/>
+			</SortableContext>
+		</DndContext>
+	);
+}
+
+export default VariableList;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/draft.ts

@@ -0,0 +1,202 @@
+import { v4 as generateUUID } from 'uuid';
+import type {
+	DashboardtypesVariableDTO,
+	DashboardtypesVariablePluginDTO,
+	DashboardtypesListVariableSpecDTO,
+	DashboardTextVariableSpecDTO,
+	TelemetrytypesSignalDTO,
+} from 'api/generated/services/sigNoz.schemas';
+
+import type { V2VariableKind, VariableDraft } from './types';
+
+export function emptyDraft(): VariableDraft {
+	return {
+		id: generateUUID(),
+		kind: 'QUERY',
+		name: '',
+		displayName: '',
+		allowAllValue: false,
+		allowMultiple: false,
+		sort: 'none',
+		defaultValue: '',
+		customAllValue: '',
+		capturingRegexp: '',
+		queryValue: '',
+		customValue: '',
+		dynamicName: '',
+		dynamicSignal: undefined,
+		textValue: '',
+	};
+}
+
+/**
+ * Hydrate the relevant slot from a V2 envelope; other slots stay empty.
+ */
+export function variableDTOToDraft(
+	dto: DashboardtypesVariableDTO,
+): VariableDraft {
+	const base = emptyDraft();
+	if (dto.kind === 'TextVariable') {
+		const spec = dto.spec as DashboardTextVariableSpecDTO;
+		return {
+			...base,
+			kind: 'TEXT',
+			name: spec?.name ?? '',
+			displayName: spec?.display?.name ?? '',
+			textValue: spec?.value ?? '',
+		};
+	}
+
+	// ListVariable
+	const spec = dto.spec as DashboardtypesListVariableSpecDTO;
+	const pluginKind = spec?.plugin?.kind;
+	let kind: V2VariableKind = 'QUERY';
+	if (pluginKind === 'signoz/DynamicVariable') kind = 'DYNAMIC';
+	else if (pluginKind === 'signoz/CustomVariable') kind = 'CUSTOM';
+	else if (pluginKind === 'signoz/QueryVariable') kind = 'QUERY';
+
+	const draft: VariableDraft = {
+		...base,
+		kind,
+		name: spec?.name ?? '',
+		displayName: spec?.display?.name ?? '',
+		allowAllValue: !!spec?.allowAllValue,
+		allowMultiple: !!spec?.allowMultiple,
+		sort: spec?.sort ?? 'none',
+		defaultValue: typeof spec?.defaultValue === 'string' ? spec.defaultValue : '',
+		customAllValue: spec?.customAllValue ?? '',
+		capturingRegexp: spec?.capturingRegexp ?? '',
+	};
+
+	const pluginSpec = spec?.plugin?.spec as Record<string, unknown> | undefined;
+	if (kind === 'QUERY') {
+		draft.queryValue = (pluginSpec?.queryValue as string) ?? '';
+	} else if (kind === 'CUSTOM') {
+		draft.customValue = (pluginSpec?.customValue as string) ?? '';
+	} else if (kind === 'DYNAMIC') {
+		draft.dynamicName = (pluginSpec?.name as string) ?? '';
+		draft.dynamicSignal = pluginSpec?.signal as TelemetrytypesSignalDTO | undefined;
+	}
+	return draft;
+}
+
+/**
+ * Serialize draft to a V2 envelope, reading ONLY the fields relevant to the
+ * active kind. Other fields the user touched stay in React state and are
+ * silently dropped.
+ */
+export function draftToVariableDTO(
+	draft: VariableDraft,
+): DashboardtypesVariableDTO {
+	const display = draft.displayName ? { name: draft.displayName } : undefined;
+
+	if (draft.kind === 'TEXT') {
+		return ({
+			kind: 'TextVariable',
+			spec: {
+				name: draft.name,
+				display,
+				value: draft.textValue,
+			},
+		} as unknown) as DashboardtypesVariableDTO;
+	}
+
+	let plugin: DashboardtypesVariablePluginDTO | undefined;
+	if (draft.kind === 'QUERY') {
+		plugin = ({
+			kind: 'signoz/QueryVariable',
+			spec: { queryValue: draft.queryValue },
+		} as unknown) as DashboardtypesVariablePluginDTO;
+	} else if (draft.kind === 'CUSTOM') {
+		plugin = ({
+			kind: 'signoz/CustomVariable',
+			spec: { customValue: draft.customValue },
+		} as unknown) as DashboardtypesVariablePluginDTO;
+	} else if (draft.kind === 'DYNAMIC') {
+		plugin = ({
+			kind: 'signoz/DynamicVariable',
+			spec: {
+				name: draft.dynamicName,
+				signal: draft.dynamicSignal,
+			},
+		} as unknown) as DashboardtypesVariablePluginDTO;
+	}
+
+	const spec: DashboardtypesListVariableSpecDTO = {
+		name: draft.name,
+		display,
+		allowAllValue: draft.allowAllValue,
+		allowMultiple: draft.allowMultiple,
+		sort: draft.sort,
+		plugin,
+		// VariableDefaultValueDTO is an open `{[key]: unknown}` shape, so a bare
+		// string isn't structurally assignable. We cast at the boundary.
+		defaultValue: draft.defaultValue
+			? ((draft.defaultValue as unknown) as DashboardtypesListVariableSpecDTO['defaultValue'])
+			: undefined,
+		customAllValue: draft.customAllValue || undefined,
+		capturingRegexp: draft.capturingRegexp || undefined,
+	};
+
+	return ({
+		kind: 'ListVariable',
+		spec,
+	} as unknown) as DashboardtypesVariableDTO;
+}
+
+export interface DraftValidationError {
+	field:
+		| 'name'
+		| 'queryValue'
+		| 'customValue'
+		| 'dynamicName'
+		| 'textValue'
+		| 'cycle';
+	message: string;
+}
+
+export function validateDraft(
+	draft: VariableDraft,
+	existingNames: string[],
+): DraftValidationError | null {
+	const trimmedName = draft.name.trim();
+	if (!trimmedName) {
+		return { field: 'name', message: 'Variable name is required' };
+	}
+	if (/\s/.test(trimmedName)) {
+		return { field: 'name', message: 'Variable name cannot contain whitespace' };
+	}
+	if (existingNames.includes(trimmedName)) {
+		return { field: 'name', message: 'Variable name already exists' };
+	}
+
+	if (draft.kind === 'QUERY' && !draft.queryValue.trim()) {
+		return { field: 'queryValue', message: 'Query is required' };
+	}
+	if (draft.kind === 'CUSTOM' && !draft.customValue.trim()) {
+		return { field: 'customValue', message: 'Custom values are required' };
+	}
+	if (draft.kind === 'DYNAMIC' && !draft.dynamicName.trim()) {
+		return { field: 'dynamicName', message: 'Attribute name is required' };
+	}
+	if (draft.kind === 'TEXT' && !draft.textValue.trim()) {
+		return { field: 'textValue', message: 'Default text value is required' };
+	}
+	return null;
+}
+
+export function getVariableName(dto: DashboardtypesVariableDTO): string {
+	if (dto.kind === 'TextVariable') {
+		return (dto.spec as DashboardTextVariableSpecDTO)?.name ?? '';
+	}
+	return (dto.spec as DashboardtypesListVariableSpecDTO)?.name ?? '';
+}
+
+export function getVariableKindLabel(dto: DashboardtypesVariableDTO): string {
+	if (dto.kind === 'TextVariable') return 'Text';
+	const spec = dto.spec as DashboardtypesListVariableSpecDTO;
+	const pluginKind = spec?.plugin?.kind;
+	if (pluginKind === 'signoz/DynamicVariable') return 'Dynamic';
+	if (pluginKind === 'signoz/CustomVariable') return 'Custom';
+	return 'Query';
+}

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/index.tsx

@@ -0,0 +1,156 @@
+import { useCallback, useMemo, useState } from 'react';
+import { Button } from 'antd';
+import { Plus } from '@signozhq/icons';
+import { patchDashboardV2 } from 'api/generated/services/dashboard';
+import type {
+	DashboardtypesJSONPatchOperationDTO,
+	DashboardtypesVariableDTO,
+} from 'api/generated/services/sigNoz.schemas';
+import { useNotifications } from 'hooks/useNotifications';
+import { useErrorModal } from 'providers/ErrorModalProvider';
+import APIError from 'types/api/error';
+
+import {
+	buildDependencyMap,
+	detectCycle,
+} from '../../DashboardVariablesV2/dependencyGraph';
+import type { V2Dashboard } from '../../utils';
+import {
+	emptyDraft,
+	getVariableName,
+	variableDTOToDraft,
+} from './draft';
+import type { VariableDraft } from './types';
+import VariableItem from './VariableItem';
+import VariableList from './VariableList';
+
+interface Props {
+	dashboard: V2Dashboard | undefined;
+	onRefetch: () => void;
+}
+
+type EditorState =
+	| { kind: 'closed' }
+	| { kind: 'add'; draft: VariableDraft }
+	| { kind: 'edit'; index: number; draft: VariableDraft };
+
+function VariablesSettingsV2({ dashboard, onRefetch }: Props): JSX.Element {
+	const dashboardId = dashboard?.id ?? '';
+	const variables = useMemo<DashboardtypesVariableDTO[]>(
+		() => dashboard?.data?.spec?.variables ?? [],
+		[dashboard?.data?.spec?.variables],
+	);
+
+	const [editor, setEditor] = useState<EditorState>({ kind: 'closed' });
+	const [saving, setSaving] = useState<boolean>(false);
+	const { notifications } = useNotifications();
+	const { showErrorModal } = useErrorModal();
+
+	const existingNames = useMemo(() => variables.map(getVariableName), [
+		variables,
+	]);
+
+	const persistVariables = useCallback(
+		async (next: DashboardtypesVariableDTO[]): Promise<void> => {
+			if (!dashboardId) return;
+			const cycle = detectCycle(buildDependencyMap(next));
+			if (cycle.hasCycle) {
+				notifications.error({
+					message: `Cyclic variable dependency: ${cycle.cycle?.join(' → ')}`,
+				});
+				return;
+			}
+			setSaving(true);
+			try {
+				const patch: DashboardtypesJSONPatchOperationDTO[] = [
+					{
+						op: 'replace' as DashboardtypesJSONPatchOperationDTO['op'],
+						path: '/spec/variables',
+						value: next,
+					},
+				];
+				await patchDashboardV2({ id: dashboardId }, patch);
+				notifications.success({ message: 'Variables updated' });
+				onRefetch();
+				setEditor({ kind: 'closed' });
+			} catch (error) {
+				showErrorModal(error as APIError);
+			} finally {
+				setSaving(false);
+			}
+		},
+		[dashboardId, notifications, onRefetch, showErrorModal],
+	);
+
+	const handleSave = useCallback(
+		async (dto: DashboardtypesVariableDTO): Promise<void> => {
+			if (editor.kind === 'add') {
+				await persistVariables([...variables, dto]);
+			} else if (editor.kind === 'edit') {
+				const next = variables.slice();
+				next[editor.index] = dto;
+				await persistVariables(next);
+			}
+		},
+		[editor, variables, persistVariables],
+	);
+
+	const handleDelete = useCallback(
+		async (index: number): Promise<void> => {
+			const next = variables.slice();
+			next.splice(index, 1);
+			await persistVariables(next);
+		},
+		[variables, persistVariables],
+	);
+
+	return (
+		<div
+			style={{
+				display: 'flex',
+				flexDirection: 'column',
+				gap: 12,
+				padding: 16,
+			}}
+		>
+			{editor.kind === 'closed' ? (
+				<>
+					<div style={{ display: 'flex', justifyContent: 'flex-end' }}>
+						<Button
+							type="primary"
+							icon={<Plus size={14} />}
+							onClick={(): void =>
+								setEditor({ kind: 'add', draft: emptyDraft() })
+							}
+							data-testid="add-variable-v2"
+						>
+							Add variable
+						</Button>
+					</div>
+					<VariableList
+						variables={variables}
+						onEdit={(index): void =>
+							setEditor({
+								kind: 'edit',
+								index,
+								draft: variableDTOToDraft(variables[index]),
+							})
+						}
+						onDelete={handleDelete}
+						onReorder={persistVariables}
+					/>
+				</>
+			) : (
+				<VariableItem
+					initialDraft={editor.draft}
+					existingNames={existingNames}
+					saving={saving}
+					onSave={handleSave}
+					onCancel={(): void => setEditor({ kind: 'closed' })}
+				/>
+			)}
+		</div>
+	);
+}
+
+export default VariablesSettingsV2;

frontend/src/container/DashboardContainerV2/DashboardSettings/Variables/types.ts

@@ -0,0 +1,61 @@
+import type {
+	DashboardtypesVariableDTO,
+	TelemetrytypesSignalDTO,
+} from 'api/generated/services/sigNoz.schemas';
+
+export type V2VariableKind = 'QUERY' | 'CUSTOM' | 'DYNAMIC' | 'TEXT';
+
+/**
+ * Internal editor state. Holds every per-kind field so that switching `kind`
+ * does not discard user input. Only the fields relevant to the active kind
+ * are written into the resulting V2 envelope on save.
+ */
+export interface VariableDraft {
+	id: string; // local identifier for list keys; not persisted to V2
+	kind: V2VariableKind;
+	name: string;
+	displayName: string;
+
+	// Shared by all List variants (QUERY / CUSTOM / DYNAMIC)
+	allowAllValue: boolean;
+	allowMultiple: boolean;
+	sort: string;
+	defaultValue: string;
+	// V2-only: literal value emitted when the user picks "ALL"
+	customAllValue: string;
+	// V2-only: regex applied to query/dynamic results to extract the actual value
+	capturingRegexp: string;
+
+	// QUERY
+	queryValue: string;
+
+	// CUSTOM
+	customValue: string;
+
+	// DYNAMIC
+	dynamicName: string;
+	dynamicSignal: TelemetrytypesSignalDTO | undefined;
+
+	// TEXT
+	textValue: string;
+}
+
+export type SaveCallback = (dto: DashboardtypesVariableDTO) => void;
+
+export const VARIABLE_KIND_LABEL: Record<V2VariableKind, string> = {
+	QUERY: 'Query',
+	CUSTOM: 'Custom',
+	DYNAMIC: 'Dynamic',
+	TEXT: 'Text',
+};
+
+// V2 supports a finer sort taxonomy than V1: separate alphabetical and
+// numerical orderings (V1 only exposed Disabled / Ascending / Descending).
+// Values match the strings used in the perses fixture and backend.
+export const SORT_OPTIONS: { label: string; value: string }[] = [
+	{ label: 'Disabled', value: 'none' },
+	{ label: 'Alphabetical ascending', value: 'alphabetical-asc' },
+	{ label: 'Alphabetical descending', value: 'alphabetical-desc' },
+	{ label: 'Numerical ascending', value: 'numerical-asc' },
+	{ label: 'Numerical descending', value: 'numerical-desc' },
+];

frontend/src/container/DashboardContainerV2/DashboardSettings/index.tsx

@@ -0,0 +1,70 @@
+import { Button, Empty, Tabs } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import { Braces, Globe, Table } from '@signozhq/icons';
+
+import '../../DashboardContainer/DashboardSettings/DashboardSettingsContent.styles.scss';
+
+import GeneralDashboardSettingsV2 from './General';
+import VariablesSettingsV2 from './Variables';
+import type { V2Dashboard } from '../utils';
+
+interface Props {
+	dashboard: V2Dashboard | undefined;
+	onRefetch: () => void;
+}
+
+function Placeholder({ message }: { message: string }): JSX.Element {
+	return (
+		<div style={{ padding: 24 }}>
+			<Empty
+				image={Empty.PRESENTED_IMAGE_SIMPLE}
+				description={<Typography.Text>{message}</Typography.Text>}
+			/>
+		</div>
+	);
+}
+
+function DashboardSettingsV2({ dashboard, onRefetch }: Props): JSX.Element {
+	const items = [
+		{
+			label: (
+				<Button type="text" icon={<Table size={14} />}>
+					General
+				</Button>
+			),
+			key: 'general',
+			children: (
+				<GeneralDashboardSettingsV2
+					dashboard={dashboard}
+					onRefetch={onRefetch}
+				/>
+			),
+		},
+		{
+			label: (
+				<Button type="text" icon={<Braces size={14} />}>
+					Variables
+				</Button>
+			),
+			key: 'variables',
+			children: (
+				<VariablesSettingsV2 dashboard={dashboard} onRefetch={onRefetch} />
+			),
+		},
+		{
+			label: (
+				<Button type="text" icon={<Globe size={14} />}>
+					Publish
+				</Button>
+			),
+			key: 'public-dashboard',
+			children: (
+				<Placeholder message="V2 public dashboard publishing coming next." />
+			),
+		},
+	];
+
+	return <Tabs items={items} />;
+}
+
+export default DashboardSettingsV2;

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/dependencyGraph.ts

@@ -0,0 +1,135 @@
+import type {
+	DashboardtypesListVariableSpecDTO,
+	DashboardtypesVariableDTO,
+} from 'api/generated/services/sigNoz.schemas';
+
+import { referencedVariables } from './substitution';
+
+/**
+ * Extracts the strings on a variable that may contain `$var` references —
+ * i.e. the dependency edges out of this variable.
+ *
+ * Currently only QUERY variables produce dependencies (their `queryValue`
+ * may reference other variables). CUSTOM and DYNAMIC plugin specs don't
+ * embed substitutable strings, and TEXT variables are leaf nodes.
+ */
+function dependencyStrings(dto: DashboardtypesVariableDTO): string[] {
+	if (dto.kind !== 'ListVariable') return [];
+	const spec = dto.spec as DashboardtypesListVariableSpecDTO;
+	const pluginKind = spec?.plugin?.kind;
+	const pluginSpec = spec?.plugin?.spec as Record<string, unknown> | undefined;
+	if (pluginKind === 'signoz/QueryVariable') {
+		return [String(pluginSpec?.queryValue ?? '')];
+	}
+	return [];
+}
+
+function nameOf(dto: DashboardtypesVariableDTO): string {
+	return (dto.spec as { name?: string })?.name ?? '';
+}
+
+/**
+ * Direct dependencies for each variable (name → set of names it references).
+ */
+export function buildDependencyMap(
+	variables: DashboardtypesVariableDTO[],
+): Record<string, Set<string>> {
+	const knownNames = new Set(variables.map(nameOf).filter(Boolean));
+	const deps: Record<string, Set<string>> = {};
+	variables.forEach((v) => {
+		const name = nameOf(v);
+		if (!name) return;
+		const refs = new Set<string>();
+		dependencyStrings(v).forEach((s) => {
+			referencedVariables(s).forEach((ref) => {
+				if (ref !== name && knownNames.has(ref)) refs.add(ref);
+			});
+		});
+		deps[name] = refs;
+	});
+	return deps;
+}
+
+export interface CycleResult {
+	hasCycle: boolean;
+	cycle?: string[];
+}
+
+/**
+ * Detect a cycle via DFS; returns the participating names in traversal order.
+ * Used at save time and to guard re-resolution.
+ */
+export function detectCycle(
+	deps: Record<string, Set<string>>,
+): CycleResult {
+	const WHITE = 0;
+	const GRAY = 1;
+	const BLACK = 2;
+	const color: Record<string, number> = {};
+	const stack: string[] = [];
+	const names = Object.keys(deps);
+	names.forEach((n) => {
+		color[n] = WHITE;
+	});
+
+	function visit(node: string): string[] | null {
+		color[node] = GRAY;
+		stack.push(node);
+		for (const next of deps[node] ?? []) {
+			if (color[next] === GRAY) {
+				const idx = stack.indexOf(next);
+				return stack.slice(idx).concat(next);
+			}
+			if (color[next] === WHITE) {
+				const found = visit(next);
+				if (found) return found;
+			}
+		}
+		stack.pop();
+		color[node] = BLACK;
+		return null;
+	}
+
+	for (const n of names) {
+		if (color[n] === WHITE) {
+			const cycle = visit(n);
+			if (cycle) return { hasCycle: true, cycle };
+		}
+	}
+	return { hasCycle: false };
+}
+
+/**
+ * Kahn's algorithm — returns variable names in dependency order
+ * (dependencies first). If there's a cycle the result excludes the
+ * participating nodes; combine with `detectCycle` for validation.
+ */
+export function topoSort(
+	deps: Record<string, Set<string>>,
+): string[] {
+	const incoming: Record<string, number> = {};
+	const downstream: Record<string, string[]> = {};
+	Object.keys(deps).forEach((n) => {
+		incoming[n] = 0;
+		downstream[n] = [];
+	});
+	Object.entries(deps).forEach(([n, refs]) => {
+		refs.forEach((ref) => {
+			incoming[n] += 1;
+			downstream[ref] = downstream[ref] ?? [];
+			downstream[ref].push(n);
+		});
+	});
+
+	const queue: string[] = Object.keys(incoming).filter((n) => incoming[n] === 0);
+	const out: string[] = [];
+	while (queue.length > 0) {
+		const n = queue.shift() as string;
+		out.push(n);
+		(downstream[n] ?? []).forEach((next) => {
+			incoming[next] -= 1;
+			if (incoming[next] === 0) queue.push(next);
+		});
+	}
+	return out;
+}

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/index.tsx

@@ -0,0 +1,81 @@
+import { useEffect, useMemo } from 'react';
+import type {
+	DashboardtypesListVariableSpecDTO,
+	DashboardTextVariableSpecDTO,
+	DashboardtypesVariableDTO,
+} from 'api/generated/services/sigNoz.schemas';
+
+import { buildDependencyMap, detectCycle, topoSort } from './dependencyGraph';
+import VariableSelector from './selectors/VariableSelector';
+import { useVariableSelectionStore } from './state/selectionStore';
+
+import '../../DashboardContainer/DashboardVariablesSelection/DashboardVariableSelection.styles.scss';
+
+interface Props {
+	dashboardId: string;
+	variables: DashboardtypesVariableDTO[] | undefined;
+}
+
+function nameOf(v: DashboardtypesVariableDTO): string {
+	return (
+		(v.spec as DashboardtypesListVariableSpecDTO | DashboardTextVariableSpecDTO)
+			?.name ?? ''
+	);
+}
+
+function kindHint(v: DashboardtypesVariableDTO): 'list' | 'text' {
+	return v.kind === 'TextVariable' ? 'text' : 'list';
+}
+
+function DashboardVariablesV2({ dashboardId, variables }: Props): JSX.Element | null {
+	const hydrate = useVariableSelectionStore((s) => s.hydrate);
+
+	// Build hints map (variable-name → list/text) so the store can decode the URL.
+	const hints = useMemo<Record<string, 'list' | 'text'>>(() => {
+		const out: Record<string, 'list' | 'text'> = {};
+		(variables ?? []).forEach((v) => {
+			const n = nameOf(v);
+			if (n) out[n] = kindHint(v);
+		});
+		return out;
+	}, [variables]);
+
+	useEffect(() => {
+		if (!dashboardId) return;
+		hydrate(dashboardId, hints);
+	}, [dashboardId, hints, hydrate]);
+
+	// Sort variables in dependency order so dependent resolvers see fresh
+	// selections from their parents. (Render order doesn't affect the React
+	// Query cache but it does affect *visual* order.)
+	const ordered = useMemo(() => {
+		if (!variables?.length) return [];
+		const deps = buildDependencyMap(variables);
+		const cycle = detectCycle(deps);
+		if (cycle.hasCycle) {
+			// Render in the original order; the cycle is surfaced separately at save
+			// time via validateDraft. Resolution will still execute; it just won't
+			// converge.
+			return variables;
+		}
+		const order = topoSort(deps);
+		const byName: Record<string, DashboardtypesVariableDTO> = {};
+		variables.forEach((v) => {
+			const n = nameOf(v);
+			if (n) byName[n] = v;
+		});
+		return order.map((n) => byName[n]).filter(Boolean);
+	}, [variables]);
+
+	if (!variables || variables.length === 0) return null;
+
+	return (
+		<div className="variables-container">
+			{ordered.map((v) => (
+				<VariableSelector key={nameOf(v)} variable={v} />
+			))}
+		</div>
+	);
+}
+
+export default DashboardVariablesV2;

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/resolution/capturingRegexp.ts

@@ -0,0 +1,29 @@
+/**
+ * Applies V2 `capturingRegexp` to each value: if the regex matches and has a
+ * capture group, replace the value with the first capture; otherwise keep
+ * the raw value. Invalid regex silently passes values through.
+ *
+ * Empty results (no match at all) are filtered out — they would be useless
+ * as selectable options.
+ */
+export function applyCapturingRegexp(
+	values: string[],
+	pattern: string | undefined | null,
+): string[] {
+	if (!pattern) return values;
+
+	let re: RegExp;
+	try {
+		re = new RegExp(pattern);
+	} catch {
+		return values;
+	}
+
+	const out: string[] = [];
+	values.forEach((v) => {
+		const m = re.exec(v);
+		if (!m) return;
+		out.push(m[1] !== undefined ? m[1] : m[0]);
+	});
+	return out;
+}

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/resolution/sorting.ts

@@ -0,0 +1,37 @@
+/**
+ * Apply V2 sort modes to a resolved value list.
+ *
+ * Sort values come from the perses spec — `none`, `alphabetical-asc`,
+ * `alphabetical-desc`, `numerical-asc`, `numerical-desc`. Numerical sort
+ * falls back to string compare for values that aren't numbers so we never
+ * throw away non-numeric entries.
+ */
+export function applySort(
+	values: string[],
+	sort: string | null | undefined,
+): string[] {
+	if (!sort || sort === 'none' || values.length <= 1) return values;
+	const copy = values.slice();
+	if (sort === 'alphabetical-asc') {
+		copy.sort((a, b) => a.localeCompare(b));
+	} else if (sort === 'alphabetical-desc') {
+		copy.sort((a, b) => b.localeCompare(a));
+	} else if (sort === 'numerical-asc' || sort === 'numerical-desc') {
+		copy.sort((a, b) => {
+			const na = Number(a);
+			const nb = Number(b);
+			const aFinite = Number.isFinite(na);
+			const bFinite = Number.isFinite(nb);
+			if (aFinite && bFinite) {
+				return sort === 'numerical-asc' ? na - nb : nb - na;
+			}
+			// Mixed numeric/non-numeric: keep non-numerics at the end, sorted alpha.
+			if (aFinite) return -1;
+			if (bFinite) return 1;
+			return sort === 'numerical-asc'
+				? a.localeCompare(b)
+				: b.localeCompare(a);
+		});
+	}
+	return copy;
+}

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/resolution/types.ts

@@ -0,0 +1,18 @@
+/**
+ * Output of resolving a single list variable. Text variables don't go
+ * through resolution — their value is the literal string.
+ */
+export interface ResolvedValues {
+	values: string[];
+	status: 'idle' | 'loading' | 'success' | 'error';
+	error?: string;
+}
+
+export const idle: ResolvedValues = { values: [], status: 'idle' };
+export const loading: ResolvedValues = { values: [], status: 'loading' };
+export function success(values: string[]): ResolvedValues {
+	return { values, status: 'success' };
+}
+export function failure(error: string): ResolvedValues {
+	return { values: [], status: 'error', error };
+}

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/resolution/useCustomResolver.ts

@@ -0,0 +1,15 @@
+import { useMemo } from 'react';
+import { commaValuesParser } from 'lib/dashboardVariables/customCommaValuesParser';
+
+import { success, type ResolvedValues } from './types';
+
+/**
+ * CUSTOM variables: the comma-separated user input is the value list.
+ * No network call, purely client-side.
+ */
+export function useCustomResolver(customValue: string): ResolvedValues {
+	return useMemo(
+		() => success(commaValuesParser(customValue).map((v) => String(v))),
+		[customValue],
+	);
+}

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/resolution/useDynamicResolver.ts

@@ -0,0 +1,50 @@
+import { useSelector } from 'react-redux';
+import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
+import { useGetFieldValues } from 'hooks/dynamicVariables/useGetFieldValues';
+import { AppState } from 'store/reducers';
+import { GlobalReducer } from 'types/reducer/globalTime';
+
+import { failure, idle, loading, success, type ResolvedValues } from './types';
+
+function signalToV1(
+	signal: TelemetrytypesSignalDTO | undefined,
+): 'traces' | 'logs' | 'metrics' | undefined {
+	if (signal === TelemetrytypesSignalDTO.traces) return 'traces';
+	if (signal === TelemetrytypesSignalDTO.logs) return 'logs';
+	if (signal === TelemetrytypesSignalDTO.metrics) return 'metrics';
+	return undefined;
+}
+
+/**
+ * DYNAMIC variables: telemetry attribute lookup.
+ * - `signal === undefined` → search across all telemetry types.
+ * - Otherwise scoped to the specific signal.
+ *
+ * Uses the existing V1 hook directly; the API is V2-shape-agnostic.
+ */
+export function useDynamicResolver(
+	attributeName: string,
+	signal: TelemetrytypesSignalDTO | undefined,
+): ResolvedValues {
+	const { maxTime, minTime } = useSelector<AppState, GlobalReducer>(
+		(state) => state.globalTime,
+	);
+
+	const enabled = !!attributeName;
+	const { data, isLoading, isError, error } = useGetFieldValues({
+		signal: signalToV1(signal),
+		name: attributeName,
+		enabled,
+		startUnixMilli: minTime,
+		endUnixMilli: maxTime,
+	});
+
+	if (!enabled) return idle;
+	if (isLoading) return loading;
+	if (isError) {
+		return failure(
+			(error as Error)?.message ?? 'Failed to resolve dynamic variable',
+		);
+	}
+	return success(data?.data?.normalizedValues ?? []);
+}

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/resolution/useQueryResolver.ts

@@ -0,0 +1,78 @@
+import { useQuery } from 'react-query';
+import dashboardVariablesQuery from 'api/dashboard/variables/dashboardVariablesQuery';
+import type { PayloadVariables } from 'types/api/dashboard/variables/query';
+
+import { substituteVariables } from '../substitution';
+import type { SelectionsByName } from '../state/types';
+import { failure, idle, loading, success, type ResolvedValues } from './types';
+
+/**
+ * Reduce the user's V2 selections to the V1 `PayloadVariables` shape the
+ * variables/query endpoint expects (a plain name → selected-value map).
+ */
+function selectionsToPayload(
+	selections: SelectionsByName,
+): PayloadVariables {
+	const out: PayloadVariables = {};
+	Object.entries(selections).forEach(([name, sel]) => {
+		if (!sel) return;
+		if (sel.kind === 'text') {
+			out[name] = sel.value;
+		} else if (sel.allSelected) {
+			// Endpoint understands `__ALL__`-style markers via the substitution
+			// done client-side; leave the value out so server doesn't double up.
+			// (Callers using IN ($var) expand via substituteVariables instead.)
+		} else if (sel.values.length === 1) {
+			out[name] = sel.values[0];
+		} else {
+			out[name] = sel.values;
+		}
+	});
+	return out;
+}
+
+interface UseQueryResolverArgs {
+	variableName: string;
+	queryValue: string;
+	selections: SelectionsByName;
+	enabled: boolean;
+}
+
+/**
+ * QUERY variables: substitute `$var` references using current selections,
+ * then POST to `/api/v2/variables/query`. React Query caches per
+ * (name, substitutedQuery) so re-render with the same inputs reuses results.
+ */
+export function useQueryResolver({
+	variableName,
+	queryValue,
+	selections,
+	enabled,
+}: UseQueryResolverArgs): ResolvedValues {
+	const substituted = substituteVariables(queryValue, selections);
+
+	const { data, isLoading, isError, error } = useQuery({
+		queryKey: ['v2-variable-query', variableName, substituted],
+		queryFn: () =>
+			dashboardVariablesQuery({
+				query: substituted,
+				variables: selectionsToPayload(selections),
+			}),
+		enabled: enabled && !!substituted,
+		refetchOnWindowFocus: false,
+	});
+
+	if (!enabled || !substituted) return idle;
+	if (isLoading) return loading;
+	if (isError) {
+		return failure(
+			(error as { details?: { error?: string } })?.details?.error ??
+				(error as Error)?.message ??
+				'Variable query failed',
+		);
+	}
+	const payload = (data as { payload?: { variableValues?: unknown[] } } | undefined)
+		?.payload;
+	const values = (payload?.variableValues ?? []).map((v) => String(v));
+	return success(values);
+}

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/resolution/useResolveVariable.ts

@@ -0,0 +1,74 @@
+import { useMemo } from 'react';
+import type {
+	DashboardtypesListVariableSpecDTO,
+	DashboardtypesVariableDTO,
+	TelemetrytypesSignalDTO,
+} from 'api/generated/services/sigNoz.schemas';
+
+import { useVariableSelectionStore } from '../state/selectionStore';
+import { applyCapturingRegexp } from './capturingRegexp';
+import { applySort } from './sorting';
+import { useCustomResolver } from './useCustomResolver';
+import { useDynamicResolver } from './useDynamicResolver';
+import { useQueryResolver } from './useQueryResolver';
+import { idle, success, type ResolvedValues } from './types';
+
+interface UseResolveVariableArgs {
+	variable: DashboardtypesVariableDTO;
+}
+
+/**
+ * Routes a variable to the correct resolver hook and applies the V2
+ * post-processing pipeline:
+ *
+ *   raw values → capturingRegexp → sort → final list
+ *
+ * Text variables short-circuit since they don't have a value list.
+ */
+export function useResolveVariable({
+	variable,
+}: UseResolveVariableArgs): ResolvedValues {
+	const selections = useVariableSelectionStore((s) => s.selections);
+
+	// Read all fields up front so the React Query / hook order is stable
+	// across renders (hooks must not be called conditionally).
+	const isText = variable.kind === 'TextVariable';
+	const listSpec = (variable.spec as DashboardtypesListVariableSpecDTO) ?? {};
+	const pluginKind = listSpec.plugin?.kind;
+	const pluginSpec = (listSpec.plugin?.spec as Record<string, unknown> | undefined) ?? {};
+
+	const name = listSpec?.name ?? '';
+	const customValue = (pluginSpec.customValue as string) ?? '';
+	const queryValue = (pluginSpec.queryValue as string) ?? '';
+	const dynName = (pluginSpec.name as string) ?? '';
+	const dynSignal = pluginSpec.signal as TelemetrytypesSignalDTO | undefined;
+
+	const customRes = useCustomResolver(
+		pluginKind === 'signoz/CustomVariable' ? customValue : '',
+	);
+	const dynRes = useDynamicResolver(
+		pluginKind === 'signoz/DynamicVariable' ? dynName : '',
+		dynSignal,
+	);
+	const queryRes = useQueryResolver({
+		variableName: name,
+		queryValue: pluginKind === 'signoz/QueryVariable' ? queryValue : '',
+		selections,
+		enabled: pluginKind === 'signoz/QueryVariable',
+	});
+
+	const raw: ResolvedValues = useMemo(() => {
+		if (isText) return success([]);
+		if (pluginKind === 'signoz/CustomVariable') return customRes;
+		if (pluginKind === 'signoz/DynamicVariable') return dynRes;
+		if (pluginKind === 'signoz/QueryVariable') return queryRes;
+		return idle;
+	}, [isText, pluginKind, customRes, dynRes, queryRes]);
+
+	return useMemo(() => {
+		if (raw.status !== 'success') return raw;
+		const afterRegex = applyCapturingRegexp(raw.values, listSpec.capturingRegexp);
+		const afterSort = applySort(afterRegex, listSpec.sort);
+		return success(afterSort);
+	}, [raw, listSpec.capturingRegexp, listSpec.sort]);
+}

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/selectors/ListVariableSelector.tsx

@@ -0,0 +1,89 @@
+import { useMemo } from 'react';
+import SelectVariableInput from 'container/DashboardContainer/DashboardVariablesSelection/SelectVariableInput';
+import { ALL_SELECT_VALUE } from 'container/DashboardContainer/utils';
+
+import type { ResolvedValues } from '../resolution/types';
+import type { VariableSelection } from '../state/types';
+
+interface Props {
+	variableId: string;
+	resolved: ResolvedValues;
+	selection: VariableSelection | undefined;
+	allowMultiple: boolean;
+	allowAllValue: boolean;
+	defaultValue: string;
+	onChange: (selection: VariableSelection) => void;
+	onClear: () => void;
+}
+
+function selectionToValue(
+	selection: VariableSelection | undefined,
+	defaultValue: string,
+	allowMultiple: boolean,
+): string | string[] | undefined {
+	if (selection && selection.kind === 'list') {
+		if (selection.allSelected) return ALL_SELECT_VALUE;
+		if (allowMultiple) return selection.values;
+		return selection.values[0];
+	}
+	if (defaultValue) return allowMultiple ? [defaultValue] : defaultValue;
+	return undefined;
+}
+
+/**
+ * QUERY / CUSTOM / DYNAMIC variables share the same dropdown UX: a list of
+ * options + an optional ALL entry + single / multi-select. Reuses V1's
+ * `SelectVariableInput` so visuals match exactly.
+ */
+function ListVariableSelector({
+	variableId,
+	resolved,
+	selection,
+	allowMultiple,
+	allowAllValue,
+	defaultValue,
+	onChange,
+	onClear,
+}: Props): JSX.Element {
+	const options = useMemo(
+		() => resolved.values.map((v) => ({ label: v, value: v })),
+		[resolved.values],
+	);
+
+	const value = selectionToValue(selection, defaultValue, allowMultiple);
+
+	return (
+		<SelectVariableInput
+			variableId={variableId}
+			options={options}
+			value={value}
+			enableSelectAll={allowAllValue}
+			isMultiSelect={allowMultiple}
+			loading={resolved.status === 'loading'}
+			errorMessage={resolved.error ?? null}
+			onChange={(next): void => {
+				if (Array.isArray(next)) {
+					// Multi-select. Antd's CustomMultiSelect emits the ALL sentinel
+					// when the user toggles the "Select all" row.
+					const hasAll = next.includes(ALL_SELECT_VALUE);
+					onChange({
+						kind: 'list',
+						values: hasAll ? [] : next,
+						allSelected: hasAll,
+					});
+				} else if (next === ALL_SELECT_VALUE) {
+					onChange({ kind: 'list', values: [], allSelected: true });
+				} else {
+					onChange({
+						kind: 'list',
+						values: next ? [next] : [],
+						allSelected: false,
+					});
+				}
+			}}
+			onClear={onClear}
+		/>
+	);
+}
+
+export default ListVariableSelector;

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/selectors/SelectorLabel.tsx

@@ -0,0 +1,27 @@
+import { Tooltip } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import { SolidInfoCircle } from '@signozhq/icons';
+
+interface Props {
+	name: string;
+	description?: string;
+}
+
+/**
+ * V1-style label: `$name` + an info tooltip if a description is set.
+ * Mirrors [DashboardVariablesSelection/VariableItem.tsx:34-42](V1).
+ */
+function SelectorLabel({ name, description }: Props): JSX.Element {
+	return (
+		<Typography.Text className="variable-name" truncate={1}>
+			${name}
+			{description ? (
+				<Tooltip title={description}>
+					<SolidInfoCircle className="info-icon" size="md" />
+				</Tooltip>
+			) : null}
+		</Typography.Text>
+	);
+}
+
+export default SelectorLabel;

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/selectors/TextVariableSelector.tsx

@@ -0,0 +1,37 @@
+import { useEffect, useState } from 'react';
+import { Input } from 'antd';
+
+interface Props {
+	value: string;
+	onCommit: (v: string) => void;
+}
+
+/**
+ * Text variable input — commits on blur (and on Enter), matching V1's
+ * `TextboxVariableInput` UX which avoids re-fetching panels on every
+ * keystroke.
+ */
+function TextVariableSelector({ value, onCommit }: Props): JSX.Element {
+	const [draft, setDraft] = useState<string>(value);
+
+	useEffect(() => {
+		setDraft(value);
+	}, [value]);
+
+	const commit = (): void => {
+		if (draft !== value) onCommit(draft);
+	};
+
+	return (
+		<Input
+			className="variable-select"
+			value={draft}
+			onChange={(e): void => setDraft(e.target.value)}
+			onBlur={commit}
+			onPressEnter={commit}
+			data-testid="text-variable-input-v2"
+		/>
+	);
+}
+
+export default TextVariableSelector;

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/selectors/VariableSelector.tsx

@@ -0,0 +1,92 @@
+import { useCallback } from 'react';
+import type {
+	DashboardtypesListVariableSpecDTO,
+	DashboardTextVariableSpecDTO,
+	DashboardtypesVariableDTO,
+} from 'api/generated/services/sigNoz.schemas';
+
+import { useResolveVariable } from '../resolution/useResolveVariable';
+import { useVariableSelectionStore } from '../state/selectionStore';
+import type { VariableSelection } from '../state/types';
+import ListVariableSelector from './ListVariableSelector';
+import SelectorLabel from './SelectorLabel';
+import TextVariableSelector from './TextVariableSelector';
+
+interface Props {
+	variable: DashboardtypesVariableDTO;
+}
+
+/**
+ * Routes one variable to its kind-specific selector. Owns the selection
+ * store binding so the kind-specific components stay dumb.
+ */
+function VariableSelector({ variable }: Props): JSX.Element | null {
+	const isText = variable.kind === 'TextVariable';
+	const spec = variable.spec as
+		| DashboardtypesListVariableSpecDTO
+		| DashboardTextVariableSpecDTO
+		| undefined;
+	const name = spec?.name ?? '';
+
+	const selection = useVariableSelectionStore((s) =>
+		name ? s.selections[name] : undefined,
+	);
+	const setSelection = useVariableSelectionStore((s) => s.setSelection);
+	const resolved = useResolveVariable({ variable });
+
+	const setListSelection = useCallback(
+		(next: VariableSelection): void => setSelection(name, next),
+		[name, setSelection],
+	);
+	const clearSelection = useCallback((): void => setSelection(name, undefined), [
+		name,
+		setSelection,
+	]);
+
+	if (!name) return null;
+
+	const description = spec?.display?.name ?? '';
+
+	if (isText) {
+		const textSpec = spec as DashboardTextVariableSpecDTO;
+		const current =
+			selection?.kind === 'text' ? selection.value : textSpec?.value ?? '';
+		return (
+			<div className="variable-item">
+				<SelectorLabel name={name} description={description} />
+				<div className="variable-value">
+					<TextVariableSelector
+						value={current}
+						onCommit={(v): void => setSelection(name, { kind: 'text', value: v })}
+					/>
+				</div>
+			</div>
+		);
+	}
+
+	const listSpec = spec as DashboardtypesListVariableSpecDTO;
+	const defaultValue =
+		typeof listSpec?.defaultValue === 'string'
+			? (listSpec.defaultValue as string)
+			: '';
+
+	return (
+		<div className="variable-item">
+			<SelectorLabel name={name} description={description} />
+			<div className="variable-value">
+				<ListVariableSelector
+					variableId={name}
+					resolved={resolved}
+					selection={selection}
+					allowMultiple={!!listSpec?.allowMultiple}
+					allowAllValue={!!listSpec?.allowAllValue}
+					defaultValue={defaultValue}
+					onChange={setListSelection}
+					onClear={clearSelection}
+				/>
+			</div>
+		</div>
+	);
+}
+
+export default VariableSelector;

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/state/localStorage.ts

@@ -0,0 +1,36 @@
+import type { SelectionsByName } from './types';
+
+const STORAGE_PREFIX = 'dashboard-v2-variables';
+
+function storageKey(dashboardId: string): string {
+	return `${STORAGE_PREFIX}:${dashboardId}`;
+}
+
+export function loadSelectionsFromStorage(
+	dashboardId: string,
+): SelectionsByName {
+	if (!dashboardId) return {};
+	try {
+		const raw = window.localStorage.getItem(storageKey(dashboardId));
+		if (!raw) return {};
+		const parsed = JSON.parse(raw) as SelectionsByName;
+		return parsed && typeof parsed === 'object' ? parsed : {};
+	} catch {
+		return {};
+	}
+}
+
+export function saveSelectionsToStorage(
+	dashboardId: string,
+	selections: SelectionsByName,
+): void {
+	if (!dashboardId) return;
+	try {
+		window.localStorage.setItem(
+			storageKey(dashboardId),
+			JSON.stringify(selections),
+		);
+	} catch {
+		// quota / availability issues — selection still lives in memory + URL
+	}
+}

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/state/selectionStore.ts

@@ -0,0 +1,63 @@
+import { create } from 'zustand';
+
+import {
+	loadSelectionsFromStorage,
+	saveSelectionsToStorage,
+} from './localStorage';
+import type { SelectionsByName, VariableSelection } from './types';
+import { readSelectionsFromUrl, writeSelectionsToUrl } from './urlSync';
+
+interface SelectionStoreState {
+	dashboardId: string;
+	selections: SelectionsByName;
+
+	/**
+	 * Hydrate from URL → fallback to LocalStorage. Called once per dashboard
+	 * load. `hints` lets URL decoding pick list vs text encoding.
+	 */
+	hydrate: (
+		dashboardId: string,
+		hints: Record<string, 'list' | 'text'>,
+	) => void;
+
+	/**
+	 * Set / clear the selection for a single variable. Persists to both
+	 * LocalStorage and URL.
+	 */
+	setSelection: (name: string, selection: VariableSelection | undefined) => void;
+
+	reset: () => void;
+}
+
+export const useVariableSelectionStore = create<SelectionStoreState>(
+	(set, get) => ({
+		dashboardId: '',
+		selections: {},
+
+		hydrate: (dashboardId, hints): void => {
+			const fromUrl = readSelectionsFromUrl(hints);
+			const fromStorage = loadSelectionsFromStorage(dashboardId);
+			// URL wins over LocalStorage (shareable links override personal
+			// preferences).
+			const merged: SelectionsByName = { ...fromStorage, ...fromUrl };
+			set({ dashboardId, selections: merged });
+		},
+
+		setSelection: (name, selection): void => {
+			const { dashboardId, selections } = get();
+			const next: SelectionsByName = { ...selections };
+			if (selection === undefined) {
+				delete next[name];
+			} else {
+				next[name] = selection;
+			}
+			set({ selections: next });
+			saveSelectionsToStorage(dashboardId, next);
+			writeSelectionsToUrl(next);
+		},
+
+		reset: (): void => {
+			set({ dashboardId: '', selections: {} });
+		},
+	}),
+);

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/state/types.ts

@@ -0,0 +1,20 @@
+/**
+ * A single variable's selected value.
+ *
+ * - `kind: 'list'` is used for QUERY / CUSTOM / DYNAMIC list variables.
+ *   - `allSelected: true` represents the user picking "ALL"; `values` is
+ *     ignored in that case.
+ *   - `values` is an array even for single-select to keep the shape uniform;
+ *     single-select uses index 0.
+ * - `kind: 'text'` is the TextVariable case: one freeform string.
+ */
+export type VariableSelection =
+	| { kind: 'list'; values: string[]; allSelected: boolean }
+	| { kind: 'text'; value: string };
+
+/**
+ * Map of `variable name` → selection. Per dashboard, in memory + persisted.
+ */
+export type SelectionsByName = Record<string, VariableSelection | undefined>;
+
+export const ALL_SENTINEL = '__ALL__';

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/state/urlSync.ts

@@ -0,0 +1,72 @@
+import { ALL_SENTINEL, type SelectionsByName, type VariableSelection } from './types';
+
+const URL_PREFIX = 'var-';
+
+/**
+ * Encodes a single selection into a URL-safe string. Compact format:
+ *   - text variable      → the freeform string
+ *   - list (ALL)         → "__ALL__"
+ *   - list (single)      → "value"
+ *   - list (multi)       → "v1,v2,v3"
+ */
+function encodeSelection(sel: VariableSelection): string {
+	if (sel.kind === 'text') return sel.value;
+	if (sel.allSelected) return ALL_SENTINEL;
+	return sel.values.join(',');
+}
+
+function decodeSelection(
+	raw: string,
+	hint: 'list' | 'text',
+): VariableSelection {
+	if (hint === 'text') return { kind: 'text', value: raw };
+	if (raw === ALL_SENTINEL) {
+		return { kind: 'list', values: [], allSelected: true };
+	}
+	const values = raw ? raw.split(',') : [];
+	return { kind: 'list', values, allSelected: false };
+}
+
+/**
+ * Reads `var-<name>=<encoded>` params off the current location.
+ * `hints` tells us each variable's kind (list vs text) for decoding.
+ */
+export function readSelectionsFromUrl(
+	hints: Record<string, 'list' | 'text'>,
+): SelectionsByName {
+	const out: SelectionsByName = {};
+	if (typeof window === 'undefined') return out;
+	const params = new URLSearchParams(window.location.search);
+	params.forEach((value, key) => {
+		if (!key.startsWith(URL_PREFIX)) return;
+		const name = key.slice(URL_PREFIX.length);
+		const hint = hints[name];
+		if (!hint) return;
+		out[name] = decodeSelection(value, hint);
+	});
+	return out;
+}
+
+/**
+ * Writes the current selections into the URL, replacing any previous
+ * `var-*` params. Uses `replaceState` so it doesn't pollute history.
+ */
+export function writeSelectionsToUrl(selections: SelectionsByName): void {
+	if (typeof window === 'undefined') return;
+	const params = new URLSearchParams(window.location.search);
+	// Strip existing var-* params
+	const keysToDelete: string[] = [];
+	params.forEach((_, key) => {
+		if (key.startsWith(URL_PREFIX)) keysToDelete.push(key);
+	});
+	keysToDelete.forEach((k) => params.delete(k));
+
+	Object.entries(selections).forEach(([name, sel]) => {
+		if (!sel) return;
+		params.set(`${URL_PREFIX}${name}`, encodeSelection(sel));
+	});
+
+	const search = params.toString();
+	const nextUrl = `${window.location.pathname}${search ? `?${search}` : ''}${window.location.hash}`;
+	window.history.replaceState(window.history.state, '', nextUrl);
+}

frontend/src/container/DashboardContainerV2/DashboardVariablesV2/substitution.ts

@@ -0,0 +1,56 @@
+import { ALL_SENTINEL, type SelectionsByName } from './state/types';
+
+/**
+ * Replaces `$varname` references in a string with the current selection.
+ *
+ * - text selection      → the freeform string
+ * - list, allSelected   → ALL_SENTINEL (callers decide whether to expand to
+ *                         all known values or to send the literal marker)
+ * - list, single value  → that value
+ * - list, multi values  → comma-joined; brackets if caller wraps with IN ()
+ *
+ * Variable names match `[a-zA-Z_][a-zA-Z0-9_.]*` so dotted attribute keys
+ * like `$service.name` work. Substitution is non-recursive (we don't expand
+ * `$other` if a value happens to contain another reference).
+ */
+const VARIABLE_REF = /\$([a-zA-Z_][a-zA-Z0-9_.]*)/g;
+
+function selectionToString(
+	selection: SelectionsByName[string],
+): string | null {
+	if (!selection) return null;
+	if (selection.kind === 'text') return selection.value;
+	if (selection.allSelected) return ALL_SENTINEL;
+	if (selection.values.length === 0) return '';
+	return selection.values.join(',');
+}
+
+export function substituteVariables(
+	template: string,
+	selections: SelectionsByName,
+): string {
+	if (!template) return template;
+	return template.replace(VARIABLE_REF, (match, name: string) => {
+		const sel = selections[name];
+		const value = selectionToString(sel);
+		// Leave unresolved references intact so the consumer can decide how to
+		// handle them (better than producing silent partial substitutions).
+		return value === null ? match : value;
+	});
+}
+
+/**
+ * Lists the variable names referenced in a string. Used by the dependency
+ * graph (Phase 5).
+ */
+export function referencedVariables(template: string): string[] {
+	if (!template) return [];
+	const out = new Set<string>();
+	let match: RegExpExecArray | null;
+	const re = new RegExp(VARIABLE_REF.source, 'g');
+	// eslint-disable-next-line no-cond-assign
+	while ((match = re.exec(template)) !== null) {
+		out.add(match[1]);
+	}
+	return Array.from(out);
+}

frontend/src/container/DashboardContainerV2/GridCardLayoutV2/PanelV2.tsx

@@ -0,0 +1,97 @@
+import { useMemo } from 'react';
+import { Tag, Tooltip } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import { EllipsisVertical } from '@signozhq/icons';
+import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
+
+interface Props {
+	panel: DashboardtypesPanelDTO | undefined;
+	panelId: string;
+}
+
+function PanelV2({ panel, panelId }: Props): JSX.Element {
+	const name = panel?.spec?.display?.name || `Panel ${panelId.slice(0, 6)}`;
+	const description = panel?.spec?.display?.description;
+	const kind = panel?.spec?.plugin?.kind?.replace(/^signoz\//, '') ?? 'unknown';
+	const queryCount = panel?.spec?.queries?.length ?? 0;
+
+	const headerTitle = useMemo(() => {
+		if (!description) return name;
+		return (
+			<Tooltip title={description}>
+				<span>{name}</span>
+			</Tooltip>
+		);
+	}, [name, description]);
+
+	return (
+		<div
+			style={{
+				display: 'flex',
+				flexDirection: 'column',
+				height: '100%',
+				width: '100%',
+				background: 'var(--bg-ink-400, #0b0c0e)',
+				border: '1px solid var(--bg-slate-400, #1d212d)',
+				borderRadius: 4,
+				overflow: 'hidden',
+			}}
+		>
+			<div
+				className="drag-handle"
+				style={{
+					display: 'flex',
+					alignItems: 'center',
+					justifyContent: 'space-between',
+					padding: '8px 12px',
+					borderBottom: '1px solid var(--bg-slate-400, #1d212d)',
+					cursor: 'grab',
+				}}
+			>
+				<div
+					style={{
+						display: 'flex',
+						alignItems: 'center',
+						gap: 8,
+						minWidth: 0,
+					}}
+				>
+					<Typography.Text
+						style={{
+							margin: 0,
+							whiteSpace: 'nowrap',
+							overflow: 'hidden',
+							textOverflow: 'ellipsis',
+						}}
+					>
+						{headerTitle}
+					</Typography.Text>
+					<Tag style={{ marginInlineEnd: 0 }}>{kind}</Tag>
+				</div>
+				<EllipsisVertical size={14} />
+			</div>
+
+			<div
+				style={{
+					flex: 1,
+					display: 'flex',
+					alignItems: 'center',
+					justifyContent: 'center',
+					padding: 12,
+					color: 'var(--bg-vanilla-400, #8993ae)',
+					fontSize: 12,
+					textAlign: 'center',
+				}}
+			>
+				<div>
+					<div style={{ marginBottom: 6 }}>{kind} panel</div>
+					<div>
+						{queryCount} {queryCount === 1 ? 'query' : 'queries'} · chart rendering coming next
+					</div>
+				</div>
+			</div>
+		</div>
+	);
+}
+
+export default PanelV2;

frontend/src/container/DashboardContainerV2/GridCardLayoutV2/Section.tsx

@@ -0,0 +1,95 @@
+import { useMemo, useState } from 'react';
+import GridLayout, { WidthProvider, type Layout } from 'react-grid-layout';
+import { Button } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import { ChevronDown, ChevronRight } from '@signozhq/icons';
+
+import type { DashboardSectionV2 } from '../utils';
+import PanelV2 from './PanelV2';
+
+const ResponsiveGridLayout = WidthProvider(GridLayout);
+
+interface Props {
+	section: DashboardSectionV2;
+}
+
+function SectionGrid({ items }: { items: DashboardSectionV2['items'] }): JSX.Element {
+	const rglLayout = useMemo<Layout[]>(
+		() =>
+			items.map((item) => ({
+				i: item.id,
+				x: item.x,
+				y: item.y,
+				w: item.width,
+				h: item.height,
+			})),
+		[items],
+	);
+
+	return (
+		<ResponsiveGridLayout
+			cols={12}
+			rowHeight={45}
+			autoSize
+			useCSSTransforms
+			layout={rglLayout}
+			draggableHandle=".drag-handle"
+			isDraggable={false}
+			isResizable={false}
+			margin={[8, 8]}
+		>
+			{items.map((item) => (
+				<div key={item.id}>
+					<PanelV2 panel={item.panel} panelId={item.id} />
+				</div>
+			))}
+		</ResponsiveGridLayout>
+	);
+}
+
+function Section({ section }: Props): JSX.Element {
+	// Local toggle override — initial state from layout spec; user can
+	// expand/collapse without persisting.
+	const [open, setOpen] = useState<boolean>(section.open);
+
+	if (!section.title) {
+		// Untitled section — render just the grid (no header chrome).
+		return <SectionGrid items={section.items} />;
+	}
+
+	return (
+		<div
+			style={{
+				marginBottom: 12,
+				border: '1px solid var(--bg-slate-500)',
+				borderRadius: 4,
+			}}
+			data-testid={`dashboard-section-${section.id}`}
+		>
+			<Button
+				type="text"
+				onClick={(): void => setOpen((v) => !v)}
+				icon={open ? <ChevronDown size={14} /> : <ChevronRight size={14} />}
+				style={{
+					width: '100%',
+					justifyContent: 'flex-start',
+					padding: '8px 12px',
+					borderBottom: open ? '1px solid var(--bg-slate-500)' : 'none',
+				}}
+				data-testid={`dashboard-section-toggle-${section.id}`}
+			>
+				<Typography.Text style={{ marginLeft: 4 }}>
+					{section.title}
+				</Typography.Text>
+				{section.repeatVariable ? (
+					<Typography.Text style={{ marginLeft: 8, opacity: 0.6 }}>
+						(repeats per ${section.repeatVariable})
+					</Typography.Text>
+				) : null}
+			</Button>
+			{open ? <SectionGrid items={section.items} /> : null}
+		</div>
+	);
+}
+
+export default Section;

frontend/src/container/DashboardContainerV2/GridCardLayoutV2/index.tsx

@@ -0,0 +1,51 @@
+import { useMemo } from 'react';
+
+import { Empty } from 'antd';
+import { Typography } from '@signozhq/ui/typography';
+import type {
+	DashboardtypesLayoutDTO,
+	DashboardtypesPanelDTO,
+} from 'api/generated/services/sigNoz.schemas';
+
+import { layoutsToSections } from '../utils';
+import Section from './Section';
+
+import 'react-grid-layout/css/styles.css';
+import 'react-resizable/css/styles.css';
+
+interface Props {
+	layouts: DashboardtypesLayoutDTO[] | undefined | null;
+	panels: Record<string, DashboardtypesPanelDTO | undefined> | undefined;
+}
+
+function GridCardLayoutV2({ layouts, panels }: Props): JSX.Element {
+	const sections = useMemo(() => layoutsToSections(layouts, panels), [
+		layouts,
+		panels,
+	]);
+
+	const isEmpty = sections.length === 0 || sections.every((s) => s.items.length === 0);
+
+	if (isEmpty) {
+		return (
+			<div style={{ padding: 48, textAlign: 'center' }}>
+				<Empty
+					image={Empty.PRESENTED_IMAGE_SIMPLE}
+					description={
+						<Typography.Text>No panels in this dashboard yet</Typography.Text>
+					}
+				/>
+			</div>
+		);
+	}
+
+	return (
+		<>
+			{sections.map((section) => (
+				<Section key={section.id} section={section} />
+			))}
+		</>
+	);
+}
+
+export default GridCardLayoutV2;

frontend/src/container/DashboardContainerV2/components/DashboardHeader/DashboardBreadcrumbs.styles.scss

@@ -0,0 +1,63 @@
+.dashboard-breadcrumbs {
+	width: 100%;
+	height: 48px;
+	display: flex;
+	gap: 6px;
+	align-items: center;
+	max-width: 80%;
+
+	.dashboard-btn {
+		display: flex;
+		align-items: center;
+		color: var(--l2-foreground);
+		font-family: Inter;
+		font-size: 14px;
+		font-style: normal;
+		font-weight: 400;
+		line-height: 20px; /* 142.857% */
+		letter-spacing: -0.07px;
+		padding: 0px;
+		height: 20px;
+	}
+
+	.dashboard-btn:hover {
+		background-color: unset;
+	}
+
+	.id-btn {
+		display: flex;
+		align-items: center;
+		gap: 4px;
+		padding: 0px 2px;
+		border-radius: 2px;
+		background: color-mix(in srgb, var(--bg-robin-400) 10%, transparent);
+		color: var(--bg-robin-400);
+		font-family: Inter;
+		font-size: 14px;
+		font-style: normal;
+		font-weight: 400;
+		line-height: 20px; /* 142.857% */
+		height: 20px;
+
+		max-width: calc(100% - 120px);
+
+		span {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+		}
+
+		.ant-btn-icon {
+			margin-inline-end: 4px;
+		}
+	}
+	.id-btn:hover {
+		background: color-mix(in srgb, var(--bg-robin-400) 10%, transparent);
+		color: var(--bg-robin-300);
+	}
+
+	.dashboard-icon-image {
+		height: 14px;
+		width: 14px;
+	}
+}

frontend/src/container/DashboardContainerV2/components/DashboardHeader/DashboardBreadcrumbs.tsx

@@ -0,0 +1,58 @@
+import { useCallback } from 'react';
+import { Button } from 'antd';
+import getSessionStorageApi from 'api/browser/sessionstorage/get';
+import ROUTES from 'constants/routes';
+import { DASHBOARDS_LIST_QUERY_PARAMS_STORAGE_KEY } from 'hooks/dashboard/useDashboardsListQueryParams';
+import { useSafeNavigate } from 'hooks/useSafeNavigate';
+import { LayoutGrid } from '@signozhq/icons';
+
+import { Base64Icons } from '../../../DashboardContainer/DashboardSettings/General/utils';
+
+import './DashboardBreadcrumbs.styles.scss';
+
+interface Props {
+	title: string;
+	image?: string;
+}
+
+function DashboardBreadcrumbs({ title, image }: Props): JSX.Element {
+	const { safeNavigate } = useSafeNavigate();
+
+	const goToListPage = useCallback(() => {
+		const dashboardsListQueryParamsString = getSessionStorageApi(
+			DASHBOARDS_LIST_QUERY_PARAMS_STORAGE_KEY,
+		);
+
+		if (dashboardsListQueryParamsString) {
+			safeNavigate({
+				pathname: ROUTES.ALL_DASHBOARD,
+				search: `?${dashboardsListQueryParamsString}`,
+			});
+		} else {
+			safeNavigate(ROUTES.ALL_DASHBOARD);
+		}
+	}, [safeNavigate]);
+
+	return (
+		<div className="dashboard-breadcrumbs">
+			<Button
+				type="text"
+				icon={<LayoutGrid size={14} />}
+				className="dashboard-btn"
+				onClick={goToListPage}
+			>
+				Dashboard /
+			</Button>
+			<Button type="text" className="id-btn dashboard-name-btn">
+				<img
+					src={image || Base64Icons[0]}
+					alt="dashboard-icon"
+					className="dashboard-icon-image"
+				/>
+				{title}
+			</Button>
+		</div>
+	);
+}
+
+export default DashboardBreadcrumbs;

frontend/src/container/DashboardContainerV2/components/DashboardHeader/DashboardHeader.styles.scss

@@ -0,0 +1,9 @@
+.dashboard-header {
+	border-bottom: 1px solid var(--l1-border);
+	display: flex;
+	justify-content: space-between;
+	gap: 16px;
+	align-items: center;
+	padding: 0 8px;
+	box-sizing: border-box;
+}

frontend/src/container/DashboardContainerV2/components/DashboardHeader/DashboardHeader.tsx

@@ -0,0 +1,22 @@
+import { memo } from 'react';
+import HeaderRightSection from 'components/HeaderRightSection/HeaderRightSection';
+
+import DashboardBreadcrumbs from './DashboardBreadcrumbs';
+
+import './DashboardHeader.styles.scss';
+
+interface Props {
+	title: string;
+	image?: string;
+}
+
+function DashboardHeader({ title, image }: Props): JSX.Element {
+	return (
+		<div className="dashboard-header">
+			<DashboardBreadcrumbs title={title} image={image} />
+			<HeaderRightSection enableAnnouncements={false} enableShare enableFeedback />
+		</div>
+	);
+}
+
+export default memo(DashboardHeader);

frontend/src/container/DashboardContainerV2/index.tsx

@@ -0,0 +1,35 @@
+import { FullScreen, useFullScreenHandle } from 'react-full-screen';
+
+import DashboardDescriptionV2 from './DashboardDescriptionV2';
+import GridCardLayoutV2 from './GridCardLayoutV2';
+import type { V2Dashboard } from './utils';
+
+interface Props {
+	dashboard: V2Dashboard | undefined;
+	onRefetch: () => void;
+}
+
+function DashboardContainerV2({ dashboard, onRefetch }: Props): JSX.Element {
+	const fullScreenHandle = useFullScreenHandle();
+	const spec = dashboard?.data?.spec;
+
+	return (
+		<FullScreen handle={fullScreenHandle}>
+			<div style={{ display: 'flex', flexDirection: 'column', height: '100%' }}>
+				<DashboardDescriptionV2
+					dashboard={dashboard}
+					handle={fullScreenHandle}
+					onRefetch={onRefetch}
+				/>
+				<div style={{ flex: 1, padding: '12px 24px', overflow: 'auto' }}>
+					<GridCardLayoutV2
+						layouts={spec?.layouts}
+						panels={spec?.panels ?? undefined}
+					/>
+				</div>
+			</div>
+		</FullScreen>
+	);
+}
+
+export default DashboardContainerV2;

frontend/src/container/DashboardContainerV2/utils.ts

@@ -0,0 +1,111 @@
+import type {
+	DashboardtypesGettableDashboardV2DTO,
+	DashboardtypesLayoutDTO,
+	DashboardtypesPanelDTO,
+} from 'api/generated/services/sigNoz.schemas';
+
+export type V2Dashboard = DashboardtypesGettableDashboardV2DTO;
+
+export interface GridItemV2 {
+	id: string;
+	x: number;
+	y: number;
+	width: number;
+	height: number;
+	panel: DashboardtypesPanelDTO | undefined;
+}
+
+const PANEL_REF_PREFIX = '#/spec/panels/';
+
+export function extractPanelIdFromRef(ref: string | undefined): string | null {
+	if (!ref) return null;
+	if (!ref.startsWith(PANEL_REF_PREFIX)) return null;
+	return ref.slice(PANEL_REF_PREFIX.length);
+}
+
+export function flattenGridLayout(
+	layouts: DashboardtypesLayoutDTO[] | undefined | null,
+	panels: Record<string, DashboardtypesPanelDTO | undefined> | undefined,
+): GridItemV2[] {
+	if (!layouts?.length) return [];
+
+	const items: GridItemV2[] = [];
+	layouts.forEach((layoutEnvelope) => {
+		if (layoutEnvelope?.kind !== 'Grid') return;
+		const gridItems = layoutEnvelope.spec?.items ?? [];
+		gridItems.forEach((item) => {
+			const id = extractPanelIdFromRef(item.content?.$ref);
+			if (!id) return;
+			items.push({
+				id,
+				x: item.x ?? 0,
+				y: item.y ?? 0,
+				width: item.width ?? 6,
+				height: item.height ?? 6,
+				panel: panels?.[id],
+			});
+		});
+	});
+
+	return items;
+}
+
+/**
+ * A section corresponds to one entry in `spec.layouts`. If the Grid has a
+ * `display.title`, it renders with a collapsible header; otherwise it is a
+ * "default" untitled section (visually just the grid).
+ */
+export interface DashboardSectionV2 {
+	id: string;
+	title: string | undefined;
+	open: boolean;
+	items: GridItemV2[];
+	repeatVariable: string | undefined;
+}
+
+export function layoutsToSections(
+	layouts: DashboardtypesLayoutDTO[] | undefined | null,
+	panels: Record<string, DashboardtypesPanelDTO | undefined> | undefined,
+): DashboardSectionV2[] {
+	if (!layouts?.length) return [];
+
+	return layouts
+		.map((layoutEnvelope, idx) => {
+			if (layoutEnvelope?.kind !== 'Grid') return null;
+			const spec = layoutEnvelope.spec;
+			const items: GridItemV2[] = (spec?.items ?? [])
+				.map((item) => {
+					const id = extractPanelIdFromRef(item.content?.$ref);
+					if (!id) return null;
+					return {
+						id,
+						x: item.x ?? 0,
+						y: item.y ?? 0,
+						width: item.width ?? 6,
+						height: item.height ?? 6,
+						panel: panels?.[id],
+					};
+				})
+				.filter((it): it is GridItemV2 => it !== null);
+
+			const title = spec?.display?.title;
+			// `open` defaults to true when no collapse field is set (the section
+			// is expanded by default).
+			const open = spec?.display?.collapse?.open !== false;
+
+			return {
+				id: `section-${idx}`,
+				title,
+				open,
+				items,
+				repeatVariable: spec?.repeatVariable,
+			};
+		})
+		.filter((s): s is DashboardSectionV2 => s !== null);
+}
+
+export function getPanelKindLabel(panel: DashboardtypesPanelDTO | undefined): string {
+	const kind = panel?.spec?.plugin?.kind;
+	if (!kind) return 'unknown';
+	return kind.replace(/^signoz\//, '');
+}

frontend/src/container/Download/Download.tsx

@@ -1,7 +1,6 @@
 import { useState } from 'react';
 import { CloudDownload } from '@signozhq/icons';
-import { DropdownMenuSimple, type MenuProps } from '@signozhq/ui/dropdown-menu';
-import { Button, Flex } from 'antd';
+import { Button, Dropdown, MenuProps, Flex } from 'antd';
 import { unparse } from 'papaparse';
 
 import { DownloadProps } from './Download.types';
@@ -68,7 +67,7 @@ function Download({ data, isLoading, fileName }: DownloadProps): JSX.Element {
 	};
 
 	return (
-		<DropdownMenuSimple menu={menu}>
+		<Dropdown menu={menu} trigger={['click']}>
 			<Button
 				className="download-button"
 				loading={isLoading || isDownloading}
@@ -80,7 +79,7 @@ function Download({ data, isLoading, fileName }: DownloadProps): JSX.Element {
 					Download
 				</Flex>
 			</Button>
-		</DropdownMenuSimple>
+		</Dropdown>
 	);
 }
 

frontend/src/container/GeneralSettings/styles.ts

@@ -1,4 +1,8 @@
-import { Col, Input as InputComponent } from 'antd';
+import {
+	Col,
+	Dropdown as DropDownComponent,
+	Input as InputComponent,
+} from 'antd';
 import { Typography as TypographyComponent } from '@signozhq/ui/typography';
 import styled from 'styled-components';
 
@@ -30,6 +34,16 @@ export const ButtonContainer = styled.div`
 	}
 `;
 
+export const Dropdown = styled(DropDownComponent)`
+	&&& {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		max-width: 150px;
+		min-width: 150px;
+	}
+`;
+
 export const TextContainer = styled.div`
 	&&& {
 		min-width: 100px;

frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.test.tsx

@@ -1,7 +1,6 @@
 // eslint-disable-next-line no-restricted-imports
 import { Provider } from 'react-redux';
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { fireEvent, render, screen } from '@testing-library/react';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import ROUTES from 'constants/routes';
 import { AppProvider } from 'providers/App/App';
@@ -177,7 +176,6 @@ jest.mock('providers/Dashboard/store/useDashboardStore', () => ({
 
 describe('WidgetGraphComponent', () => {
 	it('should show correct menu items when hovering over more options while loading', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
 		const { getByTestId, findByRole, getByText, container } = render(
 			<MockQueryClientProvider>
 				<ErrorModalProvider>
@@ -210,7 +208,7 @@ describe('WidgetGraphComponent', () => {
 		expect(skeleton).toBeInTheDocument();
 
 		const moreOptionsButton = getByTestId('widget-header-options');
-		await user.click(moreOptionsButton);
+		fireEvent.mouseEnter(moreOptionsButton);
 
 		const menu = await findByRole('menu');
 		expect(menu).toBeInTheDocument();

frontend/src/container/GridCardLayout/WidgetHeader/WidgetHeader.styles.scss

@@ -54,17 +54,6 @@
 	visibility: visible;
 }
 
-// currently the width of the dropdown menu is set to 100% of the parent container,
-// which is not desired. This is a workaround to unset that width and allow the dropdown menu to size based on its content.
-// This is necessary because the dropdown menu can contain items with varying widths, and setting it to 100% can cause layout issues and make the menu look unbalanced.
-// we should idealy fix this in the dropdown menu component itself, but for now this is a quick fix to ensure the dropdown menu looks correct in the widget header.
-
-[data-radix-popper-content-wrapper]
-	[data-slot='dropdown-menu-content'].widget-header-dropdown
-	[data-slot='dropdown-menu-item'] {
-	width: unset !important;
-}
-
 .widget-api-actions {
 	padding-right: 0.25rem;
 }

frontend/src/container/GridCardLayout/WidgetHeader/__tests__/WidgetHeader.test.tsx

@@ -467,7 +467,6 @@ describe('WidgetHeader', () => {
 
 	describe('Create Alerts Menu Item', () => {
 		it('renders Create Alerts menu item with external link icon when included in headerMenuList', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
 			render(
 				<WidgetHeader
 					title={TEST_WIDGET_TITLE}
@@ -484,7 +483,7 @@ describe('WidgetHeader', () => {
 
 			const moreOptionsIcon = await screen.findByTestId(WIDGET_HEADER_OPTIONS_ID);
 			expect(moreOptionsIcon).toBeInTheDocument();
-			await user.click(moreOptionsIcon);
+			await userEvent.hover(moreOptionsIcon);
 
 			await screen.findByText(CREATE_ALERTS_TEXT);
 
@@ -495,7 +494,6 @@ describe('WidgetHeader', () => {
 		});
 
 		it('Create Alerts menu item is enabled and clickable', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
 			const mockCreateAlertsHandler = jest.fn();
 			const useCreateAlerts = jest.requireMock(
 				'hooks/queryBuilder/useCreateAlerts',
@@ -519,12 +517,12 @@ describe('WidgetHeader', () => {
 			expect(useCreateAlerts).toHaveBeenCalledWith(mockWidget, 'dashboardView');
 
 			const moreOptionsIcon = await screen.findByTestId(WIDGET_HEADER_OPTIONS_ID);
-			await user.click(moreOptionsIcon);
+			await userEvent.hover(moreOptionsIcon);
 
 			const createAlertsMenuItem = await screen.findByText(CREATE_ALERTS_TEXT);
 
 			// Verify the menu item is clickable by actually clicking it
-			await user.click(createAlertsMenuItem);
+			await userEvent.click(createAlertsMenuItem);
 			expect(mockCreateAlertsHandler).toHaveBeenCalledTimes(1);
 		});
 	});

frontend/src/container/GridCardLayout/WidgetHeader/index.tsx

@@ -15,8 +15,7 @@ import {
 	X,
 } from '@signozhq/icons';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Input, Tooltip } from 'antd';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
+import { Button, Dropdown, Input, MenuProps, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import ErrorContent from 'components/ErrorModal/components/ErrorContent';
 import ErrorPopover from 'components/ErrorPopover/ErrorPopover';
@@ -129,7 +128,7 @@ function WidgetHeader({
 		],
 	);
 
-	const onMenuItemSelectHandler = useCallback(
+	const onMenuItemSelectHandler: MenuProps['onClick'] = useCallback(
 		({ key }: { key: string }): void => {
 			if (isTWidgetOptions(key)) {
 				const functionToCall = keyMethodMapping[key];
@@ -189,8 +188,18 @@ function WidgetHeader({
 			{
 				key: MenuItemKeys.CreateAlerts,
 				icon: <Bell size="md" />,
-				label: MENUITEM_KEYS_VS_LABELS[MenuItemKeys.CreateAlerts],
-				rightIcon: <SquareArrowOutUpRight size="lg" />,
+				label: (
+					<span
+						style={{
+							display: 'flex',
+							alignItems: 'baseline',
+							justifyContent: 'space-between',
+						}}
+					>
+						{MENUITEM_KEYS_VS_LABELS[MenuItemKeys.CreateAlerts]}
+						<SquareArrowOutUpRight size={10} />
+					</span>
+				),
 				isVisible: headerMenuList?.includes(MenuItemKeys.CreateAlerts) || false,
 				disabled: false,
 			},
@@ -212,10 +221,8 @@ function WidgetHeader({
 
 	const menu = useMemo(
 		() => ({
-			items: updatedMenuList.map((item) => ({
-				...item,
-				onClick: onMenuItemSelectHandler,
-			})),
+			items: updatedMenuList,
+			onClick: onMenuItemSelectHandler,
 		}),
 		[updatedMenuList, onMenuItemSelectHandler],
 	);
@@ -314,12 +321,7 @@ function WidgetHeader({
 							/>
 						)}
 						{menu && Array.isArray(menu.items) && menu.items.length > 0 && (
-							<DropdownMenuSimple
-								menu={menu}
-								side="bottom"
-								align="end"
-								className="widget-header-dropdown"
-							>
+							<Dropdown menu={menu} trigger={['hover']} placement="bottomRight">
 								<Button
 									data-testid="widget-header-options"
 									className={`widget-header-more-options ${
@@ -327,7 +329,7 @@ function WidgetHeader({
 									}`}
 									icon={<EllipsisVertical size="md" />}
 								/>
-							</DropdownMenuSimple>
+							</Dropdown>
 						)}
 					</div>
 				</>

frontend/src/container/GridCardLayout/WidgetHeader/types.ts

@@ -6,7 +6,6 @@ export interface MenuItem {
 	key: MenuItemKeys;
 	icon: ReactNode;
 	label: ReactNode;
-	rightIcon?: ReactNode;
 	isVisible: boolean;
 	disabled: boolean;
 	danger?: boolean;

frontend/src/container/GridCardLayout/WidgetHeader/utils.ts

@@ -1,9 +1,9 @@
-import type { MenuItem as DropdownMenuItem } from '@signozhq/ui/dropdown-menu';
+import type { MenuItemType } from 'antd/es/menu/hooks/useItems';
 
 import { MenuItemKeys } from './contants';
 import { MenuItem } from './types';
 
-export const generateMenuList = (actions: MenuItem[]): DropdownMenuItem[] =>
+export const generateMenuList = (actions: MenuItem[]): MenuItemType[] =>
 	actions
 		.filter((action: MenuItem) => action.isVisible)
 		.map(({ key, icon: Icon, label, disabled, ...rest }) => ({

frontend/src/container/Home/StepsProgress/StepsProgress.styles.scss

@@ -39,7 +39,5 @@
 
 	width: 100% !important;
 
-	.ant-progress-steps-outer {
-		width: 100% !important;
-	}
+	--progress-width: 100%;
 }

frontend/src/container/Home/StepsProgress/StepsProgress.tsx

@@ -1,4 +1,4 @@
-import { Progress } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 
 import { ChecklistItem } from '../HomeChecklist/HomeChecklist';
 
@@ -15,9 +15,7 @@ function StepsProgress({
 
 	const totalChecklistItems = checklistItems.length;
 
-	const progress = Math.round(
-		(completedChecklistItems.length / totalChecklistItems) * 100,
-	);
+	const progress = (completedChecklistItems.length / totalChecklistItems) * 100;
 
 	return (
 		<div className="steps-progress-container">

frontend/src/container/InfraMonitoringHosts/constants.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Tag } from 'antd';
+import { Tag } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	getHostLists,
@@ -79,8 +80,8 @@ export const hostDetailsMetadataConfig: K8sDetailsMetadataConfig<HostData>[] = [
 		render: (value): React.ReactNode => (
 			<Progress
 				percent={Number(Number(value).toFixed(1))}
-				size="small"
 				strokeColor={getProgressColor(Number(value))}
+				showInfo
 			/>
 		),
 	},
@@ -90,8 +91,8 @@ export const hostDetailsMetadataConfig: K8sDetailsMetadataConfig<HostData>[] = [
 		render: (value): React.ReactNode => (
 			<Progress
 				percent={Number(Number(value).toFixed(1))}
-				size="small"
 				strokeColor={getMemoryProgressColor(Number(value))}
+				showInfo
 			/>
 		),
 	},

frontend/src/container/InfraMonitoringHosts/table.module.scss

@@ -60,11 +60,6 @@
 	& > div {
 		width: 100%;
 	}
-
-	:global(.ant-progress-bg) {
-		height: 8px !important;
-		border-radius: 4px;
-	}
 }
 
 .progressBar {

frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/entityDetails.styles.scss

@@ -103,12 +103,8 @@
 			.progress-container {
 				width: 158px;
 
-				.ant-progress {
-					margin: 0;
-
-					.ant-progress-text {
-						font-weight: 600;
-					}
+				span {
+					font-weight: 600;
 				}
 			}
 
@@ -292,10 +288,6 @@
 			}
 
 			.progress-container {
-				.ant-progress-bg {
-					height: 8px !important;
-					border-radius: 4px;
-				}
 			}
 
 			.ant-table-tbody > tr:hover > td {

frontend/src/container/InfraMonitoringK8s/components/EntityProgressBar.tsx

@@ -1,4 +1,4 @@
-import { Progress } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import TanStackTable from 'components/TanStackTableView';
 import {
 	getMemoryProgressColor,
@@ -53,7 +53,6 @@ export function EntityProgressBar({
 			<Progress
 				percent={percentage}
 				strokeLinecap="butt"
-				size="small"
 				status="normal"
 				strokeColor={getStrokeColor(type, value)}
 				className={styles.progressBar}

frontend/src/container/ListAlertRules/ListAlert.tsx

@@ -3,8 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { UseQueryResult } from 'react-query';
 import { Button, Flex, Input } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
-import { Ellipsis, Plus } from '@signozhq/icons';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
+import { Plus } from '@signozhq/icons';
 import type { ColumnsType } from 'antd/es/table/interface';
 import logEvent from 'api/common/logEvent';
 import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
@@ -16,6 +15,7 @@ import type {
 } 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,
@@ -323,67 +323,55 @@ function ListAlert({ allAlertRules, refetch }: ListAlertProps): JSX.Element {
 			dataIndex: 'id',
 			key: 'action',
 			width: 10,
-			render: (id: RuletypesRuleDTO['id'], record): JSX.Element => {
-				const actionItems = [
-					<ToggleAlertState
-						key="1"
-						disabled={record.disabled ?? false}
-						setData={setData}
-						id={id ?? ''}
-					/>,
-					<ColumnButton
-						key="2"
-						onClick={(e: React.MouseEvent): void =>
-							onEditHandler(record, { newTab: isModifierKeyPressed(e) })
+			render: (id: RuletypesRuleDTO['id'], record): JSX.Element => (
+				<div data-testid="alert-actions">
+					<DropDown
+						onDropDownItemClick={(item): void =>
+							alertActionLogEvent(item.key, record)
 						}
-						type="link"
-						loading={editLoader}
-					>
-						Edit
-					</ColumnButton>,
-					<ColumnButton
-						key="3-new-tab"
-						onClick={(): void => onEditHandler(record, { newTab: true })}
-						type="link"
-						loading={editLoader}
-					>
-						Edit in New Tab
-					</ColumnButton>,
-					<ColumnButton
-						key="3-clone"
-						onClick={onCloneHandler(record)}
-						type="link"
-						loading={cloneLoader}
-					>
-						Clone
-					</ColumnButton>,
-					<DeleteAlert
-						key="4"
-						notifications={notificationsApi}
-						setData={setData}
-						id={id ?? ''}
-					/>,
-				];
-				return (
-					<div data-testid="alert-actions">
-						<DropdownMenuSimple
-							menu={{
-								items: actionItems.map((element, index) => ({
-									key: String(index),
-									label: element,
-									onClick: ({ key }): void => alertActionLogEvent(key, record),
-								})),
-							}}
-						>
-							<Button
+						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"
-								style={{ color: 'var(--l1-foreground)' }}
-								icon={<Ellipsis size={16} />}
-							/>
-						</DropdownMenuSimple>
-					</div>
-				);
-			},
+								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>
+			),
 		});
 	}
 

frontend/src/container/ListOfDashboard/DashboardsList.tsx

@@ -12,11 +12,12 @@ import { useTranslation } from 'react-i18next';
 import { generatePath } from 'react-router-dom';
 import { useCopyToClipboard } from 'react-use';
 import { Color } from '@signozhq/design-tokens';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
 import {
 	Button,
+	Dropdown,
 	Flex,
 	Input,
+	MenuProps,
 	Modal,
 	Popover,
 	Skeleton,
@@ -552,7 +553,7 @@ function DashboardsList(): JSX.Element {
 	];
 
 	const getCreateDashboardItems = useMemo(() => {
-		const menuItems: MenuItem[] = [
+		const menuItems: MenuProps['items'] = [
 			{
 				label: (
 					<div
@@ -710,11 +711,11 @@ function DashboardsList(): JSX.Element {
 
 						{createNewDashboard && (
 							<section className="actions">
-								<DropdownMenuSimple
-									className="new-dashboard-menu"
+								<Dropdown
+									overlayClassName="new-dashboard-menu"
 									menu={{ items: getCreateDashboardItems }}
-									side="bottom"
-									align="end"
+									placement="bottomRight"
+									trigger={['click']}
 								>
 									<Button
 										type="text"
@@ -726,7 +727,7 @@ function DashboardsList(): JSX.Element {
 									>
 										New Dashboard
 									</Button>
-								</DropdownMenuSimple>
+								</Dropdown>
 								<Button
 									type="text"
 									className="learn-more"
@@ -755,11 +756,11 @@ function DashboardsList(): JSX.Element {
 								onChange={handleSearch}
 							/>
 							{createNewDashboard && (
-								<DropdownMenuSimple
-									className="new-dashboard-menu"
+								<Dropdown
+									overlayClassName="new-dashboard-menu"
 									menu={{ items: getCreateDashboardItems }}
-									side="bottom"
-									align="end"
+									placement="bottomRight"
+									trigger={['click']}
 								>
 									<Button
 										type="primary"
@@ -772,7 +773,7 @@ function DashboardsList(): JSX.Element {
 									>
 										New dashboard
 									</Button>
-								</DropdownMenuSimple>
+								</Dropdown>
 							)}
 						</div>
 

frontend/src/container/LogDetailedView/BodyTitleRenderer.tsx

@@ -2,13 +2,7 @@ import { useCallback } from 'react';
 import { useCopyToClipboard } from 'react-use';
 import { orange } from '@ant-design/colors';
 import { Settings } from '@signozhq/icons';
-import {
-	type BaseMenuItem,
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuItem,
-	DropdownMenuTrigger,
-} from '@signozhq/ui/dropdown-menu';
+import { Dropdown, MenuProps } from 'antd';
 import {
 	negateOperator,
 	OPERATORS,
@@ -141,38 +135,41 @@ function BodyTitleRenderer({
 		viewName,
 	]);
 
-	const onClickHandler = (key: string): void => {
+	const onClickHandler: MenuProps['onClick'] = (props): void => {
 		const mapper = {
 			[DROPDOWN_KEY.FILTER_IN]: filterHandler(true),
 			[DROPDOWN_KEY.FILTER_OUT]: filterHandler(false),
 			[DROPDOWN_KEY.GROUP_BY]: groupByHandler,
 		};
 
-		const handler = mapper[key];
+		const handler = mapper[props.key];
 
 		if (handler) {
 			handler();
 		}
 	};
 
-	const menuItems: BaseMenuItem[] = [
-		{
-			key: DROPDOWN_KEY.FILTER_IN,
-			label: `Filter for ${value}`,
-		},
-		{
-			key: DROPDOWN_KEY.FILTER_OUT,
-			label: `Filter out ${value}`,
-		},
-		...(isGroupBySupported
-			? [
-					{
-						key: DROPDOWN_KEY.GROUP_BY,
-						label: `Group by ${nodeKey}`,
-					},
-				]
-			: []),
-	];
+	const menu: MenuProps = {
+		items: [
+			{
+				key: DROPDOWN_KEY.FILTER_IN,
+				label: `Filter for ${value}`,
+			},
+			{
+				key: DROPDOWN_KEY.FILTER_OUT,
+				label: `Filter out ${value}`,
+			},
+			...(isGroupBySupported
+				? [
+						{
+							key: DROPDOWN_KEY.GROUP_BY,
+							label: `Group by ${nodeKey}`,
+						},
+					]
+				: []),
+		],
+		onClick: onClickHandler,
+	};
 
 	const handleNodeClick = useCallback(
 		(e: React.MouseEvent): void => {
@@ -221,23 +218,15 @@ function BodyTitleRenderer({
 					}}
 					onMouseDown={(e): void => e.preventDefault()}
 				>
-					<DropdownMenu>
-						<DropdownMenuTrigger asChild>
-							<Settings style={{ marginRight: 8 }} className="hover-reveal" />
-						</DropdownMenuTrigger>
-						<DropdownMenuContent>
-							<div data-log-detail-ignore="true">
-								{menuItems.map((item) => (
-									<DropdownMenuItem
-										key={item.key}
-										onSelect={(): void => onClickHandler(item.key as string)}
-									>
-										{item.label}
-									</DropdownMenuItem>
-								))}
-							</div>
-						</DropdownMenuContent>
-					</DropdownMenu>
+					<Dropdown
+						menu={menu}
+						trigger={['click']}
+						dropdownRender={(originNode): React.ReactNode => (
+							<div data-log-detail-ignore="true">{originNode}</div>
+						)}
+					>
+						<Settings style={{ marginRight: 8 }} className="hover-reveal" />
+					</Dropdown>
 				</span>
 			)}
 			{title.toString()}{' '}

frontend/src/container/MembersSettings/MembersSettings.tsx

@@ -2,8 +2,9 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Check, ChevronDown, Plus } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
-import { DropdownMenuSimple, type MenuItem } from '@signozhq/ui/dropdown-menu';
 import { Input } from '@signozhq/ui/input';
+import type { MenuProps } from 'antd';
+import { Dropdown } from 'antd';
 import { useListUsers } from 'api/generated/services/users';
 import EditMemberDrawer from 'components/EditMemberDrawer/EditMemberDrawer';
 import InviteMembersModal from 'components/InviteMembersModal/InviteMembersModal';
@@ -94,7 +95,7 @@ function MembersSettings(): JSX.Element {
 	).length;
 	const totalCount = allMembers.length;
 
-	const filterMenuItems: MenuItem[] = [
+	const filterMenuItems: MenuProps['items'] = [
 		{
 			key: FilterMode.All,
 			label: (
@@ -170,9 +171,10 @@ function MembersSettings(): JSX.Element {
 				</div>
 
 				<div className="members-settings__controls">
-					<DropdownMenuSimple
+					<Dropdown
 						menu={{ items: filterMenuItems }}
-						className="members-filter-dropdown"
+						trigger={['click']}
+						overlayClassName="members-filter-dropdown"
 					>
 						<Button
 							variant="solid"
@@ -182,7 +184,7 @@ function MembersSettings(): JSX.Element {
 							<span>{filterLabel}</span>
 							<ChevronDown size={12} className="members-filter-trigger__chevron" />
 						</Button>
-					</DropdownMenuSimple>
+					</Dropdown>
 
 					<div className="members-settings__search">
 						<Input

frontend/src/container/MembersSettings/__tests__/MembersSettings.integration.test.tsx

@@ -1,5 +1,4 @@
 import type { TypesUserDTO } from 'api/generated/services/sigNoz.schemas';
-import userEvent from '@testing-library/user-event';
 import { rest, server } from 'mocks-server/server';
 import { fireEvent, render, screen } from 'tests/test-utils';
 
@@ -77,15 +76,14 @@ describe('MembersSettings (integration)', () => {
 	});
 
 	it('filters to pending invites via the filter dropdown', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
 		render(<MembersSettings />);
 
 		await screen.findByText('Alice Smith');
 
-		await user.click(screen.getByRole('button', { name: /all members/i }));
+		fireEvent.click(screen.getByRole('button', { name: /all members/i }));
 
 		const pendingOption = await screen.findByText(/pending invites/i);
-		await user.click(pendingOption);
+		fireEvent.click(pendingOption);
 
 		await screen.findByText('charlie@signoz.io');
 		expect(screen.queryByText('Alice Smith')).not.toBeInTheDocument();

frontend/src/container/MetricsExplorer/MetricDetails/DashboardsAndAlertsPopover.tsx

@@ -1,8 +1,7 @@
 import { useMemo } from 'react';
 import { generatePath } from 'react-router-dom';
 import { Color } from '@signozhq/design-tokens';
-import { DropdownMenuSimple } from '@signozhq/ui/dropdown-menu';
-import { Skeleton } from 'antd';
+import { Dropdown, Skeleton } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	useGetMetricAlerts,
@@ -127,11 +126,12 @@ function DashboardsAndAlertsPopover({
 	return (
 		<div className="dashboards-and-alerts-popover-container">
 			{dashboardsPopoverContent && (
-				<DropdownMenuSimple
+				<Dropdown
 					menu={{
 						items: dashboardsPopoverContent,
 					}}
-					align="start"
+					placement="bottomLeft"
+					trigger={['click']}
 				>
 					<div
 						className="dashboards-and-alerts-popover dashboards-popover"
@@ -142,14 +142,15 @@ function DashboardsAndAlertsPopover({
 							{pluralize(dashboards.length, 'dashboard')}
 						</Typography.Text>
 					</div>
-				</DropdownMenuSimple>
+				</Dropdown>
 			)}
 			{alertsPopoverContent && (
-				<DropdownMenuSimple
+				<Dropdown
 					menu={{
 						items: alertsPopoverContent,
 					}}
-					align="start"
+					placement="bottomLeft"
+					trigger={['click']}
 				>
 					<div
 						className="dashboards-and-alerts-popover alerts-popover"
@@ -160,7 +161,7 @@ function DashboardsAndAlertsPopover({
 							{pluralize(alerts.length, 'alert rule')}
 						</Typography.Text>
 					</div>
-				</DropdownMenuSimple>
+				</Dropdown>
 			)}
 		</div>
 	);

frontend/src/container/MetricsExplorer/Summary/Summary.styles.scss

@@ -142,13 +142,6 @@
 				}
 			}
 
-			.progress-container {
-				.ant-progress-bg {
-					height: 8px !important;
-					border-radius: 4px;
-				}
-			}
-
 			.ant-table-tbody > tr:hover > td {
 				background: color-mix(in srgb, var(--l1-foreground) 4%, transparent);
 			}

frontend/src/container/NewWidget/LeftContainer/ExplorerColumnsRenderer.tsx

@@ -7,12 +7,7 @@ import {
 	DropResult,
 } from 'react-beautiful-dnd';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Divider, Input, Tooltip } from 'antd';
-import {
-	DropdownMenu,
-	DropdownMenuContent,
-	DropdownMenuTrigger,
-} from '@signozhq/ui/dropdown-menu';
+import { Button, Divider, Dropdown, Input, MenuProps, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { FieldDataType } from 'api/v5/v5';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
@@ -164,12 +159,34 @@ function ExplorerColumnsRenderer({
 		debouncedSetQuerySearchText(e.target.value);
 	};
 
-	const handleOpenChange = (nextOpen: boolean): void => {
-		setOpen(nextOpen);
-		if (nextOpen) {
-			setSearchText('');
-		}
-	};
+	const items: MenuProps['items'] = [
+		{
+			key: 'search',
+			label: (
+				<Input
+					type="text"
+					placeholder="Search"
+					className="explorer-columns-search"
+					value={searchText}
+					onChange={handleSearchChange}
+					prefix={<Search size={16} style={{ padding: '6px' }} />}
+				/>
+			),
+		},
+		{
+			key: 'columns',
+			label: (
+				<ExplorerAttributeColumns
+					isLoading={isLoading}
+					data={data}
+					searchText={searchText}
+					isAttributeKeySelected={isAttributeKeySelected}
+					handleCheckboxChange={handleCheckboxChange}
+					dataSource={initialDataSource}
+				/>
+			),
+		},
+	];
 
 	const removeSelectedLogField = (name: string): void => {
 		if (
@@ -221,6 +238,13 @@ function ExplorerColumnsRenderer({
 		}
 	};
 
+	const toggleDropdown = (): void => {
+		setOpen(!open);
+		if (!open) {
+			setSearchText('');
+		}
+	};
+
 	const isDarkMode = useIsDarkMode();
 
 	return (
@@ -303,38 +327,25 @@ function ExplorerColumnsRenderer({
 						</Droppable>
 					</DragDropContext>
 					<div>
-						<DropdownMenu open={open} onOpenChange={handleOpenChange}>
-							<DropdownMenuTrigger asChild>
-								<Button
-									className="action-btn"
-									data-testid="add-columns-button"
-									icon={
-										<CirclePlus
-											size={16}
-											color={isDarkMode ? Color.BG_INK_400 : Color.BG_VANILLA_100}
-										/>
-									}
-								/>
-							</DropdownMenuTrigger>
-							<DropdownMenuContent side="top" className="explorer-columns-dropdown">
-								<Input
-									type="text"
-									placeholder="Search"
-									className="explorer-columns-search"
-									value={searchText}
-									onChange={handleSearchChange}
-									prefix={<Search size={16} style={{ padding: '6px' }} />}
-								/>
-								<ExplorerAttributeColumns
-									isLoading={isLoading}
-									data={data}
-									searchText={searchText}
-									isAttributeKeySelected={isAttributeKeySelected}
-									handleCheckboxChange={handleCheckboxChange}
-									dataSource={initialDataSource}
-								/>
-							</DropdownMenuContent>
-						</DropdownMenu>
+						<Dropdown
+							menu={{ items }}
+							arrow
+							placement="top"
+							open={open}
+							overlayClassName="explorer-columns-dropdown"
+						>
+							<Button
+								className="action-btn"
+								data-testid="add-columns-button"
+								icon={
+									<CirclePlus
+										size={16}
+										color={isDarkMode ? Color.BG_INK_400 : Color.BG_VANILLA_100}
+									/>
+								}
+								onClick={toggleDropdown}
+							/>
+						</Dropdown>
 					</div>
 				</div>
 			)}

frontend/src/container/NewWidget/LeftContainer/__test__/ExplorerColumnsRenderer.test.tsx

@@ -146,7 +146,6 @@ describe('ExplorerColumnsRenderer', () => {
 	});
 
 	it('opens and closes the dropdown', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
 		render(
 			<Wrapper>
 				<ExplorerColumnsRenderer
@@ -159,12 +158,12 @@ describe('ExplorerColumnsRenderer', () => {
 		);
 
 		const addButton = screen.getByTestId('add-columns-button');
-		await user.click(addButton);
+		await userEvent.click(addButton);
 
 		expect(screen.getByPlaceholderText('Search')).toBeInTheDocument();
 		expect(screen.getByText('attribute1')).toBeInTheDocument();
 
-		await user.click(addButton);
+		await userEvent.click(addButton);
 		await waitFor(() => {
 			expect(screen.queryByRole('menu')).not.toBeInTheDocument();
 		});