Merge remote-tracking branch 'origin/main' into nv/dashboard-ai-builder-query

#### Description

- The flush CTE rendered `last_observed_at` as an untyped literal, which
postgres resolves to `text` and refuses to assign to the `timestamptz`
column. The column never populated, so the idle expiry never applied.
- Build the CTE from the token model with only `id`, `last_observed_at`
and `updated_at`, so bun casts per dialect and no token secrets land in
the statement.
- Flush now applies cached times through `Token.UpdateLastObservedAt`,
which also skips rows with a newer stored value.
- Integration test in `passwordauthn` runs with a short GC interval and
asserts the column populates on both sql stores.

docs/api/openapi.yml

@@ -3321,6 +3321,69 @@ components:
         repeatVariable:
           type: string
       type: object
+    DashboardtypesAIBuilderQuerySpec:
+      properties:
+        aggregations:
+          items:
+            $ref: '#/components/schemas/Querybuildertypesv5TraceAggregation'
+          nullable: true
+          type: array
+        bucketOptions:
+          $ref: '#/components/schemas/Querybuildertypesv5BucketOptions'
+        cursor:
+          type: string
+        disabled:
+          type: boolean
+        filter:
+          $ref: '#/components/schemas/Querybuildertypesv5Filter'
+        functions:
+          items:
+            $ref: '#/components/schemas/Querybuildertypesv5Function'
+          nullable: true
+          type: array
+        groupBy:
+          items:
+            $ref: '#/components/schemas/Querybuildertypesv5GroupByKey'
+          nullable: true
+          type: array
+        having:
+          $ref: '#/components/schemas/Querybuildertypesv5Having'
+        legend:
+          type: string
+        limit:
+          type: integer
+        limitBy:
+          $ref: '#/components/schemas/Querybuildertypesv5LimitBy'
+        name:
+          type: string
+        offset:
+          type: integer
+        order:
+          items:
+            $ref: '#/components/schemas/Querybuildertypesv5OrderBy'
+          nullable: true
+          type: array
+        secondaryAggregations:
+          items:
+            $ref: '#/components/schemas/Querybuildertypesv5SecondaryAggregation'
+          nullable: true
+          type: array
+        selectFields:
+          items:
+            $ref: '#/components/schemas/TelemetrytypesTelemetryFieldKey'
+          nullable: true
+          type: array
+        signal:
+          enum:
+          - traces
+          type: string
+        source:
+          $ref: '#/components/schemas/TelemetrytypesSource'
+        stepInterval:
+          $ref: '#/components/schemas/Querybuildertypesv5Step'
+      required:
+      - signal
+      type: object
     DashboardtypesAreaChartAppearance:
       properties:
         fillMode:
@@ -3379,13 +3442,6 @@ components:
           nullable: true
           type: number
       type: object
-    DashboardtypesAxisScale:
-      enum:
-      - auto
-      - linear
-      - log
-      - symlog
-      type: string
     DashboardtypesBarChartPanelSpec:
       properties:
         axes:
@@ -4049,7 +4105,6 @@ components:
           signoz/ListPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesListPanelSpec'
           signoz/NumberPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesNumberPanelSpec'
           signoz/PieChartPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesPieChartPanelSpec'
-          signoz/ScatterPlotPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesScatterPlotPanelSpec'
           signoz/TablePanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTablePanelSpec'
           signoz/TextPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTextPanelSpec'
           signoz/TimeSeriesPanel: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTimeSeriesPanelSpec'
@@ -4064,7 +4119,6 @@ components:
       - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesHistogramPanelSpec'
       - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesListPanelSpec'
       - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTextPanelSpec'
-      - $ref: '#/components/schemas/DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesScatterPlotPanelSpec'
       type: object
     DashboardtypesPanelPluginKind:
       enum:
@@ -4077,7 +4131,6 @@ components:
       - signoz/HistogramPanel
       - signoz/ListPanel
       - signoz/TextPanel
-      - signoz/ScatterPlotPanel
       type: string
     DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAreaChartPanelSpec:
       properties:
@@ -4151,18 +4204,6 @@ components:
       - kind
       - spec
       type: object
-    DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesScatterPlotPanelSpec:
-      properties:
-        kind:
-          enum:
-          - signoz/ScatterPlotPanel
-          type: string
-        spec:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotPanelSpec'
-      required:
-      - kind
-      - spec
-      type: object
     DashboardtypesPanelPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesTablePanelSpec:
       properties:
         kind:
@@ -4242,16 +4283,6 @@ components:
         visualization:
           $ref: '#/components/schemas/DashboardtypesBasicVisualization'
       type: object
-    DashboardtypesPointDiameter:
-      maximum: 40
-      minimum: 2
-      nullable: true
-      type: integer
-    DashboardtypesPointOpacity:
-      maximum: 1
-      minimum: 0.1
-      nullable: true
-      type: number
     DashboardtypesPostableDashboardV2:
       properties:
         generateName:
@@ -4313,6 +4344,7 @@ components:
     DashboardtypesQueryPlugin:
       discriminator:
         mapping:
+          signoz/AIBuilderQuery: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpec'
           signoz/BuilderQuery: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesBuilderQuerySpec'
           signoz/ClickHouseSQL: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5ClickHouseQuery'
           signoz/CompositeQuery: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5CompositeQuery'
@@ -4322,6 +4354,7 @@ components:
         propertyName: kind
       oneOf:
       - $ref: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesBuilderQuerySpec'
+      - $ref: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpec'
       - $ref: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5CompositeQuery'
       - $ref: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5QueryBuilderFormula'
       - $ref: '#/components/schemas/DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesQuerybuildertypesQuerybuildertypesv5PromQuery'
@@ -4331,12 +4364,25 @@ components:
     DashboardtypesQueryPluginKind:
       enum:
       - signoz/BuilderQuery
+      - signoz/AIBuilderQuery
       - signoz/CompositeQuery
       - signoz/Formula
       - signoz/PromQLQuery
       - signoz/ClickHouseSQL
       - signoz/TraceOperator
       type: string
+    DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesAIBuilderQuerySpec:
+      properties:
+        kind:
+          enum:
+          - signoz/AIBuilderQuery
+          type: string
+        spec:
+          $ref: '#/components/schemas/DashboardtypesAIBuilderQuerySpec'
+      required:
+      - kind
+      - spec
+      type: object
     DashboardtypesQueryPluginVariantGithubComSigNozSignozPkgTypesDashboardtypesBuilderQuerySpec:
       properties:
         kind:
@@ -4425,87 +4471,6 @@ components:
       required:
       - queryValue
       type: object
-    DashboardtypesScatterPlotAxes:
-      properties:
-        x:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotAxis'
-        "y":
-          $ref: '#/components/schemas/DashboardtypesScatterPlotAxis'
-      type: object
-    DashboardtypesScatterPlotAxis:
-      properties:
-        label:
-          description: Axis title. Empty draws none.
-          type: string
-        scale:
-          $ref: '#/components/schemas/DashboardtypesAxisScale'
-        softMax:
-          nullable: true
-          type: number
-        softMin:
-          nullable: true
-          type: number
-      type: object
-    DashboardtypesScatterPlotChartAppearance:
-      properties:
-        points:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotPoints'
-      type: object
-    DashboardtypesScatterPlotDimensions:
-      properties:
-        color:
-          description: Group-by label names (e.g. k8s.namespace.name) whose combined
-            values colour dots and drive the legend. Empty colours by every group-by
-            label.
-          items:
-            type: string
-          nullable: true
-          type: array
-        size:
-          description: Value column key that scales dot size. Empty draws every dot
-            at the default size.
-          type: string
-        x:
-          description: Value column key (queryName, or queryName.expression for a
-            multi-aggregation query) plotted on the x axis. Empty uses the first value
-            column.
-          type: string
-        "y":
-          description: Value column key plotted on the y axis. Empty uses the second
-            value column.
-          type: string
-      type: object
-    DashboardtypesScatterPlotPanelSpec:
-      properties:
-        axes:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotAxes'
-        chartAppearance:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotChartAppearance'
-        dimensions:
-          $ref: '#/components/schemas/DashboardtypesScatterPlotDimensions'
-        formatting:
-          $ref: '#/components/schemas/DashboardtypesTableFormatting'
-        legend:
-          $ref: '#/components/schemas/DashboardtypesLegend'
-        thresholds:
-          items:
-            $ref: '#/components/schemas/DashboardtypesThresholdWithLabel'
-          nullable: true
-          type: array
-        visualization:
-          $ref: '#/components/schemas/DashboardtypesBasicVisualization'
-      type: object
-    DashboardtypesScatterPlotPoints:
-      properties:
-        maxSize:
-          $ref: '#/components/schemas/DashboardtypesPointDiameter'
-        minSize:
-          $ref: '#/components/schemas/DashboardtypesPointDiameter'
-        opacity:
-          $ref: '#/components/schemas/DashboardtypesPointOpacity'
-        size:
-          $ref: '#/components/schemas/DashboardtypesPointDiameter'
-      type: object
     DashboardtypesSource:
       enum:
       - user

frontend/src/constants/localStorage.ts

@@ -47,4 +47,5 @@ export enum LOCALSTORAGE {
 	DASHBOARDS_LIST_VIEWS = 'DASHBOARDS_LIST_VIEWS',
 	DASHBOARD_V2_PANEL_COLUMN_WIDTHS = 'DASHBOARD_V2_PANEL_COLUMN_WIDTHS',
 	LLM_ATTRIBUTE_MAPPING_TEST_SPAN = 'LLM_ATTRIBUTE_MAPPING_TEST_SPAN',
+	SAVED_VIEW_ENABLED = 'SAVED_VIEW_ENABLED',
 }

frontend/src/container/AppLayout/AppLayout.styles.scss

@@ -53,6 +53,10 @@
 		z-index: 0;
 		background: var(--l1-background);
 
+		// Column so the bottom strip sits under the scrolling content, not inside it.
+		display: flex;
+		flex-direction: column;
+
 		&.full-screen-content {
 			width: 100%;
 		}
@@ -70,7 +74,9 @@
 
 .chat-support-gateway {
 	position: fixed;
-	bottom: 20px;
+	// Lifted above the bottom strip. Don't extend this pattern — new fixed-bottom
+	// UI belongs in the bounded layout, not in another offset here.
+	bottom: calc(20px + var(--bottom-strip-height, 0px));
 	right: 20px;
 	z-index: 1000;
 

frontend/src/container/AppLayout/index.tsx

@@ -43,6 +43,7 @@ import { USER_PREFERENCES } from 'constants/userPreferences';
 import AIAssistantModal from 'container/AIAssistant/AIAssistantModal';
 import AIAssistantPanel from 'container/AIAssistant/AIAssistantPanel';
 import { useAIAssistantStore } from 'container/AIAssistant/store/useAIAssistantStore';
+import BottomStrip from 'container/BottomStrip';
 import SideNav from 'container/SideNav';
 import TopNav from 'container/TopNav';
 import dayjs from 'dayjs';
@@ -51,6 +52,7 @@ import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
 import { useIsAIAssistantEnabled } from 'hooks/useIsAIAssistantEnabled';
 import { useNotifications } from 'hooks/useNotifications';
+import { useSavedViewEnabled } from 'hooks/useSavedViewEnabled';
 import useTabVisibility from 'hooks/useTabFocus';
 import history from 'lib/history';
 import { isNull } from 'lodash-es';
@@ -402,6 +404,7 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 	}, [pathname]);
 
 	const isToDisplayLayout = isLoggedIn;
+	const isSavedViewEnabled = useSavedViewEnabled();
 
 	const routeKey = useMemo(() => getRouteKey(pathname), [pathname]);
 	const pageTitle = t(routeKey);
@@ -868,6 +871,10 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 								</OverlayScrollbar>
 							</LayoutContent>
 						</Sentry.ErrorBoundary>
+
+						{isSavedViewEnabled && isToDisplayLayout && !renderFullScreen && (
+							<BottomStrip />
+						)}
 					</div>
 
 					{isLoggedIn && isAIAssistantEnabled && (

frontend/src/container/AppLayout/styles.ts

@@ -12,8 +12,12 @@ export const Layout = styled(LayoutComponent)`
 	}
 `;
 
+// Takes the height left in `.app-content` after the bottom strip.
+// `min-height: 0` is not needed right now, overlayscrollbars already sets
+// `overflow: auto` here. Kept so this does not break if that goes away.
 export const LayoutContent = styled(LayoutComponent.Content)`
-	height: 100%;
+	flex: 1;
+	min-height: 0;
 	&::-webkit-scrollbar {
 		width: 0.1rem;
 	}

frontend/src/container/BottomStrip/BottomStrip.module.scss

@@ -0,0 +1,36 @@
+.strip {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	gap: var(--spacing-6);
+
+	flex-shrink: 0;
+	height: var(--bottom-strip-height);
+	padding: 0 var(--spacing-6);
+
+	background: var(--l2-background);
+	border-top: 1px solid var(--l2-border);
+
+	font-family: var(--font-family-sf-mono, monospace);
+
+	// Above page content, below the body-portalled overlays that are meant to
+	// cover the strip.
+	position: relative;
+	z-index: 1;
+}
+
+.left,
+.right {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-6);
+	min-width: 0;
+}
+
+// Temporary placeholder for the left slot. Replaced later.
+.version {
+	color: var(--l2-foreground);
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}

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

@@ -0,0 +1,49 @@
+import { render } from 'tests/test-utils';
+
+import BottomStrip, {
+	BOTTOM_STRIP_HEIGHT,
+	BOTTOM_STRIP_HEIGHT_VAR,
+	BOTTOM_STRIP_ON_CLASS,
+} from '..';
+
+describe('BottomStrip', () => {
+	it('publishes the body class and height property while mounted', () => {
+		const { unmount } = render(<BottomStrip />);
+
+		expect(document.body.classList.contains(BOTTOM_STRIP_ON_CLASS)).toBe(true);
+		expect(document.body.style.getPropertyValue(BOTTOM_STRIP_HEIGHT_VAR)).toBe(
+			`${BOTTOM_STRIP_HEIGHT}px`,
+		);
+
+		unmount();
+
+		expect(document.body.classList.contains(BOTTOM_STRIP_ON_CLASS)).toBe(false);
+		expect(document.body.style.getPropertyValue(BOTTOM_STRIP_HEIGHT_VAR)).toBe(
+			'',
+		);
+	});
+
+	// The string is whatever the Go build injected, so it is rendered untouched —
+	// same as SideNav. Release tags carry the "v", local builds do not.
+	it.each([['v0.134.67'], ['main-64f1c2a']])(
+		'renders the build version %p exactly as given',
+		(version) => {
+			const { getByTestId } = render(<BottomStrip />, undefined, {
+				appContextOverrides: {
+					versionData: { version, ee: 'Y', setupCompleted: true },
+				},
+			});
+
+			expect(getByTestId('bottom-strip-version')).toHaveTextContent(version);
+		},
+	);
+
+	it('renders the strip without a version when none is available', () => {
+		const { getByTestId, queryByTestId } = render(<BottomStrip />, undefined, {
+			appContextOverrides: { versionData: null },
+		});
+
+		expect(getByTestId('bottom-strip')).toBeInTheDocument();
+		expect(queryByTestId('bottom-strip-version')).not.toBeInTheDocument();
+	});
+});

frontend/src/container/BottomStrip/index.tsx

@@ -0,0 +1,42 @@
+import { useLayoutEffect } from 'react';
+import { useAppContext } from 'providers/App/App';
+
+import styles from './BottomStrip.module.scss';
+
+export const BOTTOM_STRIP_HEIGHT = 24;
+
+export const BOTTOM_STRIP_ON_CLASS = 'bottom-strip-on';
+export const BOTTOM_STRIP_HEIGHT_VAR = '--bottom-strip-height';
+
+function BottomStrip(): JSX.Element {
+	const { versionData } = useAppContext();
+	const version = versionData?.version?.trim();
+
+	useLayoutEffect(() => {
+		document.body.classList.add(BOTTOM_STRIP_ON_CLASS);
+		document.body.style.setProperty(
+			BOTTOM_STRIP_HEIGHT_VAR,
+			`${BOTTOM_STRIP_HEIGHT}px`,
+		);
+
+		return (): void => {
+			document.body.classList.remove(BOTTOM_STRIP_ON_CLASS);
+			document.body.style.removeProperty(BOTTOM_STRIP_HEIGHT_VAR);
+		};
+	}, []);
+
+	return (
+		<div className={styles.strip} data-testid="bottom-strip">
+			<div className={styles.left}>
+				{version && (
+					<span className={styles.version} data-testid="bottom-strip-version">
+						{version}
+					</span>
+				)}
+			</div>
+			<div className={styles.right} />
+		</div>
+	);
+}
+
+export default BottomStrip;

frontend/src/container/CreateAlertV2/Footer/styles.scss

@@ -1,6 +1,8 @@
 .create-alert-v2-footer {
 	position: fixed;
-	bottom: 0;
+	// Lifted above the bottom strip. Don't extend this pattern — new fixed-bottom
+	// UI belongs in the bounded layout, not in another offset here.
+	bottom: var(--bottom-strip-height, 0px);
 	left: 63px;
 	right: 0;
 	background-color: var(--l1-background);

frontend/src/container/ExplorerOptions/ExplorerOptions.styles.scss

@@ -1,6 +1,8 @@
 .explorer-options-container {
 	position: fixed;
-	bottom: 0px;
+	// Lifted above the bottom strip. Don't extend this pattern — new fixed-bottom
+	// UI belongs in the bounded layout, not in another offset here.
+	bottom: var(--bottom-strip-height, 0px);
 	left: calc(50% + 240px);
 	transform: translate(calc(-50% - 120px), 0);
 	transition: left 0.2s linear;

frontend/src/container/ExplorerOptions/ExplorerOptionsHideArea.styles.scss

@@ -1,6 +1,8 @@
 .explorer-option-droppable-container {
 	position: fixed;
-	bottom: 0;
+	// Lifted above the bottom strip. Don't extend this pattern — new fixed-bottom
+	// UI belongs in the bounded layout, not in another offset here.
+	bottom: var(--bottom-strip-height, 0px);
 	width: -webkit-fill-available;
 	height: 24px;
 	display: flex;

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

@@ -1,7 +1,6 @@
 .home-container {
 	display: flex;
 	flex-direction: column;
-	min-height: 100vh;
 	overflow-y: auto;
 	height: 100%;
 	width: 100%;

frontend/src/container/Licenses/Licenses.styles.scss

@@ -1,7 +1,4 @@
 .licenses-page {
-	max-height: 100vh;
-	overflow: hidden;
-
 	.licenses-page-header {
 		border-bottom: 1px solid var(--l1-border);
 		background: var(--l1-background);
@@ -32,7 +29,6 @@
 
 		.licenses-page-content {
 			flex: 1;
-			height: calc(100vh - 48px);
 			background: var(--l1-background);
 			padding: 10px 8px;
 			overflow-y: auto;

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

@@ -2,7 +2,7 @@
 	display: flex;
 	flex-direction: column;
 	gap: 1rem;
-	height: calc(100vh - 62px);
+	flex: 1;
 	min-height: 400px;
 }
 

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

@@ -181,7 +181,9 @@
 
 		.ant-pagination {
 			position: fixed;
-			bottom: 0;
+			// Lifted above the bottom strip. Don't extend this pattern — new
+			// fixed-bottom UI belongs in the bounded layout, not in another offset here.
+			bottom: var(--bottom-strip-height, 0px);
 			width: calc(100% - 54px);
 			background: var(--l1-background);
 			padding: 16px;

frontend/src/container/TriggeredAlerts/TriggeredAlerts.module.scss

@@ -2,7 +2,7 @@
 	display: flex;
 	flex-direction: column;
 	gap: 1rem;
-	height: calc(100vh - 62px);
+	flex: 1;
 	min-height: 400px;
 	padding-top: var(--spacing-8);
 }

frontend/src/container/Version/Version.styles.scss

@@ -1,7 +1,4 @@
 .version-container {
-	max-height: 100vh;
-	overflow: hidden;
-
 	.version-page-header {
 		border-bottom: 1px solid var(--l1-border);
 		background: var(--l1-background);

frontend/src/hooks/useSavedViewEnabled.ts

@@ -0,0 +1,11 @@
+import getLocalStorageKey from 'api/browser/localstorage/get';
+import { LOCALSTORAGE } from 'constants/localStorage';
+import { useState } from 'react';
+
+export function useSavedViewEnabled(): boolean {
+	const [isEnabled] = useState(
+		() => getLocalStorageKey(LOCALSTORAGE.SAVED_VIEW_ENABLED) === 'true',
+	);
+
+	return isEnabled;
+}

frontend/src/pages/AlertList/AlertList.styles.scss

@@ -1,4 +1,29 @@
 .alerts-container {
+	// Hands the page height down to the active tab so its content can bound itself
+	// instead of guessing with 100vh. Child combinators only, nested Tabs
+	// (Configuration) must not be caught.
+	flex: 1;
+	min-height: 0;
+
+	> .ant-tabs-content-holder {
+		display: flex;
+		flex-direction: column;
+
+		> .ant-tabs-content {
+			flex: 1;
+			min-height: 0;
+			display: flex;
+			flex-direction: column;
+
+			> .ant-tabs-tabpane-active {
+				flex: 1;
+				min-height: 0;
+				display: flex;
+				flex-direction: column;
+			}
+		}
+	}
+
 	.top-level-tab.periscope-tab {
 		padding: 2px 0;
 	}
@@ -40,5 +65,9 @@
 
 	.alert-rules-container {
 		margin-top: 10px;
+		flex: 1;
+		min-height: 0;
+		display: flex;
+		flex-direction: column;
 	}
 }

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/ConfigPane.module.scss

@@ -8,7 +8,6 @@
 	background-color: var(--l1-background);
 	overflow-y: auto;
 	overflow-x: hidden;
-	scrollbar-gutter: stable;
 	padding-bottom: 44px;
 
 	@include custom-scrollbar;
@@ -43,12 +42,11 @@
 
 .eyebrow {
 	display: block;
-	padding: 18px 20px 12px;
-	font-family: 'Geist Mono', monospace;
-	font-size: 12px;
-	letter-spacing: 0.1em;
-	text-transform: uppercase;
-	color: var(--l2-foreground);
+	font-size: 11px;
+	font-weight: 600;
+	padding: 16px;
+	letter-spacing: 0.06em;
+	color: var(--l1-foreground);
 }
 
 .group {
@@ -75,5 +73,9 @@
 .sections {
 	display: flex;
 	flex-direction: column;
-	border-bottom: 1px solid var(--l1-border);
+
+	& > * {
+		padding: 0 16px;
+		border-top: 1px solid var(--l1-border);
+	}
 }

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/ConfigPane.tsx

@@ -1,4 +1,3 @@
-import { useMemo } from 'react';
 import { Input } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import type {
@@ -8,7 +7,6 @@ import type {
 import { getPanelDefinition } from 'pages/DashboardPage/DashboardContainer/Panels/registry';
 import { SectionKind } from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
 import { getSupportedSignals } from 'pages/DashboardPage/DashboardContainer/Panels/capabilities';
-import { buildPluginSpec } from 'pages/DashboardPage/DashboardContainer/Panels/utils/buildPluginSpec';
 import { resolveSignal } from 'pages/DashboardPage/DashboardContainer/Panels/utils/getBuilderQueries';
 import type { EQueryType } from 'types/common/dashboard';
 
@@ -27,7 +25,6 @@ interface ConfigPaneProps {
 	onChangeSpec: (next: DashboardtypesPanelSpecDTO) => void;
 	/** Switch the panel to another visualization kind. */
 	onChangePanelKind: (kind: PanelKind) => void;
-	originalPanelKind?: PanelKind;
 	/**
 	 * Active query type from the query-builder provider (the selected tab). Drives which
 	 * panel types the visualization switcher disables — read from the provider, not the
@@ -60,7 +57,6 @@ function ConfigPane({
 	spec,
 	onChangeSpec,
 	onChangePanelKind,
-	originalPanelKind,
 	queryType,
 	legendSeries,
 	tableColumns,
@@ -80,11 +76,6 @@ function ConfigPane({
 		(config) => config.kind !== SectionKind.PanelHeader,
 	);
 
-	const defaults = useMemo(
-		() => buildPluginSpec(definition.sections),
-		[definition],
-	);
-
 	const signal = resolveSignal(spec.queries, getSupportedSignals(panelKind)[0]);
 
 	// Title/description are just a slice of the spec — edit them through the same
@@ -129,13 +120,11 @@ function ConfigPane({
 						config={headerSection}
 						spec={spec}
 						onChangeSpec={onChangeSpec}
-						defaults={defaults}
 						legendSeries={legendSeries}
 						tableColumns={tableColumns}
 						signal={signal}
 						panelKind={panelKind}
 						onChangePanelKind={onChangePanelKind}
-						originalPanelKind={originalPanelKind}
 						queryType={queryType}
 						stepInterval={stepInterval}
 						metricUnit={metricUnit}
@@ -155,13 +144,11 @@ function ConfigPane({
 									config={config}
 									spec={spec}
 									onChangeSpec={onChangeSpec}
-									defaults={defaults}
 									legendSeries={legendSeries}
 									tableColumns={tableColumns}
 									signal={signal}
 									panelKind={panelKind}
 									onChangePanelKind={onChangePanelKind}
-									originalPanelKind={originalPanelKind}
 									queryType={queryType}
 									stepInterval={stepInterval}
 									metricUnit={metricUnit}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.module.scss

@@ -1,56 +1,6 @@
-@use '../../../../../../styles/scrollbar' as *;
-
-.trigger {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-	width: 100%;
-	padding: 5px 5px 5px 12px;
-	border: 1px solid var(--l2-border);
-	border-radius: 4px;
-	background: var(--l2-background);
-	font: inherit;
-	text-align: left;
-	cursor: pointer;
-
-	&:hover {
-		border-color: var(--l3-border);
-	}
-}
-
-.triggerIcon {
-	flex-shrink: 0;
-	color: var(--l2-foreground);
-}
-
-.triggerName {
-	flex: 1;
-	min-width: 0;
-	overflow: hidden;
-	color: var(--l1-foreground);
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-
-.triggerAction {
-	display: inline-flex;
-	align-items: center;
-	gap: 6px;
-	padding: 4px 10px;
-	border-radius: 3px;
-	background: var(--l3-background);
-	color: var(--l2-foreground);
-	font-size: 12px;
-}
-
-.revert {
-	align-self: flex-start;
-}
-
-.drawerBody {
+// Matches ConfigPane's `.field` so the switcher lines up with the title/description fields.
+.field {
 	display: flex;
 	flex-direction: column;
-	min-height: 0;
-	overflow-y: auto;
-	@include custom-scrollbar;
+	gap: 8px;
 }

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.tsx

@@ -1,17 +1,12 @@
-import { useCallback, useState } from 'react';
-import { ArrowRightLeft, Undo2 } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { DrawerWrapper } from '@signozhq/ui/drawer';
+import { Typography } from '@signozhq/ui/typography';
 import type { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
 import type { EQueryType } from 'types/common/dashboard';
 
-import PanelTypeBrowser from '../../../PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/PanelTypeBrowser';
-import { getPanelDefinition } from '../../../Panels/registry';
 import type { PanelKind } from '../../../Panels/types/panelKind';
-import ConfigField from '../controls/ConfigField/ConfigField';
+import ConfigSelect from '../controls/ConfigSelect/ConfigSelect';
 
 import styles from './PanelTypeSwitcher.module.scss';
-import { getPanelTypeDisabledReason } from './utils';
+import { usePanelTypeSelectItems } from './usePanelTypeSelectItems';
 
 interface PanelTypeSwitcherProps {
 	/** The current panel kind (selected value). */
@@ -20,96 +15,33 @@ interface PanelTypeSwitcherProps {
 	queryType: EQueryType;
 	/** Panel's current signal — also gates the disabled rule (List needs logs/traces, not metrics). */
 	signal?: TelemetrytypesSignalDTO;
-	/** Kind the panel was opened with; a revert button appears once it differs. */
-	originalPanelKind?: PanelKind;
 	onChange: (kind: PanelKind) => void;
 }
 
 /**
- * Visualization-type selector (rendered inside the Visualization section): opens the
- * panel type browser in a drawer. A type is disabled when the active query type or
- * signal is incompatible with it — resolved through the capabilities guard.
+ * Visualization-type selector (rendered inside the Visualization section). A type is
+ * disabled when the active query type or signal is incompatible with it — resolved
+ * through the capabilities guard. The signal is unknown for PromQL/ClickHouse, but
+ * those query types still disable kinds that only support Query Builder (e.g. List).
  */
 function PanelTypeSwitcher({
 	panelKind,
 	queryType,
 	signal,
-	originalPanelKind,
 	onChange,
 }: PanelTypeSwitcherProps): JSX.Element {
-	const [isOpen, setIsOpen] = useState(false);
-	const { displayName, icon: Icon } = getPanelDefinition(panelKind);
-
-	const getDisabledReason = useCallback(
-		(kind: PanelKind): string | undefined =>
-			getPanelTypeDisabledReason({
-				kind,
-				queryType,
-				signal,
-				label: getPanelDefinition(kind).displayName,
-			}),
-		[queryType, signal],
-	);
-
-	const canRevert = !!originalPanelKind && originalPanelKind !== panelKind;
-	const revertBlockedReason = canRevert
-		? getDisabledReason(originalPanelKind)
-		: undefined;
-
-	const handleSelect = (kind: PanelKind): void => {
-		setIsOpen(false);
-		if (kind !== panelKind) {
-			onChange(kind);
-		}
-	};
+	const items = usePanelTypeSelectItems({ queryType, signal });
 
 	return (
-		<ConfigField label="Panel type" plain>
-			<button
-				type="button"
-				className={styles.trigger}
-				onClick={(): void => setIsOpen(true)}
-				data-testid="panel-editor-v2-type-switcher"
-			>
-				<Icon size={14} className={styles.triggerIcon} />
-				<span className={styles.triggerName}>{displayName}</span>
-				<span className={styles.triggerAction}>
-					<ArrowRightLeft size={14} />
-					Change
-				</span>
-			</button>
-			{canRevert && (
-				<Button
-					variant="link"
-					color="primary"
-					size="sm"
-					prefix={<Undo2 />}
-					className={styles.revert}
-					disabled={!!revertBlockedReason}
-					title={revertBlockedReason}
-					onClick={(): void => onChange(originalPanelKind)}
-					testId="panel-editor-v2-type-revert"
-				>
-					Revert to {getPanelDefinition(originalPanelKind).displayName}
-				</Button>
-			)}
-			<DrawerWrapper
-				open={isOpen}
-				onOpenChange={setIsOpen}
-				title="Change panel type"
-				subTitle="Pick a visualization for this panel."
-				direction="right"
-				width="wide"
-				testId="panel-type-switcher-drawer"
-				drawerDescriptionProps={{ className: styles.drawerBody }}
-			>
-				<PanelTypeBrowser
-					selectedKind={panelKind}
-					onSelect={handleSelect}
-					getDisabledReason={getDisabledReason}
-				/>
-			</DrawerWrapper>
-		</ConfigField>
+		<div className={styles.field}>
+			<Typography.Text>Panel Type</Typography.Text>
+			<ConfigSelect
+				testId="panel-editor-v2-type-switcher"
+				value={panelKind}
+				items={items}
+				onChange={(value): void => onChange(value)}
+			/>
+		</div>
 	);
 }
 

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/__tests__/PanelTypeSwitcher.test.tsx

@@ -1,30 +1,22 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { TooltipProvider } from '@signozhq/ui/tooltip';
+import { fireEvent, render, screen } from '@testing-library/react';
 import { getPanelDefinition } from 'pages/DashboardPage/DashboardContainer/Panels/registry';
 
 import PanelTypeSwitcher from '../PanelTypeSwitcher';
 import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
 import { EQueryType } from 'types/common/dashboard';
 
-const OPTIONS = [
-	{ kind: 'signoz/TimeSeriesPanel', displayName: 'Time Series' },
-	{ kind: 'signoz/NumberPanel', displayName: 'Number' },
-	{ kind: 'signoz/TablePanel', displayName: 'Table' },
-	{ kind: 'signoz/BarChartPanel', displayName: 'Bar Chart' },
-	{ kind: 'signoz/AreaChartPanel', displayName: 'Area' },
-	{ kind: 'signoz/PieChartPanel', displayName: 'Pie Chart' },
-	{ kind: 'signoz/HistogramPanel', displayName: 'Histogram' },
-	{ kind: 'signoz/ListPanel', displayName: 'List' },
-	{ kind: 'signoz/TextPanel', displayName: 'Text' },
-].map((option) => ({ ...option, icon: (): null => null }));
-
 // Stub the registry so the test doesn't pull in the real renderers and chart libs.
 jest.mock('pages/DashboardPage/DashboardContainer/Panels/registry', () => ({
 	getPanelDefinition: jest.fn(),
-	get PANEL_OPTIONS(): unknown {
-		return OPTIONS;
-	},
+	PANEL_OPTIONS: [
+		{ kind: 'signoz/TimeSeriesPanel', displayName: 'Time Series' },
+		{ kind: 'signoz/NumberPanel', displayName: 'Number' },
+		{ kind: 'signoz/TablePanel', displayName: 'Table' },
+		{ kind: 'signoz/BarChartPanel', displayName: 'Bar Chart' },
+		{ kind: 'signoz/PieChartPanel', displayName: 'Pie Chart' },
+		{ kind: 'signoz/HistogramPanel', displayName: 'Histogram' },
+		{ kind: 'signoz/ListPanel', displayName: 'List' },
+	].map((option) => ({ ...option, icon: (): null => null })),
 }));
 
 const mockGetPanelDefinition = getPanelDefinition as unknown as jest.Mock;
@@ -36,34 +28,14 @@ const SUPPORTED_QUERY_TYPES: Record<string, EQueryType[]> = {
 	'signoz/PieChartPanel': [EQueryType.QUERY_BUILDER, EQueryType.CLICKHOUSE],
 };
 
-type User = ReturnType<typeof userEvent.setup>;
-
-async function renderSwitcher(
-	props: Partial<Parameters<typeof PanelTypeSwitcher>[0]> = {},
-): Promise<{ onChange: jest.Mock; user: User }> {
-	// The open drawer sets `pointer-events: none` on the body.
-	const user = userEvent.setup({ pointerEventsCheck: 0 });
-	const onChange = jest.fn();
-	render(
-		<TooltipProvider>
-			<PanelTypeSwitcher
-				panelKind="signoz/TimeSeriesPanel"
-				queryType={EQueryType.QUERY_BUILDER}
-				onChange={onChange}
-				{...props}
-			/>
-		</TooltipProvider>,
-	);
-	await user.click(screen.getByTestId('panel-editor-v2-type-switcher'));
-	return { onChange, user };
+function disabledLabels(): (string | null)[] {
+	return Array.from(
+		document.querySelectorAll('.ant-select-item-option-disabled'),
+	).map((el) => el.textContent);
 }
 
-function disabledKinds(): (string | undefined)[] {
-	return Array.from(
-		document.querySelectorAll('[data-testid^="panel-type-signoz/"]'),
-	)
-		.filter((el) => el.getAttribute('aria-disabled') === 'true')
-		.map((el) => el.getAttribute('data-testid')?.replace('panel-type-', ''));
+function openDropdown(): void {
+	fireEvent.mouseDown(screen.getByRole('combobox'));
 }
 
 describe('PanelTypeSwitcher', () => {
@@ -72,8 +44,7 @@ describe('PanelTypeSwitcher', () => {
 		// List supports only logs/traces; every other kind also supports metrics.
 		// Query-type support comes from SUPPORTED_QUERY_TYPES (all three by default).
 		mockGetPanelDefinition.mockImplementation((kind: string) => ({
-			...OPTIONS.find((option) => option.kind === kind),
-			mode: kind === 'signoz/TextPanel' ? 'static' : 'query',
+			mode: 'query',
 			supportedSignals:
 				kind === 'signoz/ListPanel'
 					? ['logs', 'traces']
@@ -86,94 +57,83 @@ describe('PanelTypeSwitcher', () => {
 		}));
 	});
 
-	it('shows the current type and switches to the chosen one', async () => {
-		const { onChange, user } = await renderSwitcher();
-
-		expect(screen.getByTestId('panel-editor-v2-type-switcher')).toHaveTextContent(
-			'Time SeriesChange',
+	it('fires onChange with the chosen plugin kind', () => {
+		const onChange = jest.fn();
+		render(
+			<PanelTypeSwitcher
+				panelKind="signoz/TimeSeriesPanel"
+				queryType={EQueryType.QUERY_BUILDER}
+				onChange={onChange}
+			/>,
 		);
-		await user.click(screen.getByTestId('panel-type-signoz/ListPanel'));
+
+		openDropdown();
+		fireEvent.click(screen.getByText('List'));
 
 		expect(onChange).toHaveBeenCalledWith('signoz/ListPanel');
 	});
 
-	it('does not fire onChange when the current type is picked again', async () => {
-		const { onChange, user } = await renderSwitcher();
-
-		await user.click(screen.getByTestId('panel-type-signoz/TimeSeriesPanel'));
-
-		expect(onChange).not.toHaveBeenCalled();
-	});
-
-	it('disables types whose supported signals exclude the current signal', async () => {
-		const { onChange, user } = await renderSwitcher({
-			signal: TelemetrytypesSignalDTO.metrics,
-		});
-
-		expect(disabledKinds()).toStrictEqual(['signoz/ListPanel']);
-		await user.click(screen.getByTestId('panel-type-signoz/ListPanel'));
-		expect(onChange).not.toHaveBeenCalled();
-	});
-
-	it('does not disable any type when the signal is unknown (builder, no signal)', async () => {
-		await renderSwitcher();
-
-		expect(disabledKinds()).toHaveLength(0);
-	});
-
-	it('disables Query-Builder-only kinds under PromQL even without a signal', async () => {
-		await renderSwitcher({ queryType: EQueryType.PROM });
-
-		expect(disabledKinds()).toStrictEqual(
-			expect.arrayContaining([
-				'signoz/ListPanel',
-				'signoz/TablePanel',
-				'signoz/PieChartPanel',
-			]),
+	it('disables types whose supported signals exclude the current signal', () => {
+		render(
+			<PanelTypeSwitcher
+				panelKind="signoz/TimeSeriesPanel"
+				queryType={EQueryType.QUERY_BUILDER}
+				signal={TelemetrytypesSignalDTO.metrics}
+				onChange={jest.fn()}
+			/>,
 		);
-		expect(disabledKinds()).not.toContain('signoz/TimeSeriesPanel');
-		expect(disabledKinds()).not.toContain('signoz/TextPanel');
+
+		openDropdown();
+		// List can't render a metrics query, so it's disabled; Time Series stays enabled.
+		expect(disabledLabels()).toContain('List');
+		expect(disabledLabels()).not.toContain('Time Series');
 	});
 
-	it('disables List under ClickHouse while Table/Pie stay enabled', async () => {
-		await renderSwitcher({
-			panelKind: 'signoz/TablePanel',
-			queryType: EQueryType.CLICKHOUSE,
-		});
+	it('does not disable any type when the signal is unknown (builder, no signal)', () => {
+		render(
+			<PanelTypeSwitcher
+				panelKind="signoz/TimeSeriesPanel"
+				queryType={EQueryType.QUERY_BUILDER}
+				onChange={jest.fn()}
+			/>,
+		);
 
-		expect(disabledKinds()).toStrictEqual(['signoz/ListPanel']);
+		openDropdown();
+		expect(
+			document.querySelectorAll('.ant-select-item-option-disabled'),
+		).toHaveLength(0);
 	});
 
-	describe('revert', () => {
-		it('is hidden while the type is the original one', async () => {
-			await renderSwitcher({ originalPanelKind: 'signoz/TimeSeriesPanel' });
+	it('disables Query-Builder-only kinds under PromQL even without a signal', () => {
+		render(
+			<PanelTypeSwitcher
+				panelKind="signoz/TimeSeriesPanel"
+				queryType={EQueryType.PROM}
+				onChange={jest.fn()}
+			/>,
+		);
 
-			expect(
-				screen.queryByTestId('panel-editor-v2-type-revert'),
-			).not.toBeInTheDocument();
-		});
+		openDropdown();
+		// List/Table/Pie can't be authored in PromQL; Time Series can.
+		expect(disabledLabels()).toContain('List');
+		expect(disabledLabels()).toContain('Table');
+		expect(disabledLabels()).toContain('Pie Chart');
+		expect(disabledLabels()).not.toContain('Time Series');
+	});
 
-		it('switches back to the original type', async () => {
-			const { onChange, user } = await renderSwitcher({
-				panelKind: 'signoz/TablePanel',
-				originalPanelKind: 'signoz/TimeSeriesPanel',
-			});
+	it('disables List under ClickHouse while Table/Pie stay enabled', () => {
+		render(
+			<PanelTypeSwitcher
+				panelKind="signoz/TablePanel"
+				queryType={EQueryType.CLICKHOUSE}
+				onChange={jest.fn()}
+			/>,
+		);
 
-			const revert = screen.getByTestId('panel-editor-v2-type-revert');
-			expect(revert).toHaveTextContent('Revert to Time Series');
-			await user.click(revert);
-
-			expect(onChange).toHaveBeenCalledWith('signoz/TimeSeriesPanel');
-		});
-
-		it('is disabled when the original type no longer fits the query', async () => {
-			await renderSwitcher({
-				panelKind: 'signoz/TimeSeriesPanel',
-				originalPanelKind: 'signoz/ListPanel',
-				queryType: EQueryType.PROM,
-			});
-
-			expect(screen.getByTestId('panel-editor-v2-type-revert')).toBeDisabled();
-		});
+		openDropdown();
+		expect(disabledLabels()).toContain('List');
+		expect(disabledLabels()).not.toContain('Table');
+		expect(disabledLabels()).not.toContain('Pie Chart');
+		expect(disabledLabels()).not.toContain('Time Series');
 	});
 });

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/usePanelTypeSelectItems.tsx

@@ -18,7 +18,8 @@ interface UsePanelTypeSelectItemsArgs {
 /**
  * Visualization-kind options for a `ConfigSelect`, each disabled (with a reason
  * tooltip) when the active query type or signal is incompatible — resolved through
- * the capabilities guard, the same rule the editor's `PanelTypeSwitcher` applies.
+ * the capabilities guard. Shared by the editor's `PanelTypeSwitcher` and the View
+ * modal's header so the two selectors apply the same rule and can't drift.
  */
 export function usePanelTypeSelectItems({
 	queryType,

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/SectionSlot/SectionSlot.tsx

@@ -6,20 +6,16 @@ import {
 	type SectionConfig,
 	SectionKind,
 } from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
-import type { SeededPluginSpec } from 'pages/DashboardPage/DashboardContainer/Panels/utils/buildPluginSpec';
 
 import type { SectionEditorContext } from '../sectionContext';
-import { getSectionDefault, resolveSectionEditor } from '../sectionRegistry';
+import { resolveSectionEditor } from '../sectionRegistry';
 import SettingsSection from '../SettingsSection/SettingsSection';
-import { isChanged } from '../utils/changes';
 import SectionHeaderQuickAdd from './SectionHeaderQuickAdd';
 
 type SectionSlotProps = {
 	config: SectionConfig;
 	spec: DashboardtypesPanelSpecDTO;
 	onChangeSpec: (next: DashboardtypesPanelSpecDTO) => void;
-	/** The kind's seeded plugin spec (`buildPluginSpec`). */
-	defaults: SeededPluginSpec;
 	/** Renders the editor alone, for a section promoted into the Panel Details fields. */
 	bare?: boolean;
 } & Omit<SectionEditorContext, 'yAxisUnit' | 'registerHeaderAction'>;
@@ -56,14 +52,12 @@ function SectionSlot({
 	config,
 	spec,
 	onChangeSpec,
-	defaults,
 	bare,
 	legendSeries,
 	tableColumns,
 	signal,
 	panelKind,
 	onChangePanelKind,
-	originalPanelKind,
 	queryType,
 	stepInterval,
 	metricUnit,
@@ -109,10 +103,8 @@ function SectionSlot({
 		return null;
 	}
 
-	const { title } = SECTION_METADATA[config.kind];
-	const { Component, get, update, summarize } = editor;
-	const value = get(spec);
-	const defaultValue = getSectionDefault(editor, spec, defaults);
+	const { title, icon: Icon } = SECTION_METADATA[config.kind];
+	const { Component, get, update } = editor;
 	// Atomic sections carry no `controls`; controlled ones do.
 	const controls = 'controls' in config ? config.controls : undefined;
 	// Forwarded to editors that scope to the panel's unit (e.g. the thresholds unit picker).
@@ -121,26 +113,20 @@ function SectionSlot({
 
 	const headerSlot = SECTION_HEADER_SLOT[config.kind]?.(triggerHeaderAction);
 
-	const context: SectionEditorContext = {
-		legendSeries,
-		yAxisUnit,
-		tableColumns,
-		signal,
-		panelKind,
-		onChangePanelKind,
-		originalPanelKind,
-		queryType,
-		stepInterval,
-		metricUnit,
-	};
-
 	const editorElement = (
 		<Component
-			value={value}
-			defaultValue={defaultValue}
+			value={get(spec)}
 			controls={controls}
 			onChange={(next): void => onChangeSpec(update(spec, next))}
-			{...context}
+			legendSeries={legendSeries}
+			yAxisUnit={yAxisUnit}
+			tableColumns={tableColumns}
+			signal={signal}
+			panelKind={panelKind}
+			onChangePanelKind={onChangePanelKind}
+			queryType={queryType}
+			stepInterval={stepInterval}
+			metricUnit={metricUnit}
 			registerHeaderAction={registerHeaderAction}
 		/>
 	);
@@ -152,8 +138,7 @@ function SectionSlot({
 	return (
 		<SettingsSection
 			title={title}
-			summary={summarize?.(value, controls, context)}
-			changed={isChanged(value, defaultValue)}
+			icon={<Icon size={15} />}
 			open={open}
 			onOpenChange={setOpen}
 			headerSlot={headerSlot}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/SectionSlot/__tests__/SectionSlot.test.tsx

@@ -28,12 +28,7 @@ function Harness({ initial = [] }: { initial?: unknown[] } = {}): JSX.Element {
 		makeSpec(initial),
 	);
 	return (
-		<SectionSlot
-			config={THRESHOLDS_CONFIG}
-			spec={spec}
-			defaults={{}}
-			onChangeSpec={setSpec}
-		/>
+		<SectionSlot config={THRESHOLDS_CONFIG} spec={spec} onChangeSpec={setSpec} />
 	);
 }
 
@@ -75,48 +70,3 @@ describe('SectionSlot header action', () => {
 		expect(screen.getByTestId('threshold-value-0')).toBeInTheDocument();
 	});
 });
-
-describe('SectionSlot header summary', () => {
-	it('summarises a collapsed section and marks it changed', async () => {
-		const user = userEvent.setup();
-		render(
-			<Harness initial={[{ value: 80, color: '#F5B225', label: 'High' }]} />,
-		);
-
-		await user.click(screen.getByTestId('config-section-thresholds'));
-
-		expect(screen.getByText('1 threshold')).toBeInTheDocument();
-		expect(screen.getByTestId('config-changed-dot')).toBeInTheDocument();
-	});
-
-	it('shows no summary or changed marker for an untouched section', () => {
-		render(<Harness />);
-
-		expect(screen.queryByTestId('config-changed-dot')).not.toBeInTheDocument();
-		expect(screen.queryByText(/threshold$/)).not.toBeInTheDocument();
-	});
-});
-
-describe('SectionSlot rendered defaults', () => {
-	it('does not mark an explicit value that matches what unset renders as', () => {
-		const spec = {
-			display: { name: 'CPU' },
-			plugin: {
-				kind: 'signoz/TimeSeriesPanel',
-				spec: { formatting: { decimalPrecision: '2' } },
-			},
-			queries: [],
-		} as unknown as DashboardtypesPanelSpecDTO;
-
-		render(
-			<SectionSlot
-				config={{ kind: SectionKind.Formatting, controls: { decimals: true } }}
-				spec={spec}
-				defaults={{}}
-				onChangeSpec={jest.fn()}
-			/>,
-		);
-
-		expect(screen.queryByTestId('config-changed-dot')).not.toBeInTheDocument();
-	});
-});

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/SettingsSection/SettingsSection.module.scss

@@ -1,53 +1,51 @@
-.section {
-	border-top: 1px solid var(--l1-border);
-}
-
 .header {
 	display: flex;
 	align-items: center;
 	gap: 6px;
-	padding: 0 20px 0 0;
-
-	&:hover {
-		background: var(--l2-background);
-	}
+	width: 100%;
+	height: 44px;
 }
 
+// Disclosure control (icon tile + title); fills the row so the action slot and chevron sit right.
 .toggle {
 	display: flex;
 	flex: 1;
 	align-items: center;
-	gap: 10px;
+	gap: 11px;
 	min-width: 0;
-	padding: 18px 0 18px 20px;
+	padding: 0 !important;
 	border: none;
 	background: transparent;
-	font: inherit;
 	cursor: pointer;
+	color: var(--text-vanilla-100);
+	border-radius: 4px;
+}
+
+.iconTile {
+	display: grid;
+	place-items: center;
+	width: 27px;
+	height: 27px;
+	flex: none;
+	border-radius: 3px;
+	background: var(--l3-background);
+	color: var(--l3-foreground);
+	transition: all 0.15s ease;
+}
+
+.iconTileOpen {
+	background: color-mix(in srgb, var(--bg-robin-400) 14%, transparent);
+	color: var(--bg-robin-400);
 }
 
 .title {
-	font-size: 13px;
-	font-weight: 400;
-	white-space: nowrap;
-	color: var(--l1-foreground);
-}
-
-.summary {
 	flex: 1;
-	min-width: 0;
-	overflow: hidden;
-	font-size: 12px;
-	text-align: right;
-	white-space: nowrap;
-	text-overflow: ellipsis;
+	text-align: left;
+	font-weight: 600;
 	color: var(--l2-foreground);
 }
 
 .chevron {
-	flex: none;
-	color: var(--l3-foreground);
-	cursor: pointer;
 	transition: transform 0.15s ease;
 
 	&.open {
@@ -58,6 +56,6 @@
 .body {
 	display: flex;
 	flex-direction: column;
-	gap: 26px;
-	padding: 4px 20px 26px;
+	gap: 16px;
+	padding: 2px 0 18px;
 }

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/SettingsSection/SettingsSection.tsx

@@ -1,20 +1,18 @@
 import { type ReactNode, useState } from 'react';
 import { ChevronDown } from '@signozhq/icons';
+import { Button } from '@signozhq/ui/button';
+import { Typography } from '@signozhq/ui/typography';
 import cx from 'classnames';
 
-import ChangedDot from '../controls/ChangedDot/ChangedDot';
-
 import styles from './SettingsSection.module.scss';
 
 interface SettingsSectionProps {
 	title: string;
+	icon?: ReactNode;
 	defaultOpen?: boolean;
 	/** Controlled open state; when set, the section defers to `onOpenChange`. */
 	open?: boolean;
 	onOpenChange?: (open: boolean) => void;
-	/** One-line digest of the section's values, shown while collapsed. */
-	summary?: string;
-	changed?: boolean;
 	/** Rendered between the title and the chevron. */
 	headerSlot?: ReactNode;
 	children: ReactNode;
@@ -25,11 +23,10 @@ interface SettingsSectionProps {
  */
 function SettingsSection({
 	title,
+	icon,
 	defaultOpen = false,
 	open,
 	onOpenChange,
-	summary,
-	changed,
 	headerSlot,
 	children,
 }: SettingsSectionProps): JSX.Element {
@@ -54,18 +51,30 @@ function SettingsSection({
 					type="button"
 					className={styles.toggle}
 					aria-expanded={isOpen}
-					aria-label={isOpen ? `Collapse ${title}` : `Expand ${title}`}
 					data-testid={`config-section-${serializedTitle}`}
 					onClick={toggle}
 				>
-					<span className={styles.title}>{title}</span>
-					{changed && <ChangedDot title="Has changed settings" />}
-					<span className={styles.summary}>{isOpen ? '' : summary}</span>
+					{icon && (
+						<span className={cx(styles.iconTile, { [styles.iconTileOpen]: isOpen })}>
+							{icon}
+						</span>
+					)}
+					<Typography.Text className={styles.title}>{title}</Typography.Text>
 				</button>
 				{headerSlot}
-				<ChevronDown
-					size={14}
-					className={cx(styles.chevron, { [styles.open]: isOpen })}
+				<Button
+					type="button"
+					variant="ghost"
+					color="secondary"
+					size="icon"
+					prefix={
+						<ChevronDown
+							size={15}
+							className={cx(styles.chevron, { [styles.open]: isOpen })}
+						/>
+					}
+					aria-label={isOpen ? `Collapse ${title}` : `Expand ${title}`}
+					tabIndex={-1}
 					onClick={toggle}
 				/>
 			</div>

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/__tests__/ConfigPane.test.tsx

@@ -108,7 +108,7 @@ describe('ConfigPane', () => {
 
 		const toggle = screen.getByTestId('panel-header-hide');
 		expect(toggle).toBeInTheDocument();
-		expect(screen.getByText('Hide panel header')).toBeInTheDocument();
+		expect(screen.getByText('Hide header')).toBeInTheDocument();
 		// No collapsible wrapper of its own.
 		expect(screen.queryByText('Panel header')).not.toBeInTheDocument();
 	});

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/AlignmentGrid/AlignmentGrid.module.scss

@@ -1,80 +0,0 @@
-.row {
-	display: flex;
-	align-items: center;
-	gap: 16px;
-}
-
-.grid {
-	display: grid;
-	flex: none;
-	grid-template-columns: repeat(3, 28px);
-	gap: 4px;
-	padding: 6px;
-	border: 1px solid var(--l1-border);
-	border-radius: 4px;
-	background: var(--l2-background);
-}
-
-.cell {
-	position: relative;
-	display: grid;
-	place-items: center;
-	width: 28px;
-	height: 22px;
-	padding: 0;
-	border: 1px solid transparent;
-	border-radius: 3px;
-	background: transparent;
-	cursor: pointer;
-
-	&:hover {
-		background: var(--l3-background);
-	}
-
-	&:has(:focus-visible) {
-		outline: 1px solid var(--bg-robin-500);
-	}
-}
-
-.input {
-	position: absolute;
-	inset: 0;
-	margin: 0;
-	opacity: 0;
-	cursor: pointer;
-}
-
-.mark {
-	width: 10px;
-	height: 3px;
-	border-radius: 2px;
-	background: var(--l3-foreground);
-}
-
-.selected {
-	border-color: var(--bg-robin-500);
-	background: color-mix(in srgb, var(--bg-robin-500) 12%, transparent);
-
-	.mark {
-		width: 14px;
-		background: var(--bg-robin-400);
-	}
-}
-
-.text {
-	display: flex;
-	flex-direction: column;
-	gap: 3px;
-	min-width: 0;
-}
-
-.label {
-	font-size: 14px;
-	color: var(--l1-foreground);
-}
-
-.description {
-	font-size: 12px;
-	line-height: 17px;
-	color: var(--l2-foreground);
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/AlignmentGrid/AlignmentGrid.tsx

@@ -1,64 +0,0 @@
-import { useId } from 'react';
-import cx from 'classnames';
-
-import { type Alignment, ALIGNMENT_CELLS, alignmentLabel } from './alignment';
-
-import styles from './AlignmentGrid.module.scss';
-
-interface AlignmentGridProps {
-	testId: string;
-	value: Alignment;
-	description?: string;
-	onChange: (next: Alignment) => void;
-}
-
-function AlignmentGrid({
-	testId,
-	value,
-	description,
-	onChange,
-}: AlignmentGridProps): JSX.Element {
-	const name = useId();
-
-	return (
-		<div className={styles.row}>
-			<div
-				role="radiogroup"
-				aria-label="Text position"
-				data-testid={testId}
-				className={styles.grid}
-			>
-				{ALIGNMENT_CELLS.map((cell) => {
-					const label = alignmentLabel(cell);
-					const selected =
-						cell.textAlign === value.textAlign &&
-						cell.verticalAlign === value.verticalAlign;
-					return (
-						<label
-							key={label}
-							title={label}
-							data-testid={`${testId}-${cell.verticalAlign}-${cell.textAlign}`}
-							className={cx(styles.cell, { [styles.selected]: selected })}
-						>
-							<input
-								type="radio"
-								className={styles.input}
-								name={name}
-								checked={selected}
-								aria-label={label}
-								onChange={(): void => onChange(cell)}
-							/>
-							<span className={styles.mark} />
-						</label>
-					);
-				})}
-			</div>
-			<div className={styles.text}>
-				<span className={styles.label}>{alignmentLabel(value)}</span>
-				{description && <span className={styles.description}>{description}</span>}
-			</div>
-		</div>
-	);
-}
-
-export default AlignmentGrid;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/AlignmentGrid/alignment.ts

@@ -1,37 +0,0 @@
-import {
-	DashboardtypesTextAlignDTO,
-	DashboardtypesVerticalAlignDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-const VERTICAL_LABELS: Record<DashboardtypesVerticalAlignDTO, string> = {
-	[DashboardtypesVerticalAlignDTO.top]: 'Top',
-	[DashboardtypesVerticalAlignDTO.center]: 'Middle',
-	[DashboardtypesVerticalAlignDTO.bottom]: 'Bottom',
-};
-
-const HORIZONTAL_LABELS: Record<DashboardtypesTextAlignDTO, string> = {
-	[DashboardtypesTextAlignDTO.left]: 'left',
-	[DashboardtypesTextAlignDTO.center]: 'center',
-	[DashboardtypesTextAlignDTO.right]: 'right',
-};
-
-export interface Alignment {
-	textAlign: DashboardtypesTextAlignDTO;
-	verticalAlign: DashboardtypesVerticalAlignDTO;
-}
-
-export const ALIGNMENT_CELLS: Alignment[] = Object.values(
-	DashboardtypesVerticalAlignDTO,
-).flatMap((verticalAlign) =>
-	Object.values(DashboardtypesTextAlignDTO).map((textAlign) => ({
-		textAlign,
-		verticalAlign,
-	})),
-);
-
-export function alignmentLabel({
-	textAlign,
-	verticalAlign,
-}: Alignment): string {
-	return `${VERTICAL_LABELS[verticalAlign]} ${HORIZONTAL_LABELS[textAlign]}`;
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/BackgroundSwatches/BackgroundSwatches.module.scss

@@ -1,8 +1,7 @@
 .row {
 	display: flex;
-	flex-wrap: wrap;
 	align-items: center;
-	gap: 8px 6px;
+	gap: 6px;
 }
 
 .swatch {

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/BackgroundSwatches/BackgroundSwatches.tsx

@@ -8,14 +8,31 @@ import {
 } from 'pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/background/presets';
 import type {
 	PanelTheme,
+	TextBackgroundPreset,
 	TextBackgroundSelection,
 } from 'pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/background/types';
 import { TextBackgroundKind } from 'pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/background/types';
 
-import { BASE_TITLES, type BaseSelection, PRESET_TITLES } from './titles';
-
 import styles from './BackgroundSwatches.module.scss';
 
+const PRESET_TITLES: Record<TextBackgroundPreset, string> = {
+	robin: 'Robin',
+	purple: 'Purple',
+	sakura: 'Sakura',
+	cherry: 'Cherry',
+	amber: 'Amber',
+	forest: 'Forest',
+	sienna: 'Sienna',
+	slate: 'Slate',
+};
+
+type BaseSelection = TextBackgroundKind.None | TextBackgroundKind.Default;
+
+const BASE_TITLES: Record<BaseSelection, string> = {
+	none: 'Transparent',
+	default: 'Default panel',
+};
+
 /** Neither base swatch shows a colour, so its tooltip says what it does. */
 const BASE_TOOLTIPS: Record<BaseSelection, string> = {
 	none: 'Transparent — no card, border or title bar',

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/BackgroundSwatches/titles.ts

@@ -1,38 +0,0 @@
-import {
-	type ResolvedTextBackground,
-	TextBackgroundKind,
-	type TextBackgroundPreset,
-} from 'pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/background/types';
-
-export const PRESET_TITLES: Record<TextBackgroundPreset, string> = {
-	robin: 'Robin',
-	purple: 'Purple',
-	sakura: 'Sakura',
-	cherry: 'Cherry',
-	amber: 'Amber',
-	forest: 'Forest',
-	sienna: 'Sienna',
-	slate: 'Slate',
-};
-
-export type BaseSelection =
-	| TextBackgroundKind.None
-	| TextBackgroundKind.Default;
-
-export const BASE_TITLES: Record<BaseSelection, string> = {
-	none: 'Transparent',
-	default: 'Default panel',
-};
-
-export function backgroundTitle(background: ResolvedTextBackground): string {
-	switch (background.kind) {
-		case TextBackgroundKind.Preset:
-			return background.preset ? PRESET_TITLES[background.preset] : 'Custom';
-		case TextBackgroundKind.Custom:
-			return `Custom ${background.surface?.toUpperCase() ?? ''}`.trim();
-		case TextBackgroundKind.None:
-			return BASE_TITLES.none;
-		default:
-			return BASE_TITLES.default;
-	}
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ChangedDot/ChangedDot.module.scss

@@ -1,7 +0,0 @@
-.dot {
-	flex: none;
-	width: 6px;
-	height: 6px;
-	border-radius: 50%;
-	background: var(--bg-robin-500);
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ChangedDot/ChangedDot.tsx

@@ -1,18 +0,0 @@
-import styles from './ChangedDot.module.scss';
-
-function ChangedDot({
-	title = 'Changed from default',
-}: {
-	title?: string;
-}): JSX.Element {
-	return (
-		<span
-			className={styles.dot}
-			title={title}
-			aria-label={title}
-			data-testid="config-changed-dot"
-		/>
-	);
-}
-
-export default ChangedDot;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigField/ConfigField.module.scss

@@ -1,48 +0,0 @@
-.field {
-	display: flex;
-	flex-direction: column;
-	gap: 10px;
-	min-width: 0;
-}
-
-.header {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	gap: 8px;
-	min-height: 18px;
-}
-
-.label {
-	font-family: 'Geist Mono', monospace;
-	font-size: 12px;
-	letter-spacing: 0.1em;
-	text-transform: uppercase;
-	white-space: nowrap;
-	color: var(--l2-foreground);
-}
-
-.plainLabel {
-	font-size: 13px;
-	color: var(--l1-foreground);
-}
-
-.reset {
-	padding: 0;
-	border: 0;
-	background: transparent;
-	font: inherit;
-	font-size: 12px;
-	color: var(--bg-robin-400);
-	cursor: pointer;
-
-	&:hover {
-		color: var(--bg-robin-300);
-	}
-}
-
-.help {
-	font-size: 12px;
-	line-height: 17px;
-	color: var(--l2-foreground);
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigField/ConfigField.tsx

@@ -1,48 +0,0 @@
-import type { ReactNode } from 'react';
-import cx from 'classnames';
-
-import styles from './ConfigField.module.scss';
-
-interface ConfigFieldProps {
-	label: ReactNode;
-	/** Shown under the control. */
-	help?: ReactNode;
-	changed?: boolean;
-	onReset?: () => void;
-	/** Plain body label instead of the uppercase field heading. */
-	plain?: boolean;
-	className?: string;
-	children: ReactNode;
-}
-
-function ConfigField({
-	label,
-	help,
-	changed,
-	onReset,
-	plain,
-	className,
-	children,
-}: ConfigFieldProps): JSX.Element {
-	return (
-		<div className={cx(styles.field, className)}>
-			<div className={styles.header}>
-				<span className={plain ? styles.plainLabel : styles.label}>{label}</span>
-				{changed && onReset && (
-					<button
-						type="button"
-						className={styles.reset}
-						data-testid="config-field-reset"
-						onClick={onReset}
-					>
-						Reset
-					</button>
-				)}
-			</div>
-			{children}
-			{help && <span className={styles.help}>{help}</span>}
-		</div>
-	);
-}
-
-export default ConfigField;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigFieldRow/ConfigFieldRow.module.scss

@@ -1,5 +0,0 @@
-.row {
-	display: grid;
-	grid-template-columns: repeat(auto-fit, minmax(110px, 1fr));
-	gap: 10px;
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigFieldRow/ConfigFieldRow.tsx

@@ -1,10 +0,0 @@
-import type { ReactNode } from 'react';
-
-import styles from './ConfigFieldRow.module.scss';
-
-/** Side-by-side fields that wrap when the pane is narrow. */
-function ConfigFieldRow({ children }: { children: ReactNode }): JSX.Element {
-	return <div className={styles.row}>{children}</div>;
-}
-
-export default ConfigFieldRow;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigNumberInput/ConfigNumberInput.tsx

@@ -1,38 +0,0 @@
-import type { ChangeEvent } from 'react';
-import { Input } from 'antd';
-
-import ConfigField from '../ConfigField/ConfigField';
-
-interface ConfigNumberInputProps {
-	testId: string;
-	label: string;
-	value: number | null | undefined;
-	onChange: (next: number | null) => void;
-}
-
-/** Numeric input where empty means "auto"; transient non-numeric input (e.g. "-") clears. */
-function ConfigNumberInput({
-	testId,
-	label,
-	value,
-	onChange,
-}: ConfigNumberInputProps): JSX.Element {
-	const handleChange = (e: ChangeEvent<HTMLInputElement>): void => {
-		const raw = e.target.value;
-		onChange(raw === '' || Number.isNaN(Number(raw)) ? null : Number(raw));
-	};
-
-	return (
-		<ConfigField label={label} plain>
-			<Input
-				data-testid={testId}
-				type="number"
-				placeholder="Auto"
-				value={value ?? ''}
-				onChange={handleChange}
-			/>
-		</ConfigField>
-	);
-}
-
-export default ConfigNumberInput;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSegmented/ConfigSegmented.module.scss

@@ -0,0 +1,10 @@
+.group {
+	width: 100%;
+}
+
+.segment {
+	display: inline-flex;
+	align-items: center;
+	gap: 6px;
+	white-space: nowrap;
+}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSegmented/ConfigSegmented.tsx

@@ -0,0 +1,59 @@
+import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
+
+import { SegmentIcon, type SegmentIconName } from '../segmentIcons';
+
+import styles from './ConfigSegmented.module.scss';
+
+export interface ConfigSegmentedItem {
+	value: string;
+	label: string;
+	icon?: SegmentIconName;
+}
+
+interface ConfigSegmentedProps<T extends string = string> {
+	testId: string;
+	value: T | undefined;
+	items: ConfigSegmentedItem[];
+	onChange: (value: T) => void;
+}
+
+/**
+ * Inline segmented control for short option sets in the config pane (line style, fill
+ * mode, axis scale, legend position). Each segment carries an optional muted glyph that
+ * brightens with the selected state (it inherits the toggle's `currentColor`). Built on
+ * the Periscope ToggleGroup so it stays theme-faithful.
+ */
+function ConfigSegmented<T extends string = string>({
+	testId,
+	value,
+	items,
+	onChange,
+}: ConfigSegmentedProps<T>): JSX.Element {
+	return (
+		<ToggleGroupSimple
+			type="single"
+			testId={testId}
+			className={styles.group}
+			value={value}
+			items={items.map((item) => ({
+				value: item.value,
+				'aria-label': item.label,
+				label: (
+					<span className={styles.segment}>
+						{item.icon && <SegmentIcon name={item.icon} />}
+						{item.label}
+					</span>
+				),
+			}))}
+			// Single toggle-groups emit '' when the active segment is re-clicked; ignore that
+			// so a required choice (e.g. scale, position) can't be cleared to an empty value.
+			onChange={(next: T): void => {
+				if (next) {
+					onChange(next);
+				}
+			}}
+		/>
+	);
+}
+
+export default ConfigSegmented;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSwitch/ConfigSwitch.module.scss

@@ -1,31 +1,30 @@
 .card {
 	display: flex;
 	align-items: center;
-	gap: 14px;
-	padding: 14px 16px;
-	border: 1px solid var(--l1-border);
-	border-radius: 4px;
-	background: var(--l2-background);
+	justify-content: space-between;
+	gap: 12px;
+	padding: 12px 14px;
+	border: 1px solid var(--l2-border);
+	border-radius: 2px;
+	background: var(--l2-background-60);
 }
 
 .text {
 	display: flex;
-	flex: 1;
 	flex-direction: column;
-	gap: 3px;
+	gap: 2px;
 	min-width: 0;
 }
 
 .title {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-	font-size: 14px;
-	color: var(--l1-foreground);
+	font-size: 12px;
+	font-weight: 600;
+	letter-spacing: 0.06em;
+	text-transform: uppercase;
+	color: var(--l2-foreground);
 }
 
 .description {
 	font-size: 12px;
-	line-height: 17px;
-	color: var(--l2-foreground);
+	color: var(--l3-foreground);
 }

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSwitch/ConfigSwitch.tsx

@@ -1,38 +1,39 @@
-import type { ReactNode } from 'react';
 import { Switch } from '@signozhq/ui/switch';
-
-import ChangedDot from '../ChangedDot/ChangedDot';
+import { Typography } from '@signozhq/ui/typography';
 
 import styles from './ConfigSwitch.module.scss';
 
 interface ConfigSwitchProps {
 	testId: string;
+	/** Shown uppercased as the card title. */
 	title: string;
+	/** Optional helper line under the title. */
 	description?: string;
-	sketch?: ReactNode;
-	changed?: boolean;
 	value: boolean;
 	onChange: (checked: boolean) => void;
 }
 
+/**
+ * Boolean toggle rendered as a bordered card: an uppercase title with an optional
+ * description on the left and a Switch on the right. The standard presentation for
+ * on/off panel-config controls (e.g. "Show points").
+ */
 function ConfigSwitch({
 	testId,
 	title,
 	description,
-	sketch,
-	changed,
 	value,
 	onChange,
 }: ConfigSwitchProps): JSX.Element {
 	return (
 		<div className={styles.card}>
-			{sketch}
 			<div className={styles.text}>
-				<span className={styles.title}>
-					{title}
-					{changed && <ChangedDot />}
-				</span>
-				{description && <span className={styles.description}>{description}</span>}
+				<span className={styles.title}>{title}</span>
+				{description && (
+					<Typography.Text className={styles.description}>
+						{description}
+					</Typography.Text>
+				)}
 			</div>
 			<Switch testId={testId} value={value} onChange={onChange} />
 		</div>

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigTiles/ConfigTiles.module.scss

@@ -1,110 +0,0 @@
-.container {
-	container-type: inline-size;
-}
-
-.grid {
-	display: grid;
-	grid-template-columns: minmax(0, 1fr);
-	gap: 8px;
-}
-
-.tile {
-	position: relative;
-	display: flex;
-	align-items: center;
-	gap: 14px;
-	min-width: 0;
-	height: 52px;
-	padding: 0 14px;
-	border: 1px solid var(--l1-border);
-	border-radius: 4px;
-	background: var(--l2-background);
-	color: var(--l2-foreground);
-	font: inherit;
-	font-size: 13px;
-	cursor: pointer;
-	transition:
-		border-color 150ms,
-		background 150ms;
-
-	&:hover {
-		border-color: var(--l2-border);
-	}
-
-	&:has(:focus-visible) {
-		outline: 1px solid var(--bg-robin-500);
-		outline-offset: 1px;
-	}
-}
-
-.input {
-	position: absolute;
-	inset: 0;
-	margin: 0;
-	opacity: 0;
-	cursor: pointer;
-}
-
-.selected {
-	border-color: var(--bg-robin-500);
-	background: color-mix(in srgb, var(--bg-robin-500) 12%, var(--l1-background));
-	color: var(--l1-foreground);
-
-	&:hover {
-		border-color: var(--bg-robin-500);
-	}
-}
-
-.label {
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-
-@mixin stacked-tiles($columns) {
-	grid-template-columns: repeat($columns, minmax(0, 1fr));
-
-	.tile {
-		flex-direction: column;
-		justify-content: center;
-		gap: 10px;
-		height: 88px;
-		padding: 0 4px;
-	}
-}
-
-@container (min-width: 200px) {
-	.grid[data-count='2'] {
-		@include stacked-tiles(2);
-	}
-}
-
-@container (min-width: 216px) {
-	.grid[data-count='3'] {
-		@include stacked-tiles(3);
-	}
-}
-
-@container (min-width: 220px) {
-	.grid[data-count='4'] {
-		@include stacked-tiles(2);
-	}
-}
-
-@container (min-width: 420px) {
-	.grid[data-count='4'] {
-		@include stacked-tiles(4);
-	}
-}
-
-.grid.compact {
-	grid-auto-flow: column;
-	grid-auto-columns: minmax(0, 1fr);
-	gap: 6px;
-
-	.tile {
-		justify-content: center;
-		height: 36px;
-		padding: 0 4px;
-	}
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigTiles/ConfigTiles.tsx

@@ -1,72 +0,0 @@
-import { type ReactNode, useId } from 'react';
-import cx from 'classnames';
-
-import styles from './ConfigTiles.module.scss';
-
-export interface ConfigTileItem<T extends string = string> {
-	value: T;
-	label: string;
-	drawing?: ReactNode;
-}
-
-interface ConfigTilesProps<T extends string> {
-	testId: string;
-	value: T | undefined;
-	items: ConfigTileItem<T>[];
-	onChange: (value: T) => void;
-	/** Compact text-only tiles on one row (e.g. decimal places). */
-	compact?: boolean;
-	'aria-label'?: string;
-}
-
-/**
- * Single-choice tiles. Columns follow the container width: rows of 4 fold to 2×2 and
- * any row too narrow for its tiles becomes a full-width list.
- */
-function ConfigTiles<T extends string>({
-	testId,
-	value,
-	items,
-	onChange,
-	compact,
-	'aria-label': ariaLabel,
-}: ConfigTilesProps<T>): JSX.Element {
-	const name = useId();
-
-	return (
-		<div className={styles.container}>
-			<div
-				role="radiogroup"
-				aria-label={ariaLabel}
-				data-testid={testId}
-				data-count={items.length}
-				className={cx(styles.grid, { [styles.compact]: compact })}
-			>
-				{items.map((item) => {
-					const selected = item.value === value;
-					return (
-						<label
-							key={item.value}
-							data-testid={`${testId}-${item.value}`}
-							className={cx(styles.tile, { [styles.selected]: selected })}
-						>
-							<input
-								type="radio"
-								className={styles.input}
-								name={name}
-								value={item.value}
-								checked={selected}
-								aria-label={item.label}
-								onChange={(): void => onChange(item.value)}
-							/>
-							{item.drawing}
-							<span className={styles.label}>{item.label}</span>
-						</label>
-					);
-				})}
-			</div>
-		</div>
-	);
-}
-
-export default ConfigTiles;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/LegendColors/LegendColorRow.tsx

@@ -1,5 +1,6 @@
 import { ColorPicker } from 'antd';
 import { Button } from '@signozhq/ui/button';
+import { Typography } from '@signozhq/ui/typography';
 
 import styles from './LegendColors.module.scss';
 
@@ -40,9 +41,9 @@ function LegendColorRow({
 					data-testid={`legend-color-${label}`}
 				>
 					<span className={styles.swatch} style={{ backgroundColor: color }} />
-					<span className={styles.label} title={label}>
+					<Typography.Text className={styles.label} title={label}>
 						{label}
-					</span>
+					</Typography.Text>
 				</button>
 			</ColorPicker>
 			{isOverridden && (

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/LegendColors/LegendColors.module.scss

@@ -42,9 +42,7 @@
 
 .label {
 	overflow: hidden;
-	font-family: var(--font-mono);
-	font-size: var(--font-size-xs);
-	letter-spacing: -0.01em;
+	font-size: 12px;
 	color: var(--l2-foreground);
 	white-space: nowrap;
 	text-overflow: ellipsis;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/LegendColors/LegendColors.tsx

@@ -40,7 +40,7 @@ function LegendColors({
 	if (series.length === 0) {
 		return (
 			<Typography.Text className={styles.empty}>
-				Run the query to set a color for each series.
+				Run the panel to customise series colors.
 			</Typography.Text>
 		);
 	}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/LegendColors/__tests__/LegendColors.test.tsx

@@ -15,7 +15,7 @@ describe('LegendColors', () => {
 		expect(
 			screen.queryByTestId('panel-editor-v2-legend-colors'),
 		).not.toBeInTheDocument();
-		expect(screen.getByText(/run the query/i)).toBeInTheDocument();
+		expect(screen.getByText(/run the panel/i)).toBeInTheDocument();
 	});
 
 	it('renders the search box once series are present', () => {

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/drawings/LegendFrame.tsx

@@ -1,28 +0,0 @@
-import type { ReactNode } from 'react';
-
-function LegendFrame({ children }: { children: ReactNode }): JSX.Element {
-	return (
-		<svg
-			width={56}
-			height={30}
-			viewBox="0 0 56 30"
-			fill="none"
-			strokeLinecap="round"
-			style={{ flex: 'none' }}
-			aria-hidden
-		>
-			<rect
-				x={1}
-				y={1}
-				width={54}
-				height={28}
-				rx={2}
-				stroke="var(--l3-border)"
-				strokeWidth={1.4}
-			/>
-			{children}
-		</svg>
-	);
-}
-
-export default LegendFrame;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/drawings/SketchSvg.tsx

@@ -1,22 +0,0 @@
-import type { ReactNode } from 'react';
-
-function SketchSvg({ children }: { children: ReactNode }): JSX.Element {
-	return (
-		<svg
-			width={40}
-			height={22}
-			viewBox="0 0 40 22"
-			fill="none"
-			stroke="var(--l3-foreground)"
-			strokeWidth={1.8}
-			strokeLinecap="round"
-			strokeLinejoin="round"
-			style={{ flex: 'none' }}
-			aria-hidden
-		>
-			{children}
-		</svg>
-	);
-}
-
-export default SketchSvg;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/drawings/TileSvg.tsx

@@ -1,37 +0,0 @@
-import type { ReactNode } from 'react';
-
-export type Tone = 'robin' | 'sakura' | 'forest' | 'amber';
-
-const TONE_COLOR: Record<Tone, string> = {
-	robin: 'var(--bg-robin-300)',
-	sakura: 'var(--bg-sakura-400)',
-	forest: 'var(--bg-forest-400)',
-	amber: 'var(--bg-amber-400)',
-};
-
-function TileSvg({
-	tone,
-	children,
-}: {
-	tone: Tone;
-	children: ReactNode;
-}): JSX.Element {
-	return (
-		<svg
-			width={64}
-			height={24}
-			viewBox="0 0 64 24"
-			fill="none"
-			stroke="currentColor"
-			strokeWidth={2.4}
-			strokeLinecap="round"
-			strokeLinejoin="round"
-			style={{ color: TONE_COLOR[tone], flex: 'none' }}
-			aria-hidden
-		>
-			{children}
-		</svg>
-	);
-}
-
-export default TileSvg;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/drawings/switchSketches.tsx

@@ -1,37 +0,0 @@
-import SketchSvg from './SketchSvg';
-
-/** Muted sketches for on/off cards. */
-export const SWITCH_SKETCHES = {
-	hideHeader: (
-		<SketchSvg>
-			<rect x={3} y={3} width={34} height={16} rx={2} />
-			<path d="M3 8 H37" strokeDasharray="3 3" />
-		</SketchSvg>
-	),
-	fillGaps: (
-		<SketchSvg>
-			<path d="M3 9 L11 7 L16 19 L26 19 L30 8 L37 6" />
-		</SketchSvg>
-	),
-	points: (
-		<SketchSvg>
-			<path d="M4 17 L14 9 L24 13 L36 6" />
-			{[
-				[4, 17],
-				[14, 9],
-				[24, 13],
-				[36, 6],
-			].map(([cx, cy]) => (
-				<circle key={cx} cx={cx} cy={cy} r={2} fill="var(--l3-foreground)" />
-			))}
-		</SketchSvg>
-	),
-	combine: (
-		<SketchSvg>
-			<rect x={4} y={10} width={6} height={10} />
-			<rect x={13} y={4} width={6} height={16} />
-			<rect x={22} y={8} width={6} height={12} />
-			<rect x={31} y={13} width={6} height={7} />
-		</SketchSvg>
-	),
-} satisfies Record<string, JSX.Element>;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/drawings/tileDrawings.tsx

@@ -1,164 +0,0 @@
-import LegendFrame from './LegendFrame';
-import TileSvg from './TileSvg';
-
-const FILLED = { fill: 'currentColor', stroke: 'none' } as const;
-const LINE = 'M4 17 L18 9 L30 14 L44 5 L60 11';
-const POINTS = [
-	[4, 18],
-	[22, 8],
-	[40, 14],
-	[58, 6],
-];
-
-function interpDrawing(path: string): JSX.Element {
-	return (
-		<TileSvg tone="robin">
-			<path d={path} />
-			{POINTS.map(([cx, cy]) => (
-				<circle key={cx} cx={cx} cy={cy} r={2.2} {...FILLED} />
-			))}
-		</TileSvg>
-	);
-}
-
-export const TILE_DRAWINGS = {
-	lineSolid: (
-		<TileSvg tone="sakura">
-			<path d={LINE} />
-		</TileSvg>
-	),
-	lineDashed: (
-		<TileSvg tone="sakura">
-			<path d={LINE} strokeDasharray="5 5" />
-		</TileSvg>
-	),
-	interpLinear: interpDrawing('M4 18 L22 8 L40 14 L58 6'),
-	interpSpline: interpDrawing(
-		'M4 18 C 12 18, 14 8, 22 8 S 34 14, 40 14 S 52 6, 58 6',
-	),
-	interpStepBefore: interpDrawing('M4 18 V8 H22 V14 H40 V6 H58'),
-	interpStepAfter: interpDrawing('M4 18 H22 V8 H40 V14 H58 V6'),
-	fillNone: (
-		<TileSvg tone="forest">
-			<path d={LINE} />
-		</TileSvg>
-	),
-	fillSolid: (
-		<TileSvg tone="forest">
-			<path d={`${LINE} L60 22 L4 22Z`} {...FILLED} opacity={0.4} />
-			<path d={LINE} />
-		</TileSvg>
-	),
-	fillGradient: (
-		<TileSvg tone="forest">
-			<defs>
-				<linearGradient id="config-tile-fill-gradient" x1="0" y1="0" x2="0" y2="1">
-					<stop offset="0" stopColor="currentColor" stopOpacity={0.55} />
-					<stop offset="1" stopColor="currentColor" stopOpacity={0} />
-				</linearGradient>
-			</defs>
-			<path
-				d={`${LINE} L60 22 L4 22Z`}
-				fill="url(#config-tile-fill-gradient)"
-				stroke="none"
-			/>
-			<path d={LINE} />
-		</TileSvg>
-	),
-	gapsConnect: (
-		<TileSvg tone="amber">
-			<path d="M4 16 L14 11 L22 14" />
-			<path d="M22 14 L42 8" strokeDasharray="3 4" />
-			<path d="M42 8 L50 11 L60 6" />
-		</TileSvg>
-	),
-	gapsBreak: (
-		<TileSvg tone="amber">
-			<path d="M4 16 L14 11 L22 14" />
-			<path d="M42 8 L50 11 L60 6" />
-		</TileSvg>
-	),
-	scaleLinear: (
-		<TileSvg tone="robin">
-			<path d="M4 20 L60 4" />
-		</TileSvg>
-	),
-	scaleLog: (
-		<TileSvg tone="robin">
-			<path d="M4 20 C 8 8, 20 5, 60 4" />
-		</TileSvg>
-	),
-	barsSideBySide: (
-		<TileSvg tone="robin">
-			<rect x={10} y={10} width={7} height={12} {...FILLED} opacity={0.5} />
-			<rect x={18} y={4} width={7} height={18} {...FILLED} />
-			<rect x={36} y={12} width={7} height={10} {...FILLED} opacity={0.5} />
-			<rect x={44} y={7} width={7} height={15} {...FILLED} />
-		</TileSvg>
-	),
-	barsStacked: (
-		<TileSvg tone="robin">
-			<rect x={14} y={13} width={11} height={9} {...FILLED} opacity={0.5} />
-			<rect x={14} y={4} width={11} height={8} {...FILLED} />
-			<rect x={38} y={15} width={11} height={7} {...FILLED} opacity={0.5} />
-			<rect x={38} y={8} width={11} height={6} {...FILLED} />
-		</TileSvg>
-	),
-	areaOverlap: (
-		<TileSvg tone="robin">
-			<path d="M4 15 L18 9 L32 13 L46 6 L60 9" />
-			<path d="M4 20 L18 15 L32 18 L46 13 L60 15" opacity={0.5} />
-		</TileSvg>
-	),
-	areaStacked: (
-		<TileSvg tone="robin">
-			<path
-				d="M4 22 L4 17 L18 15 L32 16 L46 14 L60 15 L60 22Z"
-				{...FILLED}
-				opacity={0.45}
-			/>
-			<path
-				d="M4 17 L18 15 L32 16 L46 14 L60 15 L60 8 L46 5 L32 9 L18 6 L4 10Z"
-				{...FILLED}
-			/>
-		</TileSvg>
-	),
-	areaPercent: (
-		<TileSvg tone="robin">
-			<path
-				d="M4 22 L4 12 L18 10 L32 13 L46 9 L60 11 L60 22Z"
-				{...FILLED}
-				opacity={0.45}
-			/>
-			<path d="M4 12 L18 10 L32 13 L46 9 L60 11 L60 2 L4 2Z" {...FILLED} />
-		</TileSvg>
-	),
-	legendBottom: (
-		<LegendFrame>
-			<path
-				d="M8 15 L18 10 L28 13 L38 7 L48 9"
-				stroke="var(--bg-robin-300)"
-				strokeWidth={2}
-			/>
-			<path
-				d="M8 23 H16 M22 23 H30 M36 23 H44"
-				stroke="var(--l2-foreground)"
-				strokeWidth={2.4}
-			/>
-		</LegendFrame>
-	),
-	legendRight: (
-		<LegendFrame>
-			<path
-				d="M6 20 L14 12 L22 16 L32 8"
-				stroke="var(--bg-robin-300)"
-				strokeWidth={2}
-			/>
-			<path
-				d="M40 9 H48 M40 15 H48 M40 21 H48"
-				stroke="var(--l2-foreground)"
-				strokeWidth={2.4}
-			/>
-		</LegendFrame>
-	),
-} satisfies Record<string, JSX.Element>;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/controls/segmentIcons.tsx

@@ -0,0 +1,145 @@
+/**
+ * Small glyph icons for the panel-editor segmented/select controls, ported from the
+ * Configure-panel design. They render at 14px and inherit `currentColor` so the
+ * surrounding control can dim them when unselected and brighten them when active.
+ */
+export type SegmentIconName =
+	| 'solid-line'
+	| 'dashed-line'
+	| 'fill-none'
+	| 'fill-solid'
+	| 'fill-gradient'
+	| 'pos-bottom'
+	| 'pos-right'
+	| 'scale-linear'
+	| 'scale-log'
+	| 'interp-linear'
+	| 'interp-spline'
+	| 'interp-step-before'
+	| 'interp-step-after';
+
+function Svg({ children }: { children: React.ReactNode }): JSX.Element {
+	return (
+		<svg
+			width={14}
+			height={14}
+			viewBox="0 0 16 16"
+			fill="none"
+			stroke="currentColor"
+			strokeWidth={1.5}
+			strokeLinecap="round"
+			strokeLinejoin="round"
+			style={{ flex: 'none' }}
+			aria-hidden
+		>
+			{children}
+		</svg>
+	);
+}
+
+const FILLED = { fill: 'currentColor', stroke: 'none' } as const;
+
+export function SegmentIcon({
+	name,
+}: {
+	name: SegmentIconName;
+}): JSX.Element | null {
+	switch (name) {
+		case 'solid-line':
+			return (
+				<Svg>
+					<path d="M2 8 H14" />
+				</Svg>
+			);
+		case 'dashed-line':
+			return (
+				<Svg>
+					<path d="M2 8 H4.5" />
+					<path d="M6.75 8 H9.25" />
+					<path d="M11.5 8 H14" />
+				</Svg>
+			);
+		case 'fill-none':
+			return (
+				<Svg>
+					<path d="M2 11 L6 6 L10 9 L14 5" />
+				</Svg>
+			);
+		case 'fill-solid':
+			return (
+				<Svg>
+					<path
+						d="M2 10.5 L6 5.5 L10 8.5 L14 4.5 V13.5 H2 Z"
+						fill="currentColor"
+						fillOpacity={0.85}
+						stroke="none"
+					/>
+					<path d="M2 10.5 L6 5.5 L10 8.5 L14 4.5" />
+				</Svg>
+			);
+		case 'fill-gradient':
+			return (
+				<Svg>
+					<path
+						d="M2 10.5 L6 5.5 L10 8.5 L14 4.5 V13.5 H2 Z"
+						fill="currentColor"
+						fillOpacity={0.3}
+						stroke="none"
+					/>
+					<path d="M2 10.5 L6 5.5 L10 8.5 L14 4.5" />
+				</Svg>
+			);
+		case 'pos-bottom':
+			return (
+				<Svg>
+					<rect x={2} y={2.5} width={12} height={9} rx={1.2} />
+					<rect x={2} y={9} width={12} height={2.5} {...FILLED} />
+				</Svg>
+			);
+		case 'pos-right':
+			return (
+				<Svg>
+					<rect x={2} y={2.5} width={12} height={9} rx={1.2} />
+					<rect x={10.5} y={2.5} width={3.5} height={9} {...FILLED} />
+				</Svg>
+			);
+		case 'scale-linear':
+			return (
+				<Svg>
+					<path d="M2.5 13 L13.5 3" />
+				</Svg>
+			);
+		case 'scale-log':
+			return (
+				<Svg>
+					<path d="M2.5 13 C5 13, 8 4.5, 13.5 3" />
+				</Svg>
+			);
+		case 'interp-linear':
+			return (
+				<Svg>
+					<path d="M2 12 L6 5 L10 9 L14 4" />
+				</Svg>
+			);
+		case 'interp-spline':
+			return (
+				<Svg>
+					<path d="M2 12 C5 3, 9 3, 14 8" />
+				</Svg>
+			);
+		case 'interp-step-before':
+			return (
+				<Svg>
+					<path d="M2 6 H6 V10 H10 V4.5 H14" />
+				</Svg>
+			);
+		case 'interp-step-after':
+			return (
+				<Svg>
+					<path d="M2 10 H6 V5 H10 V9.5 H14" />
+				</Svg>
+			);
+		default:
+			return null;
+	}
+}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sectionContext.ts

@@ -16,8 +16,6 @@ export interface SectionEditorContext {
 	signal?: TelemetrytypesSignalDTO;
 	panelKind?: PanelKind;
 	onChangePanelKind?: (kind: PanelKind) => void;
-	/** Kind the panel was opened with, offered as a revert target. */
-	originalPanelKind?: PanelKind;
 	yAxisUnit?: string;
 	queryType?: EQueryType;
 	stepInterval?: number;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sectionRegistry.tsx

@@ -12,32 +12,21 @@ import {
 	type PanelChartAppearanceSlice,
 	type PanelFormattingSlice,
 	type PanelVisualizationSlice,
-	type SectionControlsOf,
 	type SectionEditorProps,
 	type SectionSpecMap,
 } from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
-import type { SeededPluginSpec } from 'pages/DashboardPage/DashboardContainer/Panels/utils/buildPluginSpec';
 
 import type { SectionEditorContext } from './sectionContext';
 import AxesSection from './sections/AxesSection/AxesSection';
-import { summarizeAxes } from './sections/AxesSection/summary';
 import BucketsSection from './sections/BucketsSection/BucketsSection';
-import { summarizeBuckets } from './sections/BucketsSection/summary';
 import ChartAppearanceSection from './sections/ChartAppearanceSection/ChartAppearanceSection';
-import { summarizeChartAppearance } from './sections/ChartAppearanceSection/summary';
 import ContextLinksSection from './sections/ContextLinksSection/ContextLinksSection';
 import FormattingSection from './sections/FormattingSection/FormattingSection';
-import { DEFAULT_DECIMAL_PRECISION } from './sections/FormattingSection/options';
-import { summarizeFormatting } from './sections/FormattingSection/summary';
 import LegendSection from './sections/LegendSection/LegendSection';
-import { summarizeLegend } from './sections/LegendSection/summary';
 import PanelHeaderSection from './sections/PanelHeaderSection/PanelHeaderSection';
-import { summarizeTextLayout } from './sections/TextLayoutSection/summary';
 import TextLayoutSection from './sections/TextLayoutSection/TextLayoutSection';
 import ThresholdsSection from './sections/ThresholdsSection/ThresholdsSection';
-import { summarizeVisualization } from './sections/VisualizationSection/summary';
 import VisualizationSection from './sections/VisualizationSection/VisualizationSection';
-import { countSummary } from './utils/summary';
 
 type PanelSpec = DashboardtypesPanelSpecDTO;
 
@@ -50,14 +39,6 @@ export interface SectionDescriptor<K extends SectionKind> {
 	Component: ComponentType<SectionEditorProps<K>>;
 	get: (spec: PanelSpec) => SectionSpecMap[K] | undefined;
 	update: (spec: PanelSpec, value: SectionSpecMap[K]) => PanelSpec;
-	/** Values an unset field renders with, when the kind's seed leaves it unset. */
-	renderedDefaults?: Partial<SectionSpecMap[K]>;
-	/** Collapsed-header digest of the slice. */
-	summarize?: (
-		value: SectionSpecMap[K] | undefined,
-		controls: SectionControlsOf<K>,
-		ctx: SectionEditorContext,
-	) => string;
 }
 
 // The plugin spec is a discriminated union over panel kinds; reading/writing a shared
@@ -97,15 +78,12 @@ export const SECTION_REGISTRY: {
 			getPluginSlice<PanelFormattingSlice>(spec, 'formatting'),
 		update: (spec, formatting): PanelSpec =>
 			updatePluginSlice(spec, 'formatting', formatting),
-		renderedDefaults: { decimalPrecision: DEFAULT_DECIMAL_PRECISION },
-		summarize: summarizeFormatting,
 	},
 	[SectionKind.Axes]: {
 		Component: AxesSection,
 		get: (spec): DashboardtypesAxesDTO | undefined =>
 			getPluginSlice<DashboardtypesAxesDTO>(spec, 'axes'),
 		update: (spec, axes): PanelSpec => updatePluginSlice(spec, 'axes', axes),
-		summarize: summarizeAxes,
 	},
 	[SectionKind.Legend]: {
 		Component: LegendSection,
@@ -113,7 +91,6 @@ export const SECTION_REGISTRY: {
 			getPluginSlice<DashboardtypesLegendDTO>(spec, 'legend'),
 		update: (spec, legend): PanelSpec =>
 			updatePluginSlice(spec, 'legend', legend),
-		summarize: summarizeLegend,
 	},
 	[SectionKind.ChartAppearance]: {
 		Component: ChartAppearanceSection,
@@ -121,7 +98,6 @@ export const SECTION_REGISTRY: {
 			getPluginSlice<PanelChartAppearanceSlice>(spec, 'chartAppearance'),
 		update: (spec, chartAppearance): PanelSpec =>
 			updatePluginSlice(spec, 'chartAppearance', chartAppearance),
-		summarize: summarizeChartAppearance,
 	},
 	[SectionKind.Visualization]: {
 		Component: VisualizationSection,
@@ -129,7 +105,6 @@ export const SECTION_REGISTRY: {
 			getPluginSlice<PanelVisualizationSlice>(spec, 'visualization'),
 		update: (spec, visualization): PanelSpec =>
 			updatePluginSlice(spec, 'visualization', visualization),
-		summarize: summarizeVisualization,
 	},
 	[SectionKind.Buckets]: {
 		Component: BucketsSection,
@@ -137,7 +112,6 @@ export const SECTION_REGISTRY: {
 			getPluginSlice<DashboardtypesHistogramBucketsDTO>(spec, 'histogramBuckets'),
 		update: (spec, buckets): PanelSpec =>
 			updatePluginSlice(spec, 'histogramBuckets', buckets),
-		summarize: summarizeBuckets,
 	},
 	[SectionKind.TextLayout]: {
 		Component: TextLayoutSection,
@@ -145,7 +119,6 @@ export const SECTION_REGISTRY: {
 			getPluginSlice<SectionSpecMap[SectionKind.TextLayout]>(spec, 'presentation'),
 		update: (spec, presentation): PanelSpec =>
 			updatePluginSlice(spec, 'presentation', presentation),
-		summarize: summarizeTextLayout,
 	},
 	[SectionKind.PanelHeader]: {
 		Component: PanelHeaderSection,
@@ -162,7 +135,6 @@ export const SECTION_REGISTRY: {
 		// Panel-level slice (spec.links), not under the plugin spec — no cast needed.
 		get: (spec): DashboardtypesLinkDTO[] => spec.links || [],
 		update: (spec, links): PanelSpec => ({ ...spec, links }),
-		summarize: (links): string => countSummary(links, 'link'),
 	},
 	// One editor for every threshold variant (label / comparison / table); the kind's
 	// `controls.variant` picks the row editor + element shape. All persist to the same
@@ -173,7 +145,6 @@ export const SECTION_REGISTRY: {
 			getPluginSlice<AnyThreshold[]>(spec, 'thresholds'),
 		update: (spec, thresholds): PanelSpec =>
 			updatePluginSlice(spec, 'thresholds', thresholds),
-		summarize: (thresholds): string => countSummary(thresholds, 'threshold'),
 	},
 };
 
@@ -188,19 +159,12 @@ export interface ErasedSectionDescriptor {
 	Component: ComponentType<
 		{
 			value: unknown;
-			defaultValue?: unknown;
 			controls?: unknown;
 			onChange: (next: unknown) => void;
 		} & SectionEditorContext
 	>;
 	get: (spec: PanelSpec) => unknown;
 	update: (spec: PanelSpec, value: unknown) => PanelSpec;
-	renderedDefaults?: object;
-	summarize?: (
-		value: unknown,
-		controls: unknown,
-		ctx: SectionEditorContext,
-	) => string;
 }
 
 export function resolveSectionEditor(
@@ -210,20 +174,3 @@ export function resolveSectionEditor(
 		| ErasedSectionDescriptor
 		| undefined;
 }
-
-/** A slice's default, read through the same lens from the kind's seeded plugin spec. */
-export function getSectionDefault(
-	editor: ErasedSectionDescriptor,
-	spec: PanelSpec,
-	defaults: SeededPluginSpec,
-): unknown {
-	const seeded = editor.get({
-		...spec,
-		links: [],
-		plugin: { ...spec.plugin, spec: defaults },
-	} as PanelSpec);
-	if (!editor.renderedDefaults) {
-		return seeded;
-	}
-	return { ...editor.renderedDefaults, ...(seeded as object | undefined) };
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/AxesSection/AxesSection.module.scss

@@ -0,0 +1,11 @@
+.bounds {
+	display: flex;
+	gap: 8px;
+}
+
+.field {
+	display: flex;
+	flex: 1;
+	flex-direction: column;
+	gap: 8px;
+}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/AxesSection/AxesSection.tsx

@@ -1,14 +1,21 @@
+import type { ChangeEvent } from 'react';
+import { Typography } from '@signozhq/ui/typography';
+import { Input } from 'antd';
 import type {
 	SectionEditorProps,
 	SectionKind,
 } from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
 
-import ConfigField from '../../controls/ConfigField/ConfigField';
-import ConfigFieldRow from '../../controls/ConfigFieldRow/ConfigFieldRow';
-import ConfigNumberInput from '../../controls/ConfigNumberInput/ConfigNumberInput';
-import ConfigTiles from '../../controls/ConfigTiles/ConfigTiles';
-import { createFieldResetter } from '../../utils/changes';
-import { AxisScale, SCALE_OPTIONS } from './options';
+import ConfigSegmented from '../../controls/ConfigSegmented/ConfigSegmented';
+
+import styles from './AxesSection.module.scss';
+
+type SoftBound = 'softMin' | 'softMax';
+
+const SCALE_OPTIONS = [
+	{ value: 'linear', label: 'Linear', icon: 'scale-linear' as const },
+	{ value: 'log', label: 'Log', icon: 'scale-log' as const },
+];
 
 /**
  * Edits the `axes` slice of a panel spec: soft Y-axis min/max bounds and the
@@ -16,53 +23,58 @@ import { AxisScale, SCALE_OPTIONS } from './options';
  */
 function AxesSection({
 	value,
-	defaultValue,
 	controls,
 	onChange,
 }: SectionEditorProps<SectionKind.Axes>): JSX.Element {
-	const reset = createFieldResetter(value, defaultValue, onChange);
+	// An empty field clears the bound (null); otherwise parse to a number, ignoring
+	// transient non-numeric input (e.g. a lone "-") by leaving the bound unset.
+	const handleBound =
+		(bound: SoftBound) =>
+		(e: ChangeEvent<HTMLInputElement>): void => {
+			const raw = e.target.value;
+			const next = raw === '' || Number.isNaN(Number(raw)) ? null : Number(raw);
+			onChange({ ...value, [bound]: next });
+		};
 
 	return (
 		<>
 			{controls.minMax && (
-				<ConfigField
-					label="Y-axis range"
-					help="The axis always shows at least this range. Data outside it still stretches the axis."
-					{...reset('softMin', 'softMax')}
-				>
-					<ConfigFieldRow>
-						<ConfigNumberInput
-							testId="panel-editor-v2-soft-min"
-							label="Min"
-							value={value?.softMin}
-							onChange={(softMin): void => onChange({ ...value, softMin })}
+				<div className={styles.bounds}>
+					<div className={styles.field}>
+						<Typography.Text>Soft min</Typography.Text>
+						<Input
+							data-testid="panel-editor-v2-soft-min"
+							type="number"
+							placeholder="Auto"
+							value={value?.softMin ?? ''}
+							onChange={handleBound('softMin')}
 						/>
-						<ConfigNumberInput
-							testId="panel-editor-v2-soft-max"
-							label="Max"
-							value={value?.softMax}
-							onChange={(softMax): void => onChange({ ...value, softMax })}
+					</div>
+					<div className={styles.field}>
+						<Typography.Text>Soft max</Typography.Text>
+						<Input
+							data-testid="panel-editor-v2-soft-max"
+							type="number"
+							placeholder="Auto"
+							value={value?.softMax ?? ''}
+							onChange={handleBound('softMax')}
 						/>
-					</ConfigFieldRow>
-				</ConfigField>
+					</div>
+				</div>
 			)}
 
 			{controls.logScale && (
-				<ConfigField
-					label="Y-axis scale"
-					help="Logarithmic spreads out values that span several orders of magnitude."
-					{...reset('isLogScale')}
-				>
-					<ConfigTiles
+				<div className={styles.field}>
+					<Typography.Text>Y-axis scale</Typography.Text>
+					<ConfigSegmented
 						testId="panel-editor-v2-log-scale"
-						aria-label="Y-axis scale"
-						value={value?.isLogScale ? AxisScale.LOG : AxisScale.LINEAR}
+						value={value?.isLogScale ? 'log' : 'linear'}
 						items={SCALE_OPTIONS}
 						onChange={(next): void =>
-							onChange({ ...value, isLogScale: next === AxisScale.LOG })
+							onChange({ ...value, isLogScale: next === 'log' })
 						}
 					/>
-				</ConfigField>
+				</div>
 			)}
 		</>
 	);

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/AxesSection/__tests__/AxesSection.test.tsx

@@ -75,7 +75,7 @@ describe('AxesSection', () => {
 			/>,
 		);
 
-		await user.click(screen.getByTestId('panel-editor-v2-log-scale-log'));
+		await user.click(screen.getByText('Log'));
 
 		expect(onChange).toHaveBeenCalledWith({ isLogScale: true });
 	});

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/AxesSection/options.ts

@@ -1,20 +0,0 @@
-import type { ConfigTileItem } from '../../controls/ConfigTiles/ConfigTiles';
-import { TILE_DRAWINGS } from '../../controls/drawings/tileDrawings';
-
-export enum AxisScale {
-	LINEAR = 'linear',
-	LOG = 'log',
-}
-
-export const SCALE_OPTIONS: ConfigTileItem<AxisScale>[] = [
-	{
-		value: AxisScale.LINEAR,
-		label: 'Linear',
-		drawing: TILE_DRAWINGS.scaleLinear,
-	},
-	{
-		value: AxisScale.LOG,
-		label: 'Logarithmic',
-		drawing: TILE_DRAWINGS.scaleLog,
-	},
-];

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/AxesSection/summary.ts

@@ -1,26 +0,0 @@
-import type { DashboardtypesAxesDTO } from 'api/generated/services/sigNoz.schemas';
-import type {
-	SectionControlsOf,
-	SectionKind,
-} from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
-
-import { joinSummary } from '../../utils/summary';
-
-function describeRange({ softMin, softMax }: DashboardtypesAxesDTO): string {
-	const hasMin = typeof softMin === 'number';
-	const hasMax = typeof softMax === 'number';
-	if (!hasMin && !hasMax) {
-		return 'auto range';
-	}
-	return `${hasMin ? softMin : 'auto'} to ${hasMax ? softMax : 'auto'}`;
-}
-
-export function summarizeAxes(
-	value: DashboardtypesAxesDTO | undefined,
-	controls: SectionControlsOf<SectionKind.Axes>,
-): string {
-	return joinSummary([
-		controls.logScale && (value?.isLogScale ? 'Log' : 'Linear'),
-		controls.minMax && describeRange(value ?? {}),
-	]);
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/BucketsSection/BucketsSection.module.scss

@@ -0,0 +1,5 @@
+.field {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/BucketsSection/BucketsSection.tsx

@@ -1,14 +1,21 @@
+import type { ChangeEvent } from 'react';
+import { Typography } from '@signozhq/ui/typography';
+import { Input } from 'antd';
+import type { DashboardtypesHistogramBucketsDTO } from 'api/generated/services/sigNoz.schemas';
 import type {
 	SectionEditorProps,
 	SectionKind,
 } from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
 
-import ConfigField from '../../controls/ConfigField/ConfigField';
-import ConfigFieldRow from '../../controls/ConfigFieldRow/ConfigFieldRow';
-import ConfigNumberInput from '../../controls/ConfigNumberInput/ConfigNumberInput';
 import ConfigSwitch from '../../controls/ConfigSwitch/ConfigSwitch';
-import { SWITCH_SKETCHES } from '../../controls/drawings/switchSketches';
-import { createFieldResetter } from '../../utils/changes';
+
+import styles from './BucketsSection.module.scss';
+
+// The two numeric bounds of the histogram-buckets spec (derived from the BE DTO).
+type NumericBound = keyof Pick<
+	DashboardtypesHistogramBucketsDTO,
+	'bucketCount' | 'bucketWidth'
+>;
 
 /**
  * Edits the `histogramBuckets` slice of a Histogram panel spec: bucket count / width
@@ -17,51 +24,55 @@ import { createFieldResetter } from '../../utils/changes';
  */
 function BucketsSection({
 	value,
-	defaultValue,
 	controls,
 	onChange,
 }: SectionEditorProps<SectionKind.Buckets>): JSX.Element {
-	const reset = createFieldResetter(value, defaultValue, onChange);
+	// Empty clears the bound to null (chart auto-sizes); otherwise parse to a number,
+	// ignoring transient non-numeric input by leaving it unset.
+	const handleNumber =
+		(bound: NumericBound) =>
+		(e: ChangeEvent<HTMLInputElement>): void => {
+			const raw = e.target.value;
+			const next = raw === '' || Number.isNaN(Number(raw)) ? null : Number(raw);
+			onChange({ ...value, [bound]: next });
+		};
 
 	return (
 		<>
-			{(controls.count || controls.width) && (
-				<ConfigField
-					label="Buckets"
-					help="How values are grouped into bars. Leave on Auto to size buckets from the data."
-					{...reset('bucketCount', 'bucketWidth')}
-				>
-					<ConfigFieldRow>
-						{controls.count && (
-							<ConfigNumberInput
-								testId="panel-editor-v2-bucket-count"
-								label="Count"
-								value={value?.bucketCount}
-								onChange={(bucketCount): void => onChange({ ...value, bucketCount })}
-							/>
-						)}
-						{controls.width && (
-							<ConfigNumberInput
-								testId="panel-editor-v2-bucket-width"
-								label="Width"
-								value={value?.bucketWidth}
-								onChange={(bucketWidth): void => onChange({ ...value, bucketWidth })}
-							/>
-						)}
-					</ConfigFieldRow>
-				</ConfigField>
+			{controls.count && (
+				<div className={styles.field}>
+					<Typography.Text>Bucket count</Typography.Text>
+					<Input
+						data-testid="panel-editor-v2-bucket-count"
+						type="number"
+						placeholder="Auto"
+						value={value?.bucketCount ?? ''}
+						onChange={handleNumber('bucketCount')}
+					/>
+				</div>
+			)}
+
+			{controls.width && (
+				<div className={styles.field}>
+					<Typography.Text>Bucket width</Typography.Text>
+					<Input
+						data-testid="panel-editor-v2-bucket-width"
+						type="number"
+						placeholder="Auto"
+						value={value?.bucketWidth ?? ''}
+						onChange={handleNumber('bucketWidth')}
+					/>
+				</div>
 			)}
 
 			{controls.mergeQueries && (
 				<ConfigSwitch
 					testId="panel-editor-v2-merge-queries"
-					title="Combine queries"
-					description="Puts every active query into one distribution. Hides the legend."
-					sketch={SWITCH_SKETCHES.combine}
-					changed={reset('mergeAllActiveQueries').changed}
+					title="Merge active queries"
+					description="Bucket all active queries together into one distribution"
 					value={value?.mergeAllActiveQueries ?? false}
-					onChange={(mergeAllActiveQueries): void =>
-						onChange({ ...value, mergeAllActiveQueries })
+					onChange={(checked): void =>
+						onChange({ ...value, mergeAllActiveQueries: checked })
 					}
 				/>
 			)}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/BucketsSection/summary.ts

@@ -1,15 +0,0 @@
-import type { DashboardtypesHistogramBucketsDTO } from 'api/generated/services/sigNoz.schemas';
-
-import { joinSummary } from '../../utils/summary';
-
-export function summarizeBuckets(
-	value: DashboardtypesHistogramBucketsDTO | undefined,
-): string {
-	const custom =
-		typeof value?.bucketCount === 'number' ||
-		typeof value?.bucketWidth === 'number';
-	return joinSummary([
-		custom ? 'Custom' : 'Auto',
-		value?.mergeAllActiveQueries && 'combined',
-	]);
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ChartAppearanceSection/ChartAppearanceSection.module.scss

@@ -1,27 +1,7 @@
-.inset {
+.field {
 	display: flex;
 	flex-direction: column;
-	gap: 10px;
-	padding: 12px 14px;
-	border: 1px solid var(--l1-border);
-	border-radius: 4px;
-	background: var(--l2-background);
-}
-
-.insetRow {
-	flex-direction: row;
-	align-items: center;
-	gap: 12px;
-}
-
-.insetLabel {
-	font-size: 13px;
-	color: var(--l1-foreground);
-}
-
-.opacitySlider {
-	flex: 1;
-	min-width: 0;
+	gap: 8px;
 }
 
 .thresholdField {

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ChartAppearanceSection/ChartAppearanceSection.tsx

@@ -1,31 +1,91 @@
-import cx from 'classnames';
-import { resolveFillOpacity } from 'lib/uPlotV2/utils/fillOpacity';
+import { Typography } from '@signozhq/ui/typography';
+import {
+	DashboardtypesFillModeDTO,
+	DashboardtypesLineInterpolationDTO,
+	DashboardtypesLineStyleDTO,
+} from 'api/generated/services/sigNoz.schemas';
 import type {
 	SectionEditorProps,
 	SectionKind,
 } from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
 
-import ConfigField from '../../controls/ConfigField/ConfigField';
+import { resolveFillOpacity } from 'lib/uPlotV2/utils/fillOpacity';
+
+import ConfigSegmented from '../../controls/ConfigSegmented/ConfigSegmented';
+import ConfigSelect from '../../controls/ConfigSelect/ConfigSelect';
 import ConfigSlider from '../../controls/ConfigSlider/ConfigSlider';
 import ConfigSwitch from '../../controls/ConfigSwitch/ConfigSwitch';
-import ConfigTiles from '../../controls/ConfigTiles/ConfigTiles';
-import { SWITCH_SKETCHES } from '../../controls/drawings/switchSketches';
+import { SegmentIcon } from '../../controls/segmentIcons';
 import type { SectionEditorContext } from '../../sectionContext';
-import { createFieldResetter } from '../../utils/changes';
 import DisconnectValuesField from './DisconnectValuesField';
-import {
-	FILL_MODE_OPTIONS,
-	FILLED_FILL_MODE_OPTIONS,
-	LINE_INTERPOLATION_HELP,
-	LINE_INTERPOLATION_OPTIONS,
-	LINE_STYLE_OPTIONS,
-} from './options';
-import { formatOpacity } from './utils';
 
 import styles from './ChartAppearanceSection.module.scss';
 
+const LINE_STYLE_OPTIONS = [
+	{
+		value: DashboardtypesLineStyleDTO.solid,
+		label: 'Solid',
+		icon: 'solid-line' as const,
+	},
+	{
+		value: DashboardtypesLineStyleDTO.dashed,
+		label: 'Dashed',
+		icon: 'dashed-line' as const,
+	},
+];
+
+const LINE_INTERPOLATION_OPTIONS = [
+	{
+		value: DashboardtypesLineInterpolationDTO.linear,
+		label: 'Linear',
+		icon: <SegmentIcon name="interp-linear" />,
+	},
+	{
+		value: DashboardtypesLineInterpolationDTO.spline,
+		label: 'Spline',
+		icon: <SegmentIcon name="interp-spline" />,
+	},
+	{
+		value: DashboardtypesLineInterpolationDTO.step_before,
+		label: 'Step before',
+		icon: <SegmentIcon name="interp-step-before" />,
+	},
+	{
+		value: DashboardtypesLineInterpolationDTO.step_after,
+		label: 'Step after',
+		icon: <SegmentIcon name="interp-step-after" />,
+	},
+];
+
+const FILL_MODE_OPTIONS = [
+	{
+		value: DashboardtypesFillModeDTO.none,
+		label: 'None',
+		icon: 'fill-none' as const,
+	},
+	{
+		value: DashboardtypesFillModeDTO.solid,
+		label: 'Solid',
+		icon: 'fill-solid' as const,
+	},
+	{
+		value: DashboardtypesFillModeDTO.gradient,
+		label: 'Gradient',
+		icon: 'fill-gradient' as const,
+	},
+];
+
+// An always-filled kind's wire enum (`AreaFillMode`) has no `none`.
+const FILLED_FILL_MODE_OPTIONS = FILL_MODE_OPTIONS.filter(
+	(option) => option.value !== DashboardtypesFillModeDTO.none,
+);
+
 const FILL_OPACITY_STEP = 0.01;
 
+function formatOpacity(opacity: number): string {
+	return `${Math.round(opacity * 100)}%`;
+}
+
 /**
  * Edits the `chartAppearance` slice of a TimeSeries panel spec: line style /
  * interpolation, fill mode, fill opacity, point markers, and the connect-null-gaps
@@ -33,90 +93,84 @@ const FILL_OPACITY_STEP = 0.01;
  */
 function ChartAppearanceSection({
 	value,
-	defaultValue,
 	controls,
 	onChange,
 	stepInterval,
 }: SectionEditorProps<SectionKind.ChartAppearance> &
 	Pick<SectionEditorContext, 'stepInterval'>): JSX.Element {
-	const reset = createFieldResetter(value, defaultValue, onChange);
-	const interpolation = value?.lineInterpolation;
-
 	return (
 		<>
 			{controls.lineStyle && (
-				<ConfigField label="Line" {...reset('lineStyle')}>
-					<ConfigTiles
+				<div className={styles.field}>
+					<Typography.Text>Line style</Typography.Text>
+					<ConfigSegmented
 						testId="panel-editor-v2-line-style"
-						aria-label="Line style"
 						value={value?.lineStyle}
 						items={LINE_STYLE_OPTIONS}
-						onChange={(lineStyle): void => onChange({ ...value, lineStyle })}
+						onChange={(next): void =>
+							onChange({ ...value, lineStyle: next as DashboardtypesLineStyleDTO })
+						}
 					/>
-				</ConfigField>
+				</div>
 			)}
 
 			{controls.lineInterpolation && (
-				<ConfigField
-					label="How points connect"
-					help={interpolation && LINE_INTERPOLATION_HELP[interpolation]}
-					{...reset('lineInterpolation')}
-				>
-					<ConfigTiles
+				<div className={styles.field}>
+					<Typography.Text>Line interpolation</Typography.Text>
+					<ConfigSelect
 						testId="panel-editor-v2-line-interpolation"
-						aria-label="How points connect"
-						value={interpolation}
+						placeholder="Select interpolation…"
+						value={value?.lineInterpolation}
 						items={LINE_INTERPOLATION_OPTIONS}
-						onChange={(lineInterpolation): void =>
-							onChange({ ...value, lineInterpolation })
+						onChange={(next): void =>
+							onChange({
+								...value,
+								lineInterpolation: next,
+							})
 						}
 					/>
-				</ConfigField>
+				</div>
 			)}
 
 			{controls.fillMode && (
-				<ConfigField
-					label="Area under the line"
-					{...reset('fillMode', 'fillOpacity')}
-				>
-					<ConfigTiles
+				<div className={styles.field}>
+					<Typography.Text>Fill mode</Typography.Text>
+					<ConfigSegmented
 						testId="panel-editor-v2-fill-mode"
-						aria-label="Area under the line"
 						value={value?.fillMode}
 						items={
 							controls.fillOpacity ? FILLED_FILL_MODE_OPTIONS : FILL_MODE_OPTIONS
 						}
-						onChange={(fillMode): void => onChange({ ...value, fillMode })}
+						onChange={(next): void =>
+							onChange({ ...value, fillMode: next as DashboardtypesFillModeDTO })
+						}
 					/>
-					{controls.fillOpacity && (
-						<div className={cx(styles.inset, styles.insetRow)}>
-							<span className={styles.insetLabel}>Opacity</span>
-							<div className={styles.opacitySlider}>
-								<ConfigSlider
-									testId="panel-editor-v2-fill-opacity"
-									// The chart's own default, so the thumb starts where an unset fill renders.
-									value={resolveFillOpacity(value?.fillOpacity)}
-									min={0}
-									max={1}
-									step={FILL_OPACITY_STEP}
-									formatValue={formatOpacity}
-									onChange={(fillOpacity): void => onChange({ ...value, fillOpacity })}
-								/>
-							</div>
-						</div>
-					)}
-				</ConfigField>
+				</div>
+			)}
+
+			{controls.fillOpacity && (
+				<div className={styles.field}>
+					<Typography.Text>Fill opacity</Typography.Text>
+					<ConfigSlider
+						testId="panel-editor-v2-fill-opacity"
+						// The chart's own default, so the thumb starts where an unset fill renders.
+						value={resolveFillOpacity(value?.fillOpacity)}
+						min={0}
+						max={1}
+						step={FILL_OPACITY_STEP}
+						formatValue={formatOpacity}
+						onChange={(fillOpacity): void => onChange({ ...value, fillOpacity })}
+					/>
+				</div>
 			)}
 
 			{controls.showPoints && (
 				<ConfigSwitch
 					testId="panel-editor-v2-show-points"
 					title="Show points"
-					description="Marks each sample the query returned."
-					sketch={SWITCH_SKETCHES.points}
-					changed={reset('showPoints').changed}
+					description="Display individual data points on the chart"
 					value={value?.showPoints ?? false}
-					onChange={(showPoints): void => onChange({ ...value, showPoints })}
+					onChange={(checked): void => onChange({ ...value, showPoints: checked })}
 				/>
 			)}
 
@@ -125,7 +179,6 @@ function ChartAppearanceSection({
 					testId="panel-editor-v2-span-gaps"
 					value={value?.spanGaps}
 					stepInterval={stepInterval}
-					{...reset('spanGaps')}
 					onChange={(spanGaps): void => onChange({ ...value, spanGaps })}
 				/>
 			)}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ChartAppearanceSection/DisconnectValuesField.tsx

@@ -1,16 +1,24 @@
 import { useEffect, useState } from 'react';
+import { rangeUtil } from '@grafana/data';
+import { Typography } from '@signozhq/ui/typography';
 import type { DashboardtypesSpanGapsDTO } from 'api/generated/services/sigNoz.schemas';
 
-import ConfigField from '../../controls/ConfigField/ConfigField';
-import ConfigTiles from '../../controls/ConfigTiles/ConfigTiles';
-import type { FieldResetProps } from '../../utils/changes';
+import ConfigSegmented from '../../controls/ConfigSegmented/ConfigSegmented';
 import DisconnectValuesThresholdInput from './DisconnectValuesThresholdInput';
-import { DISCONNECT_MODE_OPTIONS, DisconnectValuesMode } from './options';
-import { defaultDisconnectDuration } from './utils';
 
 import styles from './ChartAppearanceSection.module.scss';
 
-interface DisconnectValuesFieldProps extends FieldResetProps {
+const DEFAULT_THRESHOLD = '1m';
+enum DisconnectValuesMode {
+	NEVER = 'never',
+	THRESHOLD = 'threshold',
+}
+const MODE_OPTIONS = [
+	{ value: DisconnectValuesMode.NEVER, label: 'Never' },
+	{ value: DisconnectValuesMode.THRESHOLD, label: 'Threshold' },
+];
+
+interface DisconnectValuesFieldProps {
 	testId: string;
 	value: DashboardtypesSpanGapsDTO | undefined;
 	/** Query step interval (seconds): seeds the default threshold and floors it. */
@@ -18,6 +26,13 @@ interface DisconnectValuesFieldProps extends FieldResetProps {
 	onChange: (next: DashboardtypesSpanGapsDTO | undefined) => void;
 }
 
+/** Default threshold duration: the step interval (smallest meaningful), else 1m. */
+function defaultDuration(stepInterval?: number): string {
+	return stepInterval && stepInterval > 0
+		? rangeUtil.secondsToHms(stepInterval)
+		: DEFAULT_THRESHOLD;
+}
+
 /**
  * "Disconnect values": Never (span every gap — the chart default) vs Threshold
  * (only bridge gaps shorter than a duration). The threshold persists as a
@@ -28,8 +43,6 @@ function DisconnectValuesField({
 	testId,
 	value,
 	stepInterval,
-	changed,
-	onReset,
 	onChange,
 }: DisconnectValuesFieldProps): JSX.Element {
 	const duration = value?.fillLessThan || undefined;
@@ -50,7 +63,7 @@ function DisconnectValuesField({
 				...value,
 				fillOnlyBelow: true,
 				// Seed from the live stepInterval (async — undefined until results load), not mount.
-				fillLessThan: lastDuration ?? defaultDisconnectDuration(stepInterval),
+				fillLessThan: lastDuration ?? defaultDuration(stepInterval),
 			});
 			return;
 		}
@@ -59,24 +72,21 @@ function DisconnectValuesField({
 	};
 
 	return (
-		<ConfigField
-			label="When data is missing"
-			help="Breaking the line makes outages and restarts visible."
-			changed={changed}
-			onReset={onReset}
-		>
-			<ConfigTiles
-				testId={testId}
-				aria-label="When data is missing"
-				value={
-					isThreshold ? DisconnectValuesMode.THRESHOLD : DisconnectValuesMode.NEVER
-				}
-				items={DISCONNECT_MODE_OPTIONS}
-				onChange={handleMode}
-			/>
+		<>
+			<div className={styles.field}>
+				<Typography.Text>Disconnect values</Typography.Text>
+				<ConfigSegmented
+					testId={testId}
+					value={
+						isThreshold ? DisconnectValuesMode.THRESHOLD : DisconnectValuesMode.NEVER
+					}
+					items={MODE_OPTIONS}
+					onChange={handleMode}
+				/>
+			</div>
 			{isThreshold && duration && (
-				<div className={styles.inset}>
-					<span className={styles.insetLabel}>Break when a gap is longer than</span>
+				<div className={styles.field}>
+					<Typography.Text>Threshold value</Typography.Text>
 					<DisconnectValuesThresholdInput
 						testId={`${testId}-value`}
 						value={duration}
@@ -87,7 +97,7 @@ function DisconnectValuesField({
 					/>
 				</div>
 			)}
-		</ConfigField>
+		</>
 	);
 }
 

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ChartAppearanceSection/__tests__/ChartAppearanceSection.test.tsx

@@ -30,6 +30,16 @@ function StatefulSpanGaps({
 	);
 }
 
+// Open the antd Select by clicking its selector, then pick the option by label. The
+// line-style and fill-mode controls are ConfigSegmented (buttons), so this helper is
+// only used for the line-interpolation ConfigSelect.
+async function pickOption(triggerTestId: string, label: string): Promise<void> {
+	const user = userEvent.setup();
+	const trigger = screen.getByTestId(triggerTestId);
+	await user.click(trigger.querySelector('.ant-select-selector') as HTMLElement);
+	await user.click(await screen.findByRole('option', { name: label }));
+}
+
 const ALL_CONTROLS = {
 	lineStyle: true,
 	lineInterpolation: true,
@@ -99,7 +109,7 @@ describe('ChartAppearanceSection', () => {
 		render(
 			<ChartAppearanceSection
 				value={undefined}
-				controls={{ fillMode: true, fillOpacity: true }}
+				controls={{ fillOpacity: true }}
 				onChange={jest.fn()}
 			/>,
 		);
@@ -116,7 +126,7 @@ describe('ChartAppearanceSection', () => {
 		render(
 			<ChartAppearanceSection
 				value={{ fillOpacity: 0.25 }}
-				controls={{ fillMode: true, fillOpacity: true }}
+				controls={{ fillOpacity: true }}
 				onChange={jest.fn()}
 			/>,
 		);
@@ -155,7 +165,7 @@ describe('ChartAppearanceSection', () => {
 		expect(screen.getByText('Gradient')).toBeInTheDocument();
 	});
 
-	it('writes the chosen line interpolation through the tiles', async () => {
+	it('writes the chosen line interpolation through the dropdown', async () => {
 		const onChange = jest.fn();
 		render(
 			<ChartAppearanceSection
@@ -165,9 +175,7 @@ describe('ChartAppearanceSection', () => {
 			/>,
 		);
 
-		await userEvent
-			.setup()
-			.click(screen.getByTestId('panel-editor-v2-line-interpolation-spline'));
+		await pickOption('panel-editor-v2-line-interpolation', 'Spline');
 
 		expect(onChange).toHaveBeenCalledWith({ lineInterpolation: 'spline' });
 	});
@@ -197,9 +205,7 @@ describe('ChartAppearanceSection', () => {
 			/>,
 		);
 
-		expect(
-			screen.getByTestId('panel-editor-v2-span-gaps-never'),
-		).toBeInTheDocument();
+		expect(screen.getByText('Never')).toBeInTheDocument();
 		expect(
 			screen.queryByTestId('panel-editor-v2-span-gaps-value'),
 		).not.toBeInTheDocument();
@@ -216,7 +222,7 @@ describe('ChartAppearanceSection', () => {
 			/>,
 		);
 
-		await user.click(screen.getByTestId('panel-editor-v2-span-gaps-threshold'));
+		await user.click(screen.getByText('Threshold'));
 
 		expect(onChange).toHaveBeenLastCalledWith({
 			spanGaps: { fillOnlyBelow: true, fillLessThan: '1m' },
@@ -278,7 +284,7 @@ describe('ChartAppearanceSection', () => {
 			/>,
 		);
 
-		await user.click(screen.getByTestId('panel-editor-v2-span-gaps-never'));
+		await user.click(screen.getByText('Never'));
 
 		expect(onChange).toHaveBeenLastCalledWith({
 			spanGaps: { fillOnlyBelow: false, fillLessThan: undefined },
@@ -354,7 +360,7 @@ describe('ChartAppearanceSection', () => {
 			/>,
 		);
 
-		await user.click(screen.getByTestId('panel-editor-v2-span-gaps-threshold'));
+		await user.click(screen.getByText('Threshold'));
 
 		expect(onChange).toHaveBeenLastCalledWith({
 			spanGaps: { fillOnlyBelow: true, fillLessThan: '5m' },
@@ -382,7 +388,7 @@ describe('ChartAppearanceSection', () => {
 			/>,
 		);
 
-		await user.click(screen.getByTestId('panel-editor-v2-span-gaps-threshold'));
+		await user.click(screen.getByText('Threshold'));
 
 		// Regression: a value seeded at mount would still be the 1m fallback.
 		expect(onChange).toHaveBeenLastCalledWith({
@@ -436,7 +442,7 @@ describe('ChartAppearanceSection', () => {
 
 		// Focus the input first so clicking Never also fires its blur (the toggle race).
 		await user.click(screen.getByTestId('panel-editor-v2-span-gaps-value'));
-		await user.click(screen.getByTestId('panel-editor-v2-span-gaps-never'));
+		await user.click(screen.getByText('Never'));
 
 		expect(
 			screen.queryByTestId('panel-editor-v2-span-gaps-value'),
@@ -447,8 +453,8 @@ describe('ChartAppearanceSection', () => {
 		const user = userEvent.setup();
 		render(<StatefulSpanGaps initial={{ spanGaps: { fillLessThan: '5m' } }} />);
 
-		await user.click(screen.getByTestId('panel-editor-v2-span-gaps-never'));
-		await user.click(screen.getByTestId('panel-editor-v2-span-gaps-threshold'));
+		await user.click(screen.getByText('Never'));
+		await user.click(screen.getByText('Threshold'));
 
 		expect(screen.getByTestId('panel-editor-v2-span-gaps-value')).toHaveValue(
 			'5m',

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ChartAppearanceSection/options.ts

@@ -1,101 +0,0 @@
-import {
-	DashboardtypesFillModeDTO,
-	DashboardtypesLineInterpolationDTO,
-	DashboardtypesLineStyleDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-import type { ConfigTileItem } from '../../controls/ConfigTiles/ConfigTiles';
-import { TILE_DRAWINGS } from '../../controls/drawings/tileDrawings';
-
-export const LINE_STYLE_OPTIONS: ConfigTileItem<DashboardtypesLineStyleDTO>[] =
-	[
-		{
-			value: DashboardtypesLineStyleDTO.solid,
-			label: 'Solid',
-			drawing: TILE_DRAWINGS.lineSolid,
-		},
-		{
-			value: DashboardtypesLineStyleDTO.dashed,
-			label: 'Dashed',
-			drawing: TILE_DRAWINGS.lineDashed,
-		},
-	];
-
-export const LINE_INTERPOLATION_OPTIONS: ConfigTileItem<DashboardtypesLineInterpolationDTO>[] =
-	[
-		{
-			value: DashboardtypesLineInterpolationDTO.linear,
-			label: 'Straight',
-			drawing: TILE_DRAWINGS.interpLinear,
-		},
-		{
-			value: DashboardtypesLineInterpolationDTO.spline,
-			label: 'Smooth',
-			drawing: TILE_DRAWINGS.interpSpline,
-		},
-		{
-			value: DashboardtypesLineInterpolationDTO.step_before,
-			label: 'Step before',
-			drawing: TILE_DRAWINGS.interpStepBefore,
-		},
-		{
-			value: DashboardtypesLineInterpolationDTO.step_after,
-			label: 'Step after',
-			drawing: TILE_DRAWINGS.interpStepAfter,
-		},
-	];
-
-export const LINE_INTERPOLATION_HELP: Record<
-	DashboardtypesLineInterpolationDTO,
-	string
-> = {
-	[DashboardtypesLineInterpolationDTO.linear]:
-		'Joins each point with a straight line.',
-	[DashboardtypesLineInterpolationDTO.spline]:
-		'Curves through each point. Can overshoot between points.',
-	[DashboardtypesLineInterpolationDTO.step_before]:
-		'Jumps to each new value before its timestamp.',
-	[DashboardtypesLineInterpolationDTO.step_after]:
-		'Holds each value until the next point arrives.',
-};
-
-export const FILL_MODE_OPTIONS: ConfigTileItem<DashboardtypesFillModeDTO>[] = [
-	{
-		value: DashboardtypesFillModeDTO.none,
-		label: 'None',
-		drawing: TILE_DRAWINGS.fillNone,
-	},
-	{
-		value: DashboardtypesFillModeDTO.solid,
-		label: 'Solid',
-		drawing: TILE_DRAWINGS.fillSolid,
-	},
-	{
-		value: DashboardtypesFillModeDTO.gradient,
-		label: 'Gradient',
-		drawing: TILE_DRAWINGS.fillGradient,
-	},
-];
-
-// An always-filled kind's wire enum (`AreaFillMode`) has no `none`.
-export const FILLED_FILL_MODE_OPTIONS = FILL_MODE_OPTIONS.filter(
-	(option) => option.value !== DashboardtypesFillModeDTO.none,
-);
-
-export enum DisconnectValuesMode {
-	NEVER = 'never',
-	THRESHOLD = 'threshold',
-}
-
-export const DISCONNECT_MODE_OPTIONS: ConfigTileItem<DisconnectValuesMode>[] = [
-	{
-		value: DisconnectValuesMode.NEVER,
-		label: 'Connect the line',
-		drawing: TILE_DRAWINGS.gapsConnect,
-	},
-	{
-		value: DisconnectValuesMode.THRESHOLD,
-		label: 'Break long gaps',
-		drawing: TILE_DRAWINGS.gapsBreak,
-	},
-];

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ChartAppearanceSection/summary.ts

@@ -1,41 +0,0 @@
-import {
-	DashboardtypesFillModeDTO,
-	DashboardtypesLineStyleDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import type {
-	PanelChartAppearanceSlice,
-	SectionControlsOf,
-	SectionKind,
-} from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
-
-import { joinSummary } from '../../utils/summary';
-import { FILL_MODE_OPTIONS, LINE_INTERPOLATION_OPTIONS } from './options';
-
-function describeLine(value: PanelChartAppearanceSlice): string | undefined {
-	const interpolation = LINE_INTERPOLATION_OPTIONS.find(
-		(option) => option.value === value.lineInterpolation,
-	)?.label;
-	const dashed = value.lineStyle === DashboardtypesLineStyleDTO.dashed;
-	if (!interpolation) {
-		return dashed ? 'Dashed' : undefined;
-	}
-	return dashed ? `${interpolation}, dashed` : interpolation;
-}
-
-export function summarizeChartAppearance(
-	value: PanelChartAppearanceSlice | undefined,
-	controls: SectionControlsOf<SectionKind.ChartAppearance>,
-): string {
-	const appearance = value ?? {};
-	const fill = FILL_MODE_OPTIONS.find(
-		(option) =>
-			option.value === (appearance.fillMode ?? DashboardtypesFillModeDTO.none),
-	);
-	return joinSummary([
-		(controls.lineStyle || controls.lineInterpolation) &&
-			describeLine(appearance),
-		controls.fillMode && fill && `${fill.label} fill`,
-		controls.showPoints && appearance.showPoints && 'points',
-		controls.spanGaps && appearance.spanGaps?.fillOnlyBelow && 'breaks gaps',
-	]);
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ChartAppearanceSection/utils.ts

@@ -1,14 +0,0 @@
-import { rangeUtil } from '@grafana/data';
-
-const DEFAULT_DISCONNECT_DURATION = '1m';
-
-/** The step interval (smallest meaningful gap), else 1m. */
-export function defaultDisconnectDuration(stepInterval?: number): string {
-	return stepInterval && stepInterval > 0
-		? rangeUtil.secondsToHms(stepInterval)
-		: DEFAULT_DISCONNECT_DURATION;
-}
-
-export function formatOpacity(opacity: number): string {
-	return `${Math.round(opacity * 100)}%`;
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinksSection.module.scss

@@ -1,13 +1,7 @@
 .list {
 	display: flex;
 	flex-direction: column;
-	gap: 14px;
-}
-
-.help {
-	font-size: 13px;
-	line-height: 19px;
-	color: var(--l2-foreground);
+	gap: 8px;
 }
 
 /* --- Saved-link list item --- */
@@ -15,15 +9,10 @@
 	display: flex;
 	align-items: center;
 	justify-content: space-between;
-	gap: 14px;
-	padding: 8px 10px 8px 16px;
-	border: 1px solid var(--l1-border);
-	border-radius: 4px;
-	background: var(--l2-background);
-
-	&:hover {
-		border-color: var(--l2-border);
-	}
+	gap: 8px;
+	padding: 8px 10px;
+	border: 1px solid var(--l2-border);
+	border-radius: 6px;
 }
 
 .listItemText {
@@ -43,13 +32,12 @@
 
 .listItemLabel {
 	font-size: 13px;
-	color: var(--l1-foreground);
+	color: var(--text-vanilla-100);
 }
 
 .listItemUrl {
-	font-family: 'Geist Mono', monospace;
-	font-size: 12px;
-	color: var(--l2-foreground);
+	font-size: 11px;
+	color: var(--text-vanilla-400);
 }
 
 .listItemActions {

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinksSection.tsx

@@ -61,10 +61,6 @@ function ContextLinksSection({
 
 	return (
 		<div className={styles.list}>
-			<span className={styles.help}>
-				Links appear in a menu when someone clicks a data point. Variables pass the
-				clicked series and time range along.
-			</span>
 			{links.map((link, index) => (
 				<ContextLinkListItem
 					// Links have no stable id on the wire; index is the row identity here.
@@ -85,7 +81,7 @@ function ContextLinksSection({
 				data-testid="panel-editor-v2-add-link"
 				onClick={openAddDialog}
 			>
-				Add link
+				Add Context Link
 			</Button>
 
 			<ContextLinkDialog

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/FormattingSection/ColumnUnits.tsx

@@ -31,7 +31,7 @@ function ColumnUnits({
 	if (columns.length === 0) {
 		return (
 			<Typography.Text className={styles.columnUnitsHint}>
-				Run the query to set a unit for each value column.
+				Run the panel to set per-column units.
 			</Typography.Text>
 		);
 	}
@@ -50,7 +50,7 @@ function ColumnUnits({
 		<div className={styles.columnUnits}>
 			{columns.map((column) => (
 				<div className={styles.columnField} key={column.key}>
-					<span className={styles.columnLabel}>{column.label}</span>
+					<Typography.Text>{column.label}</Typography.Text>
 					<YAxisUnitSelector
 						data-testid={`panel-editor-v2-column-unit-${column.key}`}
 						placeholder="Select unit"

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/FormattingSection/DecimalsField.tsx

@@ -1,53 +0,0 @@
-import type { DashboardtypesPrecisionOptionDTO } from 'api/generated/services/sigNoz.schemas';
-import { resolveDecimalPrecision } from 'pages/DashboardPage/DashboardContainer/Panels/utils/chartAppearance/resolvers';
-import { formatPanelValue } from 'pages/DashboardPage/DashboardContainer/Panels/utils/formatPanelValue';
-
-import ConfigField from '../../controls/ConfigField/ConfigField';
-import ConfigTiles from '../../controls/ConfigTiles/ConfigTiles';
-import type { FieldResetProps } from '../../utils/changes';
-import {
-	DECIMAL_OPTIONS,
-	DECIMALS_PREVIEW_VALUE,
-	DEFAULT_DECIMAL_PRECISION,
-} from './options';
-
-import styles from './FormattingSection.module.scss';
-
-interface DecimalsFieldProps extends FieldResetProps {
-	value: DashboardtypesPrecisionOptionDTO | undefined;
-	unit?: string;
-	onChange: (next: DashboardtypesPrecisionOptionDTO) => void;
-}
-
-function DecimalsField({
-	value = DEFAULT_DECIMAL_PRECISION,
-	unit,
-	changed,
-	onReset,
-	onChange,
-}: DecimalsFieldProps): JSX.Element {
-	return (
-		<ConfigField label="Decimal places" changed={changed} onReset={onReset}>
-			<ConfigTiles
-				compact
-				testId="panel-editor-v2-decimals"
-				aria-label="Decimal places"
-				value={value}
-				items={DECIMAL_OPTIONS}
-				onChange={onChange}
-			/>
-			<div className={styles.preview}>
-				<span className={styles.previewLabel}>Shows as</span>
-				<span className={styles.previewValue} data-testid="decimals-preview">
-					{formatPanelValue(
-						DECIMALS_PREVIEW_VALUE,
-						unit,
-						resolveDecimalPrecision(value),
-					)}
-				</span>
-			</div>
-		</ConfigField>
-	);
-}
-
-export default DecimalsField;

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/FormattingSection/FormattingSection.module.scss

@@ -1,3 +1,9 @@
+.field {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+}
+
 .unitSelector {
 	:global(.ant-select) {
 		width: 100%;
@@ -7,31 +13,11 @@
 	}
 }
 
-.preview {
-	display: flex;
-	align-items: baseline;
-	gap: 8px;
-	padding: 12px 14px;
-	border-radius: 4px;
-	background: var(--l2-background);
-}
-
-.previewLabel {
-	font-size: 12px;
-	color: var(--l2-foreground);
-}
-
-.previewValue {
-	font-family: 'Geist Mono', monospace;
-	font-size: 15px;
-	color: var(--l1-foreground);
-}
-
 // Stacked per-column unit pickers; each column keeps the standard field layout.
 .columnUnits {
 	display: flex;
 	flex-direction: column;
-	gap: 10px;
+	gap: 12px;
 
 	:global(.ant-select) {
 		width: 100%;
@@ -45,15 +31,10 @@
 
 .columnField {
 	display: flex;
-	flex-direction: column;
-	gap: 6px;
+	flex-direction: row;
+	align-items: center;
+	gap: 16px;
 }
-
-.columnLabel {
-	font-size: 13px;
-	color: var(--l1-foreground);
-}
-
 .columnUnitSelector {
 	flex: 1;
 }

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/FormattingSection/FormattingSection.tsx

@@ -1,3 +1,5 @@
+import { Typography } from '@signozhq/ui/typography';
+import { DashboardtypesPrecisionOptionDTO } from 'api/generated/services/sigNoz.schemas';
 import YAxisUnitSelector from 'components/YAxisUnitSelector';
 import { YAxisSource } from 'components/YAxisUnitSelector/types';
 import type {
@@ -5,17 +7,28 @@ import type {
 	SectionKind,
 } from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
 
-import ConfigField from '../../controls/ConfigField/ConfigField';
+import ConfigSelect from '../../controls/ConfigSelect/ConfigSelect';
 import type { SectionEditorContext } from '../../sectionContext';
-import { createFieldResetter } from '../../utils/changes';
 import ColumnUnits from './ColumnUnits';
-import DecimalsField from './DecimalsField';
 
 import styles from './FormattingSection.module.scss';
 
 type FormattingSectionProps = SectionEditorProps<SectionKind.Formatting> &
 	Pick<SectionEditorContext, 'tableColumns' | 'metricUnit'>;
 
+// `full` means "show the raw value, no rounding"; the digits round to that many places.
+const DECIMAL_OPTIONS: {
+	value: DashboardtypesPrecisionOptionDTO;
+	label: string;
+}[] = [
+	{ value: DashboardtypesPrecisionOptionDTO.NUMBER_0, label: '0 decimals' },
+	{ value: DashboardtypesPrecisionOptionDTO.NUMBER_1, label: '1 decimal' },
+	{ value: DashboardtypesPrecisionOptionDTO.NUMBER_2, label: '2 decimals' },
+	{ value: DashboardtypesPrecisionOptionDTO.NUMBER_3, label: '3 decimals' },
+	{ value: DashboardtypesPrecisionOptionDTO.NUMBER_4, label: '4 decimals' },
+	{ value: DashboardtypesPrecisionOptionDTO.full, label: 'Full' },
+];
+
 /**
  * Edits the `formatting` slice of a panel spec (unit + decimal precision). Which
  * controls show is driven by the per-kind `controls` flags; the spec slice itself
@@ -23,22 +36,16 @@ type FormattingSectionProps = SectionEditorProps<SectionKind.Formatting> &
  */
 function FormattingSection({
 	value,
-	defaultValue,
 	controls,
 	onChange,
 	tableColumns = [],
 	metricUnit,
 }: FormattingSectionProps): JSX.Element {
-	const reset = createFieldResetter(value, defaultValue, onChange);
-
 	return (
 		<>
 			{controls.unit && (
-				<ConfigField
-					label="Unit"
-					help="Labels values, axis ticks and tooltips. With milliseconds, 1500 shows as 1.5 s."
-					{...reset('unit')}
-				>
+				<div className={styles.field}>
+					<Typography.Text>Unit</Typography.Text>
 					<YAxisUnitSelector
 						containerClassName={styles.unitSelector}
 						data-testid="panel-editor-v2-unit"
@@ -47,29 +54,37 @@ function FormattingSection({
 						initialValue={metricUnit}
 						onChange={(unit): void => onChange({ ...value, unit })}
 					/>
-				</ConfigField>
+				</div>
 			)}
 
 			{controls.decimals && (
-				<DecimalsField
-					value={value?.decimalPrecision}
-					unit={value?.unit}
-					{...reset('decimalPrecision')}
-					onChange={(decimalPrecision): void =>
-						onChange({ ...value, decimalPrecision })
-					}
-				/>
+				<div className={styles.field}>
+					<Typography.Text>Decimals</Typography.Text>
+					<ConfigSelect
+						testId="panel-editor-v2-decimals"
+						placeholder="Select decimals…"
+						value={value?.decimalPrecision}
+						items={DECIMAL_OPTIONS}
+						onChange={(next): void =>
+							onChange({
+								...value,
+								decimalPrecision: next,
+							})
+						}
+					/>
+				</div>
 			)}
 
 			{controls.columnUnits && (
-				<ConfigField label="Column units" {...reset('columnUnits')}>
+				<div className={styles.field}>
+					<Typography.Text>Column units</Typography.Text>
 					<ColumnUnits
 						columns={tableColumns}
 						value={value?.columnUnits ?? {}}
 						metricUnit={metricUnit}
 						onChange={(columnUnits): void => onChange({ ...value, columnUnits })}
 					/>
-				</ConfigField>
+				</div>
 			)}
 		</>
 	);

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/FormattingSection/__tests__/FormattingSection.test.tsx

@@ -1,15 +1,17 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import { DashboardtypesPrecisionOptionDTO } from 'api/generated/services/sigNoz.schemas';
 
 import FormattingSection from '../FormattingSection';
 
 // Auto-seeding is covered by useSeedMetricUnit's tests; here `metricUnit` is just a prop.
 
-async function pickDecimal(value: string): Promise<void> {
-	await userEvent
-		.setup()
-		.click(screen.getByTestId(`panel-editor-v2-decimals-${value}`));
+// Open the Decimals select (clicking its antd selector) and pick the option with the
+// given visible label.
+async function pickDecimal(label: string): Promise<void> {
+	const user = userEvent.setup();
+	const trigger = screen.getByTestId('panel-editor-v2-decimals');
+	await user.click(trigger.querySelector('.ant-select-selector') as HTMLElement);
+	await user.click(await screen.findByRole('option', { name: label }));
 }
 
 describe('FormattingSection', () => {
@@ -49,7 +51,7 @@ describe('FormattingSection', () => {
 			/>,
 		);
 
-		await pickDecimal('full');
+		await pickDecimal('Full');
 
 		expect(onChange).toHaveBeenCalledWith({ decimalPrecision: 'full' });
 	});
@@ -64,45 +66,11 @@ describe('FormattingSection', () => {
 			/>,
 		);
 
-		await pickDecimal('3');
+		await pickDecimal('2 decimals');
 
 		expect(onChange).toHaveBeenCalledWith({
 			unit: 'bytes',
-			decimalPrecision: '3',
-		});
-	});
-
-	it('previews a sample value at the chosen precision', () => {
-		render(
-			<FormattingSection
-				value={{ decimalPrecision: DashboardtypesPrecisionOptionDTO.NUMBER_1 }}
-				controls={{ decimals: true }}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('decimals-preview')).toHaveTextContent('1,234.5');
-	});
-
-	it('resets a changed precision back to the default', async () => {
-		const onChange = jest.fn();
-		render(
-			<FormattingSection
-				value={{
-					unit: 'bytes',
-					decimalPrecision: DashboardtypesPrecisionOptionDTO.NUMBER_4,
-				}}
-				defaultValue={{}}
-				controls={{ decimals: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		await userEvent.setup().click(screen.getByTestId('config-field-reset'));
-
-		expect(onChange).toHaveBeenCalledWith({
-			unit: 'bytes',
-			decimalPrecision: undefined,
+			decimalPrecision: '2',
 		});
 	});
 

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/FormattingSection/options.ts

@@ -1,19 +0,0 @@
-import { DashboardtypesPrecisionOptionDTO } from 'api/generated/services/sigNoz.schemas';
-
-import type { ConfigTileItem } from '../../controls/ConfigTiles/ConfigTiles';
-
-/** What an unset precision renders with. */
-export const DEFAULT_DECIMAL_PRECISION =
-	DashboardtypesPrecisionOptionDTO.NUMBER_2;
-
-export const DECIMALS_PREVIEW_VALUE = 1234.56789;
-
-export const DECIMAL_OPTIONS: ConfigTileItem<DashboardtypesPrecisionOptionDTO>[] =
-	[
-		{ value: DashboardtypesPrecisionOptionDTO.NUMBER_0, label: '0' },
-		{ value: DashboardtypesPrecisionOptionDTO.NUMBER_1, label: '1' },
-		{ value: DashboardtypesPrecisionOptionDTO.NUMBER_2, label: '2' },
-		{ value: DashboardtypesPrecisionOptionDTO.NUMBER_3, label: '3' },
-		{ value: DashboardtypesPrecisionOptionDTO.NUMBER_4, label: '4' },
-		{ value: DashboardtypesPrecisionOptionDTO.full, label: 'Full' },
-	];

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/FormattingSection/summary.ts

@@ -1,33 +0,0 @@
-import { DashboardtypesPrecisionOptionDTO } from 'api/generated/services/sigNoz.schemas';
-import { getUniversalNameFromMetricUnit } from 'components/YAxisUnitSelector/utils';
-import type {
-	PanelFormattingSlice,
-	SectionControlsOf,
-	SectionKind,
-} from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
-
-import { joinSummary } from '../../utils/summary';
-import { DEFAULT_DECIMAL_PRECISION } from './options';
-
-function describeDecimals(precision: DashboardtypesPrecisionOptionDTO): string {
-	if (precision === DashboardtypesPrecisionOptionDTO.full) {
-		return 'full precision';
-	}
-	return precision === DashboardtypesPrecisionOptionDTO.NUMBER_1
-		? '1 decimal'
-		: `${precision} decimals`;
-}
-
-export function summarizeFormatting(
-	value: PanelFormattingSlice | undefined,
-	controls: SectionControlsOf<SectionKind.Formatting>,
-): string {
-	const hasColumnUnits = Object.keys(value?.columnUnits ?? {}).length > 0;
-	return joinSummary([
-		controls.unit &&
-			(value?.unit ? getUniversalNameFromMetricUnit(value.unit) : 'No unit'),
-		controls.columnUnits && hasColumnUnits && 'Per-column units',
-		controls.decimals &&
-			describeDecimals(value?.decimalPrecision ?? DEFAULT_DECIMAL_PRECISION),
-	]);
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/LegendSection/LegendSection.module.scss

@@ -0,0 +1,5 @@
+.field {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/LegendSection/LegendSection.tsx

@@ -1,18 +1,32 @@
+import { Typography } from '@signozhq/ui/typography';
+import { DashboardtypesLegendPositionDTO } from 'api/generated/services/sigNoz.schemas';
 import type {
 	SectionEditorProps,
 	SectionKind,
 } from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
 
-import ConfigField from '../../controls/ConfigField/ConfigField';
-import ConfigTiles from '../../controls/ConfigTiles/ConfigTiles';
+import ConfigSegmented from '../../controls/ConfigSegmented/ConfigSegmented';
 import LegendColors from '../../controls/LegendColors/LegendColors';
 import type { SectionEditorContext } from '../../sectionContext';
-import { createFieldResetter } from '../../utils/changes';
-import { POSITION_OPTIONS } from './options';
+
+import styles from './LegendSection.module.scss';
 
 type LegendSectionProps = SectionEditorProps<SectionKind.Legend> &
 	Pick<SectionEditorContext, 'legendSeries'>;
 
+const POSITION_OPTIONS = [
+	{
+		value: DashboardtypesLegendPositionDTO.bottom,
+		label: 'Bottom',
+		icon: 'pos-bottom' as const,
+	},
+	{
+		value: DashboardtypesLegendPositionDTO.right,
+		label: 'Right',
+		icon: 'pos-right' as const,
+	},
+];
+
 /**
  * Edits the `legend` slice of a panel spec: legend position and per-series color
  * overrides. The colors control reads the panel's resolved series from context (the
@@ -20,35 +34,38 @@ type LegendSectionProps = SectionEditorProps<SectionKind.Legend> &
  */
 function LegendSection({
 	value,
-	defaultValue,
 	controls,
 	onChange,
 	legendSeries,
 }: LegendSectionProps): JSX.Element {
-	const reset = createFieldResetter(value, defaultValue, onChange);
-
 	return (
 		<>
 			{controls.position && (
-				<ConfigField label="Position" {...reset('position')}>
-					<ConfigTiles
+				<div className={styles.field}>
+					<Typography.Text>Position</Typography.Text>
+					<ConfigSegmented
 						testId="panel-editor-v2-legend-position"
-						aria-label="Legend position"
 						items={POSITION_OPTIONS}
-						value={value?.position ?? defaultValue?.position}
-						onChange={(position): void => onChange({ ...value, position })}
+						value={value?.position}
+						onChange={(next): void =>
+							onChange({
+								...value,
+								position: next as DashboardtypesLegendPositionDTO,
+							})
+						}
 					/>
-				</ConfigField>
+				</div>
 			)}
 
 			{controls.colors && (
-				<ConfigField label="Series colors" {...reset('customColors')}>
+				<div className={styles.field}>
+					<Typography.Text>Series colors</Typography.Text>
 					<LegendColors
 						series={legendSeries ?? []}
 						value={value?.customColors}
 						onChange={(customColors): void => onChange({ ...value, customColors })}
 					/>
-				</ConfigField>
+				</div>
 			)}
 		</>
 	);

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/LegendSection/__tests__/LegendSection.test.tsx

@@ -16,8 +16,8 @@ describe('LegendSection', () => {
 		expect(
 			screen.getByTestId('panel-editor-v2-legend-position'),
 		).toBeInTheDocument();
-		expect(screen.getByText('Below chart')).toBeInTheDocument();
-		expect(screen.getByText('Right of chart')).toBeInTheDocument();
+		expect(screen.getByText('Bottom')).toBeInTheDocument();
+		expect(screen.getByText('Right')).toBeInTheDocument();
 	});
 
 	it('renders nothing when position is not enabled', () => {
@@ -40,7 +40,7 @@ describe('LegendSection', () => {
 			/>,
 		);
 
-		fireEvent.click(screen.getByTestId('panel-editor-v2-legend-position-right'));
+		fireEvent.click(screen.getByText('Right'));
 
 		expect(onChange).toHaveBeenCalledWith({ position: 'right' });
 	});
@@ -58,7 +58,7 @@ describe('LegendSection', () => {
 			/>,
 		);
 
-		fireEvent.click(screen.getByTestId('panel-editor-v2-legend-position-right'));
+		fireEvent.click(screen.getByText('Right'));
 
 		expect(onChange).toHaveBeenCalledWith({
 			position: 'right',

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/LegendSection/options.ts

@@ -1,18 +0,0 @@
-import { DashboardtypesLegendPositionDTO } from 'api/generated/services/sigNoz.schemas';
-
-import type { ConfigTileItem } from '../../controls/ConfigTiles/ConfigTiles';
-import { TILE_DRAWINGS } from '../../controls/drawings/tileDrawings';
-
-export const POSITION_OPTIONS: ConfigTileItem<DashboardtypesLegendPositionDTO>[] =
-	[
-		{
-			value: DashboardtypesLegendPositionDTO.bottom,
-			label: 'Below chart',
-			drawing: TILE_DRAWINGS.legendBottom,
-		},
-		{
-			value: DashboardtypesLegendPositionDTO.right,
-			label: 'Right of chart',
-			drawing: TILE_DRAWINGS.legendRight,
-		},
-	];

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/LegendSection/summary.ts

@@ -1,21 +0,0 @@
-import type { DashboardtypesLegendDTO } from 'api/generated/services/sigNoz.schemas';
-import type {
-	SectionControlsOf,
-	SectionKind,
-} from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
-
-import { countSummary, joinSummary } from '../../utils/summary';
-import { POSITION_OPTIONS } from './options';
-
-export function summarizeLegend(
-	value: DashboardtypesLegendDTO | undefined,
-	controls: SectionControlsOf<SectionKind.Legend>,
-): string {
-	const position =
-		POSITION_OPTIONS.find((option) => option.value === value?.position) ??
-		POSITION_OPTIONS[0];
-	return joinSummary([
-		controls.position && position.label,
-		countSummary(Object.keys(value?.customColors ?? {}), 'custom color'),
-	]);
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/PanelHeaderSection/PanelHeaderSection.tsx

@@ -4,24 +4,19 @@ import type {
 } from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
 
 import ConfigSwitch from '../../controls/ConfigSwitch/ConfigSwitch';
-import { SWITCH_SKETCHES } from '../../controls/drawings/switchSketches';
 
 /** Edits the Text panel's `headerOptions` slice: the panel card's title strip. */
 function PanelHeaderSection({
 	value,
 	onChange,
 }: SectionEditorProps<SectionKind.PanelHeader>): JSX.Element {
-	const hide = value?.hide === true;
-
 	return (
 		<ConfigSwitch
 			testId="panel-header-hide"
-			title="Hide panel header"
-			description="Removes the title strip on the dashboard. Drag and actions appear on hover."
-			sketch={SWITCH_SKETCHES.hideHeader}
-			changed={hide}
-			value={hide}
-			onChange={(next): void => onChange({ ...value, hide: next })}
+			title="Hide header"
+			description="Drop the title strip on the dashboard; hovering the panel shows controls for drag and actions."
+			value={value?.hide === true}
+			onChange={(hide): void => onChange({ ...value, hide })}
 		/>
 	);
 }

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/TextLayoutSection/TextLayoutSection.module.scss

@@ -0,0 +1,11 @@
+.section {
+	display: flex;
+	flex-direction: column;
+	gap: 16px;
+}
+
+.field {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/TextLayoutSection/TextLayoutSection.tsx

@@ -2,6 +2,7 @@ import {
 	DashboardtypesTextAlignDTO,
 	DashboardtypesVerticalAlignDTO,
 } from 'api/generated/services/sigNoz.schemas';
+import { Typography } from '@signozhq/ui/typography';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import {
 	resolveTextBackground,
@@ -18,12 +19,23 @@ import type {
 	SectionKind,
 } from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
 
-import AlignmentGrid from '../../controls/AlignmentGrid/AlignmentGrid';
 import BackgroundSwatches from '../../controls/BackgroundSwatches/BackgroundSwatches';
 import CustomBackgroundRow from '../../controls/BackgroundSwatches/CustomBackgroundRow';
-import { backgroundTitle } from '../../controls/BackgroundSwatches/titles';
-import ConfigField from '../../controls/ConfigField/ConfigField';
-import { createFieldResetter } from '../../utils/changes';
+import ConfigSegmented from '../../controls/ConfigSegmented/ConfigSegmented';
+
+import styles from './TextLayoutSection.module.scss';
+
+const HORIZONTAL_OPTIONS = [
+	{ value: DashboardtypesTextAlignDTO.left, label: 'Left' },
+	{ value: DashboardtypesTextAlignDTO.center, label: 'Center' },
+	{ value: DashboardtypesTextAlignDTO.right, label: 'Right' },
+];
+
+const VERTICAL_OPTIONS = [
+	{ value: DashboardtypesVerticalAlignDTO.top, label: 'Top' },
+	{ value: DashboardtypesVerticalAlignDTO.center, label: 'Middle' },
+	{ value: DashboardtypesVerticalAlignDTO.bottom, label: 'Bottom' },
+];
 
 /**
  * Edits the Text panel's `presentation` slice: body alignment and the card
@@ -31,31 +43,33 @@ import { createFieldResetter } from '../../utils/changes';
  */
 function TextLayoutSection({
 	value,
-	defaultValue,
 	onChange,
 }: SectionEditorProps<SectionKind.TextLayout>): JSX.Element {
 	const theme = useIsDarkMode() ? PanelTheme.Dark : PanelTheme.Light;
 	const background = resolveTextBackground(value?.background, theme);
-	const reset = createFieldResetter(value, defaultValue, onChange);
 
 	return (
-		<>
-			<ConfigField label="Text position" {...reset('textAlign', 'verticalAlign')}>
-				<AlignmentGrid
-					testId="text-layout-align"
-					description="Where the text sits inside the panel."
-					value={{
-						textAlign: value?.textAlign ?? DashboardtypesTextAlignDTO.left,
-						verticalAlign: value?.verticalAlign ?? DashboardtypesVerticalAlignDTO.top,
-					}}
-					onChange={(alignment): void => onChange({ ...value, ...alignment })}
+		<div className={styles.section}>
+			<div className={styles.field}>
+				<Typography.Text>Horizontal alignment</Typography.Text>
+				<ConfigSegmented
+					testId="text-layout-horizontal-align"
+					items={HORIZONTAL_OPTIONS}
+					value={value?.textAlign ?? DashboardtypesTextAlignDTO.left}
+					onChange={(textAlign): void => onChange({ ...value, textAlign })}
 				/>
-			</ConfigField>
-			<ConfigField
-				label="Background"
-				help={`Selected: ${backgroundTitle(background)}`}
-				{...reset('background')}
-			>
+			</div>
+			<div className={styles.field}>
+				<Typography.Text>Vertical alignment</Typography.Text>
+				<ConfigSegmented
+					testId="text-layout-vertical-align"
+					items={VERTICAL_OPTIONS}
+					value={value?.verticalAlign ?? DashboardtypesVerticalAlignDTO.top}
+					onChange={(verticalAlign): void => onChange({ ...value, verticalAlign })}
+				/>
+			</div>
+			<div className={styles.field}>
+				<Typography.Text>Background</Typography.Text>
 				<BackgroundSwatches
 					testId="text-layout-background"
 					label="Panel background"
@@ -77,8 +91,8 @@ function TextLayoutSection({
 					}
 					onChange={(hex): void => onChange({ ...value, background: hex })}
 				/>
-			</ConfigField>
-		</>
+			</div>
+		</div>
 	);
 }
 

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/TextLayoutSection/__tests__/TextLayoutSection.test.tsx

@@ -4,7 +4,6 @@ import {
 	render as rtlRender,
 	type RenderResult,
 	screen,
-	within,
 } from '@testing-library/react';
 import { TooltipProvider } from '@signozhq/ui/tooltip';
 import {
@@ -34,7 +33,7 @@ describe('TextLayoutSection', () => {
 		const onChange = jest.fn();
 		render(<TextLayoutSection value={value} onChange={onChange} />);
 
-		fireEvent.click(screen.getByTestId('text-layout-align-top-center'));
+		fireEvent.click(screen.getByText('Center'));
 
 		expect(onChange).toHaveBeenCalledWith({
 			...value,
@@ -46,7 +45,7 @@ describe('TextLayoutSection', () => {
 		const onChange = jest.fn();
 		render(<TextLayoutSection value={value} onChange={onChange} />);
 
-		fireEvent.click(screen.getByTestId('text-layout-align-bottom-left'));
+		fireEvent.click(screen.getByText('Bottom'));
 
 		expect(onChange).toHaveBeenCalledWith({
 			...value,
@@ -130,7 +129,7 @@ describe('TextLayoutSection', () => {
 			'#3A2A64',
 		);
 		expect(
-			within(screen.getByRole('radiogroup', { name: 'Panel background' }))
+			screen
 				.getAllByRole<HTMLInputElement>('radio')
 				.filter((swatch) => swatch.checked),
 		).toHaveLength(0);

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/TextLayoutSection/summary.ts

@@ -1,24 +0,0 @@
-import {
-	DashboardtypesTextAlignDTO,
-	type DashboardtypesTextPresentationDTO,
-	DashboardtypesVerticalAlignDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { resolveTextBackground } from 'pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/background/resolveTextBackground';
-import { PanelTheme } from 'pages/DashboardPage/DashboardContainer/Panels/kinds/TextPanel/background/types';
-
-import { alignmentLabel } from '../../controls/AlignmentGrid/alignment';
-import { backgroundTitle } from '../../controls/BackgroundSwatches/titles';
-import { joinSummary } from '../../utils/summary';
-
-export function summarizeTextLayout(
-	value: DashboardtypesTextPresentationDTO | undefined,
-): string {
-	return joinSummary([
-		alignmentLabel({
-			textAlign: value?.textAlign ?? DashboardtypesTextAlignDTO.left,
-			verticalAlign: value?.verticalAlign ?? DashboardtypesVerticalAlignDTO.top,
-		}),
-		// Preset detection matches either theme's surface, so the theme is immaterial here.
-		`${backgroundTitle(resolveTextBackground(value?.background, PanelTheme.Dark))} background`,
-	]);
-}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/ThresholdsSection.module.scss

@@ -1,41 +1,32 @@
 .list {
 	display: flex;
 	flex-direction: column;
-	gap: 14px;
-}
-
-.help {
-	font-size: 13px;
-	line-height: 19px;
-	color: var(--l2-foreground);
+	gap: 8px;
 }
 
 // ── View mode: compact summary row ──────────────────────────────────────────
 .viewRow {
 	display: flex;
 	align-items: center;
-	gap: 14px;
-	padding: 8px 10px 8px 16px;
-	border: 1px solid var(--l1-border);
-	border-radius: 4px;
+	gap: 8px;
+	height: 40px;
+	padding: 0 4px 0 10px;
+	border: 1px solid var(--l2-border);
 	background-color: var(--l2-background);
-
-	&:hover {
-		border-color: var(--l2-border);
-	}
+	border-radius: 6px;
 }
 
 .viewValue {
 	flex: none;
-	font-family: 'Geist Mono', monospace;
 	font-size: 13px;
-	color: var(--l1-foreground);
+	font-weight: 500;
+	color: var(--text-vanilla-100);
 }
 
 .viewLabel {
 	overflow: hidden;
 	font-size: 12px;
-	color: var(--l2-foreground);
+	color: var(--text-vanilla-400);
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
@@ -48,11 +39,11 @@
 .editRow {
 	display: flex;
 	flex-direction: column;
-	gap: 14px;
-	padding: 16px;
-	border: 1px solid var(--bg-robin-500);
-	border-radius: 4px;
+	gap: 12px;
+	padding: 12px;
 	background-color: var(--l2-background);
+	border: 1px solid var(--bg-robin-400);
+	border-radius: 6px;
 }
 
 .field {
@@ -62,8 +53,8 @@
 }
 
 .fieldLabel {
-	font-size: 13px;
-	color: var(--l1-foreground);
+	font-size: 12px;
+	color: var(--text-vanilla-400);
 }
 
 .actions {
@@ -74,8 +65,8 @@
 
 // ── Shared ──────────────────────────────────────────────────────────────────
 .dot {
-	width: 10px;
-	height: 10px;
+	width: 12px;
+	height: 12px;
 	flex: none;
 	border-radius: 50%;
 }

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/ThresholdsSection.tsx

@@ -25,14 +25,6 @@ import styles from './ThresholdsSection.module.scss';
 // New thresholds default to red (the first palette preset); the user recolors per rule.
 const DEFAULT_THRESHOLD_COLOR = ThresholdColor.RED;
 
-const HELP: Record<ThresholdVariant, string> = {
-	label:
-		'Draws a dashed line across the chart at a value, so you can see when data crosses it.',
-	comparison:
-		'Changes the number’s color when it crosses a value. Useful for green / amber / red status.',
-	table: 'Colors cells in a column when their value crosses a limit.',
-};
-
 // Add-button testId per variant — kept stable so existing E2E/unit selectors hold.
 const ADD_TESTID: Record<ThresholdVariant, string> = {
 	label: 'panel-editor-v2-add-threshold',
@@ -196,7 +188,6 @@ function ThresholdsSection({
 
 	return (
 		<div className={styles.list}>
-			<span className={styles.help}>{HELP[variant]}</span>
 			{thresholds.map(renderRow)}
 
 			<Button

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/shared/ThresholdRowShell.tsx

@@ -1,5 +1,5 @@
 import type { ReactNode } from 'react';
-import { Pencil, Trash2 } from '@signozhq/icons';
+import { Check, Pencil, Trash2, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 
 import styles from '../../ThresholdsSection.module.scss';
@@ -79,15 +79,17 @@ function ThresholdRowShell({
 					type="button"
 					variant="outlined"
 					color="secondary"
+					prefix={<X size={14} />}
 					data-testid={`${testIdPrefix}-discard-${index}`}
 					onClick={onDiscard}
 				>
-					Cancel
+					Discard
 				</Button>
 				<Button
 					type="button"
 					variant="solid"
 					color="primary"
+					prefix={<Check size={14} />}
 					data-testid={`${testIdPrefix}-save-${index}`}
 					onClick={onSave}
 				>

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/VisualizationSection/VisualizationSection.module.scss

@@ -0,0 +1,5 @@
+.field {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+}

frontend/src/pages/DashboardPage/DashboardContainer/PanelEditor/ConfigPane/sections/VisualizationSection/VisualizationSection.tsx

@@ -1,35 +1,25 @@
-import { DashboardtypesTimePreferenceDTO } from 'api/generated/services/sigNoz.schemas';
+import { Typography } from '@signozhq/ui/typography';
+import type { DashboardtypesStackModeDTO } from 'api/generated/services/sigNoz.schemas';
 import type {
 	SectionEditorProps,
 	SectionKind,
 } from 'pages/DashboardPage/DashboardContainer/Panels/types/sections';
 import { EQueryType } from 'types/common/dashboard';
 
-import ConfigField from '../../controls/ConfigField/ConfigField';
+import ConfigSegmented from '../../controls/ConfigSegmented/ConfigSegmented';
 import ConfigSelect from '../../controls/ConfigSelect/ConfigSelect';
 import ConfigSwitch from '../../controls/ConfigSwitch/ConfigSwitch';
-import ConfigTiles from '../../controls/ConfigTiles/ConfigTiles';
-import { SWITCH_SKETCHES } from '../../controls/drawings/switchSketches';
 import PanelTypeSwitcher from '../../PanelTypeSwitcher/PanelTypeSwitcher';
 import type { SectionEditorContext } from '../../sectionContext';
-import { createFieldResetter } from '../../utils/changes';
-import {
-	BAR_LAYOUT_HELP,
-	BAR_LAYOUT_OPTIONS,
-	BarLayout,
-	STACK_MODE_HELP,
-	STACK_MODE_OPTIONS,
-} from './options';
+import { STACK_MODE_OPTIONS } from './stackModeOptions';
 import { TIME_PREFERENCE_OPTIONS } from './timePreferenceOptions';
 
+import styles from './VisualizationSection.module.scss';
+
 type VisualizationSectionProps = SectionEditorProps<SectionKind.Visualization> &
 	Pick<
 		SectionEditorContext,
-		| 'panelKind'
-		| 'onChangePanelKind'
-		| 'originalPanelKind'
-		| 'signal'
-		| 'queryType'
+		'panelKind' | 'onChangePanelKind' | 'signal' | 'queryType'
 	>;
 
 /**
@@ -41,23 +31,13 @@ type VisualizationSectionProps = SectionEditorProps<SectionKind.Visualization> &
  */
 function VisualizationSection({
 	value,
-	defaultValue,
 	controls,
 	onChange,
 	panelKind,
 	onChangePanelKind,
-	originalPanelKind,
 	queryType,
 	signal,
 }: VisualizationSectionProps): JSX.Element {
-	const reset = createFieldResetter(value, defaultValue, onChange);
-	const timePreference =
-		value?.timePreference ?? DashboardtypesTimePreferenceDTO.global_time;
-	const barLayout = value?.stackedBarChart
-		? BarLayout.STACKED
-		: BarLayout.SIDE_BY_SIDE;
-	const stack = value?.stack ?? defaultValue?.stack;
-
 	return (
 		<>
 			{controls.switchPanelKind && panelKind && onChangePanelKind && (
@@ -67,75 +47,63 @@ function VisualizationSection({
 					// supplied in practice; default to Query Builder at this boundary.
 					queryType={queryType ?? EQueryType.QUERY_BUILDER}
 					signal={signal}
-					originalPanelKind={originalPanelKind}
 					onChange={onChangePanelKind}
 				/>
 			)}
 
 			{controls.timePreference && (
-				<ConfigField
-					label="Time range"
-					help={
-						timePreference === DashboardtypesTimePreferenceDTO.global_time
-							? 'Follows the dashboard time picker.'
-							: 'Pinned. This panel ignores the dashboard time picker.'
-					}
-					{...reset('timePreference')}
-				>
+				<div className={styles.field}>
+					<Typography.Text>Panel time preference</Typography.Text>
 					<ConfigSelect
 						testId="panel-editor-v2-time-preference"
-						value={timePreference}
+						placeholder="Select time scope…"
+						value={value?.timePreference}
 						items={TIME_PREFERENCE_OPTIONS}
-						onChange={(next): void => onChange({ ...value, timePreference: next })}
+						onChange={(next): void =>
+							onChange({
+								...value,
+								timePreference: next,
+							})
+						}
 					/>
-				</ConfigField>
+				</div>
+			)}
+
+			{controls.stacking && (
+				<ConfigSwitch
+					testId="panel-editor-v2-stacked-bar-chart"
+					title="Stack series"
+					description="Stack bars from all series on top of each other"
+					value={value?.stackedBarChart ?? false}
+					onChange={(checked): void =>
+						onChange({ ...value, stackedBarChart: checked })
+					}
+				/>
+			)}
+
+			{controls.stackMode && (
+				<div className={styles.field}>
+					<Typography.Text>Stack series</Typography.Text>
+					<ConfigSegmented
+						testId="panel-editor-v2-stack-mode"
+						value={value?.stack}
+						items={STACK_MODE_OPTIONS}
+						onChange={(next): void =>
+							onChange({ ...value, stack: next as DashboardtypesStackModeDTO })
+						}
+					/>
+				</div>
 			)}
 
 			{controls.fillSpans && (
 				<ConfigSwitch
 					testId="panel-editor-v2-fill-spans"
-					title="Treat missing data as 0"
-					description="Empty intervals plot as 0 instead of a gap. Pulls averages down."
-					sketch={SWITCH_SKETCHES.fillGaps}
-					changed={reset('fillSpans').changed}
+					title="Fill gaps"
+					description="Fill gaps in data with 0 for continuity"
 					value={value?.fillSpans ?? false}
-					onChange={(fillSpans): void => onChange({ ...value, fillSpans })}
+					onChange={(checked): void => onChange({ ...value, fillSpans: checked })}
 				/>
 			)}
-
-			{controls.stacking && (
-				<ConfigField
-					label="Series layout"
-					help={BAR_LAYOUT_HELP[barLayout]}
-					{...reset('stackedBarChart')}
-				>
-					<ConfigTiles
-						testId="panel-editor-v2-stacked-bar-chart"
-						aria-label="Series layout"
-						value={barLayout}
-						items={BAR_LAYOUT_OPTIONS}
-						onChange={(next): void =>
-							onChange({ ...value, stackedBarChart: next === BarLayout.STACKED })
-						}
-					/>
-				</ConfigField>
-			)}
-
-			{controls.stackMode && (
-				<ConfigField
-					label="Series layout"
-					help={stack && STACK_MODE_HELP[stack]}
-					{...reset('stack')}
-				>
-					<ConfigTiles
-						testId="panel-editor-v2-stack-mode"
-						aria-label="Series layout"
-						value={stack}
-						items={STACK_MODE_OPTIONS}
-						onChange={(next): void => onChange({ ...value, stack: next })}
-					/>
-				</ConfigField>
-			)}
 		</>
 	);
 }